feat(constants, bll, templateActivator): заготовка для templateActivator

2024-07-25 10:30:17 +10:00
parent 1f7798222e
commit 9ae4903527
16 changed files with 298 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ variables:
  PROD_NAME_MASTER: "parr/parr-master"
  PROD_NAME_NEXT_RUN: "parr/parr-next-run"
  PROD_TEMPLATE_DISTRIBOTOR: "parr/parr-template-distributor"
+  PROD_TEMPLATE_ACTIVATOR: "parr/parr-template-activator"

 stages:
  - build
@@ -558,3 +559,52 @@ prod_template_distributor_deploy:
  tags:
    - ${RUNNER}

+
+### TEMPLATE ACTIVATOR PROD ###
+
+# PROD_TEMPLATE_ACTIVATOR
+prod_template_activator_build:
+  stage: build
+  only:
+    - /^ta[0-9]+\.[0-9]+\.[0-9]+$/
+  except:
+    - branches
+  services:
+    - name: docker:20.10.21-dind
+      command: [
+        "--insecure-registry=10.99.253.167:8090",
+        "--registry-mirror=http://10.99.253.167:8090",
+        "--insecure-registry=harbor.dvgd.rzd",
+        "--tls=false"
+        ]
+  variables:
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
+  script:
+    - APP_VERSION=$(echo $CI_COMMIT_TAG | tr -d ta)
+    - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/ta/v/g')
+    - docker build -t $REPO/$PROD_TEMPLATE_ACTIVATOR:$IMAGE_VERSION -t $REPO/$PROD_TEMPLATE_ACTIVATOR:latest -t $PROD_TEMPLATE_ACTIVATOR:$IMAGE_VERSION -t $PROD_TEMPLATE_ACTIVATOR:latest --build-arg app_version=$APP_VERSION -f PARR.TemplateActivatorWorker/Dockerfile .
+    - docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
+    - docker push --all-tags $REPO/$PROD_TEMPLATE_ACTIVATOR
+  tags:
+    - docker
+
+
+prod_template_activator_deploy:
+  stage: deploy
+  environment:
+    name: parr-template-activator
+  only:
+    - /^ta[0-9]+\.[0-9]+\.[0-9]+$/
+  except:
+    - branches
+  script:
+    - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/ta/v/g')
+    - docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO 
+    - tag=$IMAGE_VERSION docker stack deploy -c docker-compose.template-activator.yml parr-template-activator --with-registry-auth
+  parallel:
+    matrix:
+      - RUNNER: shell-api-swarm-01
+  tags:
+    - ${RUNNER}
--- a/PARR.API.sln
+++ b/PARR.API.sln
@@ -68,9 +68,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.NextRun", "PARR.NextRu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.NextRunWorker", "PARR.NextRunWorker\PARR.NextRunWorker.csproj", "{47C6E193-257A-4001-84D7-11B640E3D1A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateDistributor", "PARR.TemplateDistributor\PARR.TemplateDistributor.csproj", "{9A8D1E97-1508-4A6E-9782-C7438224D435}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.TemplateDistributor", "PARR.TemplateDistributor\PARR.TemplateDistributor.csproj", "{9A8D1E97-1508-4A6E-9782-C7438224D435}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateDistributorWorker", "PARR.TemplateDistributorWorker\PARR.TemplateDistributorWorker.csproj", "{89155CAB-295D-4937-8B7A-05170587A2BC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.TemplateDistributorWorker", "PARR.TemplateDistributorWorker\PARR.TemplateDistributorWorker.csproj", "{89155CAB-295D-4937-8B7A-05170587A2BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateActivator", "PARR.TemplateActivator\PARR.TemplateActivator.csproj", "{C92621CD-EC6A-4788-94CF-D03C0A386F12}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateActivatorWorker", "PARR.TemplateActivatorWorker\PARR.TemplateActivatorWorker.csproj", "{97E096AA-26F3-417A-A969-381464F4EF43}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -196,6 +200,14 @@ Global
 		{89155CAB-295D-4937-8B7A-05170587A2BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89155CAB-295D-4937-8B7A-05170587A2BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89155CAB-295D-4937-8B7A-05170587A2BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C92621CD-EC6A-4788-94CF-D03C0A386F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C92621CD-EC6A-4788-94CF-D03C0A386F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C92621CD-EC6A-4788-94CF-D03C0A386F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C92621CD-EC6A-4788-94CF-D03C0A386F12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97E096AA-26F3-417A-A969-381464F4EF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97E096AA-26F3-417A-A969-381464F4EF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97E096AA-26F3-417A-A969-381464F4EF43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97E096AA-26F3-417A-A969-381464F4EF43}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/PARR.BLL/Domain/Mq/TemplateActivatorMq.cs
+++ b/PARR.BLL/Domain/Mq/TemplateActivatorMq.cs
@@ -0,0 +1,20 @@
+using PARR.Constants;
+
+namespace PARR.BLL.Domain.Mq
+{
+    /// <summary>
+    /// Модель в MQ, активация/деактивация шаблонов/расписаний
+    /// </summary>
+    public class TemplateActivatorMq
+    {
+        /// <summary>
+        /// Id регламентной работы
+        /// </summary>
+        public Guid ApplicationInWorkId { get; set; }
+
+        /// <summary>
+        /// Действие по активации/деактивации
+        /// </summary>
+        public TemplateActivatorActionsEnum Action { get; set; }
+    }
+}
--- a/PARR.Constants/TemplateActivatorActionsEnum.cs
+++ b/PARR.Constants/TemplateActivatorActionsEnum.cs
@@ -0,0 +1,55 @@
+namespace PARR.Constants
+{
+    /// <summary>
+    /// Действия с шаблонами/расписаниями для TemplateActivator
+    /// </summary>
+    public enum TemplateActivatorActionsEnum
+    {
+        /// <summary>
+        /// Активировать все шаблоны
+        /// </summary>
+        ActivateAllTemplates,
+
+        /// <summary>
+        /// Активировать шаблоны у которых активировано расписание
+        /// </summary>
+        ActivateTemplatesWithActiveSchedules,
+        
+        /// <summary>
+        /// Деактивировать все шаблоны
+        /// </summary>
+        DeactivateAllTemplates,
+
+        /// <summary>
+        /// Деактивировать шаблоны у которынх деактивировано расписание
+        /// </summary>
+        DeactivateTemplatesWithDeactivationSchedules,
+
+        /// <summary>
+        /// Активировать все расписания
+        /// </summary>
+        ActivateAllSchedules,
+
+        /// <summary>
+        /// Деактивировать все расписания
+        /// </summary>
+        DeactivateAllSchedules,
+
+        ///
+        /// Активировать все расписания у которых активированы шаблоны
+        ///
+        ActivateSchedulesWithActiveTemplates,
+
+        ///
+        /// Деактивировать все расписания у которых деактивированы шаблоны
+        ///
+        DeactivateSchedulesWithDeactivationTemplates
+
+
+
+        //только в интерфейсе:
+        //активировать все шаблоны и расписания (отправлю 2 запроса)
+        //деактивировать все шаблоны и расписания (отправлю 2 запроса)
+
+    }
+}
--- a/PARR.TemplateActivator/PARR.TemplateActivator.csproj
+++ b/PARR.TemplateActivator/PARR.TemplateActivator.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PARR.BLL\PARR.BLL.csproj" />
+    <ProjectReference Include="..\PARR.Constants\PARR.Constants.csproj" />
+    <ProjectReference Include="..\PARR.DAL\PARR.DAL.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/PARR.TemplateActivatorWorker/Dockerfile
+++ b/PARR.TemplateActivatorWorker/Dockerfile
@@ -0,0 +1,28 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base
+WORKDIR /app
+
+FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["NuGet.config", "."]
+COPY ["PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj", "PARR.TemplateActivatorWorker/"]
+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.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+RUN dotnet restore "./PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj"
+COPY . .
+WORKDIR "/src/PARR.TemplateActivatorWorker"
+RUN dotnet build "./PARR.TemplateActivatorWorker.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG app_version=0.0.0-default
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./PARR.TemplateActivatorWorker.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:Version=$app_version
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "PARR.TemplateActivatorWorker.dll"]
--- a/PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj
+++ b/PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>dotnet-PARR.TemplateActivatorWorker-99abde53-965d-477c-abdc-38f4544cfd05</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PARR.TemplateActivator\PARR.TemplateActivator.csproj" />
+  </ItemGroup>
+</Project>
--- a/PARR.TemplateActivatorWorker/Program.cs
+++ b/PARR.TemplateActivatorWorker/Program.cs
@@ -0,0 +1,10 @@
+using PARR.TemplateActivatorWorker;
+
+IHost host = Host.CreateDefaultBuilder(args)
+    .ConfigureServices(services =>
+    {
+        services.AddHostedService<Worker>();
+    })
+    .Build();
+
+host.Run();
--- a/PARR.TemplateActivatorWorker/Properties/launchSettings.json
+++ b/PARR.TemplateActivatorWorker/Properties/launchSettings.json
@@ -0,0 +1,14 @@
+{
+  "profiles": {
+    "PARR.TemplateActivatorWorker": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker"
+    }
+  }
+}
--- a/PARR.TemplateActivatorWorker/Worker.cs
+++ b/PARR.TemplateActivatorWorker/Worker.cs
@@ -0,0 +1,23 @@
+namespace PARR.TemplateActivatorWorker
+{
+    public class Worker : BackgroundService
+    {
+        private readonly ILogger<Worker> _logger;
+
+        public Worker(ILogger<Worker> logger)
+        {
+            _logger = logger;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: TemplateActivatorMq
+
+            //while (!stoppingToken.IsCancellationRequested)
+            //{
+            //    _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+            //    await Task.Delay(1000, stoppingToken);
+            //}
+        }
+    }
+}
--- a/PARR.TemplateActivatorWorker/appsettings.Development.json
+++ b/PARR.TemplateActivatorWorker/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
--- a/PARR.TemplateActivatorWorker/appsettings.json
+++ b/PARR.TemplateActivatorWorker/appsettings.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
--- a/PARR.TemplateDistributor/MqTemplateDistributor.cs
+++ b/PARR.TemplateDistributor/MqTemplateDistributor.cs
@@ -55,7 +55,7 @@ namespace PARR.TemplateDistributor

            if (!await validatorService.IsValidApplicationAndWorksAsync(query.ApplicationInWorkId))
            {
-                logger.LogError($"Некорректные параметры регалментной работы {nameof(query.ApplicationInWorkId)}: {query.ApplicationInWorkId}");
+                logger.LogError($"Некорректные параметры регламентной работы {nameof(query.ApplicationInWorkId)}: {query.ApplicationInWorkId}");
                return;
            }

--- a/README.md
+++ b/README.md
@@ -34,6 +34,8 @@
 - PARR.MockData - загрузка тестовых данных 
 - PARR.NextRun - рассчет следующей даты генерации наряда/запуска агента
 - PARR.NextRunWorker
+- PARR.TemplateActivator - активатор/деактиватор шаблонов/расписаний
+- PARR.TemplateActivatorWorker
 - PARR.TemplateDistributor - автораспределение РР
 - PARR.TemplateDistributorWorker
 - PARR.Test - тестирование функций ПАРР
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -18,6 +18,7 @@
    <None Include="docker-compose.generator-templates.yml" />
    <None Include="docker-compose.master.yml" />
    <None Include="docker-compose.next-run.yml" />
+    <None Include="docker-compose.template-activator.yml" />
    <None Include="docker-compose.template-distributor.yml" />
    <None Include="docker-compose.yml" />
    <None Include=".dockerignore" />
--- a/docker-compose.template-activator.yml
+++ b/docker-compose.template-activator.yml
@@ -0,0 +1,25 @@
+version: '3.4'
+
+#PARR TEMPLATE ACTIVATOR
+services:
+  parr-template-activator:
+    image: harbor.dvgd.rzd/parr/parr-template-activator:${tag-latest}
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Production
+      - TZ=Europe/Moscow
+    logging:
+      driver: fluentd
+      options:
+        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
+        fluentd-retry-wait: '30s'
+        fluentd-max-retries: '30'
+        tag: parr.template-activator.serilog
+    deploy:
+      replicas: 2  
+    networks:
+      parr-network:
+
+networks:
+  parr-network:
+    driver: overlay
+    external: true