From 801c30de52b50664f7776905d5de6cf4b620e86d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 28 Sep 2021 13:55:39 +0300 Subject: [PATCH] code compiles --- .../entity/configuration/WatermarkEntity.java | 4 +- .../entity/download/DownloadStatusEntity.java | 5 +- .../DownloadStatusPersistenceService.java | 5 +- .../download/DownloadDLQMessageReceiver.java | 3 +- .../download/DownloadMessageReceiver.java | 3 +- .../download/DownloadPreparationService.java | 3 +- .../integration/client/DictionaryClient.java | 1 - .../client/DossierTemplateClient.java | 2 +- .../integration/client/DownloadClient.java | 2 +- .../client/FileAttributeConfigClient.java | 1 - .../client/NotificationClient.java | 1 - .../client/ReportTemplateClient.java | 1 - .../DossierTemplateTesterAndProvider.java | 13 +- .../service/DossierTesterAndProvider.java | 16 +- .../service/FileTesterAndProvider.java | 17 +- .../integration/service/TypeProvider.java | 12 +- .../tests/DigitalSignatureTest.java | 6 +- .../tests/DossierAttributeTest.java | 15 +- .../tests/DossierTemplateTest.java | 2 +- .../server/integration/tests/DossierTest.java | 4 +- .../tests/DownloadPreparationTest.java | 2 +- .../integration/tests/DownloadTest.java | 2 +- .../integration/tests/FileAttributeTest.java | 31 ++- .../integration/tests/FileProcessingTest.java | 4 +- .../v1/server/integration/tests/FileTest.java | 67 +++--- .../integration/tests/LegalBasisTest.java | 10 +- .../tests/ManualRedactionTest.java | 65 +++--- .../integration/tests/NotificationTest.java | 12 +- .../integration/tests/ReanalysisTest.java | 6 +- .../v1/server/integration/tests/SMTPTest.java | 4 +- .../v1/server/integration/tests/TypeTest.java | 14 +- .../integration/tests/ViewedPagesTest.java | 8 +- .../integration/tests/WatermarkTest.java | 7 +- .../AbstractPersistenceServerServiceTest.java | 198 ++++++++---------- 34 files changed, 239 insertions(+), 307 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java index 9bd8ff697..8db3b4cf9 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java @@ -2,6 +2,7 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.configu import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.WatermarkOrientation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -38,8 +39,5 @@ public class WatermarkEntity { @JoinColumn(name = "dossier_template_id") private DossierTemplateEntity dossierTemplate; - public enum WatermarkOrientation { - VERTICAL, HORIZONTAL, DIAGONAL - } } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java index acf46a208..96a64374d 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java @@ -3,6 +3,7 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.downloa import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType; +import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -47,9 +48,5 @@ public class DownloadStatusEntity { @ElementCollection private List downloadFileTypes = new ArrayList<>(); - public enum DownloadStatusValue { - QUEUED, GENERATING, READY, FAILED - } - } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java index 408437886..e3d4fe793 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java @@ -5,6 +5,7 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.download import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DownloadStatusRepository; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository; +import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -37,14 +38,14 @@ public class DownloadStatusPersistenceService { @Transactional - public void updateStatus(String storageId, DownloadStatusEntity.DownloadStatusValue status) { + public void updateStatus(String storageId, DownloadStatusValue status) { downloadStatusRepository.findById(storageId).ifPresent(downloadStatus -> downloadStatus.setStatus(status)); } @Transactional - public void updateStatus(String storageId, DownloadStatusEntity.DownloadStatusValue status, long fileSize) { + public void updateStatus(String storageId, DownloadStatusValue status, long fileSize) { downloadStatusRepository.findById(storageId).ifPresent(downloadStatus -> { downloadStatus.setStatus(status); downloadStatus.setFileSize(fileSize); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadDLQMessageReceiver.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadDLQMessageReceiver.java index f0544c9f3..80ee5af89 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadDLQMessageReceiver.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadDLQMessageReceiver.java @@ -5,6 +5,7 @@ import com.iqser.red.service.peristence.v1.server.model.DownloadJob; import com.iqser.red.service.peristence.v1.server.configuration.MessagingConfiguration; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DownloadStatusPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.entity.download.DownloadStatusEntity; +import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue; import com.iqser.red.service.redaction.report.v1.api.model.ReportRequestMessage; import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage; import lombok.RequiredArgsConstructor; @@ -60,7 +61,7 @@ public class DownloadDLQMessageReceiver { retryTemplate.execute(retryContext -> { log.warn("Retrying {} time to set FAILED status for downloadJob userId: {} storageId: {}", retryContext.getRetryCount(), userId, downloadId); - downloadStatusPersistenceService.updateStatus(downloadId, DownloadStatusEntity.DownloadStatusValue.FAILED); + downloadStatusPersistenceService.updateStatus(downloadId, DownloadStatusValue.FAILED); return null; }); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadMessageReceiver.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadMessageReceiver.java index 871650e46..e72a00afd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadMessageReceiver.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadMessageReceiver.java @@ -9,6 +9,7 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.dossier. import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DownloadStatusPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ReportTemplateEntity; import com.iqser.red.service.persistence.management.v1.processor.entity.download.DownloadStatusEntity; +import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue; import com.iqser.red.service.redaction.report.v1.api.model.ReportRequestMessage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -41,7 +42,7 @@ public class DownloadMessageReceiver { log.info("Preparing download for userId: {} and storageId: {}", downloadJob.getUserId(), downloadJob.getStorageId()); DownloadStatusEntity downloadStatus = downloadStatusPersistenceService.getStatus(downloadJob.getStorageId()); - downloadStatusPersistenceService.updateStatus(downloadJob.getStorageId(), DownloadStatusEntity.DownloadStatusValue.GENERATING); + downloadStatusPersistenceService.updateStatus(downloadJob.getStorageId(), DownloadStatusValue.GENERATING); var dossier = downloadStatus.getFiles().iterator().next().getDossier(); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java index e74d8a6f1..2108e85e8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java @@ -15,6 +15,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist import com.iqser.red.service.persistence.service.v1.api.model.audit.AddNotificationRequest; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; +import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue; import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage; import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation; import com.iqser.red.service.redaction.v1.model.AnnotateRequest; @@ -54,7 +55,7 @@ public class DownloadPreparationService { addReports(reportResultMessage, fileSystemBackedArchiver); storeZipFile(downloadStatus, fileSystemBackedArchiver); - downloadStatusPersistenceService.updateStatus(downloadStatus.getStorageId(), DownloadStatusEntity.DownloadStatusValue.READY, fileSystemBackedArchiver.getContentLength()); + downloadStatusPersistenceService.updateStatus(downloadStatus.getStorageId(), DownloadStatusValue.READY, fileSystemBackedArchiver.getContentLength()); notificationPersistenceService.insertNotification(AddNotificationRequest.builder() .userId(downloadStatus.getUserId()) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DictionaryClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DictionaryClient.java index 386fd6807..67ff6bf43 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DictionaryClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DictionaryClient.java @@ -1,7 +1,6 @@ package com.iqser.red.service.peristence.v1.server.integration.client; import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryResource; -import com.iqser.red.service.persistence.service.v1.api.resources.UploadResource; import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "DictionaryClient", url = "http://localhost:${server.port}") diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateClient.java index 362682263..ec57ec691 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateClient.java @@ -3,6 +3,6 @@ package com.iqser.red.service.peristence.v1.server.integration.client; import com.iqser.red.service.persistence.service.v1.api.resources.DossierTemplateResource; import org.springframework.cloud.openfeign.FeignClient; -@FeignClient(name = "DossierTemplateClient" ,url = "http://localhost:${server.port}") +@FeignClient(name = "DossierTemplateClient", url = "http://localhost:${server.port}") public interface DossierTemplateClient extends DossierTemplateResource { } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DownloadClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DownloadClient.java index b802543f2..36d0fb596 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DownloadClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DownloadClient.java @@ -3,6 +3,6 @@ package com.iqser.red.service.peristence.v1.server.integration.client; import com.iqser.red.service.persistence.service.v1.api.resources.DownloadResource; import org.springframework.cloud.openfeign.FeignClient; -@FeignClient(name = "DownloadClient" ,url = "http://localhost:${server.port}") +@FeignClient(name = "DownloadClient", url = "http://localhost:${server.port}") public interface DownloadClient extends DownloadResource { } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeConfigClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeConfigClient.java index be37a5116..adaaf5ba8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeConfigClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeConfigClient.java @@ -1,7 +1,6 @@ package com.iqser.red.service.peristence.v1.server.integration.client; import com.iqser.red.service.persistence.service.v1.api.resources.FileAttributesConfigResource; -import com.iqser.red.service.persistence.service.v1.api.resources.FileAttributesResource; import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "FileAttributeConfigClient", url = "http://localhost:${server.port}") diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationClient.java index e64a5daf7..1afed6316 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationClient.java @@ -1,6 +1,5 @@ package com.iqser.red.service.peristence.v1.server.integration.client; -import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.NotificationRepository; import com.iqser.red.service.persistence.service.v1.api.resources.NotificationResource; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReportTemplateClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReportTemplateClient.java index fa0f82026..302204145 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReportTemplateClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReportTemplateClient.java @@ -4,7 +4,6 @@ import com.iqser.red.service.persistence.service.v1.api.resources.ReportTemplate import org.springframework.cloud.openfeign.FeignClient; - @FeignClient(name = "ReportTemplateClient", url = "http://localhost:${server.port}") public interface ReportTemplateClient extends ReportTemplateResource { } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java index 45f285c11..0ffb8d824 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java @@ -3,9 +3,8 @@ package com.iqser.red.service.peristence.v1.server.integration.service; import com.google.common.collect.Sets; import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier - .DownloadFileType; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,7 +18,7 @@ public class DossierTemplateTesterAndProvider { @Autowired private DossierTemplateClient dossierTemplateClient; - public DossierTemplateEntity provideTestTemplate(){ + public DossierTemplate provideTestTemplate() { CreateOrUpdateDossierTemplateRequest cru = new CreateOrUpdateDossierTemplateRequest(); cru.setCreatedBy("1"); cru.setDateAdded(OffsetDateTime.now()); @@ -31,11 +30,11 @@ public class DossierTemplateTesterAndProvider { cru.setValidFrom(OffsetDateTime.now()); cru.setValidTo(OffsetDateTime.now()); - DossierTemplateEntity result = dossierTemplateClient.createOrUpdateDossierTemplate(cru); + DossierTemplate result = dossierTemplateClient.createOrUpdateDossierTemplate(cru); assertThat(result.getName()).isEqualTo("Template 1"); - DossierTemplateEntity loadedTemplate = dossierTemplateClient.getDossierTemplate(result.getId()); + DossierTemplate loadedTemplate = dossierTemplateClient.getDossierTemplate(result.getId()); assertThat(loadedTemplate).isEqualTo(result); @@ -43,6 +42,4 @@ public class DossierTemplateTesterAndProvider { } - - } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java index e95fbd206..0d4f7d80e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java @@ -2,10 +2,10 @@ package com.iqser.red.service.peristence.v1.server.integration.service; import com.google.common.collect.Sets; import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.persistence.service.v1.api.model.CreateOrUpdateDossierRequest; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DownloadFileType; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +22,7 @@ public class DossierTesterAndProvider { @Autowired private DossierClient dossierClient; - public DossierEntity provideTestDossier(DossierTemplateEntity testTemplate) { + public Dossier provideTestDossier(DossierTemplate testTemplate) { CreateOrUpdateDossierRequest cru = new CreateOrUpdateDossierRequest(); cru.setDownloadFileTypes(Sets.newHashSet(DownloadFileType.ORIGINAL)); @@ -36,18 +36,18 @@ public class DossierTesterAndProvider { cru.setDueDate(OffsetDateTime.now()); cru.setDossierTemplateId(testTemplate.getId()); - DossierEntity result = dossierClient.addDossier(cru); + Dossier result = dossierClient.addDossier(cru); assertThat(result.getDossierName()).isEqualTo("Dossier 1"); - DossierEntity loadedDossier = dossierClient.getDossierById(result.getId()); + Dossier loadedDossier = dossierClient.getDossierById(result.getId()); assertThat(loadedDossier).isEqualTo(result); return loadedDossier; } - public DossierEntity provideTestDossier() { + public Dossier provideTestDossier() { var testTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java index f607b4513..35314c2da 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java @@ -5,16 +5,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient; import com.iqser.red.service.peristence.v1.server.service.FileManagementStorageService; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.BinaryFileRequest; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; -import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.File; +import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.BinaryFileRequest; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionLogEntry; import com.iqser.red.service.redaction.v1.model.SectionGrid; import lombok.SneakyThrows; -import org.assertj.core.util.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ public class FileTesterAndProvider { @SneakyThrows - public File testAndProvideFile(DossierEntity dossier){ + public FileModel testAndProvideFile(Dossier dossier) { BinaryFileRequest upload = new BinaryFileRequest("test".getBytes(StandardCharsets.UTF_8), "test.pdf", dossier.getId(), "1"); @@ -53,8 +53,9 @@ public class FileTesterAndProvider { assertThat(fileClient.getDossierStatus(dossier.getId()).size()).isEqualTo(1); - fileManagementStorageService.storeObject(dossier.getId(),file.getId(), FileType.REDACTION_LOG, objectMapper.writeValueAsBytes(new RedactionLog(1, List.of(RedactionLogEntry.builder().id("annotationId").typeId("manual:" + dossier.getDossierTemplateId()).value("value").build()), Lists.newArrayList(),0,0,0,0))); - fileManagementStorageService.storeObject(dossier.getId(),file.getId(), FileType.SECTION_GRID, objectMapper.writeValueAsBytes(new SectionGrid())); + fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.REDACTION_LOG, objectMapper.writeValueAsBytes(new RedactionLog(1, List.of(RedactionLogEntry.builder().id("annotationId").typeId("manual:" + dossier.getDossierTemplateId()).value("value").build()), + null, 0, 0, 0, 0))); + fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.SECTION_GRID, objectMapper.writeValueAsBytes(new SectionGrid())); return file; } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/TypeProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/TypeProvider.java index a0d3c619e..3b3cd36f1 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/TypeProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/TypeProvider.java @@ -1,9 +1,9 @@ package com.iqser.red.service.peristence.v1.server.integration.service; import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,9 +16,9 @@ public class TypeProvider { private DictionaryClient dictionaryClient; - public TypeEntity testAndProvideType(DossierTemplateEntity dossierTemplate, DossierEntity dossier, String typeName) { + public Type testAndProvideType(DossierTemplate dossierTemplate, Dossier dossier, String typeName) { - var type = new TypeEntity(); + var type = new Type(); type.setType(typeName); type.setDescription("test"); type.setAddToDictionaryAction(true); @@ -41,7 +41,7 @@ public class TypeProvider { return loadedType; } - public TypeEntity testAndProvideType(DossierTemplateEntity dossierTemplate) { + public Type testAndProvideType(DossierTemplate dossierTemplate) { return testAndProvideType(dossierTemplate, null, "test"); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java index e3f843faa..75c583aee 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java @@ -2,7 +2,7 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import com.iqser.red.service.peristence.v1.server.integration.client.DigitalSignatureClient; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DigitalSignatureEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.DigitalSignature; import feign.FeignException; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +24,7 @@ public class DigitalSignatureTest extends AbstractPersistenceServerServiceTest { assertThat(e.status()).isEqualTo(404); } - DigitalSignatureEntity digitalSignature = new DigitalSignatureEntity(); + DigitalSignature digitalSignature = new DigitalSignature(); digitalSignature.setPassword("test"); digitalSignature.setCertificateName("test"); digitalSignature.setReason("test"); @@ -46,7 +46,6 @@ public class DigitalSignatureTest extends AbstractPersistenceServerServiceTest { assertThat(loadedSignature.getReason()).isEqualTo("new test"); - digitalSignatureClient.deleteDigitalSignature(); try { digitalSignatureClient.getDigitalSignature(); @@ -55,6 +54,5 @@ public class DigitalSignatureTest extends AbstractPersistenceServerServiceTest { } - } } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java index 5f683afdc..3e3a3c1ac 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java @@ -4,8 +4,9 @@ import com.iqser.red.service.peristence.v1.server.integration.client.DossierAttr import com.iqser.red.service.peristence.v1.server.integration.client.DossierAttributeConfigClient; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttribute; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttributeType; import lombok.SneakyThrows; import org.assertj.core.util.Lists; import org.junit.Test; @@ -36,10 +37,10 @@ public class DossierAttributeTest extends AbstractPersistenceServerServiceTest { var loadedAttributes = dossierAttributeConfigClient.getDossierAttributes(dossier.getDossierTemplateId()); assertThat(loadedAttributes).isEmpty(); - DossierAttributeConfigEntity attribute = new DossierAttributeConfigEntity(); + DossierAttributeConfig attribute = new DossierAttributeConfig(); attribute.setLabel("test"); attribute.setEditable(true); - attribute.setType(DossierAttributeConfigEntity.DossierAttributeType.TEXT); + attribute.setType(DossierAttributeType.TEXT); dossierAttributeConfigClient.addOrUpdateDossierAttribute(dossier.getDossierTemplateId(), attribute); @@ -64,8 +65,8 @@ public class DossierAttributeTest extends AbstractPersistenceServerServiceTest { var configId = loadedAttributes.iterator().next().getId(); - List dossierAttributes = new ArrayList<>(); - dossierAttributes.add(DossierAttributeEntity.builder().id(new DossierAttributeEntity.DossierAttributeEntityId(dossier.getId(), configId)).value("lorem ipsum").build()); + List dossierAttributes = new ArrayList<>(); + dossierAttributes.add(DossierAttribute.builder().dossierAttributeConfigId(configId).dossierId(dossier.getId()).value("lorem ipsum").build()); dossierAttributeClient.setDossierAttributes(dossier.getId(), dossierAttributes); @@ -84,7 +85,7 @@ public class DossierAttributeTest extends AbstractPersistenceServerServiceTest { assertThat(firstAttribute.getValue()).isEqualTo("test"); - dossierAttributeClient.deleteDossierAttribute(dossier.getId(), firstAttribute.getId().getDossierAttributeConfigId()); + dossierAttributeClient.deleteDossierAttribute(dossier.getId(), firstAttribute.getDossierAttributeConfigId()); loadedAttributeValues = dossierAttributeClient.getDossierAttributes(dossier.getId()); assertThat(loadedAttributeValues).isEmpty(); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java index f54eb35d9..09fc5ce53 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java @@ -1,8 +1,8 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest; import org.junit.Test; import org.springframework.beans.BeanUtils; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java index e1b1cea45..d3cfb8953 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java @@ -1,10 +1,10 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import com.google.common.collect.Sets; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; -import com.iqser.red.service.persistence.service.v1.api.model.CreateOrUpdateDossierRequest; +import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest; import org.junit.Test; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java index 504b3c155..50fadd89c 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java @@ -8,8 +8,8 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.peristence.v1.server.service.download.DownloadReportMessageReceiver; -import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadRequest; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUploadRequest; +import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadRequest; import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage; import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation; import com.iqser.red.storage.commons.service.StorageService; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java index bac4f1383..98eb0cb13 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java @@ -4,8 +4,8 @@ import com.iqser.red.service.peristence.v1.server.integration.client.DownloadCli import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadRequest; import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive; +import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadRequest; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java index 80d7a5849..4d712a84b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java @@ -6,10 +6,9 @@ import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.FileAttributesGeneralConfiguration; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvRequest; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; import org.assertj.core.util.Lists; @@ -51,7 +50,7 @@ public class FileAttributeTest extends AbstractPersistenceServerServiceTest { var file = fileTesterAndProvider.testAndProvideFile(dossier); - FileAttributesGeneralConfigurationEntity generalConfig = new FileAttributesGeneralConfigurationEntity(); + FileAttributesGeneralConfiguration generalConfig = new FileAttributesGeneralConfiguration(); generalConfig.setDelimiter(","); generalConfig.setFilenameMappingColumnHeaderName("Name"); generalConfig.setDossierTemplateId(dossier.getDossierTemplateId()); @@ -60,31 +59,31 @@ public class FileAttributeTest extends AbstractPersistenceServerServiceTest { var loadedConfig = fileAttributeConfigClient.getFileAttributesGeneralConfig(dossier.getDossierTemplateId()); assertThat(loadedConfig.getDelimiter()).isEqualTo(","); - List configs = new ArrayList<>(); - configs.add(FileAttributeConfigEntity.builder().csvColumnHeader("Name").primaryAttribute(true).label("Name").build()); - configs.add(FileAttributeConfigEntity.builder().csvColumnHeader("Attribute A").primaryAttribute(false).label("Attribute A").build()); - configs.add(FileAttributeConfigEntity.builder().csvColumnHeader("Attribute B").primaryAttribute(false).label("Attribute B").build()); - configs.add(FileAttributeConfigEntity.builder().csvColumnHeader("Attribute C").primaryAttribute(false).label("Attribute C").build()); - configs.add(FileAttributeConfigEntity.builder().csvColumnHeader("Attribute D").primaryAttribute(false).label("Attribute D").build()); + List configs = new ArrayList<>(); + configs.add(FileAttributeConfig.builder().csvColumnHeader("Name").primaryAttribute(true).label("Name").build()); + configs.add(FileAttributeConfig.builder().csvColumnHeader("Attribute A").primaryAttribute(false).label("Attribute A").build()); + configs.add(FileAttributeConfig.builder().csvColumnHeader("Attribute B").primaryAttribute(false).label("Attribute B").build()); + configs.add(FileAttributeConfig.builder().csvColumnHeader("Attribute C").primaryAttribute(false).label("Attribute C").build()); + configs.add(FileAttributeConfig.builder().csvColumnHeader("Attribute D").primaryAttribute(false).label("Attribute D").build()); fileAttributeConfigClient.setFileAttributesConfig(dossier.getDossierTemplateId(), configs); - List loadedConfigs = fileAttributeConfigClient.getFileAttributeConfigs(dossier.getDossierTemplateId()); + List loadedConfigs = fileAttributeConfigClient.getFileAttributeConfigs(dossier.getDossierTemplateId()); assertThat(loadedConfigs.size()).isEqualTo(5); fileAttributeConfigClient.deleteFileAttributeConfigs(loadedConfigs.stream() .filter(a -> a.getCsvColumnHeader().equalsIgnoreCase("Attribute C")) .findAny() - .map(FileAttributeConfigEntity::getId) + .map(FileAttributeConfig::getId) .orElseThrow(() -> new IllegalArgumentException("Should exists!"))); fileAttributeConfigClient.deleteFileAttributeConfigs(loadedConfigs.stream() .filter(a -> a.getCsvColumnHeader().equalsIgnoreCase("Attribute D")) .findAny() - .map(FileAttributeConfigEntity::getId) + .map(FileAttributeConfig::getId) .stream().collect(Collectors.toList())); @@ -92,7 +91,7 @@ public class FileAttributeTest extends AbstractPersistenceServerServiceTest { assertThat(loadedConfigs.size()).isEqualTo(3); - FileAttributeConfigEntity newConfig = new FileAttributeConfigEntity(); + FileAttributeConfig newConfig = new FileAttributeConfig(); newConfig.setPrimaryAttribute(true); newConfig.setLabel("Test Attribute"); var created = fileAttributeConfigClient.addOrUpdateFileAttributeConfig(dossier.getDossierTemplateId(), newConfig); @@ -111,9 +110,9 @@ public class FileAttributeTest extends AbstractPersistenceServerServiceTest { fileAttributeClient.setFileAttributes(dossier.getId(), file.getId(), Map.of(updated.getId(), "Lorem Ipsum")); - List fileAttributes = fileClient.getFileStatus(dossier.getId(), file.getId()).getFileAttributes(); + Map fileAttributes = fileClient.getFileStatus(dossier.getId(), file.getId()).getFileAttributes(); assertThat(fileAttributes.size()).isEqualTo(1); - assertThat(fileAttributes.iterator().next().getValue()).isEqualTo("Lorem Ipsum"); + assertThat(fileAttributes.entrySet().iterator().next().getValue()).isEqualTo("Lorem Ipsum"); var request = new ImportCsvRequest(); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java index 009fd4868..91124422d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java @@ -5,7 +5,7 @@ import com.iqser.red.service.peristence.v1.server.integration.client.FileProcess import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileStatus; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus; import com.iqser.red.service.redaction.v1.model.AnalyzeResult; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -48,7 +48,6 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest { assertThat(loadedFile.getAnalysisVersion()).isEqualTo(100); - fileProcessingClient.ocrFailed(dossier.getId(), file.getId()); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.getStatus()).isEqualTo(FileStatus.ERROR); @@ -60,7 +59,6 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest { assertThat(loadedFile.getLastOCRTime()).isNotNull(); - fileProcessingClient.indexing(dossier.getId(), file.getId()); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.getStatus()).isEqualTo(FileStatus.INDEXING); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java index 4d99ac302..9309c5829 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java @@ -5,28 +5,27 @@ import com.google.common.collect.Sets; import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; import com.iqser.red.service.peristence.v1.server.integration.client.ManualRedactionClient; import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient; +import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.BinaryFileRequest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest; +import com.iqser.red.service.persistence.service.v1.api.model.annotations.*; import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest; -import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationStatus; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileStatus; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.BinaryFileRequest; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.StandardCharsets; +import static org.assertj.core.api.Assertions.assertThat; + public class FileTest extends AbstractPersistenceServerServiceTest { + @Autowired + private DossierTemplateTesterAndProvider dossierTemplateTesterAndProvider; + @Autowired private FileTesterAndProvider fileTesterAndProvider; @@ -71,53 +70,52 @@ public class FileTest extends AbstractPersistenceServerServiceTest { assertThat(loadedFile.getExcludedPages()).isEmpty(); - fileClient.setCurrentFileReviewer(dossier.getId(), file.getId(), JSONPrimitive.of("1")); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.getCurrentReviewer()).isEqualTo("1"); assertThat(loadedFile.getStatus()).isEqualTo(FileStatus.UNDER_REVIEW); - fileClient.setStatusUnderApproval(dossier.getId(),file.getId(),"1"); + fileClient.setStatusUnderApproval(dossier.getId(), file.getId(), "1"); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.getStatus()).isEqualTo(FileStatus.UNDER_APPROVAL); - fileClient.setStatusUnderReview(dossier.getId(),file.getId()); + fileClient.setStatusUnderReview(dossier.getId(), file.getId()); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.getStatus()).isEqualTo(FileStatus.UNDER_REVIEW); - fileClient.setStatusUnderApproval(dossier.getId(),file.getId(),"1"); + fileClient.setStatusUnderApproval(dossier.getId(), file.getId(), "1"); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.getStatus()).isEqualTo(FileStatus.UNDER_APPROVAL); - fileClient.setStatusApproved(dossier.getId(),file.getId()); + fileClient.setStatusApproved(dossier.getId(), file.getId()); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.getStatus()).isEqualTo(FileStatus.APPROVED); - assertThat(uploadClient.getOriginal(dossier.getId(),file.getId())).isNotNull(); - assertThat(uploadClient.getRedacted(dossier.getId(),file.getId())).isNotNull(); - assertThat(uploadClient.getFlatRedacted(dossier.getId(),file.getId())).isNotNull(); - assertThat(uploadClient.getPreview(dossier.getId(),file.getId())).isNotNull(); - assertThat(uploadClient.getAnnotated(dossier.getId(),file.getId())).isNotNull(); + assertThat(uploadClient.getOriginal(dossier.getId(), file.getId())).isNotNull(); + assertThat(uploadClient.getRedacted(dossier.getId(), file.getId())).isNotNull(); + assertThat(uploadClient.getFlatRedacted(dossier.getId(), file.getId())).isNotNull(); + assertThat(uploadClient.getPreview(dossier.getId(), file.getId())).isNotNull(); + assertThat(uploadClient.getAnnotated(dossier.getId(), file.getId())).isNotNull(); fileClient.setStatusUnderReview(dossier.getId(), file.getId()); - fileClient.toggleExclusion(dossier.getId(),file.getId(),true); + fileClient.toggleExclusion(dossier.getId(), file.getId(), true); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.isExcluded()).isTrue(); - fileClient.toggleExclusion(dossier.getId(),file.getId(),false); + fileClient.toggleExclusion(dossier.getId(), file.getId(), false); loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); assertThat(loadedFile.isExcluded()).isFalse(); - uploadClient.deleteFile(dossier.getId(),file.getId()); + uploadClient.deleteFile(dossier.getId(), file.getId()); var softDeletedFiles = fileClient.getSoftDeletedDossierStatus(dossier.getId()); assertThat(softDeletedFiles.size()).isEqualTo(1); @@ -132,7 +130,6 @@ public class FileTest extends AbstractPersistenceServerServiceTest { assertThat(activeFiles.size()).isEqualTo(1); - uploadClient.hardDeleteFiles(dossier.getId(), Sets.newHashSet(file.getId())); softDeletedFiles = fileClient.getSoftDeletedDossierStatus(dossier.getId()); assertThat(softDeletedFiles.size()).isEqualTo(0); @@ -141,20 +138,20 @@ public class FileTest extends AbstractPersistenceServerServiceTest { assertThat(activeFiles.size()).isEqualTo(0); - - - } @Test public void testFilewithRedactions() { - var dossier = dossierTesterAndProvider.provideTestDossier(); + + var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); + + var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); String dossierId = dossier.getId(); var file = fileTesterAndProvider.testAndProvideFile(dossier); String fileId = file.getId(); - var type = typeProvider.testAndProvideType(dossier.getDossierTemplate(), null, "manual"); + var type = typeProvider.testAndProvideType(dossierTemplate, null, "manual"); String typeId = type.getId(); assertThat(fileClient.getAllStatuses().size()).isEqualTo(1); @@ -178,14 +175,14 @@ public class FileTest extends AbstractPersistenceServerServiceTest { var loadedFile = fileClient.getFileStatus(dossierId, fileId); assertThat(loadedFile.isHasAnnotationComments()).isEqualTo(true); - assertThat(manualRedactionClient.getAddRedaction(fileId, addRedaction.getAnnotationId()).getId().getFileId()).isEqualTo(loadedFile.getId()); - assertThat(manualRedactionClient.getRemoveRedaction(fileId, removeRedaction.getAnnotationId()).getId().getFileId()).isEqualTo(loadedFile.getId()); - assertThat(manualRedactionClient.getForceRedaction(fileId, forceRedaction.getAnnotationId()).getId().getFileId()).isEqualTo(loadedFile.getId()); - assertThat(manualRedactionClient.getLegalBasisChange(fileId, legalBasisChange.getAnnotationId()).getId().getFileId()).isEqualTo(loadedFile.getId()); - assertThat(manualRedactionClient.getImageRecategorization(fileId, imageRecategorization.getAnnotationId()).getId().getFileId()).isEqualTo(loadedFile.getId()); + assertThat(manualRedactionClient.getAddRedaction(fileId, addRedaction.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); + assertThat(manualRedactionClient.getRemoveRedaction(fileId, removeRedaction.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); + assertThat(manualRedactionClient.getForceRedaction(fileId, forceRedaction.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); + assertThat(manualRedactionClient.getLegalBasisChange(fileId, legalBasisChange.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); + assertThat(manualRedactionClient.getImageRecategorization(fileId, imageRecategorization.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); - uploadClient.deleteFile(dossier.getId(),file.getId()); + uploadClient.deleteFile(dossier.getId(), file.getId()); var softDeletedFiles = fileClient.getSoftDeletedDossierStatus(dossier.getId()); assertThat(softDeletedFiles.size()).isEqualTo(1); var activeFiles = fileClient.getDossierStatus(dossier.getId()); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java index ab689aa94..bec322643 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java @@ -3,7 +3,7 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import com.iqser.red.service.peristence.v1.server.integration.client.LegalBasisClient; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis; import feign.FeignException; import org.assertj.core.util.Lists; import org.junit.Test; @@ -36,16 +36,16 @@ public class LegalBasisTest extends AbstractPersistenceServerServiceTest { } - var mappings = new ArrayList(); - mappings.add(LegalBasisEntity.builder().name("test 1").description("test 1").reason("test 1").build()); - mappings.add(LegalBasisEntity.builder().name("test 2").description("test 2").reason("test 2").build()); + var mappings = new ArrayList(); + mappings.add(LegalBasis.builder().name("test 1").description("test 1").reason("test 1").build()); + mappings.add(LegalBasis.builder().name("test 2").description("test 2").reason("test 2").build()); legalBasisClient.setLegalBasisMapping(dossierTemplate.getId(), mappings); assertThat(legalBasisClient.getVersion(dossierTemplate.getId())).isEqualTo(1); var mapping = legalBasisClient.getLegalBasisMapping(dossierTemplate.getId()); assertThat(mapping.size()).isEqualTo(2); - assertThat(mapping.stream().map(LegalBasisEntity::getName).collect(Collectors.toList())).containsExactlyInAnyOrder("test 1", "test 2"); + assertThat(mapping.stream().map(LegalBasis::getName).collect(Collectors.toList())).containsExactlyInAnyOrder("test 1", "test 2"); legalBasisClient.setLegalBasisMapping(dossierTemplate.getId(), Lists.newArrayList()); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java index f23a70046..033e4ecd3 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java @@ -1,26 +1,18 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; import com.iqser.red.service.peristence.v1.server.integration.client.ManualRedactionClient; +import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest; +import com.iqser.red.service.persistence.service.v1.api.model.annotations.*; import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest; -import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationStatus; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { @@ -30,6 +22,9 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { @Autowired private DossierTesterAndProvider dossierTesterAndProvider; + @Autowired + private DossierTemplateTesterAndProvider dossierTemplateTesterAndProvider; + @Autowired private TypeProvider typeProvider; @@ -42,13 +37,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { @Test public void testManualRedaction() { - var dossier = dossierTesterAndProvider.provideTestDossier(); + var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); + + var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); var file = fileTesterAndProvider.testAndProvideFile(dossier); - var type = typeProvider.testAndProvideType(dossier.getDossierTemplate(), null, "manual"); - - + var type = typeProvider.testAndProvideType(dossierTemplate, null, "manual"); var comment = manualRedactionClient.addComment(dossier.getId(), file.getId(), "1", CommentRequest.builder().text("test").user("1").build()); @@ -56,8 +51,6 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedComment.getText()).isEqualTo("test"); - - var addRedaction = manualRedactionClient.addAddRedaction(dossier.getId(), file.getId(), AddRedactionRequest.builder().addToDictionary(true) .addToDossierDictionary(false).status(AnnotationStatus.REQUESTED).type(type.getId()).user("user").reason("1").value("test").legalBasis("1").build()); var loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId()); @@ -82,7 +75,6 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedAddRedaction2.isAddToDictionary()).isEqualTo(true); - var removeRedaction = manualRedactionClient.addRemoveRedaction(dossier.getId(), file.getId(), RemoveRedactionRequest.builder() .annotationId(addRedaction.getAnnotationId()).comment("comment").status(AnnotationStatus.REQUESTED).user("test").removeFromDictionary(false).build()); manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(), removeRedaction.getAnnotationId(), JSONPrimitive.of(AnnotationStatus.REQUESTED)); @@ -115,15 +107,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedRemoveRedaction2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED); - - var forceRedaction = manualRedactionClient.addForceRedaction(dossier.getId(), file.getId(), ForceRedactionRequest.builder() .annotationId(addRedaction.getAnnotationId()).comment("comment").status(AnnotationStatus.REQUESTED).user("test").legalBasis("1").build()); var loadedForceRedaction = manualRedactionClient.getForceRedaction(file.getId(), forceRedaction.getAnnotationId()); assertThat(loadedForceRedaction.getLegalBasis()).isEqualTo("1"); assertThat(loadedForceRedaction.getUser()).isEqualTo("test"); - assertThat(loadedForceRedaction.getId()).isEqualTo(loadedForceRedaction.getId()); - assertThat(loadedForceRedaction.getId().getId()).isEqualTo(loadedForceRedaction.getId().getId()); + assertThat(loadedForceRedaction.getAnnotationId()).isEqualTo(loadedForceRedaction.getAnnotationId()); + assertThat(loadedForceRedaction.getFileId()).isEqualTo(loadedForceRedaction.getFileId()); manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(), forceRedaction.getAnnotationId(), JSONPrimitive.of(AnnotationStatus.APPROVED)); loadedForceRedaction = manualRedactionClient.getForceRedaction(file.getId(), addRedaction.getAnnotationId()); @@ -134,11 +124,10 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedForceRedaction.getStatus()).isEqualTo(AnnotationStatus.DECLINED); - var legalBasisChange = manualRedactionClient.addLegalBasisChange(dossier.getId(), file.getId(), LegalBasisChangeRequest.builder() .annotationId(addRedaction.getAnnotationId()).comment("comment").status(AnnotationStatus.REQUESTED).user("test").legalBasis("1").build()); var loadedLegalBasisChange = manualRedactionClient.getLegalBasisChange(file.getId(), addRedaction.getAnnotationId()); - assertThat(loadedLegalBasisChange.getId().getId()).isEqualTo(legalBasisChange.getAnnotationId()); + assertThat(loadedLegalBasisChange.getAnnotationId()).isEqualTo(legalBasisChange.getAnnotationId()); assertThat(loadedLegalBasisChange.getUser()).isEqualTo("test"); assertThat(loadedLegalBasisChange.getLegalBasis()).isEqualTo("1"); @@ -151,11 +140,10 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedLegalBasisChange.getStatus()).isEqualTo(AnnotationStatus.DECLINED); - var imageRecategorization = manualRedactionClient.addImageRecategorization(dossier.getId(), file.getId(), ImageRecategorizationRequest.builder() .annotationId(addRedaction.getAnnotationId()).comment("comment").status(AnnotationStatus.REQUESTED).user("test").type("new-type").build()); var loadedImageRecategorization = manualRedactionClient.getImageRecategorization(file.getId(), addRedaction.getAnnotationId()); - assertThat(loadedImageRecategorization.getId().getId()).isEqualTo(imageRecategorization.getAnnotationId()); + assertThat(loadedImageRecategorization.getAnnotationId()).isEqualTo(imageRecategorization.getAnnotationId()); manualRedactionClient.updateImageRecategorizationStatus(dossier.getId(), file.getId(), imageRecategorization.getAnnotationId(), JSONPrimitive.of(AnnotationStatus.APPROVED)); loadedImageRecategorization = manualRedactionClient.getImageRecategorization(file.getId(), addRedaction.getAnnotationId()); @@ -176,7 +164,6 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedImageRecategorization2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED); - ManualRedactions manualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId()); assertThat(manualRedactions.getForceRedactions()).isNotEmpty(); assertThat(manualRedactions.getLegalBasisChanges()).isNotEmpty(); @@ -186,17 +173,15 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(manualRedactions.getComments()).isNotEmpty(); - manualRedactions.getForceRedactions().forEach(e -> manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), e.getId().getId())); - manualRedactions.getLegalBasisChanges().forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), e.getId().getId())); - manualRedactions.getEntriesToAdd().forEach(e -> manualRedactionClient.deleteAddRedaction(dossier.getId(), file.getId(), e.getId().getId())); - manualRedactions.getIdsToRemove().forEach(e -> manualRedactionClient.deleteRemoveRedaction(dossier.getId(), file.getId(), e.getId().getId())); - manualRedactions.getImageRecategorization().forEach(e -> manualRedactionClient.deleteImageRecategorization(dossier.getId(), file.getId(), e.getId().getId())); + manualRedactions.getForceRedactions().forEach(e -> manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), e.getAnnotationId())); + manualRedactions.getLegalBasisChanges().forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), e.getAnnotationId())); + manualRedactions.getEntriesToAdd().forEach(e -> manualRedactionClient.deleteAddRedaction(dossier.getId(), file.getId(), e.getAnnotationId())); + manualRedactions.getIdsToRemove().forEach(e -> manualRedactionClient.deleteRemoveRedaction(dossier.getId(), file.getId(), e.getAnnotationId())); + manualRedactions.getImageRecategorization().forEach(e -> manualRedactionClient.deleteImageRecategorization(dossier.getId(), file.getId(), e.getAnnotationId())); manualRedactions.getComments().forEach((key, value) -> value.forEach(c -> manualRedactionClient.deleteComment(file.getId(), c.getId()))); - - var forceRedaction2 = manualRedactionClient.addForceRedaction(dossier.getId(), file.getId(), ForceRedactionRequest.builder() .annotationId(addRedaction2.getAnnotationId()).comment("comment").status(AnnotationStatus.APPROVED).user("test").legalBasis("1").build()); var loadedForceRedaction2 = manualRedactionClient.getForceRedaction(file.getId(), forceRedaction2.getAnnotationId()); @@ -208,9 +193,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedForceRedaction2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED); manualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId()); - manualRedactions.getForceRedactions().forEach(e -> manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), e.getId().getId())); - - + manualRedactions.getForceRedactions().forEach(e -> manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), e.getAnnotationId())); var legalBasisChange2 = manualRedactionClient.addLegalBasisChange(dossier.getId(), file.getId(), LegalBasisChangeRequest.builder() @@ -223,7 +206,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedLegalBasisChange2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED); manualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId()); - manualRedactions.getLegalBasisChanges().forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), e.getId().getId())); + manualRedactions.getLegalBasisChanges().forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), e.getAnnotationId())); } } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java index 7918f9a55..a05b4f80e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java @@ -2,8 +2,8 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import com.iqser.red.service.peristence.v1.server.integration.client.NotificationClient; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.notification.AddNotificationRequest; -import com.iqser.red.service.persistence.management.v1.processor.entity.notification.NotificationEntity; +import com.iqser.red.service.persistence.service.v1.api.model.audit.AddNotificationRequest; +import com.iqser.red.service.persistence.service.v1.api.model.notification.Notification; import org.assertj.core.util.Lists; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +31,6 @@ public class NotificationTest extends AbstractPersistenceServerServiceTest { assertThat(notification.getReadDate()).isNotNull(); - assertThat(notification.getSeenDate()).isNull(); notificationClient.toggleSeen("1", Lists.newArrayList(notification.getId()), true); notification = getNotification(); @@ -41,26 +40,23 @@ public class NotificationTest extends AbstractPersistenceServerServiceTest { assertThat(currentNotifications).isEmpty(); - notificationClient.toggleRead("1", Lists.newArrayList(notification.getId()), false); notification = getNotification(); assertThat(notification.getReadDate()).isNull(); - notificationClient.toggleSeen("1", Lists.newArrayList(notification.getId()), false); notification = getNotification(); assertThat(notification.getSeenDate()).isNull(); - - notificationClient.softDelete("1",Lists.newArrayList(notification.getId())); + notificationClient.softDelete("1", Lists.newArrayList(notification.getId())); currentNotifications = notificationClient.getNotifications("1", true); assertThat(currentNotifications).isEmpty(); } - private NotificationEntity getNotification() { + private Notification getNotification() { var currentNotifications = notificationClient.getNotifications("1", true); assertThat(currentNotifications.size()).isEqualTo(1); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java index bfc0ea0d4..8d40cd6b6 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java @@ -6,8 +6,8 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.File; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileStatus; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus; import org.assertj.core.util.Sets; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -87,7 +87,7 @@ public class ReanalysisTest extends AbstractPersistenceServerServiceTest { } - private void resetStatus(File file) { + private void resetStatus(FileModel file) { fileRepository.findById(file.getId()).ifPresent(savedFile -> { diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SMTPTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SMTPTest.java index 2c0cd735c..f17ab19c1 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SMTPTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SMTPTest.java @@ -2,7 +2,7 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import com.iqser.red.service.peristence.v1.server.integration.client.SMTPClient; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.SMTPConfigurationEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.SMTPConfiguration; import feign.FeignException; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +17,7 @@ public class SMTPTest extends AbstractPersistenceServerServiceTest { @Test public void testSMTP() { - SMTPConfigurationEntity configuration = new SMTPConfigurationEntity(); + SMTPConfiguration configuration = new SMTPConfiguration(); configuration.setUser("test"); configuration.setPassword("test"); configuration.setAuth(true); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java index f9023b76c..552fb35ca 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java @@ -5,9 +5,9 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTem import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ColorsEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DictionaryEntryEntity; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type; import org.assertj.core.util.Lists; import org.junit.Test; import org.springframework.beans.BeanUtils; @@ -44,7 +44,7 @@ public class TypeTest extends AbstractPersistenceServerServiceTest { assertThat(loadedType.getVersion()).isGreaterThan(type.getVersion()); - List dict = dictionaryClient.getEntriesForType(type.getId()); + List dict = dictionaryClient.getEntriesForType(type.getId()); assertThat(dict.size()).isEqualTo(3); @@ -55,7 +55,7 @@ public class TypeTest extends AbstractPersistenceServerServiceTest { assertThat(loadedType.getVersion()).isGreaterThan(type.getVersion() + 1); - var request = new TypeEntity(); + var request = new Type(); BeanUtils.copyProperties(type, request); request.setRank(99); dictionaryClient.updateTypeValue(type.getId(), request); @@ -73,7 +73,7 @@ public class TypeTest extends AbstractPersistenceServerServiceTest { var dossier = dossierTesterAndProvider.provideTestDossier(); - var dossierType = typeProvider.testAndProvideType(dossierTemplate,dossier,"dossier-dict"); + var dossierType = typeProvider.testAndProvideType(dossierTemplate, dossier, "dossier-dict"); var typesForDossier = dictionaryClient.getAllTypesForDossier(dossierType.getDossierId()); assertThat(typesForDossier).isNotEmpty(); @@ -84,7 +84,7 @@ public class TypeTest extends AbstractPersistenceServerServiceTest { public void testColors() { var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); - var colors = new ColorsEntity(); + var colors = new Colors(); colors.setAnalysisColor("#dddddd"); colors.setDefaultColor("#dddddd"); colors.setDictionaryRequestColor("#dddddd"); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java index 7b3f2eaa6..f82791489 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java @@ -4,12 +4,10 @@ import com.iqser.red.service.peristence.v1.server.integration.client.ViewedPages import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ViewedPageEntity; +import com.iqser.red.service.persistence.service.v1.api.model.annotations.ViewedPage; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; public class ViewedPagesTest extends AbstractPersistenceServerServiceTest { @@ -41,8 +39,8 @@ public class ViewedPagesTest extends AbstractPersistenceServerServiceTest { viewedPagesClient.removePage(fileId, userId, 1); - List viewedPages = viewedPagesClient.getViewedPages(fileId, userId); - assertThat(viewedPages.stream().map(viewedPage -> viewedPage.getId().getPage())).containsExactlyInAnyOrder(2, 3); + var viewedPages = viewedPagesClient.getViewedPages(fileId, userId); + assertThat(viewedPages.stream().map(ViewedPage::getPage)).containsExactlyInAnyOrder(2, 3); viewedPagesClient.removePage(fileId, userId, 2); viewedPagesClient.removePage(fileId, userId, 3); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java index f838d4841..9e6d36dbd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java @@ -3,7 +3,8 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import com.iqser.red.service.peristence.v1.server.integration.client.WatermarkClient; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Watermark; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.WatermarkOrientation; import feign.FeignException; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,13 +30,13 @@ public class WatermarkTest extends AbstractPersistenceServerServiceTest { } - WatermarkEntity watermark = new WatermarkEntity(); + Watermark watermark = new Watermark(); watermark.setText("lorem ipsum"); watermark.setFontSize(12); watermark.setFontType("font"); watermark.setHexColor("#dddddd"); watermark.setOpacity(20); - watermark.setOrientation(WatermarkEntity.WatermarkOrientation.DIAGONAL); + watermark.setOrientation(WatermarkOrientation.DIAGONAL); var saved = watermarkClient.saveWatermark(dossierTemplate.getId(), watermark); assertThat(watermarkClient.getWatermark(dossierTemplate.getId())).isEqualTo(saved); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java index 5d8a84352..70b4066b7 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java @@ -4,11 +4,9 @@ import com.iqser.red.service.pdftron.redaction.v1.api.model.*; import com.iqser.red.service.peristence.v1.server.Application; import com.iqser.red.service.peristence.v1.server.client.RedactionClient; import com.iqser.red.service.peristence.v1.server.client.SearchClient; -import com.iqser.red.service.peristence.v1.server.controller.LicenseReportController; import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.*; -import com.iqser.red.service.redaction.v1.model.AnnotateRequest; import com.iqser.red.service.redaction.v1.model.AnnotateResponse; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionResult; @@ -43,39 +41,64 @@ import static org.mockito.Mockito.when; @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) public abstract class AbstractPersistenceServerServiceTest { - @Autowired - private StorageService storageService; - @MockBean protected RabbitTemplate rabbitTemplate; - @MockBean protected SearchClient searchClient; - @MockBean protected RedactionClient redactionClient; - @MockBean protected PDFTronRedactionClient pdfTronRedactionClient; - - - static class Initializer implements ApplicationContextInitializer { - public void initialize(ConfigurableApplicationContext configurableApplicationContext) { - - var postgreSQLContainer = SpringPostgreSQLTestContainer.getInstance() - .withDatabaseName("integration-tests-db") - .withUsername("sa") - .withPassword("sa"); - - postgreSQLContainer.start(); - - TestPropertyValues.of( - "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(), - "spring.datasource.username=" + postgreSQLContainer.getUsername(), - "spring.datasource.password=" + postgreSQLContainer.getPassword() - ).applyTo(configurableApplicationContext.getEnvironment()); - } - } + @Autowired + private StorageService storageService; + @Autowired + private DossierTemplateRepository dossierTemplateRepository; + @Autowired + private DossierRepository dossierRepository; + @Autowired + private FileRepository fileRepository; + @Autowired + private ViewedPagesRepository viewedPagesRepository; + @Autowired + private NotificationRepository notificationRepository; + @Autowired + private AuditRepository auditRepository; + @Autowired + private TypeRepository typeRepository; + @Autowired + private ManualRedactionRepository manualRedactionRepository; + @Autowired + private ForceRedactionRepository forceRedactionRepository; + @Autowired + private RemoveRedactionRepository removeRedactionRepository; + @Autowired + private LegalBasisChangeRepository legalBasisChangeRepository; + @Autowired + private ImageRecategorizationRepository imageRecategorizationRepository; + @Autowired + private WatermarkRepository watermarkRepository; + @Autowired + private SMTPRepository smtpRepository; + @Autowired + private RuleSetRepository ruleSetRepository; + @Autowired + private LegalBasisMappingRepository legalBasisMappingRepository; + @Autowired + private FileAttributeConfigRepository fileAttributeConfigRepository; + @Autowired + private FileAttributesGeneralConfigurationRepository fileAttributesGeneralConfigurationRepository; + @Autowired + private ReportTemplateRepository reportTemplateRepository; + @Autowired + private DigitalSignatureRepository digitalSignatureRepository; + @Autowired + private FileAttributesRepository fileAttributesRepository; + @Autowired + private DownloadStatusRepository downloadStatusRepository; + @Autowired + private DossierAttributeRepository dossierAttributeRepository; + @Autowired + private DossierAttributeConfigRepository dossierAttributeConfigRepository; @Before public void setupOptimize() { @@ -91,21 +114,7 @@ public abstract class AbstractPersistenceServerServiceTest { when(redactionClient.annotate(Mockito.any())).thenReturn(new AnnotateResponse("document".getBytes())); when(redactionClient.sections(Mockito.any())).thenReturn(new RedactionResult()); - when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(new RedactionLog(1, Lists.newArrayList(),Lists.newArrayList(),0,0,0,0)); - } - - @Configuration - @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class}) - @ComponentScan("com.iqser.red.service.persistence") - public static class TestConfiguration { - - @Bean - @Primary - public StorageService inmemoryStorage() { - return new FileSystemBackedStorageService(); - } - - + when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(new RedactionLog(1, Lists.newArrayList(), null, 0, 0, 0, 0)); } @After @@ -113,79 +122,6 @@ public abstract class AbstractPersistenceServerServiceTest { ((FileSystemBackedStorageService) this.storageService).clearStorage(); } - - @Autowired - private DossierTemplateRepository dossierTemplateRepository; - - @Autowired - private DossierRepository dossierRepository; - - @Autowired - private FileRepository fileRepository; - - @Autowired - private ViewedPagesRepository viewedPagesRepository; - - @Autowired - private NotificationRepository notificationRepository; - - @Autowired - private AuditRepository auditRepository; - - @Autowired - private TypeRepository typeRepository; - - @Autowired - private ManualRedactionRepository manualRedactionRepository; - - @Autowired - private ForceRedactionRepository forceRedactionRepository; - - @Autowired - private RemoveRedactionRepository removeRedactionRepository; - - @Autowired - private LegalBasisChangeRepository legalBasisChangeRepository; - - @Autowired - private ImageRecategorizationRepository imageRecategorizationRepository; - - @Autowired - private WatermarkRepository watermarkRepository; - - @Autowired - private SMTPRepository smtpRepository; - - @Autowired - private RuleSetRepository ruleSetRepository; - - @Autowired - private LegalBasisMappingRepository legalBasisMappingRepository; - - @Autowired - private FileAttributeConfigRepository fileAttributeConfigRepository; - - @Autowired - private FileAttributesGeneralConfigurationRepository fileAttributesGeneralConfigurationRepository; - - @Autowired - private ReportTemplateRepository reportTemplateRepository; - - @Autowired - private DigitalSignatureRepository digitalSignatureRepository; - - @Autowired - private FileAttributesRepository fileAttributesRepository; - - @Autowired - private DownloadStatusRepository downloadStatusRepository; - - @Autowired - private DossierAttributeRepository dossierAttributeRepository; - - @Autowired - private DossierAttributeConfigRepository dossierAttributeConfigRepository; - @After public void afterTests() { dossierAttributeRepository.deleteAll(); @@ -216,4 +152,36 @@ public abstract class AbstractPersistenceServerServiceTest { dossierTemplateRepository.deleteAll(); } + static class Initializer implements ApplicationContextInitializer { + public void initialize(ConfigurableApplicationContext configurableApplicationContext) { + + var postgreSQLContainer = SpringPostgreSQLTestContainer.getInstance() + .withDatabaseName("integration-tests-db") + .withUsername("sa") + .withPassword("sa"); + + postgreSQLContainer.start(); + + TestPropertyValues.of( + "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(), + "spring.datasource.username=" + postgreSQLContainer.getUsername(), + "spring.datasource.password=" + postgreSQLContainer.getPassword() + ).applyTo(configurableApplicationContext.getEnvironment()); + } + } + + @Configuration + @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class}) + @ComponentScan("com.iqser.red.service.persistence") + public static class TestConfiguration { + + @Bean + @Primary + public StorageService inmemoryStorage() { + return new FileSystemBackedStorageService(); + } + + + } + }