Расширение reminders (#19)

Co-authored-by: gorbenko.pavel <gorbenko.pavel@tansu.kz>
Reviewed-on: http://git.tnsu.kz/gorbenko.pavel/tnsu-approval-route/pulls/19

backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/ReminderDtoTests.cs

@@ -0,0 +1,32 @@
+using Shouldly;
+using Tnsu.ApprovalRoute.Application.Reminders;
+
+namespace Tnsu.ApprovalRoute.IntegrationTests.ApplicationServices;
+
+/// <summary>
+/// ApprovalOverdueReminderDto должен отдавать email получателя под двумя именами
+/// сразу: старым Email (для потребителей, ещё не перешедших на новый контракт) и
+/// унаследованным ReceiverEmail (общим для обоих видов напоминаний, см.
+/// ReminderDto) — так переход на новый контракт можно делать постепенно, не
+/// ломая существующие Power Automate-флоу разом.
+/// </summary>
+public sealed class ReminderDtoTests
+{
+    [Fact(DisplayName = "ApprovalOverdueReminderDto: Email и унаследованный ReceiverEmail — одно и то же значение")]
+    public void ApprovalOverdue_EmailAndReceiverEmail_AreTheSameValue()
+    {
+        var dto = new ApprovalOverdueReminderDto(
+            Email: "approver@tnsu.kz",
+            HoursOverdue: 5,
+            AskOverdueReason: false,
+            RequestTypeId: 1,
+            RequestTypeName: "Тип",
+            RequestId: 10,
+            Status: "На согласовании",
+            RequestUniqueCode: "code",
+            Url: "https://tnsukz.sharepoint.com/sites/requests");
+
+        dto.Email.ShouldBe("approver@tnsu.kz");
+        dto.ReceiverEmail.ShouldBe(dto.Email);
+    }
+}

backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/ReminderServiceTests.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -9,6 +10,7 @@ using Tnsu.ApprovalRoute.Application.Reminders;
 using Tnsu.ApprovalRoute.Application.RequestTypes;
 using Tnsu.ApprovalRoute.Infrastructure.Persistence;
 using Tnsu.ApprovalRoute.Infrastructure.SharePoint;
+using Tnsu.ApprovalRoute.Infrastructure.TnsuPortal;
 using Tnsu.ApprovalRoute.IntegrationTests.Infrastructure;
 
 namespace Tnsu.ApprovalRoute.IntegrationTests.ApplicationServices;
@@ -29,8 +31,28 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
     private const string DataListTitle = "Заявка тест — данные";
     private const string ApprovalListTitle = "Заявка тест — согласование";
 
+    // Своё значение (не то, что по умолчанию в RemindersOptions) — так тест
+    // проверяет, что ссылка действительно берётся из настроек, а не совпадает
+    // с ожидаемой случайно.
+    private const string ProbationReminderUrl = "https://portal.test/новая-заявка";
+
+    // Порог фиксируем в тестах СВОИМ значением, не полагаясь на дефолт из
+    // RemindersOptions: изменение продового порога (3 → 7 дней и далее) не должно
+    // ломать тесты, которые проверяют вовсе не его.
+    private const int ProbationDaysBeforeEnd = 3;
+
     private static readonly DateTimeOffset Now = new(2026, 8, 12, 12, 0, 0, TimeSpan.Zero);
 
+    // GetOverdueAsync/GetProbationEndingAsync по-прежнему берут now параметром — их
+    // тесты ниже дают его напрямую. TimeProvider нужен только там, где ReminderService
+    // сам решает, «сейчас» сколько — то есть в GetRemindersAsync (см. её doc-комментарий).
+    private sealed class FixedTimeProvider(DateTimeOffset now) : TimeProvider
+    {
+        public override DateTimeOffset GetUtcNow() => now;
+    }
+
+    private static readonly TimeProvider Clock = new FixedTimeProvider(Now);
+
     private readonly ServiceProvider _services;
     private readonly RequestTypeService _requestTypeService;
 
@@ -53,6 +75,23 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
         return listUrl;
     }
 
