Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #420: RED-3885: Add file to pdf2image-service queue, when preprocessing is done.

Browse Source 
Merge in RED/persistence-service from RED-3885 to master

* commit '2de00f1a727311028bdeb3e472de2c123110472b':
  RED-3885: Add file to pdf2image-service queue, when preprocessing is done. (is disabled by default)
This commit is contained in:
Philipp Schramm 2022-05-31 12:32:46 +02:00
commit 937c1d5830
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java
View File

@ -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<String> 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());
}

7
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
View File

@ -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);
}
}