From a3772701419d3fe8e00b855d2bbd0e216fbb9ba7 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 26 Aug 2024 16:10:02 +0200 Subject: [PATCH] RED-9965: component definitions are outside of template folder for file export --- .../dataexchange/service/DossierTemplateExportService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateExportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateExportService.java index ac82dd6ce..514a5d45a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateExportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateExportService.java @@ -124,6 +124,7 @@ public class DossierTemplateExportService { }); } + @Observed(name = "DossierTemplateExportService", contextualName = "export-dossier-template") public long createDownloadArchive(ExportDownloadMessage downloadJob) throws IOException { @@ -143,6 +144,7 @@ public class DossierTemplateExportService { } + @Observed(name = "DossierTemplateExportService", contextualName = "write-dossier-template-to-archive") public void addDossierTemplateToArchive(FileSystemBackedArchiver fileSystemBackedArchiver, String folder, DossierTemplateEntity dossierTemplate) throws IOException { @@ -276,7 +278,7 @@ public class DossierTemplateExportService { // components List componentDefinitions = componentDefinitionPersistenceService.findByDossierTemplateIdAndNotSoftDeleted(dossierTemplate.getId()); for (ComponentDefinitionEntity componentDefinition : componentDefinitions) { - fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(componentDefinition.getTechnicalName(), + fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(resolveFolder(folder, componentDefinition.getTechnicalName()), getFilename(ExportFilename.COMPONENTS, JSON_EXT), objectMapper.writeValueAsBytes(componentDefinition))); } -- 2.47.2