@7365admin1/core 2.26.0 → 2.27.0

package/dist/index.mjs

@@ -13474,6 +13474,7 @@ var VehicleSort = /* @__PURE__ */ ((VehicleSort2) => {
   VehicleSort2["NAME"] = "name";
   VehicleSort2["START"] = "start";
   VehicleSort2["END"] = "end";
+  VehicleSort2["UPDATED_AT"] = "updatedAt";
   return VehicleSort2;
 })(VehicleSort || {});
 var OrgNature = /* @__PURE__ */ ((OrgNature2) => {
@@ -13575,7 +13576,7 @@ function MVehicle(value) {
     unitName: value.unitName ?? "",
     peopleId: value.peopleId ?? "",
     createdAt,
-    updatedAt: value.updatedAt ?? "",
+    updatedAt: value.updatedAt ?? createdAt,
     deletedAt: value.deletedAt ?? ""
   };
 }
@@ -13725,7 +13726,6 @@ function useVehicleRepo() {
       ...category && { category }
     };
     let query = { ...baseQuery };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
       ...status && { status },
       ...type && { type },
@@ -13771,7 +13771,9 @@ function useVehicleRepo() {
           unitName: "$unit.name",
           recNo: 1,
           nric: 1,
-          plateNumber: 1
+          plateNumber: 1,
+          createdAt: 1,
+          updatedAt: 1
         }
       },
       {
@@ -13799,6 +13801,8 @@ function useVehicleRepo() {
           unit: { $first: "$unit" },
           unitName: { $first: "$unitName" },
           nric: { $first: "$nric" },
+          createdAt: { $min: "$createdAt" },
+          updatedAt: { $max: "$updatedAt" },
           plates: {
             $addToSet: {
               _id: "$_id",
@@ -13834,10 +13838,19 @@ function useVehicleRepo() {
                 ]
               }
             }
+          },
+          createdAt: 1,
+          updatedAt: 1
+        }
+      },
+      {
+        $addFields: {
+          sortDate: {
+            $ifNull: ["$updatedAt", "$createdAt"]
           }
         }
       },
-      { $sort: sort },
+      { $sort: { sortDate: -1 } },
       { $skip: page * limit },
       { $limit: limit }
     ];
@@ -18269,7 +18282,7 @@ function useVehicleController() {
       search: Joi46.string().optional().allow("", null),
       page: Joi46.number().integer().min(1).optional().default(1),
       limit: Joi46.number().integer().min(1).max(100).optional().default(10),
-      sort: Joi46.string().optional().valid(...Object.values(VehicleSort)),
+      sort: Joi46.string().optional().valid(...Object.values(VehicleSort)).default("updatedAt" /* UPDATED_AT */),
       order: Joi46.string().optional().valid(...Object.values(SortOrder)),
       type: Joi46.string().optional().valid(...Object.values(VehicleType)).allow(null, ""),
       category: Joi46.string().optional().valid(...Object.values(VehicleCategory)).allow(null, ""),
@@ -18285,15 +18298,20 @@ function useVehicleController() {
       return;
     }
     const { search, page, limit, type, category, status, sort, order } = value;
-    const sortObj = {
-      [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
-    };
+    let sortObj;
+    if (sort === "updatedAt" /* UPDATED_AT */) {
+      sortObj = order === "asc" /* ASC */ ? { updatedAt: 1, createdAt: 1, _id: 1 } : { updatedAt: -1, createdAt: -1, _id: -1 };
+    } else {
+      sortObj = {
+        [sort]: order === "asc" /* ASC */ ? 1 : -1
+      };
+    }
     try {
       const data = await _getVehicles({
         search,
         page,
         limit,
-        sort: sortObj,
+        // sort: sortObj,
         type,
         category,
         status
@@ -19831,13 +19849,15 @@ function useAttendanceRepository() {
     limit = 10,
     search = "",
     site,
+    serviceType,
     user
   }) {
     page = page > 0 ? page - 1 : 0;
-    const query = {};
+    const query = { serviceType };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new ObjectId53(site);
@@ -20298,6 +20318,7 @@ function useAttendanceController() {
       limit: Joi54.number().min(1).optional().allow("", null),
       search: Joi54.string().optional().allow("", null),
       site: Joi54.string().hex().required(),
+      serviceType: Joi54.string().valid(...Object.values(AppServiceType)).required(),
       user: Joi54.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -20310,12 +20331,14 @@ function useAttendanceController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getAttendanceByUser({
         page,
         limit,
         search,
         site,
+        serviceType,
         user
       });
       res.json(data);
@@ -33769,6 +33792,11 @@ function useNfcPatrolTagController() {
 // src/models/occurrence-book.model.ts
 import { ObjectId as ObjectId87 } from "mongodb";
 import Joi88 from "joi";
+var DOBStatus = /* @__PURE__ */ ((DOBStatus3) => {
+  DOBStatus3["OPEN"] = "open";
+  DOBStatus3["CLOSE"] = "close";
+  return DOBStatus3;
+})(DOBStatus || {});
 var schemaOccurrenceBook = Joi88.object({
   _id: Joi88.string().optional().allow(null, ""),
   site: Joi88.string().hex().required(),
@@ -33835,7 +33863,12 @@ function useOccurrenceBookRepo() {
   async function createIndexes() {
     try {
       await collection.createIndexes([
-        { key: { site: 1, status: 1, date: 1, closedAt: 1 } }
+        { key: { site: 1, status: 1, date: 1, closedAt: 1 } },
+        {
+          key: { site: 1, date: 1 },
+          unique: true,
+          name: "unique_site_date"
+        }
       ]);
     } catch (error) {
       throw new InternalServerError48(
@@ -34233,7 +34266,9 @@ function useOccurrenceBookService() {
         site: site._id,
         date: baseDate.toISOString(),
         closedAt: closedAt.toISOString(),
-        entryCounter
+        entryCounter,
+        totalInput: 0,
+        status: "open" /* OPEN */
       }));
       await _bulkCreate(payloads, session);
       await session?.commitTransaction();
@@ -45453,6 +45488,7 @@ export {
   BulletinStatus,
   CameraType,
   DEVICE_STATUS,
+  DOBStatus,
   DayOfWeek,
   EAccessCardTypes,
   EAccessCardUserTypes,