Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #453: RED-4153: Getting all existing dossiers returns deleted archived dossiers

Browse Source 
Merge in RED/persistence-service from RED-4153-ps4 to master

* commit '41ad7b2b3386a64686586aabd4079b28b7084307':
  RED-4153: Getting all existing dossiers returns deleted archived dossiers
This commit is contained in:
Ali Oezyetimoglu 2022-06-22 08:20:50 +02:00 committed by Philipp Schramm
commit f41188513d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java
View File

@ -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());

4
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java
View File

@ -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
}