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

package/dist/index.mjs

@@ -843,21 +843,30 @@ function useHygieneDashboardController() {
 }
 
 // src/models/hygiene-area.model.ts
-import Joi2 from "joi";
+import Joi3 from "joi";
 import { ObjectId as ObjectId2 } from "mongodb";
 import { BadRequestError as BadRequestError3, logger as logger3 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType2 } from "@7365admin1/core";
-var areaSchema = Joi2.object({
-  site: Joi2.string().hex().required(),
-  serviceType: Joi2.string().valid(...Object.values(AppServiceType2)).required(),
-  name: Joi2.string().required(),
-  type: Joi2.string().valid(...allowedTypes).required(),
-  set: Joi2.number().min(0).optional(),
-  units: Joi2.array().items(
-    Joi2.object({
-      unit: Joi2.string().hex().required(),
-      name: Joi2.string().required()
-    }).optional()
+
+// src/utils/area-unit.util.ts
+import Joi2 from "joi";
+var areaUnitSchema = Joi2.object({
+  unit: Joi2.string().hex().required(),
+  name: Joi2.string().required()
+});
+function toAreaUnit(unit) {
+  return { unit: String(unit._id), name: unit.name };
+}
+
+// src/models/hygiene-area.model.ts
+var areaSchema = Joi3.object({
+  site: Joi3.string().hex().required(),
+  serviceType: Joi3.string().valid(...Object.values(AppServiceType2)).required(),
+  name: Joi3.string().required(),
+  type: Joi3.string().valid(...allowedTypes).required(),
+  set: Joi3.number().min(0).optional(),
+  units: Joi3.array().items(
+    areaUnitSchema.optional()
   ).min(1).unique("unit", { ignoreUndefined: true }).messages({
     "array.unique": "Duplicate area units are not allowed"
   })
@@ -1371,14 +1380,14 @@ import {
 } from "@7365admin1/node-server-utils";
 
 // src/models/hygiene-unit.model.ts
-import Joi3 from "joi";
+import Joi4 from "joi";
 import { ObjectId as ObjectId4 } from "mongodb";
 import { BadRequestError as BadRequestError5, logger as logger6 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType3 } from "@7365admin1/core";
-var unitSchema = Joi3.object({
-  site: Joi3.string().hex().required(),
-  serviceType: Joi3.string().valid(...Object.values(AppServiceType3)).required(),
-  name: Joi3.string().required()
+var unitSchema = Joi4.object({
+  site: Joi4.string().hex().required(),
+  serviceType: Joi4.string().valid(...Object.values(AppServiceType3)).required(),
+  name: Joi4.string().required()
 });
 function MUnit(value) {
   const { error } = unitSchema.validate(value);
@@ -1713,10 +1722,7 @@ function useAreaService() {
                   }
                 }
                 if (foundUnit) {
-                  areaUnits.push({
-                    unit: foundUnit._id,
-                    name: foundUnit.name
-                  });
+                  areaUnits.push(toAreaUnit(foundUnit));
                 }
               }
               if (areaUnits.length > 0) {
@@ -1813,7 +1819,7 @@ function useAreaService() {
 }
 
 // src/controllers/hygiene-area.controller.ts
-import Joi4 from "joi";
+import Joi5 from "joi";
 import { BadRequestError as BadRequestError8, logger as logger9 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType4 } from "@7365admin1/core";
 
@@ -1874,13 +1880,13 @@ function useAreaController() {
   }
   async function getAreas(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi4.object({
-      page: Joi4.number().min(1).optional().allow("", null),
-      limit: Joi4.number().min(1).optional().allow("", null),
-      search: Joi4.string().optional().allow("", null),
-      type: Joi4.string().valid("all", ...allowedTypes).optional().allow("", null),
-      site: Joi4.string().hex().required(),
-      serviceType: Joi4.string().valid(...Object.values(AppServiceType4)).required()
+    const validation = Joi5.object({
+      page: Joi5.number().min(1).optional().allow("", null),
+      limit: Joi5.number().min(1).optional().allow("", null),
+      search: Joi5.string().optional().allow("", null),
+      type: Joi5.string().valid("all", ...allowedTypes).optional().allow("", null),
+      site: Joi5.string().hex().required(),
+      serviceType: Joi5.string().valid(...Object.values(AppServiceType4)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1911,7 +1917,7 @@ function useAreaController() {
     }
   }
   async function getAreaById(req, res, next) {
-    const validation = Joi4.string().hex().required();
+    const validation = Joi5.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -1931,15 +1937,15 @@ function useAreaController() {
   }
   async function updateArea(req, res, next) {
     const payload = { id: req.params.id, ...req.body };
-    const schema = Joi4.object({
-      id: Joi4.string().hex().required(),
-      name: Joi4.string().optional().allow("", null),
-      type: Joi4.string().optional().allow("", null, ...allowedTypes),
-      set: Joi4.number().min(0).optional(),
-      units: Joi4.array().items(
-        Joi4.object({
-          unit: Joi4.string().hex().required(),
-          name: Joi4.string().required()
+    const schema = Joi5.object({
+      id: Joi5.string().hex().required(),
+      name: Joi5.string().optional().allow("", null),
+      type: Joi5.string().optional().allow("", null, ...allowedTypes),
+      set: Joi5.number().min(0).optional(),
+      units: Joi5.array().items(
+        Joi5.object({
+          unit: Joi5.string().hex().required(),
+          name: Joi5.string().required()
         }).required()
       ).min(1).unique("unit", { ignoreUndefined: true }).optional().messages({
         "array.unique": "Duplicate area units are not allowed"
@@ -1964,7 +1970,7 @@ function useAreaController() {
   }
   async function deleteArea(req, res, next) {
     const id = req.params.id;
-    const validation = Joi4.string().hex().required();
+    const validation = Joi5.string().hex().required();
     const { error, value } = validation.validate(id);
     if (error) {
       logger9.log({ level: "error", message: error.message });
@@ -1987,9 +1993,9 @@ function useAreaController() {
       return;
     }
     const query = { ...req.query, ...req.params };
-    const validation = Joi4.object({
-      site: Joi4.string().hex().required(),
-      serviceType: Joi4.string().valid(...Object.values(AppServiceType4)).required()
+    const validation = Joi5.object({
+      site: Joi5.string().hex().required(),
+      serviceType: Joi5.string().valid(...Object.values(AppServiceType4)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2010,9 +2016,9 @@ function useAreaController() {
   }
   async function exportAreas(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi4.object({
-      site: Joi4.string().hex().required(),
-      serviceType: Joi4.string().valid(...Object.values(AppServiceType4)).required()
+    const validation = Joi5.object({
+      site: Joi5.string().hex().required(),
+      serviceType: Joi5.string().valid(...Object.values(AppServiceType4)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2299,7 +2305,7 @@ function useUnitService() {
 }
 
 // src/controllers/hygiene-unit.controller.ts
-import Joi5 from "joi";
+import Joi6 from "joi";
 import { BadRequestError as BadRequestError10, logger as logger12 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType5 } from "@7365admin1/core";
 function useUnitController() {
@@ -2330,12 +2336,12 @@ function useUnitController() {
   }
   async function getUnits(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi5.object({
-      page: Joi5.number().min(1).optional().allow("", null),
-      limit: Joi5.number().min(1).optional().allow("", null),
-      search: Joi5.string().optional().allow("", null),
-      site: Joi5.string().hex().required(),
-      serviceType: Joi5.string().valid(...Object.values(AppServiceType5)).required()
+    const validation = Joi6.object({
+      page: Joi6.number().min(1).optional().allow("", null),
+      limit: Joi6.number().min(1).optional().allow("", null),
+      search: Joi6.string().optional().allow("", null),
+      site: Joi6.string().hex().required(),
+      serviceType: Joi6.string().valid(...Object.values(AppServiceType5)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -2366,9 +2372,9 @@ function useUnitController() {
   }
   async function updateUnit(req, res, next) {
     const payload = { id: req.params.id, ...req.body };
-    const validation = Joi5.object({
-      id: Joi5.string().hex().required(),
-      name: Joi5.string().required()
+    const validation = Joi6.object({
+      id: Joi6.string().hex().required(),
+      name: Joi6.string().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -2389,8 +2395,8 @@ function useUnitController() {
   }
   async function deleteUnit(req, res, next) {
     const id = req.params.id;
-    const validation = Joi5.object({
-      id: Joi5.string().hex().required()
+    const validation = Joi6.object({
+      id: Joi6.string().hex().required()
     });
     const { error, value } = validation.validate({ id });
     if (error) {
@@ -2414,9 +2420,9 @@ function useUnitController() {
       return;
     }
     const query = { ...req.query, ...req.params };
-    const validation = Joi5.object({
-      site: Joi5.string().hex().required(),
-      serviceType: Joi5.string().valid(...Object.values(AppServiceType5)).required()
+    const validation = Joi6.object({
+      site: Joi6.string().hex().required(),
+      serviceType: Joi6.string().valid(...Object.values(AppServiceType5)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2437,9 +2443,9 @@ function useUnitController() {
   }
   async function exportUnits(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi5.object({
-      site: Joi5.string().hex().required(),
-      serviceType: Joi5.string().valid(...Object.values(AppServiceType5)).required()
+    const validation = Joi6.object({
+      site: Joi6.string().hex().required(),
+      serviceType: Joi6.string().valid(...Object.values(AppServiceType5)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2482,15 +2488,15 @@ function useUnitController() {
 }
 
 // src/models/hygiene-parent-checklist.model.ts
-import Joi6 from "joi";
+import Joi7 from "joi";
 import { ObjectId as ObjectId6 } from "mongodb";
 import { BadRequestError as BadRequestError11, logger as logger13 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType6 } from "@7365admin1/core";
-var parentChecklistSchema = Joi6.object({
-  createdAt: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
-  site: Joi6.string().hex().required(),
-  serviceType: Joi6.string().valid(...Object.values(AppServiceType6)).required(),
-  dateStr: Joi6.string().optional().allow("", null)
+var parentChecklistSchema = Joi7.object({
+  createdAt: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
+  site: Joi7.string().hex().required(),
+  serviceType: Joi7.string().valid(...Object.values(AppServiceType6)).required(),
+  dateStr: Joi7.string().optional().allow("", null)
 });
 function MParentChecklist(value) {
   const { error } = parentChecklistSchema.validate(value);
@@ -3071,7 +3077,7 @@ function useParentChecklistRepo() {
 }
 
 // src/controllers/hygiene-parent-checklist.controller.ts
-import Joi7 from "joi";
+import Joi8 from "joi";
 import { BadRequestError as BadRequestError13, logger as logger15 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType8 } from "@7365admin1/core";
 function useParentChecklistController() {
@@ -3081,10 +3087,10 @@ function useParentChecklistController() {
   } = useParentChecklistRepo();
   async function createParentChecklist(req, res, next) {
     const payload = req.body;
-    const validation = Joi7.object({
-      createdAt: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
-      site: Joi7.string().hex().required(),
-      serviceType: Joi7.string().valid(...Object.values(AppServiceType8)).optional().allow("", null)
+    const validation = Joi8.object({
+      createdAt: Joi8.alternatives().try(Joi8.date(), Joi8.string()).optional().allow("", null),
+      site: Joi8.string().hex().required(),
+      serviceType: Joi8.string().valid(...Object.values(AppServiceType8)).optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -3104,15 +3110,15 @@ function useParentChecklistController() {
   }
   async function getAllParentChecklist(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi7.object({
-      page: Joi7.number().min(1).optional().allow("", null),
-      limit: Joi7.number().min(1).optional().allow("", null),
-      search: Joi7.string().optional().allow("", null),
-      site: Joi7.string().hex().required(),
-      serviceType: Joi7.string().valid(...Object.values(AppServiceType8)).required(),
-      startDate: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
-      endDate: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
-      status: Joi7.string().valid(...allowedStatus, "all").optional().allow("", null)
+    const validation = Joi8.object({
+      page: Joi8.number().min(1).optional().allow("", null),
+      limit: Joi8.number().min(1).optional().allow("", null),
+      search: Joi8.string().optional().allow("", null),
+      site: Joi8.string().hex().required(),
+      serviceType: Joi8.string().valid(...Object.values(AppServiceType8)).required(),
+      startDate: Joi8.alternatives().try(Joi8.date(), Joi8.string()).optional().allow("", null),
+      endDate: Joi8.alternatives().try(Joi8.date(), Joi8.string()).optional().allow("", null),
+      status: Joi8.string().valid(...allowedStatus, "all").optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -3154,28 +3160,28 @@ function useParentChecklistController() {
 }
 
 // src/models/hygiene-area-checklist.model.ts
-import Joi8 from "joi";
+import Joi9 from "joi";
 import { ObjectId as ObjectId8 } from "mongodb";
 import { BadRequestError as BadRequestError14, logger as logger16 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType9 } from "@7365admin1/core";
 var allowedChecklistStatus = ["open", "completed", "closed"];
-var areaChecklistSchema = Joi8.object({
-  schedule: Joi8.string().hex().required(),
-  serviceType: Joi8.string().valid(...Object.values(AppServiceType9)).required(),
-  area: Joi8.string().hex().required(),
-  name: Joi8.string().required(),
-  type: Joi8.string().valid(...allowedTypes).required(),
-  checklist: Joi8.array().items(
-    Joi8.object({
-      set: Joi8.number().min(0).required(),
-      units: Joi8.array().items(
-        Joi8.object({
-          unit: Joi8.string().hex().required(),
-          name: Joi8.string().required()
+var areaChecklistSchema = Joi9.object({
+  schedule: Joi9.string().hex().required(),
+  serviceType: Joi9.string().valid(...Object.values(AppServiceType9)).required(),
+  area: Joi9.string().hex().required(),
+  name: Joi9.string().required(),
+  type: Joi9.string().valid(...allowedTypes).required(),
+  checklist: Joi9.array().items(
+    Joi9.object({
+      set: Joi9.number().min(0).required(),
+      units: Joi9.array().items(
+        Joi9.object({
+          unit: Joi9.string().hex().required(),
+          name: Joi9.string().required()
         }).required()
       ).min(1).required(),
-      isScheduleTask: Joi8.boolean().optional().default(false),
-      scheduleTaskId: Joi8.string().hex().optional().allow(null)
+      isScheduleTask: Joi9.boolean().optional().default(false),
+      scheduleTaskId: Joi9.string().hex().optional().allow(null)
     }).required()
   ).optional().default([])
 });
@@ -3253,6 +3259,39 @@ import {
   useAtlas as useAtlas6,
   useCache as useCache5
 } from "@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 = useAtlas6.getDb();
   if (!db) {
@@ -3324,7 +3363,11 @@ function useAreaChecklistRepo() {
       const parentChecklistId = new ObjectId9(value.schedule);
       const areaId = new ObjectId9(value.area);
       const existingChecklist = await collection.findOne(
-        { schedule: parentChecklistId, area: areaId, serviceType: value.serviceType },
+        {
+          schedule: parentChecklistId,
+          area: areaId,
+          serviceType: value.serviceType
+        },
         { session }
       );
       if (existingChecklist) {
@@ -4080,6 +4123,21 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function readSetCompletionState(_id, set, unitId) {
+    try {
+      _id = new ObjectId9(_id);
+    } catch (error) {
+      throw new BadRequestError15("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 ObjectId9(_id);
@@ -4364,6 +4422,7 @@ function useAreaChecklistRepo() {
     updateAreaChecklist,
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
+    readSetCompletionState,
     getMaxSetNumberForArea,
     closeExpiredAreaChecklists,
     pushScheduleTaskSets,
@@ -4611,7 +4670,7 @@ function useAreaChecklistService() {
 }
 
 // src/controllers/hygiene-area-checklist.controller.ts
-import Joi9 from "joi";
+import Joi10 from "joi";
 import {
   BadRequestError as BadRequestError16,
   InternalServerError as InternalServerError7,
@@ -4839,7 +4898,8 @@ function useAreaChecklistController() {
     getAllAreaChecklist: _getAllAreaChecklist,
     getAreaChecklistHistory: _getAreaChecklistHistory,
     getAreaChecklistHistoryDetails: _getAreaChecklistHistoryDetails,
-    getAreaChecklistUnits: _getAreaChecklistUnits
+    getAreaChecklistUnits: _getAreaChecklistUnits,
+    readSetCompletionState: _readSetCompletionState
   } = useAreaChecklistRepo();
   const {
     createAreaChecklist: _createAreaChecklist,
@@ -4855,9 +4915,9 @@ function useAreaChecklistController() {
       site: req.params.site,
       schedule: req.params.schedule
     };
-    const validation = Joi9.object({
-      site: Joi9.string().hex().required(),
-      schedule: Joi9.string().hex().required()
+    const validation = Joi10.object({
+      site: Joi10.string().hex().required(),
+      schedule: Joi10.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -4877,14 +4937,14 @@ function useAreaChecklistController() {
   }
   async function getAllAreaChecklist(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi9.object({
-      page: Joi9.number().min(1).optional().allow("", null),
-      limit: Joi9.number().min(1).optional().allow("", null),
-      search: Joi9.string().optional().allow("", null),
-      type: Joi9.string().valid(...allowedTypes, "all").optional().allow("", null),
-      status: Joi9.string().valid(...allowedStatus, "all").optional().allow("", null),
-      schedule: Joi9.string().hex().required(),
-      serviceType: Joi9.string().valid(...Object.values(AppServiceType10)).required()
+    const validation = Joi10.object({
+      page: Joi10.number().min(1).optional().allow("", null),
+      limit: Joi10.number().min(1).optional().allow("", null),
+      search: Joi10.string().optional().allow("", null),
+      type: Joi10.string().valid(...allowedTypes, "all").optional().allow("", null),
+      status: Joi10.string().valid(...allowedStatus, "all").optional().allow("", null),
+      schedule: Joi10.string().hex().required(),
+      serviceType: Joi10.string().valid(...Object.values(AppServiceType10)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -4919,14 +4979,14 @@ function useAreaChecklistController() {
   }
   async function getAreaChecklistHistory(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi9.object({
-      page: Joi9.number().min(1).optional().allow("", null),
-      limit: Joi9.number().min(1).optional().allow("", null),
-      search: Joi9.string().optional().allow("", null),
-      type: Joi9.string().optional().allow("", ...allowedTypes),
-      schedule: Joi9.string().hex().required(),
-      status: Joi9.string().allow("", null, ...allowedStatus),
-      createdAt: Joi9.alternatives().try(Joi9.date(), Joi9.string()).optional().allow("", null)
+    const validation = Joi10.object({
+      page: Joi10.number().min(1).optional().allow("", null),
+      limit: Joi10.number().min(1).optional().allow("", null),
+      search: Joi10.string().optional().allow("", null),
+      type: Joi10.string().optional().allow("", ...allowedTypes),
+      schedule: Joi10.string().hex().required(),
+      status: Joi10.string().allow("", null, ...allowedStatus),
+      createdAt: Joi10.alternatives().try(Joi10.date(), Joi10.string()).optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -4960,7 +5020,7 @@ function useAreaChecklistController() {
     }
   }
   async function getAreaChecklistHistoryDetails(req, res, next) {
-    const validation = Joi9.string().hex().required();
+    const validation = Joi10.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -4980,12 +5040,12 @@ function useAreaChecklistController() {
   }
   async function getAreaChecklistUnits(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi9.object({
-      page: Joi9.number().min(1).optional().allow("", null),
-      limit: Joi9.number().min(1).optional().allow("", null),
-      search: Joi9.string().optional().allow("", null),
-      serviceType: Joi9.string().valid(...Object.values(AppServiceType10)).required(),
-      id: Joi9.string().hex().required()
+    const validation = Joi10.object({
+      page: Joi10.number().min(1).optional().allow("", null),
+      limit: Joi10.number().min(1).optional().allow("", null),
+      search: Joi10.string().optional().allow("", null),
+      serviceType: Joi10.string().valid(...Object.values(AppServiceType10)).required(),
+      id: Joi10.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5035,46 +5095,21 @@ function useAreaChecklistController() {
       ...decisionValues,
       completedBy
     };
-    const validation = Joi9.object({
-      id: Joi9.string().hex().required(),
-      set: Joi9.number().integer().min(1).required(),
-      unit: Joi9.string().hex().required(),
-      decision: Joi9.string().valid("approve", "reject").required(),
-      approve: Joi9.boolean().optional(),
-      reject: Joi9.boolean().optional(),
-      remarks: Joi9.string().optional().allow("", null),
+    const validation = Joi10.object({
+      id: Joi10.string().hex().required(),
+      set: Joi10.number().integer().min(1).required(),
+      unit: Joi10.string().hex().required(),
+      decision: Joi10.string().valid("approve", "reject").required(),
+      approve: Joi10.boolean().optional(),
+      reject: Joi10.boolean().optional(),
+      remarks: Joi10.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: Joi9.array().items(Joi9.string().trim().min(1)).when("decision", {
-        is: "approve",
-        then: Joi9.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: Joi9.array().optional()
-      }),
-      completedBy: Joi9.string().hex().required()
+      attachment: Joi10.array().items(Joi10.string().trim().min(1)).optional(),
+      completedBy: Joi10.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -5084,7 +5119,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 BadRequestError16(COMPLETION_PHOTO_MESSAGE));
+          return;
+        }
+      }
+      await _updateAreaChecklistUnits(id, setNumber, unit, value);
       res.json({ message: "Area checklist updated successfully." });
       return;
     } catch (error2) {
@@ -5094,7 +5146,7 @@ function useAreaChecklistController() {
     }
   }
   async function downloadChecklistPdf(req, res, next) {
-    const validation = Joi9.string().hex().required();
+    const validation = Joi10.string().hex().required();
     const schedule = req.params.schedule;
     const { error, value } = validation.validate(schedule);
     if (error) {
@@ -5140,16 +5192,16 @@ function useAreaChecklistController() {
 }
 
 // src/models/hygiene-supply.model.ts
-import Joi10 from "joi";
+import Joi11 from "joi";
 import { ObjectId as ObjectId12 } from "mongodb";
 import { BadRequestError as BadRequestError17, logger as logger21 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType11 } from "@7365admin1/core";
-var supplySchema = Joi10.object({
-  site: Joi10.string().hex().required(),
-  serviceType: Joi10.string().valid(...Object.values(AppServiceType11)).required(),
-  name: Joi10.string().required(),
-  unitOfMeasurement: Joi10.string().required(),
-  attachment: Joi10.string().allow(null, "").optional()
+var supplySchema = Joi11.object({
+  site: Joi11.string().hex().required(),
+  serviceType: Joi11.string().valid(...Object.values(AppServiceType11)).required(),
+  name: Joi11.string().required(),
+  unitOfMeasurement: Joi11.string().required(),
+  attachment: Joi11.string().allow(null, "").optional()
 });
 function MSupply(value) {
   const { error } = supplySchema.validate(value);
@@ -5448,7 +5500,7 @@ function useSupplyRepository() {
 }
 
 // src/controllers/hygiene-supply.controller.ts
-import Joi11 from "joi";
+import Joi12 from "joi";
 import { BadRequestError as BadRequestError19, logger as logger23 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType12 } from "@7365admin1/core";
 function useSupplyController() {
@@ -5479,12 +5531,12 @@ function useSupplyController() {
   }
   async function getSupplies(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi11.object({
-      page: Joi11.number().min(1).optional().allow("", null),
-      limit: Joi11.number().min(1).optional().allow("", null),
-      search: Joi11.string().optional().allow("", null),
-      site: Joi11.string().hex().required(),
-      serviceType: Joi11.string().valid(...Object.values(AppServiceType12)).required()
+    const validation = Joi12.object({
+      page: Joi12.number().min(1).optional().allow("", null),
+      limit: Joi12.number().min(1).optional().allow("", null),
+      search: Joi12.string().optional().allow("", null),
+      site: Joi12.string().hex().required(),
+      serviceType: Joi12.string().valid(...Object.values(AppServiceType12)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5514,7 +5566,7 @@ function useSupplyController() {
     }
   }
   async function getSupplyById(req, res, next) {
-    const validation = Joi11.string().hex().required();
+    const validation = Joi12.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -5534,12 +5586,12 @@ function useSupplyController() {
   }
   async function updateSupply(req, res, next) {
     const payload = { id: req.params.id, ...req.body };
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required(),
-      name: Joi11.string().optional().allow("", null),
-      unitOfMeasurement: Joi11.string().optional().allow("", null),
-      qty: Joi11.number().min(0).optional().allow("", null),
-      attachment: Joi11.string().optional().allow("", null)
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required(),
+      name: Joi12.string().optional().allow("", null),
+      unitOfMeasurement: Joi12.string().optional().allow("", null),
+      qty: Joi12.number().min(0).optional().allow("", null),
+      attachment: Joi12.string().optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -5560,7 +5612,7 @@ function useSupplyController() {
   }
   async function deleteSupply(req, res, next) {
     const id = req.params.id;
-    const validation = Joi11.string().hex().required();
+    const validation = Joi12.string().hex().required();
     const { error, value } = validation.validate(id);
     if (error) {
       logger23.log({ level: "error", message: error.message });
@@ -5587,18 +5639,18 @@ function useSupplyController() {
 }
 
 // src/models/hygiene-stock.model.ts
-import Joi12 from "joi";
+import Joi13 from "joi";
 import { ObjectId as ObjectId14 } from "mongodb";
 import { BadRequestError as BadRequestError20, logger as logger24 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType13 } from "@7365admin1/core";
-var stockSchema = Joi12.object({
-  site: Joi12.string().hex().required(),
-  serviceType: Joi12.string().valid(...Object.values(AppServiceType13)).required(),
-  supply: Joi12.string().hex().required(),
-  in: Joi12.number().min(0).optional(),
-  out: Joi12.number().min(0).optional(),
-  balance: Joi12.number().min(0).required(),
-  remarks: Joi12.string().optional().allow("", null)
+var stockSchema = Joi13.object({
+  site: Joi13.string().hex().required(),
+  serviceType: Joi13.string().valid(...Object.values(AppServiceType13)).required(),
+  supply: Joi13.string().hex().required(),
+  in: Joi13.number().min(0).optional(),
+  out: Joi13.number().min(0).optional(),
+  balance: Joi13.number().min(0).required(),
+  remarks: Joi13.string().optional().allow("", null)
 });
 function MStock(value) {
   const { error } = stockSchema.validate(value);
@@ -5825,7 +5877,7 @@ function useStockService() {
 }
 
 // src/controllers/hygiene-stock.controller.ts
-import Joi13 from "joi";
+import Joi14 from "joi";
 import { BadRequestError as BadRequestError23, logger as logger26 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType14 } from "@7365admin1/core";
 function useStockController() {
@@ -5833,12 +5885,12 @@ function useStockController() {
   const { createStock: _createStock } = useStockService();
   async function createStock(req, res, next) {
     const payload = { ...req.body, ...req.params };
-    const validation = Joi13.object({
-      site: Joi13.string().hex().required(),
-      serviceType: Joi13.string().valid(...Object.values(AppServiceType14)).required(),
-      supply: Joi13.string().hex().required(),
-      qty: Joi13.number().min(0).required(),
-      remarks: Joi13.string().optional().allow("", null)
+    const validation = Joi14.object({
+      site: Joi14.string().hex().required(),
+      serviceType: Joi14.string().valid(...Object.values(AppServiceType14)).required(),
+      supply: Joi14.string().hex().required(),
+      qty: Joi14.number().min(0).required(),
+      remarks: Joi14.string().optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -5858,13 +5910,13 @@ function useStockController() {
   }
   async function getStocksBySupplyId(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi13.object({
-      page: Joi13.number().min(1).optional().allow("", null),
-      limit: Joi13.number().min(1).optional().allow("", null),
-      search: Joi13.string().optional().allow("", null),
-      site: Joi13.string().hex().required(),
-      serviceType: Joi13.string().valid(...Object.values(AppServiceType14)).required(),
-      supply: Joi13.string().hex().required()
+    const validation = Joi14.object({
+      page: Joi14.number().min(1).optional().allow("", null),
+      limit: Joi14.number().min(1).optional().allow("", null),
+      search: Joi14.string().optional().allow("", null),
+      site: Joi14.string().hex().required(),
+      serviceType: Joi14.string().valid(...Object.values(AppServiceType14)).required(),
+      supply: Joi14.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5926,21 +5978,21 @@ async function applyCheckOutDecision(decision, decide, returnStock) {
 }
 
 // src/models/hygiene-checkout-item.model.ts
-import Joi14 from "joi";
+import Joi15 from "joi";
 import { ObjectId as ObjectId16 } from "mongodb";
 import { BadRequestError as BadRequestError24, logger as logger27 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType15 } from "@7365admin1/core";
 var allowedCheckOutItemStatus = ["pending", "completed"];
-var checkOutItemSchema = Joi14.object({
-  site: Joi14.string().hex().required(),
-  serviceType: Joi14.string().valid(...Object.values(AppServiceType15)).required(),
-  supply: Joi14.string().hex().required(),
-  supplyName: Joi14.string().required(),
-  supplyQty: Joi14.number().min(0).required(),
-  qty: Joi14.number().min(0).required(),
-  attachment: Joi14.array().items(Joi14.string()).optional().allow(null),
-  createdBy: Joi14.string().hex().required(),
-  createdByName: Joi14.string().required()
+var checkOutItemSchema = Joi15.object({
+  site: Joi15.string().hex().required(),
+  serviceType: Joi15.string().valid(...Object.values(AppServiceType15)).required(),
+  supply: Joi15.string().hex().required(),
+  supplyName: Joi15.string().required(),
+  supplyQty: Joi15.number().min(0).required(),
+  qty: Joi15.number().min(0).required(),
+  attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
+  createdBy: Joi15.string().hex().required(),
+  createdByName: Joi15.string().required()
 });
 function MCheckOutItem(value) {
   const { error } = checkOutItemSchema.validate(value);
@@ -6429,7 +6481,7 @@ function useCheckOutItemService() {
 }
 
 // src/controllers/hygiene-checkout-item.controller.ts
-import Joi15 from "joi";
+import Joi16 from "joi";
 import { BadRequestError as BadRequestError27, logger as logger29 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType16 } from "@7365admin1/core";
 function useCheckOutItemController() {
@@ -6453,13 +6505,13 @@ function useCheckOutItemController() {
       ...req.params,
       createdBy
     };
-    const validation = Joi15.object({
-      site: Joi15.string().hex().required(),
-      serviceType: Joi15.string().valid(...Object.values(AppServiceType16)).required(),
-      supply: Joi15.string().hex().required(),
-      qty: Joi15.number().min(0).required(),
-      attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
-      createdBy: Joi15.string().hex().required()
+    const validation = Joi16.object({
+      site: Joi16.string().hex().required(),
+      serviceType: Joi16.string().valid(...Object.values(AppServiceType16)).required(),
+      supply: Joi16.string().hex().required(),
+      qty: Joi16.number().min(0).required(),
+      attachment: Joi16.array().items(Joi16.string()).optional().allow(null),
+      createdBy: Joi16.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -6488,15 +6540,15 @@ function useCheckOutItemController() {
       ...req.params,
       createdBy
     };
-    const validation = Joi15.object({
-      site: Joi15.string().hex().required(),
-      serviceType: Joi15.string().valid(...Object.values(AppServiceType16)).required(),
-      createdBy: Joi15.string().hex().required(),
-      items: Joi15.array().items(
-        Joi15.object({
-          supply: Joi15.string().hex().required(),
-          qty: Joi15.number().min(0).required(),
-          attachment: Joi15.array().items(Joi15.string()).optional().allow(null)
+    const validation = Joi16.object({
+      site: Joi16.string().hex().required(),
+      serviceType: Joi16.string().valid(...Object.values(AppServiceType16)).required(),
+      createdBy: Joi16.string().hex().required(),
+      items: Joi16.array().items(
+        Joi16.object({
+          supply: Joi16.string().hex().required(),
+          qty: Joi16.number().min(0).required(),
+          attachment: Joi16.array().items(Joi16.string()).optional().allow(null)
         })
       ).min(1).required()
     });
@@ -6518,12 +6570,12 @@ function useCheckOutItemController() {
   }
   async function getCheckOutItems(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi15.object({
-      page: Joi15.number().min(1).optional().allow("", null),
-      limit: Joi15.number().min(1).optional().allow("", null),
-      search: Joi15.string().optional().allow("", null),
-      site: Joi15.string().hex().required(),
-      serviceType: Joi15.string().valid(...Object.values(AppServiceType16)).required()
+    const validation = Joi16.object({
+      page: Joi16.number().min(1).optional().allow("", null),
+      limit: Joi16.number().min(1).optional().allow("", null),
+      search: Joi16.string().optional().allow("", null),
+      site: Joi16.string().hex().required(),
+      serviceType: Joi16.string().valid(...Object.values(AppServiceType16)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -6553,7 +6605,7 @@ function useCheckOutItemController() {
     }
   }
   async function getCheckOutItemById(req, res, next) {
-    const validation = Joi15.string().hex().required();
+    const validation = Joi16.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -6592,13 +6644,13 @@ function useCheckOutItemController() {
       ...decisionValues,
       completedBy
     };
-    const validation = Joi15.object({
-      id: Joi15.string().hex().required(),
-      decision: Joi15.string().valid("approve", "disapprove").required(),
-      approve: Joi15.boolean().required(),
-      reject: Joi15.boolean().required(),
-      remarks: Joi15.string().optional().allow("", null),
-      completedBy: Joi15.string().hex().required()
+    const validation = Joi16.object({
+      id: Joi16.string().hex().required(),
+      decision: Joi16.string().valid("approve", "disapprove").required(),
+      approve: Joi16.boolean().required(),
+      reject: Joi16.boolean().required(),
+      remarks: Joi16.string().optional().allow("", null),
+      completedBy: Joi16.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -6631,21 +6683,21 @@ function useCheckOutItemController() {
 // src/models/hygiene-schedule-task.model.ts
 import { BadRequestError as BadRequestError28, logger as logger30 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType17 } from "@7365admin1/core";
-import Joi16 from "joi";
+import Joi17 from "joi";
 import { ObjectId as ObjectId18 } from "mongodb";
-var scheduleTaskSchema = Joi16.object({
-  site: Joi16.string().hex().required(),
-  serviceType: Joi16.string().valid(...Object.values(AppServiceType17)).required(),
-  title: Joi16.string().required(),
-  time: Joi16.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
-  dates: Joi16.array().min(1).items(
-    Joi16.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
+var scheduleTaskSchema = Joi17.object({
+  site: Joi17.string().hex().required(),
+  serviceType: Joi17.string().valid(...Object.values(AppServiceType17)).required(),
+  title: Joi17.string().required(),
+  time: Joi17.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
+  dates: Joi17.array().min(1).items(
+    Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
   ).required(),
-  description: Joi16.string().optional().allow("", null),
-  areas: Joi16.array().min(1).items(
-    Joi16.object({
-      name: Joi16.string().required(),
-      value: Joi16.any().required()
+  description: Joi17.string().optional().allow("", null),
+  areas: Joi17.array().min(1).items(
+    Joi17.object({
+      name: Joi17.string().required(),
+      value: Joi17.any().required()
     })
   ).required()
 });
@@ -7249,7 +7301,7 @@ function useScheduleTaskService() {
 }
 
 // src/controllers/hygiene-schedule-task.controller.ts
-import Joi17 from "joi";
+import Joi18 from "joi";
 import { BadRequestError as BadRequestError30, logger as logger33 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType18 } from "@7365admin1/core";
 function useScheduleTaskController() {
@@ -7280,12 +7332,12 @@ function useScheduleTaskController() {
   }
   async function getScheduleTasks(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi17.object({
-      page: Joi17.number().min(1).optional().allow("", null),
-      limit: Joi17.number().min(1).optional().allow("", null),
-      search: Joi17.string().optional().allow("", null),
-      site: Joi17.string().hex().required(),
-      serviceType: Joi17.string().valid(...Object.values(AppServiceType18)).required()
+    const validation = Joi18.object({
+      page: Joi18.number().min(1).optional().allow("", null),
+      limit: Joi18.number().min(1).optional().allow("", null),
+      search: Joi18.string().optional().allow("", null),
+      site: Joi18.string().hex().required(),
+      serviceType: Joi18.string().valid(...Object.values(AppServiceType18)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -7315,7 +7367,7 @@ function useScheduleTaskController() {
     }
   }
   async function getScheduleTaskById(req, res, next) {
-    const validation = Joi17.string().hex().required();
+    const validation = Joi18.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -7335,18 +7387,18 @@ function useScheduleTaskController() {
   }
   async function updateScheduleTask(req, res, next) {
     const payload = { id: req.params.id, ...req.body };
-    const validation = Joi17.object({
-      id: Joi17.string().hex().required(),
-      title: Joi17.string().optional().allow("", null),
-      time: Joi17.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
-      dates: Joi17.array().min(1).items(
-        Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
+    const validation = Joi18.object({
+      id: Joi18.string().hex().required(),
+      title: Joi18.string().optional().allow("", null),
+      time: Joi18.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
+      dates: Joi18.array().min(1).items(
+        Joi18.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
       ).optional(),
-      description: Joi17.string().optional().allow("", null),
-      areas: Joi17.array().min(1).items(
-        Joi17.object({
-          name: Joi17.string().required(),
-          value: Joi17.any().required()
+      description: Joi18.string().optional().allow("", null),
+      areas: Joi18.array().min(1).items(
+        Joi18.object({
+          name: Joi18.string().required(),
+          value: Joi18.any().required()
         })
       ).optional()
     });
@@ -7368,7 +7420,7 @@ function useScheduleTaskController() {
     }
   }
   async function deleteScheduleTask(req, res, next) {
-    const validation = Joi17.string().hex().required();
+    const validation = Joi18.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -7612,17 +7664,17 @@ function useQRService() {
 }
 
 // src/controllers/hygiene-qr.controller.ts
-import Joi18 from "joi";
+import Joi19 from "joi";
 import { BadRequestError as BadRequestError31, logger as logger35 } from "@7365admin1/node-server-utils";
 function useQRController() {
   const { generateQRImage: _generateQRImage, generateQRPDF: _generateQRPDF } = useQRService();
   async function generateQR(req, res, next) {
-    const validation = Joi18.object({
-      url: Joi18.string().uri().required(),
-      filename: Joi18.string().optional().allow("", null),
-      title: Joi18.string().optional().allow("", null),
-      subtitle: Joi18.string().optional().allow("", null),
-      download: Joi18.boolean().optional().default(false)
+    const validation = Joi19.object({
+      url: Joi19.string().uri().required(),
+      filename: Joi19.string().optional().allow("", null),
+      title: Joi19.string().optional().allow("", null),
+      subtitle: Joi19.string().optional().allow("", null),
+      download: Joi19.boolean().optional().default(false)
     });
     const query = { ...req.query };
     const { error, value } = validation.validate(query);