From 41ad7b2b3386a64686586aabd4079b28b7084307 Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Tue, 21 Jun 2022 18:15:32 +0200 Subject: [PATCH] RED-4153: Getting all existing dossiers returns deleted archived dossiers --- .../v1/server/controller/DossierController.java | 8 ++++---- .../v1/server/integration/tests/DossierTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 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 8fc36354c..feb2d9b78 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 @@ -119,17 +119,17 @@ public class DossierController implements DossierResource { return convert(dossierEntitiesList, Dossier.class, new DossierMapper()); } - // return archived and non-deleted dossiers + // return both active and archived&non-deleted dossiers if (includeArchived) { return convert(dossierEntitiesList.stream().filter(p -> p.getSoftDeletedTime() == null).collect(Collectors.toList()), Dossier.class, new DossierMapper()); } - // return deleted and non-archived dossiers + // return both active and deleted dossiers if (includeDeleted) { - return convert(dossierEntitiesList.stream().filter(p -> p.getArchivedTime() == null).collect(Collectors.toList()), Dossier.class, new DossierMapper()); + return convert(dossierEntitiesList.stream().filter(p -> p. getArchivedTime() == null || p.getSoftDeletedTime() != null).collect(Collectors.toList()), Dossier.class, new DossierMapper()); } - // return only non-deleted and non-archived dossiers + // return only active dossiers return convert(dossierEntitiesList.stream() .filter(p -> p.getSoftDeletedTime() == null && p.getArchivedTime() == null) .collect(Collectors.toList()), Dossier.class, new DossierMapper()); 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 3d436d037..6a5ea5a00 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 @@ -201,7 +201,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { dossierClient.archiveDossiers(Set.of(dossier1.getId(), dossier2.getId())); assertThat(dossierClient.getAllDossiers(false, false)).hasSize(0); assertThat(dossierClient.getAllDossiers(true, false)).hasSize(1); - assertThat(dossierClient.getAllDossiers(false, true)).hasSize(0); + assertThat(dossierClient.getAllDossiers(false, true)).hasSize(1); assertThat(dossierClient.getAllDossiers(true, true)).hasSize(2); assertThat(dossierClient.getArchivedDossiers()).hasSize(1); assertThat(dossierClient.getSoftDeletedDossiers()).hasSize(1); @@ -410,7 +410,7 @@ public class DossierTest extends AbstractPersistenceServerServiceTest { // check get all dossiers with inclusions assertThat(dossierClient.getAllDossiers(true, true)).hasSize(4); //all without harddeleted assertThat(dossierClient.getAllDossiers(true, false)).hasSize(2); //regular and onlyarchived - assertThat(dossierClient.getAllDossiers(false, true)).hasSize(2); //regular and onlydeleted + assertThat(dossierClient.getAllDossiers(false, true)).hasSize(3); //regular and onlydeleted and archivedanddeleted assertThat(dossierClient.getAllDossiers(false, false)).hasSize(1); //regular }