From 22347a0202c52921671519bb86453244b709d6c2 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 31 Jan 2025 10:37:59 +0100 Subject: [PATCH] refactor(MessagingService): umbenannt in SmsSender --- .../Contracts/{IMessagingService.cs => ISmsSender.cs} | 3 ++- EnvelopeGenerator.Application/Extensions/DIExtensions.cs | 2 +- .../Services/EnvelopeReceiverService.cs | 8 ++++---- .../Services/{GTXMessagingService.cs => GTXSmsSender.cs} | 5 +++-- EnvelopeGenerator.Web/Controllers/HomeController.cs | 4 ++-- .../Controllers/Test/TestMessagingController.cs | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) rename EnvelopeGenerator.Application/Contracts/{IMessagingService.cs => ISmsSender.cs} (77%) rename EnvelopeGenerator.Application/Services/{GTXMessagingService.cs => GTXSmsSender.cs} (85%) diff --git a/EnvelopeGenerator.Application/Contracts/IMessagingService.cs b/EnvelopeGenerator.Application/Contracts/ISmsSender.cs similarity index 77% rename from EnvelopeGenerator.Application/Contracts/IMessagingService.cs rename to EnvelopeGenerator.Application/Contracts/ISmsSender.cs index 886585a5..21fb28bf 100644 --- a/EnvelopeGenerator.Application/Contracts/IMessagingService.cs +++ b/EnvelopeGenerator.Application/Contracts/ISmsSender.cs @@ -2,7 +2,8 @@ namespace EnvelopeGenerator.Application.Contracts; -public interface IMessagingService +//TODO: move to DigitalData.Core +public interface ISmsSender { string ServiceProvider { get; } diff --git a/EnvelopeGenerator.Application/Extensions/DIExtensions.cs b/EnvelopeGenerator.Application/Extensions/DIExtensions.cs index 465b5b23..ba72c561 100644 --- a/EnvelopeGenerator.Application/Extensions/DIExtensions.cs +++ b/EnvelopeGenerator.Application/Extensions/DIExtensions.cs @@ -60,7 +60,7 @@ namespace EnvelopeGenerator.Application.Extensions services.Configure(envelopeReceiverCacheParamsSection); services.AddHttpClientService(smsConfigSection); - services.TryAddSingleton(); + services.TryAddSingleton(); services.TryAddSingleton(); services.TryAddSingleton(); diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs index ee3e07fe..742c2d41 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs @@ -17,13 +17,13 @@ namespace EnvelopeGenerator.Application.Services { private readonly IStringLocalizer _localizer; - private readonly IMessagingService _messagingService; + private readonly ISmsSender _smsSender; - public EnvelopeReceiverService(IEnvelopeReceiverRepository repository, IStringLocalizer localizer, IMapper mapper, IMessagingService messagingService) + public EnvelopeReceiverService(IEnvelopeReceiverRepository repository, IStringLocalizer localizer, IMapper mapper, ISmsSender smsSender) : base(repository, mapper) { _localizer = localizer; - _messagingService = messagingService; + _smsSender = smsSender; } public async Task>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true) @@ -171,7 +171,7 @@ namespace EnvelopeGenerator.Application.Services .Message(Key.PhoneNumberNonexists) .Notice(LogLevel.Error, Flag.NotFound, $"An attempt was made to send sms to the user whose phone number is null. Envelope recipient ID is {envelopeReceiverId}, UUID is {uuid} and signature is {signature}."); - var res = await _messagingService.SendSmsAsync(recipient: env_rcv.PhoneNumber, message: message); + var res = await _smsSender.SendSmsAsync(recipient: env_rcv.PhoneNumber, message: message); return Result.Success(res); } diff --git a/EnvelopeGenerator.Application/Services/GTXMessagingService.cs b/EnvelopeGenerator.Application/Services/GTXSmsSender.cs similarity index 85% rename from EnvelopeGenerator.Application/Services/GTXMessagingService.cs rename to EnvelopeGenerator.Application/Services/GTXSmsSender.cs index 3d6e8620..319700fb 100644 --- a/EnvelopeGenerator.Application/Services/GTXMessagingService.cs +++ b/EnvelopeGenerator.Application/Services/GTXSmsSender.cs @@ -8,7 +8,8 @@ using Microsoft.Extensions.Options; namespace EnvelopeGenerator.Application.Services; -public class GtxMessagingService : IMessagingService +//TODO: move to DigitalData.Core +public class GTXSmsSender : ISmsSender { private readonly IHttpClientService _smsClient; @@ -18,7 +19,7 @@ public class GtxMessagingService : IMessagingService public string ServiceProvider { get; } - public GtxMessagingService(IHttpClientService smsClient, IOptions smsParamsOptions, IMapper mapper) + public GTXSmsSender(IHttpClientService smsClient, IOptions smsParamsOptions, IMapper mapper) { _smsClient = smsClient; _smsParams = smsParamsOptions.Value; diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 26aa7bc1..974206eb 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -38,13 +38,13 @@ namespace EnvelopeGenerator.Web.Controllers private readonly Cultures _cultures; private readonly IEnvelopeMailService _mailService; private readonly IEnvelopeReceiverReadOnlyService _readOnlyService; - private readonly IMessagingService _msgService; + private readonly ISmsSender _msgService; private readonly ICodeGenerator _codeGenerator; private readonly IReceiverService _rcvService; private readonly IDistributedCache _dCache; private readonly TotpSmsParams _totpSmsParams; - public HomeController(EnvelopeOldService envelopeOldService, ILogger logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IMessagingService messagingService, ICodeGenerator codeGenerator, IReceiverService receiverService, IDistributedCache distributedCache, IOptions totpSmsParamsOptions) + public HomeController(EnvelopeOldService envelopeOldService, ILogger logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, ISmsSender messagingService, ICodeGenerator codeGenerator, IReceiverService receiverService, IDistributedCache distributedCache, IOptions totpSmsParamsOptions) { this.envelopeOldService = envelopeOldService; _envRcvService = envelopeReceiverService; diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestMessagingController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestMessagingController.cs index b0d6ee7a..ac4555e1 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestMessagingController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestMessagingController.cs @@ -7,9 +7,9 @@ namespace EnvelopeGenerator.Web.Controllers.Test [ApiController] public class TestMessagingController : ControllerBase { - private readonly IMessagingService _service; + private readonly ISmsSender _service; - public TestMessagingController(IMessagingService service) + public TestMessagingController(ISmsSender service) { _service = service; }