From 24beb1a52c50c1db0540c95ce1b9b8b9c4d4f71d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 3 May 2022 19:34:38 +0300 Subject: [PATCH 1/2] RED-3800 dossier archived flag --- .../v1/api/model/dossiertemplate/dossier/file/FileModel.java | 1 + .../v1/server/service/ReanalysisRequiredStatusService.java | 1 + 2 files changed, 2 insertions(+) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java index a6a4c728d..2e226e268 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java @@ -60,6 +60,7 @@ public class FileModel { private Set excludedPages = new HashSet<>(); private Map fileAttributes = new HashMap<>(); private String dossierId; + private boolean isDossierArchived; private String dossierTemplateId; private String dossierStatusId; private OffsetDateTime redactionModificationDate; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java index 1ebc00d9d..62fd42900 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java @@ -107,6 +107,7 @@ public class ReanalysisRequiredStatusService { return new AnalysisRequiredResult(false, false); } + fileStatus.setDossierArchived(dossier.getArchivedTime() != null); fileStatus.setDossierTemplateId(dossier.getDossierTemplateId()); fileStatus.setDossierStatusId(dossier.getDossierStatusId()); From 15dc2a62d107b592ae51190c1f10ec1e2ca8d6f6 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 3 May 2022 19:35:18 +0300 Subject: [PATCH 2/2] RED-3800 dossier archived flag --- .../v1/api/model/dossiertemplate/dossier/file/FileModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java index 2e226e268..f39ebc9c6 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java @@ -60,7 +60,7 @@ public class FileModel { private Set excludedPages = new HashSet<>(); private Map fileAttributes = new HashMap<>(); private String dossierId; - private boolean isDossierArchived; + private boolean dossierArchived; private String dossierTemplateId; private String dossierStatusId; private OffsetDateTime redactionModificationDate;