From 57006ff6a4e4a1714047d913dad21698e4b0c2b0 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 8 Nov 2021 14:18:28 +0200 Subject: [PATCH] fixes --- .../persistence/DossierTemplatePersistenceService.java | 4 +++- .../peristence/v1/server/controller/DictionaryController.java | 1 - .../peristence/v1/server/controller/ReanalysisController.java | 2 -- .../v1/server/controller/ReportTemplateController.java | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java index eb7176a9d..0c7bf2c27 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java @@ -15,6 +15,7 @@ import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.stream.Collectors; @Service @@ -64,7 +65,8 @@ public class DossierTemplatePersistenceService { public void deleteDossierTemplate(String dossierTemplateId, String deletingUserId) { dossierTemplateRepository.findById(dossierTemplateId).ifPresentOrElse((dossierTemplate) -> { - if (dossierTemplate.getDossiers().isEmpty()) { + dossierTemplate.getDossiers().stream().filter(template -> !) + if (dossierTemplate.getDossiers().stream().filter(d -> d.getHardDeletedTime() ==null).collect(Collectors.toList()).isEmpty()) { dossierTemplate.setModifiedBy(deletingUserId); dossierTemplate.setDateModified(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java index 6d2438982..6beba63fe 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java @@ -144,7 +144,6 @@ public class DictionaryController implements DictionaryResource { .collect(toList()), currentVersion + 1); } - dictionaryPersistenceService.incrementVersion(typeId); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java index 938efb663..8fca3ef27 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java @@ -35,8 +35,6 @@ public class ReanalysisController implements ReanalysisResource { private final FileStatusService fileStatusService; private final DossierPersistenceService dossierPersistenceService; - private final DictionaryController dictionaryClient; - private final RulesController rulesClient; private final IndexingService indexingService; private final ReanalysisRequiredStatusService reanalysisRequiredStatusService; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java index 4c2a4586b..160fc341e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java @@ -50,7 +50,8 @@ public class ReportTemplateController implements ReportTemplateResource { String storageId = StorageIdUtils.getReportStorageId(reportTemplateUploadRequest.getDossierTemplateId(), reportTemplateUploadRequest.getFileName()); storageService.storeObject(storageId, reportTemplateUploadRequest.getTemplate()); String templateId = UUID.randomUUID().toString(); - reportTemplatePersistenceService.insert(reportTemplateUploadRequest.getDossierTemplateId(), templateId, storageId, reportTemplateUploadRequest.getFileName(), reportTemplateUploadRequest.isActiveByDefault(), reportTemplateUploadRequest.isMultiFileReport()); + reportTemplatePersistenceService.insert(reportTemplateUploadRequest.getDossierTemplateId(), templateId, storageId, + reportTemplateUploadRequest.getFileName(), reportTemplateUploadRequest.isActiveByDefault(), reportTemplateUploadRequest.isMultiFileReport()); return convert(reportTemplatePersistenceService.find(templateId), ReportTemplate.class);