@7365admin1/core 2.48.0 → 2.49.0

package/dist/index.mjs

@@ -940,12 +940,16 @@ import {
   makeCacheKey as makeCacheKey3
 } from "@7365admin1/node-server-utils";
 var work_orders_namespace_collection = "work-orders";
+var work_orders2_namespace_collection = "work-orders2";
 function useWorkOrderRepo() {
   const db = useAtlas3.getDb();
   if (!db) {
     throw new InternalServerError3("Unable to connect to server.");
   }
   const collection = db.collection(work_orders_namespace_collection);
+  const workOrders2Collection = db.collection(
+    work_orders2_namespace_collection
+  );
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -977,6 +981,12 @@ function useWorkOrderRepo() {
   const { delNamespace, setCache, getCache, delCache } = useCache3(
     work_orders_namespace_collection
   );
+  const {
+    delNamespace: delNamespaceWorkOrders2,
+    setCache: setCacheWorkOrders2,
+    getCache: getCacheWorkOrders2,
+    delCache: delCacheWorkOrders2
+  } = useCache3(work_orders2_namespace_collection);
   const { delNamespace: _delDashboardNameSpace } = useCache3("dashboard");
   async function createWorkOrder(value, session) {
     try {
@@ -1378,7 +1388,7 @@ function useWorkOrderRepo() {
         updatedAt: /* @__PURE__ */ new Date(),
         deletedAt: /* @__PURE__ */ new Date()
       };
-      const res = await collection.updateOne(
+      const res = await workOrders2Collection.updateOne(
         { _id },
         { $set: updateValue },
         { session }
@@ -1386,13 +1396,13 @@ function useWorkOrderRepo() {
       if (res.modifiedCount === 0) {
         throw new InternalServerError3("Unable to delete work order.");
       }
-      delNamespace().then(() => {
+      delNamespaceWorkOrders2().then(() => {
         logger5.info(
-          `Cache cleared for namespace: ${work_orders_namespace_collection}`
+          `Cache cleared for namespace: ${work_orders2_namespace_collection}`
         );
       }).catch((err) => {
         logger5.error(
-          `Failed to clear cache for namespace: ${work_orders_namespace_collection}`,
+          `Failed to clear cache for namespace: ${work_orders2_namespace_collection}`,
           err
         );
       });
@@ -2031,7 +2041,7 @@ function useOccurrenceEntryRepo() {
       logger6.info(`Cache hit for key: ${cacheKey}`);
       return cached;
     }
-    const bookId = new ObjectId7(dailyOccurrenceBookId);
+    const bookId = typeof dailyOccurrenceBookId === "string" ? new ObjectId7(dailyOccurrenceBookId) : dailyOccurrenceBookId;
     const data = await collection.findOne(
       { dailyOccurrenceBookId: bookId },
       {
@@ -2046,6 +2056,16 @@ function useOccurrenceEntryRepo() {
     });
     return serialNumber;
   }
+  async function getLatestSerialNumberInGroup(bookId, group) {
+    const latestEntry = await collection.findOne(
+      {
+        dailyOccurrenceBookId: bookId,
+        serialNumber: { $regex: `^${group}(\\.|$)` }
+      },
+      { sort: { serialNumber: -1 } }
+    );
+    return latestEntry ? Number(latestEntry.serialNumber) : group;
+  }
   async function updateUserNameBySignatureId(_id, value, session) {
     try {
       const updateValue = {
@@ -2081,7 +2101,8 @@ function useOccurrenceEntryRepo() {
     createIndexes,
     createTextIndex,
     getLatestSerialNumber,
-    updateOccurrenceEntryByBookId
+    updateOccurrenceEntryByBookId,
+    getLatestSerialNumberInGroup
   };
 }
 
@@ -13508,11 +13529,18 @@ function useVisitorTransactionRepo() {
       );
     }
   }
-  async function add(value, session) {
+  async function add(value, session, returnValue = false) {
     try {
       value = MVisitorTransaction(value);
       const res = await collection.insertOne(value, { session });
-      return res.insertedId;
+      if (returnValue) {
+        return {
+          ...value,
+          _id: res.insertedId
+        };
+      } else {
+        return res.insertedId;
+      }
     } catch (error) {
       console.log("Error in add visitor transaction:", error);
       const isDuplicated = error.message.includes("duplicate");
@@ -14866,7 +14894,11 @@ function usePersonRepo() {
     try {
       await collection.createIndexes([
         { key: { contact: 1 } },
-        { key: { nric: 1 } }
+        { key: { nric: 1 } },
+        { key: { user: 1 } },
+        { key: { site: 1, status: 1 } },
+        { key: { "plates.plateNumber": 1, status: 1 } },
+        { key: { unit: 1, status: 1 } }
       ]);
     } catch (error) {
       throw new InternalServerError26("Failed to create index on site people.");
@@ -16844,6 +16876,9 @@ function useVehicleService() {
     const _end = vehicle.end;
     const _recNo = plate.recNo;
     const _type = value.type ? value.type : plate.type;
+    if (value.peopleId) {
+      value.peopleId = new ObjectId46(value.peopleId);
+    }
     const { name, plateNumber, start, end, recNo, type, unit, site, ...rest } = value;
     const startDahua = value.start ? formatDahuaDate(new Date(value.start)) : formatDahuaDate(new Date(_start));
     const endDahua = value.end ? formatDahuaDate(new Date(value.end)) : formatDahuaDate(new Date(_end));
@@ -16907,6 +16942,17 @@ function useVehicleService() {
             }
             const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
             value.recNo = responseData.split("=")[1]?.trim();
+            const normalizedPlateNumber = Array.isArray(plateNumber) ? plateNumber[0] : plateNumber;
+            if (value.peopleId && value.recNo) {
+              await _pushVehicleById(
+                value.peopleId,
+                {
+                  plateNumber: normalizedPlateNumber,
+                  recNo: value.recNo
+                },
+                session
+              );
+            }
           } else {
             const dahuaPayload = {
               host,
@@ -16920,6 +16966,17 @@ function useVehicleService() {
               owner: name ? name : _name
             };
             const dahuaResponse = await _updatePlateNumber(dahuaPayload);
+            const normalizedPlateNumber = Array.isArray(plateNumber) ? plateNumber[0] : plateNumber;
+            if (value.peopleId && value.recNo) {
+              await _pushVehicleById(
+                value.peopleId,
+                {
+                  plateNumber: normalizedPlateNumber,
+                  recNo: _recNo
+                },
+                session
+              );
+            }
             if (dahuaResponse?.statusCode !== 200) {
               throw new BadRequestError72(
                 "Failed to update plate number to ANPR"
@@ -17114,7 +17171,7 @@ function useDahuaService() {
   const { createFile: _createFile } = useFileService();
   let currentTransactionId = null;
   let currentSnapshotField = null;
-  function useBufferQueue(boundary, site, gate, designation, host, username, password) {
+  function useBufferQueue(boundary, site, gate, designation, host, username, password, onDetected) {
     const queue = [];
     let processing = false;
     let plateNumber = null;
@@ -17147,7 +17204,7 @@ function useDahuaService() {
         );
         streamRef.pause();
       }
-      processNext();
+      processNext(onDetected);
     }
     function destroy() {
       queue.length = 0;
@@ -17163,30 +17220,30 @@ function useDahuaService() {
         `[${site}][${gate}] BufferQueue destroyed. Processed=${processedChunks}, Dropped=${droppedChunks}`
       );
     }
-    async function processNext() {
+    async function processNext(onDetected2) {
       if (processing || queue.length === 0)
         return;
       processing = true;
       const buffer = queue.shift();
       try {
-        await handleBuffer(buffer);
+        await handleBuffer(buffer, onDetected2);
         processedChunks++;
         if (queue.length <= RESUME_THRESHOLD && streamRef && streamRef.isPaused()) {
           loggerDahua.info(
-            `[${site}][${gate}] Queue at ${queue.length}/${MAX_QUEUE_SIZE}, resuming stream`
+            `[${host}]Queue at ${queue.length}/${MAX_QUEUE_SIZE}, resuming stream`
           );
           streamRef.resume();
         }
       } catch (err) {
-        loggerDahua.error(`[${site}][${gate}] Error processing buffer:`, err);
+        loggerDahua.error(`[${host}] Error processing buffer:`, err);
       } finally {
         processing = false;
-        processNext();
+        processNext(onDetected2);
       }
     }
-    async function processVehicleTransaction() {
+    async function processVehicleTransaction(onDetected2) {
       loggerDahua.info(
-        `[${site}][${gate}] Vehicle transaction: Plate=${plateNumber}, UTC=${UTCData}, UTCMs=${UTCMs}`
+        `[${host}] Vehicle transaction: Plate=${plateNumber}, UTC=${UTCData}, UTCMs=${UTCMs}`
       );
       let org = "";
       try {
@@ -17194,7 +17251,7 @@ function useDahuaService() {
         org = theSite?.orgId.toString() || "unknown";
       } catch (error) {
         loggerDahua.error(
-          `[${site}][${gate}] Error fetching site for orgId:`,
+          `[${host}] Error fetching site for orgId:`,
           error
         );
       }
@@ -17214,7 +17271,7 @@ function useDahuaService() {
             }
           } catch (error) {
             loggerDahua.error(
-              `[${site}][${gate}] Error closing existing open transaction:`,
+              `[${host}] Error closing existing open transaction:`,
               error
             );
           }
@@ -17264,9 +17321,13 @@ function useDahuaService() {
           }
           try {
             await addPlateNumber(dahuaPayload);
-            const transactionId = await add(visitorTransaction);
-            currentTransactionId = transactionId.toString();
+            const result = await add(visitorTransaction, void 0, true);
+            const transactionId = result?._id;
+            currentTransactionId = transactionId?.toString();
             currentSnapshotField = "snapshotEntryImage";
+            if (onDetected2) {
+              onDetected2({ _id: transactionId, site: result?.site?.toString(), plateNumber: result.plateNumber });
+            }
           } catch (error) {
             console.log("failed to create visitor transaction", error);
             loggerDahua.error(
@@ -17300,7 +17361,7 @@ function useDahuaService() {
         }
       }
     }
-    async function handleBuffer(chunk) {
+    async function handleBuffer(chunk, onDetected2) {
       partialBuffer = Buffer.concat([partialBuffer, chunk]);
       while (true) {
         const boundaryIndex = partialBuffer.indexOf(Buffer.from(boundary));
@@ -17326,7 +17387,7 @@ function useDahuaService() {
               direction = line.split("=")[1].trim();
           });
           if (plateNumber && UTCData) {
-            await processVehicleTransaction();
+            await processVehicleTransaction(onDetected2);
           }
         } else if (part.includes("Content-Type: image/jpeg")) {
           const [headers, ...imageParts] = part.split("\r\n\r\n");
@@ -17353,7 +17414,7 @@ function useDahuaService() {
       try {
         await fsAsync.mkdir(dir, { recursive: true });
         await fsAsync.writeFile(snapFolder, accumulatedImageBuffer);
-        loggerDahua.debug(`[${site}][${gate}] Saved image locally: ${filename}`);
+        loggerDahua.debug(`[${host}] Saved image locally: ${filename}`);
         const fileId = await _createFile(
           {
             originalname: filename,
@@ -17363,7 +17424,7 @@ function useDahuaService() {
           `anpr/${site}`
         );
         loggerDahua.info(
-          `[${site}][${gate}] Created file record for image: ${fileId.toString()}`
+          `[${host}] Created file record for image: ${fileId.toString()}`
         );
         if (currentTransactionId && currentSnapshotField) {
           await updateById(currentTransactionId, {
@@ -17371,23 +17432,23 @@ function useDahuaService() {
           });
         }
         loggerDahua.info(
-          `[${site}][${gate}] Image stored with fileId: ${fileId.toString()}`
+          `[${host}] Image stored with fileId: ${fileId.toString()}`
         );
         await fsAsync.unlink(snapFolder);
-        loggerDahua.debug(`[${site}][${gate}] Deleted local file: ${filename}`);
+        loggerDahua.info(`[${host}] Deleted local file: ${filename}`);
       } catch (err) {
         loggerDahua.error(
-          `[${site}][${gate}] Failed to process image ${filename}:`,
+          `[${host}] Failed to process image ${filename}:`,
           err
         );
         try {
           await fsAsync.unlink(snapFolder);
-          loggerDahua.debug(
-            `[${site}][${gate}] Cleaned up local file after error: ${filename}`
+          loggerDahua.error(
+            `[${host}] Cleaned up local file after error: ${filename}`
           );
         } catch (unlinkErr) {
           loggerDahua.error(
-            `[${site}][${gate}] Failed to clean up local file: ${filename}`,
+            `[${host}] Failed to clean up local file: ${filename}`,
             unlinkErr
           );
         }
@@ -17427,7 +17488,7 @@ function useDahuaService() {
       throw error;
     }
   }
-  async function listenToCamera(camera) {
+  async function listenToCamera(camera, onDetected) {
     if (!camera?._id) {
       loggerDahua.error(`Camera _id is required to listen to camera.`);
       throw new BadRequestError73("Camera _id is required to listen to camera.");
@@ -17448,10 +17509,11 @@ function useDahuaService() {
       `guard-post-${camera.guardPost}`,
       camera.direction,
       cameraId,
-      controller.signal
+      controller.signal,
+      onDetected
     );
   }
-  async function getTrafficJunction(host = "", username = "", password = "", site = "", gate = "", designation = "", cameraId, signal) {
+  async function getTrafficJunctionOld(host = "", username = "", password = "", site = "", gate = "", designation = "", cameraId, signal, onDetected) {
     if (signal.aborted)
       return;
     try {
@@ -17474,7 +17536,8 @@ function useDahuaService() {
         designation,
         host,
         username,
-        password
+        password,
+        onDetected
       );
       bufferQueue.setStream(response.res);
       const onAbort = () => {
@@ -17528,7 +17591,7 @@ function useDahuaService() {
         await new Promise((res) => setTimeout(res, 5e3));
         if (signal.aborted)
           return;
-        getTrafficJunction(host, username, password, site, gate, designation, cameraId, signal);
+        getTrafficJunction(host, username, password, site, gate, designation, cameraId, signal, onDetected);
       };
       response.res.on(
         "end",
@@ -17552,8 +17615,87 @@ function useDahuaService() {
       await new Promise((res) => setTimeout(res, 5e3));
       if (signal.aborted)
         return;
-      getTrafficJunction(host, username, password, site, gate, designation, cameraId, signal);
+      getTrafficJunction(host, username, password, site, gate, designation, cameraId, signal, onDetected);
+    }
+  }
+  async function getTrafficJunction(host = "", username = "", password = "", site = "", gate = "", designation = "", cameraId, signal, onDetected) {
+    while (!signal.aborted) {
+      let bufferQueue = null;
+      let response = null;
+      try {
+        response = await useDahuaDigest({
+          host,
+          username,
+          password,
+          endpoint: "/cgi-bin/snapManager.cgi?action=attachFileProc&channel=1&heartbeat=5&Flags[0]=Event&Events=[TrafficJunction]",
+          timeout: 2e4,
+          streaming: true
+        });
+        if ([400, 401, 403, 500].includes(response.statusCode)) {
+          loggerDahua.error(`[${host}] Connection error: ${response.statusCode}`);
+          throw new Error(`Failed to connect to ANPR: ${response.statusCode}`);
+        }
+        loggerDahua.info(`[${host}] Successfully connected to ANPR.`);
+        const contentType = response.res.headers["content-type"];
+        const boundaryMatch = contentType?.match(/boundary=(.*)$/i);
+        const boundary = boundaryMatch ? `--${boundaryMatch[1]}` : "--myboundary";
+        bufferQueue = useBufferQueue(
+          boundary,
+          site,
+          gate,
+          designation,
+          host,
+          username,
+          password,
+          onDetected
+        );
+        bufferQueue.setStream(response.res);
+        await new Promise((resolve, reject) => {
+          const onAbort = () => {
+            loggerDahua.info(`[${site}]-[${host}] Abort triggered. Cleaning up...`);
+            if (response.res && !response.res.destroyed) {
+              response.res.destroy();
+            }
+            resolve("aborted");
+          };
+          signal.addEventListener("abort", onAbort, { once: true });
+          response.res.on("data", (chunk) => {
+            if (signal.aborted) {
+              response.res.destroy();
+              return;
+            }
+            bufferQueue.enqueue(chunk);
+          });
+          response.res.on("end", () => {
+            signal.removeEventListener("abort", onAbort);
+            resolve("ended");
+          });
+          response.res.on("close", () => {
+            signal.removeEventListener("abort", onAbort);
+            resolve("closed");
+          });
+          response.res.on("error", (err) => {
+            signal.removeEventListener("abort", onAbort);
+            reject(err);
+          });
+        });
+      } catch (error) {
+        if (signal.aborted)
+          break;
+        loggerDahua.error(
+          `[${host}] Connection lost or error: ${error.message || error}. Retrying in 5s...`
+        );
+      } finally {
+        if (bufferQueue?.destroy)
+          bufferQueue.destroy();
+        if (response?.res && !response.res.destroyed)
+          response.res.destroy();
+      }
+      if (!signal.aborted) {
+        await new Promise((res) => setTimeout(res, 5e3));
+      }
     }
+    loggerDahua.info(`[${host}] ANPR Listener stopped.`);
   }
   async function addPlateNumber(value) {
     const validation = Joi40.object({
@@ -19929,7 +20071,9 @@ function useVehicleController() {
         start: Joi46.string().isoDate().optional().allow(null, ""),
         end: Joi46.string().isoDate().optional().allow(null, ""),
         recNo: Joi46.string().optional().allow(null, ""),
-        type: Joi46.string().optional().valid(...Object.values(VehicleType)).allow(null, "")
+        type: Joi46.string().optional().valid(...Object.values(VehicleType)).allow(null, ""),
+        peopleId: Joi46.string().hex().length(24).optional().allow(null, ""),
+        seasonPassType: Joi46.string().optional().allow("", null)
       });
       const { error, value } = schema2.validate(
         {
@@ -20166,7 +20310,7 @@ function useSiteCameraService() {
       session.endSession();
     }
   }
-  async function listenToCapturedPlateNumber() {
+  async function listenToCapturedPlateNumber(onDetected) {
     const siteCameras = [];
     let page = 1;
     let pages = 1;
@@ -20187,7 +20331,7 @@ function useSiteCameraService() {
     for (let index = 0; index < siteCameras.length; index++) {
       const siteCamera = siteCameras[index];
       if (siteCamera && siteCamera.status === "active" && siteCamera.host && siteCamera.username && siteCamera.password && siteCamera.site && siteCamera.guardPost) {
-        dahuaService.listenToCamera(siteCamera);
+        dahuaService.listenToCamera(siteCamera, onDetected);
       }
     }
   }
@@ -25356,11 +25500,7 @@ function usePatrolQuestionRepo() {
   const { delNamespace, getCache, setCache } = useCache34(namespace_collection);
   async function createIndexes() {
     try {
-      await collection.createIndexes([
-        {
-          key: { site: 1 }
-        }
-      ]);
+      await collection.createIndexes([{ key: { site: 1, status: 1 } }]);
       return `Successfully created indexes for ${namespace_collection}.`;
     } catch (error) {
       logger87.log({
@@ -25805,6 +25945,24 @@ function usePatrolRouteRepo() {
   const namespace_collection = "patrol.route";
   const collection = db.collection(namespace_collection);
   const { delNamespace, getCache, setCache } = useCache35(namespace_collection);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        { key: { site: 1, status: 1 } },
+        { key: { site: 1, repeat: 1 } },
+        { key: { assignee: 1 } }
+      ]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger90.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError36(
+        "Failed to create general indexes on patrol routes."
+      );
+    }
+  }
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -26178,7 +26336,8 @@ function usePatrolRouteRepo() {
     updateById,
     deleteById,
     getScheduledRoute,
-    getById
+    getById,
+    createIndexes
   };
 }
 
@@ -26525,9 +26684,8 @@ function usePatrolLogRepo() {
   async function createIndexes() {
     try {
       await collection.createIndexes([
-        {
-          key: { site: 1 }
-        }
+        { key: { site: 1, createdAt: -1 } },
+        { key: { assignee: 1 } }
       ]);
       return `Successfully created indexes for ${namespace_collection}.`;
     } catch (error) {
@@ -30418,6 +30576,20 @@ function useSiteBillingItemRepo() {
   const namespace_collection = "site.billing.items";
   const collection = db.collection(namespace_collection);
   const { delNamespace, setCache, getCache } = useCache42(namespace_collection);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([{ key: { site: 1, status: 1 } }]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger107.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError43(
+        "Failed to create general indexes on billing item."
+      );
+    }
+  }
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -30637,7 +30809,8 @@ function useSiteBillingItemRepo() {
     getAll,
     getById,
     updateById,
-    deleteById
+    deleteById,
+    createIndexes
   };
 }
 
@@ -30791,6 +30964,20 @@ function useSiteBillingConfigurationRepo() {
   const namespace_collection = "site.billing.configuration";
   const collection = db.collection(namespace_collection);
   const { delNamespace, setCache, getCache } = useCache43(namespace_collection);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([{ key: { site: 1, status: 1 } }]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger109.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError44(
+        "Failed to create general indexes on billing configuration."
+      );
+    }
+  }
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -31000,7 +31187,8 @@ function useSiteBillingConfigurationRepo() {
     getAll,
     getById,
     updateById,
-    deleteById
+    deleteById,
+    createIndexes
   };
 }
 
@@ -32303,6 +32491,25 @@ function useSiteUnitBillingRepo() {
   const namespace_collection = "site.unit.billing";
   const collection = db.collection(namespace_collection);
   const { delNamespace, setCache, getCache } = useCache45(namespace_collection);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        { key: { site: 1, status: 1, paymentStatus: 1 } },
+        { key: { site: 1, unitId: 1, status: 1, paymentStatus: 1 } },
+        { key: { site: 1, unitId: 1, issueDate: 1 } },
+        { key: { createdAt: -1 } }
+      ]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger117.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError46(
+        "Failed to create general indexes on unit billing."
+      );
+    }
+  }
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -32856,7 +33063,8 @@ function useSiteUnitBillingRepo() {
     deleteById,
     getUnitBillingBySite,
     getResidentUserBilling,
-    getResidentUserUnsettledBilling
+    getResidentUserUnsettledBilling,
+    createIndexes
   };
 }
 
@@ -38714,6 +38922,22 @@ function useStatementOfAccountRepo() {
   const namespace_collection = "site.statement-of-accounts";
   const collection = db.collection(namespace_collection);
   const { delNamespace, getCache, setCache } = useCache50(namespace_collection);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        { key: { site: 1, status: 1 } },
+        { key: { site: 1, unitId: 1, status: 1 } },
+        { key: { createdAt: -1 } }
+      ]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger128.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError51("Failed to create general indexes on SOA.");
+    }
+  }
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -39064,7 +39288,8 @@ function useStatementOfAccountRepo() {
     deleteById,
     updateStatusById,
     getResidentUserSoa,
-    reviewSOA
+    reviewSOA,
+    createIndexes
   };
 }
 
@@ -42689,7 +42914,10 @@ function useOccurrenceEntryService() {
     updateOccurrenceEntryById: _updateOccurrenceEntryById,
     getOccurrenceEntryById: _getOccurrenceEntryById,
     getOccurrenceEntryByBookId: _getOccurrenceEntryByBookId,
-    updateOccurrenceEntryByBookId: _updateOccurrenceEntryByBookId
+    updateOccurrenceEntryByBookId: _updateOccurrenceEntryByBookId,
+    deleteOccurrenceEntryById: _deleteOccurrenceEntryById,
+    getLatestSerialNumber: _getLatestSerialNumber,
+    getLatestSerialNumberInGroup: _getLatestSerialNumberInGroup
   } = useOccurrenceEntryRepo();
   const {
     getOccurrenceBookById: _getOccurrenceBookById,
@@ -42741,8 +42969,20 @@ function useOccurrenceEntryService() {
       if (!occurrenceEntry) {
         throw new Error("Occurrence entry not found.");
       }
-      const entrySerialNumber = Number(occurrenceEntry.serialNumber);
-      const updatedSerialNumber = (entrySerialNumber + 0.1).toFixed(1);
+      const entryCount = await _getLatestSerialNumberInGroup(
+        occurrenceEntry.dailyOccurrenceBookId,
+        Number(occurrenceEntry.serialNumber)
+      );
+      const currentSerial = Number(occurrenceEntry.serialNumber);
+      const latestSerial = Number(entryCount);
+      const currentGroup = Math.floor(currentSerial);
+      const latestGroup = Math.floor(latestSerial);
+      let updatedSerialNumber;
+      if (currentGroup === latestGroup) {
+        updatedSerialNumber = (latestSerial + 0.1).toFixed(1);
+      } else {
+        updatedSerialNumber = (currentSerial + 0.1).toFixed(1);
+      }
       const dobId = occurrenceEntry.dailyOccurrenceBookId;
       const book = await _getOccurrenceBookById(dobId);
       const subject = await _getOccurrenceSubjectById(
@@ -45237,7 +45477,9 @@ function useManpowerMonitoringRepo() {
         {
           key: { siteId: 1 }
         },
-        { key: { createdAt: 1 } }
+        { key: { createdAt: 1 } },
+        { key: { siteId: 1, serviceProviderId: 1 } },
+        { key: { siteName: 1 } }
       ]);
       return `Successfully created indexes for ${namespace_collection}.`;
     } catch (error) {
@@ -45506,7 +45748,9 @@ function useManpowerRemarksRepo() {
         {
           key: { siteId: 1 }
         },
-        { key: { createdAt: 1 } }
+        { key: { createdAt: 1 } },
+        { key: { siteId: 1, serviceProviderId: 1, createdAtSGT: 1 } },
+        { key: { serviceProviderId: 1, status: 1, createdAtSGT: 1 } }
       ]);
       return `Successfully created indexes for ${namespace_collection}.`;
     } catch (error) {
@@ -45939,7 +46183,8 @@ function useManpowerDesignationRepo() {
         {
           key: { siteId: 1 }
         },
-        { key: { createdAt: 1 } }
+        { key: { createdAt: 1 } },
+        { key: { siteId: 1, serviceProviderId: 1 } }
       ]);
       return `Successfully created indexes for ${namespace_collection}.`;
     } catch (error) {
@@ -51458,6 +51703,7 @@ export {
   vehicles_namespace_collection,
   visitors_namespace_collection,
   workOrderSchema,
+  work_orders2_namespace_collection,
   work_orders_namespace_collection
 };
 //# sourceMappingURL=index.mjs.map