@7365admin1/core 2.68.0 → 2.69.1

package/dist/index.js

@@ -4138,6 +4138,11 @@ function useAuthService() {
           "Your account is currently suspended. Please contact support for assistance."
         );
       }
+      if (user.status === "pending") {
+        throw new import_node_server_utils13.BadRequestError(
+          "Your account is currently pending. Please contact support for assistance."
+        );
+      }
       const isPasswordValid = await (0, import_node_server_utils13.comparePassword)(password, user.password);
       if (!isPasswordValid) {
         throw new import_node_server_utils13.BadRequestError("Invalid password.");
@@ -4920,6 +4925,155 @@ function useOrgRepo() {
       throw new import_node_server_utils17.InternalServerError("Failed to update organization status.");
     }
   }
+  async function getOrganizationsWithSubscription({
+    search = "",
+    page = 1,
+    limit = 10,
+    status = "active",
+    type = "",
+    billingCycle = ""
+  }) {
+    const normalizedPage = page > 0 ? page - 1 : 0;
+    const query = {
+      status
+    };
+    if (search) {
+      query.$or = [
+        {
+          name: {
+            $regex: search,
+            $options: "i"
+          }
+        },
+        {
+          email: {
+            $regex: search,
+            $options: "i"
+          }
+        }
+      ];
+    }
+    const subscriptionMatch = {};
+    if (type) {
+      subscriptionMatch["subscription.type"] = type;
+    }
+    if (billingCycle) {
+      subscriptionMatch["subscription.billingCycle"] = billingCycle;
+    }
+    const lookupStage = {
+      $lookup: {
+        from: "subscriptions",
+        let: {
+          orgId: "$_id"
+        },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $eq: [
+                  "$org",
+                  "$$orgId"
+                ]
+              }
+            }
+          },
+          {
+            $sort: {
+              createdAt: -1
+            }
+          },
+          {
+            $limit: 1
+          }
+        ],
+        as: "subscription"
+      }
+    };
+    const unwindStage = {
+      $unwind: {
+        path: "$subscription",
+        preserveNullAndEmptyArrays: true
+      }
+    };
+    try {
+      const pipeline = [
+        {
+          $match: query
+        },
+        lookupStage,
+        unwindStage,
+        ...Object.keys(subscriptionMatch).length ? [
+          {
+            $match: subscriptionMatch
+          }
+        ] : [],
+        {
+          $project: {
+            _id: 1,
+            name: 1,
+            email: 1,
+            nature: 1,
+            description: 1,
+            status: 1,
+            createdAt: 1,
+            subscription: {
+              _id: "$subscription._id",
+              org: "$subscription.org",
+              type: "$subscription.type",
+              paidSeats: "$subscription.paidSeats",
+              currentSeats: "$subscription.currentSeats",
+              maxSeats: "$subscription.maxSeats",
+              billingCycle: "$subscription.billingCycle",
+              nextBillingDate: "$subscription.nextBillingDate",
+              createdAt: "$subscription.createdAt",
+              status: "$subscription.status"
+            }
+          }
+        },
+        {
+          $sort: {
+            _id: -1
+          }
+        },
+        {
+          $skip: normalizedPage * limit
+        },
+        {
+          $limit: limit
+        }
+      ];
+      const items = await collection.aggregate(pipeline).toArray();
+      const countPipeline = [
+        {
+          $match: query
+        },
+        lookupStage,
+        unwindStage,
+        ...Object.keys(subscriptionMatch).length ? [
+          {
+            $match: subscriptionMatch
+          }
+        ] : [],
+        {
+          $count: "total"
+        }
+      ];
+      const countResult = await collection.aggregate(countPipeline).toArray();
+      const totalItems = countResult?.[0]?.total ?? 0;
+      return (0, import_node_server_utils17.paginate)(
+        items,
+        normalizedPage,
+        limit,
+        totalItems
+      );
+    } catch (error) {
+      import_node_server_utils17.logger.log({
+        level: "error",
+        message: `${error}`
+      });
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -4933,7 +5087,8 @@ function useOrgRepo() {
     updateFieldById,
     updateStatusById,
     deleteById,
-    getOrgsByEmail
+    getOrgsByEmail,
+    getOrganizationsWithSubscription
   };
 }
 
@@ -5832,6 +5987,44 @@ function useVerificationRepoV2() {
       throw new import_node_server_utils20.InternalServerError("Failed to count pending invitations.");
     }
   }
