♻️ set default log analytics time range to. 7days ago

server/routers/auditLogs/queryRequestAnalytics.ts

@@ -2,7 +2,7 @@ import { db, requestAuditLog, driver } from "@server/db";
 import { registry } from "@server/openApi";
 import { NextFunction } from "express";
 import { Request, Response } from "express";
-import { eq, gt, lt, and, count, sql, desc, not, isNull } from "drizzle-orm";
+import { eq, gte, lte, and, count, sql, desc, not, isNull } from "drizzle-orm";
 import { OpenAPITags } from "@server/openApi";
 import { z } from "zod";
 import createHttpError from "http-errors";
@@ -11,6 +11,14 @@ import { fromError } from "zod-validation-error";
 import response from "@server/lib/response";
 import logger from "@server/logger";
 
+function getSevenDaysAgo() {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0); // Set to midnight
+    const sevenDaysAgo = new Date(today);
+    sevenDaysAgo.setDate(today.getDate() - 7);
+    return sevenDaysAgo.toISOString();
+}
+
 const queryAccessAuditLogsQuery = z.object({
     // iso string just validate its a parseable date
     timeStart: z
@@ -19,7 +27,8 @@ const queryAccessAuditLogsQuery = z.object({
             error: "timeStart must be a valid ISO date string"
         })
         .transform((val) => Math.floor(new Date(val).getTime() / 1000))
-        .optional(),
+        .optional()
+        .prefault(getSevenDaysAgo),
     timeEnd: z
         .string()
         .refine((val) => !isNaN(Date.parse(val)), {
@@ -55,15 +64,10 @@ type Q = z.infer<typeof queryRequestAuditLogsCombined>;
 async function query(query: Q) {
     let baseConditions = and(
         eq(requestAuditLog.orgId, query.orgId),
-        lt(requestAuditLog.timestamp, query.timeEnd)
+        gte(requestAuditLog.timestamp, query.timeStart),
+        lte(requestAuditLog.timestamp, query.timeEnd)
     );
 
-    if (query.timeStart) {
-        baseConditions = and(
-            baseConditions,
-            gt(requestAuditLog.timestamp, query.timeStart)
-        );
-    }
     if (query.resourceId) {
         baseConditions = and(
             baseConditions,