From f4068b213745e084997de2251d69fc52e8577aee Mon Sep 17 00:00:00 2001 From: devplant Date: Wed, 23 Mar 2022 10:14:14 +0200 Subject: [PATCH] RED-3594 - archived dossier can be unarchived, when using trash - remove from the list of archived dossiers the ones that were soft deleted - update junit tests --- .../peristence/v1/server/controller/DossierController.java | 2 +- .../peristence/v1/server/integration/tests/DossierTest.java | 2 +- 2 files changed, 2 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 5e46e62f8..d253a9f91 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 @@ -143,7 +143,7 @@ public class DossierController implements DossierResource { var archivedDossiers = convert(dossierService.getAllDossiers() .stream() - .filter(p -> p.getArchivedTime() != null && p.getHardDeletedTime() == null) + .filter(p -> p.getArchivedTime() != null && p.getHardDeletedTime() == null && p.getSoftDeletedTime() == null) .collect(Collectors.toList()), Dossier.class, new DossierMapper()); archivedDossiers.sort((dossier1, dossier2) -> dossier2.getArchivedTime().compareTo(dossier1.getArchivedTime())); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java index 0212a0fc7..ed55b66bc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java @@ -182,7 +182,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { assertThat(dossierClient.getAllDossiers(true, false)).hasSize(2); assertThat(dossierClient.getAllDossiers(false, true)).hasSize(1); assertThat(dossierClient.getAllDossiers(true, true)).hasSize(2); - assertThat(dossierClient.getArchivedDossiers()).hasSize(2); + assertThat(dossierClient.getArchivedDossiers()).hasSize(1); assertThat(dossierClient.getSoftDeletedDossiers()).hasSize(1); dossierInformation = dossierClient.getDossierInformation();