feat(bll,dal,common): в common - DateResolver - проверка даты на текущие сутки относительно часового пояса МСК. Dal - EsppScheduleTransformService - рассчет NextRun с учетом выходных дней

2024-09-18 16:32:45 +10:00
parent 9987626478
commit 60c0ba9ec8
24 changed files with 181 additions and 29 deletions
--- a/PARR.AIHITLoaderWorker/Dockerfile
+++ b/PARR.AIHITLoaderWorker/Dockerfile
@@ -10,6 +10,7 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj", "PARR.AIHITLoaderWorker/"]
 COPY ["PARR.AIHITLoader/PARR.AIHITLoader.csproj", "PARR.AIHITLoader/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "./PARR.AIHITLoaderWorker/./PARR.AIHITLoaderWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.AIHITLoaderWorker"
--- a/PARR.AIHITSyncerWorker/Dockerfile
+++ b/PARR.AIHITSyncerWorker/Dockerfile
@@ -12,6 +12,7 @@ COPY ["PARR.AIHITSyncer/PARR.AIHITSyncer.csproj", "PARR.AIHITSyncer/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "./PARR.AIHITSyncerWorker/./PARR.AIHITSyncerWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.AIHITSyncerWorker"
--- a/PARR.API.sln
+++ b/PARR.API.sln
@@ -76,9 +76,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.TemplateActivator", "P
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.TemplateActivatorWorker", "PARR.TemplateActivatorWorker\PARR.TemplateActivatorWorker.csproj", "{97E096AA-26F3-417A-A969-381464F4EF43}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.JobAutoControlWorker", "PARR.JobAutoControlWorker\PARR.JobAutoControlWorker.csproj", "{EFDC0833-E79C-476B-BF91-58E8778EA2E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.JobAutoControlWorker", "PARR.JobAutoControlWorker\PARR.JobAutoControlWorker.csproj", "{EFDC0833-E79C-476B-BF91-58E8778EA2E2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.JobAutoControl", "PARR.JobAutoControl\PARR.JobAutoControl.csproj", "{2C35CCD5-6DCD-4640-98DA-D2DC11CE3BA5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.JobAutoControl", "PARR.JobAutoControl\PARR.JobAutoControl.csproj", "{2C35CCD5-6DCD-4640-98DA-D2DC11CE3BA5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.Common", "PARR.Common\PARR.Common.csproj", "{5C89E990-6E49-4897-8344-1AC3ECFBD869}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -220,6 +222,10 @@ Global
 		{2C35CCD5-6DCD-4640-98DA-D2DC11CE3BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C35CCD5-6DCD-4640-98DA-D2DC11CE3BA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C35CCD5-6DCD-4640-98DA-D2DC11CE3BA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C89E990-6E49-4897-8344-1AC3ECFBD869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C89E990-6E49-4897-8344-1AC3ECFBD869}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C89E990-6E49-4897-8344-1AC3ECFBD869}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C89E990-6E49-4897-8344-1AC3ECFBD869}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/PARR.API/Contracts/V1/ApiRoutes.cs
+++ b/PARR.API/Contracts/V1/ApiRoutes.cs
@@ -55,6 +55,8 @@

            public const string IsWorkDay = Base + "/tests/is-work-day/";

+            public const string GetWorkDay = Base + "/tests/get-work-day/{date}";
+
            public const string paramDate = "{lastRunDate}";
            public const string paramApplicationInWorkId = "{applicationInWorkId}";
        }
--- a/PARR.API/Controllers/V1/TestController.cs
+++ b/PARR.API/Controllers/V1/TestController.cs
@@ -103,6 +103,15 @@ namespace PARR.API.Controllers.V1
        }


+        //[HttpGet(ApiRoutes.Test.GetWorkDay)]
+        //public async Task<IActionResult> GetWorkDay([FromRoute] DateTimeOffset date)
+        //{
+        //    var result = await esppScheduleTransformService.GetWorkDayAsync(date);
+
+        //    return Ok(result);
+        //}
+
+
    }

    public class CaheRequestTest
--- a/PARR.API/Dockerfile
+++ b/PARR.API/Dockerfile
@@ -12,6 +12,7 @@ COPY ["CHANGELOG.md", "PARR.API/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "PARR.API/PARR.API.csproj"
 COPY . .
 WORKDIR "/src/PARR.API"
--- a/PARR.BLL/PARR.BLL.csproj
+++ b/PARR.BLL/PARR.BLL.csproj
@@ -16,6 +16,7 @@
  </ItemGroup>

  <ItemGroup>
+    <ProjectReference Include="..\PARR.Common\PARR.Common.csproj" />
    <ProjectReference Include="..\PARR.Constants\PARR.Constants.csproj" />
  </ItemGroup>

--- a/PARR.BLL/Services/Implementations/CalendarService.cs
+++ b/PARR.BLL/Services/Implementations/CalendarService.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Logging;
 using PARR.BLL.Services.Interfaces;
+using PARR.Common;
 using PARR.Constants;

 namespace PARR.BLL.Services.Implementations
@@ -76,7 +77,8 @@ namespace PARR.BLL.Services.Implementations

            //Так как в базе всё храним в UTC то время с 21 часа уже соответствует следующими суткам в календаре Москвы
            //просто сдвигаем на день весь список
-            if (refTime.Hour > 21)
+            //if (refTime.Hour > 21)
+            if (DateResolver.IsCurrentDayRelativeMskTime(refTime.Hour) == false)
                return workDays.Select(wd => wd.AddDays(-1)).ToList();

            //иначе просто отдаём как есть
@@ -84,6 +86,8 @@ namespace PARR.BLL.Services.Implementations
        }


+
+
        /// <summary>
        /// Возвращает список дней между датами
        /// </summary>
--- a/PARR.Common/DateResolver.cs
+++ b/PARR.Common/DateResolver.cs
@@ -0,0 +1,34 @@
+namespace PARR.Common
+{
+    /// <summary>
+    /// Даты и часовые пояса 
+    /// </summary>
+    public static class DateResolver
+    {
+        /// <summary>
+        /// Это текущий день относительно часовой зоны МСК? Да - текущий, нет - следующий день.
+        /// </summary>
+        /// <param name="date">Дата ЮТС</param>
+        /// <returns></returns>
+        public static bool IsCurrentDayRelativeMskTime(DateTimeOffset date)
+        {
+            return IsCurrentDayRelativeMskTime(date.Hour);
+        }
+
+
+        /// <summary>
+        /// Это текущий день относительно часовой зоны МСК? Да - текущий, нет - следующий день.
+        /// </summary>
+        /// <param name="hour">Час</param>
+        /// <returns></returns>
+        public static bool IsCurrentDayRelativeMskTime(int hour)
+        {
+            //Так как в базе всё храним в UTC то время с 21 часа уже соответствует следующими суткам в календаре Москвы
+
+            if (hour >= 21)
+                return false;
+
+            return true;
+        }
+    }
+}
--- a/PARR.Common/PARR.Common.csproj
+++ b/PARR.Common/PARR.Common.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
--- a/PARR.DAL/PARR.DAL.csproj
+++ b/PARR.DAL/PARR.DAL.csproj
@@ -20,6 +20,7 @@
  </ItemGroup>

  <ItemGroup>
+    <ProjectReference Include="..\PARR.Common\PARR.Common.csproj" />
    <ProjectReference Include="..\PARR.Constants\PARR.Constants.csproj" />
  </ItemGroup>

--- a/PARR.DAL/TransformServices/EsppScheduleTransformService.cs
+++ b/PARR.DAL/TransformServices/EsppScheduleTransformService.cs
@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+using PARR.Common;
 using PARR.Constants;
 using PARR.DAL.Contracts;
 using PARR.DAL.DomainModels;
@@ -12,6 +13,7 @@ namespace PARR.DAL.TransformServices
    {
        private readonly IEsppSchTypeConfigService esppSchTypeConfigService;
        private readonly IApplicationsInWorkService applicationsInWorkService;
+        private readonly IWeekendDayService weekendDayService;
        private readonly ILogger<EsppScheduleTransformService> logger;

        private readonly Dictionary<string, int> monthDict = new Dictionary<string, int>()
@@ -50,45 +52,65 @@ namespace PARR.DAL.TransformServices
            {"Воскресенье", 0 }
         };

+
        public EsppScheduleTransformService(
            ILogger<EsppScheduleTransformService> logger,
            IEsppSchTypeConfigService esppSchTypeConfigService,
-            IApplicationsInWorkService applicationsInWorkService
-
+            IApplicationsInWorkService applicationsInWorkService,
+            IWeekendDayService weekendDayService
            )
        {
            this.esppSchTypeConfigService = esppSchTypeConfigService;
            this.applicationsInWorkService = applicationsInWorkService;
+            this.weekendDayService = weekendDayService;
            this.logger = logger;
        }


        public DateTimeOffset GetNextDate(EsppScheduleDto esppSchedule, DateTimeOffset lastRun)
        {
+            var nextRun = lastRun;
+
            //если больше текущего вернуть lastRun. Это и есть следующая дата
            if (lastRun > DateTimeOffset.UtcNow)
-                return lastRun;
+                nextRun = lastRun;
+            //return lastRun;

            switch (esppSchedule.TypeSchedule.Id)
            {
                case (int)EsppSchTypeScheduleEnum.Regularly:
-                    return GetNextDateRegularly(esppSchedule.Values, lastRun);
+                    //return GetNextDateRegularly(esppSchedule.Values, lastRun);
+                    nextRun = GetNextDateRegularly(esppSchedule.Values, lastRun);
+                    break;
                case (int)EsppSchTypeScheduleEnum.Weekly:
-                    return GetNextDateWeekly(esppSchedule.Values, lastRun);
+                    //return GetNextDateWeekly(esppSchedule.Values, lastRun);
+                    nextRun = GetNextDateWeekly(esppSchedule.Values, lastRun);
+                    break;
                case (int)EsppSchTypeScheduleEnum.Monthly:
-                    return GetNextDateMonthly(esppSchedule.Values, lastRun);
+                    //return GetNextDateMonthly(esppSchedule.Values, lastRun);
+                    nextRun = GetNextDateMonthly(esppSchedule.Values, lastRun);
+                    break;
                case (int)EsppSchTypeScheduleEnum.Monthly2:
-                    return GetNextDateMonthly2(esppSchedule.Values, lastRun);
+                    //return GetNextDateMonthly2(esppSchedule.Values, lastRun);
+                    nextRun = GetNextDateMonthly2(esppSchedule.Values, lastRun);
+                    break;
                case (int)EsppSchTypeScheduleEnum.Annually:
-                    return GetNextDateAnnually(esppSchedule.Values, lastRun);
+                    //return GetNextDateAnnually(esppSchedule.Values, lastRun);
+                    nextRun = GetNextDateAnnually(esppSchedule.Values, lastRun);
+                    break;
                case (int)EsppSchTypeScheduleEnum.Annually2:
-                    return GetNextDateAnnually2(esppSchedule.Values, lastRun);
+                    //return GetNextDateAnnually2(esppSchedule.Values, lastRun);
+                    nextRun = GetNextDateAnnually2(esppSchedule.Values, lastRun);
+                    break;
            }
-            return lastRun;//todo убрать lastrun должен возвращать реальный результат
+
+            nextRun = GetWorkDayAsync(nextRun).GetAwaiter().GetResult();
+
+            return nextRun;
        }


-        public List<DateTimeOffset> GetNextSchedule(EsppScheduleDto esppSchedule, DateTimeOffset lastRun)
+        private List<DateTimeOffset> GetNextSchedule(EsppScheduleDto esppSchedule, DateTimeOffset lastRun)
        {
            // расписание на оставшееся на сегодня время. его так мало...
            lastRun = lastRun.UtcDateTime;
@@ -136,7 +158,7 @@ namespace PARR.DAL.TransformServices
        {
            //если больше текущего вернуть lastRun. Это и есть следующая дата
            if (lastRun > DateTimeOffset.UtcNow)
-                return lastRun;
+                return await GetWorkDayAsync(lastRun);

            var appInWork = await applicationsInWorkService.Get()
                                                        .Include(aiw => aiw.EsppSchValues)
@@ -160,6 +182,8 @@ namespace PARR.DAL.TransformServices

        public async Task<List<DateTimeOffset>> GetNextScheduleAsync(Guid applicationInWorkId, DateTimeOffset lastRun)
        {
+            //TODO: тут не проверен переход через выходные дни!!! Переход не используется, так как тут не рассчитываем NextRun.
+            //В общем проверить, когда будем тестировать агента, что с датами все ок
            var esppSchedule = await GetEsppScheduleAsync(applicationInWorkId);
            var nextSchedule = GetNextSchedule(esppSchedule, lastRun);

@@ -179,6 +203,7 @@ namespace PARR.DAL.TransformServices
            return esppSchedule;
        }

+
        private DateTimeOffset GetNextDateRegularly(List<EsppScheduleValDto> values, DateTimeOffset lastRun)
        {
            var regDict = new Dictionary<string, int>
@@ -359,19 +384,25 @@ namespace PARR.DAL.TransformServices

        public DateTimeOffset GetNextDateForDistributionRun(DateTimeOffset lastRun, DistributionPeriodTypeEnum periodType, string distributionPeriod)
        {
+            var nextRun = lastRun;
+
            switch (periodType)
            {
                case (DistributionPeriodTypeEnum.Day):
-                    return lastRun.AddDays(ParseInt(distributionPeriod));
-
+                    //return lastRun.AddDays(ParseInt(distributionPeriod));
+                    nextRun = lastRun.AddDays(ParseInt(distributionPeriod));
+                    break;
                case (DistributionPeriodTypeEnum.Month):
-                    return lastRun.AddMonths(ParseInt(distributionPeriod));
-
+                    //return lastRun.AddMonths(ParseInt(distributionPeriod));
+                    nextRun = lastRun.AddMonths(ParseInt(distributionPeriod));
+                    break;
                case (DistributionPeriodTypeEnum.Year):
-                    return lastRun.AddYears(ParseInt(distributionPeriod));
+                    //return lastRun.AddYears(ParseInt(distributionPeriod));
+                    nextRun = lastRun.AddYears(ParseInt(distributionPeriod));
+                    break;
            }

-            return lastRun;
+            return GetWorkDayAsync(nextRun).GetAwaiter().GetResult();
        }


@@ -395,7 +426,6 @@ namespace PARR.DAL.TransformServices

        public async Task<DateOnly> GetStartPeriodForDateAsync(Guid applicationInWorkId, DateTimeOffset date, DateTimeOffset referenceDate, DistributionPeriodTypeEnum periodType, string distributionPeriod)
        {
-
            var esppSchedule = await GetEsppScheduleAsync(applicationInWorkId);

            var currentStartPeriod = referenceDate;
@@ -439,5 +469,47 @@ namespace PARR.DAL.TransformServices

            return result;
        }
+
+
+        /// <summary>
+        /// Получить рабочий день следующего срабатывания
+        /// </summary>
+        /// <param name="nextRun"></param>
+        /// <returns></returns>
+        private async Task<DateTimeOffset> GetWorkDayAsync(DateTimeOffset nextRun)
+        {
+            // получаем день относительно часового пояса МСК
+            var date = DateOnly.FromDateTime(DateResolver.IsCurrentDayRelativeMskTime(nextRun) ? nextRun.Date : nextRun.Date.AddDays(1));
+
+            if (await weekendDayService.IsWorkDayAsync(date, true))
+            {
+                //текущий nextRun рабочий день, возвращаем его
+                return nextRun;
+            }
+
+            // ищем следующий рабочий день, максимум 20 итераций, если за их кол-во не нашли рабочий, берём последний не рабочий
+            int count = 20;
+            while (count > 0)
+            {
+                date = date.AddDays(1);
+                var isWorkDay = await weekendDayService.IsWorkDayAsync(date, true);
+                if (isWorkDay)
+                    break; // это рабочий день, выбираем его
+
+                count--;
+
+                if (!isWorkDay && count == 0)
+                    logger.LogWarning($"Не нашли рабочий день за 20 итераций, взяли последний нерабочий {date}");
+            }
+
+            // смотрим, если смещали из-за пояса МСК на день вперед, вычитаем этот день назад
+            if (!DateResolver.IsCurrentDayRelativeMskTime(nextRun))
+                date = date.AddDays(-1);
+
+            // считаем новый NextRun
+            var dayCount = date.DayNumber - DateOnly.FromDateTime(nextRun.Date).DayNumber;
+
+            return nextRun.AddDays(dayCount);
+        }
    }
 }
--- a/PARR.DAL/TransformServices/IEsppScheduleTransformService.cs
+++ b/PARR.DAL/TransformServices/IEsppScheduleTransformService.cs
@@ -16,13 +16,13 @@ namespace PARR.DAL.TransformServices
        /// <returns></returns>
        DateTimeOffset GetNextDate(EsppScheduleDto esppSchedule, DateTimeOffset lastRun);

-        /// <summary>
-        /// Получить расписание
-        /// </summary>
-        /// <param name="esppSchedule"></param>
-        /// <param name="lastRun"></param>
-        /// <returns></returns>
-        List<DateTimeOffset> GetNextSchedule(EsppScheduleDto esppSchedule, DateTimeOffset lastRun);
+        ///// <summary>
+        ///// Получить расписание
+        ///// </summary>
+        ///// <param name="esppSchedule"></param>
+        ///// <param name="lastRun"></param>
+        ///// <returns></returns>
+        //List<DateTimeOffset> GetNextSchedule(EsppScheduleDto esppSchedule, DateTimeOffset lastRun);

        /// <summary>
        /// Получить следующую дату по applicationInWorkId
--- a/PARR.EsppOrderLoaderWorker/Dockerfile
+++ b/PARR.EsppOrderLoaderWorker/Dockerfile
@@ -12,6 +12,7 @@ COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.EsppApi/PARR.EsppApi.csproj", "PARR.EsppApi/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.EsppOrderLoaderWorker"
--- a/PARR.EsppOrderManagerWorker/Dockerfile
+++ b/PARR.EsppOrderManagerWorker/Dockerfile
@@ -12,6 +12,7 @@ COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.EsppApi/PARR.EsppApi.csproj", "PARR.EsppApi/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.EsppOrderManagerWorker"
--- a/PARR.EsppScheduleSyncWorker/Dockerfile
+++ b/PARR.EsppScheduleSyncWorker/Dockerfile
@@ -11,6 +11,7 @@ COPY ["PARR.EsppScheduleSync/PARR.EsppScheduleSync.csproj", "PARR.EsppScheduleSy
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 COPY ["PARR.EsppSync/PARR.EsppSync.csproj", "PARR.EsppSync/"]
 RUN dotnet restore "PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj"
 COPY . .
--- a/PARR.EsppTemplateSyncWorker/Dockerfile
+++ b/PARR.EsppTemplateSyncWorker/Dockerfile
@@ -11,6 +11,7 @@ COPY ["PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj", "PARR.EsppTemplateSy
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.EsppTemplateSyncWorker"
--- a/PARR.GeneratorTemplatesWorker/Dockerfile
+++ b/PARR.GeneratorTemplatesWorker/Dockerfile
@@ -12,6 +12,7 @@ COPY ["PARR.TemplateDistributor/PARR.TemplateDistributor.csproj", "PARR.Template
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.GeneratorTemplatesWorker"
--- a/PARR.JobAutoControlWorker/Dockerfile
+++ b/PARR.JobAutoControlWorker/Dockerfile
@@ -11,6 +11,7 @@ COPY ["PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj", "PARR.JobAut
 COPY ["PARR.JobAutoControl/PARR.JobAutoControl.csproj", "PARR.JobAutoControl/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 RUN dotnet restore "./PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj"
 COPY . .
--- a/PARR.MasterWorker/Dockerfile
+++ b/PARR.MasterWorker/Dockerfile
@@ -11,6 +11,7 @@ COPY ["PARR.Master/PARR.Master.csproj", "PARR.Master/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "PARR.MasterWorker/PARR.MasterWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.MasterWorker"
--- a/PARR.NextRunWorker/Dockerfile
+++ b/PARR.NextRunWorker/Dockerfile
@@ -12,6 +12,7 @@ COPY ["PARR.NextRun/PARR.NextRun.csproj", "PARR.NextRun/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 RUN dotnet restore "./PARR.NextRunWorker/./PARR.NextRunWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.NextRunWorker"
--- a/PARR.TemplateActivatorWorker/Dockerfile
+++ b/PARR.TemplateActivatorWorker/Dockerfile
@@ -11,6 +11,7 @@ COPY ["PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj", "PARR.
 COPY ["PARR.TemplateActivator/PARR.TemplateActivator.csproj", "PARR.TemplateActivator/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 RUN dotnet restore "./PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj"
 COPY . .
--- a/PARR.TemplateDistributorWorker/Dockerfile
+++ b/PARR.TemplateDistributorWorker/Dockerfile
@@ -11,6 +11,7 @@ COPY ["PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj", "P
 COPY ["PARR.TemplateDistributor/PARR.TemplateDistributor.csproj", "PARR.TemplateDistributor/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
 RUN dotnet restore "./PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj"
 COPY . .
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@
 - PARR.AIHITSyncerWorker
 - PARR.API - API
 - PARR.BLL - общие методы и настройки для проектов
+- PARR.Common - общие методы для DAL и BLL
 - PARR.Constants - глобальные константы
 - PARR.DAL - модели, сервисы по работе с БД PARR
 - PARR.EsppApi - сервисы по работе с Api ЕСПП