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

Pull request #549: RED-5097 - ocr status updates - lastUpdated needs to change when ocr values change

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

* commit '3c2c0a8822a420a495879265662255a0b1999ac3':
  RED-5097 - ocr status updates - lastUpdated needs to change when ocr values change
This commit is contained in:
Timo Bejan 2022-10-12 12:12:13 +02:00
commit c9b91fd74e
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
View File

@ -135,7 +135,7 @@ public class FileStatusPersistenceService {
if (isFileDeleted(fileId)) {
return;
}
fileRepository.updateOCRStartTime(fileId, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS), time);
fileRepository.updateOCRStartTime(fileId, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS), time.truncatedTo(ChronoUnit.MILLIS));
fileRepository.updateFileModificationDate(fileId, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
}

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/internal/AdminInterfaceController.java
View File

@ -61,7 +61,6 @@ public class AdminInterfaceController {
@PostMapping("/ocr")
public void forceOCR(@RequestParam("dossierId") String dossierId, @RequestParam("fileId") String fileId) {
fileStatusService.updateOCRStartTime(fileId);
fileStatusService.setStatusOcrQueued(dossierId, fileId);
}
@ -91,7 +90,6 @@ public class AdminInterfaceController {
file.getId(), file.getDossierId(), file.getWorkflowStatus(), file.getProcessingStatus(), file.getOcrStartTime());
if (!dryRun) {
fileStatusService.updateOCRStartTime(file.getId());
fileStatusService.setStatusOcrQueued(file.getDossierId(), file.getId());
}

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

@ -365,6 +365,7 @@ public class FileStatusService {
return;
}
updateOCRStartTime(fileId);
fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.OCR_PROCESSING_QUEUED);
addToOcrQueue(dossierId, fileId, 2);
}

3
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java
View File

@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import com.iqser.red.service.persistence.management.v1.processor.utils.multitenancy.TenantContext;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@ -70,9 +71,11 @@ public class ReanalysisTest extends AbstractPersistenceServerServiceTest {
private void resetProcessingStatus(FileModel file) {
TenantContext.setTenantId("redaction");
fileRepository.findById(file.getId()).ifPresent(savedFile -> {
savedFile.setOcrStartTime(null);
savedFile.setProcessingStatus(ProcessingStatus.UNPROCESSED);
fileRepository.save(savedFile);