From 13d929eb5b8f7fb03cb610be781f15bf8ce1b3dd Mon Sep 17 00:00:00 2001
From: "gorbenko.pavel" <gorbenko.pavel@tansu.kz>
Date: Wed, 29 Jul 2026 10:19:38 +0500
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateRouteStepService.cs               |  3 +++
 .../TemplateRouteStepValidators.cs            |  2 ++
 .../TemplateRouteStepServiceTests.cs          | 21 +++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepService.cs b/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepService.cs
index d43d3a0..44e821f 100644
--- a/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepService.cs
+++ b/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepService.cs
@@ -114,6 +114,9 @@ public sealed class TemplateRouteStepService(ApprovalRouteDbContext db)
         var headType = r.HeadType ?? entity.HeadType;
         var status = r.Status ?? entity.Status;
 
+        if (status == RouteStepStatus.None)
+            return Result.Fail<TemplateRouteStepDto>(new ValidationError("Статус обязателен: Approval или Execution."));
+
         if (!route.ByProject && projectRole is not (null or ProjectRole.None))
             return Result.Fail<TemplateRouteStepDto>(new ValidationError(
                 "Роль в проекте недопустима для шага маршрута, который не учитывает проект (by_project = false)."));
diff --git a/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepValidators.cs b/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepValidators.cs
index 37f1620..89357a5 100644
--- a/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepValidators.cs
+++ b/backend/src/Tnsu.ApprovalRoute.Application/TemplateRouteSteps/TemplateRouteStepValidators.cs
@@ -7,6 +7,7 @@ public sealed class CreateTemplateRouteStepRequestValidator : AbstractValidator<
 {
     public CreateTemplateRouteStepRequestValidator()
     {
+        RuleFor(x => x.Status).NotEqual(RouteStepStatus.None).WithMessage("Статус обязателен: Approval или Execution.");
         RuleFor(x => x)
             .Must(x => TemplateRouteStepFields.CountFilled(x.ExecutorEmail, x.Position, x.ProjectRole, x.HeadType) == 1)
             .WithMessage("Должно быть заполнено ровно одно из полей: исполнитель, должность, роль в проекте или тип руководителя.");
@@ -17,6 +18,7 @@ public sealed class UpdateTemplateRouteStepRequestValidator : AbstractValidator<
 {
     public UpdateTemplateRouteStepRequestValidator()
     {
+        RuleFor(x => x.Status).NotEqual(RouteStepStatus.None).WithMessage("Статус обязателен: Approval или Execution.");
         RuleFor(x => x)
             .Must(x => TemplateRouteStepFields.CountFilled(x.ExecutorEmail, x.Position, x.ProjectRole, x.HeadType) == 1)
             .WithMessage("Должно быть заполнено ровно одно из полей: исполнитель, должность, роль в проекте или тип руководителя.");
diff --git a/backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/TemplateRouteStepServiceTests.cs b/backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/TemplateRouteStepServiceTests.cs
index 02ea273..31daf65 100644
--- a/backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/TemplateRouteStepServiceTests.cs
+++ b/backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/TemplateRouteStepServiceTests.cs
@@ -226,6 +226,27 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         patched.IsFailed.ShouldBeTrue();
     }
 
+    [Fact(DisplayName = "Патч со статусом None возвращает неуспешный результат")]
+    public async Task PatchAsync_StatusNone_ReturnsFailedResult()
+    {
+        // Arrange
+        var routeId = await CreateRouteAsync("Route to patch step status none", byProject: false);
+        var created = await _service.CreateAsync(
+            routeId,
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false),
+            CancellationToken.None);
+
+        // Action
+        var patched = await _service.PatchAsync(
+            routeId,
+            created.Value.Id,
+            new PatchTemplateRouteStepRequest(OrderNo: null, ExecutorEmail: null, Position: null, ProjectRole: null, HeadType: null, Status: RouteStepStatus.None, AllowReassignToOtherApprovers: null),
+            CancellationToken.None);
+
+        // Assert
+        patched.IsFailed.ShouldBeTrue();
+    }
+
     [Fact(DisplayName = "Явные ProjectRole.None и HeadType.None при патче считаются незаполненными, как и null")]
     public async Task PatchAsync_ExplicitNoneValues_TreatedAsUnfilled()
     {