@7365admin1/module-hygiene 4.27.2-staging.3 → 4.27.2-staging.5

package/dist/index.mjs

@@ -3284,7 +3284,19 @@ function useAreaChecklistRepo() {
   }
   async function createUniqueIndex() {
     try {
-      await collection.createIndex({ schedule: 1, area: 1 }, { unique: true });
+      await collection.createIndex(
+        { schedule: 1, area: 1, serviceType: 1 },
+        { unique: true }
+      );
+      const legacyIndex = (await collection.indexes()).find((index) => {
+        return index.unique === true && JSON.stringify(index.key) === JSON.stringify({ schedule: 1, area: 1 });
+      });
+      if (legacyIndex?.name) {
+        await collection.dropIndex(legacyIndex.name);
+        logger17.info(
+          `Dropped legacy hygiene area checklist unique index: ${legacyIndex.name}`
+        );
+      }
     } catch (error) {
       throw new InternalServerError5(
         "Failed to create unique index on hygiene checklist area."
@@ -3296,7 +3308,7 @@ function useAreaChecklistRepo() {
       const parentChecklistId = new ObjectId9(value.schedule);
       const areaId = new ObjectId9(value.area);
       const existingChecklist = await collection.findOne(
-        { schedule: parentChecklistId, area: areaId },
+        { schedule: parentChecklistId, area: areaId, serviceType: value.serviceType },
         { session }
       );
       if (existingChecklist) {
@@ -3314,7 +3326,8 @@ function useAreaChecklistRepo() {
         logger17.info(`Duplicate area checklist skipped for area ${value.name}`);
         const existing = await collection.findOne({
           schedule: new ObjectId9(value.schedule),
-          area: new ObjectId9(value.area)
+          area: new ObjectId9(value.area),
+          serviceType: value.serviceType
         });
         return existing._id;
       }
@@ -5163,9 +5176,18 @@ function useSupplyRepository() {
   async function createUniqueIndex() {
     try {
       await collection.createIndex(
-        { site: 1, name: 1, deletedAt: 1 },
+        { site: 1, serviceType: 1, name: 1, deletedAt: 1 },
         { unique: true }
       );
+      const legacyIndex = (await collection.indexes()).find((index) => {
+        return index.unique === true && JSON.stringify(index.key) === JSON.stringify({ site: 1, name: 1, deletedAt: 1 });
+      });
+      if (legacyIndex?.name) {
+        await collection.dropIndex(legacyIndex.name);
+        logger22.info(
+          `Dropped legacy hygiene supply unique index: ${legacyIndex.name}`
+        );
+      }
     } catch (error) {
       throw new InternalServerError8(
         "Failed to create unique index on hygiene supply."
@@ -5844,6 +5866,7 @@ var checkOutItemSchema = Joi14.object({
   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(),
@@ -5874,6 +5897,7 @@ function MCheckOutItem(value) {
     serviceType: value.serviceType,
     supply: value.supply,
     supplyName: value.supplyName,
+    supplyQty: value.supplyQty,
     qty: value.qty,
     attachment: value.attachment || [],
     createdBy: value.createdBy,
@@ -5987,32 +6011,6 @@ function useCheckOutItemRepository() {
     try {
       const items = await collection.aggregate([
         { $match: query },
-        {
-          $lookup: {
-            from: "site.supplies",
-            let: { supplyId: "$supply" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: {
-                    $and: [
-                      { $ne: ["$$supplyId", ""] },
-                      { $eq: ["$_id", "$$supplyId"] }
-                    ]
-                  }
-                }
-              },
-              { $project: { qty: 1 } }
-            ],
-            as: "supplyDoc"
-          }
-        },
-        {
-          $unwind: {
-            path: "$supplyDoc",
-            preserveNullAndEmptyArrays: true
-          }
-        },
         {
           $lookup: {
             from: "users",
@@ -6039,7 +6037,7 @@ function useCheckOutItemRepository() {
         {
           $project: {
             supplyName: 1,
-            supplyQty: "$supplyDoc.qty",
+            supplyQty: 1,
             checkOutByName: "$createdByName",
             profile: "$createdByDoc.profile",
             checkOutQty: "$qty",
@@ -6109,7 +6107,7 @@ function useCheckOutItemRepository() {
               qty: 1,
               status: 1,
               unitOfMeasurement: "$supplyDetails.unitOfMeasurement",
-              stockQty: "$supplyDetails.qty",
+              stockQty: "$supplyQty",
               attachment: 1
             }
           }
@@ -6193,6 +6191,7 @@ function useCheckOutItemService() {
         {
           ...value,
           supplyName: supplyData?.name || "",
+          supplyQty: Math.max((supplyData?.qty || 0) - value.qty, 0),
           createdByName: createdByData?.name || ""
         },
         session
@@ -6239,6 +6238,7 @@ function useCheckOutItemService() {
             serviceType,
             supply: item.supply,
             supplyName: supplyData?.name || "",
+            supplyQty: Math.max((supplyData?.qty || 0) - item.qty, 0),
             qty: item.qty,
             attachment: item.attachment,
             createdBy,