From 1f66ef0efbb62be28f21735033241bc7abac0dc0 Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Tue, 11 Jan 2022 09:22:58 +0100 Subject: [PATCH] RED-3014: Sort soft deleted files and soft deleted dossier responses by soft deleted date / time descending --- .../peristence/v1/server/controller/DossierController.java | 5 ++++- .../v1/server/controller/FileStatusController.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java index c8b068140..f2c144543 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java @@ -127,10 +127,13 @@ public class DossierController implements DossierResource { @Transactional public List getSoftDeletedDossiers() { - return convert(dossierService.getAllDossiers() + var softDeletedDossiers = convert(dossierService.getAllDossiers() .stream() .filter(p -> p.getStatus().equals(DossierStatus.DELETED) && p.getHardDeletedTime() == null) .collect(Collectors.toList()), Dossier.class, new DossierMapper()); + softDeletedDossiers.sort((dossier1, dossier2) -> dossier2.getSoftDeletedTime().compareTo(dossier1.getSoftDeletedTime())); + + return softDeletedDossiers; } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java index 455cf8f98..22fd5c7c2 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java @@ -61,10 +61,13 @@ public class FileStatusController implements StatusResource { @Override public List getSoftDeletedDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId) { - return reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(fileStatusService.getDossierStatus(dossierId) + var softDeletedFiles = reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(fileStatusService.getDossierStatus(dossierId) .stream() .filter(f -> f.getProcessingStatus().equals(ProcessingStatus.DELETED) && f.getHardDeletedTime() == null) .collect(Collectors.toList()), FileModel.class, new FileModelMapper())); + softDeletedFiles.sort((f1, f2) -> f2.getDeleted().compareTo(f1.getDeleted())); + + return softDeletedFiles; }