@7365admin1/module-hygiene 4.9.0 → 4.11.0

package/dist/index.mjs

@@ -2651,7 +2651,12 @@ function MAreaChecklist(value) {
 }
 
 // src/services/hygiene-area-checklist.service.ts
-import { logger as logger18, useAtlas as useAtlas7 } from "@7365admin1/node-server-utils";
+import {
+  logger as logger18,
+  UnauthorizedError,
+  useAtlas as useAtlas7
+} from "@7365admin1/node-server-utils";
+import { useUserRepo } from "@7365admin1/core";
 
 // src/repositories/hygiene-area-checklist.repository.ts
 import { ObjectId as ObjectId9 } from "mongodb";
@@ -2808,6 +2813,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,
@@ -2847,7 +2868,6 @@ function useAreaChecklistRepo() {
             createdByName: "$createdByDoc.name"
           }
         },
-        { $sort: { _id: -1 } },
         { $skip: page * limit },
         { $limit: limit }
       ];
@@ -3177,7 +3197,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
+              }
+            }
           }
         },
         {
@@ -3206,7 +3238,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,
@@ -3217,6 +3256,7 @@ function useAreaChecklistRepo() {
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
             reject: "$checklist.units.reject",
+            timestamp: "$checklist.units.timestamp",
             status: {
               $switch: {
                 branches: [
@@ -3251,6 +3291,7 @@ function useAreaChecklistRepo() {
                 name: "$name",
                 approve: "$approve",
                 reject: "$reject",
+                timestamp: "$timestamp",
                 status: "$status",
                 remarks: "$remarks",
                 completedByName: "$completedByName"
@@ -3268,7 +3309,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 }
       ];
@@ -3472,6 +3531,20 @@ function useAreaChecklistRepo() {
       throw error;
     }
   }
+  async function getAreaChecklistSetOwner(_id, set, session) {
+    try {
+      _id = new ObjectId9(_id);
+    } catch (error) {
+      throw new BadRequestError15("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 ObjectId9(areaId);
@@ -3535,6 +3608,7 @@ function useAreaChecklistRepo() {
     getAreaChecklistUnits,
     getAreaChecklistById,
     getAreaChecklistByAreaAndSchedule,
+    getAreaChecklistSetOwner,
     updateAreaChecklist,
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
@@ -3551,11 +3625,13 @@ function useAreaChecklistService() {
     getAllAreaChecklist,
     getAreaChecklistUnits,
     getAreaChecklistById,
+    getAreaChecklistSetOwner,
     updateAreaChecklistUnits: _updateAreaChecklistUnits,
     updateAreaChecklistStatus,
     getMaxSetNumberForArea
   } = useAreaChecklistRepo();
   const { updateParentChecklistStatuses } = useParentChecklistRepo();
+  const { getUserById } = useUserRepo();
   async function createAreaChecklist(value) {
     const session = useAtlas7.getClient()?.startSession();
     try {
@@ -3626,6 +3702,13 @@ function useAreaChecklistService() {
     const session = useAtlas7.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 UnauthorizedError(
+          `${acceptedBy.name} has already taken this set.`
+        );
+      }
       await _updateAreaChecklistUnits(_id, set, unitId, value, session);
       const allUnitsResult = await getAreaChecklistUnits(
         {
@@ -5223,7 +5306,7 @@ function useCheckOutItemRepository() {
 }
 
 // src/services/hygiene-checkout-item.service.ts
-import { useUserRepo } from "@7365admin1/core";
+import { useUserRepo as useUserRepo2 } from "@7365admin1/core";
 import { BadRequestError as BadRequestError26, useAtlas as useAtlas13 } from "@7365admin1/node-server-utils";
 function useCheckOutItemService() {
   const {
@@ -5232,7 +5315,7 @@ function useCheckOutItemService() {
     completeCheckOutItem
   } = useCheckOutItemRepository();
   const { getSupplyById } = useSupplyRepository();
-  const { getUserById } = useUserRepo();
+  const { getUserById } = useUserRepo2();
   const { createStock } = useStockService();
   async function createCheckOutItem(value) {
     const session = useAtlas13.getClient()?.startSession();