From 4c1fd58d5fa5e553173f7117a0bfe19c2b02936f Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 14 Apr 2022 12:51:36 +0200 Subject: [PATCH] RED-3886: Do migration stuff also for softdeleted files --- .../migration/migrations/DictionaryToEntityMigration2.java | 2 +- .../v1/server/migration/migrations/MigrateHighlights3.java | 2 +- .../migrations/RemoveFalsePositiveManualRedactions6.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/DictionaryToEntityMigration2.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/DictionaryToEntityMigration2.java index a5f46f846..1696b2998 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/DictionaryToEntityMigration2.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/DictionaryToEntityMigration2.java @@ -55,7 +55,7 @@ public class DictionaryToEntityMigration2 extends Migration { log.info("Start migration of dossier {}", dossier.getId()); files.forEach(file -> { log.info("Start migration of file {}", file.getId()); - if (file.getDeleted() == null) { + if (file.getHardDeletedTime() == null) { var newRedactionLogEntries = new ArrayList(); var redactionLog = fileManagementStorageService.getRedactionLog(dossier.getId(), file.getId()); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/MigrateHighlights3.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/MigrateHighlights3.java index f6be6ca1c..f4b602531 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/MigrateHighlights3.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/MigrateHighlights3.java @@ -48,7 +48,7 @@ public class MigrateHighlights3 extends Migration { dossiers.forEach(dossier -> { var files = fileStatusPersistenceService.getStatusesForDossier(dossier.getId()); files.forEach(file -> { - if (file.getDeleted() == null) { + if (file.getHardDeletedTime() == null) { var fileBytes = fileManagementStorageService.getStoredObjectBytes(dossier.getId(), file.getId(), FileType.ORIGIN); var hasHighlights = pdfTronRedactionClient.extractHighlights(new DocumentRequest(dossier.getId(), file.getId(), fileBytes)); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/RemoveFalsePositiveManualRedactions6.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/RemoveFalsePositiveManualRedactions6.java index 27c0fb599..644829746 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/RemoveFalsePositiveManualRedactions6.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/RemoveFalsePositiveManualRedactions6.java @@ -44,7 +44,7 @@ public class RemoveFalsePositiveManualRedactions6 extends Migration { dossiers.forEach(dossier -> { var files = fileStatusPersistenceService.getStatusesForDossier(dossier.getId()); files.forEach(file -> { - if (file.getDeleted() == null) { + if (file.getHardDeletedTime() == null) { var annotationIdsToRemove = new ArrayList(); var manualRedactions = manualRedactionController.getManualRedactions(dossier.getId(), file.getId());