добавлены новые поля

2026-07-31 11:54:16 +05:00
parent ea2599732c
commit fdd3787e43
16 changed files with 556 additions and 62 deletions
@@ -15,7 +15,8 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
            .Where(x => x.RouteId == routeId)
            .OrderBy(x => x.OrderNo)
            .Select(x => new TemplateRouteStepDto(
-                x.Id, x.OrderNo, x.ExecutorEmail, x.Position, x.ProjectRole, x.HeadType, x.Status, x.RouteId, x.AllowReassignToOtherApprovers))
+                x.Id, x.OrderNo, x.ExecutorEmail, x.Position, x.ProjectRole, x.HeadType, x.Status, x.RouteId, x.AllowReassignToOtherApprovers,
+                x.FieldName, x.Operation, x.Value))
            .ToListAsync(cancellationToken);

        return Result.Ok<IReadOnlyList<TemplateRouteStepDto>>(items);
@@ -33,7 +34,7 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)

    public async Task<Result<TemplateRouteStepDto>> CreateAsync(int routeId, CreateTemplateRouteStepRequest r, CancellationToken cancellationToken)
    {
-        var route = await db.TemplateRoutes.FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
+        var route = await db.TemplateRoutes.Include(x => x.RequestType).FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
        if (route is null)
            return Result.Fail<TemplateRouteStepDto>(new NotFoundError("Маршрут", routeId));

@@ -41,6 +42,14 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
                "Роль в проекте недопустима для шага маршрута, который не учитывает проект (by_project = false)."));

+        if (!TemplateRouteStepFields.IsConditionValid(r.FieldName, r.Operation, r.Value))
+            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
+                "Поля условия (field_name, operation, value) должны быть заполнены все вместе или не заполнены вовсе."));
+
+        if (RequiresListName(r.FieldName, r.Operation, r.Value) && string.IsNullOrWhiteSpace(route.RequestType?.ListName))
+            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
+                "Поля условия (field_name, operation, value) можно указывать только если у типа заявки указано имя списка (list_name)."));
+
        var duplicate = await HasDuplicateAsync(
            route.Id, r.ExecutorEmail, r.Position, r.ProjectRole, r.HeadType, r.Status, excludeId: null, cancellationToken);
        if (duplicate)
@@ -56,7 +65,10 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
            ProjectRole = r.ProjectRole,
            HeadType = r.HeadType,
            Status = r.Status,
-            AllowReassignToOtherApprovers = r.AllowReassignToOtherApprovers
+            AllowReassignToOtherApprovers = r.AllowReassignToOtherApprovers,
+            FieldName = r.FieldName,
+            Operation = r.Operation,
+            Value = r.Value
        };
        db.TemplateRouteSteps.Add(entity);
        await db.SaveChangesAsync(cancellationToken);
@@ -67,7 +79,7 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
    public async Task<Result<TemplateRouteStepDto>> UpdateAsync(
        int routeId, int id, UpdateTemplateRouteStepRequest r, CancellationToken cancellationToken)
    {
-        var route = await db.TemplateRoutes.FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
+        var route = await db.TemplateRoutes.Include(x => x.RequestType).FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
        if (route is null)
            return Result.Fail<TemplateRouteStepDto>(new NotFoundError("Маршрут", routeId));

@@ -79,6 +91,14 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
                "Роль в проекте недопустима для шага маршрута, который не учитывает проект (by_project = false)."));

+        if (!TemplateRouteStepFields.IsConditionValid(r.FieldName, r.Operation, r.Value))
+            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
+                "Поля условия (field_name, operation, value) должны быть заполнены все вместе или не заполнены вовсе."));
+
+        if (RequiresListName(r.FieldName, r.Operation, r.Value) && string.IsNullOrWhiteSpace(route.RequestType?.ListName))
+            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
+                "Поля условия (field_name, operation, value) можно указывать только если у типа заявки указано имя списка (list_name)."));
+
        var duplicate = await HasDuplicateAsync(
            route.Id, r.ExecutorEmail, r.Position, r.ProjectRole, r.HeadType, r.Status, excludeId: entity.Id, cancellationToken);
        if (duplicate)
