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

Pull request #319: RED-3594 - archived dossier can be unarchived, when using trash

Browse Source 
Merge in RED/persistence-service from bugfix/RED-3594-1 to master

* commit 'f4068b213745e084997de2251d69fc52e8577aee':
  RED-3594 - archived dossier can be unarchived, when using trash
This commit is contained in:
Corina Olariu 2022-03-23 17:25:14 +01:00 committed by Timo Bejan
commit cbc17b270a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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