implemented tests for notifications project #GCPActive

Altinn · Nov 13, 2023 · ef75ef6 · ef75ef6
1 parent c458592
commit ef75ef6
Show file tree

Hide file tree

Showing 17 changed files with 579 additions and 76 deletions.
diff --git a/src/Altinn.Notifications.Core/Models/Notification/EmailNotificationWithResult.cs b/src/Altinn.Notifications.Core/Models/Notification/EmailNotificationWithResult.cs
@@ -10,16 +10,16 @@ namespace Altinn.Notifications.Core.Models.Notification
     public class EmailNotificationWithResult : INotificationWithResult<EmailRecipient, EmailNotificationResultType>
     {
         /// <inheritdoc/>
-        public Guid Id { get; internal set; }
+        public Guid Id { get; }
 
         /// <inheritdoc/> 
         public bool Succeeded { get; internal set; }
 
         /// <inheritdoc/> 
-        public EmailRecipient Recipient { get; internal set; }
+        public EmailRecipient Recipient { get; }
 
         /// <inheritdoc/> 
-        public NotificationResult<EmailNotificationResultType> ResultStatus { get; internal set; }
+        public NotificationResult<EmailNotificationResultType> ResultStatus { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EmailNotificationWithResult"/> class.
@@ -30,5 +30,16 @@ public EmailNotificationWithResult(Guid id, EmailRecipient recipient, Notificati
             Recipient = recipient;
             ResultStatus = result;
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmailNotificationWithResult"/> class.
+        /// </summary>
+        internal EmailNotificationWithResult(Guid id, bool succeeded, EmailRecipient recipient, NotificationResult<EmailNotificationResultType> result)
+        {
+            Id = id;
+            Succeeded = succeeded;
+            Recipient = recipient;
+            ResultStatus = result;
+        }
     }
 }
diff --git a/src/Altinn.Notifications.Core/Services/NotificationSummaryService.cs b/src/Altinn.Notifications.Core/Services/NotificationSummaryService.cs
@@ -59,10 +59,12 @@ private void ProcessNotificationResults(EmailNotificationSummary summary)
         {
             summary.Generated = summary.Notifications.Count;
 
-            foreach (NotificationResult<EmailNotificationResultType> resultStatus in summary.Notifications.Select(n => n.ResultStatus))
+            foreach (EmailNotificationWithResult notification in summary.Notifications)
             {
+                NotificationResult<EmailNotificationResultType> resultStatus = notification.ResultStatus;
                 if (_successResults.Contains(resultStatus.Result))
                 {
+                    notification.Succeeded = true;
                     ++summary.Succeeded;
                 }
 

diff --git a/src/Altinn.Notifications/Mappers/NotificationSummaryMapper.cs b/src/Altinn.Notifications/Mappers/NotificationSummaryMapper.cs
@@ -27,28 +27,31 @@ public static EmailNotificationSummaryExt MapToEmailNotificationSummaryExt(this
         /// </summary>
         public static List<EmailNotificationWithResultExt> MapToEmailNotificationWithResultExt(this List<EmailNotificationWithResult> notifications)
         {
-            List<EmailNotificationWithResultExt> result = new List<EmailNotificationWithResultExt>();
+            List<EmailNotificationWithResultExt> result = notifications.Select(n => n.MapToEmailNotificationWithResultExt()).ToList();
 
-            foreach (var notification in notifications)
+            return result;
+        }
+
+        /// <summary>
+        /// Maps a  <see cref="EmailNotificationWithResult"/> to a <see cref="EmailNotificationWithResultExt"/>
+        /// </summary>       
+        public static EmailNotificationWithResultExt MapToEmailNotificationWithResultExt(this EmailNotificationWithResult notification)
+        {
+            return new EmailNotificationWithResultExt()
             {
-                result.Add(new EmailNotificationWithResultExt()
+                Id = notification.Id,
+                Succeeded = notification.Succeeded,
+                Recipient = new()
                 {
-                    Id = notification.Id,
-                    Succeeded = notification.Succeeded,
-                    Recipient = new()
-                    {
-                        EmailAddress = notification.Recipient.ToAddress
-                    },
-                    SendStatus = new()
-                    {
-                        Status = notification.ResultStatus.Result.ToString(),
-                        StatusDescription = notification.ResultStatus.ResultDescription,
-                        LastUpdate = notification.ResultStatus.ResultTime
-                    }
-                });
-            }
-
-            return result;
+                    EmailAddress = notification.Recipient.ToAddress
+                },
+                SendStatus = new()
+                {
+                    Status = notification.ResultStatus.Result.ToString(),
+                    StatusDescription = notification.ResultStatus.ResultDescription,
+                    LastUpdate = notification.ResultStatus.ResultTime
+                }
+            };
         }
     }
 }
diff --git a/src/Altinn.Notifications/Models/EmailNotificationSummaryExt.cs b/src/Altinn.Notifications/Models/EmailNotificationSummaryExt.cs
@@ -1,7 +1,5 @@
 using System.Text.Json.Serialization;
 
