From e1060a7ad8e669de0115af7cff08ee968a8e0b16 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 17 Feb 2022 15:06:19 +0200 Subject: [PATCH] dossier and npe cleanup --- .../src/main/resources/db/changelog/db.changelog-master.yaml | 2 ++ .../main/resources/db/changelog/sql/7.1-set-json-fields.sql | 4 ---- .../resources/db/changelog/sql/7.2-set-dossier-status.sql | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.2-set-dossier-status.sql diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml index 87156b2af..e6717d496 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml @@ -15,5 +15,7 @@ databaseChangeLog: file: db/changelog/7-json-column-mapping.changelog.yaml - include: file: db/changelog/sql/7.1-set-json-fields.sql + - include: + file: db/changelog/sql/7.2-set-dossier-status.sql - include: file: db/changelog/8-remove-old-dossier-status-column.changelog.yaml diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.1-set-json-fields.sql b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.1-set-json-fields.sql index 5c5ef1a0e..d3e059786 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.1-set-json-fields.sql +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.1-set-json-fields.sql @@ -25,7 +25,3 @@ update download_status set download_file_types = (select '['||STRING_AGG( '"'|| download_file_types || '"', ', ')||']' from download_status_entity_download_file_types dem where dem.download_status_entity_storage_id = download_status.storage_id group by dem.download_status_entity_storage_id); - -update dossier set dossier_status = 'ACTIVE' where status = 0 or status is null; -update dossier set dossier_status = 'DELETED' where status = 1; -update dossier set dossier_status = 'ARCHIVED' where status = 2; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.2-set-dossier-status.sql b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.2-set-dossier-status.sql new file mode 100644 index 000000000..33ecf1c4a --- /dev/null +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/sql/7.2-set-dossier-status.sql @@ -0,0 +1,3 @@ +update dossier set dossier_status = 'ACTIVE' where status = 0 or status is null; +update dossier set dossier_status = 'DELETED' where status = 1; +update dossier set dossier_status = 'ARCHIVED' where status = 2;