Chore/change to ignore reservation

Test/Altinn.Correspondence.Tests/CorrespondenceControllerTests.cs

@@ -1367,7 +1367,7 @@ private MultipartFormDataContent CorrespondenceToFormData(BaseCorrespondenceExt
             { new StringContent(correspondence.Content.MessageSummary), "correspondence.content.MessageSummary" },
             { new StringContent(correspondence.Content.MessageBody), "correspondence.content.MessageBody" },
             { new StringContent(correspondence.Content.Language), "correspondence.content.Language" },
-            { new StringContent((correspondence.IsReservable ?? false).ToString()), "correspondence.isReservable" },
+            { new StringContent((correspondence.IgnoreReservation ?? false).ToString()), "correspondence.IgnoreReservation" },
         };
         if (correspondence.Notification != null)
         {

Test/Altinn.Correspondence.Tests/Factories/CorrespondenceBuilder.cs

@@ -35,7 +35,7 @@ public CorrespondenceBuilder CreateCorrespondence()
                         {"culpa_852", "2"},
                         {"anim5", "3"}
                     },
-                    IsReservable = true
+                    IgnoreReservation = false
                 },
                 Recipients = new List<string>(){
                     "0192:991825827",   // org number

altinn-correspondence-v1.json

@@ -358,7 +358,7 @@
                                             "$ref": "#/components/schemas/InitializeCorrespondenceNotificationExt"
                                         }
                                     },
-                                    "Correspondence.IsReservable": {
+                                    "Correspondence.IgnoreReservation": {
                                         "type": "boolean"
                                     },
                                     "Recipients": {
@@ -432,7 +432,7 @@
                                 "Correspondence.Notifications": {
                                     "style": "form"
                                 },
-                                "Correspondence.IsReservable": {
+                                "Correspondence.IgnoreReservation": {
                                     "style": "form"
                                 },
                                 "Recipients": {
@@ -998,7 +998,7 @@
                         },
                         "nullable": true
                     },
-                    "isReservable": {
+                    "IgnoreReservation": {
                         "type": "boolean",
                         "nullable": true
                     }
@@ -1197,7 +1197,7 @@
                         },
                         "nullable": true
                     },
-                    "isReservable": {
+                    "IgnoreReservation": {
                         "type": "boolean",
                         "nullable": true
                     },
@@ -1386,7 +1386,7 @@
                         },
                         "nullable": true
                     },
