From 83a01639601d5364c395718a26d14b5b26c7d49b Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Wed, 30 Oct 2024 09:34:17 +0100 Subject: [PATCH] RED-10297: Provide default date format file when missing on dossier template import --- .../service/DossierTemplateImportService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateImportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateImportService.java index 57545514f..4985fb7a3 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateImportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateImportService.java @@ -108,7 +108,7 @@ public class DossierTemplateImportService { private final ComponentDefinitionPersistenceService componentDefinitionPersistenceService; private final EntityTypeImportService entityTypeImportService; private final SystemManagedTypesImport systemManagedTypesImport; - private final DefaultDateFormatsProvider defaultDateFormatsProvider; + private final DefaultDateFormatsProvider defaultDateFormatsProvider; public String importDossierTemplate(ImportDossierTemplateRequest request) { @@ -499,11 +499,13 @@ public class DossierTemplateImportService { if (dateFormats == null && applicationType.equals("DocuMine")) { dateFormats = defaultDateFormatsProvider.getDateFormats(); } - List dateFormatPatternErrorMessages = dateFormatsValidationService.validateDateFormats(dateFormats); - if (!dateFormatPatternErrorMessages.isEmpty()) { - throw new BadRequestException("The date formats file contains errors"); + if (dateFormats != null) { + List dateFormatPatternErrorMessages = dateFormatsValidationService.validateDateFormats(dateFormats); + if (!dateFormatPatternErrorMessages.isEmpty()) { + throw new BadRequestException("The date formats file contains errors"); + } + dateFormatsPersistenceService.setDateFormats(dateFormats, dossierTemplateId, request.getDateFormatsExportModel().getVersion()); } - dateFormatsPersistenceService.setDateFormats(dateFormats, dossierTemplateId, request.getDateFormatsExportModel().getVersion()); }