From 139d70c03da71b7d81f99d99a81d8693037c8aee Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 19 Aug 2022 13:11:33 +0200 Subject: [PATCH] RED-5022: Changed figure detection Filename to FIGURE, because it is hard coded in image perdiction service --- .../v1/api/model/dossiertemplate/dossier/file/FileType.java | 2 +- .../v1/server/internal/AdminInterfaceController.java | 2 +- .../peristence/v1/server/model/CvAnalysisServiceRequest.java | 2 +- .../peristence/v1/server/service/FileStatusService.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java index 72e92bd8c..d4ca1c477 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java @@ -14,7 +14,7 @@ public enum FileType { IMAGE_INFO(".json"), IMPORTED_REDACTIONS(".json"), TEXT_HIGHLIGHTS(".json"), - FIGURES(".json"), + FIGURE(".json"), TABLES(".json"); @Getter diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/internal/AdminInterfaceController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/internal/AdminInterfaceController.java index c4b1f3292..da55b5508 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/internal/AdminInterfaceController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/internal/AdminInterfaceController.java @@ -39,7 +39,7 @@ public class AdminInterfaceController { fileManagementStorageService.deleteObject(dossierId, fileId, FileType.REDACTION_LOG); fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TEXT); fileManagementStorageService.deleteObject(dossierId, fileId, FileType.NER_ENTITIES); - fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURES); + fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURE); fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TABLES); fileStatusService.setStatusFullReprocess(dossierId, fileId, true, true); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/CvAnalysisServiceRequest.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/CvAnalysisServiceRequest.java index 5da3fedc3..99622fdf3 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/CvAnalysisServiceRequest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/CvAnalysisServiceRequest.java @@ -14,7 +14,7 @@ public class CvAnalysisServiceRequest { public static final String OPERATION_TABLE_PARSING = "table"; public static final String OPERATION_FIGURE_DETECTION = "figure"; - public static final String FIGURE_DETECTION_FILE_EXTENSION = "FIGURES.json.gz"; + public static final String FIGURE_DETECTION_FILE_EXTENSION = "FIGURE.json.gz"; public static final String TABLE_PARSING_FILE_EXTENSION = "TABLES.json.gz"; public static final String TARGET_FILE_EXTENSION = "ORIGIN.pdf.gz"; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index eccd74193..e8e0f60c9 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -470,7 +470,7 @@ public class FileStatusService { fileManagementStorageService.deleteObject(dossierId, fileId, FileType.IMAGE_INFO); fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TEXT); fileManagementStorageService.deleteObject(dossierId, fileId, FileType.NER_ENTITIES); - fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURES); + fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURE); fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TABLES); if (keepManualRedactions) { @@ -576,7 +576,7 @@ public class FileStatusService { boolean reanalyse = fileModel.isReanalysisRequired() || manualRedactionReanalyse; - if (!reanalyse && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.FIGURES) && settings.isCvServiceEnabled()) { + if (!reanalyse && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.FIGURE) && settings.isCvServiceEnabled()) { addToFigureDetectionRequestQueue(dossierId, fileId); return; }