From ebd99f95a3a8d1e70365cc05137a342add9d90de Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Wed, 29 Oct 2025 17:37:29 -0700
Subject: [PATCH] Also order by id

---
 server/private/routers/auditLogs/queryAccessAuditLog.ts | 2 +-
 server/private/routers/auditLogs/queryActionAuditLog.ts | 2 +-
 server/routers/auditLogs/queryRequstAuditLog.ts         | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/private/routers/auditLogs/queryAccessAuditLog.ts b/server/private/routers/auditLogs/queryAccessAuditLog.ts
index 4d6b96e6..33383c25 100644
--- a/server/private/routers/auditLogs/queryAccessAuditLog.ts
+++ b/server/private/routers/auditLogs/queryAccessAuditLog.ts
@@ -124,7 +124,7 @@ export function queryAccess(data: Q) {
             eq(accessAuditLog.resourceId, resources.resourceId)
         )
         .where(getWhere(data))
-        .orderBy(desc(accessAuditLog.timestamp));
+        .orderBy(desc(accessAuditLog.timestamp), desc(accessAuditLog.id));
 }
 
 export function countAccessQuery(data: Q) {
diff --git a/server/private/routers/auditLogs/queryActionAuditLog.ts b/server/private/routers/auditLogs/queryActionAuditLog.ts
index f3796aa2..018651cb 100644
--- a/server/private/routers/auditLogs/queryActionAuditLog.ts
+++ b/server/private/routers/auditLogs/queryActionAuditLog.ts
@@ -92,7 +92,7 @@ export function queryAction(data: Q) {
         })
         .from(actionAuditLog)
         .where(getWhere(data))
-        .orderBy(desc(actionAuditLog.timestamp));
+        .orderBy(desc(actionAuditLog.timestamp), desc(actionAuditLog.id));
 }
 
 export function countActionQuery(data: Q) {
diff --git a/server/routers/auditLogs/queryRequstAuditLog.ts b/server/routers/auditLogs/queryRequstAuditLog.ts
index 5575f8bd..26cba417 100644
--- a/server/routers/auditLogs/queryRequstAuditLog.ts
+++ b/server/routers/auditLogs/queryRequstAuditLog.ts
@@ -94,6 +94,7 @@ function getWhere(data: Q) {
 export function queryRequest(data: Q) {
     return db
         .select({
+            id: requestAuditLog.id,
             timestamp: requestAuditLog.timestamp,
             orgId: requestAuditLog.orgId,
             action: requestAuditLog.action,
@@ -123,7 +124,7 @@ export function queryRequest(data: Q) {
             eq(requestAuditLog.resourceId, resources.resourceId)
         ) // TODO: Is this efficient?
         .where(getWhere(data))
-        .orderBy(desc(requestAuditLog.timestamp));
+        .orderBy(desc(requestAuditLog.timestamp), desc(requestAuditLog.id));
 }
 
 export function countRequestQuery(data: Q) {