From 74ac3c0c34d9aef417770b5a5e57f6b519dda0ed Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Wed, 6 Sep 2023 14:20:38 +0200 Subject: [PATCH] RED-7375: integrate Table Extractor * fix filenames --- .../management/v1/processor/model/TableExtractorRequest.java | 4 +++- .../management/v1/processor/service/FileStatusService.java | 2 +- .../shared/model/dossiertemplate/dossier/file/FileType.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/TableExtractorRequest.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/TableExtractorRequest.java index e5c14617e..6ec502b84 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/TableExtractorRequest.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/TableExtractorRequest.java @@ -1,5 +1,7 @@ package com.iqser.red.service.persistence.management.v1.processor.model; +import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,7 +13,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class TableExtractorRequest { - public static final String TABLE_EXTRACTOR_FILE_EXTENSION = "EXTRACTED_TABLES.json.gz"; + public static final String TABLE_EXTRACTOR_FILE_EXTENSION = FileType.EXTRACTED_TABLES.name() + FileType.EXTRACTED_TABLES.getExtension() + ".gz"; public static final String TARGET_FILE_EXTENSION = "ORIGIN.pdf.gz"; diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java index 76ffbfacb..ef9854c23 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java @@ -176,7 +176,7 @@ public class FileStatusService { return; } - if (settings.isTableExtractorEnabled() && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.INVISIBLE_TABLES)) { + if (settings.isTableExtractorEnabled() && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.EXTRACTED_TABLES)) { log.info("Add file: {} from dossier {} to Table Extractor queue", fileId, dossierId); addToTableExtractorQueue(dossierId, fileId); return; 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 afcf7fde9..cea316b90 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 @@ -17,7 +17,7 @@ public enum FileType { TEXT_HIGHLIGHTS(".json"), FIGURE(".json"), TABLES(".json"), - INVISIBLE_TABLES(".json"), + EXTRACTED_TABLES(".json"), COMPONENTS(".json"), // document is split into 4 files, all should be overridden/deleted at the same time DOCUMENT_TEXT(".json"),