-using Altinn.Notifications.Models;
-
 namespace Altinn.Notifications.Core.Models.Notification
 {
     /// <summary>
@@ -15,56 +13,31 @@ public class EmailNotificationSummaryExt
         /// <summary>
         /// The order id
         /// </summary>
+        [JsonPropertyName("orderId")]
         public Guid OrderId { get; set; }
 
         /// <summary>
         /// The senders reference
         /// </summary>
+        [JsonPropertyName("sendersReference")]
         public string? SendersReference { get; set; }
 
         /// <summary>
         /// The number of generated email notifications
         /// </summary>
+        [JsonPropertyName("generated")]
         public int Generated { get; set; }
 
         /// <summary>
         /// The number of email notifications that were sent successfully
         /// </summary>
+        [JsonPropertyName("succeeded")]
         public int Succeeded { get; set; }
 
         /// <summary>
         /// A list of notifications with send result 
         /// </summary>
+        [JsonPropertyName("notifications")]
         public List<EmailNotificationWithResultExt> Notifications { get; set; } = new List<EmailNotificationWithResultExt>();
     }
-
-    /// <summary>
-    /// EmailNotificationWithResultExt class
-    /// </summary>
-    public class EmailNotificationWithResultExt
-    {
-        /// <summary>
-        /// The notification id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Boolean indicating if the sending of the notification was successful
-        /// </summary>
-        [JsonPropertyName("succeeded")]
-        public bool Succeeded { get; set; }
-
-        /// <summary>
-        /// The recipient of the notification
-        /// </summary>
-        [JsonPropertyName("recipient")]
-        public RecipientExt Recipient { get; set; } = new();
-
-        /// <summary>
-        /// The result status of the notification
-        /// </summary>
-        [JsonPropertyName("sendStatus")]
-        public StatusExt SendStatus { get; set; } = new();
-    }
 }
diff --git a/src/Altinn.Notifications/Models/EmailNotificationWithResultExt.cs b/src/Altinn.Notifications/Models/EmailNotificationWithResultExt.cs
@@ -0,0 +1,36 @@
+using System.Text.Json.Serialization;
+
+using Altinn.Notifications.Models;
+
+namespace Altinn.Notifications.Core.Models.Notification
+{
+    /// <summary>
+    /// EmailNotificationWithResultExt class
+    /// </summary>
+    public class EmailNotificationWithResultExt
+    {
+        /// <summary>
+        /// The notification id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// Boolean indicating if the sending of the notification was successful
+        /// </summary>
+        [JsonPropertyName("succeeded")]
+        public bool Succeeded { get; set; }
+
+        /// <summary>
+        /// The recipient of the notification
+        /// </summary>
+        [JsonPropertyName("recipient")]
+        public RecipientExt Recipient { get; set; } = new();
+
+        /// <summary>
+        /// The result status of the notification
+        /// </summary>
+        [JsonPropertyName("sendStatus")]
+        public StatusExt SendStatus { get; set; } = new();
+    }
+}
diff --git a/....IntegrationTests/Notifications.Integrations/TestingConsumers/EmailStatusConsumerTests.cs b/....IntegrationTests/Notifications.Integrations/TestingConsumers/EmailStatusConsumerTests.cs
@@ -60,9 +60,7 @@ public async Task DisposeAsync()
 
     protected virtual async Task Dispose(bool disposing)
     {
-        string sql = $"delete from notifications.orders where sendersreference = '{_sendersRef}'";
-
-        await PostgreUtil.RunSql(sql);
+        await PostgreUtil.DeleteOrderFromDb(_sendersRef);
         await KafkaUtil.DeleteTopicAsync(_statusUpdatedTopicName);
     }
 

diff --git a/...ntegrationTests/Notifications.Integrations/TestingConsumers/PastDueOrdersConsumerTests.cs b/...ntegrationTests/Notifications.Integrations/TestingConsumers/PastDueOrdersConsumerTests.cs
@@ -59,8 +59,7 @@ public async void Dispose()
 
     protected virtual async Task Dispose(bool disposing)
     {
-        string sql = $"delete from notifications.orders where sendersreference = '{_sendersRef}'";
-        await PostgreUtil.RunSql(sql);
+        await PostgreUtil.DeleteOrderFromDb(_sendersRef);
         await KafkaUtil.DeleteTopicAsync(_pastDueOrdersTopicName);
     }
 

diff --git a/...ationTests/Notifications.Integrations/TestingConsumers/PastDueOrdersRetryConsumerTests.cs b/...ationTests/Notifications.Integrations/TestingConsumers/PastDueOrdersRetryConsumerTests.cs
@@ -95,8 +95,7 @@ public async void Dispose()
     protected virtual async Task Dispose(bool disposing)
     {
         await KafkaUtil.DeleteTopicAsync(_retryTopicName);
-        string sql = $"delete from notifications.orders where sendersreference = '{_sendersRef}'";
-        await PostgreUtil.RunSql(sql);
+        await PostgreUtil.DeleteOrderFromDb(_sendersRef);
     }
 
     private static async Task<long> SelectCompletedOrderCount(Guid orderId)