From 589fc9db3a19ee309c97c47f8702830d285c83a0 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Mon, 4 Aug 2025 11:15:27 -0700
Subject: [PATCH] Update usage queries to reference auditlog.UserAuditEvent

---
 LDK/resources/queries/core/DistinctUsersByMonth.sql | 4 ++--
 LDK/resources/queries/core/SiteUsageByDay.sql       | 5 ++---
 LDK/resources/queries/core/SiteUsageByHour.sql      | 4 ++--
 LDK/resources/queries/core/SiteUsageByMonth.sql     | 5 ++---
 LDK/resources/queries/core/SiteUsageByUser.sql      | 2 +-
 LDK/resources/queries/core/SiteUsagePerGroup.sql    | 4 ++--
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/LDK/resources/queries/core/DistinctUsersByMonth.sql b/LDK/resources/queries/core/DistinctUsersByMonth.sql
index 5a778d81..8666a4c9 100644
--- a/LDK/resources/queries/core/DistinctUsersByMonth.sql
+++ b/LDK/resources/queries/core/DistinctUsersByMonth.sql
@@ -28,9 +28,9 @@ year(a.date) as year,
 month(a.date) as month,
 a.CreatedBy.DisplayName as user
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 
-WHERE a.EventType = 'UserAuditEvent' AND a.Comment LIKE '%logged in%'
+WHERE a.Comment LIKE '%logged in%'
 
 GROUP BY year(a.date), month(a.date), a.CreatedBy.DisplayName
 
diff --git a/LDK/resources/queries/core/SiteUsageByDay.sql b/LDK/resources/queries/core/SiteUsageByDay.sql
index 1a559009..11900586 100644
--- a/LDK/resources/queries/core/SiteUsageByDay.sql
+++ b/LDK/resources/queries/core/SiteUsageByDay.sql
@@ -27,8 +27,7 @@ CASE
 END as dayOfWeek,
 count(*) AS Logins
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 
-WHERE a.EventType = 'UserAuditEvent'
-AND a.Comment LIKE '%logged in%'
+WHERE a.Comment LIKE '%logged in%'
 GROUP BY cast(a.date as date)
\ No newline at end of file
diff --git a/LDK/resources/queries/core/SiteUsageByHour.sql b/LDK/resources/queries/core/SiteUsageByHour.sql
index 26b34cf3..8cb5b6f5 100644
--- a/LDK/resources/queries/core/SiteUsageByHour.sql
+++ b/LDK/resources/queries/core/SiteUsageByHour.sql
@@ -19,8 +19,8 @@ SELECT
 hour(a.date) as Hour,
 count(*) AS Visits
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 
-WHERE a.EventType = 'UserAuditEvent' AND a.Comment LIKE '%logged in%'
+WHERE a.Comment LIKE '%logged in%'
 
 GROUP BY hour(a.date)
\ No newline at end of file
diff --git a/LDK/resources/queries/core/SiteUsageByMonth.sql b/LDK/resources/queries/core/SiteUsageByMonth.sql
index 6d6b18ff..9059b7f2 100644
--- a/LDK/resources/queries/core/SiteUsageByMonth.sql
+++ b/LDK/resources/queries/core/SiteUsageByMonth.sql
@@ -20,10 +20,9 @@ month(a.date) as month,
 cast(cast(year(a.date) as varchar) || '-' || cast(month(a.date) as varchar) || '-01' as DATE) as date,
 count(*) AS Logins
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 --FROM audit_pg.auditLog a
 
-WHERE a.EventType = 'UserAuditEvent'
-AND a.Comment LIKE '%logged in%'
+WHERE a.Comment LIKE '%logged in%'
 
 GROUP BY year(a.date), month(a.date)
\ No newline at end of file
diff --git a/LDK/resources/queries/core/SiteUsageByUser.sql b/LDK/resources/queries/core/SiteUsageByUser.sql
index 1f332fc7..35ab41ff 100644
--- a/LDK/resources/queries/core/SiteUsageByUser.sql
+++ b/LDK/resources/queries/core/SiteUsageByUser.sql
@@ -18,6 +18,6 @@ PARAMETERS(MinDate TIMESTAMP)
 SELECT
 a.CreatedBy,
 COUNT(a.Date) AS LogInCount
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 WHERE a.Comment LIKE '%logged in%' AND cast(a.date as date) >= cast(MinDate as date)
 GROUP BY a.CreatedBy
\ No newline at end of file
diff --git a/LDK/resources/queries/core/SiteUsagePerGroup.sql b/LDK/resources/queries/core/SiteUsagePerGroup.sql
index 1a285141..8248e5b7 100644
--- a/LDK/resources/queries/core/SiteUsagePerGroup.sql
+++ b/LDK/resources/queries/core/SiteUsagePerGroup.sql
@@ -23,8 +23,8 @@ a.EventType
 FROM core.groups g
 
 LEFT JOIN core.Members m ON (g.UserId = m.GroupId.UserId)
-LEFT JOIN "/".auditlog.audit a
-ON (a.CreatedBy.UserId = m.UserId.UserId AND a.EventType = 'UserAuditEvent' AND a.Comment LIKE '%logged in%')
+LEFT JOIN "/".auditlog.UserAuditEvent a
+ON (a.CreatedBy.UserId = m.UserId.UserId AND a.Comment LIKE '%logged in%')
 
 WHERE g.Name IS NOT NULL
 AND g.Name != ''