Add date filter and pagination component to audit log v2

backend/src/controllers/v1/membershipController.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
 import { Types } from "mongoose";
-import { Key, Membership, MembershipOrg, User, IUser } from "../../models";
+import { IUser, Key, Membership, MembershipOrg, User } from "../../models";
 import { EventType } from "../../ee/models";
 import { deleteMembership as deleteMember, findMembership } from "../../helpers/membership";
 import { sendMail } from "../../helpers/nodemailer";

backend/src/controllers/v1/secretsFolderController.ts

@@ -17,8 +17,8 @@ import {
 } from "../../services/FolderService";
 import { ADMIN, MEMBER } from "../../variables";
 import { validateMembership } from "../../helpers/membership";
-import { FolderVersion, EventType } from "../../ee/models";
-import { EESecretService, EEAuditLogService } from "../../ee/services";
+import { EventType, FolderVersion } from "../../ee/models";
+import { EEAuditLogService, EESecretService } from "../../ee/services";
 
 // verify workspace id/environment
 export const createFolder = async (req: Request, res: Response) => {

backend/src/controllers/v2/environmentController.ts

@@ -8,8 +8,8 @@ import {
   ServiceTokenData,
   Workspace,
 } from "../../models";
-import { SecretVersion, EventType } from "../../ee/models";
-import { EELicenseService, EEAuditLogService } from "../../ee/services";
+import { EventType, SecretVersion } from "../../ee/models";
+import { EEAuditLogService, EELicenseService } from "../../ee/services";
 import { BadRequestError, WorkspaceNotFoundError } from "../../utils/errors";
 import _ from "lodash";
 import { PERMISSION_READ_SECRETS, PERMISSION_WRITE_SECRETS } from "../../variables";

backend/src/ee/controllers/v1/workspaceController.ts

@@ -4,6 +4,7 @@ import { Membership, Secret, ServiceTokenData, User } from "../../../models";
 import {
   ActorType,
   AuditLog,
+  EventType,
   FolderVersion,
   IPType,
   ISecretVersion,
@@ -13,14 +14,13 @@ import {
   ServiceActor,
   TFolderRootVersionSchema,
   TrustedIP,
-  UserActor,
-  EventType
+  UserActor
 } from "../../models";
 import { EESecretService } from "../../services";
 import { getLatestSecretVersionIds } from "../../helpers/secretVersion";
 import Folder, { TFolderSchema } from "../../../models/folder";
 import { searchByFolderId } from "../../../services/FolderService";
-import { EELicenseService, EEAuditLogService } from "../../services";
+import { EEAuditLogService, EELicenseService } from "../../services";
 import { extractIPDetails, isValidIpOrCidr } from "../../../utils/ip";
 
 /**
@@ -611,7 +611,10 @@ export const getWorkspaceAuditLogs = async (req: Request, res: Response) => {
   const offset: number = parseInt(req.query.offset as string);
   const limit: number = parseInt(req.query.limit as string);
   
-  const auditLogs = await AuditLog.find({
+  const startDate = req.query.startDate as string;
+  const endDate = req.query.endDate as string;
+  
+  const query = {
     workspace: new Types.ObjectId(workspaceId),
     ...(eventType ? {
         "event.type": eventType
@@ -626,14 +629,25 @@ export const getWorkspaceAuditLogs = async (req: Request, res: Response) => {
       } : {
         "actor.metadata.serviceId": actor.split("-", 2)[1]
       })
+    } : {}),
+    ...(startDate || endDate ? {
+      createdAt: {
+        ...(startDate && { $gte: new Date(startDate) }),
+        ...(endDate && { $lte: new Date(endDate) })
+      }
     } : {})
-  })
+  }
+  
+  const auditLogs = await AuditLog.find(query)
   .sort({ createdAt: -1 })
   .skip(offset)
   .limit(limit);
-    
+
+  const totalCount = await AuditLog.countDocuments(query);
+  
   return res.status(200).send({
-    auditLogs
+    auditLogs,
+    totalCount
   });
 }
 

backend/src/ee/routes/v1/workspace.ts

@@ -96,9 +96,11 @@ router.get(
   param("workspaceId").exists().trim(),
   query("eventType").isString().isIn(Object.values(EventType)).optional({ nullable: true }),
   query("userAgentType").isString().isIn(Object.values(UserAgentType)).optional({ nullable: true }),
-  query("actor").isString().optional({ nullable: true }),
-  query("offset").default("0"),
-  query("limit").default("20"),
+  query("actor").optional({ nullable: true }),
+  query("startDate").isISO8601().withMessage("Invalid start date format").optional({ nullable: true }),
+  query("endDate").isISO8601().withMessage("Invalid end date format").optional({ nullable: true }),
+  query("offset"),
+  query("limit"),
   validateRequest,
   workspaceController.getWorkspaceAuditLogs
 );

backend/src/services/FolderService.ts

@@ -1,6 +1,6 @@
 import { nanoid } from "nanoid";
 import { Types } from "mongoose";
-import Folder, { TFolderSchema, TFolderRootSchema } from "../models/folder";
+import Folder, { TFolderRootSchema, TFolderSchema } from "../models/folder";
 import { ResourceNotFoundError } from "../utils/errors";
 
 type TAppendFolderDTO = {