@7365admin1/core 3.48.1-staging.155 → 3.48.1-staging.156

package/.changeset/manpower-remark-site-scope.md

@@ -0,0 +1,41 @@
+---
+"@7365admin1/core": minor
+---
+
+Scope the manpower remarks routes to the site the remarks belong to.
+
+A remarks row is the shift-attendance exception record for one site on one day:
+which named guards were late or absent, and whether the estate has acknowledged
+it. Every route on `/api/remarks` carried `requireAuth` and nothing more — the
+controller held no authorization identifier of any kind — so being signed in
+anywhere on the platform was enough to read another client's daily manning
+failures, to write an acknowledgement into their record in a name of the
+caller's choosing, or to switch a row to `inactive` so the estate's own console
+stops listing it.
+
+All five routes now go through `requireSiteReach`, the rule
+`/api/manpower-monitoring`, `/api/attendances`, `/api/vehicles`,
+`/api/documents` and `/api/incident-reports` already use:
+
+- `GET /:id/:serviceProviderId` names the site in the URL, so it is checked
+  before the read.
+- `PUT /:id` and `PATCH /:id` name only a record, so the site is read off the
+  **stored** row — a `siteId` in the caller's own body cannot stand in for it.
+- `GET /` names no site at all. Its only filter is a `serviceProviderId` the
+  caller supplies, which is not a claim about the caller, and one agency works
+  for several clients — so the page came back holding every one of those
+  clients' rows. It is narrowed after the read, the way
+  `/api/manpower-monitoring`'s own `GET /search` is. The count in the envelope
+  stays the unfiltered one, as it does there; both callers read it only for the
+  pager.
+- `POST /` writes a row for whatever `siteId` the body carries. It has no caller
+  in any web app or mobile app — the rows are written internally by
+  `manpower-monitoring.service.ts` when a site's monitoring settings are created
+  — and it is guarded all the same rather than left open.
+
+`requireSiteReach` matters here because the contracted agency that actually runs
+these shifts holds no membership in the estate's organisation and reaches its
+own site through `customer.sites`.
+
+A row the caller cannot reach answers exactly as one that does not exist, so
+site ids cannot be enumerated by watching the difference.

package/dist/index.d.ts

@@ -8369,11 +8369,45 @@ declare function useManpowerRemarksRepo(): {
         pageRange: string;
     }>;
     getManpowerRemarksBySiteId: (_id: string | ObjectId, date: string, serviceProviderId?: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
+    getManpowerRemarksById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     updateManpowerRemarks: (_id: string | ObjectId, value: TManpowerRemarksUpdate) => Promise<number>;
     updateRemarksStatus: (_id: string | ObjectId, value: TManpowerRemarksStatusUpdate) => Promise<number>;
     createIndexes: () => Promise<string>;
 };
 
+/**
+ * Who may see, or change, a site's manpower remarks.
+ *
+ * A remarks row is the shift-attendance exception record for one site on one
+ * day: which named guards were late or absent, and whether the estate has
+ * acknowledged it. Every route on this mount carried `requireAuth` and NOTHING
+ * else — this controller held no authorization identifier of any kind — so
+ * being signed in anywhere on the platform was enough to read another client's
+ * daily manning failures, to write an acknowledgement into their record in
+ * somebody else's name, or to switch a row to `inactive` so the estate stops
+ * seeing it.
+ *
+ * The estate is the scope, the same rule `/api/manpower-monitoring`,
+ * `/api/attendances`, `/api/vehicles`, `/api/documents` and
+ * `/api/incident-reports` already use, so the contracted agency that actually
+ * runs these shifts reaches its own sites through `customer.sites` and needs no
+ * membership in the estate's own organisation.
+ *
+ * Three shapes, because the routes ask three different questions:
+ *  - `GET /:id/:serviceProviderId` names the site in the URL, so it is checked
+ *    BEFORE the read.
+ *  - `PUT /:id` and `PATCH /:id` name only a record, so the site is read off
+ *    the STORED row (`requireRemarkReach`) and a `siteId` in the body cannot
+ *    stand in for it.
+ *  - `GET /` names no site at all — its only filter is a `serviceProviderId`
+ *    the caller supplies — so the page has to be narrowed AFTER the read, the
+ *    way `/api/manpower-monitoring`'s own `GET /search` is.
+ *
+ * `POST /` writes a row for whatever `siteId` the body carries. It has no
+ * caller in any web app or mobile app; the rows are written internally by
+ * `manpower-monitoring.service.ts` when a site's monitoring settings are
+ * created. It is guarded all the same rather than left open.
+ */
 declare function useManpowerRemarkCtrl(): {
     createManpowerRemark: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
     getManpowerRemarksAllSite: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;

package/dist/index.js

@@ -75335,6 +75335,14 @@ function useManpowerRemarksRepo() {
       throw error;
     }
   }
+  async function getManpowerRemarksById(_id) {
+    try {
+      _id = new import_mongodb146.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils231.BadRequestError("Invalid ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   async function updateManpowerRemarks(_id, value) {
     try {
       _id = new import_mongodb146.ObjectId(_id);
@@ -75382,6 +75390,7 @@ function useManpowerRemarksRepo() {
     createManpowerRemarks,
     getManpowerRemarksAllSite,
     getManpowerRemarksBySiteId,
+    getManpowerRemarksById,
     updateManpowerRemarks,
     updateRemarksStatus,
     createIndexes
@@ -77349,8 +77358,13 @@ function useManpowerRemarkCtrl() {
     getManpowerRemarksAllSite: _getManpowerRemarksAllSite,
     updateRemarksStatus: _updateRemarksStatus,
     getManpowerRemarksBySiteId: _getManpowerRemarksBySiteId,
+    getManpowerRemarksById: _getManpowerRemarksById,
     updateManpowerRemarks: _updateManpowerRemarks
   } = useManpowerRemarksRepo();
+  async function requireRemarkReach(req, _id) {
+    const remark = await _getManpowerRemarksById(_id);
+    await requireSiteReach(req, remark?.siteId);
+  }
   async function createManpowerRemark(req, res, next) {
     try {
       const payload = { ...req.body };
@@ -77359,6 +77373,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireSiteReach(req, payload.siteId);
       const result = await _createManpowerRemarks(payload);
       return res.json(result);
     } catch (error) {
@@ -77398,7 +77413,17 @@ function useManpowerRemarkCtrl() {
         status: status?.toString() || "",
         date: date?.toString() || ""
       });
-      return res.json(result);
+      const { only } = await siteReachOf(req);
+      const items = await only(
+        (result?.items ?? []).map((row) => ({
+          row,
+          site: row?.siteId
+        }))
+      );
+      return res.json({
+        ...result,
+        items: items.map((entry) => entry.row)
+      });
     } catch (error) {
       import_node_server_utils244.logger.log({ level: "error", message: error.message });
       next(error);
@@ -77423,6 +77448,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireSiteReach(req, id);
       const result = await _getManpowerRemarksBySiteId(
         id,
         date,
@@ -77450,6 +77476,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireRemarkReach(req, _id);
       const result = await _updateManpowerRemarks(_id, payload);
       return res.json(result);
     } catch (error) {
@@ -77471,6 +77498,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireRemarkReach(req, _id);
       const result = await _updateRemarksStatus(_id, payload);
       return res.json(result);
     } catch (error) {