+    // pageUrl отдельным параметром (а не /{name}, как в CreateTypeWithSlaAsync) —
+    // GetProbationEndingAsync ищет тип НЕ по SLA, а именно по PageUrl (см.
+    // RemindersOptions.RecruitingHirePageUrl), и у каждого теста здесь свой
+    // уникальный PageUrl, передаваемый в опции сервиса той же строкой: так тесты
+    // не видят чужие «recruiting-hire»-записи, случайно оставшиеся от других
+    // тестов в общей БД фикстуры.
+    private async Task<(string ListUrl, string PageUrl)> CreateHireTypeAsync(string name)
+    {
+        var listUrl = $"/sites/requests/Lists/{name.Replace(" ", string.Empty)}";
+        var pageUrl = $"/{name.Replace(" ", string.Empty)}";
+        await _requestTypeService.CreateAsync(
+            new CreateRequestTypeRequest(name, pageUrl, listUrl, SiteUrl, "General"),
+            CancellationToken.None);
+
+        return (listUrl, pageUrl);
+    }
+
     private static JsonElement Json(object value) => JsonSerializer.SerializeToElement(value);
 
     private static object Row(
@@ -104,6 +143,8 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
             _services.GetRequiredService<ApprovalRouteDbContext>(),
             sharePoint.Object,
             _services.GetRequiredService<ListPartitionRegistry>(),
+            Mock.Of<ITnsuPortalClient>(),
+            Clock,
             Options.Create(new RemindersOptions()),
             NullLogger<ReminderService>.Instance);
     }
@@ -119,12 +160,38 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
         var result = await service.GetOverdueAsync(Now, CancellationToken.None);
 
         result.IsSuccess.ShouldBeTrue();
-        var reminder = result.Value.ShouldHaveSingleItem();
+        var reminder = result.Value.ShouldHaveSingleItem().ShouldBeOfType<ApprovalOverdueReminderDto>();
         reminder.Email.ShouldBe("approver@tnsu.kz");
         reminder.HoursOverdue.ShouldBe(24);
         reminder.RequestId.ShouldBe(1);
     }
 
+    [Fact(DisplayName = "GetRemindersAsync без feed — обратная совместимость, как ApprovalOverdue")]
+    public async Task GetRemindersAsync_WithoutFeed_BehavesLikeApprovalOverdue()
+    {
+        var listUrl = await CreateTypeWithSlaAsync("Sla feed default", slaHours: 24);
+        var service = BuildService(listUrl,
+            [Row(10, 1, "На согласовании", "Согласование", date: Now.AddHours(-48).ToString("O"))]);
+
+        var result = await service.GetRemindersAsync(CancellationToken.None);
+
+        result.IsSuccess.ShouldBeTrue();
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ApprovalOverdueReminderDto>().HoursOverdue.ShouldBe(24);
+    }
+
+    [Fact(DisplayName = "GetRemindersAsync(feed: ProbationEnding) — просроченные шаги согласования игнорируются")]
+    public async Task GetRemindersAsync_ProbationEndingFeed_IgnoresApprovalOverdue()
+    {
+        var listUrl = await CreateTypeWithSlaAsync("Sla feed probation", slaHours: 24);
+        var service = BuildService(listUrl,
+            [Row(10, 1, "На согласовании", "Согласование", date: Now.AddHours(-48).ToString("O"))]);
+
+        var result = await service.GetRemindersAsync(ReminderFeed.ProbationEnding, CancellationToken.None);
+
+        result.IsSuccess.ShouldBeTrue();
+        result.Value.ShouldBeEmpty();
+    }
+
     [Fact(DisplayName = "Срок ещё не вышел — напоминания нет")]
     public async Task WithinSla_ReturnsNothing()
     {
@@ -153,7 +220,7 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
 
         var result = await service.GetOverdueAsync(Now, CancellationToken.None);
 
-        result.Value.ShouldHaveSingleItem().HoursOverdue.ShouldBe(2);
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ApprovalOverdueReminderDto>().HoursOverdue.ShouldBe(2);
     }
 
     [Fact(DisplayName = "Активная строка без даты (Date пуста) — пропускается, а не падает")]
@@ -179,7 +246,7 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
 
         var result = await service.GetOverdueAsync(Now, CancellationToken.None);
 
-        result.Value.ShouldHaveSingleItem().HoursOverdue.ShouldBe(5);
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ApprovalOverdueReminderDto>().HoursOverdue.ShouldBe(5);
     }
 
     // SharePoint отдаёт Number-колонки ДРОБНЫМИ («1.0», а не «1»), и на этом
