From 096a990669d0c8fa741dbd2a1a69580bdc215912 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Thu, 21 Sep 2023 09:37:36 +1000 Subject: [PATCH] Bll MqService --- PARR.API.sln | 14 ++++- .../V1/GeneratorTemplateController.cs | 19 ++++--- PARR.API/Installers/ApiServicesInstaller.cs | 1 - .../Interfaces/IMqGeneratorTemplateService.cs | 7 --- PARR.BLL/Domain/Mq/MqSendResult.cs | 18 ++++++ PARR.BLL/PARR.BLL.csproj | 1 + PARR.BLL/ParrBllInstaller.cs | 1 + .../Services/Implementations/MqService.cs | 55 ++++++++++++------- PARR.BLL/Services/Interfaces/IMqService.cs | 10 ++++ .../GeneratorTemplateInstaller.cs | 16 ++++++ .../PARR.GeneratorTemplatesWorker.csproj | 5 ++ 11 files changed, 109 insertions(+), 38 deletions(-) delete mode 100644 PARR.API/Services/Interfaces/IMqGeneratorTemplateService.cs create mode 100644 PARR.BLL/Domain/Mq/MqSendResult.cs rename PARR.API/Services/Implementations/MqGeneratorTemplateService.cs => PARR.BLL/Services/Implementations/MqService.cs (52%) create mode 100644 PARR.BLL/Services/Interfaces/IMqService.cs create mode 100644 PARR.GeneratorTemplates/GeneratorTemplateInstaller.cs diff --git a/PARR.API.sln b/PARR.API.sln index d731ecfe..ce7ca48a 100644 --- a/PARR.API.sln +++ b/PARR.API.sln @@ -28,7 +28,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.EsppTemplateSyncWorker EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.EsppTemplateSync", "PARR.EsppTemplateSync\PARR.EsppTemplateSync.csproj", "{39FD9AAD-0792-46B2-A935-42486A993C32}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.MockData", "PARR.MockData\PARR.MockData.csproj", "{B02E5B16-59BD-4F02-9CC4-6873409DBD84}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.MockData", "PARR.MockData\PARR.MockData.csproj", "{B02E5B16-59BD-4F02-9CC4-6873409DBD84}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.GeneratorTemplates", "PARR.GeneratorTemplates\PARR.GeneratorTemplates.csproj", "{79EC7AD8-9A16-4806-881A-E5632C48C461}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.GeneratorTemplatesWorker", "PARR.GeneratorTemplatesWorker\PARR.GeneratorTemplatesWorker.csproj", "{BE11D005-D3FE-4F29-93A2-7379E729C78D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -74,6 +78,14 @@ Global {B02E5B16-59BD-4F02-9CC4-6873409DBD84}.Debug|Any CPU.Build.0 = Debug|Any CPU {B02E5B16-59BD-4F02-9CC4-6873409DBD84}.Release|Any CPU.ActiveCfg = Release|Any CPU {B02E5B16-59BD-4F02-9CC4-6873409DBD84}.Release|Any CPU.Build.0 = Release|Any CPU + {79EC7AD8-9A16-4806-881A-E5632C48C461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {79EC7AD8-9A16-4806-881A-E5632C48C461}.Debug|Any CPU.Build.0 = Debug|Any CPU + {79EC7AD8-9A16-4806-881A-E5632C48C461}.Release|Any CPU.ActiveCfg = Release|Any CPU + {79EC7AD8-9A16-4806-881A-E5632C48C461}.Release|Any CPU.Build.0 = Release|Any CPU + {BE11D005-D3FE-4F29-93A2-7379E729C78D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE11D005-D3FE-4F29-93A2-7379E729C78D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE11D005-D3FE-4F29-93A2-7379E729C78D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE11D005-D3FE-4F29-93A2-7379E729C78D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PARR.API/Controllers/V1/GeneratorTemplateController.cs b/PARR.API/Controllers/V1/GeneratorTemplateController.cs index 8deb8b11..a3438f85 100644 --- a/PARR.API/Controllers/V1/GeneratorTemplateController.cs +++ b/PARR.API/Controllers/V1/GeneratorTemplateController.cs @@ -5,7 +5,9 @@ using PARR.API.Contracts.V1.Requests; using PARR.API.Contracts.V1.Responses.Base; using PARR.API.Controllers.V1.Base; using PARR.API.Services.Interfaces; +using PARR.API.Settings; using PARR.BLL.Domain.Mq; +using PARR.BLL.Services.Interfaces; using System.Text.Json; namespace PARR.API.Controllers.V1 @@ -13,18 +15,21 @@ namespace PARR.API.Controllers.V1 public class GeneratorTemplateController : BaseApiController { private readonly IValidator validator; - private readonly IMqGeneratorTemplateService mqGeneratorTemplateService; + private readonly IMqService mqService; private readonly IUriService uriService; + private readonly MqSettings mqSettings; public GeneratorTemplateController( IValidator validator, - IMqGeneratorTemplateService mqGeneratorTemplateService, - IUriService uriService + IMqService mqService, + IUriService uriService, + MqSettings mqSettings ) { this.validator = validator; - this.mqGeneratorTemplateService = mqGeneratorTemplateService; + this.mqService = mqService; this.uriService = uriService; + this.mqSettings = mqSettings; } /// @@ -38,8 +43,6 @@ namespace PARR.API.Controllers.V1 if (!resultValidate.IsValid) return BadRequest(new Response(resultValidate.Errors)); - // Todo: проверить есть ли в бд такие ворк и апп - var obj = new GeneratorTemplateMq { Action = request.Action, @@ -50,9 +53,9 @@ namespace PARR.API.Controllers.V1 var msg = JsonSerializer.Serialize(obj); - var result = mqGeneratorTemplateService.SendMsg(msg); + var result = mqService.Send(mqSettings.GenerateTemplates, new[] { msg }); - if (!result) + if (!result.IsSuccess) return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при отправке данных." } })); var createdUri = uriService.GetAllUri(ApiRoutes.Template.GetAll); diff --git a/PARR.API/Installers/ApiServicesInstaller.cs b/PARR.API/Installers/ApiServicesInstaller.cs index a097cd3a..4ff3bc14 100644 --- a/PARR.API/Installers/ApiServicesInstaller.cs +++ b/PARR.API/Installers/ApiServicesInstaller.cs @@ -20,7 +20,6 @@ namespace PARR.API.Installers }); services.AddTransient(); - services.AddTransient(); diff --git a/PARR.API/Services/Interfaces/IMqGeneratorTemplateService.cs b/PARR.API/Services/Interfaces/IMqGeneratorTemplateService.cs deleted file mode 100644 index 51d3361c..00000000 --- a/PARR.API/Services/Interfaces/IMqGeneratorTemplateService.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace PARR.API.Services.Interfaces -{ - public interface IMqGeneratorTemplateService - { - bool SendMsg(string msg); - } -} diff --git a/PARR.BLL/Domain/Mq/MqSendResult.cs b/PARR.BLL/Domain/Mq/MqSendResult.cs new file mode 100644 index 00000000..b719b484 --- /dev/null +++ b/PARR.BLL/Domain/Mq/MqSendResult.cs @@ -0,0 +1,18 @@ +namespace PARR.BLL.Domain.Mq +{ + /// + /// Результат отправки очереди в MQ + /// + public class MqSendResult + { + /// + /// Результат отправки + /// + public bool IsSuccess { get; set; } + + /// + /// Неотправленные сообщения + /// + public string[]? NotSendMessages { get; set; } + } +} diff --git a/PARR.BLL/PARR.BLL.csproj b/PARR.BLL/PARR.BLL.csproj index 1c2edf9c..fa036eaa 100644 --- a/PARR.BLL/PARR.BLL.csproj +++ b/PARR.BLL/PARR.BLL.csproj @@ -11,6 +11,7 @@ + diff --git a/PARR.BLL/ParrBllInstaller.cs b/PARR.BLL/ParrBllInstaller.cs index 782a45e0..0c34489d 100644 --- a/PARR.BLL/ParrBllInstaller.cs +++ b/PARR.BLL/ParrBllInstaller.cs @@ -16,6 +16,7 @@ namespace PARR.BLL services.AddTransient(); + services.AddTransient(); } } } diff --git a/PARR.API/Services/Implementations/MqGeneratorTemplateService.cs b/PARR.BLL/Services/Implementations/MqService.cs similarity index 52% rename from PARR.API/Services/Implementations/MqGeneratorTemplateService.cs rename to PARR.BLL/Services/Implementations/MqService.cs index 245efa0d..6d74876d 100644 --- a/PARR.API/Services/Implementations/MqGeneratorTemplateService.cs +++ b/PARR.BLL/Services/Implementations/MqService.cs @@ -1,30 +1,34 @@ -using PARR.API.Services.Interfaces; -using PARR.API.Settings; +using Microsoft.Extensions.Logging; +using PARR.BLL.Contracts.Interfaces; +using PARR.BLL.Domain.Mq; +using PARR.BLL.Services.Interfaces; using RabbitMQ.Client; using System.Text; -namespace PARR.API.Services.Implementations +namespace PARR.BLL.Services.Implementations { - public class MqGeneratorTemplateService : IMqGeneratorTemplateService + internal class MqService : IMqService { - private readonly MqSettings mqSettings; - private readonly ILogger logger; + private readonly ILogger logger; - public MqGeneratorTemplateService(MqSettings mqSettings, ILogger logger) + public MqService(ILogger logger) { - this.mqSettings = mqSettings; this.logger = logger; } - public bool SendMsg(string msg) + public MqSendResult Send(IMqSettings mqSettings, string[] msgList) { var factory = new ConnectionFactory { - HostName = mqSettings.GenerateTemplates.HostName, - UserName = mqSettings.GenerateTemplates.User, - Password = mqSettings.GenerateTemplates.Password + HostName = mqSettings.HostName, + UserName = mqSettings.User, + Password = mqSettings.Password }; + // индекс текущей отправки в очередь из массива msgList + // нужен для формирования списка неотправленных сообщений + var sendIdx = 0; + try { using (var connection = factory.CreateConnection()) @@ -41,33 +45,42 @@ namespace PARR.API.Services.Implementations //В целом эти параметры можно посмотреть в админке RabbitMQ channel.QueueDeclare( - queue: mqSettings.GenerateTemplates.QueueName, + queue: mqSettings.QueueName, durable: true, exclusive: false, autoDelete: false, arguments: args ); - var body = Encoding.UTF8.GetBytes(msg); - var props = channel.CreateBasicProperties(); //храним на диске props.DeliveryMode = 2; //время жизни, мс //props.Expiration = "60000"; - channel.BasicPublish(exchange: "", routingKey: mqSettings.GenerateTemplates.QueueName, basicProperties: props, body: body); + foreach (var msg in msgList) + { + var body = Encoding.UTF8.GetBytes(msg); + channel.BasicPublish(exchange: "", routingKey: mqSettings.QueueName, basicProperties: props, body: body); + + sendIdx++; + logger.LogDebug($"Отправлено сообщение в очередь: {mqSettings.QueueName}, {msg}"); + } } - logger.LogDebug($"Отправлено сообщение в очередь: {mqSettings.GenerateTemplates.QueueName}, {msg}"); - - return true; + return new MqSendResult { IsSuccess = true }; } catch (Exception ex) { - logger.LogError(ex, $"Ошибка при отправке сообщения в очередь {mqSettings.GenerateTemplates.QueueName}, {msg}"); + var notSendMsg = new List(); - return false; + // формируем список неотправленных элементов + for (int i = sendIdx; i < msgList.Length; i++) + notSendMsg.Add(msgList[i]); + + logger.LogError(ex, $"Ошибка при отправке сообщения в очередь {mqSettings.QueueName}, {string.Join(',', notSendMsg)}"); + + return new MqSendResult { IsSuccess = false, NotSendMessages = notSendMsg.ToArray() }; } } } diff --git a/PARR.BLL/Services/Interfaces/IMqService.cs b/PARR.BLL/Services/Interfaces/IMqService.cs new file mode 100644 index 00000000..ab825e3e --- /dev/null +++ b/PARR.BLL/Services/Interfaces/IMqService.cs @@ -0,0 +1,10 @@ +using PARR.BLL.Contracts.Interfaces; +using PARR.BLL.Domain.Mq; + +namespace PARR.BLL.Services.Interfaces +{ + public interface IMqService + { + MqSendResult Send(IMqSettings mqSettings, string[] msgList); + } +} diff --git a/PARR.GeneratorTemplates/GeneratorTemplateInstaller.cs b/PARR.GeneratorTemplates/GeneratorTemplateInstaller.cs new file mode 100644 index 00000000..4007a483 --- /dev/null +++ b/PARR.GeneratorTemplates/GeneratorTemplateInstaller.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PARR.GeneratorTemplates +{ + public static class GeneratorTemplateInstaller + { + //public static void InstallGeneratorTemplateServices(this IServiceCollection services, IConfiguration configuration) + //{ + + //} + } +} diff --git a/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj b/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj index 245b1a44..3385ae46 100644 --- a/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj +++ b/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj @@ -8,6 +8,11 @@ + + + + +