From 8006a4c374db580e076728a6e5be93c59922748c Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Fri, 19 Jul 2024 10:35:36 +0200 Subject: [PATCH] CLARI: document-data-markdown --- .../persistence-service-processor-v1/build.gradle.kts | 2 +- .../service/layoutparsing/LayoutParsingRequestFactory.java | 5 +++++ .../v1/processor/settings/FileManagementServiceSettings.java | 2 ++ .../shared/model/dossiertemplate/dossier/file/FileType.java | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts index 2abe3bdde..cbfe2ece3 100644 --- a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1") } - api("com.knecon.fforesight:layoutparser-service-internal-api:0.145.0") { + api("com.knecon.fforesight:layoutparser-service-internal-api:0.149.0") { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1") } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java index 7c6f58cd7..9a2f15d75 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; +import com.iqser.red.service.persistence.management.v1.processor.settings.FileManagementServiceSettings; import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; @@ -23,6 +24,7 @@ public class LayoutParsingRequestFactory { private final FileManagementStorageService fileManagementStorageService; private final LayoutParsingRequestIdentifierService layoutParsingRequestIdentifierService; + private final FileManagementServiceSettings fileManagementServiceSettings; public LayoutParsingRequest build(String dossierId, String fileId, boolean priority) { @@ -55,6 +57,9 @@ public class LayoutParsingRequestFactory { .positionBlockFileStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_POSITION)) .simplifiedTextStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SIMPLIFIED_TEXT)) .viewerDocumentStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.VIEWER_DOCUMENT)) + .documentMarkdownFileStorageId(fileManagementServiceSettings.isStoreMarkdown() ? Optional.of(StorageIdUtils.getStorageId(dossierId, + fileId, + FileType.MARKDOWN)) : Optional.empty()) .build(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/settings/FileManagementServiceSettings.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/settings/FileManagementServiceSettings.java index 2bc9c77b8..b72faf5b1 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/settings/FileManagementServiceSettings.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/settings/FileManagementServiceSettings.java @@ -48,4 +48,6 @@ public class FileManagementServiceSettings { private Set defaultFilterTypes = new HashSet<>(); private Set defaultFilterHintTypes = new HashSet<>(); + private boolean storeMarkdown; + } diff --git a/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 b/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 index b02a80e86..7cc39b7fc 100644 --- a/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 +++ b/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 @@ -30,7 +30,8 @@ public enum FileType { // only for export @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"); @Getter private final String extension;