@@ -92,6 +112,9 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
        entity.HeadType = r.HeadType;
        entity.Status = r.Status;
        entity.AllowReassignToOtherApprovers = r.AllowReassignToOtherApprovers;
+        entity.FieldName = r.FieldName;
+        entity.Operation = r.Operation;
+        entity.Value = r.Value;
        await db.SaveChangesAsync(cancellationToken);

        return Result.Ok(await ToDtoWithWarningAsync(entity, route, cancellationToken));
@@ -100,7 +123,7 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
    public async Task<Result<TemplateRouteStepDto>> PatchAsync(
        int routeId, int id, PatchTemplateRouteStepRequest r, CancellationToken cancellationToken)
    {
-        var route = await db.TemplateRoutes.FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
+        var route = await db.TemplateRoutes.Include(x => x.RequestType).FirstOrDefaultAsync(x => x.Id == routeId, cancellationToken);
        if (route is null)
            return Result.Fail<TemplateRouteStepDto>(new NotFoundError("Маршрут", routeId));

@@ -113,6 +136,9 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
        var projectRole = r.ProjectRole ?? entity.ProjectRole;
        var headType = r.HeadType ?? entity.HeadType;
        var status = r.Status ?? entity.Status;
+        var fieldName = r.FieldName ?? entity.FieldName;
+        var operation = r.Operation ?? entity.Operation;
+        var value = r.Value ?? entity.Value;

        if (status == RouteStepStatus.None)
            return Result.Fail<TemplateRouteStepDto>(new ValidationError("Статус обязателен: Approval или Execution."));
@@ -125,6 +151,14 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
                "Должно быть заполнено ровно одно из полей: исполнитель, должность, роль в проекте или тип руководителя."));

+        if (!TemplateRouteStepFields.IsConditionValid(fieldName, operation, value))
+            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
+                "Поля условия (field_name, operation, value) должны быть заполнены все вместе или не заполнены вовсе."));
+
+        if (RequiresListName(fieldName, operation, value) && string.IsNullOrWhiteSpace(route.RequestType?.ListName))
+            return Result.Fail<TemplateRouteStepDto>(new ValidationError(
+                "Поля условия (field_name, operation, value) можно указывать только если у типа заявки указано имя списка (list_name)."));
+
        var duplicate = await HasDuplicateAsync(
            route.Id, executorEmail, position, projectRole, headType, status, excludeId: entity.Id, cancellationToken);
        if (duplicate)
@@ -138,6 +172,9 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
        entity.HeadType = headType;
        entity.Status = status;
        entity.AllowReassignToOtherApprovers = r.AllowReassignToOtherApprovers ?? entity.AllowReassignToOtherApprovers;
+        entity.FieldName = fieldName;
+        entity.Operation = operation;
+        entity.Value = value;
        await db.SaveChangesAsync(cancellationToken);

        return Result.Ok(await ToDtoWithWarningAsync(entity, route, cancellationToken));
@@ -155,6 +192,9 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
        return Result.Ok();
    }

+    private static bool RequiresListName(string? fieldName, ComparisonOperator? operation, string? value) =>
+        TemplateRouteStepFields.CountConditionFilled(fieldName, operation, value) > 0;
+
    private Task<bool> HasDuplicateAsync(
        int routeId, string? executorEmail, string? position, ProjectRole? projectRole, HeadType? headType,
        RouteStepStatus status, int? excludeId, CancellationToken cancellationToken) =>
@@ -184,5 +224,6 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
    }

    private static TemplateRouteStepDto ToDto(TemplateRouteStep e) => new(
-        e.Id, e.OrderNo, e.ExecutorEmail, e.Position, e.ProjectRole, e.HeadType, e.Status, e.RouteId, e.AllowReassignToOtherApprovers);
+        e.Id, e.OrderNo, e.ExecutorEmail, e.Position, e.ProjectRole, e.HeadType, e.Status, e.RouteId, e.AllowReassignToOtherApprovers,
+        e.FieldName, e.Operation, e.Value);
 }