Skip to content

feat: add fluentValidation validators for the min-max values #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fvanderflier merged 12 commits into from
Jan 29, 2026
Merged

feat: add fluentValidation validators for the min-max values #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1463c09
feature/add fluentValidation validators for the min-max values
Jan 23, 2026
b0ef0ac
Add xUnit tests for the DomainModelEditor for the min-max feature
Jan 23, 2026
a6909f3
refactor/ use collection expressions to initialize TextTypes and Nume…
Jan 23, 2026
6f1e0bc
Add tests for the FieldRequest and UpdateFieldRequest validators
Jan 26, 2026
8c56366
Make the Validators Tests parametrised
Jan 27, 2026
ebb5953
Merge branch 'main' into feature/add-min-max-validators
Jan 27, 2026
82b7f69
refactor/ change the range attribute generation to use type constants…
Jan 27, 2026
0abae22
add controller level tests for the min-max feature
Jan 28, 2026
71baa37
add verified tests
Jan 28, 2026
d4681cd
fix: change the content to include relative path
Jan 29, 2026
b4f5018
Revert the name of the CreateModel_Should_Return_BadRequest_If_Model_…
Jan 29, 2026
8a481b1
remove CreateModel_Should_Return_BadRequest_If_Min_Property_Type_Is_I…
Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 160 additions & 0 deletions Dappi.HeadlessCms.Tests/Controllers/ModelsControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Net.Http;
using System.Net.Http.Json;
using System.Text.RegularExpressions;
using Dappi.HeadlessCms.Models;
Expand Down Expand Up @@ -436,6 +437,154 @@ public async Task AddField_Should_Add_ManyToMany_Relation_To_Models()
await Verify(res, _verifySettings).UseFileName("response");
}

[Theory]
[ClassData(typeof(ValidMinMaxConstraints))]
public async Task AddField_Should_Accept_Valid_MinMax_Constraints(
string fieldType,
double? min,
double? max,
string testName)
{
var auth = await _client.Authorize();
_client.DefaultRequestHeaders.Add("Authorization", $"Bearer {auth?.Token}");

var modelRequest = new ModelRequest { ModelName = $"MinMaxTest{testName}", IsAuditableEntity = false };
await _client.PostAsJsonAsync(_baseUrl, modelRequest);

var fieldRequest = new FieldRequest
{
FieldName = "TestField",
FieldType = fieldType,
IsRequired = false,
Min = min,
Max = max
};

var res = await _client.PutAsJsonAsync($"{_baseUrl}/{modelRequest.ModelName}", fieldRequest);
var filePath = Path.Combine(_entitiesPath, $"{modelRequest.ModelName}.cs");
var actual = await File.ReadAllTextAsync(filePath);

_verifySettings.UseDirectory(
$"{_snapshotPath}/{nameof(AddField_Should_Accept_Valid_MinMax_Constraints)}/{testName}");
await Verify(actual, _verifySettings).UseFileName("model");
await Verify(res, _verifySettings).UseFileName("response");
}

[Theory]
[ClassData(typeof(InvalidMinMaxConstraints))]
public async Task AddField_Should_Return_BadRequest_For_Invalid_MinMax_Constraints(
string fieldType,
double? min,
double? max,
string testName)
{
var auth = await _client.Authorize();
_client.DefaultRequestHeaders.Add("Authorization", $"Bearer {auth?.Token}");

var modelRequest = new ModelRequest { ModelName = $"InvalidMinMax{testName}", IsAuditableEntity = false };
await _client.PostAsJsonAsync(_baseUrl, modelRequest);

var fieldRequest = new FieldRequest
{
FieldName = "TestField",
FieldType = fieldType,
IsRequired = false,
Min = min,
Max = max
};

var res = await _client.PutAsJsonAsync($"{_baseUrl}/{modelRequest.ModelName}", fieldRequest);

_verifySettings.UseDirectory(
$"{_snapshotPath}/{nameof(AddField_Should_Return_BadRequest_For_Invalid_MinMax_Constraints)}/{testName}");
await Verify(res, _verifySettings).UseFileName("response");
}