-                    "isReservable": {
+                    "IgnoreReservation": {
                         "type": "boolean",
                         "nullable": true
                     },

src/Altinn.Correspondence.API/Mappers/CorrespondenceDetailsMapper.cs

@@ -26,7 +26,7 @@ internal static CorrespondenceDetailsExt MapToExternal(GetCorrespondenceDetailsR
             ExternalReferences = correspondenceDetails.ExternalReferences != null ? ExternalReferenceMapper.MapListToExternal(correspondenceDetails.ExternalReferences) : new List<ExternalReferenceExt>(),
             ResourceId = correspondenceDetails.ResourceId.ToString(),
             VisibleFrom = correspondenceDetails.VisibleFrom,
-            IsReservable = correspondenceDetails.IsReservable,
+            IgnoreReservation = correspondenceDetails.IgnoreReservation,
             MarkedUnread = correspondenceDetails.MarkedUnread,
             AllowSystemDeleteAfter = correspondenceDetails.AllowSystemDeleteAfter,
             DueDateTime = correspondenceDetails.DueDateTime,

src/Altinn.Correspondence.API/Mappers/CorrespondenceOverviewMapper.cs

@@ -28,7 +28,7 @@ internal static CorrespondenceOverviewExt MapToExternal(GetCorrespondenceOvervie
             AllowSystemDeleteAfter = correspondenceOverview.AllowSystemDeleteAfter,
             DueDateTime = correspondenceOverview.DueDateTime,
             PropertyList = correspondenceOverview.PropertyList,
-            IsReservable = correspondenceOverview.IsReservable
+            IgnoreReservation = correspondenceOverview.IgnoreReservation
         };
         return Correspondence;
     }

src/Altinn.Correspondence.API/Mappers/InitializeCorrespondencesMapper.cs

@@ -20,7 +20,7 @@ internal static InitializeCorrespondencesRequest MapToRequest(BaseCorrespondence
             DueDateTime = initializeCorrespondenceExt.DueDateTime,
             PropertyList = initializeCorrespondenceExt.PropertyList,
             ReplyOptions = initializeCorrespondenceExt.ReplyOptions != null ? CorrespondenceReplyOptionsMapper.MapListToEntities(initializeCorrespondenceExt.ReplyOptions) : new List<CorrespondenceReplyOptionEntity>(),
-            IsReservable = initializeCorrespondenceExt.IsReservable,
+            IgnoreReservation = initializeCorrespondenceExt.IgnoreReservation,
             ExternalReferences = initializeCorrespondenceExt.ExternalReferences != null ? ExternalReferenceMapper.MapListToEntities(initializeCorrespondenceExt.ExternalReferences) : new List<ExternalReferenceEntity>(),
             Statuses = new List<CorrespondenceStatusEntity>(),
             Created = DateTimeOffset.UtcNow,

src/Altinn.Correspondence.API/Mappers/MigrateCorrespondenceMapper.cs

@@ -37,7 +37,7 @@ internal static MigrateCorrespondenceRequest MapToRequest(MigrateCorrespondenceE
             DueDateTime = migrateCorrespondenceExt.CorrespondenceData.Correspondence.DueDateTime,
             PropertyList = migrateCorrespondenceExt.CorrespondenceData.Correspondence.PropertyList,
             ReplyOptions = migrateCorrespondenceExt.CorrespondenceData.Correspondence.ReplyOptions != null ? CorrespondenceReplyOptionsMapper.MapListToEntities(migrateCorrespondenceExt.CorrespondenceData.Correspondence.ReplyOptions) : new List<CorrespondenceReplyOptionEntity>(),
-            IsReservable = migrateCorrespondenceExt.CorrespondenceData.Correspondence.IsReservable,
+            IgnoreReservation = migrateCorrespondenceExt.CorrespondenceData.Correspondence.IgnoreReservation,
             ExternalReferences = migrateCorrespondenceExt.CorrespondenceData.Correspondence.ExternalReferences != null ? ExternalReferenceMapper.MapListToEntities(migrateCorrespondenceExt.CorrespondenceData.Correspondence.ExternalReferences) : new List<ExternalReferenceEntity>(),
             Created = DateTimeOffset.UtcNow,
             Content = migrateCorrespondenceExt.CorrespondenceData.Correspondence.Content != null ? new CorrespondenceContentEntity

src/Altinn.Correspondence.API/Models/BaseCorrespondenceExt.cs

@@ -98,8 +98,8 @@ public class BaseCorrespondenceExt
         /// <summary>
         /// Specifies whether the correspondence can override reservation against digital comminication in KRR
         /// </summary>
-        [JsonPropertyName("isReservable")]
-        public bool? IsReservable { get; set; }
+        [JsonPropertyName("IgnoreReservation")]
+        public bool? IgnoreReservation { get; set; }
     }
 
     [AttributeUsage(AttributeTargets.Property)]

src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsHandler.cs

@@ -92,7 +92,7 @@ await _correspondenceStatusRepository.AddCorrespondenceStatus(new Correspondence
             ExternalReferences = correspondence.ExternalReferences ?? new List<ExternalReferenceEntity>(),
             ResourceId = correspondence.ResourceId,
             VisibleFrom = correspondence.VisibleFrom,
-            IsReservable = correspondence.IsReservable == null || correspondence.IsReservable.Value,
+            IgnoreReservation = correspondence.IgnoreReservation ?? false,
             MarkedUnread = correspondence.MarkedUnread,
             AllowSystemDeleteAfter = correspondence.AllowSystemDeleteAfter,
             DueDateTime = correspondence.DueDateTime,

src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsResponse.cs

@@ -38,7 +38,7 @@ public class GetCorrespondenceDetailsResponse
 
     public DateTimeOffset VisibleFrom { get; set; }
 
-    public bool IsReservable { get; set; }
+    public bool IgnoreReservation { get; set; }
 
     public bool? MarkedUnread { get; set; }
 

src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewHandler.cs

@@ -74,7 +74,7 @@ await _correspondenceStatusRepository.AddCorrespondenceStatus(new Correspondence
             Notifications = correspondence.Notifications ?? new List<CorrespondenceNotificationEntity>(),
             ExternalReferences = correspondence.ExternalReferences ?? new List<ExternalReferenceEntity>(),
             VisibleFrom = correspondence.VisibleFrom,
-            IsReservable = correspondence.IsReservable == null || correspondence.IsReservable.Value,
+            IgnoreReservation = correspondence.IgnoreReservation ?? false,
             MarkedUnread = correspondence.MarkedUnread,
             AllowSystemDeleteAfter = correspondence.AllowSystemDeleteAfter,
         };

src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewResponse.cs

@@ -37,7 +37,7 @@ public class GetCorrespondenceOverviewResponse
 
     public DateTimeOffset VisibleFrom { get; set; }
 
-    public bool IsReservable { get; set; }
+    public bool IgnoreReservation { get; set; }
 
     public bool? MarkedUnread { get; set; }
 

src/Altinn.Correspondence.Application/InitializeCorrespondences/InitializeCorrespondencesHandler.cs

@@ -176,7 +176,7 @@ public async Task<OneOf<InitializeCorrespondencesResponse, Error>> Process(Initi
                 DueDateTime = request.Correspondence.DueDateTime,
                 PropertyList = request.Correspondence.PropertyList.ToDictionary(x => x.Key, x => x.Value),
                 ReplyOptions = request.Correspondence.ReplyOptions,
-                IsReservable = request.Correspondence.IsReservable,
+                IgnoreReservation = request.Correspondence.IgnoreReservation,
                 Statuses = new List<CorrespondenceStatusEntity>(){
                     new CorrespondenceStatusEntity
                     {
@@ -263,7 +263,7 @@ private List<NotificationOrderRequest> CreateNotifications(NotificationRequest n
         }
         var notificationOrder = new NotificationOrderRequest
         {
-            IgnoreReservation = !correspondence.IsReservable,
+            IgnoreReservation = correspondence.IgnoreReservation,
             Recipients = new List<Recipient>{
             new Recipient{
                 OrganizationNumber = orgNr,
@@ -290,7 +290,7 @@ private List<NotificationOrderRequest> CreateNotifications(NotificationRequest n
         {
             notifications.Add(new NotificationOrderRequest
             {
-                IgnoreReservation = !correspondence.IsReservable,
+                IgnoreReservation = correspondence.IgnoreReservation,
                 Recipients = new List<Recipient>{
             new Recipient{
                 OrganizationNumber = orgNr,

src/Altinn.Correspondence.Core/Models/Entities/CorrespondenceEntity.cs

@@ -43,7 +43,7 @@ public class CorrespondenceEntity
         [MaxLength(6, ErrorMessage = "Notifications can contain at most 6 notifcations")]
         public List<CorrespondenceNotificationEntity> Notifications { get; set; } = new List<CorrespondenceNotificationEntity>();
 
-        public bool? IsReservable { get; set; }
+        public bool? IgnoreReservation { get; set; }
 
         public bool? MarkedUnread { get; set; }