@7365admin1/core 3.9.0 → 3.10.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.10.0
+
+### Minor Changes
+
+- da700a5: release changes for preloved api, push notification, tec.
+
 ## 3.9.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -6096,31 +6096,34 @@ declare function useNewDashboardRepo(): {
         workOrder: number;
         taskCompleted: number;
     }[]>;
-    getServiceTodayTaskSchedule: ({ site, serviceType, page, limit, }: {
+    getServiceTodayTaskSchedule: ({ site, serviceType, page, limit, period, }: {
         site: string | ObjectId;
         serviceType: TAppServiceType;
         page?: number | undefined;
         limit?: number | undefined;
+        period?: Period | undefined;
     }) => Promise<{
         items: any[];
         pages: number;
         pageRange: string;
     }>;
-    getServiceStaffAttendance: ({ site, serviceType, page, limit, }: {
+    getServiceStaffAttendance: ({ site, serviceType, page, limit, period, }: {
         site: string | ObjectId;
         serviceType: TAppServiceType;
         page?: number | undefined;
         limit?: number | undefined;
+        period?: Period | undefined;
     }) => Promise<{
         items: any[];
         pages: number;
         pageRange: string;
     }>;
-    getServiceRecentFeedbacks: ({ site, serviceType, page, limit, }: {
+    getServiceRecentFeedbacks: ({ site, serviceType, page, limit, period, }: {
         site: string | ObjectId;
         serviceType: TAppServiceType;
         page?: number | undefined;
         limit?: number | undefined;
+        period?: Period | undefined;
     }) => Promise<{
         items: any[];
         pages: number;
@@ -7375,11 +7378,13 @@ declare function MBidPreloved(value: TBidPreloved): {
 
 declare function useBidPrelovedRepo(): {
     add: (value: TBidPreloved, session?: any) => Promise<string | ObjectId>;
+    getById: (_id: string | ObjectId) => Promise<mongodb.WithId<TBidPreloved>>;
     updateStatus: (_id: string | ObjectId, status: BidStatus) => Promise<string>;
 };
 
 declare function useBidPrelovedController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateStatus: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
@@ -7467,7 +7472,7 @@ declare function useFormEntryRepo(): {
     createTextIndex: () => Promise<void>;
     deleteOnlineFormById: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
     addResidentForm: (value: residentFormEntry, session?: ClientSession) => Promise<ObjectId>;
-    residentForm: ({ userId, site, org }: {
+    residentForm: ({ userId, site, org, }: {
         userId: string;
         site: string | ObjectId;
         org: string | ObjectId;

package/dist/index.js

@@ -33692,7 +33692,7 @@ async function send(userIds, title, body, data, isForMAMobileApp = false, appSlu
     if (isForMAMobileApp) {
       tokens = await PushTokenRepo.findTokensByUserIds(userIds, appSlug);
     } else {
-      tokens = await PushTokenRepo.findTokensByUserIds(userIds);
+      tokens = await PushTokenRepo.findTokensByUserIds(userIds, appSlug);
     }
     if (!tokens.length)
       return;
@@ -33740,6 +33740,37 @@ var NotificationService = class {
       "iservice365-resident-mobile-app"
     );
   }
+  static async onlineFormRequestStatusUpdated(payload) {
+    let screen = "";
+    let params = {};
+    if (payload.status === "pending" || payload.status === "resubmission") {
+      screen = "/(user)/(online-forms)/form-fill";
+      params = {
+        id: payload.onlineFormId.toString(),
+        submissionStatus: payload.status ?? ""
+      };
+    } else {
+      screen = "/(user)/(online-forms)/submission-detail";
+      params = {
+        id: payload.onlineFormId.toString(),
+        status: payload.status ?? ""
+      };
+    }
+    await send(
+      toStringArray(payload.to),
+      "Online Form",
+      `Your online form has been updated to ${payload.status}.`,
+      {
+        onlineFormId: payload.onlineFormId.toString(),
+        status: payload.status,
+        module: "onlineForm",
+        screen,
+        params: JSON.stringify(params)
+      },
+      false,
+      "iservice365-resident-mobile-app"
+    );
+  }
   static async bulletinBoardCreatedForMA(payload) {
     await send(
       toStringArray(payload.to),
@@ -57770,7 +57801,8 @@ function useNewDashboardRepo() {
     site,
     serviceType,
     page = 1,
-    limit = 10
+    limit = 10,
+    period = "today" /* TODAY */
   }) {
     page = page > 0 ? page - 1 : 0;
     const cacheOptions = { serviceType, page, limit };
@@ -57780,9 +57812,7 @@ function useNewDashboardRepo() {
     } catch {
       throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
     }
-    const todayStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
-    const todayEnd = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
-    const todayRange = { $gte: todayStart, $lte: todayEnd };
+    const todayRange = getDateRange(period);
     try {
       const [items, countResult] = await Promise.all([
         areaChecklistCollection.aggregate([
@@ -57858,7 +57888,8 @@ function useNewDashboardRepo() {
     site,
     serviceType,
     page = 1,
-    limit = 10
+    limit = 10,
+    period = "today" /* TODAY */
   }) {
     page = page > 0 ? page - 1 : 0;
     const cacheOptions = { serviceType, page, limit };
@@ -57868,8 +57899,9 @@ function useNewDashboardRepo() {
     } catch {
       throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
     }
-    const todayStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
-    const todayEnd = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
+    const periodRange = getDateRange(period);
+    const todayStart = periodRange.$gte;
+    const todayEnd = periodRange.$lte;
     const todayStartStr = todayStart.toISOString();
     const todayEndStr = todayEnd.toISOString();
     try {
@@ -57986,7 +58018,8 @@ function useNewDashboardRepo() {
     site,
     serviceType,
     page = 1,
-    limit = 10
+    limit = 10,
+    period = "today" /* TODAY */
   }) {
     page = page > 0 ? page - 1 : 0;
     const cacheOptions = { serviceType, page, limit };
@@ -57997,10 +58030,14 @@ function useNewDashboardRepo() {
       throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
     }
     const workOrderService = workOrderServiceMap[serviceType] ?? serviceType;
+    const matchQuery = { site, service: workOrderService };
+    if (period) {
+      matchQuery.createdAt = getDateRange(period);
+    }
     try {
       const [items, length] = await Promise.all([
         feedbackCollection.aggregate([
-          { $match: { site, service: workOrderService } },
+          { $match: matchQuery },
           { $sort: { createdAt: -1, _id: -1 } },
           {
             $lookup: {
@@ -58023,7 +58060,7 @@ function useNewDashboardRepo() {
           { $skip: page * limit },
           { $limit: limit }
         ]).toArray(),
-        feedbackCollection.countDocuments({ site, service: workOrderService })
+        feedbackCollection.countDocuments(matchQuery)
       ]);
       const data = (0, import_node_server_utils199.paginate)(items, page, limit, length);
       return data;
@@ -58183,6 +58220,7 @@ function useNewDashboardController() {
     const validation = import_joi112.default.object({
       site: import_joi112.default.string().hex().required(),
       serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      period: import_joi112.default.string().valid(...Object.values(Period)).default("today" /* TODAY */),
       page: import_joi112.default.number().min(1).optional().allow("", null),
       limit: import_joi112.default.number().min(1).optional().allow("", null)
     });
@@ -58194,12 +58232,14 @@ function useNewDashboardController() {
     }
     const site = req.params.site;
     const serviceType = req.params.serviceType;
+    const period = req.query.period;
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     try {
       const data = await _getServiceTodayTaskSchedule({
         site,
         serviceType,
+        period,
         page,
         limit
       });
@@ -58216,6 +58256,7 @@ function useNewDashboardController() {
     const validation = import_joi112.default.object({
       site: import_joi112.default.string().hex().required(),
       serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      period: import_joi112.default.string().valid(...Object.values(Period)).default("today" /* TODAY */),
       page: import_joi112.default.number().min(1).optional().allow("", null),
       limit: import_joi112.default.number().min(1).optional().allow("", null)
     });
@@ -58227,12 +58268,14 @@ function useNewDashboardController() {
     }
     const site = req.params.site;
     const serviceType = req.params.serviceType;
+    const period = req.query.period;
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     try {
       const data = await _getServiceStaffAttendance({
         site,
         serviceType,
+        period,
         page,
         limit
       });
@@ -58249,6 +58292,7 @@ function useNewDashboardController() {
     const validation = import_joi112.default.object({
       site: import_joi112.default.string().hex().required(),
       serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      period: import_joi112.default.string().valid(...Object.values(Period)).default("today" /* TODAY */),
       page: import_joi112.default.number().min(1).optional().allow("", null),
       limit: import_joi112.default.number().min(1).optional().allow("", null)
     });
@@ -58260,12 +58304,14 @@ function useNewDashboardController() {
     }
     const site = req.params.site;
     const serviceType = req.params.serviceType;
+    const period = req.query.period;
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     try {
       const data = await _getServiceRecentFeedbacks({
         site,
         serviceType,
+        period,
         page,
         limit
       });
@@ -66798,14 +66844,26 @@ function useBidPrelovedRepo() {
       throw new import_node_server_utils250.InternalServerError("Unable to update bid.");
     return "Bid updated successfully.";
   }
-  return { add, updateStatus };
+  async function getById(_id) {
+    if (typeof _id === "string")
+      _id = new import_mongodb150.ObjectId(_id);
+    const result = await collection.findOne({ _id });
+    if (!result)
+      throw new import_node_server_utils250.NotFoundError("Bid not found.");
+    return result;
+  }
+  return { add, getById, updateStatus };
 }
 
 // src/controllers/bid-preloved.controller.ts
 var import_node_server_utils251 = require("@7365admin1/node-server-utils");
 var import_joi146 = __toESM(require("joi"));
 function useBidPrelovedController() {
-  const { add: _add, updateStatus: _updateStatus } = useBidPrelovedRepo();
+  const {
+    add: _add,
+    getById: _getById,
+    updateStatus: _updateStatus
+  } = useBidPrelovedRepo();
   async function add(req, res, next) {
     const { error, value } = schemaBidPreloved.validate(req.body, {
       abortEarly: false
@@ -66852,7 +66910,25 @@ function useBidPrelovedController() {
       next(error);
     }
   }
-  return { add, updateStatus };
+  async function getById(req, res, next) {
+    const paramsSchema = import_joi146.default.object({
+      id: import_joi146.default.string().hex().length(24).required()
+    });
+    const { error, value: params } = paramsSchema.validate(req.params);
+    if (error) {
+      import_node_server_utils251.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils251.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getById(params.id);
+      res.status(200).json(data);
+    } catch (error2) {
+      import_node_server_utils251.logger.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  return { add, getById, updateStatus };
 }
 
 // src/models/online-forms-v2.model.ts
@@ -66996,6 +67072,7 @@ function useFormEntryRepo() {
   const { delNamespace, getCache, setCache } = (0, import_node_server_utils252.useCache)(
     online_forms_namespace_collection
   );
+  const { getUserById } = useUserRepo();
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -67149,6 +67226,26 @@ function useFormEntryRepo() {
       if (res.modifiedCount === 0) {
         throw new import_node_server_utils252.InternalServerError("Unable to update online form.");
       }
+      const onlineFormRequest = await collection.findOne({ _id });
+      if (!onlineFormRequest) {
+        throw new import_node_server_utils252.NotFoundError("Online form not found.");
+      }
+      const user = await getUserById(onlineFormRequest.userId.toString());
+      if (!user || !user._id) {
+        throw new import_node_server_utils252.NotFoundError("User not found.");
+      }
+      const userId = user._id.toString();
+      await NotificationService.onlineFormRequestStatusUpdated({
+        to: userId,
+        onlineFormId: onlineFormRequest._id,
+        // typeOfForm: onlineFormRequest.typeOfForm,
+        // unitNumber: onlineFormRequest.unitNumber,
+        status: onlineFormRequest.status
+        // createdAt: onlineFormRequest.createdAt ?? "",
+        // fields: onlineFormRequest.fields ?? {},
+        // remarks: onlineFormRequest.remarks ?? "",
+        // managementValuesJson: onlineFormRequest.managementValues ?? {},
+      });
       delNamespace().then(() => {
         import_node_server_utils252.logger.info(
           `Cache cleared for namespace: ${online_forms_namespace_collection}`
@@ -67185,7 +67282,9 @@ function useFormEntryRepo() {
         throw new import_node_server_utils252.InternalServerError("Unable to delete online form.");
       }
       delNamespace().then(() => {
-        import_node_server_utils252.logger.info(`Cache cleared for namespace: ${online_forms_namespace_collection}`);
+        import_node_server_utils252.logger.info(
+          `Cache cleared for namespace: ${online_forms_namespace_collection}`
+        );
       }).catch((err) => {
         import_node_server_utils252.logger.error(
           `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
@@ -67222,7 +67321,11 @@ function useFormEntryRepo() {
       throw error;
     }
   }
-  async function residentForm({ userId, site, org }) {
+  async function residentForm({
+    userId,
+    site,
+    org
+  }) {
     try {
       const user = new import_mongodb152.ObjectId(userId);
       const siteId = new import_mongodb152.ObjectId(site);