From 763a8da39b863274fb66c282164c940fdc9903aa Mon Sep 17 00:00:00 2001
From: Daniel Palafox <dp852@hotmail.com>
Date: Tue, 31 Oct 2023 19:26:13 -0500
Subject: [PATCH] fix: Add missing `last_modified` in events view so panoply
 can run successfully

---
 .../src/main/resources/db-master.xml          |  1 +
 .../resources/db/updates/dw_alter_event.xml   | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 orcid-persistence/src/main/resources/db/updates/dw_alter_event.xml

diff --git a/orcid-persistence/src/main/resources/db-master.xml b/orcid-persistence/src/main/resources/db-master.xml
index f2c56e0432d..da8321423b4 100644
--- a/orcid-persistence/src/main/resources/db-master.xml
+++ b/orcid-persistence/src/main/resources/db-master.xml
@@ -377,4 +377,5 @@
   <include file="/db/updates/create_event_table.xml" />
   <include file="/db/updates/dw_event.xml" />  
   <include file="/db/updates/create_event_indexes.xml" />
+  <include file="/db/updates/dw_alter_event.xml" />
 </databaseChangeLog>
diff --git a/orcid-persistence/src/main/resources/db/updates/dw_alter_event.xml b/orcid-persistence/src/main/resources/db/updates/dw_alter_event.xml
new file mode 100644
index 00000000000..d7b9c53608e
--- /dev/null
+++ b/orcid-persistence/src/main/resources/db/updates/dw_alter_event.xml
@@ -0,0 +1,43 @@
+<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="ALTER-DW-EVENT-VIEW-GROUP-BY-DAY-CLIENT_ID-AND-EVENT_TYPE" author="Daniel Palafox" dbms="postgresql">
+        <dropView  viewName="dw_event"/>
+
+        <createView viewName="dw_event">
+            SELECT event_type, client_id, COUNT(id), DATE_TRUNC('day', date_created), DATE_TRUNC('day', date_created) as last_modified
+            FROM event
+            WHERE event_type != 'Public-Page'
+            GROUP BY event_type, client_id, DATE_TRUNC('day', date_created)
+            ORDER BY DATE_TRUNC('day', date_created) DESC;
+        </createView>
+    </changeSet>
+
+    <changeSet id="GRANT-READ-TO-DW_USER-TO-DW_EVENT-VIEW" author="Daniel Palafox" dbms="postgresql">
+        <preConditions>
+            <sqlCheck expectedResult="1">SELECT 1 FROM pg_roles WHERE rolname='dw_user'</sqlCheck>
+        </preConditions>
+        <sql>GRANT SELECT ON TABLE dw_event to dw_user;</sql>
+    </changeSet>
+
+    <changeSet id="ALTER-DW-EVENT-VIEW-GROUP-BY-PUBLIC-PAGE" author="Daniel Palafox" dbms="postgresql">
+        <dropView  viewName="dw_event_public_page"/>
+
+        <createView viewName="dw_event_public_page">
+            SELECT event_type, public_page, COUNT(id), DATE_TRUNC('day', date_created), DATE_TRUNC('day', date_created) as last_modified
+            FROM event
+            WHERE event_type = 'Public-Page'
+            GROUP BY event_type, public_page, DATE_TRUNC('day', date_created)
+            ORDER BY DATE_TRUNC('day', date_created) DESC;
+        </createView>
+    </changeSet>
+
+    <changeSet id="GRANT-READ-TO-DW-EVENT-VIEW-GROUP-BY-PUBLIC-PAGE" author="Daniel Palafox" dbms="postgresql">
+        <preConditions>
+            <sqlCheck expectedResult="1">SELECT 1 FROM pg_roles WHERE rolname='dw_user'</sqlCheck>
+        </preConditions>
+        <sql>GRANT SELECT ON TABLE dw_event_public_page to dw_user;</sql>
+    </changeSet>
+
+</databaseChangeLog>