My suggested changes to feature/notifications (#65)

src/LocalTest.csproj

@@ -4,6 +4,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>56f36ce2-b44b-415e-a8a5-f399a76e35b9</UserSecretsId>
     <ImplicitUsings>enable</ImplicitUsings>
+
+    <!-- Allow copied code to use #if LOCALTEST to maintain changes for localtest from core services -->
+    <DefineConstants>$(DefineConstants);LOCALTEST</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

src/Notifications/API/Controllers/EmailNotificationOrdersController.cs

@@ -1,4 +1,8 @@
-using Altinn.Notifications.Core.Models;
+#nullable enable
+#if !LOCALTEST
+using Altinn.Notifications.Configuration;
+#endif
+using Altinn.Notifications.Core.Models;
 using Altinn.Notifications.Core.Models.Orders;
 using Altinn.Notifications.Core.Services.Interfaces;
 using Altinn.Notifications.Extensions;
@@ -8,15 +12,28 @@
 
 using FluentValidation;
 
+#if !LOCALTEST
+using Microsoft.AspNetCore.Authorization;
+#endif
 using Microsoft.AspNetCore.Mvc;
 
+#if !LOCALTEST
+using Swashbuckle.AspNetCore.Annotations;
+using Swashbuckle.AspNetCore.Filters;
+#endif
+
 namespace Altinn.Notifications.Controllers;
 
 /// <summary>
 /// Controller for all operations related to email notification orders
 /// </summary>
 [Route("notifications/api/v1/orders/email")]
 [ApiController]
+#if !LOCALTEST
+[Authorize(Policy = AuthorizationConstants.POLICY_CREATE_SCOPE_OR_PLATFORM_ACCESS)]
+[SwaggerResponse(401, "Caller is unauthorized")]
+[SwaggerResponse(403, "Caller is not authorized to access the requested resource")]
+# endif
 public class EmailNotificationOrdersController : ControllerBase
 {
     private readonly IValidator<EmailNotificationOrderRequestExt> _validator;
@@ -42,6 +59,11 @@ public EmailNotificationOrdersController(IValidator<EmailNotificationOrderReques
     [HttpPost]
     [Consumes("application/json")]
     [Produces("application/json")]
+#if !LOCALTEST
+    [SwaggerResponse(202, "The notification order was accepted", typeof(OrderIdExt))]
+    [SwaggerResponse(400, "The notification order is invalid", typeof(ValidationProblemDetails))]
+    [SwaggerResponseHeader(202, "Location", "string", "Link to access the newly created notification order.")]
+#endif
     public async Task<ActionResult<OrderIdExt>> Post(EmailNotificationOrderRequestExt emailNotificationOrderRequest)
     {
         var validationResult = _validator.Validate(emailNotificationOrderRequest);
@@ -51,10 +73,19 @@ public async Task<ActionResult<OrderIdExt>> Post(EmailNotificationOrderRequestEx
             return ValidationProblem(ModelState);
         }
 
+#if LOCALTEST
         string creator = "localtest";
+#else
+        string? creator = HttpContext.GetOrg();
+
+        if (creator == null)
+        {
+            return Forbid();
+        }
+#endif
 
         var orderRequest = emailNotificationOrderRequest.MapToOrderRequest(creator);
-        (NotificationOrder registeredOrder, ServiceError error) = await _orderService.RegisterEmailNotificationOrder(orderRequest);
+        (NotificationOrder? registeredOrder, ServiceError? error) = await _orderService.RegisterEmailNotificationOrder(orderRequest);
 
         if (error != null)
         {

src/Notifications/API/Models/EmailContentTypeExt.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Models;
+#nullable enable
+namespace Altinn.Notifications.Models;
 
 /// <summary>
 /// Enum describing available content types for an email.

src/Notifications/API/Models/EmailNotificationWithResultExt.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 using Altinn.Notifications.Models;
 

src/Notifications/API/Models/EmailTemplateExt.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 namespace Altinn.Notifications.Models;
 

src/Notifications/API/Models/NotificationChannelExt.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Models;
+#nullable enable
+namespace Altinn.Notifications.Models;
 
 /// <summary>
 /// Enum describing available notification channels.

src/Notifications/API/Models/NotificationOrderListExt.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 namespace Altinn.Notifications.Models;
 

src/Notifications/API/Models/NotificationResourceLinksExt.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 namespace Altinn.Notifications.Models;
 

src/Notifications/API/Models/NotificationStatusExt.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 namespace Altinn.Notifications.Models;
 

src/Notifications/API/Models/OrderIdExt.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 namespace Altinn.Notifications.Models;
 

src/Notifications/API/Models/OrderResourceLinksExt.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 namespace Altinn.Notifications.Models;
 

src/Notifications/API/Controllers/ValidationResultExtensions.cs → src/Notifications/API/Validators/ValidationResultExtensions.cs

@@ -1,4 +1,5 @@
-using FluentValidation.Results;
+#nullable enable
+using FluentValidation.Results;
 
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 

src/Notifications/Core/Configuration/NotificationOrderConfig.cs

@@ -0,0 +1,13 @@
+#nullable enable
+namespace Altinn.Notifications.Core.Configuration;
+
+/// <summary>
+/// Configuration class for notification orders
+/// </summary>
+public class NotificationOrderConfig
+{
+    /// <summary>
+    /// Default from address for email notifications
+    /// </summary>
+    public string DefaultEmailFromAddress { get; set; } = string.Empty;
+}

src/Notifications/Core/Enums/AddressType.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Enums;
+#nullable enable
+namespace Altinn.Notifications.Core.Enums;
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 /// <summary>

src/Notifications/Core/Enums/EmailContentType.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Enums;
+#nullable enable
+namespace Altinn.Notifications.Core.Enums;
 
 /// <summary>
 /// Enum describing available email content types

src/Notifications/Core/Enums/EmailNotificationResultType.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Enums;
+#nullable enable
+namespace Altinn.Notifications.Core.Enums;
 
 /// <summary>
 /// Enum describing email notification result types

src/Notifications/Core/Enums/IResultType.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Enums;
+#nullable enable
+namespace Altinn.Notifications.Core.Enums;
 
 /// <summary>
 /// Base class for send result of a notification

src/Notifications/Core/Enums/NotificationChannel.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Enums;
+#nullable enable
+namespace Altinn.Notifications.Core.Enums;
 
 /// <summary>
 /// Enum describing available notification channels.

src/Notifications/Core/Enums/NotificationTemplateType.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Enums;
+#nullable enable
+namespace Altinn.Notifications.Core.Enums;
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 /// <summary>

src/Notifications/Core/Enums/OrderProcessingStatus.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Enums;
+#nullable enable
+namespace Altinn.Notifications.Core.Enums;
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 /// <summary>

src/Notifications/Core/Models/Address/EmailAddressPoint.cs

@@ -1,4 +1,5 @@
-using Altinn.Notifications.Core.Enums;
+#nullable enable
+using Altinn.Notifications.Core.Enums;
 
 namespace Altinn.Notifications.Core.Models.Address;
 

src/Notifications/Core/Models/Address/IAddressPoint.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 using Altinn.Notifications.Core.Enums;
 

src/Notifications/Core/Models/Creator.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Models;
+#nullable enable
+namespace Altinn.Notifications.Core.Models;
 
 /// <summary>
 /// A class representing a notification creator 

src/Notifications/Core/Models/Email.cs

@@ -1,4 +1,5 @@
-using System.Text.Json;
+#nullable enable
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 using Altinn.Notifications.Core.Enums;

src/Notifications/Core/Models/Notification/EmailNotificationWithResult.cs

@@ -1,4 +1,5 @@
-using Altinn.Notifications.Core.Enums;
+#nullable enable
+using Altinn.Notifications.Core.Enums;
 using Altinn.Notifications.Core.Models.Recipients;
 
 namespace Altinn.Notifications.Core.Models.Notification

src/Notifications/Core/Models/Notification/INotification.cs

@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 
 using Altinn.Notifications.Core.Enums;
 

src/Notifications/Core/Models/Notification/INotificationWithResult.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Models.Notification;
+#nullable enable
+namespace Altinn.Notifications.Core.Models.Notification;
 
 /// <summary>
 /// Interface representing a notification object with send result data

src/Notifications/Core/Models/Notification/SendOperationResult.cs

@@ -1,8 +1,8 @@
 #nullable enable
 using System.Text.Json;
 using System.Text.Json.Serialization;
-
 using Altinn.Notifications.Core.Enums;
+using Altinn.Notifications.Core.Models.Orders;
 
 namespace Altinn.Notifications.Core.Models.Notification;
 

src/Notifications/Core/Models/NotificationTemplate/INotificationTemplate.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+#nullable enable
+using System.Text.Json.Serialization;
 
 using Altinn.Notifications.Core.Enums;
 

src/Notifications/Core/Models/Recipient.cs

@@ -1,4 +1,5 @@
-using Altinn.Notifications.Core.Models.Address;
+#nullable enable
+using Altinn.Notifications.Core.Models.Address;
 
 namespace Altinn.Notifications.Core.Models;
 

src/Notifications/Core/Services/DateTimeService.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+#nullable enable
+using System.Diagnostics.CodeAnalysis;
 
 using Altinn.Notifications.Core.Services.Interfaces;
 

src/Notifications/Core/Services/EmailNotificationOrderService.cs

@@ -1,10 +1,13 @@
 #nullable enable
+using Altinn.Notifications.Core.Configuration;
 using Altinn.Notifications.Core.Models;
 using Altinn.Notifications.Core.Models.NotificationTemplate;
 using Altinn.Notifications.Core.Models.Orders;
 using Altinn.Notifications.Core.Repository.Interfaces;
 using Altinn.Notifications.Core.Services.Interfaces;
 
+using Microsoft.Extensions.Options;
+
 namespace Altinn.Notifications.Core.Services;
 
 /// <summary>
@@ -20,12 +23,12 @@ public class EmailNotificationOrderService : IEmailNotificationOrderService
     /// <summary>
     /// Initializes a new instance of the <see cref="EmailNotificationOrderService"/> class.
     /// </summary>
-    public EmailNotificationOrderService(IOrderRepository repository, IGuidService guid, IDateTimeService dateTime)
+    public EmailNotificationOrderService(IOrderRepository repository, IGuidService guid, IDateTimeService dateTime, IOptions<NotificationOrderConfig> config)
     {
         _repository = repository;
         _guid = guid;
         _dateTime = dateTime;
-        _defaultFromAddress = "localtest@altinn.no";
+        _defaultFromAddress = config.Value.DefaultEmailFromAddress;
     }
 
     /// <inheritdoc/>

src/Notifications/Core/Services/GuidService.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+#nullable enable
+using System.Diagnostics.CodeAnalysis;
 
 using Altinn.Notifications.Core.Services.Interfaces;
 

src/Notifications/Core/Services/Interfaces/IDateTimeService.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Services.Interfaces;
+#nullable enable
+namespace Altinn.Notifications.Core.Services.Interfaces;
 
 /// <summary>
 /// Interface describing a dateTime service

src/Notifications/Core/Services/Interfaces/IGuidService.cs

@@ -1,4 +1,5 @@
-namespace Altinn.Notifications.Core.Services.Interfaces;
+#nullable enable
+namespace Altinn.Notifications.Core.Services.Interfaces;
 
 /// <summary>
 /// Interface describing a guid service