@7365admin1/core 3.43.0 → 3.44.0

package/dist/index.mjs

@@ -22035,7 +22035,8 @@ function useVisitorTransactionRepo() {
     type = "",
     checkedOut,
     plateNumber = "",
-    tab = ""
+    tab = "",
+    passOrKey
   }) {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
@@ -22066,7 +22067,9 @@ function useVisitorTransactionRepo() {
       },
       ...plateNumber && { plateNumber },
       ...status && { status },
-      ...tab == "Overnight Parking" && { isOvernightParking: true }
+      ...tab == "Overnight Parking" && { isOvernightParking: true },
+      ...passOrKey?.type == "pass" && { visitorPass: { $elemMatch: { keyId: new ObjectId44(passOrKey.keyId) } } },
+      ...passOrKey?.type == "key" && { passKeys: { $elemMatch: { keyId: new ObjectId44(passOrKey.keyId) } } }
     };
     const finalSort = Object.keys(sort).length > 0 ? sort : { latestDate: -1 };
     try {
@@ -31067,7 +31070,7 @@ function useBuildingController() {
       const requiredFields = ["block", "name"];
       const rowSchema = Joi48.object({
         block: Joi48.number().integer().min(0).required(),
-        name: Joi48.string().trim().required(),
+        name: Joi48.alternatives().try(Joi48.string(), Joi48.number()).custom((value) => String(value).trim()).required(),
         level: Joi48.alternatives().try(Joi48.string(), Joi48.number()).custom((value) => String(value)).optional().allow(null, ""),
         unit: Joi48.alternatives().try(Joi48.string(), Joi48.number()).custom((value) => String(value)).optional().allow(null, ""),
         category: Joi48.string().trim().optional().allow(null, ""),
@@ -38997,7 +39000,20 @@ function useVisitorTransactionController() {
         checkedOut: Joi58.boolean().allow(null, ""),
         plateNumber: Joi58.string().optional().allow(null, ""),
         order: Joi58.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
-        tab: Joi58.string().optional().allow(null, "")
+        tab: Joi58.string().optional().allow(null, ""),
+        passOrKey: Joi58.alternatives().try(
+          Joi58.object({
+            keyId: Joi58.string().regex(/^[0-9a-fA-F]{24}$/).required(),
+            type: Joi58.string().required()
+          }),
+          Joi58.string().custom((value2, helpers) => {
+            try {
+              return JSON.parse(value2);
+            } catch (e) {
+              return helpers.error("any.invalid");
+            }
+          })
+        ).optional().allow(null)
       });
       const { error, value } = validation.validate(req.query, {
         abortEarly: false
@@ -39022,7 +39038,8 @@ function useVisitorTransactionController() {
         sort,
         order,
         plateNumber,
-        tab
+        tab,
+        passOrKey
       } = value;
       const sortObj = {
         [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
@@ -39040,7 +39057,8 @@ function useVisitorTransactionController() {
         type,
         checkedOut,
         plateNumber,
-        tab
+        tab,
+        passOrKey
       });
       res.status(200).json(data);
       return;