feature: Create dw_event_stats view and remove dw_even and dw_event_p…

…ublic
ORCID · Jan 4, 2024 · bd56da8 · bd56da8
1 parent a6db989
commit bd56da8
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/EventStatsDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/EventStatsDaoImpl.java
@@ -25,8 +25,7 @@ public void createEventStats() {
                 "INSERT INTO event_stats (event_type, client_id, count, date, date_created, last_modified) " +
                 "SELECT event_type, client_id, COUNT(id), CAST(e.date_created as date), now(), now() " +
                 "FROM event as e " +
-                "WHERE event_type != 'Public-Page' " +
-                "AND CAST(e.date_created as date) = CAST(now() - (CAST('1' AS INTERVAL DAY) * 1) as date) " +
+                "WHERE CAST(e.date_created as date) = CAST(now() - (CAST('1' AS INTERVAL DAY) * 1) as date) " +
                 "GROUP BY event_type, client_id, CAST(e.date_created as date) " +
                 "ORDER BY CAST(e.date_created as date) DESC;";
         Query insertQuery = entityManager.createNativeQuery(query);

diff --git a/orcid-persistence/src/main/resources/db-master.xml b/orcid-persistence/src/main/resources/db-master.xml
@@ -382,4 +382,5 @@
   <include file="/db/updates/grant_select_to_dw_user_on_dw_event.xml" />
   <include file="/db/updates/identifier-types/update-ol-to-be-case-sensitive.xml" />
   <include file="/db/updates/create_event_stats_table.xml" />
+  <include file="/db/updates/dw_event_stats.xml" />
 </databaseChangeLog>
diff --git a/orcid-persistence/src/main/resources/db/updates/dw_event_stats.xml b/orcid-persistence/src/main/resources/db/updates/dw_event_stats.xml
@@ -0,0 +1,27 @@
+<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="DROP-VIEW-FOR-EVENT" author="Daniel Palafox" dbms="postgresql">
+        <dropView viewName="dw_event"/>
+    </changeSet>
+
+    <changeSet id="CREATE-DW-EVENT-STATS-VIEW-GROUP-BY-DAY-CLIENT_ID-AND-EVENT_TYPE" author="Daniel Palafox" dbms="postgresql">
+        <preConditions onFail="MARK_RAN">
+            <not><viewExists viewName="dw_event_stats"/></not>
+        </preConditions>
+        <createView viewName="dw_event_stats">
+            SELECT event_type, client_id, count, DATE_TRUNC('day', date), DATE_TRUNC('day', date) as last_modified
+            FROM event_stats
+            ORDER BY DATE_TRUNC('day', date_created) DESC;
+        </createView>
+    </changeSet>
+
+    <changeSet id="GRANT-READ-TO-DW_USER-TO-DW_EVENT-STATS-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_stats to dw_user;</sql>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/orcid-persistence/src/test/java/org/orcid/persistence/dao/EventStatsDaoTest.java b/orcid-persistence/src/test/java/org/orcid/persistence/dao/EventStatsDaoTest.java
@@ -1,6 +1,5 @@
 package org.orcid.persistence.dao;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.orcid.persistence.jpa.entities.EventEntity;
@@ -38,6 +37,7 @@ public void createEventStats() {
 
         assertNotNull(eventStatsEntityList);
         assertEquals(1, eventStatsEntityList.size());
+        assertEquals(20, java.util.Optional.ofNullable(eventStatsEntityList.get(0).getCount()));
     }
 
     private void createEvents() {

diff --git a/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml b/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml
@@ -42,7 +42,7 @@
         <task:scheduled ref="emailMessageSender" method="addWorksToRecordSecondReminder" cron="${org.orcid.scheduler.web.addWorksToRecord.secondReminder:0 20 * * * *}"/>
         <task:scheduled ref="emailMessageSender" method="addWorksToRecordThirdReminder" cron="${org.orcid.scheduler.web.addWorksToRecord.thirdReminder:0 30 * * * *}"/>
         <task:scheduled ref="eventStats" method="deleteEvents" cron="${org.orcid.scheduler.web.deleteEventsOlderDays:0 10 * * * *}"/>
-        <task:scheduled ref="eventStats" method="saveEventStats" cron="${org.orcid.scheduler.web.saveEventStats:0 10 * * * *}"/>
+        <task:scheduled ref="eventStats" method="saveEventStats" cron="${org.orcid.scheduler.web.saveEventStats:30 * * * * *}"/>
     </task:scheduled-tasks>
 
 	<task:scheduler id="scheduler" pool-size="${org.orcid.scheduler.tasks.pool_size:30}"/>

diff --git a/orcid-test/src/main/resources/data/EventEntityData.xml b/orcid-test/src/main/resources/data/EventEntityData.xml
@@ -13,7 +13,7 @@
     />
 
     <event id="3"
-           event_type="Sign-In"
+           event_type="Public-Page"
            label="Website"
            date_created="2023-01-01 15:31:00.00"           
     />