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

package/dist/index.d.ts

@@ -519,6 +519,7 @@ type TCheckOutItem = {
     serviceType: TAppServiceType;
     supply: string | ObjectId;
     supplyName: string;
+    supplyQty: number;
     qty: number;
     attachment?: string[];
     createdBy: string | ObjectId;
@@ -528,7 +529,7 @@ type TCheckOutItem = {
     updatedAt?: string;
     deletedAt?: string;
 };
-type TCheckOutItemCreate = Pick<TCheckOutItem, "site" | "serviceType" | "supply" | "supplyName" | "qty" | "attachment" | "createdBy" | "createdByName">;
+type TCheckOutItemCreate = Pick<TCheckOutItem, "site" | "serviceType" | "supply" | "supplyName" | "supplyQty" | "qty" | "attachment" | "createdBy" | "createdByName">;
 type TCheckOutItemCreateService = Pick<TCheckOutItem, "site" | "serviceType" | "supply" | "qty" | "attachment" | "createdBy">;
 type TCheckOutItemCreateByBatchService = Pick<TCheckOutItem, "site" | "serviceType" | "createdBy"> & {
     items: Pick<TCheckOutItem, "supply" | "qty" | "attachment">[];
@@ -538,7 +539,7 @@ type TCheckOutItemGetQuery = {
     limit?: number;
     search?: string;
 } & Pick<TCheckOutItem, "site" | "serviceType">;
-type TCheckOutItemGetById = Pick<TCheckOutItem, "_id" | "site" | "serviceType" | "supply" | "supplyName" | "qty" | "status"> & {
+type TCheckOutItemGetById = Pick<TCheckOutItem, "_id" | "site" | "serviceType" | "supply" | "supplyName" | "supplyQty" | "qty" | "status"> & {
     unitOfMeasurement?: string;
 };
 declare const checkOutItemSchema: Joi.ObjectSchema<any>;
@@ -547,6 +548,7 @@ declare function MCheckOutItem(value: TCheckOutItemCreate): {
     serviceType: AppServiceType;
     supply: string | ObjectId;
     supplyName: string;
+    supplyQty: number;
     qty: number;
     attachment: string[];
     createdBy: string | ObjectId;

package/dist/index.js

@@ -3314,7 +3314,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);
+        import_node_server_utils17.logger.info(
+          `Dropped legacy hygiene area checklist unique index: ${legacyIndex.name}`
+        );
+      }
     } catch (error) {
       throw new import_node_server_utils17.InternalServerError(
         "Failed to create unique index on hygiene checklist area."
@@ -3326,7 +3338,7 @@ 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 },
+        { schedule: parentChecklistId, area: areaId, serviceType: value.serviceType },
         { session }
       );
       if (existingChecklist) {
@@ -3344,7 +3356,8 @@ function useAreaChecklistRepo() {
         import_node_server_utils17.logger.info(`Duplicate area checklist skipped for area ${value.name}`);
         const existing = await collection.findOne({
           schedule: new import_mongodb9.ObjectId(value.schedule),
-          area: new import_mongodb9.ObjectId(value.area)
+          area: new import_mongodb9.ObjectId(value.area),
+          serviceType: value.serviceType
         });
         return existing._id;
       }
@@ -5180,9 +5193,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);
+        import_node_server_utils22.logger.info(
+          `Dropped legacy hygiene supply unique index: ${legacyIndex.name}`
+        );
+      }
     } catch (error) {
       throw new import_node_server_utils22.InternalServerError(
         "Failed to create unique index on hygiene supply."
@@ -5849,6 +5871,7 @@ var checkOutItemSchema = import_joi14.default.object({
   serviceType: import_joi14.default.string().valid(...Object.values(import_core16.AppServiceType)).required(),
   supply: import_joi14.default.string().hex().required(),
   supplyName: import_joi14.default.string().required(),
+  supplyQty: import_joi14.default.number().min(0).required(),
   qty: import_joi14.default.number().min(0).required(),
   attachment: import_joi14.default.array().items(import_joi14.default.string()).optional().allow(null),
   createdBy: import_joi14.default.string().hex().required(),
@@ -5879,6 +5902,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,
@@ -5983,32 +6007,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",
@@ -6035,7 +6033,7 @@ function useCheckOutItemRepository() {
         {
           $project: {
             supplyName: 1,
-            supplyQty: "$supplyDoc.qty",
+            supplyQty: 1,
             checkOutByName: "$createdByName",
             profile: "$createdByDoc.profile",
             checkOutQty: "$qty",
@@ -6105,7 +6103,7 @@ function useCheckOutItemRepository() {
               qty: 1,
               status: 1,
               unitOfMeasurement: "$supplyDetails.unitOfMeasurement",
-              stockQty: "$supplyDetails.qty",
+              stockQty: "$supplyQty",
               attachment: 1
             }
           }
@@ -6189,6 +6187,7 @@ function useCheckOutItemService() {
         {
           ...value,
           supplyName: supplyData?.name || "",
+          supplyQty: Math.max((supplyData?.qty || 0) - value.qty, 0),
           createdByName: createdByData?.name || ""
         },
         session
@@ -6235,6 +6234,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,