diff --git a/.bruno/Correspondence/Initialize and Upload.bru b/.bruno/Correspondence/Initialize and Upload.bru index 9bb2e349c..fda67fa71 100644 --- a/.bruno/Correspondence/Initialize and Upload.bru +++ b/.bruno/Correspondence/Initialize and Upload.bru @@ -28,7 +28,6 @@ body:multipart-form { "attachments": [] }, "RequestedPublishTime": "2024-09-28T12:44:28.290518+00:00", - "allowSystemDeleteAfter": "2025-08-29T13:31:28.290518+00:00", "dueDateTime": "2025-05-29T13:31:28.290518+00:00", "externalReferences": [ { diff --git a/.bruno/Correspondence/Initialize and upload (form-data).bru b/.bruno/Correspondence/Initialize and upload (form-data).bru index e45369524..81e52465b 100644 --- a/.bruno/Correspondence/Initialize and upload (form-data).bru +++ b/.bruno/Correspondence/Initialize and upload (form-data).bru @@ -22,7 +22,6 @@ body:multipart-form { correspondence.content.messagesummary: Ett sammendrag for meldingen correspondence.content.messagebody: Som kan være plain text eller **markdown** correspondence.requestedpublishtime: {{requestedPublishTime}} - correspondence.allowsystemdeleteafter: {{allowSystemDeleteAfter}} correspondence.duedatetime: {{dueDateTime}} correspondence.propertylist.casenumber: 123 correspondence.propertylist.etc: can-use-for-anything diff --git a/.bruno/Correspondence/Initialize.bru b/.bruno/Correspondence/Initialize.bru index 94c3831a5..565dde663 100644 --- a/.bruno/Correspondence/Initialize.bru +++ b/.bruno/Correspondence/Initialize.bru @@ -28,7 +28,6 @@ body:json { }, "requestedPublishTime": "{{requestedPublishTime}}", "dueDateTime": "{{dueDateTime}}", - "allowSystemDeleteAfter": "{{allowSystemDeleteAfter}}", "externalReferences": [], "propertyList": { "caseNumber": "123", diff --git a/Test/Altinn.Correspondence.LoadTests/data/correspondence-form.js b/Test/Altinn.Correspondence.LoadTests/data/correspondence-form.js index e85082499..ffbc989e0 100644 --- a/Test/Altinn.Correspondence.LoadTests/data/correspondence-form.js +++ b/Test/Altinn.Correspondence.LoadTests/data/correspondence-form.js @@ -44,7 +44,6 @@ export function getCorrespondenceForm(resource_id, sender, recipient, boundary) addFormField('Correspondence.content.attachments[0].FileName', 'testfile.txt'); addFormField('Correspondence.content.attachments[0].IsEncrypted', 'true'); addFormField('Correspondence.visibleFrom', visibleFrom.toISOString()); - addFormField('Correspondence.allowSystemDeleteAfter', deleteAfter.toISOString()); addFormField('Correspondence.dueDateTime', dueDateTime.toISOString()); addFormField('Correspondence.content.externalReferences[0].referenceValue', 'test'); addFormField('Correspondence.content.externalReferences[0].referenceType', 'AltinnBrokerFileTransfer'); diff --git a/Test/Altinn.Correspondence.LoadTests/data/correspondence-json.js b/Test/Altinn.Correspondence.LoadTests/data/correspondence-json.js index 955b634de..3a380d8e2 100644 --- a/Test/Altinn.Correspondence.LoadTests/data/correspondence-json.js +++ b/Test/Altinn.Correspondence.LoadTests/data/correspondence-json.js @@ -3,8 +3,6 @@ export function getCorrespondenceJson(resource_id, sender, recipient) { const visibleFrom = new Date(now); const dueDateTime = new Date(now.getTime()); dueDateTime.setMonth(dueDateTime.getMonth() + 1); - const deleteAfter = new Date(now.getTime()); - deleteAfter.setMonth(deleteAfter.getMonth() + 5); const data_without_attachment = { Correspondence: { resourceId: resource_id, @@ -18,7 +16,6 @@ export function getCorrespondenceJson(resource_id, sender, recipient) { attachments: [], }, visibleFrom: visibleFrom.toISOString(), - allowSystemDeleteAfter: deleteAfter.toISOString(), dueDateTime: dueDateTime.toISOString(), externalReferences: [], propertyList: {}, diff --git a/Test/Altinn.Correspondence.LoadTests/test_initialize_and_upload_correspondence.js b/Test/Altinn.Correspondence.LoadTests/test_initialize_and_upload_correspondence.js index c2c7be923..3f0cfb4da 100644 --- a/Test/Altinn.Correspondence.LoadTests/test_initialize_and_upload_correspondence.js +++ b/Test/Altinn.Correspondence.LoadTests/test_initialize_and_upload_correspondence.js @@ -41,7 +41,6 @@ formData.append('Correspondence.content.attachments[0].SendersReference', "1234" formData.append('Correspondence.content.attachments[0].FileName', "testfile.txt"); formData.append('Correspondence.content.attachments[0].IsEncrypted', "true"); formData.append('Correspondence.visibleFrom', "2024-05-29T13:31:28.290518+00:00"); -formData.append('Correspondence.allowSystemDeleteAfter', "2025-05-29T13:31:28.290518+00:00"); formData.append('Correspondence.dueDateTime', "2025-05-29T13:31:28.290518+00:00"); formData.append('Correspondence.content.externalReferences[0].referenceValue', "test"); formData.append('Correspondence.content.externalReferences[0].referenceType', "AltinnBrokerFileTransfer"); diff --git a/Test/Altinn.Correspondence.LoadTests/test_initialize_correspondence.js b/Test/Altinn.Correspondence.LoadTests/test_initialize_correspondence.js index c292df20a..fa80600d2 100644 --- a/Test/Altinn.Correspondence.LoadTests/test_initialize_correspondence.js +++ b/Test/Altinn.Correspondence.LoadTests/test_initialize_correspondence.js @@ -32,7 +32,6 @@ const data_without_attachment = { attachments: [], }, visibleFrom: "2024-09-28T12:44:28.290518+00:00", - allowSystemDeleteAfter: "2025-08-29T13:31:28.290518+00:00", dueDateTime: "2025-05-29T13:31:28.290518+00:00", externalReferences: [], propertyList: {}, diff --git a/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceBuilder.cs b/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceBuilder.cs index 36c530859..9b60b5191 100644 --- a/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceBuilder.cs +++ b/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceBuilder.cs @@ -180,11 +180,6 @@ public CorrespondenceBuilder WithRequestedPublishTime(DateTimeOffset? requestedP _correspondence.Correspondence.RequestedPublishTime = requestedPublishTime; return this; } - public CorrespondenceBuilder WithAllowSystemDeleteAfter(DateTimeOffset dueDateTime) - { - _correspondence.Correspondence.AllowSystemDeleteAfter = dueDateTime; - return this; - } public CorrespondenceBuilder WithConfirmationNeeded(bool confirmationNeeded) { _correspondence.Correspondence.IsConfirmationNeeded = confirmationNeeded; diff --git a/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceEntityBuilder.cs b/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceEntityBuilder.cs index a5d9cfadd..6765160e4 100644 --- a/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceEntityBuilder.cs +++ b/Test/Altinn.Correspondence.Tests/Factories/CorrespondenceEntityBuilder.cs @@ -216,12 +216,6 @@ public CorrespondenceEntityBuilder WithServiceOwnerId(string serviceOwnerId) return this; } - public CorrespondenceEntityBuilder WithAllowSystemDeleteAfter(DateTimeOffset? allowSystemDeleteAfter) - { - _correspondenceEntity.AllowSystemDeleteAfter = allowSystemDeleteAfter; - return this; - } - public CorrespondenceEntityBuilder WithMessageSummary(string messageSummary) { if (_correspondenceEntity.Content != null) diff --git a/Test/Altinn.Correspondence.Tests/Helpers/CorrespondenceHelper.cs b/Test/Altinn.Correspondence.Tests/Helpers/CorrespondenceHelper.cs index 6ec5e6d87..80a3bfaa7 100644 --- a/Test/Altinn.Correspondence.Tests/Helpers/CorrespondenceHelper.cs +++ b/Test/Altinn.Correspondence.Tests/Helpers/CorrespondenceHelper.cs @@ -24,7 +24,6 @@ public static MultipartFormDataContent CorrespondenceToFormData(BaseCorresponden { new StringContent(correspondence.SendersReference), "correspondence.sendersReference" }, { new StringContent(correspondence.RequestedPublishTime.ToString()), "correspondence.RequestedPublishTime" }, { new StringContent(correspondence.DueDateTime.ToString()), "correspondence.dueDateTime" }, - { new StringContent(correspondence.AllowSystemDeleteAfter.ToString()), "correspondence.AllowSystemDeleteAfter" }, { new StringContent(correspondence.Content.MessageTitle), "correspondence.content.MessageTitle" }, { new StringContent(correspondence.Content.MessageSummary), "correspondence.content.MessageSummary" }, { new StringContent(correspondence.Content.MessageBody), "correspondence.content.MessageBody" }, diff --git a/Test/Altinn.Correspondence.Tests/TestingController/Correspondence/CorrespondenceInitializationTests.cs b/Test/Altinn.Correspondence.Tests/TestingController/Correspondence/CorrespondenceInitializationTests.cs index 1fe19750a..589ea5e3a 100644 --- a/Test/Altinn.Correspondence.Tests/TestingController/Correspondence/CorrespondenceInitializationTests.cs +++ b/Test/Altinn.Correspondence.Tests/TestingController/Correspondence/CorrespondenceInitializationTests.cs @@ -427,58 +427,6 @@ public async Task InitializeCorrespondence_DueDate_PriorRequestedPublishTime_Ret Assert.Equal(HttpStatusCode.BadRequest, initializeCorrespondenceResponse.StatusCode); } - [Fact] - public async Task InitializeCorrespondence_AllowSystemDeleteAfter_PriorToday_Returns_BadRequest() - { - // Arrange - var payload = new CorrespondenceBuilder() - .CreateCorrespondence() - .WithAllowSystemDeleteAfter(DateTimeOffset.UtcNow.AddDays(-7)) - .Build(); - - // Act - var initializeCorrespondenceResponse = await _senderClient.PostAsJsonAsync("correspondence/api/v1/correspondence", payload); - - // Assert - Assert.Equal(HttpStatusCode.BadRequest, initializeCorrespondenceResponse.StatusCode); - } - - [Fact] - public async Task InitializeCorrespondence_AllowSystemDeleteAfter_PriorRequestedPublishTime_Returns_BadRequest() - { - // Arrange - var payload = new CorrespondenceBuilder() - .CreateCorrespondence() - .WithAllowSystemDeleteAfter(DateTimeOffset.UtcNow.AddDays(7)) - .WithRequestedPublishTime(DateTimeOffset.UtcNow.AddDays(14)) - .WithDueDateTime(DateTimeOffset.UtcNow.AddDays(21)) // ensure DueDate is after RequestedPublishTime - .Build(); - - // Act - var initializeCorrespondenceResponse = await _senderClient.PostAsJsonAsync("correspondence/api/v1/correspondence", payload); - - // Assert - Assert.Equal(HttpStatusCode.BadRequest, initializeCorrespondenceResponse.StatusCode); - } - - [Fact] - public async Task InitializeCorrespondence_AllowSystemDeleteAfter_PriorDueDate_Returns_BadRequest() - { - // Arrange - var payload = new CorrespondenceBuilder() - .CreateCorrespondence() - .WithAllowSystemDeleteAfter(DateTimeOffset.UtcNow.AddDays(14)) - .WithRequestedPublishTime(DateTimeOffset.UtcNow.AddDays(7)) - .WithDueDateTime(DateTimeOffset.UtcNow.AddDays(21)) - .Build(); - - // Act - var initializeCorrespondenceResponse = await _senderClient.PostAsJsonAsync("correspondence/api/v1/correspondence", payload); - - // Assert - Assert.Equal(HttpStatusCode.BadRequest, initializeCorrespondenceResponse.StatusCode); - } - [Fact] public async Task InitializeCorrespondence_WithConfirmationNeeded_Without_DueDate_Returns_BadRequest() { diff --git a/Test/Altinn.Correspondence.Tests/TestingController/Migration/MigrationControllerTests.cs b/Test/Altinn.Correspondence.Tests/TestingController/Migration/MigrationControllerTests.cs index 0368c5a14..1f0b01be9 100644 --- a/Test/Altinn.Correspondence.Tests/TestingController/Migration/MigrationControllerTests.cs +++ b/Test/Altinn.Correspondence.Tests/TestingController/Migration/MigrationControllerTests.cs @@ -295,7 +295,7 @@ public async Task MakeCorrespondenceAvailable_Defined() .WithStatusEvent(MigrateCorrespondenceStatusExt.Archived, new DateTime(2024, 1, 9, 10, 50, 17)) .Build(); SetNotificationHistory(migrateCorrespondenceExt); - string jsonCorr = "{\"correspondenceData\":{\"correspondence\":{\"resourceId\":\"skd-migratedcorrespondence-3476-130314\",\"sender\":\"urn:altinn:organization:identifier-no:974761076\",\"senderPartyUuid\":\"e6e80419-0019-4892-b8a7-78ac03eb3c51\",\"sendersReference\":\"b4199d2c-c063-4bb2-bce6-0b4d69f5acea\",\"messageSender\":\"Skatteetaten\",\"content\":{\"language\":\"nb\",\"messageTitle\":\"A03 a-melding tilbakemelding for 2025-05 - meldingsId: tlx-1232714052\",\"messageSummary\":\"\",\"messageBody\":\"Tilbakemelding på a-melding\"},\"requestedPublishTime\":\"2025-06-30T12:06:09.487+02:00\",\"allowSystemDeleteAfter\":null,\"dueDateTime\":null,\"externalReferences\":[],\"propertyList\":{\"Altinn2ArchiveUnitReference\":\"AR20699019\"},\"replyOptions\":[],\"ignoreReservation\":null,\"published\":\"2025-06-30T12:06:09.487+02:00\",\"isConfirmationNeeded\":false},\"recipients\":[\"urn:altinn:organization:identifier-no:313414450\"],\"recipientPartyUuids\":[\"aa0c3933-4d4e-4bbb-8ac6-1becd706ffe8\"],\"existingAttachments\":[]},\"altinn2CorrespondenceId\":30088189,\"eventHistory\":[{\"status\":0,\"statusText\":\"Correspondence Created in Altinn 2\",\"statusChanged\":\"2025-06-30T12:06:09.487+02:00\",\"eventUserUuid\":\"00000000-0000-0000-0000-000000000000\",\"eventUserPartyUuid\":\"00000000-0000-0000-0000-000000000000\"},{\"status\":2,\"statusText\":\"Correspondence Published in Altinn 2\",\"statusChanged\":\"2025-06-30T12:06:09.487+02:00\",\"eventUserUuid\":\"e6e80419-0019-4892-b8a7-78ac03eb3c51\",\"eventUserPartyUuid\":\"e6e80419-0019-4892-b8a7-78ac03eb3c51\"},{\"status\":4,\"statusText\":\"Migrated event Read from Altinn 2\",\"statusChanged\":\"2025-06-30T12:06:46.337+02:00\",\"eventUserUuid\":\"2a064dc8-193e-4ca0-9027-9aef49c96db1\",\"eventUserPartyUuid\":\"2a064dc8-193e-4ca0-9027-9aef49c96db1\"}],\"notificationHistory\":[],\"forwardingHistory\":[],\"IsMigrating\":true,\"created\":\"2025-06-30T12:06:09.487+02:00\",\"partyId\":51843981}"; + string jsonCorr = "{\"correspondenceData\":{\"correspondence\":{\"resourceId\":\"skd-migratedcorrespondence-3476-130314\",\"sender\":\"urn:altinn:organization:identifier-no:974761076\",\"senderPartyUuid\":\"e6e80419-0019-4892-b8a7-78ac03eb3c51\",\"sendersReference\":\"b4199d2c-c063-4bb2-bce6-0b4d69f5acea\",\"messageSender\":\"Skatteetaten\",\"content\":{\"language\":\"nb\",\"messageTitle\":\"A03 a-melding tilbakemelding for 2025-05 - meldingsId: tlx-1232714052\",\"messageSummary\":\"\",\"messageBody\":\"Tilbakemelding på a-melding\"},\"requestedPublishTime\":\"2025-06-30T12:06:09.487+02:00\",\"dueDateTime\":null,\"externalReferences\":[],\"propertyList\":{\"Altinn2ArchiveUnitReference\":\"AR20699019\"},\"replyOptions\":[],\"ignoreReservation\":null,\"published\":\"2025-06-30T12:06:09.487+02:00\",\"isConfirmationNeeded\":false},\"recipients\":[\"urn:altinn:organization:identifier-no:313414450\"],\"recipientPartyUuids\":[\"aa0c3933-4d4e-4bbb-8ac6-1becd706ffe8\"],\"existingAttachments\":[]},\"altinn2CorrespondenceId\":30088189,\"eventHistory\":[{\"status\":0,\"statusText\":\"Correspondence Created in Altinn 2\",\"statusChanged\":\"2025-06-30T12:06:09.487+02:00\",\"eventUserUuid\":\"00000000-0000-0000-0000-000000000000\",\"eventUserPartyUuid\":\"00000000-0000-0000-0000-000000000000\"},{\"status\":2,\"statusText\":\"Correspondence Published in Altinn 2\",\"statusChanged\":\"2025-06-30T12:06:09.487+02:00\",\"eventUserUuid\":\"e6e80419-0019-4892-b8a7-78ac03eb3c51\",\"eventUserPartyUuid\":\"e6e80419-0019-4892-b8a7-78ac03eb3c51\"},{\"status\":4,\"statusText\":\"Migrated event Read from Altinn 2\",\"statusChanged\":\"2025-06-30T12:06:46.337+02:00\",\"eventUserUuid\":\"2a064dc8-193e-4ca0-9027-9aef49c96db1\",\"eventUserPartyUuid\":\"2a064dc8-193e-4ca0-9027-9aef49c96db1\"}],\"notificationHistory\":[],\"forwardingHistory\":[],\"IsMigrating\":true,\"created\":\"2025-06-30T12:06:09.487+02:00\",\"partyId\":51843981}"; migrateCorrespondenceExt = JsonConvert.DeserializeObject(jsonCorr); CorrespondenceMigrationStatusExt resultObj = await MigrateSingleCorrespondence_NoAdd(migrateCorrespondenceExt); diff --git a/Test/Altinn.Correspondence.Tests/TestingHandler/CleanupPerishingDialogsHandlerTests.cs b/Test/Altinn.Correspondence.Tests/TestingHandler/CleanupPerishingDialogsHandlerTests.cs index 0b1fdd4fa..560f956b3 100644 --- a/Test/Altinn.Correspondence.Tests/TestingHandler/CleanupPerishingDialogsHandlerTests.cs +++ b/Test/Altinn.Correspondence.Tests/TestingHandler/CleanupPerishingDialogsHandlerTests.cs @@ -21,13 +21,11 @@ public async Task ExecuteCleanupInBackground_RemovesExpiresAtAndCountsAlreadyOk( .WithCreated(now.UtcDateTime.AddMinutes(-2)) .WithRequestedPublishTime(now.AddMinutes(-2)) .WithExternalReference(ReferenceType.DialogportenDialogId, "d1") - .WithAllowSystemDeleteAfter(now.AddDays(30)) .Build(); var c2 = new CorrespondenceEntityBuilder() .WithCreated(now.UtcDateTime.AddMinutes(-1)) .WithRequestedPublishTime(now.AddMinutes(-1)) .WithExternalReference(ReferenceType.DialogportenDialogId, "d2") - .WithAllowSystemDeleteAfter(now.AddDays(30)) .Build(); var repo = new Mock(); @@ -70,7 +68,6 @@ public async Task ExecuteCleanupInBackground_DoesNotReprocessOrSkipItemsBetweenB .WithCreated(baseTime.AddSeconds(i).UtcDateTime) .WithRequestedPublishTime(baseTime.AddSeconds(i)) .WithExternalReference(ReferenceType.DialogportenDialogId, $"d{i}") - .WithAllowSystemDeleteAfter(baseTime.AddDays(30)) .Build()); } diff --git a/src/Altinn.Correspondence.API/Controllers/CorrespondenceController.cs b/src/Altinn.Correspondence.API/Controllers/CorrespondenceController.cs index 32f4a1fd8..724c7c727 100644 --- a/src/Altinn.Correspondence.API/Controllers/CorrespondenceController.cs +++ b/src/Altinn.Correspondence.API/Controllers/CorrespondenceController.cs @@ -54,9 +54,6 @@ public CorrespondenceController(ILogger logger) ///
  • 1007: Existing attachment not found
  • ///
  • 1008: DueDateTime cannot be prior to today
  • ///
  • 1009: DueDateTime cannot be prior to RequestedPublishTime
  • - ///
  • 1010: AllowSystemDelete cannot be prior to today
  • - ///
  • 1011: AllowSystemDelete cannot be prior to RequestedPublishTime
  • - ///
  • 1012: AllowSystemDelete cannot be prior to DueDateTime
  • ///
  • 1013: Sender cannot delete correspondence that has been published
  • ///
  • 1016: DueDateTime is required when confirmation is needed
  • ///
  • 1017: The sender of the correspondence must be equal the sender of existing attachments
  • @@ -163,9 +160,6 @@ public async Task> Initialize ///
  • 1007: Existing attachment not found
  • ///
  • 1008: DueDateTime cannot be prior to today
  • ///
  • 1009: DueDateTime cannot be prior to RequestedPublishTime
  • - ///
  • 1010: AllowSystemDelete cannot be prior to today
  • - ///
  • 1011: AllowSystemDelete cannot be prior to RequestedPublishTime
  • - ///
  • 1012: AllowSystemDelete cannot be prior to DueDateTime
  • ///
  • 1013: Sender cannot delete correspondence that has been published
  • ///
  • 1016: DueDateTime is required when confirmation is needed
  • ///
  • 1017: The sender of the correspondence must be equal the sender of existing attachments
  • diff --git a/src/Altinn.Correspondence.API/Mappers/CorrespondenceDetailsMapper.cs b/src/Altinn.Correspondence.API/Mappers/CorrespondenceDetailsMapper.cs index e35ea973f..9d4f65ee3 100644 --- a/src/Altinn.Correspondence.API/Mappers/CorrespondenceDetailsMapper.cs +++ b/src/Altinn.Correspondence.API/Mappers/CorrespondenceDetailsMapper.cs @@ -28,7 +28,6 @@ internal static CorrespondenceDetailsExt MapToExternal(GetCorrespondenceDetailsR ResourceId = correspondenceDetails.ResourceId.ToString(), RequestedPublishTime = correspondenceDetails.RequestedPublishTime, IgnoreReservation = correspondenceDetails.IgnoreReservation, - AllowSystemDeleteAfter = correspondenceDetails.AllowSystemDeleteAfter, DueDateTime = correspondenceDetails.DueDateTime, PropertyList = correspondenceDetails.PropertyList, Published = correspondenceDetails.Published, diff --git a/src/Altinn.Correspondence.API/Mappers/CorrespondenceOverviewMapper.cs b/src/Altinn.Correspondence.API/Mappers/CorrespondenceOverviewMapper.cs index f1bc59fc9..6f90fe5ec 100644 --- a/src/Altinn.Correspondence.API/Mappers/CorrespondenceOverviewMapper.cs +++ b/src/Altinn.Correspondence.API/Mappers/CorrespondenceOverviewMapper.cs @@ -25,7 +25,6 @@ internal static CorrespondenceOverviewExt MapToExternal(GetCorrespondenceOvervie ExternalReferences = ExternalReferenceMapper.MapListToExternal(correspondenceOverview.ExternalReferences), ResourceId = correspondenceOverview.ResourceId.ToString(), RequestedPublishTime = correspondenceOverview.RequestedPublishTime, - AllowSystemDeleteAfter = correspondenceOverview.AllowSystemDeleteAfter, DueDateTime = correspondenceOverview.DueDateTime, PropertyList = correspondenceOverview.PropertyList, IgnoreReservation = correspondenceOverview.IgnoreReservation, diff --git a/src/Altinn.Correspondence.API/Mappers/InitializeCorrespondencesMapper.cs b/src/Altinn.Correspondence.API/Mappers/InitializeCorrespondencesMapper.cs index b7973064e..fb87174f5 100644 --- a/src/Altinn.Correspondence.API/Mappers/InitializeCorrespondencesMapper.cs +++ b/src/Altinn.Correspondence.API/Mappers/InitializeCorrespondencesMapper.cs @@ -25,7 +25,6 @@ internal static OneOf MapToRequest(Init ServiceOwnerId = null, // Will be populated by the handler after determining service owner from ResourceRegistry MessageSender = request.Correspondence.MessageSender, RequestedPublishTime = request.Correspondence.RequestedPublishTime ?? DateTimeOffset.UtcNow, - AllowSystemDeleteAfter = request.Correspondence.AllowSystemDeleteAfter, DueDateTime = request.Correspondence.DueDateTime, PropertyList = request.Correspondence.PropertyList, ReplyOptions = request.Correspondence.ReplyOptions != null ? CorrespondenceReplyOptionsMapper.MapListToEntities(request.Correspondence.ReplyOptions) : new List(), diff --git a/src/Altinn.Correspondence.API/Mappers/LegacyCorrespondenceOverviewMapper.cs b/src/Altinn.Correspondence.API/Mappers/LegacyCorrespondenceOverviewMapper.cs index 8a907ff60..4204abd84 100644 --- a/src/Altinn.Correspondence.API/Mappers/LegacyCorrespondenceOverviewMapper.cs +++ b/src/Altinn.Correspondence.API/Mappers/LegacyCorrespondenceOverviewMapper.cs @@ -30,7 +30,6 @@ internal static LegacyCorrespondenceOverviewExt MapToExternal(LegacyGetCorrespon ExternalReferences = ExternalReferenceMapper.MapListToExternal(correspondenceOverview.ExternalReferences), ResourceId = correspondenceOverview.ResourceId.ToString(), RequestedPublishTime = correspondenceOverview.RequestedPublishTime, - AllowSystemDeleteAfter = correspondenceOverview.AllowSystemDeleteAfter, DueDateTime = correspondenceOverview.DueDateTime, PropertyList = correspondenceOverview.PropertyList, IgnoreReservation = correspondenceOverview.IgnoreReservation, diff --git a/src/Altinn.Correspondence.API/Mappers/MigrateCorrespondenceMapper.cs b/src/Altinn.Correspondence.API/Mappers/MigrateCorrespondenceMapper.cs index aff3e5e84..a460a4638 100644 --- a/src/Altinn.Correspondence.API/Mappers/MigrateCorrespondenceMapper.cs +++ b/src/Altinn.Correspondence.API/Mappers/MigrateCorrespondenceMapper.cs @@ -27,7 +27,6 @@ internal static async Task MapToRequestAsync(Migra ServiceOwnerId = await serviceOwnerHelper.GetSafeServiceOwnerIdAsync(migrateCorrespondenceExt.CorrespondenceData.Correspondence.Sender, cancellationToken), MessageSender = migrateCorrespondenceExt.CorrespondenceData.Correspondence.MessageSender, RequestedPublishTime = (DateTimeOffset)migrateCorrespondenceExt.CorrespondenceData.Correspondence.RequestedPublishTime, - AllowSystemDeleteAfter = migrateCorrespondenceExt.CorrespondenceData.Correspondence.AllowSystemDeleteAfter, DueDateTime = migrateCorrespondenceExt.CorrespondenceData.Correspondence.DueDateTime, PropertyList = migrateCorrespondenceExt.CorrespondenceData.Correspondence.PropertyList, ReplyOptions = migrateCorrespondenceExt.CorrespondenceData.Correspondence.ReplyOptions != null ? CorrespondenceReplyOptionsMapper.MapListToEntities(migrateCorrespondenceExt.CorrespondenceData.Correspondence.ReplyOptions) : new List(), diff --git a/src/Altinn.Correspondence.API/Models/BaseCorrespondenceExt.cs b/src/Altinn.Correspondence.API/Models/BaseCorrespondenceExt.cs index c07f077f1..7065544b7 100644 --- a/src/Altinn.Correspondence.API/Models/BaseCorrespondenceExt.cs +++ b/src/Altinn.Correspondence.API/Models/BaseCorrespondenceExt.cs @@ -55,12 +55,6 @@ public class BaseCorrespondenceExt [JsonPropertyName("requestedPublishTime")] public DateTimeOffset? RequestedPublishTime { get; set; } - /// - /// When Altinn can remove the correspondence from its database. - /// - [JsonPropertyName("allowSystemDeleteAfter")] - public DateTimeOffset? AllowSystemDeleteAfter { get; set; } - /// /// When the recipient must reply to the correspondence /// diff --git a/src/Altinn.Correspondence.API/Models/CorrespondenceExt.cs b/src/Altinn.Correspondence.API/Models/CorrespondenceExt.cs index 187e54c64..d95524b4a 100644 --- a/src/Altinn.Correspondence.API/Models/CorrespondenceExt.cs +++ b/src/Altinn.Correspondence.API/Models/CorrespondenceExt.cs @@ -31,8 +31,6 @@ public class CorrespondenceExt public required DateTimeOffset RequestedPublishTime { get; set; } - public DateTimeOffset? AllowSystemDeleteAfter { get; set; } - public DateTimeOffset? DueDateTime { get; set; } public List ExternalReferences { get; set; } = new List(); diff --git a/src/Altinn.Correspondence.Application/Errors.cs b/src/Altinn.Correspondence.Application/Errors.cs index f5a49d3cc..11aa45ccc 100644 --- a/src/Altinn.Correspondence.Application/Errors.cs +++ b/src/Altinn.Correspondence.Application/Errors.cs @@ -14,9 +14,6 @@ public static class CorrespondenceErrors public static Error ExistingAttachmentNotFound = new Error(1007, "Existing attachment not found", HttpStatusCode.BadRequest); public static Error DueDatePriorToday = new Error(1008, "DueDateTime cannot be prior to today", HttpStatusCode.BadRequest); public static Error DueDatePriorRequestedPublishTime = new Error(1009, "DueDateTime cannot be prior to RequestedPublishTime", HttpStatusCode.BadRequest); - public static Error AllowSystemDeletePriorToday = new Error(1010, "AllowSystemDelete cannot be prior to today", HttpStatusCode.BadRequest); - public static Error AllowSystemDeletePriorRequestedPublishTime = new Error(1011, "AllowSystemDelete cannot be prior to RequestedPublishTime", HttpStatusCode.BadRequest); - public static Error AllowSystemDeletePriorDueDate = new Error(1012, "AllowSystemDelete cannot be prior to DueDateTime", HttpStatusCode.BadRequest); public static Error CantPurgePublishedCorrespondence = new Error(1013, "Sender cannot delete correspondence that has been published", HttpStatusCode.BadRequest); public static Error CorrespondenceAlreadyPurged = new Error(1014, "Correspondence has already been purged", HttpStatusCode.BadRequest); public static Error CouldNotRetrieveStatus = new Error(1015, "Could not retrieve highest status for correspondence", HttpStatusCode.BadRequest); diff --git a/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsHandler.cs b/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsHandler.cs index 4b54af3a0..03007506b 100644 --- a/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsHandler.cs +++ b/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsHandler.cs @@ -175,7 +175,6 @@ await correspondenceStatusRepository.AddCorrespondenceStatusFetched(new Correspo ResourceId = correspondence.ResourceId, RequestedPublishTime = correspondence.RequestedPublishTime, IgnoreReservation = correspondence.IgnoreReservation ?? false, - AllowSystemDeleteAfter = correspondence.AllowSystemDeleteAfter, DueDateTime = correspondence.DueDateTime, PropertyList = correspondence.PropertyList, Published = correspondence.Published, diff --git a/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsResponse.cs b/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsResponse.cs index fb255d885..ca624753b 100644 --- a/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsResponse.cs +++ b/src/Altinn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsResponse.cs @@ -40,8 +40,6 @@ public class GetCorrespondenceDetailsResponse public bool IgnoreReservation { get; set; } - public DateTimeOffset? AllowSystemDeleteAfter { get; set; } - public DateTimeOffset? DueDateTime { get; set; } public Dictionary PropertyList { get; set; } = new Dictionary(); diff --git a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewHandler.cs b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewHandler.cs index 35a30ef5f..e43f2b20a 100644 --- a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewHandler.cs +++ b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewHandler.cs @@ -161,7 +161,6 @@ await correspondenceStatusRepository.AddCorrespondenceStatus(new CorrespondenceS ExternalReferences = correspondence.ExternalReferences ?? new List(), RequestedPublishTime = correspondence.RequestedPublishTime, IgnoreReservation = correspondence.IgnoreReservation ?? false, - AllowSystemDeleteAfter = correspondence.AllowSystemDeleteAfter, Published = correspondence.Published, IsConfirmationNeeded = correspondence.IsConfirmationNeeded, IsConfidential = correspondence.IsConfidential diff --git a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewResponse.cs b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewResponse.cs index cc6f9d56b..d6970e546 100644 --- a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewResponse.cs +++ b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/GetCorrespondenceOverviewResponse.cs @@ -39,8 +39,6 @@ public class GetCorrespondenceOverviewResponse public bool IgnoreReservation { get; set; } - public DateTimeOffset? AllowSystemDeleteAfter { get; set; } - public DateTimeOffset? DueDateTime { get; set; } public Dictionary PropertyList { get; set; } = new Dictionary(); diff --git a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewHandler.cs b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewHandler.cs index 11af1d137..8a13f1dec 100644 --- a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewHandler.cs +++ b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewHandler.cs @@ -136,7 +136,6 @@ await correspondenceStatusRepository.AddCorrespondenceStatus(new CorrespondenceS ExternalReferences = correspondence.ExternalReferences ?? new List(), RequestedPublishTime = correspondence.RequestedPublishTime, IgnoreReservation = correspondence.IgnoreReservation ?? false, - AllowSystemDeleteAfter = correspondence.AllowSystemDeleteAfter, Published = correspondence.Published, IsConfirmationNeeded = correspondence.IsConfirmationNeeded, MinimumAuthenticationLevel = (int)minimumAuthLevel, diff --git a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewResponse.cs b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewResponse.cs index 81537835f..f390be4a0 100644 --- a/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewResponse.cs +++ b/src/Altinn.Correspondence.Application/GetCorrespondenceOverview/LegacyGetCorrespondenceOverviewResponse.cs @@ -52,8 +52,6 @@ public class LegacyGetCorrespondenceOverviewResponse public bool IgnoreReservation { get; set; } - public DateTimeOffset? AllowSystemDeleteAfter { get; set; } - public DateTimeOffset? DueDateTime { get; set; } public Dictionary PropertyList { get; set; } = new Dictionary(); diff --git a/src/Altinn.Correspondence.Application/Helpers/InitializeCorrespondenceHelper.cs b/src/Altinn.Correspondence.Application/Helpers/InitializeCorrespondenceHelper.cs index abff301ed..e32bbabbf 100644 --- a/src/Altinn.Correspondence.Application/Helpers/InitializeCorrespondenceHelper.cs +++ b/src/Altinn.Correspondence.Application/Helpers/InitializeCorrespondenceHelper.cs @@ -38,21 +38,6 @@ public class InitializeCorrespondenceHelper( return CorrespondenceErrors.DueDatePriorRequestedPublishTime; } } - if (correspondence.AllowSystemDeleteAfter is not null) - { - if (correspondence.AllowSystemDeleteAfter < DateTimeOffset.UtcNow) - { - return CorrespondenceErrors.AllowSystemDeletePriorToday; - } - if (correspondence.AllowSystemDeleteAfter < RequestedPublishTime) - { - return CorrespondenceErrors.AllowSystemDeletePriorRequestedPublishTime; - } - if (correspondence.DueDateTime is not null && correspondence.AllowSystemDeleteAfter < correspondence.DueDateTime) - { - return CorrespondenceErrors.AllowSystemDeletePriorDueDate; - } - } return null; } @@ -361,7 +346,6 @@ public async Task MapToCorrespondenceEntityAsync(Initializ MessageTitle = AddRecipientToMessage(request.Correspondence.Content.MessageTitle, partyDetails?.Name), }, RequestedPublishTime = request.Correspondence.RequestedPublishTime, - AllowSystemDeleteAfter = request.Correspondence.AllowSystemDeleteAfter, DueDateTime = request.Correspondence.DueDateTime, PropertyList = request.Correspondence.PropertyList.ToDictionary(x => x.Key, x => x.Value), ReplyOptions = request.Correspondence.ReplyOptions.Select(requestReplyOption => new CorrespondenceReplyOptionEntity() diff --git a/src/Altinn.Correspondence.Persistence/Repositories/CorrespondenceRepository.cs b/src/Altinn.Correspondence.Persistence/Repositories/CorrespondenceRepository.cs index 5b727c993..78865eda0 100644 --- a/src/Altinn.Correspondence.Persistence/Repositories/CorrespondenceRepository.cs +++ b/src/Altinn.Correspondence.Persistence/Repositories/CorrespondenceRepository.cs @@ -394,7 +394,6 @@ public async Task> GetCorrespondencesByIdsWithExterna .AsNoTracking() .AsSplitQuery() .Where(c => correspondenceIds.Contains(c.Id)) - .Where(c => c.AllowSystemDeleteAfter != null) .Where(c => c.ExternalReferences.Any(er => er.ReferenceType == referenceType)) .Include(c => c.ExternalReferences) .ToListAsync(cancellationToken);