[Theory]
[ClassData(typeof(InvalidMinMaxConstraints))]
public async Task UpdateField_Should_Return_BadRequest_For_Invalid_MinMax_Update(
string fieldType,
double? min,
double? max,
string testName)
{
var auth = await _client.Authorize();
_client.DefaultRequestHeaders.Add("Authorization", $"Bearer {auth?.Token}");

var modelRequest = new ModelRequest { ModelName = $"UpdateInvalidMinMax{testName}", IsAuditableEntity = false };
await _client.PostAsJsonAsync(_baseUrl, modelRequest);

var fieldRequest = new FieldRequest
{
FieldName = "TestField",
FieldType = fieldType,
IsRequired = false,
Min = 0,
Max = 100
};
await _client.PutAsJsonAsync($"{_baseUrl}/{modelRequest.ModelName}", fieldRequest);

var updateRequest = new UpdateFieldRequest
{
OldFieldName = "TestField",
NewFieldName = "TestField",
FieldType = fieldType,
IsRequired = false,
Min = min,
Max = max
};

var res = await PatchAsJsonAsync(_client, $"{_baseUrl}/{modelRequest.ModelName}/fields", updateRequest);

_verifySettings.UseDirectory(
$"{_snapshotPath}/{nameof(UpdateField_Should_Return_BadRequest_For_Invalid_MinMax_Update)}/{testName}");
await Verify(res, _verifySettings).UseFileName("response");
}

[Theory]
[ClassData(typeof(ValidMinMaxConstraints))]
public async Task UpdateField_Should_Accept_Valid_MinMax_Update(
string fieldType,
double? min,
double? max,
string testName)
{
var auth = await _client.Authorize();
_client.DefaultRequestHeaders.Add("Authorization", $"Bearer {auth?.Token}");

var modelRequest = new ModelRequest { ModelName = $"UpdateValidMinMax{testName}", IsAuditableEntity = false };
await _client.PostAsJsonAsync(_baseUrl, modelRequest);

var fieldRequest = new FieldRequest
{
FieldName = "TestField",
FieldType = fieldType,
IsRequired = false,
Min = 0,
Max = 10
};
await _client.PutAsJsonAsync($"{_baseUrl}/{modelRequest.ModelName}", fieldRequest);

var updateRequest = new UpdateFieldRequest
{
OldFieldName = "TestField",
NewFieldName = "TestField",
FieldType = fieldType,
IsRequired = false,
Min = min,
Max = max
};

var res = await PatchAsJsonAsync(_client, $"{_baseUrl}/{modelRequest.ModelName}/fields", updateRequest);
var filePath = Path.Combine(_entitiesPath, $"{modelRequest.ModelName}.cs");
var actual = await File.ReadAllTextAsync(filePath);

_verifySettings.UseDirectory(
$"{_snapshotPath}/{nameof(UpdateField_Should_Accept_Valid_MinMax_Update)}/{testName}");
await Verify(actual, _verifySettings).UseFileName("model");
await Verify(res, _verifySettings).UseFileName("response");
}

[Fact]
public async Task DeleteModel_Should_Return_NotFound_If_Model_Does_Not_Exist()
{
Expand Down Expand Up @@ -560,6 +709,17 @@ public async Task Other_Relations_Should_Not_Be_Deleted()
await Verify(deleteRes, _verifySettings).UseFileName("response");
}

private static Task<HttpResponseMessage> PatchAsJsonAsync<T>(HttpClient client, string requestUri, T value)
{
var content = JsonContent.Create(value);
var request = new HttpRequestMessage(HttpMethod.Patch, requestUri)
{
Content = content
};

return client.SendAsync(request);
}

public void Dispose()
{
if (Directory.Exists(_entitiesPath))
Expand Down
Loading