gorbenko.pavel/tnsu-approval-route
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

переход на fluentValidation

Browse Source
This commit is contained in:
gorbenko.pavel
2026-07-23 16:58:18 +05:00
parent 7cce18e67b
commit 253fafa575
14 changed files with 150 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/Tnsu.ApprovalRoute.Application/ApplicationServiceCollectionExtensions.cs
+4
View File
@@ -1,3 +1,5 @@
using System.Reflection;
using FluentValidation;
using Microsoft.Extensions.DependencyInjection;
using Tnsu.ApprovalRoute.Application.RequestTypes;
using Tnsu.ApprovalRoute.Application.TemplateRoutes;
@@ -13,6 +15,8 @@ public static class ApplicationServiceCollectionExtensions
services.AddScoped<TemplateRouteService>();
services.AddScoped<TemplateRouteStepService>();
services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());
return services;
}
}
backend/src/Tnsu.ApprovalRoute.Application/RequestTypes/RequestTypeService.cs
+5 -15
View File
@@ -27,33 +27,23 @@ public sealed class RequestTypeService(ApprovalRouteDbContext db)
: Result.Ok(ToDto(entity));
}
public async Task<Result<RequestTypeDto>> CreateAsync(string name, string pageUrl, CancellationToken cancellationToken)
public async Task<Result<RequestTypeDto>> CreateAsync(CreateRequestTypeRequest request, CancellationToken cancellationToken)
{
if (string.IsNullOrWhiteSpace(name))
return Result.Fail<RequestTypeDto>(new ValidationError("Имя типа заявки обязательно."));
if (string.IsNullOrWhiteSpace(pageUrl))
return Result.Fail<RequestTypeDto>(new ValidationError("Url страницы обязателен."));
var entity = new RequestType { Name = name, PageUrl = pageUrl };
var entity = new RequestType { Name = request.Name, PageUrl = request.PageUrl };
db.RequestTypes.Add(entity);
await db.SaveChangesAsync(cancellationToken);
return Result.Ok(ToDto(entity));
}
public async Task<Result<RequestTypeDto>> UpdateAsync(Guid id, string name, string pageUrl, CancellationToken cancellationToken)
public async Task<Result<RequestTypeDto>> UpdateAsync(Guid id, UpdateRequestTypeRequest request, CancellationToken cancellationToken)
{
var entity = await db.RequestTypes.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
if (entity is null)
return Result.Fail<RequestTypeDto>(new NotFoundError("Тип заявки", id));
if (string.IsNullOrWhiteSpace(name))
return Result.Fail<RequestTypeDto>(new ValidationError("Имя типа заявки обязательно."));
if (string.IsNullOrWhiteSpace(pageUrl))
return Result.Fail<RequestTypeDto>(new ValidationError("Url страницы обязателен."));
entity.Name = name;
entity.PageUrl = pageUrl;
entity.Name = request.Name;
entity.PageUrl = request.PageUrl;
await db.SaveChangesAsync(cancellationToken);
return Result.Ok(ToDto(entity));
backend/src/Tnsu.ApprovalRoute.Application/RequestTypes/RequestTypeValidators.cs
+21
View File
@@ -0,0 +1,21 @@
using FluentValidation;
namespace Tnsu.ApprovalRoute.Application.RequestTypes;
public sealed class CreateRequestTypeRequestValidator : AbstractValidator<CreateRequestTypeRequest>
{
public CreateRequestTypeRequestValidator()
{
RuleFor(x => x.Name).NotEmpty().WithMessage("Имя типа заявки обязательно.");
RuleFor(x => x.PageUrl).NotEmpty().WithMessage("Url страницы обязателен.");
}
}
public sealed class UpdateRequestTypeRequestValidator : AbstractValidator<UpdateRequestTypeRequest>
{
public UpdateRequestTypeRequestValidator()
{
RuleFor(x => x.Name).NotEmpty().WithMessage("Имя типа заявки обязательно.");
RuleFor(x => x.PageUrl).NotEmpty().WithMessage("Url страницы обязателен.");
}
}
backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepService.cs
+6 -17
View File
@@ -37,9 +37,9 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
if (route is null)
return Result.Fail<TemplateRouteStepDto>(new NotFoundError("Маршрут", routeId));
var fieldsError = ValidateFields(r.ExecutorEmail, r.Position, r.ProjectRole, route.ByProject);
if (fieldsError is not null)
return Result.Fail<TemplateRouteStepDto>(fieldsError);
if (!route.ByProject && r.ProjectRole != ProjectRole.None)
return Result.Fail<TemplateRouteStepDto>(new ValidationError(
"Роль в проекте недопустима для шага маршрута, который не учитывает проект (by_project = false)."));
var entity = new TemplateRouteStep
{
@@ -70,9 +70,9 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
if (entity is null)
return Result.Fail<TemplateRouteStepDto>(new NotFoundError("Шаг маршрута", id));
var fieldsError = ValidateFields(r.ExecutorEmail, r.Position, r.ProjectRole, route.ByProject);
if (fieldsError is not null)
return Result.Fail<TemplateRouteStepDto>(fieldsError);
if (!route.ByProject && r.ProjectRole != ProjectRole.None)
return Result.Fail<TemplateRouteStepDto>(new ValidationError(
"Роль в проекте недопустима для шага маршрута, который не учитывает проект (by_project = false)."));
entity.OrderNo = r.OrderNo;
entity.ExecutorEmail = r.ExecutorEmail;
@@ -99,17 +99,6 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
return Result.Ok();
}
private static IError? ValidateFields(string executorEmail, string position, ProjectRole projectRole, bool routeByProject)
{
if (string.IsNullOrWhiteSpace(executorEmail) && string.IsNullOrWhiteSpace(position) && projectRole == ProjectRole.None)
return new ValidationError("Исполнитель, должность и роль в проекте не могут быть пустыми одновременно.");
if (!routeByProject && projectRole != ProjectRole.None)
return new ValidationError("Роль в проекте недопустима для шага маршрута, который не учитывает проект (by_project = false).");
return null;
}
private async Task<Result<TemplateRouteStepDto>> AppendMissingProjectRoleWarningAsync(
TemplateRoute route, Result<TemplateRouteStepDto> result, CancellationToken cancellationToken)
{
backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepValidators.cs
+24
View File
@@ -0,0 +1,24 @@
using FluentValidation;
using Tnsu.ApprovalRoute.Domain.Enums;
namespace Tnsu.ApprovalRoute.Application.TemplateRouteSteps;
public sealed class CreateTemplateRouteStepRequestValidator : AbstractValidator<CreateTemplateRouteStepRequest>
{
public CreateTemplateRouteStepRequestValidator()
{
RuleFor(x => x)
.Must(x => !(string.IsNullOrWhiteSpace(x.ExecutorEmail) && string.IsNullOrWhiteSpace(x.Position) && x.ProjectRole == ProjectRole.None))
.WithMessage("Исполнитель, должность и роль в проекте не могут быть пустыми одновременно.");
}
}
public sealed class UpdateTemplateRouteStepRequestValidator : AbstractValidator<UpdateTemplateRouteStepRequest>
{
public UpdateTemplateRouteStepRequestValidator()
{
RuleFor(x => x)
.Must(x => !(string.IsNullOrWhiteSpace(x.ExecutorEmail) && string.IsNullOrWhiteSpace(x.Position) && x.ProjectRole == ProjectRole.None))
.WithMessage("Исполнитель, должность и роль в проекте не могут быть пустыми одновременно.");
}
}
backend/src/Tnsu.ApprovalRoute.Application/TemplateRoutes/ResolveTemplateRouteDto.cs
+6
View File
@@ -17,3 +17,9 @@ public sealed record ResolveTemplateRouteResultDto(
RouteType RouteType,
bool RequiresControl,
IReadOnlyList<ResolvedRouteStepDto> Steps);
public sealed record ResolveTemplateRouteRequest(
Guid RequestTypeId,
string? UserEmail,
Guid? ProjectId,
RouteStepStatus Status);
backend/src/Tnsu.ApprovalRoute.Application/TemplateRoutes/TemplateRouteService.cs
+11 -21
View File
@@ -39,9 +39,6 @@ public sealed class TemplateRouteService(
public async Task<Result<TemplateRouteDto>> CreateAsync(CreateTemplateRouteRequest r, CancellationToken cancellationToken)
{
if (r.CompanyId == Guid.Empty)
return Result.Fail<TemplateRouteDto>(new ValidationError("Компания обязательна."));
var requestTypeExists = await db.RequestTypes.AnyAsync(x => x.Id == r.RequestTypeId, cancellationToken);
if (!requestTypeExists)
return Result.Fail<TemplateRouteDto>(new NotFoundError("Тип заявки", r.RequestTypeId));
@@ -72,9 +69,6 @@ public sealed class TemplateRouteService(
if (entity is null)
return Result.Fail<TemplateRouteDto>(new NotFoundError("Маршрут", id));
if (r.CompanyId == Guid.Empty)
return Result.Fail<TemplateRouteDto>(new ValidationError("Компания обязательна."));
var duplicate = await HasDuplicateAsync(entity.RequestTypeId, r.DepartmentId, r.CompanyId, r.ByProject, excludeId: entity.Id, cancellationToken);
if (duplicate)
return Result.Fail<TemplateRouteDto>(new ConflictError(
@@ -103,28 +97,24 @@ public sealed class TemplateRouteService(
}
public async Task<Result<ResolveTemplateRouteResultDto>> ResolveAsync(
Guid requestTypeId, string? userEmail, Guid? projectId, RouteStepStatus status, CancellationToken cancellationToken)
ResolveTemplateRouteRequest request, CancellationToken cancellationToken)
{
if (status == RouteStepStatus.None)
return Result.Fail<ResolveTemplateRouteResultDto>(
new ValidationError("Статус обязателен: Approval или Execution."));
var email = string.IsNullOrWhiteSpace(userEmail) ? currentUser.Email : userEmail;
var email = string.IsNullOrWhiteSpace(request.UserEmail) ? currentUser.Email : request.UserEmail;
if (string.IsNullOrWhiteSpace(email))
return Result.Fail<ResolveTemplateRouteResultDto>(
new ValidationError("Не удалось определить email инициатора: не передан явно и отсутствует в токене."));
var requestTypeExists = await db.RequestTypes.AnyAsync(x => x.Id == requestTypeId, cancellationToken);
var requestTypeExists = await db.RequestTypes.AnyAsync(x => x.Id == request.RequestTypeId, cancellationToken);
if (!requestTypeExists)
return Result.Fail<ResolveTemplateRouteResultDto>(new NotFoundError("Тип заявки", requestTypeId));
return Result.Fail<ResolveTemplateRouteResultDto>(new NotFoundError("Тип заявки", request.RequestTypeId));
var employee = await portalClient.GetEmployeeByEmailAsync(email, cancellationToken);
var byProject = projectId is not null;
var byProject = request.ProjectId is not null;
var route = await db.TemplateRoutes.AsNoTracking()
.Include(x => x.Steps)
.Where(x =>
x.RequestTypeId == requestTypeId &&
x.RequestTypeId == request.RequestTypeId &&
x.CompanyId == employee.CompanyId &&
x.ByProject == byProject &&
x.DepartmentId == employee.DepartmentId)
@@ -132,7 +122,7 @@ public sealed class TemplateRouteService(
?? await db.TemplateRoutes.AsNoTracking()
.Include(x => x.Steps)
.Where(x =>
x.RequestTypeId == requestTypeId &&
x.RequestTypeId == request.RequestTypeId &&
x.CompanyId == employee.CompanyId &&
x.ByProject == byProject &&
x.DepartmentId == null)
@@ -141,14 +131,14 @@ public sealed class TemplateRouteService(
if (route is null)
return Result.Fail<ResolveTemplateRouteResultDto>(new NotFoundError(
"Маршрут для этого типа заявки, отдела/компании инициатора и признака «по проекту»",
requestTypeId));
request.RequestTypeId));
IReadOnlyList<ProjectExecutorInfo> projectExecutors = [];
if (projectId is { } id)
projectExecutors = await portalClient.GetProjectExecutorsAsync(id, cancellationToken);
if (request.ProjectId is { } projectId)
projectExecutors = await portalClient.GetProjectExecutorsAsync(projectId, cancellationToken);
var steps = route.Steps
.Where(s => s.Status == status)
.Where(s => s.Status == request.Status)
.OrderBy(s => s.OrderNo)
.Select(s => ResolveStep(s, projectExecutors))
.ToList();
backend/src/Tnsu.ApprovalRoute.Application/TemplateRoutes/TemplateRouteValidators.cs
+28
View File
@@ -0,0 +1,28 @@
using FluentValidation;
using Tnsu.ApprovalRoute.Domain.Enums;
namespace Tnsu.ApprovalRoute.Application.TemplateRoutes;
public sealed class CreateTemplateRouteRequestValidator : AbstractValidator<CreateTemplateRouteRequest>
{
public CreateTemplateRouteRequestValidator()
{
RuleFor(x => x.CompanyId).NotEqual(Guid.Empty).WithMessage("Компания обязательна.");
}
}
public sealed class UpdateTemplateRouteRequestValidator : AbstractValidator<UpdateTemplateRouteRequest>
{
public UpdateTemplateRouteRequestValidator()
{
RuleFor(x => x.CompanyId).NotEqual(Guid.Empty).WithMessage("Компания обязательна.");
}
}
public sealed class ResolveTemplateRouteRequestValidator : AbstractValidator<ResolveTemplateRouteRequest>
{
public ResolveTemplateRouteRequestValidator()
{
RuleFor(x => x.Status).NotEqual(RouteStepStatus.None).WithMessage("Статус обязателен: Approval или Execution.");
}
}
backend/src/Tnsu.ApprovalRoute.Application/Tnsu.ApprovalRoute.Application.csproj
+2
View File
@@ -5,6 +5,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentResults" />
<PackageReference Include="FluentValidation" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
</ItemGroup>
</Project>