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

Pull request #107: RED-2441: Fixed dossierTemplateId is null for soft deleted files

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

* commit 'd5b70932b2466e434f3e8a7a735fda7b8fb520ef':
  RED-2441: Fixed dossierTemplateId is null for soft deleted files
This commit is contained in:
Dominique Eiflaender 2021-11-08 14:35:49 +01:00
commit f0f9109abf
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/FileModelMapper.java
View File

@ -13,5 +13,9 @@ public class FileModelMapper implements BiConsumer<FileEntity, FileModel> {
fileEntity.getFileAttributes().forEach(fa ->
fileModel.getFileAttributes().put(fa.getFileAttributeId().getFileAttributeConfigId(), fa.getValue())
);
// Without this dossierTemplateId is not set for soft-deleted documents calling get softdeleted with curl.
// however in the unittest it always null without it. Strange....
fileModel.setDossierTemplateId(fileEntity.getDossier().getDossierTemplateId());
}
}

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

@ -137,6 +137,7 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
var softDeletedFiles = fileClient.getSoftDeletedDossierStatus(dossier.getId());
assertThat(softDeletedFiles.size()).isEqualTo(1);
assertThat(softDeletedFiles.get(0).getDossierTemplateId()).isNotNull();
var activeFiles = fileClient.getDossierStatus(dossier.getId());
assertThat(activeFiles.size()).isEqualTo(0);