Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public List<string> PopulateWithCorrespondences(int totalCount)
},
"\"correspondence\".\"Correspondences\"",
@"Id, ResourceId, Recipient, Sender, SendersReference, MessageSender,
RequestedPublishTime, AllowSystemDeleteAfter, DueDateTime, PropertyList,
RequestedPublishTime, DueDateTime, PropertyList,
IgnoreReservation, Created, Altinn2CorrespondenceId, Published, IsConfirmationNeeded"
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ begin
"SendersReference",
"MessageSender",
"RequestedPublishTime",
"AllowSystemDeleteAfter",
"DueDateTime",
"PropertyList",
"IgnoreReservation",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public async Task ExecuteCleanupInBackground_RemovesExpiresAtAndCountsAlreadyOk(
repo.SetupSequence(r => r.GetCorrespondencesWindowAfter(It.IsAny<int>(), It.IsAny<DateTimeOffset?>(), It.IsAny<Guid?>(), true, It.IsAny<CancellationToken>()))
.ReturnsAsync(new List<CorrespondenceEntity> { c1, c2 })
.ReturnsAsync(new List<CorrespondenceEntity>());
repo.Setup(r => r.GetCorrespondencesByIdsWithExternalReferenceAndAllowSystemDeleteAfter(
repo.Setup(r => r.GetCorrespondencesByIdsWithExternalReference(
It.IsAny<List<Guid>>(),
It.IsAny<ReferenceType>(),
It.IsAny<CancellationToken>()))
Expand Down Expand Up @@ -84,7 +84,7 @@ public async Task ExecuteCleanupInBackground_DoesNotReprocessOrSkipItemsBetweenB
.ToList();
return query;
});
repo.Setup(r => r.GetCorrespondencesByIdsWithExternalReferenceAndAllowSystemDeleteAfter(
repo.Setup(r => r.GetCorrespondencesByIdsWithExternalReference(
It.IsAny<List<Guid>>(),
It.IsAny<ReferenceType>(),
It.IsAny<CancellationToken>()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public async Task<ActionResult> CleanupOrphanedDialogs(
}

/// <summary>
/// Enqueue cleanup to remove expiresAt from dialogs in Dialogporten for correspondences where AllowSystemDeleteAfter has been set
/// Enqueue cleanup to remove expiresAt from dialogs in Dialogporten
/// </summary>
/// <response code="200">Returns the enqueued job id</response>
/// <response code="401">Unauthorized</response>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public async Task ExecuteCleanupInBackground(int windowSize, CancellationToken c
}

var windowIds = correspondencesWindow.Select(c => c.Id).ToList();
var candidates = await correspondenceRepository.GetCorrespondencesByIdsWithExternalReferenceAndAllowSystemDeleteAfter(
var candidates = await correspondenceRepository.GetCorrespondencesByIdsWithExternalReference(
windowIds,
ReferenceType.DialogportenDialogId,
cancellationToken);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ public class CorrespondenceEntity

public required DateTimeOffset RequestedPublishTime { get; set; }

public DateTimeOffset? AllowSystemDeleteAfter { get; set; }

public DateTimeOffset? DueDateTime { get; set; }

public List<ExternalReferenceEntity> ExternalReferences { get; set; } = new List<ExternalReferenceEntity>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Task<List<CorrespondenceEntity>> GetCorrespondencesByIdsWithExternalReferenceAnd
List<CorrespondenceStatus> excludedCurrentStatuses,
CancellationToken cancellationToken);

Task<List<CorrespondenceEntity>> GetCorrespondencesByIdsWithExternalReferenceAndAllowSystemDeleteAfter(
Task<List<CorrespondenceEntity>> GetCorrespondencesByIdsWithExternalReference(
List<Guid> correspondenceIds,
ReferenceType referenceType,
CancellationToken cancellationToken);
Expand Down
Loading
Loading