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

deletion of dossier template on failed import

Browse Source
This commit is contained in:
Kilian Schuettler 2024-08-16 10:26:18 +02:00
parent 6342b1b4f6
commit 189f2f0019
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateImportService.java
View File

@ -178,7 +178,8 @@ public class DossierTemplateImportService {
if (StringUtils.isEmpty(dossierTemplateMeta.getName())) { if (StringUtils.isEmpty(dossierTemplateMeta.getName())) {
throw new ConflictException("DossierTemplate name must be set"); throw new ConflictException("DossierTemplate name must be set");
} }
dossierTemplateMeta.setId("");this.validateDossierTemplateName(dossierTemplateMeta); dossierTemplateMeta.setId("");
this.validateDossierTemplateName(dossierTemplateMeta);
DossierTemplateEntity dossierTemplateEntity = new DossierTemplateEntity(); DossierTemplateEntity dossierTemplateEntity = new DossierTemplateEntity();
// order is important // order is important

1
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateManagementService.java
View File

@ -31,7 +31,6 @@ public class DossierTemplateManagementService {
private final DictionaryManagementService dictionaryManagementService; private final DictionaryManagementService dictionaryManagementService;
private final ComponentMappingService componentMappingService; private final ComponentMappingService componentMappingService;
private final FileAttributeConfigPersistenceService fileAttributeConfigPersistenceService; private final FileAttributeConfigPersistenceService fileAttributeConfigPersistenceService;
private final DossierAttributePersistenceService dossierAttributePersistenceService;
private final DossierAttributeConfigPersistenceService dossierAttributeConfigPersistenceService; private final DossierAttributeConfigPersistenceService dossierAttributeConfigPersistenceService;
private final ReportTemplatePersistenceService reportTemplatePersistenceService; private final ReportTemplatePersistenceService reportTemplatePersistenceService;
private final WatermarkService watermarkService; private final WatermarkService watermarkService;

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

@ -130,9 +130,6 @@ public class DossierTemplateCloneAndExportWithDuplicateRanksTest {
dossierTemplatePersistenceService = new DossierTemplatePersistenceService(dossierTemplateRepository, dossierTemplatePersistenceService = new DossierTemplatePersistenceService(dossierTemplateRepository,
legalBasisMappingPersistenceService, legalBasisMappingPersistenceService,
rulesPersistenceService, rulesPersistenceService,
dictionaryPersistenceService,
dictionaryManagementService,
componentMappingService,
typeRepository); typeRepository);
dossierTemplateCloneService = new DossierTemplateCloneService(dossierTemplateRepository, dossierTemplateCloneService = new DossierTemplateCloneService(dossierTemplateRepository,
legalBasisMappingPersistenceService, legalBasisMappingPersistenceService,
@ -170,11 +167,15 @@ public class DossierTemplateCloneAndExportWithDuplicateRanksTest {
componentDefinitionPersistenceService, componentDefinitionPersistenceService,
watermarkService, watermarkService,
rabbitTemplate); rabbitTemplate);
dossierTemplateManagementService = new DossierTemplateManagementService(dossierTemplateExportService, dossierTemplateManagementService = new DossierTemplateManagementService(dossierTemplatePersistenceService,
dossierTemplateImportService,
dossierTemplatePersistenceService,
dossierTemplateCloneService, dossierTemplateCloneService,
dossierDeletionService); dossierDeletionService,
dictionaryManagementService,
componentMappingService,
fileAttributeConfigPersistenceService,
dossierAttributeConfigPersistenceService,
reportTemplatePersistenceService,
watermarkService);
rankDeDuplicationService = new RankDeDuplicationService(dossierTemplateManagementService, dictionaryPersistenceService); rankDeDuplicationService = new RankDeDuplicationService(dossierTemplateManagementService, dictionaryPersistenceService);
@ -194,7 +195,7 @@ public class DossierTemplateCloneAndExportWithDuplicateRanksTest {
// test the export of dossier template // test the export of dossier template
ExportDownloadRequest exportDownloadRequest = new ExportDownloadRequest("userId", dossierTemplateId); ExportDownloadRequest exportDownloadRequest = new ExportDownloadRequest("userId", dossierTemplateId);
Assertions.assertThrows(BadRequestException.class, () -> dossierTemplateManagementService.prepareExportDownload(exportDownloadRequest)); Assertions.assertThrows(BadRequestException.class, () -> dossierTemplateExportService.prepareExportDownload(exportDownloadRequest));
} }

2
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/dossier/file/FileType.java
View File

@ -31,7 +31,7 @@ public enum FileType {
// only for export // only for export
@Deprecated(forRemoval = true) // still needed for migration to delete existing ones, can be removed as soon as migration is done @Deprecated(forRemoval = true) // still needed for migration to delete existing ones, can be removed as soon as migration is done
SECTION_GRID(".json"), SECTION_GRID(".json"),
MARKDOWN(".md"); MARKDOWN(".md");
@Getter @Getter