@7365admin1/core 3.32.2-staging.1 → 3.32.2-staging.2

package/dist/index.d.ts

@@ -2622,6 +2622,8 @@ type TGetAttendancesQuery = {
     page?: number;
     limit?: number;
     search?: string;
+    startDate?: string | Date;
+    endDate?: string | Date;
 } & Pick<TAttendance, "site" | "serviceType">;
 type TGetAttendancesByUserQuery = Pick<TGetAttendancesQuery, "page" | "limit" | "search" | "site" | "serviceType"> & Pick<TAttendance, "user">;
 declare const attendanceSchema: Joi.ObjectSchema<any>;
@@ -2682,7 +2684,7 @@ declare function useAttendanceSettingsController(): {
 declare function useAttendanceRepository(): {
     createIndex: () => Promise<void>;
     checkInAttendance: (value: TAttendanceCheckIn, session?: ClientSession) => Promise<ObjectId>;
-    getAllAttendances: ({ page, limit, search, site, serviceType, }: TGetAttendancesQuery) => Promise<{}>;
+    getAllAttendances: ({ page, limit, search, site, startDate, endDate, serviceType, }: TGetAttendancesQuery) => Promise<{}>;
     getAttendanceByUser: ({ page, limit, search, site, serviceType, user, }: TGetAttendancesByUserQuery) => Promise<{}>;
     getAttendanceById: (_id: string | ObjectId, session?: ClientSession) => Promise<{}>;
     getRawAttendanceById: (_id: string | ObjectId, session?: ClientSession) => Promise<TAttendance>;

package/dist/index.js

@@ -32939,6 +32939,7 @@ function MAttendance(value) {
 // src/repositories/attendance.repository.ts
 var import_mongodb60 = require("mongodb");
 var import_node_server_utils103 = require("@7365admin1/node-server-utils");
+var import_moment = __toESM(require("moment"));
 function useAttendanceRepository() {
   const db = import_node_server_utils103.useAtlas.getDb();
   if (!db) {
@@ -32980,6 +32981,8 @@ function useAttendanceRepository() {
     limit = 10,
     search = "",
     site,
+    startDate = "",
+    endDate = "",
     serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
@@ -32999,6 +33002,37 @@ function useAttendanceRepository() {
     if (search) {
       cacheOptions.search = search;
     }
+    const singaporeTz = "Asia/Singapore";
+    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    if (startDate && endDate) {
+      const startOfDay = import_moment.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = import_moment.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
+      query.$expr = {
+        $and: [
+          { $gte: [{ $toDate: "$checkIn.timestamp" }, startOfDay] },
+          { $lte: [{ $toDate: "$checkIn.timestamp" }, endOfDay] }
+        ]
+      };
+      cacheOptions.startDate = normalizedStartDate;
+      cacheOptions.endDate = normalizedEndDate;
+    } else if (startDate) {
+      query.$expr = {
+        $gte: [
+          { $toDate: "$checkIn.timestamp" },
+          import_moment.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+        ]
+      };
+      cacheOptions.startDate = normalizedStartDate;
+    } else if (endDate) {
+      query.$expr = {
+        $lte: [
+          { $toDate: "$checkIn.timestamp" },
+          import_moment.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+        ]
+      };
+      cacheOptions.endDate = normalizedEndDate;
+    }
     const cacheKey = (0, import_node_server_utils103.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -33500,7 +33534,9 @@ function useAttendanceController() {
       limit: import_joi56.default.number().min(1).optional().allow("", null),
       search: import_joi56.default.string().optional().allow("", null),
       site: import_joi56.default.string().hex().required(),
-      serviceType: import_joi56.default.string().valid(...Object.values(AppServiceType)).required()
+      serviceType: import_joi56.default.string().valid(...Object.values(AppServiceType)).required(),
+      dateFrom: import_joi56.default.alternatives().try(import_joi56.default.date(), import_joi56.default.string()).optional().allow("", null),
+      dateTo: import_joi56.default.alternatives().try(import_joi56.default.date(), import_joi56.default.string()).optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -33513,13 +33549,17 @@ function useAttendanceController() {
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
     const serviceType = req.query.serviceType ?? "";
+    const startDate = req.query.dateFrom ?? "";
+    const endDate = req.query.dateTo ?? "";
     try {
       const data = await _getAllAttendances({
         page,
         limit,
         search,
         site,
-        serviceType
+        serviceType,
+        startDate,
+        endDate
       });
       res.json(data);
       return;
@@ -58769,7 +58809,7 @@ function useNfcPatrolLogController() {
 // src/repositories/new-dashboard.repo.ts
 var import_node_server_utils201 = require("@7365admin1/node-server-utils");
 var import_mongodb122 = require("mongodb");
-var import_moment = __toESM(require("moment"));
+var import_moment2 = __toESM(require("moment"));
 var Period = /* @__PURE__ */ ((Period2) => {
   Period2["TODAY"] = "today";
   Period2["THIS_WEEK"] = "thisWeek";
@@ -58806,7 +58846,7 @@ function useNewDashboardRepo() {
       const dateWithoutTimezone = date.replace(/\s*\+\d{2}:\d{2}$/, "");
       date = new Date(dateWithoutTimezone);
     }
-    const singaporeMoment = import_moment.default.tz(date, "Asia/Singapore");
+    const singaporeMoment = import_moment2.default.tz(date, "Asia/Singapore");
     singaporeMoment.set({
       hour: 23,
       minute: 59,
@@ -58816,7 +58856,7 @@ function useNewDashboardRepo() {
     return singaporeMoment.toDate();
   }
   function getDateRange(p) {
-    const now = (0, import_moment.default)().tz("Asia/Singapore");
+    const now = (0, import_moment2.default)().tz("Asia/Singapore");
     if (p === "thisWeek" /* THIS_WEEK */) {
       return {
         $gte: now.clone().startOf("isoWeek").toDate(),
@@ -58834,7 +58874,7 @@ function useNewDashboardRepo() {
       $lte: now.clone().endOf("day").toDate()
     };
   }
-  function getSiteDayRange(date = import_moment.default.tz("Asia/Singapore")) {
+  function getSiteDayRange(date = import_moment2.default.tz("Asia/Singapore")) {
     return {
       $gte: date.clone().startOf("day").toDate(),
       $lte: date.clone().endOf("day").toDate()
@@ -59105,8 +59145,8 @@ function useNewDashboardRepo() {
     const todayCompliance = tTotal > 0 ? tCompleted / tTotal * 100 : 0;
     let activePatrolItems = [];
     if (period === "today" /* TODAY */) {
-      const todayString = import_moment.default.tz("Asia/Singapore").format("YYYY-MM-DD");
-      const dayIndex = import_moment.default.tz("Asia/Singapore").day();
+      const todayString = import_moment2.default.tz("Asia/Singapore").format("YYYY-MM-DD");
+      const dayIndex = import_moment2.default.tz("Asia/Singapore").day();
       const repeatDay = dayIndex === 0 ? 7 : dayIndex;
       const routes = await db.collection("patrol.route").find({
         site: { $in: [siteIdObj, siteId] },
@@ -59158,12 +59198,12 @@ function useNewDashboardRepo() {
               status = "completed";
             }
           } else {
-            const routeTime = import_moment.default.tz(
+            const routeTime = import_moment2.default.tz(
               `${todayString} ${startTime}`,
               "YYYY-MM-DD HH:mm",
               "Asia/Singapore"
             );
-            const nowSg = import_moment.default.tz("Asia/Singapore");
+            const nowSg = import_moment2.default.tz("Asia/Singapore");
             const diffMinutes = nowSg.diff(routeTime, "minutes");
             if (diffMinutes >= 0) {
               if (diffMinutes <= 120) {
@@ -59211,8 +59251,8 @@ function useNewDashboardRepo() {
           if (log.status) {
             status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
           }
-          const logTime = (0, import_moment.default)(log.createdAt).tz("Asia/Singapore").format("HH:mm");
-          const logDate = (0, import_moment.default)(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
+          const logTime = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("HH:mm");
+          const logDate = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
           return {
             id: log._id.toString(),
             title: log.name,
@@ -59264,11 +59304,11 @@ function useNewDashboardRepo() {
   }
   async function getPropertyManagementDashboard(siteId, period = "today" /* TODAY */, type, facility) {
     const siteIdObj = (0, import_node_server_utils201.toObjectId)(siteId);
-    const startOfToday = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
-    const endOfToday = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
+    const startOfToday = import_moment2.default.tz("Asia/Singapore").startOf("day").toDate();
+    const endOfToday = import_moment2.default.tz("Asia/Singapore").endOf("day").toDate();
     const facilityTodayRange = getSiteDayRange();
     const facilityYesterdayRange = getSiteDayRange(
-      import_moment.default.tz("Asia/Singapore").subtract(1, "day")
+      import_moment2.default.tz("Asia/Singapore").subtract(1, "day")
     );
     const facilityTodayStart = facilityTodayRange.$gte;
     const facilityTodayEnd = facilityTodayRange.$lte;
@@ -59280,13 +59320,13 @@ function useNewDashboardRepo() {
     };
     if (period === "thisWeek" /* THIS_WEEK */) {
       facilityPeriodRange = {
-        $gte: import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
-        $lte: import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
+        $gte: import_moment2.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
+        $lte: import_moment2.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
       facilityPeriodRange = {
-        $gte: import_moment.default.tz("Asia/Singapore").startOf("month").toDate(),
-        $lte: import_moment.default.tz("Asia/Singapore").endOf("month").toDate()
+        $gte: import_moment2.default.tz("Asia/Singapore").startOf("month").toDate(),
+        $lte: import_moment2.default.tz("Asia/Singapore").endOf("month").toDate()
       };
     }
     const upcomingEvents = await db.collection(events_namespace_collection).find({
@@ -59918,28 +59958,28 @@ function useNewDashboardRepo() {
     let labels = [];
     let getIntervalIndex;
     if (period === "today" /* TODAY */) {
-      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
-      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
+      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("day").toDate();
+      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("day").toDate();
       labels = ["12 AM", "4 AM", "8 AM", "12 PM", "4 PM", "8 PM"];
       getIntervalIndex = (date) => {
-        const hour = (0, import_moment.default)(date).tz("Asia/Singapore").hour();
+        const hour = (0, import_moment2.default)(date).tz("Asia/Singapore").hour();
         return Math.floor(hour / 4);
       };
     } else if (period === "thisWeek" /* THIS_WEEK */) {
-      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate();
-      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate();
+      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("isoWeek").toDate();
+      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("isoWeek").toDate();
       labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
       getIntervalIndex = (date) => {
-        const day = (0, import_moment.default)(date).tz("Asia/Singapore").isoWeekday();
+        const day = (0, import_moment2.default)(date).tz("Asia/Singapore").isoWeekday();
         return day - 1;
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
-      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("month").toDate();
-      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("month").toDate();
-      const daysInMonth = import_moment.default.tz("Asia/Singapore").daysInMonth();
+      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("month").toDate();
+      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("month").toDate();
+      const daysInMonth = import_moment2.default.tz("Asia/Singapore").daysInMonth();
       labels = Array.from({ length: daysInMonth }, (_, i) => String(i + 1));
       getIntervalIndex = (date) => {
-        return (0, import_moment.default)(date).tz("Asia/Singapore").date() - 1;
+        return (0, import_moment2.default)(date).tz("Asia/Singapore").date() - 1;
       };
     } else {
       throw new import_node_server_utils201.BadRequestError("Invalid period.");