@@ -199,7 +266,7 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
 
         var result = await service.GetOverdueAsync(Now, CancellationToken.None);
 
-        result.Value.ShouldHaveSingleItem().HoursOverdue.ShouldBe(5);
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ApprovalOverdueReminderDto>().HoursOverdue.ShouldBe(5);
     }
 
     [Fact(DisplayName = "Флаг опроса причины наследуется от типа заявки, если в строке не задан")]
@@ -211,7 +278,7 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
 
         var result = await service.GetOverdueAsync(Now, CancellationToken.None);
 
-        result.Value.ShouldHaveSingleItem().AskOverdueReason.ShouldBeTrue();
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ApprovalOverdueReminderDto>().AskOverdueReason.ShouldBeTrue();
     }
 
     // Портал — одностраничный и живёт в корне сайта; вид ссылки подтверждён
@@ -256,6 +323,300 @@ public sealed class ReminderServiceTests : IClassFixture<PostgresDatabaseFixture
 
         var result = await service.GetOverdueAsync(Now, CancellationToken.None);
 
-        result.Value.ShouldHaveSingleItem().Email.ShouldBe("approver@tnsu.kz");
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ApprovalOverdueReminderDto>().Email.ShouldBe("approver@tnsu.kz");
+    }
+
+    private static object HireDataRow(
+        int id, string status, string? candidateName, string? hireDate, string? probationPeriod, string? code = null) =>
+        new
+        {
+            Id = id,
+            RequestStatus = status,
+            CandidateName = candidateName,
+            HireDate = hireDate,
+            ProbationPeriod = probationPeriod,
+            RequestUniqueCode = code
+        };
+
+    private ReminderService BuildProbationService(
+        string pageUrl, string listUrl, IReadOnlyList<object> rows, Mock<ITnsuPortalClient> portalClient,
+        int daysBeforeEnd = ProbationDaysBeforeEnd)
+    {
+        const string hireDataListTitle = "Прием на работу тест — данные";
+
+        var sharePoint = new Mock<ISharePointClient>();
+        sharePoint
+            .Setup(x => x.GetListTitleAsync(SiteUrl, listUrl, It.IsAny<CancellationToken>()))
+            .ReturnsAsync(hireDataListTitle);
+
+        // GetProbationEndingAsync читает только «Согласовано»/«Закрыта» — SharePoint
+        // фильтрует это сам ($filter в запросе), мок повторяет ту же фильтрацию.
+        var closedRows = rows
+            .Where(r => (string)r.GetType().GetProperty("RequestStatus")!.GetValue(r)! is "Согласовано" or "Закрыта")
+            .ToList();
+        sharePoint
+            .Setup(x => x.GetItemsByListTitleAsync(
+                SiteUrl, hireDataListTitle, It.Is<string>(q => q.Contains("RequestStatus eq")), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(closedRows.Select(Json).ToList());
+
+        return new ReminderService(
+            _services.GetRequiredService<ApprovalRouteDbContext>(),
+            sharePoint.Object,
+            _services.GetRequiredService<ListPartitionRegistry>(),
+            portalClient.Object,
+            Clock,
+            Options.Create(new RemindersOptions
+            {
+                RecruitingHirePageUrl = pageUrl,
+                ProbationReminderDaysBeforeEnd = daysBeforeEnd,
+                ProbationReminderUrl = ProbationReminderUrl
+            }),
+            NullLogger<ReminderService>.Instance);
+    }
+
+    private static Mock<ITnsuPortalClient> BuildPortalClientMock(
+        string candidateFio, DateTimeOffset? dismissalDate, string? candidateEmail, string? managerEmail)
+    {
+        var portalClient = new Mock<ITnsuPortalClient>();
+
+        portalClient
+            .Setup(x => x.GetFullBaseAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync([new EmployeeFullBaseInfo(Guid.NewGuid(), candidateFio, "ТОО TANSU", dismissalDate)]);
+
+        portalClient
+            .Setup(x => x.GetAllEmployeesAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync([new EmployeeContactInfo(Guid.NewGuid(), candidateFio, candidateEmail, "ТОО TANSU")]);
+
+        if (candidateEmail is not null)
+            portalClient
+                .Setup(x => x.GetManagerAsync(candidateEmail, "chief", It.IsAny<CancellationToken>()))
+                .ReturnsAsync(managerEmail);
+
+        return portalClient;
+    }
+
+    [Fact(DisplayName = "До конца испытательного срока 3 дня — напоминание с email кандидата и его руководителя")]
+    public async Task ProbationEndingIn3Days_BuildsReminder()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation due");
+        // probationEndsAt = Now.Date + 3 дня = 2026-08-15; "2 месяца" от 2026-06-15.
+        var rows = new[] { HireDataRow(1, "Закрыта", "Иванов Иван Иванович", "2026-06-15T00:00:00Z", "2 месяца") };
+        var portalClient = BuildPortalClientMock(
+            "Иванов Иван Иванович", dismissalDate: null, candidateEmail: "candidate@tnsu.kz", managerEmail: "manager@tnsu.kz");
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.IsSuccess.ShouldBeTrue();
+        var reminder = result.Value.ShouldHaveSingleItem().ShouldBeOfType<ProbationEndingReminderDto>();
+        reminder.ReceiverEmail.ShouldBe("manager@tnsu.kz");
+        reminder.CandidateEmail.ShouldBe("candidate@tnsu.kz");
+        reminder.CandidateName.ShouldBe("Иванов Иван Иванович");
+        reminder.DaysUntilProbationEnds.ShouldBe(3);
+        // Ссылка ведёт не на саму заявку на приём, а на раздел, где заводят новую
+        // (константа из настроек, см. RemindersOptions.ProbationReminderUrl).
+        reminder.Url.ShouldBe(ProbationReminderUrl);
+    }
+
+    [Fact(DisplayName = "Кандидат уже уволен (dismissalDate заполнен) — напоминания нет")]
+    public async Task DismissedCandidate_IsSkipped()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation dismissed");
+        var rows = new[] { HireDataRow(1, "Закрыта", "Петров Пётр Петрович", "2026-06-15T00:00:00Z", "2 месяца") };
+        var portalClient = BuildPortalClientMock(
+            "Петров Пётр Петрович", dismissalDate: Now.AddDays(-1), candidateEmail: "petrov@tnsu.kz", managerEmail: "manager@tnsu.kz");
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.Value.ShouldBeEmpty();
+    }
+
+    // Сотрудник холдинга может числиться в нескольких компаниях сразу (см.
+    // /Employee/FullBase — по записи на компанию). Увольнение из одной из них не
+    // означает, что человек ушёл: пока хоть где-то дата увольнения не стоит, он
+    // работает, и напоминание ему по-прежнему нужно.
+    [Fact(DisplayName = "Уволен из одной компании, но работает в другой — напоминание есть")]
+    public async Task DismissedFromOneCompanyOnly_StillBuildsReminder()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation partly dismissed");
+        const string fio = "Романов Роман Романович";
+        var rows = new[] { HireDataRow(1, "Закрыта", fio, "2026-06-15T00:00:00Z", "2 месяца") };
+
+        var portalClient = new Mock<ITnsuPortalClient>();
+        portalClient
+            .Setup(x => x.GetFullBaseAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync(
+            [
+                new EmployeeFullBaseInfo(Guid.NewGuid(), fio, "ТОО АСТЕЛ-К", Now.AddDays(-10)),
+                new EmployeeFullBaseInfo(Guid.NewGuid(), fio, "ТОО TANSU Construction", null)
+            ]);
+        portalClient
+            .Setup(x => x.GetAllEmployeesAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync([new EmployeeContactInfo(Guid.NewGuid(), fio, "romanov@tnsu.kz", "ТОО TANSU Construction")]);
+        portalClient
+            .Setup(x => x.GetManagerAsync("romanov@tnsu.kz", "chief", It.IsAny<CancellationToken>()))
+            .ReturnsAsync("manager@tnsu.kz");
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ProbationEndingReminderDto>().CandidateEmail.ShouldBe("romanov@tnsu.kz");
+    }
+
+    // ФИО в заявке набирают руками — лишние пробелы и другой регистр не должны
+    // ломать сопоставление со справочником (см. EmployeeDirectorySnapshot.Normalize).
+    [Fact(DisplayName = "ФИО сопоставляется без учёта регистра и лишних пробелов")]
+    public async Task CandidateName_IsMatchedLoosely()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation fio normalize");
+        var rows = new[] { HireDataRow(1, "Закрыта", "  волков   ВОЛК волкович ", "2026-06-15T00:00:00Z", "2 месяца") };
+        var portalClient = BuildPortalClientMock(
+            "Волков Волк Волкович", dismissalDate: null, candidateEmail: "volkov@tnsu.kz", managerEmail: "manager@tnsu.kz");
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ProbationEndingReminderDto>().CandidateEmail.ShouldBe("volkov@tnsu.kz");
+    }
+
+    [Fact(DisplayName = "Кандидат не найден в /Employee/FullBase — напоминания нет")]
+    public async Task CandidateNotInFullBase_IsSkipped()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation unknown");
+        var rows = new[] { HireDataRow(1, "Закрыта", "Сидоров Сидор Сидорович", "2026-06-15T00:00:00Z", "2 месяца") };
+        var portalClient = new Mock<ITnsuPortalClient>();
+        portalClient.Setup(x => x.GetFullBaseAsync(It.IsAny<CancellationToken>())).ReturnsAsync([]);
+        portalClient.Setup(x => x.GetAllEmployeesAsync(It.IsAny<CancellationToken>())).ReturnsAsync([]);
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.Value.ShouldBeEmpty();
+    }
+
+    [Fact(DisplayName = "До конца испытательного срока не ровно 3 дня — напоминания нет")]
+    public async Task NotExactlyThreeDaysLeft_IsSkipped()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation not due");
+        // "1 месяц" от 2026-06-15 → срок кончился 2026-07-15, задолго до Now.
+        var rows = new[] { HireDataRow(1, "Закрыта", "Кузнецов Кузьма Кузьмич", "2026-06-15T00:00:00Z", "1 месяц") };
+        var portalClient = BuildPortalClientMock(
+            "Кузнецов Кузьма Кузьмич", dismissalDate: null, candidateEmail: "kuznecov@tnsu.kz", managerEmail: "manager@tnsu.kz");
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.Value.ShouldBeEmpty();
+    }
+
+    [Fact(DisplayName = "«Без испытательного срока» — напоминания нет")]
+    public async Task NoProbationPeriod_IsSkipped()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation none");
+        var rows = new[]
+        {
+            HireDataRow(1, "Закрыта", "Смирнов Смирн Смирнович", "2026-06-15T00:00:00Z", "Без испытательного срока")
+        };
+        var portalClient = BuildPortalClientMock(
+            "Смирнов Смирн Смирнович", dismissalDate: null, candidateEmail: "smirnov@tnsu.kz", managerEmail: "manager@tnsu.kz");
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.Value.ShouldBeEmpty();
+    }
+
+    // Портал пишет дату приёма как МЕСТНУЮ полночь, переведённую в UTC, поэтому в
+    // списке она лежит как 19:00Z предыдущего дня. Здесь 2026-06-14T19:00Z — это
+    // 15 июня по местному календарю (см. LocalOffset в ReminderService): срок
+    // истекает 15 августа, до него от Now (12 августа) ровно 3 дня.
+    // Если считать по UTC, дата приёма превратилась бы в 14 июня, срок — в 14
+    // августа, и осталось бы 2 дня: напоминание не построилось бы вовсе.
+    [Fact(DisplayName = "Дата приёма считается по местному календарю, а не по UTC")]
+    public async Task HireDate_IsReadInLocalTimeZone()
+    {
+        var (listUrl, pageUrl) = await CreateHireTypeAsync("Probation timezone");
+        var rows = new[] { HireDataRow(1, "Закрыта", "Тимуров Тимур Тимурович", "2026-06-14T19:00:00Z", "2 месяца") };
+        var portalClient = BuildPortalClientMock(
+            "Тимуров Тимур Тимурович", dismissalDate: null, candidateEmail: "timurov@tnsu.kz", managerEmail: "manager@tnsu.kz");
+
+        var service = BuildProbationService(pageUrl, listUrl, rows, portalClient);
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        var reminder = result.Value.ShouldHaveSingleItem().ShouldBeOfType<ProbationEndingReminderDto>();
+        reminder.DaysUntilProbationEnds.ShouldBe(3);
+        // И дата приёма, и конец срока отдаются в том же местном календаре.
+        reminder.HireDate.Date.ShouldBe(new DateTime(2026, 6, 15));
+        reminder.ProbationEndsAt.Date.ShouldBe(new DateTime(2026, 8, 15));
+    }
+
+    // Испытательный срок не бывает длиннее 6 месяцев (см. ProbationMonthsByOption
+    // в ReminderService), поэтому заявка, способная дать напоминание сегодня,
+    // физически не может лежать раньше предпоследней партиции. Три партиции:
+    // самая старая (№1) содержит строку-ловушку — если сервис её прочитает, тест
+    // это увидит по лишнему напоминанию; предпоследняя (№2) и текущая (№3)
+    // читаются как обычно.
+    [Fact(DisplayName = "Читаются только текущая и последняя архивная партиция — более старые игнорируются")]
+    public async Task OnlyLastTwoPartitions_AreRead()
+    {
+        var (listUrl1, pageUrl) = await CreateHireTypeAsync("Probation partitions");
+        var db = _services.GetRequiredService<ApprovalRouteDbContext>();
+        var partitionRegistry = _services.GetRequiredService<ListPartitionRegistry>();
+        var type = await db.RequestTypes.FirstAsync(x => x.PageUrl == pageUrl);
+
+        // Партиция №1 — уедет в архив первой, её строки читаться не должны.
+        await partitionRegistry.ArchiveCurrentAsync(type, CancellationToken.None);
+        var listUrl2 = listUrl1 + "-2";
+        type.ListId = listUrl2;
+        await db.SaveChangesAsync();
+
+        // Партиция №2 — последняя архивная, должна читаться наравне с текущей.
+        await partitionRegistry.ArchiveCurrentAsync(type, CancellationToken.None);
+        var listUrl3 = listUrl1 + "-3";
+        type.ListId = listUrl3;
+        await db.SaveChangesAsync();
+
+        const string fio = "Партиция Тест Тестович";
+        var trapRow = HireDataRow(1, "Закрыта", fio, "2026-06-15T00:00:00Z", "2 месяца");
+        var realRow = HireDataRow(2, "Закрыта", fio, "2026-06-15T00:00:00Z", "2 месяца");
+
+        var sharePoint = new Mock<ISharePointClient>();
+        sharePoint.Setup(x => x.GetListTitleAsync(SiteUrl, listUrl1, It.IsAny<CancellationToken>())).ReturnsAsync("list1 — данные");
+        sharePoint.Setup(x => x.GetListTitleAsync(SiteUrl, listUrl2, It.IsAny<CancellationToken>())).ReturnsAsync("list2 — данные");
+        sharePoint.Setup(x => x.GetListTitleAsync(SiteUrl, listUrl3, It.IsAny<CancellationToken>())).ReturnsAsync("list3 — данные");
+        sharePoint
+            .Setup(x => x.GetItemsByListTitleAsync(SiteUrl, "list1 — данные", It.IsAny<string>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync([Json(trapRow)]);
+        sharePoint
+            .Setup(x => x.GetItemsByListTitleAsync(SiteUrl, "list2 — данные", It.IsAny<string>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync([Json(realRow)]);
+        sharePoint
+            .Setup(x => x.GetItemsByListTitleAsync(SiteUrl, "list3 — данные", It.IsAny<string>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync([]);
+
+        var portalClient = BuildPortalClientMock(
+            fio, dismissalDate: null, candidateEmail: "partition@tnsu.kz", managerEmail: "manager@tnsu.kz");
+
+        var service = new ReminderService(
+            db, sharePoint.Object, partitionRegistry, portalClient.Object, Clock,
+            // Порог задан явно (как и в BuildProbationService): тест про партиции, а
+            // не про то, сколько дней до конца срока настроено в проде.
+            Options.Create(new RemindersOptions
+            {
+                RecruitingHirePageUrl = pageUrl,
+                ProbationReminderUrl = ProbationReminderUrl,
+                ProbationReminderDaysBeforeEnd = ProbationDaysBeforeEnd
+            }),
+            NullLogger<ReminderService>.Instance);
+
+        var result = await service.GetProbationEndingAsync(Now, CancellationToken.None);
+
+        result.IsSuccess.ShouldBeTrue();
+        result.Value.ShouldHaveSingleItem().ShouldBeOfType<ProbationEndingReminderDto>()
+            .CandidateEmail.ShouldBe("partition@tnsu.kz");
+        sharePoint.Verify(
+            x => x.GetItemsByListTitleAsync(SiteUrl, "list1 — данные", It.IsAny<string>(), It.IsAny<CancellationToken>()),
+            Times.Never);
     }
 }

backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/TemplateRouteServiceTests.cs

@@ -169,7 +169,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, "approver@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "approver@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -206,7 +206,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         await stepService.CreateAsync(
             route.Value.Id,
             new CreateTemplateRouteStepRequest(
-                1, "approver@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null,
+                1, "approver@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And,
                 SlaHours: stepSla, AskOverdueReason: stepAsk),
             CancellationToken.None);
 
@@ -285,15 +285,15 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
 
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, "dup@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "dup@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(2, "other@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(2, "other@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(3, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(3, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -342,11 +342,11 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
 
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.DirectionHead, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.DirectionHead, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -377,7 +377,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action — departmentId в запросе не передан
@@ -419,7 +419,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -459,7 +459,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -488,7 +488,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, "big-amount@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, "big-amount@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -515,11 +515,11 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, "big-amount@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, "big-amount@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(2, "always@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(2, "always@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -546,7 +546,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, "big-amount@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, "big-amount@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action — fieldValues не переданы вовсе
@@ -571,7 +571,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, "urgent@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Priority", ComparisonOperator.Equal, "Urgent") }),
+            new CreateTemplateRouteStepRequest(1, "urgent@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Priority", ComparisonOperator.Equal, "Urgent") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -605,7 +605,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, "text-condition@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Priority", operation, expected) }),
+            new CreateTemplateRouteStepRequest(1, "text-condition@tnsu.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Priority", operation, expected) }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -672,7 +672,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, ProjectRole.ProjectManager, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, ProjectRole.ProjectManager, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -710,7 +710,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, "Lead", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, "Lead", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -749,7 +749,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -785,7 +785,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DirectorTansu, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DirectorTansu, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -832,7 +832,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(5, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(5, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -883,7 +883,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -949,7 +949,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -998,11 +998,11 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(5, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(5, null, null, null, HeadType.CompanyDirectors, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(10, null, null, null, HeadType.DirectorTansu, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(10, null, null, null, HeadType.DirectorTansu, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action — тестовая конфигурация не переопределяет TnsuPortal:DirectorTansuEmail,
@@ -1036,7 +1036,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -1065,7 +1065,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, "Несуществующая должность", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, "Несуществующая должность", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -1094,7 +1094,7 @@ public sealed class TemplateRouteServiceTests : IClassFixture<PostgresDatabaseFi
         var stepService = _services.GetRequiredService<TemplateRouteStepService>();
         await stepService.CreateAsync(
             route.Value.Id,
-            new CreateTemplateRouteStepRequest(1, null, null, ProjectRole.Security, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, ProjectRole.Security, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action

backend/tests/Tnsu.ApprovalRoute.IntegrationTests/ApplicationServices/TemplateRouteStepServiceTests.cs

@@ -43,7 +43,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var result = await _service.CreateAsync(
             999999,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -59,7 +59,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var result = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", ProjectRole.ProjectManager, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", ProjectRole.ProjectManager, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -71,14 +71,14 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
     {
         // Arrange
         var routeId = await CreateRouteAsync("Route with duplicate step", byProject: false);
-        var request = new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, HeadType.Chief, RouteStepStatus.Approval, false, null);
+        var request = new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And);
         var first = await _service.CreateAsync(routeId, request, CancellationToken.None);
         first.IsSuccess.ShouldBeTrue();
 
         // Action
         var duplicate = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(2, "a@b.kz", "Engineer", null, HeadType.Chief, RouteStepStatus.Approval, true, null),
+            new CreateTemplateRouteStepRequest(2, "a@b.kz", "Engineer", null, HeadType.Chief, RouteStepStatus.Approval, true, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -153,14 +153,14 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route with duplicate head type", byProject: false);
         var first = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         first.IsSuccess.ShouldBeTrue();
 
         // Action — другой статус (Execution вместо Approval), но тот же HeadType.Chief
         var second = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.Chief, RouteStepStatus.Execution, true, null),
+            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.Chief, RouteStepStatus.Execution, true, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -174,14 +174,14 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route with duplicate department head", byProject: false);
         var first = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         first.IsSuccess.ShouldBeTrue();
 
         // Action
         var second = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Execution, false, null),
+            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.DepartmentHead, RouteStepStatus.Execution, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -197,11 +197,11 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var chief = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         var directorTansu = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.DirectorTansu, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.DirectorTansu, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -219,11 +219,11 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var small = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.LessThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.LessThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
         var big = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -240,11 +240,11 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var small = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.LessThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.LessThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
         var big = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(2, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(2, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -259,14 +259,14 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route with head type same condition", byProject: false, listName: "Requests");
         var first = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
         first.IsSuccess.ShouldBeTrue();
 
         // Action — то же условие, другой статус
         var second = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.Chief, RouteStepStatus.Execution, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(2, null, null, null, HeadType.Chief, RouteStepStatus.Execution, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -280,14 +280,14 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route to update head type on itself", byProject: false);
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action — HasDuplicateHeadTypeAsync должен исключать сам обновляемый шаг (excludeId)
         var updated = await _service.UpdateAsync(
             routeId,
             created.Value.Id,
-            new UpdateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Execution, true, null),
+            new UpdateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Execution, true, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -303,7 +303,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -321,7 +321,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -341,7 +341,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -359,7 +359,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "", "", ProjectRole.ProjectManager, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "", "", ProjectRole.ProjectManager, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -374,14 +374,14 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route to update step", byProject: false);
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
         var updated = await _service.UpdateAsync(
             routeId,
             created.Value.Id,
-            new UpdateTemplateRouteStepRequest(2, "b@b.kz", "Senior Engineer", null, HeadType.Chief, RouteStepStatus.Execution, true, null),
+            new UpdateTemplateRouteStepRequest(2, "b@b.kz", "Senior Engineer", null, HeadType.Chief, RouteStepStatus.Execution, true, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -398,7 +398,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route to patch step", byProject: false);
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -422,7 +422,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route to patch step into conflict", byProject: false);
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, null, null, null, HeadType.Chief, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -443,7 +443,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         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, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -457,6 +457,12 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         patched.IsFailed.ShouldBeTrue();
     }
 
+    // ConditionsLogic здесь всюду передаётся явно, потому что он обязателен: у
+    // Create/Update-запроса значения по умолчанию нет вовсе, а пропущенное в JSON
+    // поле превращается в ConditionsLogic.None и отвергается валидатором на слое
+    // API (TemplateRouteStepValidators + ValidationActionFilter). Отдельным тестом
+    // это не покрыто — сервис валидаторы не вызывает.
+
     [Fact(DisplayName = "Явные ProjectRole.None и HeadType.None при патче считаются незаполненными, как и null")]
     public async Task PatchAsync_ExplicitNoneValues_TreatedAsUnfilled()
     {
@@ -464,7 +470,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route with explicit None values on patch", byProject: false);
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", null, null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -489,7 +495,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var result = await _service.CreateAsync(
             routeId,
             new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false,
-                new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "") }),
+                new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -505,7 +511,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var result = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -521,7 +527,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         // Action
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, new[] { new RouteStepConditionDto("Amount", ComparisonOperator.GreaterThan, "1000") }, ConditionsLogic.And),
             CancellationToken.None);
 
         // Assert
@@ -539,7 +545,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route to patch condition into conflict", byProject: false, listName: "Requests");
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -560,7 +566,7 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeId = await CreateRouteAsync("Route to delete step", byProject: false);
         var created = await _service.CreateAsync(
             routeId,
-            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "a@b.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action
@@ -581,16 +587,16 @@ public sealed class TemplateRouteStepServiceTests : IClassFixture<PostgresDataba
         var routeBId = await CreateRouteAsync("Route B for executor search", byProject: false);
         await _service.CreateAsync(
             routeAId,
-            new CreateTemplateRouteStepRequest(1, "Target@Example.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(1, "Target@Example.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
         await _service.CreateAsync(
             routeBId,
-            new CreateTemplateRouteStepRequest(1, "target@example.kz", "Manager", null, null, RouteStepStatus.Execution, false, null),
+            new CreateTemplateRouteStepRequest(1, "target@example.kz", "Manager", null, null, RouteStepStatus.Execution, false, null, ConditionsLogic.And),
             CancellationToken.None);
         // Другой исполнитель — не должен попасть в выдачу.
         await _service.CreateAsync(
             routeAId,
-            new CreateTemplateRouteStepRequest(2, "other@example.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null),
+            new CreateTemplateRouteStepRequest(2, "other@example.kz", "Engineer", null, null, RouteStepStatus.Approval, false, null, ConditionsLogic.And),
             CancellationToken.None);
 
         // Action