@7365admin1/module-hygiene 4.28.2-staging.10 → 4.28.2-staging.11

package/.changeset/hygiene-checkout-stock-return.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/module-hygiene": minor
+---
+
+Disapproving a hygiene check out item returns the drawn-down quantity to stock, in the same transaction as the decision.

package/dist/index.d.ts

@@ -541,6 +541,21 @@ declare function buildCheckOutDecision(decision: TCheckOutDecision, remarks?: st
     remarks: string;
     updatedAt: string;
 };
+/**
+ * Sequence a decision: the guarded update first, the stock return only if that
+ * update actually decided the row.
+ *
+ * Idempotency comes from the update's `{ _id, status: "pending" }` match, not
+ * from anything here. `decide` reports how many rows it changed (and the
+ * repository throws on a match of none), so a row someone already decided
+ * moves no stock. That is what stops a second disapprove crediting stock
+ * twice, and stops an approve after a disapprove deducting it again — the
+ * approve is refused outright, so it never reaches a stock call at all.
+ *
+ * Kept here rather than in the service so the ordering can be tested with
+ * fakes, the same way the rest of this file is tested without a database.
+ */
+declare function applyCheckOutDecision(decision: TCheckOutDecision, decide: () => Promise<number>, returnStock: () => Promise<unknown>): Promise<number>;
 
 declare const allowedCheckOutItemStatus: string[];
 type TCheckOutItem = {
@@ -611,6 +626,7 @@ declare function useCheckOutItemRepository(): {
 declare function useCheckOutItemService(): {
     createCheckOutItem: (value: TCheckOutItemCreateService) => Promise<bson.ObjectId>;
     createCheckOutItemByBatch: (value: TCheckOutItemCreateByBatchService) => Promise<bson.ObjectId[]>;
+    decideCheckOutItem: (_id: string, value: TCheckOutItemDecision) => Promise<number>;
 };
 
 declare function useCheckOutItemController(): {
@@ -705,4 +721,4 @@ declare function useQRController(): {
     generateQR: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { CHECKOUT_DECIDABLE_STATUS, CHECKOUT_DECISIONS, MArea, MAreaChecklist, MCheckOutItem, MParentChecklist, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCheckOutDecision, TCheckOutItem, TCheckOutItemCreate, TCheckOutItemCreateByBatchService, TCheckOutItemCreateService, TCheckOutItemDecision, TCheckOutItemGetById, TCheckOutItemGetQuery, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TParentChecklist, TParentChecklistCreate, TParentChecklistGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedCheckOutItemStatus, allowedChecklistStatus, allowedPeriods, allowedStatus, allowedTypes, areaChecklistSchema, areaSchema, buildCheckOutDecision, checkOutItemSchema, isCheckOutDecision, parentChecklistSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaExportService, useAreaRepo, useAreaService, useCheckOutItemController, useCheckOutItemRepository, useCheckOutItemService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useQRController, useQRService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitExportService, useUnitRepository, useUnitService };
+export { CHECKOUT_DECIDABLE_STATUS, CHECKOUT_DECISIONS, MArea, MAreaChecklist, MCheckOutItem, MParentChecklist, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCheckOutDecision, TCheckOutItem, TCheckOutItemCreate, TCheckOutItemCreateByBatchService, TCheckOutItemCreateService, TCheckOutItemDecision, TCheckOutItemGetById, TCheckOutItemGetQuery, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TParentChecklist, TParentChecklistCreate, TParentChecklistGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedCheckOutItemStatus, allowedChecklistStatus, allowedPeriods, allowedStatus, allowedTypes, applyCheckOutDecision, areaChecklistSchema, areaSchema, buildCheckOutDecision, checkOutItemSchema, isCheckOutDecision, parentChecklistSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaExportService, useAreaRepo, useAreaService, useCheckOutItemController, useCheckOutItemRepository, useCheckOutItemService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useQRController, useQRService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitExportService, useUnitRepository, useUnitService };

package/dist/index.js

@@ -45,6 +45,7 @@ __export(src_exports, {
   allowedPeriods: () => allowedPeriods,
   allowedStatus: () => allowedStatus,
   allowedTypes: () => allowedTypes,
+  applyCheckOutDecision: () => applyCheckOutDecision,
   areaChecklistSchema: () => areaChecklistSchema,
   areaSchema: () => areaSchema,
   buildCheckOutDecision: () => buildCheckOutDecision,
@@ -5896,6 +5897,13 @@ function buildCheckOutDecision(decision, remarks, now = (/* @__PURE__ */ new Dat
     updatedAt: now
   };
 }
+async function applyCheckOutDecision(decision, decide, returnStock) {
+  const decided = await decide();
+  if (decided > 0 && decision === "disapprove") {
+    await returnStock();
+  }
+  return decided;
+}
 
 // src/models/hygiene-checkout-item.model.ts
 var import_joi14 = __toESM(require("joi"));
@@ -6261,7 +6269,8 @@ function useCheckOutItemService() {
   const {
     createCheckOutItem: _createCheckOutItem,
     getCheckOutItemById: _getCheckOutItemById,
-    completeCheckOutItem
+    completeCheckOutItem,
+    decideCheckOutItem: _decideCheckOutItem
   } = useCheckOutItemRepository();
   const { getSupplyById } = useSupplyRepository();
   const { getUserById } = (0, import_core17.useUserRepo)();
@@ -6352,9 +6361,41 @@ function useCheckOutItemService() {
       await session?.endSession();
     }
   }
+  async function decideCheckOutItem(_id, value) {
+    const session = import_node_server_utils30.useAtlas.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      const checkOutItem = await _getCheckOutItemById(_id, session);
+      if (!checkOutItem) {
+        throw new import_node_server_utils30.BadRequestError("Check out item not found.");
+      }
+      const decided = await applyCheckOutDecision(
+        value.approve === true ? "approve" : "disapprove",
+        () => _decideCheckOutItem(_id, value, session),
+        () => createStock(
+          {
+            site: checkOutItem.site.toString(),
+            serviceType: checkOutItem.serviceType,
+            supply: checkOutItem.supply.toString(),
+            qty: checkOutItem.qty
+          },
+          false,
+          session
+        )
+      );
+      await session?.commitTransaction();
+      return decided;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      await session?.endSession();
+    }
+  }
   return {
     createCheckOutItem,
-    createCheckOutItemByBatch
+    createCheckOutItemByBatch,
+    decideCheckOutItem
   };
 }
 
@@ -6365,12 +6406,12 @@ var import_core18 = require("@7365admin1/core");
 function useCheckOutItemController() {
   const {
     getCheckOutItems: _getCheckOutItems,
-    getCheckOutItemById: _getCheckOutItemById,
-    decideCheckOutItem: _decideCheckOutItem
+    getCheckOutItemById: _getCheckOutItemById
   } = useCheckOutItemRepository();
   const {
     createCheckOutItem: _createCheckOutItem,
-    createCheckOutItemByBatch: _createCheckOutItemByBatch
+    createCheckOutItemByBatch: _createCheckOutItemByBatch,
+    decideCheckOutItem: _decideCheckOutItem
   } = useCheckOutItemService();
   async function createCheckOutItem(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
@@ -7610,6 +7651,7 @@ function useQRController() {
   allowedPeriods,
   allowedStatus,
   allowedTypes,
+  applyCheckOutDecision,
   areaChecklistSchema,
   areaSchema,
   buildCheckOutDecision,