@7365admin1/core 3.43.0 → 3.44.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.44.0
+
+### Minor Changes
+
+- adbcf07: block, level, units upload modifications
+
 ## 3.43.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -4003,7 +4003,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
 declare const visitors_namespace_collection = "visitor.transactions";
 declare function useVisitorTransactionRepo(): {
     add: (value: TVisitorTransaction, session?: ClientSession, returnValue?: boolean) => Promise<any>;
-    getAll: ({ search, page, limit, sort, status, org, site, dateTo, dateFrom, type, checkedOut, plateNumber, tab, }: {
+    getAll: ({ search, page, limit, sort, status, org, site, dateTo, dateFrom, type, checkedOut, plateNumber, tab, passOrKey, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -4017,6 +4017,10 @@ declare function useVisitorTransactionRepo(): {
         checkedOut?: Boolean | undefined;
         plateNumber?: string | undefined;
         tab?: string | undefined;
+        passOrKey?: {
+            keyId: string;
+            type: string;
+        } | undefined;
     }) => Promise<{
         items: any[];
         pages: number;

package/dist/index.js

@@ -22369,7 +22369,8 @@ function useVisitorTransactionRepo() {
     type = "",
     checkedOut,
     plateNumber = "",
-    tab = ""
+    tab = "",
+    passOrKey
   }) {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
@@ -22400,7 +22401,9 @@ function useVisitorTransactionRepo() {
       },
       ...plateNumber && { plateNumber },
       ...status && { status },
-      ...tab == "Overnight Parking" && { isOvernightParking: true }
+      ...tab == "Overnight Parking" && { isOvernightParking: true },
+      ...passOrKey?.type == "pass" && { visitorPass: { $elemMatch: { keyId: new import_mongodb44.ObjectId(passOrKey.keyId) } } },
+      ...passOrKey?.type == "key" && { passKeys: { $elemMatch: { keyId: new import_mongodb44.ObjectId(passOrKey.keyId) } } }
     };
     const finalSort = Object.keys(sort).length > 0 ? sort : { latestDate: -1 };
     try {
@@ -31339,7 +31342,7 @@ function useBuildingController() {
       const requiredFields = ["block", "name"];
       const rowSchema = import_joi48.default.object({
         block: import_joi48.default.number().integer().min(0).required(),
-        name: import_joi48.default.string().trim().required(),
+        name: import_joi48.default.alternatives().try(import_joi48.default.string(), import_joi48.default.number()).custom((value) => String(value).trim()).required(),
         level: import_joi48.default.alternatives().try(import_joi48.default.string(), import_joi48.default.number()).custom((value) => String(value)).optional().allow(null, ""),
         unit: import_joi48.default.alternatives().try(import_joi48.default.string(), import_joi48.default.number()).custom((value) => String(value)).optional().allow(null, ""),
         category: import_joi48.default.string().trim().optional().allow(null, ""),
@@ -39215,7 +39218,20 @@ function useVisitorTransactionController() {
         checkedOut: import_joi58.default.boolean().allow(null, ""),
         plateNumber: import_joi58.default.string().optional().allow(null, ""),
         order: import_joi58.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
-        tab: import_joi58.default.string().optional().allow(null, "")
+        tab: import_joi58.default.string().optional().allow(null, ""),
+        passOrKey: import_joi58.default.alternatives().try(
+          import_joi58.default.object({
+            keyId: import_joi58.default.string().regex(/^[0-9a-fA-F]{24}$/).required(),
+            type: import_joi58.default.string().required()
+          }),
+          import_joi58.default.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
@@ -39240,7 +39256,8 @@ function useVisitorTransactionController() {
         sort,
         order,
         plateNumber,
-        tab
+        tab,
+        passOrKey
       } = value;
       const sortObj = {
         [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
@@ -39258,7 +39275,8 @@ function useVisitorTransactionController() {
         type,
         checkedOut,
         plateNumber,
-        tab
+        tab,
+        passOrKey
       });
       res.status(200).json(data);
       return;