+  async function getPendingVerificationByEmail(email) {
+    try {
+      return await collection.findOne(
+        {
+          email,
+          status: "pending" /* PENDING */,
+          type: "user-sign-up" /* USER_SIGN_UP */
+        },
+        {
+          sort: { createdAt: -1 }
+        }
+      );
+    } catch (error) {
+      throw new import_node_server_utils20.InternalServerError(
+        "Failed to retrieve verification."
+      );
+    }
+  }
+  async function updateVerificationCodeById(_id, verificationCode, expireAt, session) {
+    try {
+      _id = new import_mongodb18.ObjectId(_id);
+      return await collection.updateOne(
+        { _id },
+        {
+          $set: {
+            "metadata.verificationCode": verificationCode,
+            expireAt,
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          }
+        },
+        { session }
+      );
+    } catch (error) {
+      throw new import_node_server_utils20.InternalServerError(
+        "Failed to update verification code."
+      );
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -5841,7 +6034,9 @@ function useVerificationRepoV2() {
     getVerificationById,
     getVerifications,
     updateStatusById,
-    countPendingOrgInvites
+    countPendingOrgInvites,
+    getPendingVerificationByEmail,
+    updateVerificationCodeById
   };
 }
 
@@ -9190,7 +9385,7 @@ function useOrgController() {
 var import_joi19 = __toESM(require("joi"));
 var import_node_server_utils36 = require("@7365admin1/node-server-utils");
 function useOrgControllerV2() {
-  const { getAll: _getAll } = useOrgRepo();
+  const { getAll: _getAll, getOrganizationsWithSubscription: _getOrganizationsWithSubscription } = useOrgRepo();
   async function getAll(req, res, next) {
     const validation = import_joi19.default.object({
       search: import_joi19.default.string().optional().allow("", null),
@@ -9230,8 +9425,43 @@ function useOrgControllerV2() {
       return;
     }
   }
+  async function getOrganizationsWithSubscription(req, res, next) {
+    const validation = import_joi19.default.object({
+      search: import_joi19.default.string().optional().allow("", null),
+      page: import_joi19.default.number().integer().min(1).default(1),
+      limit: import_joi19.default.number().integer().min(1).max(100).default(10),
+      status: import_joi19.default.string().trim().valid("active", "suspended", "deleted").default("active"),
+      type: import_joi19.default.string().optional().allow("", null),
+      billingCycle: import_joi19.default.string().optional().allow("", null)
+    });
+    const { error, value } = validation.validate(
+      req.query,
+      {
+        convert: true,
+        stripUnknown: true
+      }
+    );
+    if (error) {
+      next(new import_node_server_utils36.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getOrganizationsWithSubscription({
+        search: value.search ?? "",
+        page: value.page ?? 1,
+        limit: value.limit ?? 10,
+        status: value.status ?? "active",
+        type: value.type ?? "",
+        billingCycle: value.billingCycle ?? ""
+      });
+      res.json(data);
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
-    getAll
+    getAll,
+    getOrganizationsWithSubscription
   };
 }
 
@@ -31877,6 +32107,7 @@ function useDocumentManagementRepo() {
   async function createIndex() {
     try {
       await collection.createIndexes([
+        { key: { type: 1 } },
         { key: { site: 1 } },
         { key: { parentId: 1 } }
       ]);
@@ -31919,8 +32150,7 @@ function useDocumentManagementRepo() {
     search = "",
     page = 1,
     limit = 10,
-    sort = {},
-    status = "active",
+    type = "all",
     org = "",
     site = "",
     parentId = ""
@@ -31931,17 +32161,18 @@ function useDocumentManagementRepo() {
     } catch (error) {
       throw new import_node_server_utils136.BadRequestError("Invalid site ID format.");
     }
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
       page,
       limit,
-      status,
-      site: site?.toString(),
-      sort: JSON.stringify(sort)
+      site: site?.toString()
     };
     const query = {
-      ...status ? { $and: [{ status }, { status: { $ne: "deleted" } }] } : { status: { $ne: "deleted" } }
+      status: { $ne: "deleted" }
     };
+    if (type && type !== "all") {
+      query.type = type;
+      cacheOptions.type = type;
+    }
     if (org) {
       query.org = new import_mongodb79.ObjectId(org);
       cacheOptions.org = org.toString();
@@ -31972,19 +32203,17 @@ function useDocumentManagementRepo() {
     try {
       const items = await collection.aggregate([
         { $match: query },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit },
+        { $sort: { _id: -1 } },
         {
           $project: {
+            parentId: 1,
             name: 1,
             type: 1,
-            status: 1,
-            attachment: 1,
-            parentId: 1,
-            remarks: 1,
+            size: 1,
             createdAt: 1,
-            updatedAt: 1
+            updatedAt: 1,
+            remarks: 1,
+            attachment: 1
           }
         }
       ]).toArray();
@@ -32260,13 +32489,12 @@ function useDocumentManagementController() {
       search: import_joi76.default.string().optional().allow("", null),
       page: import_joi76.default.number().integer().min(1).allow("", null).default(1),
       limit: import_joi76.default.number().integer().min(1).max(100).allow("", null).default(10),
-      status: import_joi76.default.string().required(),
+      type: import_joi76.default.string().valid("all", "pdf", "csv", "doc").optional().default("all"),
       org: import_joi76.default.string().hex().optional().allow("", null),
       site: import_joi76.default.string().hex().optional().allow("", null),
       parentId: import_joi76.default.string().hex().optional().allow("", null)
     });
     const query = { ...req.query };
-    query.status = req.query.status;
     const { error } = validation.validate(query);
     if (error) {
       import_node_server_utils138.logger.log({ level: "error", message: error.message });
@@ -32276,7 +32504,7 @@ function useDocumentManagementController() {
     const search = req.query.search ?? "";
     const page = parseInt(req.query.page ?? "1");
     const limit = parseInt(req.query.limit ?? "10");
-    const status = req.query.status ?? "active";
+    const type = req.query.type ?? "all";
     const org = req.query.org ?? "";
     const site = req.query.site ?? "";
     const parentId = req.query.parentId ?? "";
@@ -32285,7 +32513,7 @@ function useDocumentManagementController() {
         search,
         page,
         limit,
-        status,
+        type,
         org,
         site,
         parentId
@@ -32862,8 +33090,12 @@ function useBulletinBoardService() {
   async function add(value) {
     const session = import_node_server_utils140.useAtlas.getClient()?.startSession();
     session?.startTransaction();
-    if (value.startDate && new Date(value.startDate) > /* @__PURE__ */ new Date()) {
-      value.status = "upcoming" /* UPCOMING */;
+    if (value.startDate) {
+      const today = /* @__PURE__ */ new Date();
+      today.setHours(23, 59, 0, 0);
+      if (new Date(value.startDate) > today) {
+        value.status = "upcoming" /* UPCOMING */;
+      }
     }
     try {
       const bulletinFiles = value?.file ?? [];
@@ -32894,6 +33126,15 @@ function useBulletinBoardService() {
   async function updateBulletinBoardById(id, value) {
     const session = import_node_server_utils140.useAtlas.getClient()?.startSession();
     session?.startTransaction();
+    if (value.startDate) {
+      const today = /* @__PURE__ */ new Date();
+      today.setHours(23, 59, 0, 0);
+      if (new Date(value.startDate) > today) {
+        value.status = "upcoming" /* UPCOMING */;
+      } else {
+        value.status = "active" /* ACTIVE */;
+      }
+    }
     try {
       await _updateBulletinBoardById(id, value, session);
       await session?.commitTransaction();
@@ -39154,6 +39395,33 @@ function UseAccessManagementRepo() {
       throw new Error(error.message);
     }
   }
+  async function userAccessCardsRepo({
+    userId,
+    siteId,
+    isLiftCard
+  }) {
+    try {
+      siteId = new import_mongodb92.ObjectId(siteId);
+      userId = new import_mongodb92.ObjectId(userId);
+      const query = {
+        site: siteId,
+        userId,
+        isLiftCard,
+        userType: "Visitor/Resident" /* DEFAULT */
+      };
+      console.log(query);
+      const res = await collection().aggregate([
+        {
+          $match: {
+            ...query
+          }
+        }
+      ]).toArray();
+      return res;
+    } catch (error) {
+      throw new Error(error.message);
+    }
+  }
   return {
     createIndexes,
     createIndexForEntrypass,
@@ -39190,7 +39458,8 @@ function UseAccessManagementRepo() {
     assignMultipleCardsRepo,
     visitorCheckoutRepo,
     uploadTemplateRepo,
-    getResidentsRepo
+    getResidentsRepo,
+    userAccessCardsRepo
   };
 }
 
@@ -39235,7 +39504,8 @@ function useAccessManagementSvc() {
     assignMultipleCardsRepo,
     visitorCheckoutRepo,
     uploadTemplateRepo,
-    getResidentsRepo
+    getResidentsRepo,
+    userAccessCardsRepo
   } = UseAccessManagementRepo();
   const addPhysicalCardSvc = async (payload) => {
     try {
@@ -39597,6 +39867,22 @@ function useAccessManagementSvc() {
       throw new Error(err.message);
     }
   };
+  const userAccessCardsSvc = async ({
+    userId,
+    siteId,
+    isLiftCard
+  }) => {
+    try {
+      const response = await userAccessCardsRepo({
+        userId,
+        siteId,
+        isLiftCard
+      });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
   return {
     addPhysicalCardSvc,
     addNonPhysicalCardSvc,
@@ -39636,7 +39922,8 @@ function useAccessManagementSvc() {
     assignMultipleCardsSvc,
     visitorCheckoutSvc,
     uploadTemplateSvc,
-    getResidentsSvc
+    getResidentsSvc,
+    userAccessCardsSvc
   };
 }
 
@@ -39681,7 +39968,8 @@ function useAccessManagementController() {
     assignMultipleCardsSvc,
     visitorCheckoutSvc,
     uploadTemplateSvc,
-    getResidentsSvc
+    getResidentsSvc,
+    userAccessCardsSvc
   } = useAccessManagementSvc();
   const addPhysicalCard = async (req, res) => {
     try {
@@ -40705,6 +40993,32 @@ function useAccessManagementController() {
       });
     }
   };
+  const userAccessCards = async (req, res) => {
+    try {
+      const { userId, siteId, isLiftCard } = req.query;
+      const schema2 = import_joi87.default.object({
+        isLiftCard: import_joi87.default.string().valid("true", "false").required(),
+        siteId: import_joi87.default.string().hex().required(),
+        userId: import_joi87.default.string().hex().required()
+      });
+      const { error } = schema2.validate({ userId, siteId, isLiftCard });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const isLiftCardBool = isLiftCard === "true";
+      const result = await userAccessCardsSvc({
+        userId,
+        siteId,
+        isLiftCard: isLiftCardBool
+      });
+      return res.status(200).json({ data: result });
+    } catch (error) {
+      return res.status(400).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
   return {
     addPhysicalCard,
     addNonPhysicalCard,
@@ -40742,7 +41056,8 @@ function useAccessManagementController() {
     assignMultipleCards,
     visitorCheckout,
     uploadTemplate,
-    getResidents
+    getResidents,
+    userAccessCards
   };
 }
 
@@ -52767,7 +53082,9 @@ function useVerificationServiceV2() {
     updateVerificationStatusById: _updateVerificationStatusById,
     getByVerificationCode: _getByVerificationCode,
     updateStatusById: _updateStatusById,
-    countPendingOrgInvites: _countPendingOrgInvites
+    countPendingOrgInvites: _countPendingOrgInvites,
+    getPendingVerificationByEmail: _getPendingVerificationByEmail,
+    updateVerificationCodeById: _updateVerificationCodeById
   } = useVerificationRepoV2();
   const {
     getUserByEmailStatus: _getUserByEmailStatus,
@@ -53110,6 +53427,50 @@ function useVerificationServiceV2() {
       );
     }
   }
+  async function resendSignUpVerification(email) {
+    const item = await _getPendingVerificationByEmail(email);
+    if (!item) {
+      throw new import_node_server_utils225.NotFoundError(
+        "Pending verification not found."
+      );
+    }
+    if (item.status !== "pending" /* PENDING */) {
+      throw new import_node_server_utils225.BadRequestError(
+        "Verification is no longer active."
+      );
+    }
+    const verificationCode = generateVerificationCode(6);
+    const expireAt = new Date(
+      (/* @__PURE__ */ new Date()).getTime() + 15 * 60 * 1e3
+    ).toISOString();
+    await _updateVerificationCodeById(
+      String(item._id),
+      verificationCode,
+      expireAt
+    );
+    const dir = __dirname;
+    const filePath = (0, import_node_server_utils225.getDirectory)(
+      dir,
+      "./public/handlebars/sign-up-v2"
+    );
+    const emailContent = (0, import_node_server_utils225.compileHandlebar)({
+      context: {
+        email,
+        validity: "15 minutes",
+        code: verificationCode
+      },
+      filePath
+    });
+    await mailer.sendMail({
+      to: email,
+      subject: "Sign Up Verification",
+      html: emailContent,
+      sender: "iService365" /* ISERVICE365 */
+    });
+    return {
+      message: "Verification code resent successfully."
+    };
+  }
   return {
     signUp,
     verify,
@@ -53117,7 +53478,8 @@ function useVerificationServiceV2() {
     createOrganizationInvite,
     createServiceProviderInvite,
     createForgetPassword,
-    cancelUserInvitation
+    cancelUserInvitation,
+    resendSignUpVerification
   };
 }
 
@@ -53131,7 +53493,8 @@ function useVerificationControllerV2() {
     createOrganizationInvite: _createOrganizationInvite,
     createServiceProviderInvite: _createServiceProviderInvite,
     createForgetPassword: _createForgetPassword,
-    cancelUserInvitation: _cancelUserInvitation
+    cancelUserInvitation: _cancelUserInvitation,
+    resendSignUpVerification: _resendSignUpVerification
   } = useVerificationServiceV2();
   const { getVerifications: _getVerifications } = useVerificationRepoV2();
   async function verify(req, res, next) {
@@ -53345,6 +53708,27 @@ function useVerificationControllerV2() {
       return;
     }
   }
+  async function resendSignUpVerification(req, res, next) {
+    const schema2 = import_joi129.default.object({
+      email: import_joi129.default.string().email().lowercase().required()
+    });
+    const { error, value } = schema2.validate(req.body);
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      next(new import_node_server_utils226.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _resendSignUpVerification(
+        value.email
+      );
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+      return;
+    }
+  }
   return {
     verify,
     createUserInvite,
@@ -53352,7 +53736,8 @@ function useVerificationControllerV2() {
     createServiceProviderInvite,
     createForgetPassword,
     getVerifications,
-    cancelUserInvitation
+    cancelUserInvitation,
+    resendSignUpVerification
   };
 }
 
@@ -53847,6 +54232,11 @@ function useAuthServiceV2() {
           "Your account is currently suspended. Please contact support for assistance."
         );
       }
+      if (user.status === "pending") {
+        throw new import_node_server_utils228.BadRequestError(
+          "Your account is currently pending. Please contact support for assistance."
+        );
+      }
       const isPasswordValid = await (0, import_node_server_utils228.comparePassword)(password, user.password);
       if (!isPasswordValid) {
         throw new import_node_server_utils228.BadRequestError("Invalid password.");
@@ -54723,7 +55113,8 @@ var schemaPost = import_joi133.default.object({
   title: import_joi133.default.string().required(),
   description: import_joi133.default.string().optional().allow("", null),
   attachments: import_joi133.default.array().items(import_joi133.default.string().hex().optional()).optional().allow(null),
-  category: import_joi133.default.array().items(import_joi133.default.string().hex().optional()).optional().allow(null),
+  category: import_joi133.default.string().optional().allow(null),
+  subcategory: import_joi133.default.string().optional().allow(null),
   currency: import_joi133.default.string().optional().allow("", null),
   price: import_joi133.default.number().required(),
   status: import_joi133.default.string().valid(...Object.values(PostStatus)).optional().default("published" /* PUBLISHED */),
@@ -54739,7 +55130,8 @@ var schemaUpdatePost = import_joi133.default.object({
   title: import_joi133.default.string().optional().allow("", null),
   description: import_joi133.default.string().optional().allow("", null),
   attachments: import_joi133.default.array().items(import_joi133.default.string().hex().optional()).optional().allow(null),
-  category: import_joi133.default.array().items(import_joi133.default.string().hex().optional()).optional().allow(null),
+  category: import_joi133.default.string().optional().allow(null),
+  subcategory: import_joi133.default.string().optional().allow(null),
   currency: import_joi133.default.string().optional().allow("", null),
   price: import_joi133.default.number().optional(),
   status: import_joi133.default.string().valid(...Object.values(PostStatus)).optional().allow(null),
@@ -54790,24 +55182,27 @@ function MPost(value) {
       return id;
     });
   }
-  if (value.category && Array.isArray(value.category)) {
-    value.category = value.category.map((id) => {
-      if (typeof id === "string") {
-        try {
-          return new import_mongodb131.ObjectId(id);
-        } catch {
-          throw new Error("Invalid category ID.");
-        }
-      }
-      return id;
-    });
+  if (value.category && typeof value.category === "string") {
+    try {
+      value.category = new import_mongodb131.ObjectId(value.category);
+    } catch {
+      throw new Error("Invalid category ID.");
+    }
+  }
+  if (value.subcategory && typeof value.subcategory === "string") {
+    try {
+      value.subcategory = new import_mongodb131.ObjectId(value.subcategory);
+    } catch {
+      throw new Error("Invalid subcategory ID.");
+    }
   }
   return {
     _id: value._id ?? new import_mongodb131.ObjectId(),
     title: value.title ?? "",
     description: value.description ?? "",
     attachments: value.attachments ?? [],
-    category: value.category ?? [],
+    category: value.category ?? "",
+    subcategory: value.subcategory ?? "",
     currency: value.currency ?? "",
     price: value.price ?? 0,
     status: value.status ?? "published" /* PUBLISHED */,
@@ -54867,6 +55262,7 @@ function usePostPrelovedRepo() {
       case "price-high-low":
         return { price: -1 };
       case "recent":
+        return { createdAt: -1 };
       default:
         return { createdAt: -1 };
     }
@@ -54911,7 +55307,8 @@ function usePostPrelovedRepo() {
     filter,
     site,
     status,
-    category
+    category,
+    subcategory
   }, session) {
     page = page > 0 ? page - 1 : 0;
     if (site) {
@@ -54921,13 +55318,24 @@ function usePostPrelovedRepo() {
         throw new import_node_server_utils235.BadRequestError("Invalid site ID format.");
       }
     }
-    const categoryIds = category && Array.isArray(category) && category.length > 0 ? category.map((id) => {
+    let categoryId = null;
+    let subcategoryIds = null;
+    if (category && subcategory) {
       try {
-        return new import_mongodb132.ObjectId(id);
+        categoryId = new import_mongodb132.ObjectId(category);
       } catch {
         throw new import_node_server_utils235.BadRequestError("Invalid category ID format.");
       }
-    }) : null;
+      if (subcategory.length > 0) {
+        subcategoryIds = subcategory.map((id) => {
+          try {
+            return new import_mongodb132.ObjectId(id);
+          } catch {
+            throw new import_node_server_utils235.BadRequestError("Invalid subcategory ID format.");
+          }
+        });
+      }
+    }
     const query = {
       status: { $ne: "deleted" /* DELETED */ },
       ...site && { site },
@@ -54940,7 +55348,8 @@ function usePostPrelovedRepo() {
       ...status && {
         status: { $in: Array.isArray(status) ? status : [status] }
       },
-      ...categoryIds && { category: { $in: categoryIds } }
+      ...categoryId && { category: categoryId },
+      ...subcategoryIds && { subcategory: { $in: subcategoryIds } }
     };
     const sortObj = buildSortObj(filter);
     try {
@@ -55101,7 +55510,8 @@ function usePostPrelovedController() {
         import_joi134.default.array().items(import_joi134.default.string().valid(...Object.values(PostStatus))),
         import_joi134.default.string().valid(...Object.values(PostStatus))
       ).optional().allow(null),
-      category: import_joi134.default.alternatives().try(import_joi134.default.array().items(import_joi134.default.string().hex()), import_joi134.default.string().hex()).optional().allow(null)
+      category: import_joi134.default.string().hex().length(24).optional().allow("", null),
+      subcategory: import_joi134.default.alternatives().try(import_joi134.default.array().items(import_joi134.default.string())).optional().allow(null, "")
     });
     const { error, value } = validation.validate(req.query, {
       abortEarly: false
@@ -55112,7 +55522,7 @@ function usePostPrelovedController() {
       next(new import_node_server_utils236.BadRequestError(messages));
       return;
     }
-    const { page, limit, search, filter, site, status, category } = value;
+    const { page, limit, search, filter, site, status, category, subcategory } = value;
     try {
       const data = await _getAll({
         page,
@@ -55121,7 +55531,8 @@ function usePostPrelovedController() {
         filter,
         site,
         status: status ? Array.isArray(status) ? status : [status] : void 0,
-        category: category ? Array.isArray(category) ? category : [category] : void 0
+        category: category ?? void 0,
+        subcategory: subcategory ? Array.isArray(subcategory) ? subcategory : [subcategory] : void 0
       });
       res.status(200).json(data);
       return;