Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

- Core.Client zur Anwendungsschicht hinzufügen

EnvelopeGenerator.Application/Configurations/GtxMessaging/SmsParams.cs

@@ -0,0 +1,22 @@
+using DigitalData.Core.Abstractions.Client;
+
+namespace EnvelopeGenerator.Application.Configurations.GtxMessaging
+{
+    /// <summary>
+    /// https://www.gtx-messaging.com/en/api-docs/sms-rest-api/
+    /// </summary>
+    public class SmsParams : IHttpClientOptions
+    {
+        public required string Uri { get; init; }
+
+        public string? Path { get; init; }
+
+        public Dictionary<string, object>? Headers { get; init; }
+
+        public Dictionary<string, object?>? QueryParams { get; init; }
+
+        public string RecipientQueryParamName { get; init; } = "to";
+
+        public string MessageQueryParamName { get; init; } = "text";
+    }
+}

EnvelopeGenerator.Application/Contracts/IMessagingService.cs

@@ -0,0 +1,9 @@
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IMessagingService
+    {
+        public Task<dynamic?> SendSmsAsync(string recipient, string message);
+
+        public Task<TResponse?> SendSmsAsync<TResponse>(string recipient, string message);
+    }
+}

EnvelopeGenerator.Application/DIExtensions.cs

@@ -7,44 +7,47 @@ using EnvelopeGenerator.Infrastructure.Contracts;
 using EnvelopeGenerator.Infrastructure.Repositories;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using DigitalData.Core.Client;
+using EnvelopeGenerator.Application.Configurations.GtxMessaging;
 
 namespace EnvelopeGenerator.Application
 {
     public static class DIExtensions
     {
-        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration dispatcherConfigSection, IConfiguration mailConfigSection)
+        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfigurationSection dispatcherConfigSection, IConfigurationSection mailConfigSection, IConfigurationSection smsConfigSection)
         {
             //Inject CRUD Service and repositoriesad
-            services.AddScoped<IConfigRepository, ConfigRepository>();
-            services.AddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-            services.AddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-            services.AddScoped<IConfigRepository, ConfigRepository>();
-            services.AddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-            services.AddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
-            services.AddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
-            services.AddScoped<IEnvelopeRepository, EnvelopeRepository>();
-            services.AddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
-            services.AddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-            services.AddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
-            services.AddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
-            services.AddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
-            services.AddScoped<IReceiverRepository, ReceiverRepository>();
-            services.AddScoped<IUserReceiverRepository, UserReceiverRepository>();
-            services.AddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
-            services.AddScoped<IConfigService, ConfigService>();
-            services.AddScoped<IDocumentReceiverElementService, DocumentReceiverElementService>();
-            services.AddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
-            services.AddScoped<IEnvelopeHistoryService, EnvelopeHistoryService>();
-            services.AddScoped<IDocumentStatusService, DocumentStatusService>();
-            services.AddScoped<IEmailTemplateService, EmailTemplateService>();
-            services.AddScoped<IEnvelopeService, EnvelopeService>();
-            services.AddScoped<IEnvelopeCertificateService, EnvelopeCertificateService>();
-            services.AddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
-            services.AddScoped<IEnvelopeReceiverService, EnvelopeReceiverService>();
-            services.AddScoped<IEnvelopeTypeService, EnvelopeTypeService>();
-            services.AddScoped<IReceiverService, ReceiverService>();
-            services.AddScoped<IUserReceiverService, UserReceiverService>();
-            services.AddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
+            services.TryAddScoped<IConfigRepository, ConfigRepository>();
+            services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+            services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+            services.TryAddScoped<IConfigRepository, ConfigRepository>();
+            services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+            services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
+            services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
+            services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
+            services.TryAddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
+            services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+            services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
+            services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
+            services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
+            services.TryAddScoped<IReceiverRepository, ReceiverRepository>();
+            services.TryAddScoped<IUserReceiverRepository, UserReceiverRepository>();
+            services.TryAddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
+            services.TryAddScoped<IConfigService, ConfigService>();
+            services.TryAddScoped<IDocumentReceiverElementService, DocumentReceiverElementService>();
+            services.TryAddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
+            services.TryAddScoped<IEnvelopeHistoryService, EnvelopeHistoryService>();
+            services.TryAddScoped<IDocumentStatusService, DocumentStatusService>();
+            services.TryAddScoped<IEmailTemplateService, EmailTemplateService>();
+            services.TryAddScoped<IEnvelopeService, EnvelopeService>();
+            services.TryAddScoped<IEnvelopeCertificateService, EnvelopeCertificateService>();
+            services.TryAddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
+            services.TryAddScoped<IEnvelopeReceiverService, EnvelopeReceiverService>();
+            services.TryAddScoped<IEnvelopeTypeService, EnvelopeTypeService>();
+            services.TryAddScoped<IReceiverService, ReceiverService>();
+            services.TryAddScoped<IUserReceiverService, UserReceiverService>();
+            services.TryAddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
 
             //Auto mapping profiles
             services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly);
