Merge conflicts

Altinn · Sep 6, 2023 · 22414b4 · 22414b4
2 parents f4863cc + f89497a
commit 22414b4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/Altinn.Notifications.Core/Models/Email.cs b/src/Altinn.Notifications.Core/Models/Email.cs
@@ -43,9 +43,9 @@ public class Email
     /// <summary>
     /// Initializes a new instance of the <see cref="Email"/> class.
     /// </summary>
-    public Email(Guid id, string subject, string body, string fromAddress, string toAddress, EmailContentType contentType)
+    public Email(Guid notificationId, string subject, string body, string fromAddress, string toAddress, EmailContentType contentType)
     {
-        NotificationId = id;
+        NotificationId = notificationId;
         Subject = subject;
         Body = body;
         FromAddress = fromAddress;

diff --git a/src/Altinn.Notifications/Validators/EmailNotificationOrderRequestValidator.cs b/src/Altinn.Notifications/Validators/EmailNotificationOrderRequestValidator.cs
@@ -5,7 +5,7 @@
 namespace Altinn.Notifications.Validators;
 
 /// <summary>
-/// Claass contining validation logic for the <see cref="EmailNotificationOrderRequestExt"/> model
+/// Class containing validation logic for the <see cref="EmailNotificationOrderRequestExt"/> model
 /// </summary>
 public class EmailNotificationOrderRequestValidator : AbstractValidator<EmailNotificationOrderRequestExt>
 {
@@ -22,7 +22,7 @@ public EmailNotificationOrderRequestValidator()
 
         RuleFor(order => order.RequestedSendTime)
           .Must(sendTime => sendTime >= DateTime.UtcNow.AddMinutes(-5))
-          .WithMessage("Send time must be in the future. Leave blank to send immediatly.");
+          .WithMessage("Send time must be in the future. Leave blank to send immediately.");
 
         RuleFor(order => order.Body).NotEmpty();
         RuleFor(order => order.Subject).NotEmpty();

diff --git a/src/Altinn.Notifications/appsettings.json b/src/Altinn.Notifications/appsettings.json
@@ -30,7 +30,7 @@
         "altinn.notifications.health.check",
         "altinn.notifications.orders.pastdue",
         "altinn.notifications.orders.pastdue.retry",
-        "altinn.notification.email.queue"
+        "altinn.notifications.email.queue"
       ]
     }
   },

diff --git a/test/Altinn.Notifications.Tests/Notifications.Core/TestingModels/EmailTests.cs b/test/Altinn.Notifications.Tests/Notifications.Core/TestingModels/EmailTests.cs
@@ -18,7 +18,7 @@ public EmailTests()
         _email = new Email(id, "subject", "body", "[email protected]", "[email protected]", EmailContentType.Html);
         _serializedEmail = new JsonObject()
         {
-            { "id", id },
+            { "notificationId", id },
              { "subject", "subject" },
             {"body", "body" },
             {"fromAddress", "[email protected]" },

diff --git a/...ions.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs b/...ions.Tests/Notifications/TestingValidators/EmailNotificationOrderRequestValidatorTests.cs
@@ -68,7 +68,7 @@ public void Validate_SendTimePassed_ReturnsFalse()
         var actual = _validator.Validate(order);
 
         Assert.False(actual.IsValid);
-        Assert.Contains(actual.Errors, a => a.ErrorMessage.Equals("Send time must be in the future. Leave blank to send immediatly."));
+        Assert.Contains(actual.Errors, a => a.ErrorMessage.Equals("Send time must be in the future. Leave blank to send immediately."));
     }
 
     [Fact]

diff --git a/test/k6/docker-compose.yml b/test/k6/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 
 services:
   k6:
-    image: loadimpact/k6:0.46.0
+    image: grafana/k6:0.46.0
     networks:
       - k6
     ports:

diff --git a/test/k6/src/data/orders/01-email-request.json b/test/k6/src/data/orders/01-email-request.json
@@ -2,5 +2,5 @@
 	"subject": "Automated email from Altinn",
 	"body": "This is an automated email generated during testing of Altinn Notifications",
 	"content-type": "Html",
-	"fromAddress": "noreply@altinn.no"
-}
+	"fromAddress": "noreply@altinn.cloud"
+}