@7365admin1/module-hygiene 4.9.0 → 4.11.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @7365admin1/module-hygiene
 
+## 4.11.0
+
+### Minor Changes
+
+- Update Hygiene App Enhancements
+
+## 4.10.0
+
+### Minor Changes
+
+- Update Hygiene App Enhancements
+
 ## 4.9.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -317,6 +317,7 @@ declare function useAreaChecklistRepo(): {
     }, session?: ClientSession) => Promise<{}>;
     getAreaChecklistById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
     getAreaChecklistByAreaAndSchedule: (schedule: string | ObjectId, area: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
+    getAreaChecklistSetOwner: (_id: string | ObjectId, set: number, session?: ClientSession) => Promise<any>;
     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>;

package/dist/index.js

@@ -2695,6 +2695,7 @@ function MAreaChecklist(value) {
 
 // src/services/hygiene-area-checklist.service.ts
 var import_node_server_utils18 = require("@7365admin1/node-server-utils");
+var import_core = require("@7365admin1/core");
 
 // src/repositories/hygiene-area-checklist.repository.ts
 var import_mongodb9 = require("mongodb");
@@ -2843,6 +2844,22 @@ function useAreaChecklistRepo() {
             preserveNullAndEmptyArrays: true
           }
         },
+        {
+          $addFields: {
+            statusOrder: {
+              $switch: {
+                branches: [
+                  { case: { $eq: ["$status", "open"] }, then: 0 },
+                  { case: { $eq: ["$status", "ongoing"] }, then: 1 },
+                  { case: { $eq: ["$status", "completed"] }, then: 3 },
+                  { case: { $eq: ["$status", "closed"] }, then: 4 }
+                ],
+                default: 2
+              }
+            }
+          }
+        },
+        { $sort: { statusOrder: 1, _id: -1 } },
         {
           $project: {
             name: 1,
@@ -2882,7 +2899,6 @@ function useAreaChecklistRepo() {
             createdByName: "$createdByDoc.name"
           }
         },
-        { $sort: { _id: -1 } },
         { $skip: page * limit },
         { $limit: limit }
       ];
@@ -3212,7 +3228,19 @@ function useAreaChecklistRepo() {
         },
         {
           $addFields: {
-            isCompleted: { $ne: ["$checklist.units.completedBy", ""] }
+            isCompleted: { $ne: ["$checklist.units.completedBy", ""] },
+            isActioned: {
+              $cond: {
+                if: {
+                  $or: [
+                    { $eq: ["$checklist.units.approve", true] },
+                    { $eq: ["$checklist.units.reject", true] }
+                  ]
+                },
+                then: 1,
+                else: 0
+              }
+            }
           }
         },
         {
@@ -3241,7 +3269,14 @@ function useAreaChecklistRepo() {
             preserveNullAndEmptyArrays: true
           }
         },
-        { $sort: { set: 1, isCompleted: -1, "checklist.units.timestamp": 1 } },
+        {
+          $sort: {
+            set: 1,
+            isActioned: 1,
+            "checklist.units.timestamp": 1,
+            isCompleted: -1
+          }
+        },
         {
           $project: {
             _id: 0,
@@ -3252,6 +3287,7 @@ function useAreaChecklistRepo() {
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
             reject: "$checklist.units.reject",
+            timestamp: "$checklist.units.timestamp",
             status: {
               $switch: {
                 branches: [
@@ -3286,6 +3322,7 @@ function useAreaChecklistRepo() {
                 name: "$name",
                 approve: "$approve",
                 reject: "$reject",
+                timestamp: "$timestamp",
                 status: "$status",
                 remarks: "$remarks",
                 completedByName: "$completedByName"
@@ -3303,7 +3340,25 @@ function useAreaChecklistRepo() {
             units: 1
           }
         },
-        { $sort: { set: 1 } },
+        {
+          $addFields: {
+            isFullyActioned: {
+              $allElementsTrue: {
+                $map: {
+                  input: "$units",
+                  as: "u",
+                  in: {
+                    $or: [
+                      { $eq: ["$$u.approve", true] },
+                      { $eq: ["$$u.reject", true] }
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        },
+        { $sort: { isFullyActioned: 1 } },
         { $skip: page * limit },
         { $limit: limit }
       ];
@@ -3507,6 +3562,20 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function getAreaChecklistSetOwner(_id, set, session) {
+    try {
+      _id = new import_mongodb9.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils17.BadRequestError("Invalid area checklist ID format.");
+    }
+    const existing = await collection.findOne(
+      { _id, "checklist.set": set },
+      { projection: { "checklist.$": 1 }, session }
+    );
+    if (!existing?.checklist?.length)
+      return null;
+    return existing.checklist[0].units.map((u) => u.completedBy).find((cb) => cb && cb.toString() !== "") ?? null;
+  }
   async function getMaxSetNumberForArea(areaId, session) {
     try {
       const _id = new import_mongodb9.ObjectId(areaId);
@@ -3570,6 +3639,7 @@ function useAreaChecklistRepo() {
     getAreaChecklistUnits,
     getAreaChecklistById,
     getAreaChecklistByAreaAndSchedule,
+    getAreaChecklistSetOwner,
     updateAreaChecklist,
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
@@ -3586,11 +3656,13 @@ function useAreaChecklistService() {
     getAllAreaChecklist,
     getAreaChecklistUnits,
     getAreaChecklistById,
+    getAreaChecklistSetOwner,
     updateAreaChecklistUnits: _updateAreaChecklistUnits,
     updateAreaChecklistStatus,
     getMaxSetNumberForArea
   } = useAreaChecklistRepo();
   const { updateParentChecklistStatuses } = useParentChecklistRepo();
+  const { getUserById } = (0, import_core.useUserRepo)();
   async function createAreaChecklist(value) {
     const session = import_node_server_utils18.useAtlas.getClient()?.startSession();
     try {
@@ -3661,6 +3733,13 @@ function useAreaChecklistService() {
     const session = import_node_server_utils18.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
+      const setOwner = await getAreaChecklistSetOwner(_id, set, session);
+      if (setOwner && value.completedBy && setOwner.toString() !== value.completedBy.toString()) {
+        const acceptedBy = await getUserById(setOwner.toString());
+        throw new import_node_server_utils18.UnauthorizedError(
+          `${acceptedBy.name} has already taken this set.`
+        );
+      }
       await _updateAreaChecklistUnits(_id, set, unitId, value, session);
       const allUnitsResult = await getAreaChecklistUnits(
         {
@@ -5228,7 +5307,7 @@ function useCheckOutItemRepository() {
 }
 
 // src/services/hygiene-checkout-item.service.ts
-var import_core = require("@7365admin1/core");
+var import_core2 = require("@7365admin1/core");
 var import_node_server_utils30 = require("@7365admin1/node-server-utils");
 function useCheckOutItemService() {
   const {
@@ -5237,7 +5316,7 @@ function useCheckOutItemService() {
     completeCheckOutItem
   } = useCheckOutItemRepository();
   const { getSupplyById } = useSupplyRepository();
-  const { getUserById } = (0, import_core.useUserRepo)();
+  const { getUserById } = (0, import_core2.useUserRepo)();
   const { createStock } = useStockService();
   async function createCheckOutItem(value) {
     const session = import_node_server_utils30.useAtlas.getClient()?.startSession();