Renamed gateway settings file #GCPActive (#12)

* Added logging on failure for sms client #GCPActive

* renamed gateway config file

* fixed test

src/Altinn.Notifications.Sms.Integrations/Configuration/ServiceCollectionExtensions.cs

@@ -27,8 +27,8 @@ public static IServiceCollection AddIntegrationServices(this IServiceCollection
         {
             throw new ArgumentNullException(nameof(config), "Required Kafka settings is missing from application configuration");
         }
-        
-        SmsGatewayConfiguration smsGatewaySettings = config!.GetSection(nameof(SmsGatewayConfiguration)).Get<SmsGatewayConfiguration>()!;
+
+        SmsGatewaySettings smsGatewaySettings = config!.GetSection(nameof(SmsGatewaySettings)).Get<SmsGatewaySettings>()!;
 
         if (smsGatewaySettings == null)
         {

src/Altinn.Notifications.Sms.Integrations/LinkMobility/AltinnGatewayClient.cs

@@ -19,7 +19,7 @@ public class AltinnGatewayClient : IAltinnGatewayClient
     /// <summary>
     /// Initializes a new instance of the <see cref="AltinnGatewayClient"/> class.
     /// </summary>
-    public AltinnGatewayClient(SmsGatewayConfiguration gatewayConfig)
+    public AltinnGatewayClient(SmsGatewaySettings gatewayConfig)
     {
         _client = new(new XmlTransport(gatewayConfig.Username, gatewayConfig.Password, new Uri(gatewayConfig.Endpoint)));
     }

src/Altinn.Notifications.Sms.Integrations/LinkMobility/SmsClient.cs

@@ -2,8 +2,11 @@
 using Altinn.Notifications.Sms.Core.Sending;
 using Altinn.Notifications.Sms.Core.Shared;
 using Altinn.Notifications.Sms.Core.Status;
+
 using LinkMobility.PSWin.Client.Model;
 
+using Microsoft.Extensions.Logging;
+
 using LinkMobilityModel = global::LinkMobility.PSWin.Client.Model;
 
 namespace Altinn.Notifications.Sms.Integrations.LinkMobility
@@ -15,14 +18,17 @@ namespace Altinn.Notifications.Sms.Integrations.LinkMobility
     public class SmsClient : ISmsClient
     {
         private readonly IAltinnGatewayClient _client;
+        private readonly ILogger<ISmsClient> _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SmsClient"/> class.
         /// </summary>
         /// <param name="client">Gateway Client</param>
-        public SmsClient(IAltinnGatewayClient client)
+        /// <param name="logger">Logger</param>
+        public SmsClient(IAltinnGatewayClient client, ILogger<ISmsClient> logger)
         {
             _client = client;
+            _logger = logger;
         }
 
         /// <inheritdoc />
@@ -40,6 +46,7 @@ public async Task<Result<string, SmsClientErrorResponse>> SendAsync(Core.Sending
                 return new SmsClientErrorResponse { SendResult = SmsSendResult.Failed_InvalidReceiver, ErrorMessage = result.StatusText };
             }
 
+            _logger.LogInformation("// SmsClient // SendAsync // Failed to send SMS. Status: {StatusText}", result.StatusText);
             return new SmsClientErrorResponse { SendResult = SmsSendResult.Failed };
         }
     }

src/Altinn.Notifications.Sms.Integrations/LinkMobility/SmsGatewayConfiguration.cs → src/Altinn.Notifications.Sms.Integrations/LinkMobility/SmsGatewaySettings.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Configuration for the LinkMobility SMS gateway
     /// </summary>
-    public class SmsGatewayConfiguration
+    public class SmsGatewaySettings
     {
         /// <summary>
         /// Username to use for authentication towards the SMS gateway

src/Altinn.Notifications.Sms/appsettings.json

@@ -26,7 +26,7 @@
     "SendSmsQueueRetryTopicName": "altinn.notifications.sms.queue.retry",
     "AltinnServiceUpdateTopicName ": "altinn.platform.service.updated"
   },
-  "SmsGatewayConfiguration": {
+  "SmsGatewaySettings": {
     "Username": "<populated-during-deploy>",
     "Password": "<populated-during-deploy>",
     "Endpoint": "https://xml-test.pswin.com"

test/Altinn.Notifications.Sms.Tests/Sms.Integrations/ServiceCollectionExtensionsTests.cs

@@ -30,7 +30,7 @@ public void AddIntegrationServices_MissingKafkaConfig_ThrowsException()
     {
         // Arrange
         Environment.SetEnvironmentVariable("KafkaSettings__BrokerAddress", null, EnvironmentVariableTarget.Process);
-        Environment.SetEnvironmentVariable("SmsGatewayConfiguration__Endpoint", "https://vg.no", EnvironmentVariableTarget.Process);
+        Environment.SetEnvironmentVariable("SmsGatewaySettings__Endpoint", "https://vg.no", EnvironmentVariableTarget.Process);
         string expectedExceptionMessage = "Required Kafka settings is missing from application configuration (Parameter 'config')";
 
         var config = new ConfigurationBuilder().AddEnvironmentVariables().Build();
@@ -48,7 +48,7 @@ public void AddIntegrationServices_MissingKafkaConfig_ThrowsException()
     public void AddIntegrationServices_SmsGatewayConfigIncluded_NoException()
     {
         // Arrange
-        Environment.SetEnvironmentVariable("SmsGatewayConfiguration__Endpoint", "https://vg.no", EnvironmentVariableTarget.Process);
+        Environment.SetEnvironmentVariable("SmsGatewaySettings__Endpoint", "https://vg.no", EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable("KafkaSettings__BrokerAddress", "localhost:9092", EnvironmentVariableTarget.Process);
         var config = new ConfigurationBuilder().AddEnvironmentVariables().Build();
 

test/Altinn.Notifications.Sms.Tests/Sms.Integrations/SmsClientTests.cs

@@ -1,9 +1,12 @@
-using Altinn.Notifications.Sms.Core.Status;
+using Altinn.Notifications.Sms.Core.Dependencies;
+using Altinn.Notifications.Sms.Core.Status;
 
 using Altinn.Notifications.Sms.Integrations.LinkMobility;
 
 using LinkMobility.PSWin.Client.Model;
 
+using Microsoft.Extensions.Logging;
+
 using Moq;
 
 using LinkMobilityModel = global::LinkMobility.PSWin.Client.Model;
@@ -13,6 +16,7 @@ namespace Altinn.Notifications.Sms.Tests.Sms.Integrations
     public class SmsClientTests
     {
         private readonly Mock<IAltinnGatewayClient> _clientMock = new();
+        private readonly Mock<ILogger<ISmsClient>> _loggerMock = new();
 
         [Fact]
         public async Task SendAsync_GatewayReturnsNonSuccess_UnknownError()
@@ -23,7 +27,7 @@ public async Task SendAsync_GatewayReturnsNonSuccess_UnknownError()
             _clientMock.Setup(cm => cm.SendAsync(It.IsAny<LinkMobilityModel.Sms>()))
                 .ReturnsAsync(gatewayResult);
 
-            SmsClient smsClient = new(_clientMock.Object);
+            SmsClient smsClient = new(_clientMock.Object, _loggerMock.Object);
 
             // Act
             var result = await smsClient.SendAsync(new Notifications.Sms.Core.Sending.Sms());
@@ -52,7 +56,7 @@ public async Task SendAsync_GatewayReturnsNonSuccess_InvalidReceiver()
             _clientMock.Setup(cm => cm.SendAsync(It.IsAny<LinkMobilityModel.Sms>()))
                 .ReturnsAsync(gatewayResult);
 
-            SmsClient smsClient = new(_clientMock.Object);
+            SmsClient smsClient = new(_clientMock.Object, _loggerMock.Object);
 
             // Act
             var result = await smsClient.SendAsync(new Notifications.Sms.Core.Sending.Sms());
@@ -84,7 +88,7 @@ public async Task SendAsync_GatewayReturnsSuccess_GatewayRefReturned()
             _clientMock.Setup(cm => cm.SendAsync(It.IsAny<LinkMobilityModel.Sms>()))
                 .ReturnsAsync(gatewayResult);
 
-            SmsClient smsClient = new(_clientMock.Object);
+            SmsClient smsClient = new(_clientMock.Object, _loggerMock.Object);
 
             // Act
             var result = await smsClient.SendAsync(new Notifications.Sms.Core.Sending.Sms());