@7365admin1/core 3.32.2-staging.9 → 3.34.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 3.34.0
+
+### Minor Changes
+
+- 36c0873: Add `MAILER_FROM_EMAIL` config so the mailer's SMTP auth login and display sender can differ, needed for relaying through Brevo (or any provider whose SMTP login differs from the desired sender address). Falls back to the existing behavior when unset.
+
+## 3.33.0
+
+### Minor Changes
+
+- fd94267: release api changes
+
 ## 3.32.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2622,8 +2622,6 @@ 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>;
@@ -2684,7 +2682,7 @@ declare function useAttendanceSettingsController(): {
 declare function useAttendanceRepository(): {
     createIndex: () => Promise<void>;
     checkInAttendance: (value: TAttendanceCheckIn, session?: ClientSession) => Promise<ObjectId>;
-    getAllAttendances: ({ page, limit, search, site, startDate, endDate, serviceType, }: TGetAttendancesQuery) => Promise<{}>;
+    getAllAttendances: ({ page, limit, search, site, 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

@@ -15062,10 +15062,6 @@ function useVerificationController() {
   }
   async function createSimpleUserInvite(req, res, next) {
     const payload = { ...req.body };
-    import_node_server_utils32.logger.log({
-      level: "info",
-      message: `[invite/user] payload: ${JSON.stringify(payload)}`
-    });
     const validation = import_joi16.default.object({
       email: import_joi16.default.string().email().required(),
       app: import_joi16.default.array().items(import_joi16.default.string()).min(1).required(),
@@ -15105,21 +15101,16 @@ function useVerificationController() {
           siteName
         }
       });
-      const responseBody = {
+      res.status(201).json({
         message: "Successfully invited user.",
         totalInvites: verificationIds.length,
         verificationIds
-      };
-      import_node_server_utils32.logger.log({
-        level: "info",
-        message: `[invite/user] response: ${JSON.stringify(responseBody)}`
       });
-      res.status(201).json(responseBody);
       return;
     } catch (error2) {
       import_node_server_utils32.logger.log({
         level: "error",
-        message: `[invite/user] error for payload ${JSON.stringify(payload)}: ${error2.message}`
+        message: `${error2.message}`
       });
       next(error2);
       return;
@@ -15127,10 +15118,6 @@ function useVerificationController() {
   }
   async function createSimpleMemberInvite(req, res, next) {
     const payload = { ...req.body };
-    import_node_server_utils32.logger.log({
-      level: "info",
-      message: `[invite/member] payload: ${JSON.stringify(payload)}`
-    });
     const validation = import_joi16.default.object({
       email: import_joi16.default.string().email().required(),
       app: import_joi16.default.string().optional().allow("", null),
@@ -15168,19 +15155,14 @@ function useVerificationController() {
           siteName
         }
       });
-      const responseBody = {
+      res.status(201).json({
         message: "Successfully invited member."
-      };
-      import_node_server_utils32.logger.log({
-        level: "info",
-        message: `[invite/member] response: ${JSON.stringify(responseBody)}`
       });
-      res.status(201).json(responseBody);
       return;
     } catch (error2) {
       import_node_server_utils32.logger.log({
         level: "error",
-        message: `[invite/member] error for payload ${JSON.stringify(payload)}: ${error2.message}`
+        message: `${error2.message}`
       });
       next(error2);
       return;
@@ -15188,10 +15170,6 @@ function useVerificationController() {
   }
   async function createServiceProviderInvite(req, res, next) {
     const payload = req.body;
-    import_node_server_utils32.logger.log({
-      level: "info",
-      message: `[service-providers/invite] payload: ${JSON.stringify(payload)}`
-    });
     const validation = import_joi16.default.object({
       email: import_joi16.default.string().email().required(),
       orgId: import_joi16.default.string().hex().required(),
@@ -15231,19 +15209,14 @@ function useVerificationController() {
         secure: true,
         maxAge: 4 * 60 * 60 * 1e3
       };
-      const responseBody = {
+      res.cookie("service-provider-email", email, cookieOptions).json({
         message: "Successfully invited service provider."
-      };
-      import_node_server_utils32.logger.log({
-        level: "info",
-        message: `[service-providers/invite] response: ${JSON.stringify(responseBody)}`
       });
-      res.cookie("service-provider-email", email, cookieOptions).json(responseBody);
       return;
     } catch (error2) {
       import_node_server_utils32.logger.log({
         level: "error",
-        message: `[service-providers/invite] error for payload ${JSON.stringify(payload)}: ${error2.message}`
+        message: `controller - ${error2.message}`
       });
       next(error2);
       return;
@@ -27030,8 +27003,7 @@ function useVehicleService() {
         throw new Error("Unable to start session for vehicle service.");
       }
     }
-    const plateNumbers = Array.isArray(value.plateNumber) ? value.plateNumber : value.plateNumber ? [value.plateNumber] : [];
-    const [_vehiclePlateNumber] = plateNumbers;
+    const [_vehiclePlateNumber] = value.plateNumber;
     const [existingPlateNumber, org] = await Promise.all([
       _getVehicleByPlateNumber(_vehiclePlateNumber),
       _getById(value.org)
@@ -27096,6 +27068,7 @@ function useVehicleService() {
       }
     }
     const owner = value.name;
+    const plateNumbers = value.plateNumber;
     try {
       if (!isExternalSession) {
         session.startTransaction();
@@ -27312,10 +27285,7 @@ function useVehicleService() {
         const dahuaResponse = await _addPlateNumber(dahuaPayload);
         if (dahuaResponse?.statusCode != 200) {
           console.log("dahuaResponse", dahuaResponse);
-          console.log(
-            "approveVehicleById dahuaResponse dahuaResponse?.statusCode != 200",
-            dahuaResponse?.statusCode
-          );
+          console.log("approveVehicleById dahuaResponse dahuaResponse?.statusCode != 200", dahuaResponse?.statusCode);
           throw new import_node_server_utils78.BadRequestError("Failed to add plate number to ANPR");
         }
         const responseData = dahuaResponse?.data.toString("utf-8");
@@ -27522,19 +27492,7 @@ function useVehicleService() {
       if (value.peopleId) {
         value.peopleId = new import_mongodb49.ObjectId(value.peopleId);
       }
-      const {
-        name,
-        plateNumber,
-        start,
-        end,
-        recNo,
-        type,
-        unit,
-        site,
-        block,
-        level,
-        ...rest
-      } = value;
+      const { name, plateNumber, start, end, recNo, type, unit, site, block, level, ...rest } = value;
       if (_name != name || _plateNumber != plateNumber) {
         const startDahua = value.start ? formatDahuaDate(new Date(value.start)) : formatDahuaDate(new Date(_start));
         const endDahua = value.end ? formatDahuaDate(new Date(value.end)) : formatDahuaDate(new Date(_end));
@@ -27561,11 +27519,7 @@ function useVehicleService() {
           for (const camera of siteCameras) {
             const { host, username, password } = camera;
             if (_plateNumber != plateNumber) {
-              console.log(
-                "updateVehicleById _plateNumber != plateNumber",
-                _plateNumber,
-                plateNumber
-              );
+              console.log("updateVehicleById _plateNumber != plateNumber", _plateNumber, plateNumber);
               const removePlateNumber = {
                 host,
                 username,
@@ -27612,11 +27566,7 @@ function useVehicleService() {
                 );
               }
             } else {
-              console.log(
-                "updateVehicleById _plateNumber == plateNumber",
-                _plateNumber,
-                plateNumber
-              );
+              console.log("updateVehicleById _plateNumber == plateNumber", _plateNumber, plateNumber);
               const dahuaPayload = {
                 host,
                 username,
@@ -33006,7 +32956,6 @@ 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) {
@@ -33048,8 +32997,6 @@ function useAttendanceRepository() {
     limit = 10,
     search = "",
     site,
-    startDate = "",
-    endDate = "",
     serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
@@ -33069,37 +33016,6 @@ 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) {
@@ -33601,9 +33517,7 @@ 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(),
-      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)
+      serviceType: import_joi56.default.string().valid(...Object.values(AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -33616,17 +33530,13 @@ 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,
-        startDate,
-        endDate
+        serviceType
       });
       res.json(data);
       return;
@@ -58794,7 +58704,6 @@ function useNfcPatrolLogController() {
     const query = {
       site: req.query.site,
       date: req.query.date,
-      type: req.query.type,
       route: {
         _id: req.query["route._id"],
         startTime: req.query["route.startTime"]
@@ -58809,14 +58718,13 @@ function useNfcPatrolLogController() {
       next(new import_node_server_utils200.BadRequestError(messages));
       return;
     }
-    const { page, limit, site, date, type, route } = value;
+    const { page, limit, site, date, route } = value;
     try {
       const data = await _getAllBySite({
         page,
         limit,
         site,
         date,
-        type,
         route
       });
       res.status(200).json(data);
@@ -58878,7 +58786,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_moment2 = __toESM(require("moment"));
+var import_moment = __toESM(require("moment"));
 var Period = /* @__PURE__ */ ((Period2) => {
   Period2["TODAY"] = "today";
   Period2["THIS_WEEK"] = "thisWeek";
@@ -58915,7 +58823,7 @@ function useNewDashboardRepo() {
       const dateWithoutTimezone = date.replace(/\s*\+\d{2}:\d{2}$/, "");
       date = new Date(dateWithoutTimezone);
     }
-    const singaporeMoment = import_moment2.default.tz(date, "Asia/Singapore");
+    const singaporeMoment = import_moment.default.tz(date, "Asia/Singapore");
     singaporeMoment.set({
       hour: 23,
       minute: 59,
@@ -58925,7 +58833,7 @@ function useNewDashboardRepo() {
     return singaporeMoment.toDate();
   }
   function getDateRange(p) {
-    const now = (0, import_moment2.default)().tz("Asia/Singapore");
+    const now = (0, import_moment.default)().tz("Asia/Singapore");
     if (p === "thisWeek" /* THIS_WEEK */) {
       return {
         $gte: now.clone().startOf("isoWeek").toDate(),
@@ -58943,7 +58851,7 @@ function useNewDashboardRepo() {
       $lte: now.clone().endOf("day").toDate()
     };
   }
-  function getSiteDayRange(date = import_moment2.default.tz("Asia/Singapore")) {
+  function getSiteDayRange(date = import_moment.default.tz("Asia/Singapore")) {
     return {
       $gte: date.clone().startOf("day").toDate(),
       $lte: date.clone().endOf("day").toDate()
@@ -59214,8 +59122,8 @@ function useNewDashboardRepo() {
     const todayCompliance = tTotal > 0 ? tCompleted / tTotal * 100 : 0;
     let activePatrolItems = [];
     if (period === "today" /* TODAY */) {
-      const todayString = import_moment2.default.tz("Asia/Singapore").format("YYYY-MM-DD");
-      const dayIndex = import_moment2.default.tz("Asia/Singapore").day();
+      const todayString = import_moment.default.tz("Asia/Singapore").format("YYYY-MM-DD");
+      const dayIndex = import_moment.default.tz("Asia/Singapore").day();
       const repeatDay = dayIndex === 0 ? 7 : dayIndex;
       const routes = await db.collection("patrol.route").find({
         site: { $in: [siteIdObj, siteId] },
@@ -59267,12 +59175,12 @@ function useNewDashboardRepo() {
               status = "completed";
             }
           } else {
-            const routeTime = import_moment2.default.tz(
+            const routeTime = import_moment.default.tz(
               `${todayString} ${startTime}`,
               "YYYY-MM-DD HH:mm",
               "Asia/Singapore"
             );
-            const nowSg = import_moment2.default.tz("Asia/Singapore");
+            const nowSg = import_moment.default.tz("Asia/Singapore");
             const diffMinutes = nowSg.diff(routeTime, "minutes");
             if (diffMinutes >= 0) {
               if (diffMinutes <= 120) {
@@ -59320,8 +59228,8 @@ function useNewDashboardRepo() {
           if (log.status) {
             status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
           }
-          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");
+          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");
           return {
             id: log._id.toString(),
             title: log.name,
@@ -59373,11 +59281,11 @@ function useNewDashboardRepo() {
   }
   async function getPropertyManagementDashboard(siteId, period = "today" /* TODAY */, type, facility) {
     const siteIdObj = (0, import_node_server_utils201.toObjectId)(siteId);
-    const startOfToday = import_moment2.default.tz("Asia/Singapore").startOf("day").toDate();
-    const endOfToday = import_moment2.default.tz("Asia/Singapore").endOf("day").toDate();
+    const startOfToday = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+    const endOfToday = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
     const facilityTodayRange = getSiteDayRange();
     const facilityYesterdayRange = getSiteDayRange(
-      import_moment2.default.tz("Asia/Singapore").subtract(1, "day")
+      import_moment.default.tz("Asia/Singapore").subtract(1, "day")
     );
     const facilityTodayStart = facilityTodayRange.$gte;
     const facilityTodayEnd = facilityTodayRange.$lte;
@@ -59389,13 +59297,13 @@ function useNewDashboardRepo() {
     };
     if (period === "thisWeek" /* THIS_WEEK */) {
       facilityPeriodRange = {
-        $gte: import_moment2.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
-        $lte: import_moment2.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
       facilityPeriodRange = {
-        $gte: import_moment2.default.tz("Asia/Singapore").startOf("month").toDate(),
-        $lte: import_moment2.default.tz("Asia/Singapore").endOf("month").toDate()
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("month").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("month").toDate()
       };
     }
     const upcomingEvents = await db.collection(events_namespace_collection).find({
@@ -60027,28 +59935,28 @@ function useNewDashboardRepo() {
     let labels = [];
     let getIntervalIndex;
     if (period === "today" /* TODAY */) {
-      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("day").toDate();
-      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("day").toDate();
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+      rangeEnd = import_moment.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_moment2.default)(date).tz("Asia/Singapore").hour();
+        const hour = (0, import_moment.default)(date).tz("Asia/Singapore").hour();
         return Math.floor(hour / 4);
       };
     } else if (period === "thisWeek" /* THIS_WEEK */) {
-      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("isoWeek").toDate();
-      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("isoWeek").toDate();
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate();
+      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate();
       labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
       getIntervalIndex = (date) => {
-        const day = (0, import_moment2.default)(date).tz("Asia/Singapore").isoWeekday();
+        const day = (0, import_moment.default)(date).tz("Asia/Singapore").isoWeekday();
         return day - 1;
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
-      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();
+      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();
       labels = Array.from({ length: daysInMonth }, (_, i) => String(i + 1));
       getIntervalIndex = (date) => {
-        return (0, import_moment2.default)(date).tz("Asia/Singapore").date() - 1;
+        return (0, import_moment.default)(date).tz("Asia/Singapore").date() - 1;
       };
     } else {
       throw new import_node_server_utils201.BadRequestError("Invalid period.");