diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java index d79854a8c..01ce47559 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java @@ -745,7 +745,7 @@ public class MigrationService { ProcessingStatus processingStatus = null; switch (oldFile.getStatus()) { case UNPROCESSED: - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.UNPROCESSED; break; case REPROCESS: @@ -753,7 +753,7 @@ public class MigrationService { workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); processingStatus = ProcessingStatus.REPROCESS; } else { - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.REPROCESS; } break; @@ -762,7 +762,7 @@ public class MigrationService { workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); processingStatus = ProcessingStatus.PROCESSING; } else { - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.PROCESSING; } break; @@ -771,7 +771,7 @@ public class MigrationService { workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); processingStatus = ProcessingStatus.ERROR; } else { - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.ERROR; } break; @@ -780,12 +780,12 @@ public class MigrationService { workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); processingStatus = ProcessingStatus.DELETED; } else { - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.DELETED; } break; case UNASSIGNED: - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.PROCESSED; break; case UNDER_REVIEW: @@ -805,7 +805,7 @@ public class MigrationService { workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); processingStatus = ProcessingStatus.FULLREPROCESS; } else { - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.FULLREPROCESS; } break; @@ -814,7 +814,7 @@ public class MigrationService { workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); processingStatus = ProcessingStatus.OCR_PROCESSING; } else { - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.OCR_PROCESSING; } break; @@ -823,7 +823,7 @@ public class MigrationService { workflowStatus = WorkflowStatus.valueOf(oldFile.getLastSuccessfulStatus().name()); processingStatus = ProcessingStatus.INDEXING; } else { - workflowStatus = WorkflowStatus.UNASSIGNED; + workflowStatus = WorkflowStatus.NEW; processingStatus = ProcessingStatus.INDEXING; } break; @@ -842,7 +842,8 @@ public class MigrationService { .deleted(oldFile.getDeleted()) .lastProcessed(oldFile.getLastProcessed()) .numberOfAnalyses(oldFile.getNumberOfAnalyses()) - .currentReviewer(oldFile.getCurrentReviewer()) + .assignee(oldFile.getCurrentReviewer()) + .lastApprover(workflowStatus == WorkflowStatus.APPROVED ? oldFile.getLastReviewer() : null) .lastReviewer(oldFile.getLastReviewer()) .lastManualRedaction(oldFile.getLastManualRedaction()) .hasRedactions(oldFile.isHasRedactions())