@7365admin1/core 3.48.1-staging.148 → 3.48.1-staging.149

package/dist/index.d.ts

@@ -4890,6 +4890,12 @@ type TPatrolLog = {
     cameras: Array<logCamera>;
     status: Array<string>;
     incidentReport: incidentReport;
+    /**
+     * The user who created the log. Stored as a reference only — the name is
+     * resolved from `users` at read time, so a renamed account shows its current
+     * name rather than whatever it was called when the log was filed.
+     */
+    createdBy?: string | ObjectId | null;
     platform?: string;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -4910,6 +4916,7 @@ declare function MPatrolLog(value: TPatrolLog): {
     status: string[];
     route: string | ObjectId | undefined;
     incidentReport: incidentReport;
+    createdBy: string | ObjectId | null;
     platForm: string;
     createdAt: string | Date;
     updatedAt: string | Date;

package/dist/index.js

@@ -52384,6 +52384,9 @@ var schemaPatrolLog = import_joi75.default.object({
   cameras: import_joi75.default.array().items(schemeLogCamera).required(),
   status: import_joi75.default.array().items(import_joi75.default.string().valid("complete", "late", "incomplete")).required(),
   incidentReport: incidentReportLog,
+  // Optional: existing clients do not send it, and requiring it would reject
+  // every patrol log currently being posted.
+  createdBy: import_joi75.default.string().hex().length(24).optional().allow(null, ""),
   platform: import_joi75.default.string().valid("web", "mobile").optional().allow(null, ""),
   createdAt: import_joi75.default.date().optional(),
   updatedAt: import_joi75.default.date().optional(),
@@ -52442,6 +52445,13 @@ function MPatrolLog(value) {
       throw new import_node_server_utils151.BadRequestError("Invalid incident report id format");
     }
   }
+  if (value.createdBy && typeof value.createdBy === "string") {
+    try {
+      value.createdBy = new import_mongodb93.ObjectId(value.createdBy);
+    } catch {
+      throw new import_node_server_utils151.BadRequestError("Invalid createdBy id format");
+    }
+  }
   return {
     _id: value._id ?? new import_mongodb93.ObjectId(),
     site: value.site,
@@ -52453,6 +52463,7 @@ function MPatrolLog(value) {
     status: value.status ?? [],
     route: value.route,
     incidentReport: value.incidentReport,
+    createdBy: value.createdBy ?? null,
     platForm: value.platform ?? "",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? "",
@@ -52621,7 +52632,45 @@ function usePatrolLogRepo() {
         },
         { $sort: sort },
         { $skip: page * limit },
-        { $limit: limit }
+        { $limit: limit },
+        // Both lookups sit after $limit on purpose: they are projection only,
+        // nothing above filters or sorts on them, so they run for the page
+        // being returned rather than for the whole collection.
+        {
+          $lookup: {
+            from: "users",
+            localField: "createdBy",
+            foreignField: "_id",
+            // Name only. The users collection holds password hashes and session
+            // fields, none of which belong in a patrol log response.
+            pipeline: [{ $project: { _id: 1, name: 1 } }],
+            as: "createdByData"
+          }
+        },
+        {
+          $unwind: { path: "$createdByData", preserveNullAndEmptyArrays: true }
+        },
+        {
+          $lookup: {
+            from: "patrol.route",
+            localField: "route",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 1, repeat: 1 } }],
+            as: "routeData"
+          }
+        },
+        { $unwind: { path: "$routeData", preserveNullAndEmptyArrays: true } },
+        {
+          // Flattened to match the `approvedByName` shape used elsewhere.
+          // `repeat` is read live rather than snapshotted on the log: it is the
+          // route's current configuration, so editing a route must change what
+          // the list shows.
+          $addFields: {
+            createdByName: "$createdByData.name",
+            repeat: "$routeData.repeat"
+          }
+        },
+        { $project: { createdByData: 0, routeData: 0 } }
       ];
       const countPipeline = [
         {