removed from address prop from ext model (#269)

Altinn · Oct 10, 2023 · d569f5e · d569f5e
1 parent 6a13f0b
commit d569f5e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 19 deletions.
diff --git a/src/Altinn.Notifications/Mappers/OrderMapper.cs b/src/Altinn.Notifications/Mappers/OrderMapper.cs
@@ -18,7 +18,7 @@ public static class OrderMapper
     /// </summary>
     public static NotificationOrderRequest MapToOrderRequest(this EmailNotificationOrderRequestExt extRequest, string creator)
     {
-        var emailTemplate = new EmailTemplate(extRequest.FromAddress, extRequest.Subject, extRequest.Body, extRequest.ContentType);
+        var emailTemplate = new EmailTemplate(null, extRequest.Subject, extRequest.Body, extRequest.ContentType);
 
         var recipients = new List<Recipient>();
 

diff --git a/src/Altinn.Notifications/Models/EmailNotificationOrderRequestExt.cs b/src/Altinn.Notifications/Models/EmailNotificationOrderRequestExt.cs
@@ -13,12 +13,6 @@ namespace Altinn.Notifications.Models;
 /// </remarks>
 public class EmailNotificationOrderRequestExt
 {
-    /// <summary>
-    /// Gets or sets the from address to use as sender of the email
-    /// </summary>
-    [JsonPropertyName("fromAddress")]
-    public string? FromAddress { get; set; }
-
     /// <summary>
     /// Gets or sets the subject of the email 
     /// </summary>

diff --git a/...Notifications/EmailNotificationsOrderController/EmailNotificationOrdersControllerTests.cs b/...Notifications/EmailNotificationsOrderController/EmailNotificationOrdersControllerTests.cs
@@ -55,7 +55,6 @@ public EmailNotificationOrdersControllerTests(IntegrationTestWebApplicationFacto
         {
             Body = "email-body",
             ContentType = EmailContentType.Html,
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>() { new RecipientExt() { EmailAddress = "[email protected]" }, new RecipientExt() { EmailAddress = "[email protected]" } },
             SendersReference = "senders-reference",
             RequestedSendTime = DateTime.UtcNow,
@@ -181,8 +180,6 @@ public async Task Post_ServiceReturnsError_ServerError()
     public async Task Post_ServiceReturnsOrder_Accepted()
     {
         // Arrange
-        string expectedFromAddress = "[email protected]";
-
         Mock<IEmailNotificationOrderService> serviceMock = new();
         serviceMock.Setup(s => s.RegisterEmailNotificationOrder(It.IsAny<NotificationOrderRequest>()))
               .Callback<NotificationOrderRequest>(orderRequest =>
@@ -192,7 +189,7 @@ public async Task Post_ServiceReturnsOrder_Accepted()
                       .FirstOrDefault();
 
                   Assert.NotNull(emailTemplate);
-                  Assert.Equal(expectedFromAddress, emailTemplate.FromAddress);
+                  Assert.Equal(string.Empty, emailTemplate.FromAddress);
               })
             .ReturnsAsync((_order, null));
 

diff --git a/...tifications.IntegrationTests/Notifications/EmailNotificationsOrderController/PostTests.cs b/...tifications.IntegrationTests/Notifications/EmailNotificationsOrderController/PostTests.cs
@@ -39,7 +39,6 @@ public PostTests(IntegrationTestWebApplicationFactory<EmailNotificationOrdersCon
         {
             Body = "email-body",
             ContentType = EmailContentType.Html,
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>()
             {
                 new RecipientExt

diff --git a/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs b/test/Altinn.Notifications.Tests/Notifications/TestingMappers/OrderMapperTests.cs
@@ -128,7 +128,6 @@ public void MapToOrderRequest_RecipientsProvided_AreEquivalent()
         {
             Body = "email-body",
             ContentType = EmailContentType.Html,
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>() { new RecipientExt() { EmailAddress = "[email protected]" }, new RecipientExt() { EmailAddress = "[email protected]" } },
             SendersReference = "senders-reference",
             RequestedSendTime = sendTime,
@@ -142,7 +141,7 @@ public void MapToOrderRequest_RecipientsProvided_AreEquivalent()
             Templates = new List<INotificationTemplate>()
             {
                 new EmailTemplate(
-                    "[email protected]",
+                    string.Empty,
                     "email-subject",
                     "email-body",
                     EmailContentType.Html)

diff --git a/...ions.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs b/...ions.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs
@@ -27,7 +27,6 @@ public void Validate_RecipientProvided_ReturnsTrue()
         var order = new EmailNotificationOrderRequestExt()
         {
             Subject = "This is an email subject",
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>() { new RecipientExt() { Id = "16069412345", EmailAddress = "[email protected]" } },
             Body = "This is an email body"
         };
@@ -42,7 +41,6 @@ public void Validate_EmailNotDefinedForRecipient_ReturnFalse()
         var order = new EmailNotificationOrderRequestExt()
         {
             Subject = "This is an email subject",
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>() { new RecipientExt() { Id = "16069412345" } },
             Body = "This is an email body"
         };
@@ -59,7 +57,6 @@ public void Validate_SendTimePassed_ReturnsFalse()
         var order = new EmailNotificationOrderRequestExt()
         {
             Subject = "This is an email subject",
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>() { new RecipientExt() { Id = "16069412345", EmailAddress = "[email protected]" } },
             Body = "This is an email body",
             RequestedSendTime = DateTime.UtcNow.AddDays(-1)
@@ -76,7 +73,6 @@ public void Validate_SubjectMissing_ReturnsFalse()
     {
         var order = new EmailNotificationOrderRequestExt()
         {
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>() { new RecipientExt() { Id = "16069412345", EmailAddress = "[email protected]" } },
             Body = "This is an email body"
         };
@@ -92,7 +88,6 @@ public void Validate_BodyMissing_ReturnsFalse()
         var order = new EmailNotificationOrderRequestExt()
         {
             Subject = "This is an email subject",
-            FromAddress = "[email protected]",
             Recipients = new List<RecipientExt>() { new RecipientExt() { Id = "16069412345", EmailAddress = "[email protected]" } },
         };