diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java index f9a7cf4e4..a0bd2b1b4 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java @@ -5,8 +5,6 @@ import java.util.Arrays; import org.springframework.stereotype.Service; -import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings; -import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ApplicationConfigurationEntity; import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException; import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; @@ -43,7 +41,6 @@ public class FileService { private final ForceRedactionPersistenceService forceRedactionPersistenceService; private final RemoveRedactionPersistenceService removeRedactionPersistenceService; private final FileStatusService fileStatusService; - private final PDFTronRedactionClient pdfTronRedactionClient; private final ViewedPagesPersistenceService viewedPagesPersistenceService; private final FileManagementStorageService fileManagementStorageService; private final DossierPersistenceService dossierPersistenceService; @@ -52,7 +49,6 @@ public class FileService { private final ResizeRedactionPersistenceService resizeRedactionPersistenceService; private final IndexingService indexingService; private final ApplicationConfigService applicationConfigService; - private final FileManagementServiceSettings fileManagementServiceSettings; public JSONPrimitive upload(AddFileRequest request, boolean keepManualRedactions) { @@ -84,10 +80,6 @@ public class FileService { fileStatusService.createStatus(request.getDossierId(), request.getFileId(), request.getUploader(), request.getFilename(), applicationConfigurationEntity.isRemoveDigitalSignaturesOnUpload()); } - if (fileManagementServiceSettings.isPdf2ImageServiceEnabled()) { - fileStatusService.addToPdf2ImageQueue(request.getDossierId(), request.getFileId()); - } - return new JSONPrimitive<>(request.getFileId()); } 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 7f9d59f79..d7b81745c 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 @@ -76,6 +76,7 @@ public class FileStatusService { private final ReanalysisRequiredStatusService reanalysisRequiredStatusService; private final ViewedPagesPersistenceService viewedPagesPersistenceService; private final ApplicationConfigService applicationConfigService; + private final FileManagementServiceSettings fileManagementServiceSettings; @Transactional @@ -113,7 +114,6 @@ public class FileStatusService { var fileEntities = fileStatusPersistenceService.getSoftDeletedFiles(dossierIds); var convertedList = convert(fileEntities, FileModel.class, new FileModelMapper()); return reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convertedList); -// return convertedList; } @@ -130,6 +130,11 @@ public class FileStatusService { fileStatusPersistenceService.updateProcessingStatusPreprocessed(fileId, hasHighlights); addToAnalysisQueue(dossierId, fileId, false, Set.of()); + + if (fileManagementServiceSettings.isPdf2ImageServiceEnabled()) { + addToPdf2ImageQueue(dossierId, fileId); + } + }