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

Pull request #138: RED-2900: Fixed failing migration

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

* commit '0eea79bff601822893871b6adbac13105672a90a':
  RED-2900: Fixed failing migration
This commit is contained in:
Dominique Eiflaender 2021-12-01 16:35:48 +01:00
commit 9ffdae9a31
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
View File

@ -360,7 +360,8 @@ public class MigrationService {
.findFirst(); .findFirst();
if(!versionOptional.isPresent()){ if(!versionOptional.isPresent()){
throw new MigrationException("Unable to find version"); log.warn("no rules version found for dossier template {}", dossierTemplateId);
return;
} }
var version = versionOptional var version = versionOptional
.get() .get()
@ -670,7 +671,7 @@ public class MigrationService {
break; break;
case REPROCESS: case REPROCESS:
if (oldFile.getLastSuccessfulStatus() != null) { if (oldFile.getLastSuccessfulStatus() != null) {
workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); workflowStatus = oldFile.getLastSuccessfulStatus().equals(Status.UNASSIGNED) ? WorkflowStatus.NEW : WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name());
processingStatus = ProcessingStatus.REPROCESS; processingStatus = ProcessingStatus.REPROCESS;
} else { } else {
workflowStatus = WorkflowStatus.NEW; workflowStatus = WorkflowStatus.NEW;
@ -679,7 +680,7 @@ public class MigrationService {
break; break;
case PROCESSING: case PROCESSING:
if (oldFile.getLastSuccessfulStatus() != null) { if (oldFile.getLastSuccessfulStatus() != null) {
workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); workflowStatus = oldFile.getLastSuccessfulStatus().equals(Status.UNASSIGNED) ? WorkflowStatus.NEW : WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name());
processingStatus = ProcessingStatus.PROCESSING; processingStatus = ProcessingStatus.PROCESSING;
} else { } else {
workflowStatus = WorkflowStatus.NEW; workflowStatus = WorkflowStatus.NEW;
@ -688,7 +689,7 @@ public class MigrationService {
break; break;
case ERROR: case ERROR:
if (oldFile.getLastSuccessfulStatus() != null) { if (oldFile.getLastSuccessfulStatus() != null) {
workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); workflowStatus = oldFile.getLastSuccessfulStatus().equals(Status.UNASSIGNED) ? WorkflowStatus.NEW : WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name());
processingStatus = ProcessingStatus.ERROR; processingStatus = ProcessingStatus.ERROR;
} else { } else {
workflowStatus = WorkflowStatus.NEW; workflowStatus = WorkflowStatus.NEW;
@ -697,7 +698,7 @@ public class MigrationService {
break; break;
case DELETED: case DELETED:
if (oldFile.getLastSuccessfulStatus() != null) { if (oldFile.getLastSuccessfulStatus() != null) {
workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); workflowStatus = oldFile.getLastSuccessfulStatus().equals(Status.UNASSIGNED) ? WorkflowStatus.NEW : WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name());
processingStatus = ProcessingStatus.DELETED; processingStatus = ProcessingStatus.DELETED;
} else { } else {
workflowStatus = WorkflowStatus.NEW; workflowStatus = WorkflowStatus.NEW;
@ -722,7 +723,7 @@ public class MigrationService {
break; break;
case FULLREPROCESS: case FULLREPROCESS:
if (oldFile.getLastSuccessfulStatus() != null) { if (oldFile.getLastSuccessfulStatus() != null) {
workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); workflowStatus = oldFile.getLastSuccessfulStatus().equals(Status.UNASSIGNED) ? WorkflowStatus.NEW : WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name());
processingStatus = ProcessingStatus.FULLREPROCESS; processingStatus = ProcessingStatus.FULLREPROCESS;
} else { } else {
workflowStatus = WorkflowStatus.NEW; workflowStatus = WorkflowStatus.NEW;
@ -731,7 +732,7 @@ public class MigrationService {
break; break;
case OCR_PROCESSING: case OCR_PROCESSING:
if (oldFile.getLastSuccessfulStatus() != null) { if (oldFile.getLastSuccessfulStatus() != null) {
workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); workflowStatus = oldFile.getLastSuccessfulStatus().equals(Status.UNASSIGNED) ? WorkflowStatus.NEW : WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name());
processingStatus = ProcessingStatus.OCR_PROCESSING; processingStatus = ProcessingStatus.OCR_PROCESSING;
} else { } else {
workflowStatus = WorkflowStatus.NEW; workflowStatus = WorkflowStatus.NEW;
@ -740,7 +741,7 @@ public class MigrationService {
break; break;
case INDEXING: case INDEXING:
if (oldFile.getLastSuccessfulStatus() != null) { if (oldFile.getLastSuccessfulStatus() != null) {
workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); workflowStatus = oldFile.getLastSuccessfulStatus().equals(Status.UNASSIGNED) ? WorkflowStatus.NEW : WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name());
processingStatus = ProcessingStatus.INDEXING; processingStatus = ProcessingStatus.INDEXING;
} else { } else {
workflowStatus = WorkflowStatus.NEW; workflowStatus = WorkflowStatus.NEW;