Merge branch 'main' into 9362-tech-remove-the-dateutils-and-others-pl…

…ease-identify-them-on-the-orcid-core-package-and-leave-the-one-on-orcid-utils
ORCID · Aug 28, 2024 · 6362527 · 6362527
2 parents 24ed04b + 50850de
commit 6362527
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## v2.64.1 - 2024-08-26
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.64.0...v2.64.1)
+
+## v2.64.0 - 2024-08-22
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.63.10...v2.64.0)
+
+## v2.63.10 - 2024-08-22
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.63.9...v2.63.10)
+
 ## v2.63.9 - 2024-08-16
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.63.8...v2.63.9)

diff --git a/orcid-persistence/src/main/resources/db-master.xml b/orcid-persistence/src/main/resources/db-master.xml
@@ -401,5 +401,6 @@
   <include file="/db/updates/identifier-types/identifier-type-52-RAiD.xml" />
   <include file="/db/updates/add_fail_count_fail_reason_and_sync_date_to_group_id_record.xml" />
   <include file="/db/updates/create_profile_email_domain_table.xml" />
-  <include file="/db/updates/create_dw_research_resource_with_dates.xml" />
+  <include file="/db/updates/create_dw_notification.xml" />
+  <include file="/db/updates/create_dw_profile_email_domain.xml" />
 </databaseChangeLog>
diff --git a/orcid-persistence/src/main/resources/db/updates/create_dw_notification.xml b/orcid-persistence/src/main/resources/db/updates/create_dw_notification.xml
@@ -5,7 +5,7 @@
 
     <changeSet id="CREATE-DW-NOTIFICATION" author="Camelia Dumitru" dbms="postgresql">
         <createView viewName="dw_notification" replaceIfExists="true">
-            select notification_type, orcid, client_source_id, date_created, sent_date, read_date, actioned_date, archived_date, last_modified 
+            select id as db_id, notification_type, orcid, client_source_id, date_created, sent_date, read_date, actioned_date, archived_date, last_modified 
             from notification where notification_type='PERMISSION' and client_source_id is not null and last_modified > date_trunc('day',(now() - interval '12 months'))
         </createView>
     </changeSet>

diff --git a/orcid-persistence/src/main/resources/db/updates/create_dw_profile_email_domain.xml b/orcid-persistence/src/main/resources/db/updates/create_dw_profile_email_domain.xml
@@ -0,0 +1,19 @@
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
+
+
+    <changeSet id="CREATE-DW-PROFILE-EMAIL-DOMAIN" author="Camelia Dumitru" dbms="postgresql">
+        <createView viewName="dw_profile_email_domain" replaceIfExists="true">
+            select id as db_id, orcid, email_domain, visibility,date_created, last_modified from profile_email_domain where last_modified > date_trunc('day',(now() - interval '4 months'))
+        </createView>
+    </changeSet>
+
+    <changeSet id="GRANT-READ_PERM-TO-DW-PROFILE-EMAIL-DOMAIN" author="Camelia Dumitru" dbms="postgresql">
+        <preConditions>
+            <sqlCheck expectedResult="1">SELECT 1 FROM pg_roles WHERE rolname='dw_user'</sqlCheck>
+        </preConditions>
+        <sql>GRANT SELECT ON TABLE dw_profile_email_domain to dw_user;</sql>
+    </changeSet>
+
+</databaseChangeLog>