@7365admin1/core 2.30.0 → 2.30.1

package/dist/index.mjs

@@ -1438,7 +1438,7 @@ var schemaUpdateOccurrenceEntry = Joi5.object({
   occurrence: Joi5.string().optional().allow(null, ""),
   signature: Joi5.string().hex().optional().allow(null, ""),
   incidentReportId: Joi5.string().hex().optional().allow(null, ""),
-  eSignature: Joi5.string().hex().length(24).required(),
+  eSignature: Joi5.string().hex().length(24).optional().allow(null, ""),
   createdByName: Joi5.string().optional().allow(null, "")
 });
 function MOccurrenceEntry(value) {
@@ -1847,32 +1847,16 @@ function useOccurrenceEntryRepo() {
       throw error;
     }
   }
-  async function getOccurrenceEntryByBookId(dailyOccurrenceBookId, session) {
+  async function getOccurrenceEntryByBookId(dailyOccurrenceBookId) {
     try {
       dailyOccurrenceBookId = new ObjectId7(dailyOccurrenceBookId);
     } catch (error) {
       throw new BadRequestError7("Invalid occurrence entry ID format.");
     }
-    const cacheKey = makeCacheKey4(namespace_collection, {
-      dailyOccurrenceBookId
-    });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger6.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
+    const query = { dailyOccurrenceBookId };
     try {
-      const data = await collection.findOne(
-        { dailyOccurrenceBookId },
-        {
-          sort: { _id: -1 },
-          session
-        }
-      );
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger6.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger6.error(`Failed to set cache for key: ${cacheKey}`, err);
+      const data = await collection.findOne(query, {
+        sort: { _id: -1 }
       });
       return data;
     } catch (error) {
@@ -13083,7 +13067,7 @@ var schemaVisitorTransaction = Joi36.object({
   checkIn: Joi36.date().optional().allow(null, ""),
   checkOut: Joi36.date().optional().allow(null, ""),
   deliveryType: Joi36.string().optional().allow(null, ""),
-  status: Joi36.string().optional().valid(...Object.values(VisitorStatus)).default("pending" /* PENDING */),
+  status: Joi36.string().optional().valid(...Object.values(VisitorStatus)).default("registered" /* REGISTERED */),
   remarks: Joi36.string().optional().allow(null, ""),
   members: Joi36.array().items(
     Joi36.object({
@@ -15813,11 +15797,7 @@ function useDahuaService() {
             org,
             status: "unregistered" /* UNREGISTERED */
           };
-          const typesForAutoRegister = [
-            "guest" /* GUEST */,
-            "resident" /* RESIDENT */,
-            "tenant" /* TENANT */
-          ];
+          const typesForAutoRegister = Object.values(PersonTypes);
           let startDate = vehicle?.start ? new Date(vehicle?.start) : /* @__PURE__ */ new Date();
           let endDate = vehicle?.end ? new Date(vehicle?.end) : new Date(startDate.getTime() + 60 * 60 * 1e3);
           if (vehicle && typeof vehicle.category === "string" && typesForAutoRegister.includes(vehicle.category)) {
@@ -15828,7 +15808,7 @@ function useDahuaService() {
             visitorTransaction.level = vehicle.level;
             visitorTransaction.unit = vehicle.unit?.toString();
             visitorTransaction.unitName = vehicle.unitName;
-            visitorTransaction.type = "resident" /* RESIDENT */;
+            visitorTransaction.type = vehicle.category;
             visitorTransaction.status = "registered" /* REGISTERED */;
             visitorTransaction.recNo = vehicle.recNo;
             visitorTransaction.expiredAt = vehicle.end;
@@ -39061,8 +39041,7 @@ function useOccurrenceEntryController() {
     getLatestSerialNumber: _getLatestSerialNumber
   } = useOccurrenceEntryRepo();
   async function add(req, res, next) {
-    const payload = { ...req.body };
-    const { error } = schemaOccurrenceEntry.validate(payload, {
+    const { error, value } = schemaOccurrenceEntry.validate(req.body, {
       abortEarly: false
     });
     if (error) {
@@ -39072,7 +39051,7 @@ function useOccurrenceEntryController() {
       return;
     }
     try {
-      const data = await _add(payload);
+      const data = await _add(value);
       res.status(201).json(data);
       return;
     } catch (error2) {
@@ -39154,9 +39133,8 @@ function useOccurrenceEntryController() {
     }
   }
   async function updateOccurrenceEntryById(req, res, next) {
-    const _id = req.params.id;
-    const payload = { _id, ...req.body };
-    const { error } = schemaUpdateOccurrenceEntry.validate(payload, {
+    const payload = { _id: req.params.id, ...req.body };
+    const { error, value } = schemaUpdateOccurrenceEntry.validate(payload, {
       abortEarly: false
     });
     if (error) {
@@ -39165,8 +39143,9 @@ function useOccurrenceEntryController() {
       next(new BadRequestError170(messages));
       return;
     }
+    const { _id, ...rest } = value;
     try {
-      const result = await _updateOccurrenceEntryById(_id, req.body);
+      const result = await _updateOccurrenceEntryById(_id, rest);
       res.status(200).json({ message: result });
       return;
     } catch (error2) {