From c3bca638bcdba8125e89b335ba1680ec639953ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 11 Mar 2024 14:11:09 +0100 Subject: [PATCH 1/3] RED-8712: Fixed sql statement --- .../206-remove-manual-redactions-on-non-existing-pages.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/206-remove-manual-redactions-on-non-existing-pages.sql b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/206-remove-manual-redactions-on-non-existing-pages.sql index 77af61e9a..ebe158fba 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/206-remove-manual-redactions-on-non-existing-pages.sql +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/206-remove-manual-redactions-on-non-existing-pages.sql @@ -1,7 +1,7 @@ Delete -from redaction.manual_redaction +from manual_redaction where concat(annotation_id, file_id) in (SELECT concat(manual_redaction_entry_entity_annotation_id, id) - from redaction.file file - JOIN redaction.manual_redaction_entry_entity_positions pos + from file file + JOIN manual_redaction_entry_entity_positions pos ON file.id = pos.manual_redaction_entry_entity_file_id where file.number_of_pages < pos.page); \ No newline at end of file From f0105efa6295a1758211459a314865689cfe9c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 11 Mar 2024 15:31:08 +0100 Subject: [PATCH 2/3] hotfix: fixed to long section value of manual redaction in saas migration --- .../v1/processor/migration/SaasMigrationService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java index 4df672608..3baf6e258 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java @@ -240,6 +240,12 @@ public class SaasMigrationService implements TenantSyncService { private int addManualRedactionEntries(List manualRedactionEntriesToAdd) { + manualRedactionEntriesToAdd.forEach(add -> { + if(add.getSection().length() > 254){ + add.setSection(add.getSection().substring(0, 254)); + } + }); + return manualRedactionService.addManualRedactionEntries(manualRedactionEntriesToAdd, true); } From ccdc1f3ce0553d515fa1495473967ecbe3ff7b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 11 Mar 2024 16:05:31 +0100 Subject: [PATCH 3/3] hotfix: saas migration section is null --- .../management/v1/processor/migration/SaasMigrationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java index 3baf6e258..104f2b6d3 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/SaasMigrationService.java @@ -241,7 +241,7 @@ public class SaasMigrationService implements TenantSyncService { private int addManualRedactionEntries(List manualRedactionEntriesToAdd) { manualRedactionEntriesToAdd.forEach(add -> { - if(add.getSection().length() > 254){ + if(add.getSection() != null && add.getSection().length() > 254){ add.setSection(add.getSection().substring(0, 254)); } });