@7365admin1/core 2.31.1 → 2.31.2

package/dist/index.mjs

@@ -7415,6 +7415,34 @@ function useOrgController() {
       return;
     }
   }
+  async function addOnboardingOrg(req, res, next) {
+    const validation = Joi18.object({
+      name: Joi18.string().required(),
+      type: Joi18.string().required(),
+      nature: Joi18.string().valid(...allowedNatures).required(),
+      email: Joi18.string().email().optional().allow("", null),
+      contact: Joi18.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      logger24.log({ level: "error", message: error.message });
+      next(new BadRequestError32(error.message));
+      return;
+    }
+    try {
+      const _id = await _add(req.body);
+      const data = await _getById(_id);
+      res.status(201).json({
+        message: "Successfully created organization.",
+        data
+      });
+      return;
+    } catch (error2) {
+      logger24.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function getOrgsByUserId(req, res, next) {
     const validation = Joi18.object({
       search: Joi18.string().optional().allow("", null),
@@ -7513,6 +7541,7 @@ function useOrgController() {
   }
   return {
     add,
+    addOnboardingOrg,
     getAll,
     getOrgsByUserId,
     getByName,
@@ -36807,6 +36836,81 @@ function useStatementOfAccountRepo() {
       throw new InternalServerError50("Failed to update soa request.");
     }
   }
+  async function getResidentUserSoa({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "pending",
+    site = "",
+    dateFrom,
+    dateTo,
+    unitId,
+    category
+  }, session) {
+    page = page > 0 ? page - 1 : 0;
+    let dateExpr = {};
+    if (dateFrom && dateTo) {
+      let startDate = new Date(dateFrom);
+      startDate.setHours(0, 0, 0, 0);
+      let endDate = new Date(dateTo);
+      endDate.setHours(23, 59, 59, 999);
+      dateExpr = {
+        $expr: {
+          $and: [
+            { $gte: ["$createdAt", startDate] },
+            { $lte: ["$createdAt", endDate] }
+          ]
+        }
+      };
+    }
+    const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
+    const query = {
+      ...status && status !== "all" && { status },
+      ...search && {
+        $or: [
+          { unitOwner: { $regex: search, $options: "i" } },
+          { unit: { $regex: unitSearchRegex, $options: "i" } },
+          { email: { $regex: search, $options: "i" } },
+          { category: { $regex: search, $options: "i" } }
+        ]
+      },
+      ...ObjectId97.isValid(site) && { site: new ObjectId97(site) },
+      ...dateExpr,
+      ...ObjectId97.isValid(unitId) && { unitId: new ObjectId97(unitId) },
+      ...category && { category }
+    };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    try {
+      const basePipeline = [
+        { $match: query },
+        {
+          $addFields: {
+            sortPriority: {
+              $cond: [{ $eq: ["$status", "pending"] }, 1, 2]
+            }
+          }
+        },
+        {
+          $sort: {
+            sortPriority: 1,
+            ...sort
+          }
+        },
+        { $skip: page * limit },
+        { $limit: limit }
+      ];
+      const [items, countResult] = await Promise.all([
+        collection.aggregate(basePipeline, { session }).toArray(),
+        collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
+      ]);
+      const totalCount = countResult[0]?.total || 0;
+      const data = paginate42(items, page, limit, totalCount);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       logger128.log({
@@ -36827,7 +36931,8 @@ function useStatementOfAccountRepo() {
     getById,
     updateById,
     deleteById,
-    updateStatusById
+    updateStatusById,
+    getResidentUserSoa
   };
 }
 
@@ -36984,7 +37089,8 @@ function useStatementOfAccountController() {
     getById: _getById,
     updateById: _updateById,
     deleteById: _deleteById,
-    updateStatusById: _updateStatusById
+    updateStatusById: _updateStatusById,
+    getResidentUserSoa: _getResidentUserSoa
   } = useStatementOfAccountRepo();
   const { add: _add, generatePDF: _generatePDF } = useStatementOfAccountService();
   async function add(req, res, next) {
@@ -37235,6 +37341,57 @@ function useStatementOfAccountController() {
       return;
     }
   }
+  async function getResidentUserSoa(req, res, next) {
+    const validation = Joi93.object({
+      page: Joi93.number().integer().min(1).allow("", null).default(1),
+      limit: Joi93.number().integer().min(1).max(100).allow("", null).default(10),
+      status: Joi93.string().optional().allow(null, ""),
+      search: Joi93.string().optional().allow(null, ""),
+      site: Joi93.string().required(),
+      dateFrom: Joi93.string().optional().allow(null, ""),
+      dateTo: Joi93.string().optional().allow(null, ""),
+      unitId: Joi93.string().required(),
+      category: Joi93.string().optional().allow(null, "")
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger130.log({ level: "error", message: messages });
+      next(new BadRequestError153(messages));
+      return;
+    }
+    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 site = req.query.site;
+    const dateFrom = req.query.dateFrom ?? "";
+    const dateTo = req.query.dateTo ?? "";
+    const unitId = req.query.unitId;
+    const category = req.query.category ?? "";
+    try {
+      const data = await _getResidentUserSoa({
+        search,
+        page,
+        limit,
+        status,
+        site,
+        dateFrom,
+        dateTo,
+        unitId,
+        category
+      });
+      res.status(200).json(data);
+      return;
+    } catch (error2) {
+      logger130.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -37242,7 +37399,8 @@ function useStatementOfAccountController() {
     updateById,
     deleteById,
     generatePDF,
-    updateStatusById
+    updateStatusById,
+    getResidentUserSoa
   };
 }
 
@@ -40391,7 +40549,7 @@ function useOccurrenceEntryService() {
       value.signature = value.signature ? new ObjectId108(value.signature) : occurrenceEntry.signature._id;
       value.eSignature = value.eSignature ? new ObjectId108(value.eSignature) : occurrenceEntry.eSignature;
       value.createdAt = /* @__PURE__ */ new Date();
-      value.date = /* @__PURE__ */ new Date();
+      value.date = value.date ? value.date : occurrenceEntry.date;
       value.userName = value.userName ? value.userName : occurrenceEntry.signature.name;
       value.createdByName = value.createdByName ? value.createdByName : occurrenceEntry.createdByName;
       await _updateOccurrenceBookById(dobId, {
@@ -46762,6 +46920,7 @@ import {
   InternalServerError as InternalServerError68,
   logger as logger175,
   makeCacheKey as makeCacheKey64,
+  paginate as paginate57,
   toObjectId as toObjectId17,
   useAtlas as useAtlas112,
   useCache as useCache66
@@ -46889,13 +47048,85 @@ function useVerificationRepoV2() {
       );
     }
   }
+  async function getVerifications({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "active",
+    app = "",
+    type = {},
+    email = ""
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { status };
+    const cacheOptions = {
+      page,
+      limit,
+      status
+    };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    cacheOptions.sort = JSON.stringify(sort);
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    if (app) {
+      query["metadata.app"] = app;
+      cacheOptions["metadata.app"] = app;
+    }
+    if (type && Object.keys(type).length > 0) {
+      query.type = { $in: Object.keys(type) };
+      cacheOptions.type = JSON.stringify(type);
+    }
+    if (email) {
+      query.email = email;
+      cacheOptions.email = email;
+    }
+    const cacheKey = makeCacheKey64(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger175.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit },
+        {
+          $project: {
+            _id: 1,
+            createdAt: 1,
+            email: 1,
+            type: 1,
+            metadata: 1,
+            status: 1
+          }
+        }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate57(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger175.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger175.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      logger175.log({ level: "error", message: `${error}` });
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
     add,
     updateVerificationStatusById,
     getByVerificationCode,
-    getVerificationById
+    getVerificationById,
+    getVerifications
   };
 }
 
@@ -47249,6 +47480,7 @@ function useVerificationControllerV2() {
     createServiceProviderInvite: _createServiceProviderInvite,
     createForgetPassword: _createForgetPassword
   } = useVerificationServiceV2();
+  const { getVerifications: _getVerifications } = useVerificationRepoV2();
   async function verify(req, res, next) {
     try {
       const schema2 = Joi126.object({ verificationCode: Joi126.string().required() });
@@ -47364,11 +47596,49 @@ function useVerificationControllerV2() {
       return;
     }
   }
+  async function getVerifications(req, res, next) {
+    const schema2 = Joi126.object({
+      search: Joi126.string().optional().allow("", null),
+      page: Joi126.number().integer().min(1).allow("", null).default(1),
+      status: Joi126.string().required(),
+      app: Joi126.string().optional().allow("", null),
+      type: Joi126.alternatives().try(
+        Joi126.array().items(Joi126.string()),
+        Joi126.string().custom((value2) => value2.split(","))
+      ).optional().allow("", null),
+      email: Joi126.string().optional().allow("", null)
+    });
+    const { error, value } = schema2.validate(req.query);
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger177.log({ level: "error", message: messages });
+      next(new BadRequestError197(messages));
+      return;
+    }
+    const { search, page, status, app, email, type } = value;
+    try {
+      const data = await _getVerifications({
+        search,
+        page,
+        status,
+        app,
+        type,
+        email
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger177.log({ level: "error", message: `${error2.message}` });
+      next(error2);
+      return;
+    }
+  }
   return {
     verify,
     createUserInvite,
     createServiceProviderInvite,
-    createForgetPassword
+    createForgetPassword,
+    getVerifications
   };
 }