Extended notificationOrderExt with sms properties (#410)

Altinn · Feb 5, 2024 · ffbd840 · ffbd840
1 parent 682f951
commit ffbd840
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 6 deletions.
diff --git a/src/Altinn.Notifications/Mappers/OrderMapper.cs b/src/Altinn.Notifications/Mappers/OrderMapper.cs
@@ -28,7 +28,7 @@ public static NotificationOrderRequest MapToOrderRequest(this EmailNotificationO
         return new NotificationOrderRequest(
             extRequest.SendersReference,
             creator,
-            new List<INotificationTemplate>() { emailTemplate },
+            [emailTemplate],
             extRequest.RequestedSendTime.ToUniversalTime(),
             NotificationChannel.Email,
             recipients);
@@ -49,7 +49,7 @@ public static NotificationOrderRequest MapToOrderRequest(this SmsNotificationOrd
         return new NotificationOrderRequest(
             extRequest.SendersReference,
             creator,
-            new List<INotificationTemplate>() { smsTemplate },
+            [smsTemplate],
             extRequest.RequestedSendTime.ToUniversalTime(),
             NotificationChannel.Sms,
             recipients);
@@ -81,7 +81,13 @@ public static NotificationOrderExt MapToNotificationOrderExt(this NotificationOr
                     };
 
                     break;
-                default:
+                case NotificationTemplateType.Sms:
+                    var smsTemplate = template! as SmsTemplate;
+                    orderExt.SmsTemplate = new()
+                    {
+                        Body = smsTemplate!.Body,
+                        SenderNumber = smsTemplate.SenderNumber
+                    };
                     break;
             }
         }
@@ -160,7 +166,7 @@ internal static List<RecipientExt> MapToRecipientExt(this List<Recipient> recipi
             recipients.Select(r => new RecipientExt
             {
                 EmailAddress = GetEmailFromAddressList(r.AddressInfo),
-                MobileNumber = GetMobileNumberFromAddressList(r.AddressInfo) 
+                MobileNumber = GetMobileNumberFromAddressList(r.AddressInfo)
             }));
 
         return recipientExt;

diff --git a/src/Altinn.Notifications/Models/NotificationOrderExt.cs b/src/Altinn.Notifications/Models/NotificationOrderExt.cs
@@ -47,6 +47,12 @@ public class NotificationOrderExt : IBaseNotificationOrderExt
     [JsonPropertyName("emailTemplate")]
     public EmailTemplateExt? EmailTemplate { get; set; }
 
+    /// <summary>
+    /// Gets or sets the smsTemplate
+    /// </summary>
+    [JsonPropertyName("smsTemplate")]
+    public SmsTemplateExt? SmsTemplate { get; set; }
+
     /// <summary>
     /// Gets or sets the link of the order
     /// </summary>

diff --git a/src/Altinn.Notifications/Models/SmsTemplateExt.cs b/src/Altinn.Notifications/Models/SmsTemplateExt.cs
@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+
+namespace Altinn.Notifications.Models
+{
+    /// <summary>
+    /// Template for an sms notification
+    /// </summary>
+    public class SmsTemplateExt
+    {
+        /// <summary>
+        /// Gets the number from which the SMS is created by the template    
+        /// </summary>
+        [JsonPropertyName("senderNumber")]
+        public string SenderNumber { get; internal set; } = string.Empty;
+
+        /// <summary>
+        /// Gets the body of SMSs created by the template    
+        /// </summary>
+        [JsonPropertyName("body")]
+        public string Body { get; internal set; } = string.Empty;
+    }
+}
diff --git a/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs b/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs
@@ -32,12 +32,15 @@ public void MapToNotificationOrderExt_AreEquivalent()
         {
             Id = Guid.NewGuid(),
             SendersReference = "ref1337",
-            Templates = new List<INotificationTemplate>() { new EmailTemplate("from@domain.com", "email-subject", "email-body", EmailContentType.Plain) },
+            Templates = [
+                new EmailTemplate("from@domain.com", "email-subject", "email-body", EmailContentType.Plain),
+                new SmsTemplate("Altinn-test", "This is a text message")
+            ],
             RequestedSendTime = sendTime,
             NotificationChannel = NotificationChannel.Email,
             Creator = new Creator("ttd"),
             Created = created,
-            Recipients = new List<Recipient>()
+            Recipients = []
         };
 
         NotificationOrderExt expected = new()
@@ -56,6 +59,11 @@ public void MapToNotificationOrderExt_AreEquivalent()
                 FromAddress = "from@domain.com",
                 Subject = "email-subject"
             },
+            SmsTemplate = new SmsTemplateExt
+            {
+                Body = "This is a text message",
+                SenderNumber = "Altinn-test"
+            },
             Links = new OrderResourceLinksExt()
             {
                 Self = $"https://platform.at22.altinn.cloud/notifications/api/v1/orders/{order.Id}",