From 9aee9627d87e48ddd10e0ef0c6f8b24dc8b6ba0a Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 23 Oct 2023 11:20:12 +0300 Subject: [PATCH] RED-7434 - Remove Section Grid entirely - update the layout parser version to remove the section grid from layou parser request --- .../persistence-service-processor-v1/pom.xml | 2 +- .../LayoutParsingRequestFactory.java | 1 - .../redactionlog/SectionTextService.java | 41 ------------------- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/SectionTextService.java diff --git a/persistence-service-v1/persistence-service-processor-v1/pom.xml b/persistence-service-v1/persistence-service-processor-v1/pom.xml index eb209cca3..8ff5c0fa3 100644 --- a/persistence-service-v1/persistence-service-processor-v1/pom.xml +++ b/persistence-service-v1/persistence-service-processor-v1/pom.xml @@ -91,7 +91,7 @@ com.knecon.fforesight layoutparser-service-internal-api - 0.57.0 + 0.74.0 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 5936ed66d..76785a0b0 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 @@ -50,7 +50,6 @@ public class LayoutParsingRequestFactory { .textBlockFileStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_TEXT)) .positionBlockFileStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_POSITION)) .simplifiedTextStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SIMPLIFIED_TEXT)) - .sectionGridStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID)) .viewerDocumentStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.VIEWER_DOCUMENT)) .build(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/SectionTextService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/SectionTextService.java deleted file mode 100644 index 45e04bc6b..000000000 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/SectionTextService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.iqser.red.service.persistence.management.v1.processor.service.redactionlog; - -import org.springframework.stereotype.Service; - -import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry; -import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Service -public class SectionTextService { - - public void handleSectionText(SectionGrid sectionGrid, RedactionLogEntry redactionLogEntry) { - - if (redactionLogEntry.getSection() != null) { - // set by UI - return; - } - - if (sectionGrid != null) { - var firstPosition = !redactionLogEntry.getPositions().isEmpty() ? redactionLogEntry.getPositions().iterator().next() : null; - - if (firstPosition != null) { - - for (var section : sectionGrid.getSections()) { - if (section.getPages().contains(firstPosition.getPage())) { - for (var sectionArea : section.getSectionAreas()) { - if (sectionArea.contains(firstPosition)) { - redactionLogEntry.setSection(section.getHeadline()); - redactionLogEntry.setSectionNumber(section.getSectionNumber()); - return; - } - } - } - } - } - } - } - -} -- 2.47.2