on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Правка бага создания / редактирвоания операции: группировка ошибок по name внтури ValidationBadRequest + закомментирован код, который проверяет начало текущей операции и конец предыдущей.

Browse Source
This commit is contained in:
Olga Nemt 2024-01-31 11:15:21 +05:00
parent 9e7d732140
commit 6e55d5b542
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AsbCloudInfrastructure/Repository/WellOperationRepository.cs
View File

@ -383,12 +383,12 @@ public class WellOperationRepository : IWellOperationRepository
new[] { nameof(wellOperationDtos) }); new[] { nameof(wellOperationDtos) });
} }
if (previousDateEnd > currentDateStart) //if (previousDateEnd > currentDateStart)
{ //{
yield return new ValidationResult( // yield return new ValidationResult(
"Предыдущая операция не завершена", // "Предыдущая операция не завершена",
new[] { nameof(wellOperationDtos) }); // new[] { nameof(wellOperationDtos) });
} //}
previous = current; previous = current;
} }

6
AsbCloudWebApi/Extentions.cs
View File

@ -70,8 +70,10 @@ namespace Microsoft.AspNetCore.Mvc
public static BadRequestObjectResult ValidationBadRequest(this ControllerBase controller, IEnumerable<ValidationResult> validationResults) public static BadRequestObjectResult ValidationBadRequest(this ControllerBase controller, IEnumerable<ValidationResult> validationResults)
{ {
var errors = validationResults var errors = validationResults
.SelectMany(e => e.MemberNames.Select(name=> new { name, e.ErrorMessage })) .SelectMany(e => e.MemberNames.Select(name => new { name, e.ErrorMessage }))
.ToDictionary(e => e.name, e => new[] { e.ErrorMessage ?? string.Empty }); .GroupBy(e => e.name)
.ToDictionary(e => e.Key, e => e.Select(el => el.ErrorMessage ?? string.Empty).ToArray());
var problem = new ValidationProblemDetails(errors); var problem = new ValidationProblemDetails(errors);
return controller.BadRequest(problem); return controller.BadRequest(problem);
} }