@7365admin1/module-hygiene 4.29.1-staging.12 → 4.29.1-staging.13

package/.changeset/checklist-photo-set-finish-approve-reject.md

@@ -0,0 +1,9 @@
+---
+"@7365admin1/module-hygiene": patch
+---
+
+Decide which approve finishes a checklist set from approve/reject, the same rule
+the units list uses, instead of the unit `status` field. Units at rest carry
+"open" or "closed", so the old check never saw a set as finished: a set holding a
+rejected unit could not be completed, and the finishing tick was not recognised.
+No change to when a photo is required, and no schema or data change.

package/.changeset/photo-required-only-on-completion.md

@@ -0,0 +1,9 @@
+---
+"@7365admin1/module-hygiene": patch
+---
+
+Require the completion photo only on the approve that FINISHES a set, not on
+every unit tick. A task in this product is a set: both the web checklist and the
+five field apps tick units one at a time and open the photographs dialog on the
+tick that completes the set. The previous rule demanded a photo on every
+approve, which refused every intermediate tick on both platforms.

package/dist/index.d.ts

@@ -388,6 +388,10 @@ declare function useAreaChecklistRepo(): {
     updateAreaChecklist: (_id: string | ObjectId, value: TAreaChecklistUpdate, session?: ClientSession) => Promise<number>;
     updateAreaChecklistStatus: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
     updateAreaChecklistUnits: (_id: string | ObjectId, set: number, unitId: string | ObjectId, value: TAreaChecklistUnitsUpdate, session?: ClientSession) => Promise<number>;
+    readSetCompletionState: (_id: string | ObjectId, set: number, unitId: string) => Promise<{
+        completesSet: boolean;
+        hasEvidence: boolean;
+    }>;
     getMaxSetNumberForArea: (areaId: string | ObjectId, session?: ClientSession) => Promise<any>;
     closeExpiredAreaChecklists: () => Promise<number>;
     pushScheduleTaskSets: (scheduleId: string | ObjectId, serviceType: TAppServiceType, areaId: string | ObjectId, scheduleTaskId: string | ObjectId, newSets: TAreaChecklist[]) => Promise<number>;

package/dist/index.js

@@ -3288,6 +3288,39 @@ var import_core10 = require("@7365admin1/core");
 // src/repositories/hygiene-area-checklist.repository.ts
 var import_mongodb9 = require("mongodb");
 var import_node_server_utils17 = require("@7365admin1/node-server-utils");
+
+// src/utils/completion-photo.util.ts
+var COMPLETION_PHOTO_MESSAGE = "A photo is required to complete this task. Take or upload at least one photo before marking it complete.";
+function readCompletion(units, unitId) {
+  if (units.length === 0)
+    return { completesSet: false, hasEvidence: false };
+  const others = units.filter((unit) => String(unit.unit) !== String(unitId));
+  return {
+    completesSet: others.every(
+      (unit) => unit.approve === true || unit.reject === true
+    ),
+    hasEvidence: others.some(
+      (unit) => Array.isArray(unit.attachment) && unit.attachment.length > 0
+    )
+  };
+}
+function requiresCompletionPhoto({
+  decision,
+  attachment,
+  completesSet,
+  hasEvidence
+}) {
+  if (decision !== "approve")
+    return false;
+  if (!completesSet)
+    return false;
+  if (hasEvidence)
+    return false;
+  const carriesEvidence = Array.isArray(attachment) && attachment.some((id) => typeof id === "string" && id.trim().length > 0);
+  return !carriesEvidence;
+}
+
+// src/repositories/hygiene-area-checklist.repository.ts
 function useAreaChecklistRepo() {
   const db = import_node_server_utils17.useAtlas.getDb();
   if (!db) {
@@ -3359,7 +3392,11 @@ function useAreaChecklistRepo() {
       const parentChecklistId = new import_mongodb9.ObjectId(value.schedule);
       const areaId = new import_mongodb9.ObjectId(value.area);
       const existingChecklist = await collection.findOne(
-        { schedule: parentChecklistId, area: areaId, serviceType: value.serviceType },
+        {
+          schedule: parentChecklistId,
+          area: areaId,
+          serviceType: value.serviceType
+        },
         { session }
       );
       if (existingChecklist) {
@@ -4115,6 +4152,21 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function readSetCompletionState(_id, set, unitId) {
+    try {
+      _id = new import_mongodb9.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils17.BadRequestError("Invalid area checklist ID format.");
+    }
+    const doc = await collection.findOne(
+      { _id, "checklist.set": set },
+      { projection: { checklist: 1 } }
+    );
+    const group = (doc?.checklist ?? []).find(
+      (entry) => entry.set === set
+    );
+    return readCompletion(group?.units ?? [], unitId);
+  }
   async function updateAreaChecklist(_id, value, session) {
     try {
       _id = new import_mongodb9.ObjectId(_id);
@@ -4399,6 +4451,7 @@ function useAreaChecklistRepo() {
     updateAreaChecklist,
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
+    readSetCompletionState,
     getMaxSetNumberForArea,
     closeExpiredAreaChecklists,
     pushScheduleTaskSets,
@@ -4870,7 +4923,8 @@ function useAreaChecklistController() {
     getAllAreaChecklist: _getAllAreaChecklist,
     getAreaChecklistHistory: _getAreaChecklistHistory,
     getAreaChecklistHistoryDetails: _getAreaChecklistHistoryDetails,
-    getAreaChecklistUnits: _getAreaChecklistUnits
+    getAreaChecklistUnits: _getAreaChecklistUnits,
+    readSetCompletionState: _readSetCompletionState
   } = useAreaChecklistRepo();
   const {
     createAreaChecklist: _createAreaChecklist,
@@ -5075,36 +5129,11 @@ function useAreaChecklistController() {
       reject: import_joi9.default.boolean().optional(),
       remarks: import_joi9.default.string().optional().allow("", null),
       /*
-       * A PHOTO IS REQUIRED TO COMPLETE A TASK.
-       *
-       * Owner requirement, 2026-09-10: *"once task was completed they required
-       * to take photo before completing the task ... all the services that has
-       * this module must be the same process."*
-       *
-       * This endpoint is the one place every service and every client meets:
-       * the five field apps (M&E, Cleaning, Landscape, Pest, Pool) all PATCH
-       * `/api/hygiene-area-checklist/...` with a `serviceType`, and the web
-       * checklist (`layer-common ManageChecklistMain`) posts here too. Requiring
-       * it here is what makes "the same process" true rather than five client
-       * guards that can drift apart — and a client guard alone is a suggestion.
-       *
-       * ONLY ON APPROVE. Completing a unit is the act the evidence is for.
-       * A REJECT is the technician reporting a problem, and demanding a
-       * photograph before somebody can report one would stop them reporting it.
-       * `decision` carries which is which.
-       *
-       * At least one entry, and each must be a real id — an empty array or a
-       * blank string would satisfy `.optional()` while carrying no evidence at
-       * all, which is the shape a client sends when its uploader failed.
+       * Shape only. WHETHER a photo is required depends on the set's current
+       * state in the database, which Joi cannot see — see the check below.
+       * Each entry must still be a real id: a blank string carries no evidence.
        */
-      attachment: import_joi9.default.array().items(import_joi9.default.string().trim().min(1)).when("decision", {
-        is: "approve",
-        then: import_joi9.default.array().min(1).required().messages({
-          "array.min": "A photo is required to complete this task. Take or upload at least one photo before marking it complete.",
-          "any.required": "A photo is required to complete this task. Take or upload at least one photo before marking it complete."
-        }),
-        otherwise: import_joi9.default.array().optional()
-      }),
+      attachment: import_joi9.default.array().items(import_joi9.default.string().trim().min(1)).optional(),
       completedBy: import_joi9.default.string().hex().required()
     });
     const { error } = validation.validate(payload);
@@ -5115,7 +5144,24 @@ function useAreaChecklistController() {
     }
     try {
       const { id, set, unit, decision: decision2, ...value } = payload;
-      await _updateAreaChecklistUnits(id, parseInt(set), unit, value);
+      const setNumber = parseInt(set);
+      if (decision2 === "approve") {
+        const { completesSet, hasEvidence } = await _readSetCompletionState(
+          id,
+          setNumber,
+          unit
+        );
+        if (requiresCompletionPhoto({
+          decision: decision2,
+          attachment: value.attachment,
+          completesSet,
+          hasEvidence
+        })) {
+          next(new import_node_server_utils20.BadRequestError(COMPLETION_PHOTO_MESSAGE));
+          return;
+        }
+      }
+      await _updateAreaChecklistUnits(id, setNumber, unit, value);
       res.json({ message: "Area checklist updated successfully." });
       return;
     } catch (error2) {