@@ -53,11 +56,15 @@ namespace EnvelopeGenerator.Application
             services.Configure<DispatcherConfig>(dispatcherConfigSection);
             services.Configure<MailConfig>(mailConfigSection);
 
+            services.AddHttpClientService<SmsParams>(smsConfigSection);
+            services.TryAddSingleton<IMessagingService, GtxMessagingService>();
+
             return services;
         }
 
         public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config) => services.AddEnvelopeGenerator(
             dispatcherConfigSection: config.GetSection("DispatcherConfig"),
-            mailConfigSection: config.GetSection("MailConfig"));
+            mailConfigSection: config.GetSection("MailConfig"),
+            smsConfigSection: config.GetSection("SmsConfig"));
     }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -12,8 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Client" Version="2.0.2" />
     <PackageReference Include="DigitalData.Core.DTO" Version="2.0.0" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />

EnvelopeGenerator.Application/Services/GTXMessagingService.cs

@@ -0,0 +1,31 @@
+using DigitalData.Core.Abstractions.Client;
+using DigitalData.Core.Client;
+using EnvelopeGenerator.Application.Configurations.GtxMessaging;
+using EnvelopeGenerator.Application.Contracts;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class GtxMessagingService : IMessagingService
+    {
+        private readonly IHttpClientService<SmsParams> _smsClient;
+
+        private readonly SmsParams _smsParams;
+        
+        public GtxMessagingService(IHttpClientService<SmsParams> smsClient, IOptions<SmsParams> smsParamsOptions)
+        {
+            _smsClient = smsClient;
+            _smsParams = smsParamsOptions.Value;
+        }
+
+        public Task<dynamic?> SendSmsAsync(string recipient, string message) => SendSmsAsync<dynamic>(recipient: recipient, message: message);
+
+        public async Task<TResponse?> SendSmsAsync<TResponse>(string recipient, string message)
+        {
+            return await _smsClient.FetchAsync(queryParams: new Dictionary<string, object?>() {
+                { _smsParams.RecipientQueryParamName, recipient },
+                { _smsParams.MessageQueryParamName, message }
+            }).ThenAsync(res => res.Json<TResponse>());
+        }
+    }
+}

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="1.0.0" />
     <PackageReference Include="UserManager.Domain" Version="1.0.0" />
   </ItemGroup>

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.15" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />

EnvelopeGenerator.Web/Controllers/Test/TestMessagingController.cs

@@ -0,0 +1,24 @@
+using EnvelopeGenerator.Application.Contracts;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Web.Controllers.Test
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class TestMessagingController : ControllerBase
+    {
+        private readonly IMessagingService _service;
+
+        public TestMessagingController(IMessagingService service)
+        {
+            _service = service;
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> SendAsync(string recipient, string message)
+        {
+            var res = await _service.SendSmsAsync(recipient: recipient, message: message);
+            return res is null? StatusCode(StatusCodes.Status500InternalServerError) : Ok(res);
+        }
+    }
+}

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -46,7 +46,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />

EnvelopeGenerator.Web/appsettings.json

@@ -125,5 +125,16 @@
       "[SIGNATURE_TYPE]": "signieren",
       "[REASON]": ""
     }
+  },
+  "GTXMessagingConfig": {
+    "AuthKey": "ep$?A!Gs"
+  },
+  "SmsConfig": {
+    "Uri": "https://rest.gtx-messaging.net",
+    "Path": "smsc/sendsms/f566f7e5-bdf2-4a9a-bf52-ed88215a432e/json",
+    "Headers": {},
+    "QueryParams": {
+      "from": "signFLOW Portal"
+    }
   }
 }