Fix RabbitMQ запись в БД. Репо перенастроен на harbor

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  REPO: "10.99.253.167:8088"
+  REPO: "harbor.dvgd.rzd"
   PROD_NAME_API: "parr/parr-api"
   PROD_NAME_AIHIT: "parr/parr-aihit-syncher"
   PROD_NAME_ESPP_TEMPLATE: "parr/parr-espp-template-sync"
@@ -26,7 +26,7 @@ prod_build:
   script:
     - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d v)
     - docker build -t $REPO/$PROD_NAME_API:$CI_COMMIT_TAG -t $REPO/$PROD_NAME_API:latest -t $PROD_NAME_API:$CI_COMMIT_TAG -t $PROD_NAME_API:latest --build-arg app_version=$IMAGE_VERSION -f PARR.API/Dockerfile .
-    - docker login -u $NEXUS_PUSH_USER -p $NEXUS_PUSH_PASS $REPO
+    - docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
     - docker push --all-tags $REPO/$PROD_NAME_API
   tags:
     - docker
@@ -42,6 +42,7 @@ prod_deploy:
   except:
     - branches
   script:
+    - docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO
     - tag=$CI_COMMIT_TAG docker compose up -d
   parallel:
     matrix:
@@ -70,7 +71,7 @@ prod_aihit_build:
     - APP_VERSION=$(echo $CI_COMMIT_TAG | tr -d as)
     - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/as/v/g')
     - docker build -t $REPO/$PROD_NAME_AIHIT:$IMAGE_VERSION -t $REPO/$PROD_NAME_AIHIT:latest -t $PROD_NAME_AIHIT:$IMAGE_VERSION -t $PROD_NAME_AIHIT:latest --build-arg app_version=$APP_VERSION -f PARR.Worker/PARR.Worker/Dockerfile .
-    - docker login -u $NEXUS_PUSH_USER -p $NEXUS_PUSH_PASS $REPO
+    - docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
     - docker push --all-tags $REPO/$PROD_NAME_AIHIT
   tags:
     - docker-as
@@ -86,6 +87,7 @@ prod_aihit_deploy:
     - branches
   script:
     - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/as/v/g')
+    - docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO
     - tag=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d
   parallel:
     matrix:
@@ -112,7 +114,7 @@ prod_espp-template_build:
     - APP_VERSION=$(echo $CI_COMMIT_TAG | tr -d et)
     - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/et/v/g')
     - docker build -t $REPO/$PROD_NAME_ESPP_TEMPLATE:$IMAGE_VERSION -t $REPO/$PROD_NAME_ESPP_TEMPLATE:latest -t $PROD_NAME_ESPP_TEMPLATE:$IMAGE_VERSION -t $PROD_NAME_ESPP_TEMPLATE:latest --build-arg app_version=$APP_VERSION -f PARR.EsppTemplateSyncWorker/Dockerfile .
-    - docker login -u $NEXUS_PUSH_USER -p $NEXUS_PUSH_PASS $REPO
+    - docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
     - docker push --all-tags $REPO/$PROD_NAME_ESPP_TEMPLATE
   tags:
     - docker-et
@@ -128,6 +130,7 @@ prod_espp-template_build:
 #     - branches
 #   script:
 #     - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/et/v/g')
+#     - docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO 
 #     - tag=$IMAGE_VERSION docker compose -f docker-compose.espp-template-sync.yml up -d
 #   parallel:
 #     matrix:

PARR.AIHIT/AIHIT/SyncherInstaller.cs

@@ -4,6 +4,8 @@ using Microsoft.Extensions.DependencyInjection;
 using PARR.AIHIT.Context;
 using PARR.AIHIT.Services;
 using PARR.AIHIT.Settings;
