Reverted changes to other components

Altinn · Nov 16, 2023 · e4481ed · e4481ed
1 parent fa2fa28
commit e4481ed
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 25 deletions.
diff --git a/src/Models/ServiceError.cs b/src/Models/ServiceError.cs
@@ -1,4 +1,4 @@
-namespace LocalTest.Models
+namespace Altinn.Platform.Storage.Models
 {
     /// <summary>
     /// A class representing a service error object used to transfere error information from service to controller.

diff --git a/src/Notifications/API/Controllers/EmailNotificationOrderRequestValidator.cs b/src/Notifications/API/Controllers/EmailNotificationOrderRequestValidator.cs
@@ -1,7 +1,8 @@
 using System.Text.RegularExpressions;
 
 using FluentValidation;
-using LocalTest.Notifications.Models.API;
+
+using LocalTest.Notifications.API.Models;
 
 namespace LocalTest.Notifications.Controllers;
 

diff --git a/src/Notifications/API/Controllers/EmailNotificationOrdersController.cs b/src/Notifications/API/Controllers/EmailNotificationOrdersController.cs
@@ -1,12 +1,14 @@
-using Altinn.Notifications.Mappers;
+using Altinn.Notifications.Core.Models;
 
 using FluentValidation;
 
-using LocalTest.Models;
+using LocalTest.Notifications.API.Controllers;
+using LocalTest.Notifications.API.Extensions;
+using LocalTest.Notifications.API.Mappers;
+using LocalTest.Notifications.API.Models;
 using LocalTest.Notifications.Core.Models.Orders;
 using LocalTest.Notifications.Core.Services;
-using LocalTest.Notifications.Extensions;
-using LocalTest.Notifications.Models.API;
+
 using Microsoft.AspNetCore.Mvc;
 
 namespace LocalTest.Notifications.Controllers;

diff --git a/src/Mappers/Notifications/OrderMapper.cs → src/Notifications/API/Mappers/OrderMapper.cs b/src/Mappers/Notifications/OrderMapper.cs → src/Notifications/API/Mappers/OrderMapper.cs
@@ -6,7 +6,7 @@
 using LocalTest.Notifications.Core.Models.NotificationTemplate;
 using LocalTest.Notifications.Core.Models.Orders;
 
-namespace Altinn.Notifications.Mappers;
+namespace LocalTest.Notifications.API.Mappers;
 
 /// <summary>
 /// Mapper for <see cref="EmailNotificationOrderRequestExt"/>
@@ -156,7 +156,7 @@ private static IBaseNotificationOrderExt MapBaseNotificationOrder(this IBaseNoti
         return orderExt;
     }
 
-    private static string? GetEmailFromAddressList(List<IAddressPoint> addressPoints)
+    private static string GetEmailFromAddressList(List<IAddressPoint> addressPoints)
     {
         var emailAddressPoint = addressPoints
             .Find(a => a.AddressType.Equals(AddressType.Email))

diff --git a/src/Notifications/API/Models/EmailNotificationWithResultExt.cs b/src/Notifications/API/Models/EmailNotificationWithResultExt.cs
@@ -1,5 +1,7 @@
 using System.Text.Json.Serialization;
 
+using LocalTest.Notifications.Models.API;
+
 namespace LocalTest.Notifications.API.Models
 {
     /// <summary>

diff --git a/src/Notifications/API/Models/NotificationOrderWithStatusExt.cs b/src/Notifications/API/Models/NotificationOrderWithStatusExt.cs
@@ -1,5 +1,7 @@
 using System.Text.Json.Serialization;
 
+using LocalTest.Notifications.Models.API;
+
 namespace LocalTest.Notifications.API.Models;
 
 /// <summary>

diff --git a/src/Notifications/Core/Models/Notification/SendOperationResult.cs b/src/Notifications/Core/Models/Notification/SendOperationResult.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Altinn.Notifications.Core.Models.Orders;
+
 using LocalTest.Notifications.Core.Models.Enums;
 
 namespace LocalTest.Notifications.Core.Models.Notification;

diff --git a/src/Notifications/Core/Models/ServiceError.cs b/src/Notifications/Core/Models/ServiceError.cs
@@ -1,4 +1,4 @@
-namespace LocalTest.Notifications.Core.Models;
+namespace Altinn.Notifications.Core.Models;
 
 /// <summary>
 /// A class representing a service error object used to transfere error information from service to controller.
@@ -14,7 +14,7 @@ public class ServiceError
     /// <summary>
     /// The error message
     /// </summary>
-    public string ErrorMessage { get; private set; }
+    public string? ErrorMessage { get; private set; }
 
     /// <summary>
     /// Create a new instance of a service error

diff --git a/src/Notifications/Core/Services/EmailNotificationOrderService.cs b/src/Notifications/Core/Services/EmailNotificationOrderService.cs
@@ -1,4 +1,6 @@
-using LocalTest.Models;
+using Altinn.Notifications.Core.Models;
+
+using LocalTest.Models;
 using LocalTest.Notifications.Core.Models.NotificationTemplate;
 using LocalTest.Notifications.Core.Models.Orders;
 using LocalTest.Notifications.Core.Repository;

diff --git a/src/Notifications/Core/Services/IEmailNotificationOrderService.cs b/src/Notifications/Core/Services/IEmailNotificationOrderService.cs
@@ -1,4 +1,5 @@
-using LocalTest.Models;
+using Altinn.Notifications.Core.Models;
+
 using LocalTest.Notifications.Core.Models.Orders;
 
 namespace LocalTest.Notifications.Core.Services;

diff --git a/src/Services/Storage/Implementation/ApplicationService.cs b/src/Services/Storage/Implementation/ApplicationService.cs
@@ -1,8 +1,7 @@
 using Altinn.Platform.Storage.Interface.Models;
+using Altinn.Platform.Storage.Models;
 using Altinn.Platform.Storage.Repository;
 
-using LocalTest.Models;
-
 namespace Altinn.Platform.Storage.Services
 {
     /// <summary>

diff --git a/src/Services/Storage/Implementation/DataService.cs b/src/Services/Storage/Implementation/DataService.cs
@@ -7,10 +7,9 @@
 
 using Altinn.Platform.Storage.Clients;
 using Altinn.Platform.Storage.Interface.Models;
+using Altinn.Platform.Storage.Models;
 using Altinn.Platform.Storage.Repository;
 
-using LocalTest.Models;
-
 namespace Altinn.Platform.Storage.Services
 {
     /// <summary>

diff --git a/src/Services/Storage/Implementation/InstanceService.cs b/src/Services/Storage/Implementation/InstanceService.cs
@@ -5,10 +5,9 @@
 using Altinn.Platform.Storage.Helpers;
 using Altinn.Platform.Storage.Interface.Enums;
 using Altinn.Platform.Storage.Interface.Models;
+using Altinn.Platform.Storage.Models;
 using Altinn.Platform.Storage.Repository;
 
-using LocalTest.Models;
-
 using Newtonsoft.Json;
 
 namespace Altinn.Platform.Storage.Services

diff --git a/src/Services/Storage/Interface/IApplicationService.cs b/src/Services/Storage/Interface/IApplicationService.cs
@@ -1,4 +1,4 @@
-using LocalTest.Models;
+using Altinn.Platform.Storage.Models;
 
 namespace Altinn.Platform.Storage.Services
 {

diff --git a/src/Services/Storage/Interface/IDataService.cs b/src/Services/Storage/Interface/IDataService.cs
@@ -4,8 +4,7 @@
 using System.Threading.Tasks;
 
 using Altinn.Platform.Storage.Interface.Models;
-
-using LocalTest.Models;
+using Altinn.Platform.Storage.Models;
 
 namespace Altinn.Platform.Storage.Services
 {

diff --git a/src/Services/Storage/Interface/IInstanceService.cs b/src/Services/Storage/Interface/IInstanceService.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Threading.Tasks;
-
 using Altinn.Platform.Storage.Interface.Models;
-
-using LocalTest.Models;
+using Altinn.Platform.Storage.Models;
 
 namespace Altinn.Platform.Storage.Services
 {

diff --git a/src/Startup.cs b/src/Startup.cs
@@ -63,6 +63,8 @@
 using LocalTest.Notifications.Core.Services;
 using LocalTest.Notifications.Core.Repository;
 using LocalTest.Notifications.Persistence.Repository;
+using LocalTest.Notifications.API.Models;
+using LocalTest.Notifications.API.Extensions;
 
 namespace LocalTest
 {