From 12478e195156494a84bc601132dedf1492c296b4 Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Tue, 26 Aug 2025 13:40:02 +1000 Subject: [PATCH] =?UTF-8?q?fix(templateTaskGenerator):=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API.sln | 4 ++-- PARR.TemplateGeneratorWorker/TemplateGenerator.cs | 2 +- .../IMqTemplateTaskGenerator.cs | 0 .../ITemplateTaskGenerator.cs | 0 .../MqTemplateTaskGenerator.cs | 0 .../PARR.TemplateTaskGenerator.csproj | 0 .../Services/IValidatorService.cs | 0 .../Services/ValidatorService.cs | 0 .../Settings/MqSettings.cs | 0 .../TemplateTaskGenerator.cs | 0 .../TemplateTaskGeneratorInstaller.cs | 0 .../Dockerfile | 0 .../PARR.TemplateTaskGeneratorWorker.csproj | 2 +- .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Worker.cs | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 18 files changed, 4 insertions(+), 4 deletions(-) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/IMqTemplateTaskGenerator.cs (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/ITemplateTaskGenerator.cs (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/MqTemplateTaskGenerator.cs (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/PARR.TemplateTaskGenerator.csproj (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/Services/IValidatorService.cs (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/Services/ValidatorService.cs (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/Settings/MqSettings.cs (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/TemplateTaskGenerator.cs (100%) rename {TemplateTaskGenerator => PARR.TemplateTaskGenerator}/TemplateTaskGeneratorInstaller.cs (100%) rename {TemplateTaskGeneratorWorker => PARR.TemplateTaskGeneratorWorker}/Dockerfile (100%) rename {TemplateTaskGeneratorWorker => PARR.TemplateTaskGeneratorWorker}/PARR.TemplateTaskGeneratorWorker.csproj (91%) rename {TemplateTaskGeneratorWorker => PARR.TemplateTaskGeneratorWorker}/Program.cs (100%) rename {TemplateTaskGeneratorWorker => PARR.TemplateTaskGeneratorWorker}/Properties/launchSettings.json (100%) rename {TemplateTaskGeneratorWorker => PARR.TemplateTaskGeneratorWorker}/Worker.cs (100%) rename {TemplateTaskGeneratorWorker => PARR.TemplateTaskGeneratorWorker}/appsettings.Development.json (100%) rename {TemplateTaskGeneratorWorker => PARR.TemplateTaskGeneratorWorker}/appsettings.json (100%) diff --git a/PARR.API.sln b/PARR.API.sln index f7fd1fa2..561b8da1 100644 --- a/PARR.API.sln +++ b/PARR.API.sln @@ -92,9 +92,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.AIHITRelationshipsSync EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateGeneratorWorker", "PARR.TemplateGeneratorWorker\PARR.TemplateGeneratorWorker.csproj", "{17245D0B-3290-4C96-B5B1-4B0711BABAF2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateTaskGenerator", "TemplateTaskGenerator\PARR.TemplateTaskGenerator.csproj", "{D4C51090-CE06-4158-9A0E-961744872411}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateTaskGenerator", "PARR.TemplateTaskGenerator\PARR.TemplateTaskGenerator.csproj", "{D4C51090-CE06-4158-9A0E-961744872411}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateTaskGeneratorWorker", "TemplateTaskGeneratorWorker\PARR.TemplateTaskGeneratorWorker.csproj", "{93249642-DF7D-41A1-87C0-6E3BAECB43EC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateTaskGeneratorWorker", "PARR.TemplateTaskGeneratorWorker\PARR.TemplateTaskGeneratorWorker.csproj", "{93249642-DF7D-41A1-87C0-6E3BAECB43EC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/PARR.TemplateGeneratorWorker/TemplateGenerator.cs b/PARR.TemplateGeneratorWorker/TemplateGenerator.cs index 35233931..8569c7f3 100644 --- a/PARR.TemplateGeneratorWorker/TemplateGenerator.cs +++ b/PARR.TemplateGeneratorWorker/TemplateGenerator.cs @@ -84,7 +84,7 @@ namespace PARR.TemplateGeneratorWorker InitiatorParrComponentId = query.HistoryInitiator?.InitiatorParrComponentId }; - if (!await templateService.CreateAsync(template) || !await templateService.CommitAsync(new HistoryInitiator { InitiatorComment = "Запрос на генерацию с тестового шаблона", InitiatorParrComponentId = ParrComponentsEnum.TemplateGenerator })) + if (!await templateService.CreateAsync(template) || !await templateService.CommitAsync(new HistoryInitiator { InitiatorComment = "Запрос на генерацию с тестового шаблона", InitiatorParrComponentId = ParrComponentsEnum.TemplateTaskGenerator })) { logger.LogError($"Ошибка при создании шаблона: Name: {template.Name}, {nameof(template.Job)}: {template.JobId}, {nameof(template.Unit)}: {template.UnitId}"); } diff --git a/TemplateTaskGenerator/IMqTemplateTaskGenerator.cs b/PARR.TemplateTaskGenerator/IMqTemplateTaskGenerator.cs similarity index 100% rename from TemplateTaskGenerator/IMqTemplateTaskGenerator.cs rename to PARR.TemplateTaskGenerator/IMqTemplateTaskGenerator.cs diff --git a/TemplateTaskGenerator/ITemplateTaskGenerator.cs b/PARR.TemplateTaskGenerator/ITemplateTaskGenerator.cs similarity index 100% rename from TemplateTaskGenerator/ITemplateTaskGenerator.cs rename to PARR.TemplateTaskGenerator/ITemplateTaskGenerator.cs diff --git a/TemplateTaskGenerator/MqTemplateTaskGenerator.cs b/PARR.TemplateTaskGenerator/MqTemplateTaskGenerator.cs similarity index 100% rename from TemplateTaskGenerator/MqTemplateTaskGenerator.cs rename to PARR.TemplateTaskGenerator/MqTemplateTaskGenerator.cs diff --git a/TemplateTaskGenerator/PARR.TemplateTaskGenerator.csproj b/PARR.TemplateTaskGenerator/PARR.TemplateTaskGenerator.csproj similarity index 100% rename from TemplateTaskGenerator/PARR.TemplateTaskGenerator.csproj rename to PARR.TemplateTaskGenerator/PARR.TemplateTaskGenerator.csproj diff --git a/TemplateTaskGenerator/Services/IValidatorService.cs b/PARR.TemplateTaskGenerator/Services/IValidatorService.cs similarity index 100% rename from TemplateTaskGenerator/Services/IValidatorService.cs rename to PARR.TemplateTaskGenerator/Services/IValidatorService.cs diff --git a/TemplateTaskGenerator/Services/ValidatorService.cs b/PARR.TemplateTaskGenerator/Services/ValidatorService.cs similarity index 100% rename from TemplateTaskGenerator/Services/ValidatorService.cs rename to PARR.TemplateTaskGenerator/Services/ValidatorService.cs diff --git a/TemplateTaskGenerator/Settings/MqSettings.cs b/PARR.TemplateTaskGenerator/Settings/MqSettings.cs similarity index 100% rename from TemplateTaskGenerator/Settings/MqSettings.cs rename to PARR.TemplateTaskGenerator/Settings/MqSettings.cs diff --git a/TemplateTaskGenerator/TemplateTaskGenerator.cs b/PARR.TemplateTaskGenerator/TemplateTaskGenerator.cs similarity index 100% rename from TemplateTaskGenerator/TemplateTaskGenerator.cs rename to PARR.TemplateTaskGenerator/TemplateTaskGenerator.cs diff --git a/TemplateTaskGenerator/TemplateTaskGeneratorInstaller.cs b/PARR.TemplateTaskGenerator/TemplateTaskGeneratorInstaller.cs similarity index 100% rename from TemplateTaskGenerator/TemplateTaskGeneratorInstaller.cs rename to PARR.TemplateTaskGenerator/TemplateTaskGeneratorInstaller.cs diff --git a/TemplateTaskGeneratorWorker/Dockerfile b/PARR.TemplateTaskGeneratorWorker/Dockerfile similarity index 100% rename from TemplateTaskGeneratorWorker/Dockerfile rename to PARR.TemplateTaskGeneratorWorker/Dockerfile diff --git a/TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj b/PARR.TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj similarity index 91% rename from TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj rename to PARR.TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj index 847cddbc..79225a7c 100644 --- a/TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj +++ b/PARR.TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj @@ -19,6 +19,6 @@ - + diff --git a/TemplateTaskGeneratorWorker/Program.cs b/PARR.TemplateTaskGeneratorWorker/Program.cs similarity index 100% rename from TemplateTaskGeneratorWorker/Program.cs rename to PARR.TemplateTaskGeneratorWorker/Program.cs diff --git a/TemplateTaskGeneratorWorker/Properties/launchSettings.json b/PARR.TemplateTaskGeneratorWorker/Properties/launchSettings.json similarity index 100% rename from TemplateTaskGeneratorWorker/Properties/launchSettings.json rename to PARR.TemplateTaskGeneratorWorker/Properties/launchSettings.json diff --git a/TemplateTaskGeneratorWorker/Worker.cs b/PARR.TemplateTaskGeneratorWorker/Worker.cs similarity index 100% rename from TemplateTaskGeneratorWorker/Worker.cs rename to PARR.TemplateTaskGeneratorWorker/Worker.cs diff --git a/TemplateTaskGeneratorWorker/appsettings.Development.json b/PARR.TemplateTaskGeneratorWorker/appsettings.Development.json similarity index 100% rename from TemplateTaskGeneratorWorker/appsettings.Development.json rename to PARR.TemplateTaskGeneratorWorker/appsettings.Development.json diff --git a/TemplateTaskGeneratorWorker/appsettings.json b/PARR.TemplateTaskGeneratorWorker/appsettings.json similarity index 100% rename from TemplateTaskGeneratorWorker/appsettings.json rename to PARR.TemplateTaskGeneratorWorker/appsettings.json