+using PARR.DAL;
+using PARR.Mail;
 
 namespace PARR.AIHIT
 {
@@ -14,7 +16,10 @@ namespace PARR.AIHIT
             var syncherSettings = new SyncherSettings();
             configuration.GetSection(nameof(SyncherSettings)).Bind(syncherSettings);
             services.AddSingleton(syncherSettings);
-            
+
+            services.InstallMailServices(configuration);
+            services.InstallDalServices(configuration);
+
             services.AddDbContext<AIHITContext>(options =>
                 options.UseSqlServer(
                 configuration.GetConnectionString("AihitConnection")

PARR.DAL/Context/DataContext.cs

@@ -6,7 +6,7 @@ using PARR.DAL.Models.V1;
 
 namespace PARR.DAL.Context
 {
-    public class DataContext : DbContext
+    internal class DataContext : DbContext
     {
         public DataContext(DbContextOptions<DataContext> options) : base(options) { }
 

PARR.EsppTemplateSync/ITemplateSyncer.cs

@@ -2,7 +2,7 @@
 {
     public interface ITemplateSyncer
     {
-        Task StartAsync();
+        void Start();
         void Stop();
     }
 }

PARR.EsppTemplateSync/Services/Manager.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using PARR.DAL.Context;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
 
@@ -11,25 +10,18 @@ namespace PARR.EsppTemplateSync.Services
         private readonly ILogger<Manager> logger;
         private readonly IServiceProvider serviceProvider;
         private readonly IParserService parserService;
-       // private readonly ITemplateService templateService;
 
         public Manager(
             ILogger<Manager> logger,
             IServiceProvider serviceProvider,
-            IParserService parserService//,
+            IParserService parserService
-          //  ITemplateService templateService
             )
         {
             this.logger = logger;
             this.serviceProvider = serviceProvider;
             this.parserService = parserService;
-           // this.templateService = templateService;
-
-
-            //using var scope = serviceProvider.CreateScope();
-            //var services = scope.ServiceProvider;
-            //var templateService = services.GetService<ITemplateService>();
         }
+
         public Task<bool> ManageFileAsync(string path)
         {
             throw new NotImplementedException();
@@ -37,18 +29,40 @@ namespace PARR.EsppTemplateSync.Services
 
         public async Task<bool> ManageStringAsync(string str)
         {
-
             bool isSuccess = true;
-            //TOD if (str == null || str.Length <= 2) 
+            ////TODO: if (str == null || str.Length <= 2) 
+            // тут обязательно нужна проверка, если str не того формата, возникает exception в ParseStringAsync
             var template = await parserService.ParseStringAsync(str);
+            ////TODO: а если template==null???
             await CheckChangesAsync(template);
 
-
+            //todo: only true?????
             return isSuccess;
         }
 
         private async Task CheckChangesAsync(Template esppTemplate)
         {
+            // --- test ---
+
+            using (var scope = serviceProvider.CreateScope())
+            {
+                var services = scope.ServiceProvider;
+                var templateService = services.GetService<ITemplateService>();
+
+                if (templateService == null)
+                {
+                    return;
+                }
+
+                var resCreate = await templateService.CreateAsync(esppTemplate);
+                var resCommit = await templateService.CommitAsync();
+            }
+
+            // === end test ===
+
+
+
+
             //if (!await templateService.CreateAsync(esppTemplate) || !await templateService.CommitAsync())
             //{
             //    logger.LogError($"Не удалось создать запись Template {esppTemplate.EK}({esppTemplate.ShortDescription})");
@@ -68,27 +82,27 @@ namespace PARR.EsppTemplateSync.Services
             // -----------------
 
 
-            using (var scope = serviceProvider.CreateScope())
+            //using (var scope = serviceProvider.CreateScope())
-            {
+            //{
-                var services = scope.ServiceProvider;
+            //    var services = scope.ServiceProvider;
-                var templateService = services.GetService<ITemplateService>();
+            //    var templateService = services.GetService<ITemplateService>();
 
-                if (templateService == null)
+            //    if (templateService == null)
-                    return;
+            //        return;
 
-                var template = await templateService.GetTemplateByNameAsync(esppTemplate.EK);
+            //    var template = await templateService.GetTemplateByNameAsync(esppTemplate.EK);
-                if (template == null)
+            //    if (template == null)
-                {
+            //    {
-                    esppTemplate.Status = "New";
+            //        esppTemplate.Status = "New";
-                    logger.LogInformation($"В ЕСПП активирован неизвестной шаблон: {esppTemplate.EK} секунд. краткое описание: {esppTemplate.ShortDescription}");
+            //        logger.LogInformation($"В ЕСПП активирован неизвестной шаблон: {esppTemplate.EK} секунд. краткое описание: {esppTemplate.ShortDescription}");
-                    if (!await templateService.CreateAsync(esppTemplate) || !await templateService.CommitAsync())
+            //        if (!await templateService.CreateAsync(esppTemplate) || !await templateService.CommitAsync())
-                    {
+            //        {
-                        logger.LogError($"Не удалось создать запись Template {esppTemplate.EK}({esppTemplate.ShortDescription})");
+            //            logger.LogError($"Не удалось создать запись Template {esppTemplate.EK}({esppTemplate.ShortDescription})");
-                    }
+            //        }
-                    else
+            //        else
-                        logger.LogInformation($"----- Создана запись Template {esppTemplate.EK}({esppTemplate.ShortDescription})  -----");
+            //            logger.LogInformation($"----- Создана запись Template {esppTemplate.EK}({esppTemplate.ShortDescription})  -----");
-                }
+            //    }
-            }
+            //}
 
         }
     }

PARR.EsppTemplateSync/Services/ParserService.cs

@@ -24,6 +24,8 @@ namespace PARR.EsppTemplateSync.Services
 
         public async Task<Template> ParseStringAsync(string str)
         {
+            //TODO: а если формат нет тот? Все будет ок?
+
             //TODO: 
             var splittedContent = str.Split(";");
             var ek = splittedContent[0].Trim().Substring(1, splittedContent[0].Length - 2);
@@ -45,7 +47,9 @@ namespace PARR.EsppTemplateSync.Services
                 WorkGroup = workGroup,
                 ShortDescription = shortDescription,
                 Category = category,
-                EKDateCreated = ConvertDateFromStr(ekDateCreatedStr+ " +03:00"),
+                //todo: EKDateCreated
+                //EKDateCreated = ConvertDateFromStr(ekDateCreatedStr+ " +03:00"),
+                EKDateCreated = null,
                 Process = process,
                 SubProcess = subProcess,
                 Status = "Checking"

PARR.EsppTemplateSync/Settings/GlobalSettings.cs

@@ -13,7 +13,6 @@
         public string? QueueName { get; set; }
         public string? UserName { get; set; }
         public string? Password { get; set; }
-        public int CheckIntervalSeconds { get; set; } = 30;
     }
 
     internal class StorageSettings

PARR.EsppTemplateSync/TemplateFileSyncer.cs

@@ -40,7 +40,7 @@ namespace PARR.EsppTemplateSync
             filterExtensions = string.Join(",", storageSettings.EsppTemplates!.AllowedExtensions).Replace(".", "*.");
         }
 
-        public async Task StartAsync()
+        public void Start()
         {
             //смотрим, доступна ли папка
             if (!Directory.Exists(dirPath))
@@ -53,8 +53,9 @@ namespace PARR.EsppTemplateSync
 
             while (true)
             {
-                await GetFilesAsync();
+                //todo: new Task() -> 
-                await Task.Delay(globalSettings.StorageSettings!.CheckIntervalSeconds * 1000);
+                //await GetFilesAsync();
+                //await Task.Delay(globalSettings.StorageSettings!.CheckIntervalSeconds * 1000);
             }
 
 

PARR.EsppTemplateSync/TemplateMQSyncer.cs

@@ -1,11 +1,8 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging;
-using PARR.DAL.Context;
 using PARR.EsppTemplateSync.Services;
 using PARR.EsppTemplateSync.Settings;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
-using System.Runtime.Serialization.DataContracts;
 using System.Text;
 
 namespace PARR.EsppTemplateSync
@@ -15,92 +12,93 @@ namespace PARR.EsppTemplateSync
         private readonly ILogger<TemplateMQSyncer> logger;
         private readonly IManager manager;
         private readonly GlobalSettings globalSettings;
-        private readonly IServiceProvider serviceProvider;
+
-        private IConnection connection;
+        private IConnection? connection;
-        private RabbitMQ.Client.IModel channel;
+        private IModel? channel;
 
         public TemplateMQSyncer(
             ILogger<TemplateMQSyncer> logger,
             IManager manager,
-            GlobalSettings globalSettings,
+            GlobalSettings globalSettings
-            IServiceProvider serviceProvider
             )
         {
             this.logger = logger;
             this.manager = manager;
             this.globalSettings = globalSettings;
-            this.serviceProvider = serviceProvider;
+
             if (globalSettings.MqSettings == null)
             {
                 logger.LogError("Нет секции настроек хранилища. MqSettings, EsppTemplates");
                 throw new Exception("Нет секции настроек хранилища. MqSettings, EsppTemplates");
             }
-            var factory = new ConnectionFactory { HostName = globalSettings.MqSettings.HostName };
+        }
+
+        public void Start()
+        {
+            InitConnection();
+
+            logger.LogInformation($"Запущена проверка очереди {globalSettings.MqSettings!.QueueName}.");
+
+            GetMessages();
+        }
+
+        public void Stop()
+        {
+            channel?.Close();
+            connection?.Close();
+
+            logger.LogInformation($"=== === === Соединение с очередью {globalSettings.MqSettings!.QueueName} закрыто === === ===");
+        }
+
+        private void InitConnection()
+        {
+            logger.LogInformation($"Устанавливаю соединение с RabbitMQ: {globalSettings.MqSettings!.HostName}");
+
+            var factory = new ConnectionFactory { HostName = globalSettings.MqSettings!.HostName };
             factory.UserName = globalSettings.MqSettings.UserName;
             factory.Password = globalSettings.MqSettings.Password;
             factory.AutomaticRecoveryEnabled = true;
             factory.DispatchConsumersAsync = true;
+
             connection = factory.CreateConnection();
             channel = connection.CreateModel();
-            Dictionary<String, Object> args = new Dictionary<String, Object>();
+
-            args.Add("x-queue-mode", "lazy");
+            var args = new Dictionary<string, object>
+            {
+                { "x-queue-mode", "lazy" }
+            };
 
             channel.QueueDeclare(queue: globalSettings.MqSettings.QueueName,
                                durable: true,
                                exclusive: false,
                                autoDelete: false,
                                arguments: args);
-        }
-        public async Task StartAsync()
-        {
-            logger.LogInformation($"Запущена проверка очереди {globalSettings.MqSettings!.QueueName}. Интервал: {globalSettings.MqSettings!.CheckIntervalSeconds} секунд.");
 
-            //    CancellationTokenSource cancelTokenSource = new CancellationTokenSource();
+            logger.LogInformation("Соединение с RabbitMQ установлено.");
-            //    CancellationToken token = cancelTokenSource.Token;
-            //    Task task = new Task(() => { GetMessages(); }, token);
-            //    task.Start();
-            //    await task.WaitAsync(token);
-            GetMessages();
         }
 
         private void GetMessages()
         {
+            if (channel == null || connection == null)
+            {
+                logger.LogError("Отсутствует соедниение с RabbitMQ.");
+                return;
+            }
 
             var consumer = new AsyncEventingBasicConsumer(channel);
+
             consumer.Received += async (ch, ea) =>
             {
                 var content = Encoding.UTF8.GetString(ea.Body.ToArray());
+                logger.LogDebug($"Получено сообщение: {content}");
 
-                // Обрабатываем полученное сообщение
                 await manager.ManageStringAsync(content);
 
-                // ------------
-
-                //using var scope = serviceProvider.CreateScope();
-                //var services = scope.ServiceProvider;
-                //var manager = services.GetRequiredService<IManager>();
-
-                //// ------------
-
-
-                //if (manager != null) await manager.ManageStringAsync(content);
-
                 channel.BasicAck(ea.DeliveryTag, false);
                 await Task.Yield();
             };
 
             channel.BasicConsume(globalSettings.MqSettings!.QueueName, false, consumer);
-
         }
-
-
-
-        public void Stop()
-        {
-            channel.Close();
-            connection.Close();
-            logger.LogInformation($"=== === === Соединение с очередью {globalSettings.MqSettings!.QueueName} закрыто === === ===");
-        }
-
     }
 }

PARR.EsppTemplateSyncWorker/Program.cs

@@ -6,7 +6,6 @@ using Serilog;
 IHost host = Host.CreateDefaultBuilder(args)
     .ConfigureServices((hostContext, services) =>
     {
-        services.InstallDalServices(hostContext.Configuration);
         services.InstallEsppTemplateSyncServices(hostContext.Configuration);
 
         services.AddHostedService<Worker>();

PARR.EsppTemplateSyncWorker/Worker.cs

@@ -5,25 +5,21 @@ namespace PARR.EsppTemplateSyncWorker
     public class Worker : BackgroundService
     {
         private readonly ILogger<Worker> _logger;
-        private ITemplateSyncer? templateSyncer;
+        private ITemplateSyncer templateSyncer;
-        private readonly IServiceProvider serviceProvider;
+        //private readonly IServiceProvider serviceProvider;
 
         public Worker(
             ILogger<Worker> logger,
-            IServiceProvider serviceProvider
+            ITemplateSyncer templateSyncer
             )
         {
             _logger = logger;
-            this.serviceProvider = serviceProvider;
+            this.templateSyncer = templateSyncer;
         }
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
-            using var scope = serviceProvider.CreateScope();
+            templateSyncer.Start();
-            var services = scope.ServiceProvider;
-            templateSyncer = services.GetService<ITemplateSyncer>();
-
-            if (templateSyncer != null) await templateSyncer.StartAsync();
         }
 
         public override Task StopAsync(CancellationToken cancellationToken)

PARR.EsppTemplateSyncWorker/appsettings.json

@@ -1,5 +1,7 @@
 {
-  "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;",
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;"
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -36,8 +38,7 @@
       "HostName": "10.99.253.216",
       "QueueName": "parr-espp-templates",
       "UserName": "rmuser",
-      "Password": "rmpassword",
+      "Password": "rmpassword"
-      "CheckIntervalSeconds": 30
 
     },
     "StorageSettings": {

PARR.Worker/PARR.Worker/Program.cs

@@ -16,8 +16,8 @@ IHost host = Host.CreateDefaultBuilder(args)
         hostContext.Configuration.GetSection(nameof(WorkerSettings)).Bind(workerSettings);
         services.AddSingleton(workerSettings);
 
-        services.InstallMailServices(hostContext.Configuration);
+        //services.InstallMailServices(hostContext.Configuration);
-        services.InstallDalServices(hostContext.Configuration);
+        //services.InstallDalServices(hostContext.Configuration);
         services.InstallSyncerServices(hostContext.Configuration);
 
         services.AddHostedService<Worker>();