@7365admin1/core 2.42.0 → 2.43.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.43.0
+
+### Minor Changes
+
+- 08875ce: get latest changes
+
 ## 2.42.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1640,10 +1640,22 @@ declare function useSiteRepo(): {
     updateSiteIncidentCounter: (_id: string | ObjectId, incidentCounter: number, session?: ClientSession) => Promise<number>;
     updateSiteById: (id: string | ObjectId, payload: TSite, session?: ClientSession) => Promise<number>;
     getAllSitesUnpaginated: () => Promise<bson.Document[]>;
-    siteInformation: ({ id, payload }: {
+    siteInformation: ({ id, payload, }: {
         id: string;
         payload: TSiteInformation;
     }) => Promise<number>;
+    getAllSitesForResidentCreation: ({ search, page, limit, }: {
+        search: string;
+        page: number;
+        limit: number;
+    }) => Promise<{
+        items: {
+            _id: ObjectId;
+            name: string;
+        }[];
+        pages: number;
+        pageRange: string;
+    }>;
 };
 
 declare function useSiteService(): {
@@ -1681,6 +1693,7 @@ declare function useSiteController(): {
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateGuardPostsById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     siteInformation: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getAllSitesForResidentCreation: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TChat = {
@@ -2481,6 +2494,7 @@ type TPerson = {
     isOwner?: boolean;
     files?: TFiles[];
     plateNumber?: string;
+    platform?: string;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
@@ -2515,6 +2529,7 @@ declare function MPerson(value: TPerson): {
     isOwner: boolean;
     files: TFiles[];
     plateNumber: string;
+    platForm: string;
     createdAt: string | Date;
     updatedAt: string | Date | undefined;
     deletedAt: string | Date | undefined;
@@ -2554,7 +2569,7 @@ type TVisitorTransaction = {
     unit?: string | ObjectId;
     checkIn?: string | Date | null;
     expectedCheckIn?: string | Date;
-    checkOut?: string | Date;
+    checkOut?: string | Date | null;
     status?: VisitorStatus;
     nric?: string;
     remarks?: string;
@@ -2611,7 +2626,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     recNo: string | undefined;
     checkIn: string | Date | null;
     expectedCheckIn: Date | undefined;
-    checkOut: string | Date | undefined;
+    checkOut: string | Date | null | undefined;
     status: VisitorStatus | undefined;
     remarks: string | undefined;
     deliveryType: string | undefined;

package/dist/index.js

@@ -5156,7 +5156,10 @@ function useSiteRepo() {
       throw error;
     }
   }
-  async function siteInformation({ id, payload }) {
+  async function siteInformation({
+    id,
+    payload
+  }) {
     try {
       const siteId = new import_mongodb17.ObjectId(id);
       const res = await collection.updateOne(
@@ -5176,6 +5179,48 @@ function useSiteRepo() {
       throw error;
     }
   }
+  async function getAllSitesForResidentCreation({
+    search = "",
+    page = 1,
+    limit = 10
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = {
+      status: { $ne: "deleted" }
+    };
+    const cacheOptions = {
+      status: { $ne: "deleted" },
+      page,
+      limit
+    };
+    if (search) {
+      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      cacheOptions.search = search;
+    }
+    const cacheKey = (0, import_node_server_utils19.makeCacheKey)(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils19.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = (0, import_node_server_utils19.paginate)(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils19.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils19.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndexes,
     createSite,
@@ -5190,7 +5235,8 @@ function useSiteRepo() {
     updateSiteIncidentCounter,
     updateSiteById,
     getAllSitesUnpaginated,
-    siteInformation
+    siteInformation,
+    getAllSitesForResidentCreation
   };
 }
 
@@ -12296,7 +12342,7 @@ function useServiceProviderController() {
     const validation = import_joi30.default.object({
       search: import_joi30.default.string().optional().allow("", null),
       page: import_joi30.default.number().integer().min(1).allow("", null).default(1),
-      limit: import_joi30.default.number().integer().min(1).max(100).allow("", null).default(10),
+      limit: import_joi30.default.number().integer().min(1).max(1e3).allow("", null).default(10),
       orgId: import_joi30.default.string().hex().optional().allow("", null),
       siteId: import_joi30.default.string().hex().optional().allow("", null),
       serviceProviderOrgId: import_joi30.default.string().hex().optional().allow("", null),
@@ -13496,7 +13542,8 @@ var schemaPerson = import_joi35.default.object({
   isOwner: import_joi35.default.boolean().required(),
   files: import_joi35.default.array().items(schemaFiles).optional().allow(null),
   password: import_joi35.default.string().optional().allow(null, ""),
-  plateNumber: import_joi35.default.string().optional().allow(null, "")
+  plateNumber: import_joi35.default.string().optional().allow(null, ""),
+  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, "")
 });
 var schemaUpdatePerson = import_joi35.default.object({
   _id: import_joi35.default.string().hex().required(),
@@ -13517,12 +13564,13 @@ var schemaUpdatePerson = import_joi35.default.object({
   isOwner: import_joi35.default.boolean().optional().allow(null, ""),
   files: import_joi35.default.array().items(schemaFiles).optional().allow(null),
   password: import_joi35.default.string().optional().allow(null, ""),
-  plateNumber: import_joi35.default.string().optional().allow(null, "")
+  plateNumber: import_joi35.default.string().optional().allow(null, ""),
+  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
   if (error) {
-    throw new Error(error.details[0].message);
+    throw new import_node_server_utils68.BadRequestError(error.details[0].message);
   }
   if (value._id && typeof value._id === "string") {
     try {
@@ -13588,6 +13636,7 @@ function MPerson(value) {
     isOwner: value.isOwner ?? false,
     files: value.files ?? [],
     plateNumber: value.plateNumber ?? "",
+    platForm: value.platform ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -13626,8 +13675,8 @@ var schemaVisitorTransaction = import_joi36.default.object({
   contact: import_joi36.default.string().optional().allow(null, ""),
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   recNo: import_joi36.default.string().optional().allow(null, ""),
-  checkIn: import_joi36.default.date().optional().allow(null, ""),
-  checkOut: import_joi36.default.date().optional().allow(null, ""),
+  checkIn: import_joi36.default.date().iso().optional().allow(null),
+  checkOut: import_joi36.default.date().iso().optional().allow(null),
   deliveryType: import_joi36.default.string().optional().allow(null, ""),
   status: import_joi36.default.string().optional().valid(...Object.values(VisitorStatus)).default("registered" /* REGISTERED */),
   remarks: import_joi36.default.string().optional().allow(null, ""),
@@ -13691,8 +13740,8 @@ var schemaUpdateVisTrans = import_joi36.default.object({
   contact: import_joi36.default.string().optional().allow(null, ""),
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   recNo: import_joi36.default.string().optional().allow(null, ""),
-  checkIn: import_joi36.default.date().optional().allow(null, ""),
-  checkOut: import_joi36.default.date().optional().allow(null, ""),
+  checkIn: import_joi36.default.date().iso().optional().allow(null),
+  checkOut: import_joi36.default.date().iso().optional().allow(null),
   deliveryType: import_joi36.default.string().optional().allow(null, ""),
   status: import_joi36.default.string().optional().allow(null, ""),
   remarks: import_joi36.default.string().optional().allow(null, ""),
@@ -15269,7 +15318,7 @@ function usePersonRepo() {
       ]
     } : void 0;
     const query = {
-      status,
+      ...status && status !== "all" ? { status } : { status: { $nin: ["deleted", "rejected"] } },
       ...start && { start },
       ...end,
       ...search && {
@@ -15307,12 +15356,29 @@ function usePersonRepo() {
       return cachedData;
     }
     try {
-      const basePipeline = [
-        { $match: query },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ];
+      const basePipeline = [{ $match: query }];
+      if (status && status == "all") {
+        basePipeline.push(
+          {
+            $addFields: {
+              sortPriority: {
+                $cond: [{ $eq: ["$status", "pending"] }, 1, 2]
+              }
+            }
+          },
+          {
+            $sort: {
+              sortPriority: 1,
+              ...sort
+            }
+          }
+        );
+      } else {
+        basePipeline.push({
+          $sort: sort
+        });
+      }
+      basePipeline.push({ $skip: page * limit }, { $limit: limit });
       const [items, countResult] = await Promise.all([
         collection.aggregate(basePipeline, { session }).toArray(),
         collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
@@ -18082,7 +18148,8 @@ function useSiteController() {
     getSites: _getSites,
     getSiteById: _getSiteById,
     updateSiteBlock: _updateSiteBlock,
-    deleteSite: _deleteSite
+    deleteSite: _deleteSite,
+    getAllSitesForResidentCreation: _getAllSitesForResidentCreation
   } = useSiteRepo();
   const { updateGuardPostById, siteInformation: _siteInformation } = useSiteService();
   async function createSite(req, res, next) {
@@ -18267,14 +18334,13 @@ function useSiteController() {
         id: import_joi42.default.string().hex().required(),
         bgImage: import_joi42.default.string().optional().allow("", null),
         description: import_joi42.default.string().optional().allow("", null),
-        docs: import_joi42.default.array().items(import_joi42.default.object({
-          id: import_joi42.default.string().hex().optional().allow("", null),
-          name: import_joi42.default.string().optional().allow("", null)
-        })).optional().allow("", null)
-      }).validate(
-        { id, ...payload },
-        { abortEarly: false }
-      );
+        docs: import_joi42.default.array().items(
+          import_joi42.default.object({
+            id: import_joi42.default.string().hex().optional().allow("", null),
+            name: import_joi42.default.string().optional().allow("", null)
+          })
+        ).optional().allow("", null)
+      }).validate({ id, ...payload }, { abortEarly: false });
       if (error) {
         import_node_server_utils78.logger.log({ level: "error", message: error.message });
         next(new import_node_server_utils78.BadRequestError(error.message));
@@ -18290,6 +18356,36 @@ function useSiteController() {
       return;
     }
   }
+  async function getAllSitesForResidentCreation(req, res, next) {
+    const validation = import_joi42.default.object({
+      search: import_joi42.default.string().optional().allow("", null),
+      page: import_joi42.default.number().integer().min(1).allow("", null).default(1),
+      limit: import_joi42.default.number().integer().min(1).max(100).allow("", null).default(10)
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query);
+    if (error) {
+      import_node_server_utils78.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils78.BadRequestError(error.message));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    try {
+      const data = await _getAllSitesForResidentCreation({
+        search,
+        page,
+        limit
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils78.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createSite,
     getSites,
@@ -18298,7 +18394,8 @@ function useSiteController() {
     deleteSite,
     updateById,
     updateGuardPostsById,
-    siteInformation
+    siteInformation,
+    getAllSitesForResidentCreation
   };
 }
 
@@ -22952,6 +23049,14 @@ function useVisitorTransactionService() {
         }
         value.passKeys = keptPassKeys;
       }
+      if (value.checkIn) {
+        const parsed = new Date(value.checkIn);
+        value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
+      }
+      if (value.checkOut) {
+        const parsed = new Date(value.checkOut);
+        value.checkOut = isNaN(parsed.getTime()) ? null : parsed;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -23951,10 +24056,11 @@ function usePersonService() {
           email: value.email,
           password: hashedPassword,
           name: value.name,
+          status: value.platform == "mobile" ? "deleted" : "active",
           defaultOrg: value.org?.toString() || ""
         };
         const userId = await addUser(user, session);
-        value.user = userId;
+        value.user = userId.toString();
         let org = null;
         if (userId) {
           if (value?.org) {
@@ -29535,7 +29641,7 @@ function useBulletinBoardController() {
       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),
       sort: import_joi76.default.string().valid(...Object.values(BulletinSort)).default("_id" /* ID */),
-      order: import_joi76.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
+      order: import_joi76.default.string().valid(...Object.values(SortOrder)).default("desc" /* DESC */),
       site: import_joi76.default.string().hex().length(24).required(),
       status: import_joi76.default.string().valid(...Object.values(BuildingStatus)).optional().default("active" /* ACTIVE */),
       recipients: import_joi76.default.alternatives().try(