@7365admin1/core 2.52.0 → 2.53.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.53.0
+
+### Minor Changes
+
+- 77eff04: release new/latest core package version (hot fix issue)
+
 ## 2.52.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1854,7 +1854,7 @@ declare function useBuildingRepo(): {
     getById: (_id: string | ObjectId) => Promise<TBuilding | null>;
     updateById: (_id: ObjectId | string, value: Pick<TBuilding, "name" | "block" | "levels" | "buildingFiles">, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
-    getBuildingLevel: (site: string | ObjectId, block: number, isVMS: boolean) => Promise<bson.Document[] | TBuilding>;
+    getBuildingLevel: (site: string | ObjectId, block: number) => Promise<mongodb.WithId<bson.Document> | TBuilding | null>;
 };
 
 declare function useBuildingService(): {

package/dist/index.js

@@ -19481,7 +19481,7 @@ function useBuildingRepo() {
       }
     }
   }
-  async function getBuildingLevel(site, block, isVMS) {
+  async function getBuildingLevel(site, block) {
     try {
       site = new import_mongodb49.ObjectId(site);
     } catch (error) {
@@ -19491,7 +19491,8 @@ function useBuildingRepo() {
       site,
       block
     };
-    const cacheKey = (0, import_node_server_utils82.makeCacheKey)(buildings_namespace_collection, { ...query, isVMS });
+    const cacheOptions = { ...query };
+    const cacheKey = (0, import_node_server_utils82.makeCacheKey)(buildings_namespace_collection, cacheOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -19501,24 +19502,7 @@ function useBuildingRepo() {
         });
         return cached;
       }
-      const pipeline = [{ $match: { ...query } }];
-      if (isVMS) {
-        pipeline.push({
-          $lookup: {
-            from: "building-levels",
-            let: { id: "$_id" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$block", "$$id"] }
-                }
-              }
-            ],
-            as: "building_levels"
-          }
-        });
-      }
-      const result = await collection.aggregate(pipeline).toArray();
+      const result = await collection.findOne(query);
       setCache(cacheKey, result, 300).then(() => {
         import_node_server_utils82.logger.log({
           level: "info",
@@ -19853,7 +19837,6 @@ function useBuildingController() {
   async function getBuildingLevel(req, res, next) {
     const site = req.params.site ?? "";
     let block = req.query.block;
-    const isVMS = req.query.isVMS;
     const validation = import_joi44.default.object({
       site: import_joi44.default.string().hex().required(),
       block: import_joi44.default.number().required()
@@ -19865,7 +19848,7 @@ function useBuildingController() {
     }
     block = parseInt(block) ?? 0;
     try {
-      const siteBlock = await _getBuildingLevel(site, block, isVMS);
+      const siteBlock = await _getBuildingLevel(site, block);
       res.json(siteBlock);
       return;
     } catch (error2) {
@@ -20668,7 +20651,8 @@ function useVehicleController() {
         recNo: import_joi46.default.string().optional().allow(null, ""),
         type: import_joi46.default.string().optional().valid(...Object.values(VehicleType)).allow(null, ""),
         peopleId: import_joi46.default.string().hex().length(24).optional().allow(null, ""),
-        seasonPassType: import_joi46.default.string().optional().allow("", null)
+        seasonPassType: import_joi46.default.string().optional().allow("", null),
+        remarks: import_joi46.default.string().optional().allow("", null)
       });
       const { error, value } = schema2.validate(
         {