@7365admin1/core 3.32.2-staging.3 → 3.32.2-staging.5

package/dist/index.d.ts

@@ -2965,7 +2965,7 @@ declare function useVisitorTransactionRepo(): {
         pageRange: string;
     }>;
     getOpenByPlateNumber: (plateNumber: string, site: string | ObjectId) => Promise<TVisitorTransaction | null | undefined>;
-    updateById: (_id: string | ObjectId, value: Partial<TVisitorTransaction>, session?: ClientSession, isManualCheckOut?: boolean) => Promise<mongodb.UpdateResult<bson.Document>>;
+    updateById: (_id: string | ObjectId, value: Partial<TVisitorTransaction>, session?: ClientSession, isManualCheckOut?: boolean) => Promise<mongodb.UpdateResult<bson.Document> | undefined>;
     deleteVisitorTransaction: (_id: string | ObjectId) => Promise<number>;
     createTextIndex: () => Promise<void>;
     getDeliveryPickupTransactions: () => Promise<mongodb.WithId<bson.Document>[]>;
@@ -7261,6 +7261,7 @@ declare function usePostPrelovedRepo(): {
     updateById: (_id: string | ObjectId, value: Partial<TPost>, session?: any) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: any) => Promise<number>;
     updateStatus: (_id: string | ObjectId, status: PostStatus, session?: any) => Promise<mongodb.UpdateResult<bson.Document>>;
+    createIndexes: () => Promise<string>;
 };
 
 declare function usePostPrelovedController(): {
@@ -7648,7 +7649,7 @@ declare function useFormEntryRepo(): {
         items: any[];
         pages: number;
         pageRange: string;
-    } | TFormEntry>;
+    }>;
 };
 
 declare function useFormEntryController(): {

package/dist/index.js

@@ -22137,7 +22137,14 @@ function useVisitorTransactionRepo() {
         }
       });
       if (Array.isArray(value.visitorPass)) {
-        value.visitorPass.forEach((item, index) => {
+        const visitorPassMap = /* @__PURE__ */ new Map();
+        value.visitorPass.forEach((item) => {
+          if (item.keyId) {
+            visitorPassMap.set(item.keyId.toString(), item);
+          }
+        });
+        const uniqueVisitorPass = Array.from(visitorPassMap.values());
+        uniqueVisitorPass.forEach((item, index) => {
           if (item.add === true) {
             const { add: add2, ...cleanItem } = item;
             cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Pass Id");
@@ -22150,8 +22157,7 @@ function useVisitorTransactionRepo() {
             Object.keys(item).forEach((itemKey) => {
               if (itemKey !== "keyId") {
                 const typedItemKey = itemKey;
-                let itemValue = item[typedItemKey];
-                updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = itemValue;
+                updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = item[typedItemKey];
               }
             });
             arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
@@ -22159,7 +22165,14 @@ function useVisitorTransactionRepo() {
         });
       }
       if (Array.isArray(value.passKeys)) {
-        value.passKeys.forEach((item, index) => {
+        const passKeysMap = /* @__PURE__ */ new Map();
+        value.passKeys.forEach((item) => {
+          if (item.keyId) {
+            passKeysMap.set(item.keyId.toString(), item);
+          }
+        });
+        const uniquePassKeys = Array.from(passKeysMap.values());
+        uniquePassKeys.forEach((item, index) => {
           if (item.add === true) {
             const { add: add2, ...cleanItem } = item;
             cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Key Id");
@@ -22172,32 +22185,34 @@ function useVisitorTransactionRepo() {
             Object.keys(item).forEach((itemKey) => {
               if (itemKey !== "keyId") {
                 const typedItemKey = itemKey;
-                let itemValue = item[typedItemKey];
-                updateFields[`passKeys.$[${elementKey}].${itemKey}`] = itemValue;
+                updateFields[`passKeys.$[${elementKey}].${itemKey}`] = item[typedItemKey];
               }
             });
             arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
           }
         });
       }
-      const updatePayload = {};
+      let result;
       if (Object.keys(updateFields).length > 0) {
-        updatePayload.$set = updateFields;
+        result = await collection.updateOne(
+          { _id: new import_mongodb41.ObjectId(_id) },
+          { $set: updateFields },
+          {
+            ...arrayFilters.length > 0 && { arrayFilters },
+            session
+          }
+        );
       }
       if (Object.keys(pushFields).length > 0) {
-        updatePayload.$push = pushFields;
+        result = await collection.updateOne(
+          { _id: new import_mongodb41.ObjectId(_id) },
+          { $push: pushFields },
+          { session }
+        );
       }
-      const result = await collection.updateOne(
-        { _id: new import_mongodb41.ObjectId(_id) },
-        updatePayload,
-        {
-          ...arrayFilters.length > 0 && { arrayFilters },
-          // Only pass if not empty
-          session
-        }
-      );
       return result;
     } catch (error) {
+      console.log("Error in updateById visitor transaction repo", error);
       throw error;
     }
   }
@@ -35469,7 +35484,7 @@ function useVisitorTransactionService() {
             } else if (item?.status && VALID_STATUSES.has(item.status)) {
               status = item.status;
             } else {
-              throw new Error("Invalid Visitor Pass Status");
+              throw new Error("Invalid Key Status");
             }
             await KeyRepo.updateKeyById(
               item.keyId,
@@ -67058,6 +67073,26 @@ function usePostPrelovedRepo() {
     }
   };
   const collection = db.collection(POST_COLLECTION);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        // getAll: site browse filtered by status, sorted by recency (default sort)
+        { key: { site: 1, status: 1, createdAt: -1 } },
+        // getAll: global browse (no site) sorted by recency
+        { key: { status: 1, createdAt: -1 } },
+        // getByOwnerId: a user's own posts, sorted by recency
+        { key: { createdBy: 1, status: 1, createdAt: -1 } },
+        // category / subcategory faceted filtering
+        { key: { category: 1, status: 1 } },
+        { key: { subcategory: 1, status: 1 } }
+      ]);
+      return `Successfully created indexes for ${POST_COLLECTION}.`;
+    } catch (error) {
+      throw new import_node_server_utils237.InternalServerError(
+        "Failed to create indexes on post-preloved."
+      );
+    }
+  }
   function buildSortObj(filter) {
     switch (filter) {
       case "price-low-high":
@@ -67390,7 +67425,8 @@ function usePostPrelovedRepo() {
     getByOwnerId,
     updateById,
     deleteById,
-    updateStatus
+    updateStatus,
+    createIndexes
   };
 }
 
@@ -69797,15 +69833,6 @@ function useFormEntryRepo() {
     const user = new import_mongodb153.ObjectId(userId);
     const siteId = new import_mongodb153.ObjectId(site);
     const orgId = new import_mongodb153.ObjectId(org);
-    const cacheOptions = {
-      page,
-      limit,
-      sort: JSON.stringify(sort),
-      userId: user,
-      site: siteId,
-      org: orgId,
-      ...search && { search }
-    };
     const query = {
       userId: user,
       site: siteId,
@@ -69817,15 +69844,6 @@ function useFormEntryRepo() {
         { unitNumber: { $regex: search, $options: "i" } }
       ];
     }
-    const cacheKey = (0, import_node_server_utils256.makeCacheKey)(
-      online_forms_namespace_collection,
-      cacheOptions
-    );
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils256.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
       const items = await collection.aggregate([
         { $match: query },
@@ -69835,11 +69853,6 @@ function useFormEntryRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_node_server_utils256.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils256.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils256.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw error;