@7365admin1/core 2.25.0 → 2.26.0

package/dist/index.js

@@ -104,6 +104,7 @@ __export(src_exports, {
   MVehicle: () => MVehicle,
   MVehicleTransaction: () => MVehicleTransaction,
   MVerification: () => MVerification,
+  MVerificationV2: () => MVerificationV2,
   MVisitorTransaction: () => MVisitorTransaction,
   MWorkOrder: () => MWorkOrder,
   OrgNature: () => OrgNature,
@@ -112,6 +113,7 @@ __export(src_exports, {
   PERSON_TYPES: () => PERSON_TYPES,
   PMDashboardCollection: () => PMDashboardCollection,
   Period: () => Period,
+  PersonStatus: () => PersonStatus,
   PersonTypes: () => PersonTypes,
   SiteCategories: () => SiteCategories,
   SiteStatus: () => SiteStatus,
@@ -124,6 +126,7 @@ __export(src_exports, {
   VehicleSort: () => VehicleSort,
   VehicleStatus: () => VehicleStatus,
   VehicleType: () => VehicleType,
+  VerificationType: () => VerificationType,
   VisitorSort: () => VisitorSort,
   VisitorStatus: () => VisitorStatus,
   addressSchema: () => addressSchema,
@@ -248,6 +251,7 @@ __export(src_exports, {
   useAttendanceSettingsRepository: () => useAttendanceSettingsRepository,
   useAttendanceSettingsService: () => useAttendanceSettingsService,
   useAuthController: () => useAuthController,
+  useAuthControllerV2: () => useAuthControllerV2,
   useAuthService: () => useAuthService,
   useBuildingController: () => useBuildingController,
   useBuildingRepo: () => useBuildingRepo,
@@ -401,7 +405,9 @@ __export(src_exports, {
   useVehicleService: () => useVehicleService,
   useVerificationController: () => useVerificationController,
   useVerificationRepo: () => useVerificationRepo,
+  useVerificationRepoV2: () => useVerificationRepoV2,
   useVerificationService: () => useVerificationService,
+  useVerificationServiceV2: () => useVerificationServiceV2,
   useVisitorTransactionController: () => useVisitorTransactionController,
   useVisitorTransactionRepo: () => useVisitorTransactionRepo,
   useVisitorTransactionService: () => useVisitorTransactionService,
@@ -4518,7 +4524,9 @@ var siteSchema = import_joi9.default.object({
   category: import_joi9.default.string().valid(...Object.values(SiteCategories)).default("commercial" /* COMMERCIAL */),
   deliveryCompanyList: import_joi9.default.array().items(import_joi9.default.string()).optional().allow(null),
   isOpenGate: import_joi9.default.boolean().optional().default(false),
-  dahuaTimeExpiration: import_joi9.default.number().optional().allow(null)
+  dahuaTimeExpiration: import_joi9.default.number().optional().allow(null),
+  siteDocs: import_joi9.default.array().items(import_joi9.default.string().hex().length(24).allow(null, "")),
+  unitDocs: import_joi9.default.array().items(import_joi9.default.string().hex().length(24).allow(null, ""))
 });
 var updateSiteSchema = import_joi9.default.object({
   _id: import_joi9.default.string().hex().length(24).required(),
@@ -4526,7 +4534,9 @@ var updateSiteSchema = import_joi9.default.object({
   metadata: metadataSchema3.optional(),
   deliveryCompanyList: import_joi9.default.array().items(import_joi9.default.string().trim()).optional().allow(null),
   isOpenGate: import_joi9.default.boolean().optional().allow(null),
-  dahuaTimeExpiration: import_joi9.default.number().optional().allow(null)
+  dahuaTimeExpiration: import_joi9.default.number().optional().allow(null),
+  siteDocs: import_joi9.default.array().items(import_joi9.default.string().hex().length(24).allow(null, "")),
+  unitDocs: import_joi9.default.array().items(import_joi9.default.string().hex().length(24).allow(null, ""))
 });
 function MSite(value) {
   const { error } = siteSchema.validate(value);
@@ -4553,6 +4563,8 @@ function MSite(value) {
     deliveryCompanyList: value.deliveryCompanyList ?? [],
     isOpenGate: value.isOpenGate,
     dahuaTimeExpiration: value.dahuaTimeExpiration,
+    siteDocs: value.siteDocs ?? [],
+    unitDocs: value.unitDocs ?? [],
     updatedAt: value.updatedAt ?? "",
     deletedAt: value.deletedAt ?? ""
   };
@@ -8743,7 +8755,7 @@ var import_node_server_utils41 = require("@7365admin1/node-server-utils");
 var import_zod = require("zod");
 var import_mongodb25 = require("mongodb");
 var import_node_server_utils40 = require("@7365admin1/node-server-utils");
-function toObjectId2(value) {
+function toObjectId3(value) {
   if (typeof value === "string") {
     if (!/^[a-fA-F0-9]{24}$/.test(value)) {
       throw new import_node_server_utils40.BadRequestError(`Invalid ObjectId format: ${value}`);
@@ -8795,7 +8807,7 @@ var TInvoice = import_zod.z.object({
       message: "Invalid ObjectId: Must be a 24-character hex string."
     }),
     import_zod.z.instanceof(import_mongodb25.ObjectId, { message: "Invalid ObjectId instance." })
-  ]).optional().transform((val) => val ? toObjectId2(val) : void 0),
+  ]).optional().transform((val) => val ? toObjectId3(val) : void 0),
   invoiceNumber: import_zod.z.string({ required_error: "Invoice number is required." }),
   type: TInvoiceType.default("other"),
   amount: import_zod.z.number().min(0, { message: "Invoice amount must be at least 0." }),
@@ -12953,17 +12965,22 @@ var import_mongodb38 = require("mongodb");
 var import_node_server_utils66 = require("@7365admin1/node-server-utils");
 var import_joi35 = __toESM(require("joi"));
 var import_mongodb37 = require("mongodb");
-var PersonTypes = /* @__PURE__ */ ((PersonTypes2) => {
-  PersonTypes2["WALK_IN"] = "walk-in";
-  PersonTypes2["DROP_OFF"] = "drop-off";
-  PersonTypes2["CONTRACTOR"] = "contractor";
-  PersonTypes2["DELIVERY"] = "delivery";
-  PersonTypes2["PICK_UP"] = "pick-up";
-  PersonTypes2["GUEST"] = "guest";
-  PersonTypes2["TENANT"] = "tenant";
-  PersonTypes2["RESIDENT"] = "resident";
-  return PersonTypes2;
+var PersonTypes = /* @__PURE__ */ ((PersonTypes3) => {
+  PersonTypes3["WALK_IN"] = "walk-in";
+  PersonTypes3["DROP_OFF"] = "drop-off";
+  PersonTypes3["CONTRACTOR"] = "contractor";
+  PersonTypes3["DELIVERY"] = "delivery";
+  PersonTypes3["PICK_UP"] = "pick-up";
+  PersonTypes3["GUEST"] = "guest";
+  PersonTypes3["TENANT"] = "tenant";
+  PersonTypes3["RESIDENT"] = "resident";
+  return PersonTypes3;
 })(PersonTypes || {});
+var PersonStatus = /* @__PURE__ */ ((PersonStatus2) => {
+  PersonStatus2["ACTIVE"] = "active";
+  PersonStatus2["DELETED"] = "deleted";
+  return PersonStatus2;
+})(PersonStatus || {});
 var PERSON_TYPES = [
   "walk-in",
   "drop-off",
@@ -13682,7 +13699,8 @@ var vehicleSchema = import_joi37.default.object({
   start: import_joi37.default.date().optional().allow("", null),
   end: import_joi37.default.date().optional().allow("", null),
   unitName: import_joi37.default.string().optional().allow("", null),
-  status: import_joi37.default.string().optional().valid(...Object.values(VehicleStatus)).allow("")
+  status: import_joi37.default.string().optional().valid(...Object.values(VehicleStatus)).allow(""),
+  peopleId: import_joi37.default.string().hex().length(24).optional().allow(null, "")
 });
 function MVehicle(value) {
   const { error } = vehicleSchema.validate(value);
@@ -13711,6 +13729,13 @@ function MVehicle(value) {
       throw new import_node_server_utils68.BadRequestError("Invalid building unit ID format.");
     }
   }
+  if (value.peopleId) {
+    try {
+      value.peopleId = new import_mongodb40.ObjectId(value.peopleId);
+    } catch (error2) {
+      throw new import_node_server_utils68.BadRequestError("Invalid building unit ID format.");
+    }
+  }
   const createdAtDate = value.createdAt ? new Date(value.createdAt) : /* @__PURE__ */ new Date();
   const expiredDate = new Date(createdAtDate);
   expiredDate.setFullYear(expiredDate.getFullYear() + 10);
@@ -13735,6 +13760,7 @@ function MVehicle(value) {
     end: value.end ?? expiredAt,
     status: value.status ?? "active" /* ACTIVE */,
     unitName: value.unitName ?? "",
+    peopleId: value.peopleId ?? "",
     createdAt,
     updatedAt: value.updatedAt ?? "",
     deletedAt: value.deletedAt ?? ""
@@ -14886,7 +14912,7 @@ function usePersonRepo() {
   }
   async function getPeopleByUnit({
     status = "active",
-    type,
+    type = [],
     unit
   }, session) {
     const cacheKey = (0, import_node_server_utils70.makeCacheKey)(site_people_namespace_collection, {
@@ -14895,13 +14921,20 @@ function usePersonRepo() {
       type,
       key: "get-residents-by-unit"
     });
+    const cacheData = await getCache(cacheKey);
+    if (cacheData) {
+      import_node_server_utils70.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cacheData;
+    }
     try {
-      const cacheData = await getCache(cacheKey);
-      if (cacheData) {
-        import_node_server_utils70.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cacheData;
-      }
-      const data = await collection.find({ unit, status, ...type && { type } }).sort({ _id: -1 }).toArray();
+      const query = {
+        unit,
+        status,
+        ...Array.isArray(type) && type.length > 0 && {
+          type: { $in: type }
+        }
+      };
+      const data = await collection.find(query).sort({ _id: -1 }).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils70.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -15043,13 +15076,14 @@ function usePersonRepo() {
       throw new import_node_server_utils70.InternalServerError("Failed to retrieve person by NRIC.");
     }
   }
-  async function pushVehicleByNRIC(nric, plate, session) {
+  async function pushVehicleById(id, plate, session) {
     const { plateNumber, recNo } = plate;
     const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const _id = (0, import_node_server_utils70.toObjectId)(id);
     try {
       const updateExisting = await collection.updateOne(
         {
-          nric,
+          _id,
           "plates.plateNumber": plateNumber
         },
         {
@@ -15062,7 +15096,7 @@ function usePersonRepo() {
       );
       if (updateExisting.matchedCount === 0) {
         await collection.updateOne(
-          { nric },
+          { _id },
           {
             $push: {
               plates: {
@@ -15154,7 +15188,7 @@ function usePersonRepo() {
     getCompany,
     getPeopleByPlateNumber,
     getPeopleByNRIC,
-    pushVehicleByNRIC,
+    pushVehicleById,
     pullVehicleByRecNo,
     getByUserId
   };
@@ -15185,7 +15219,7 @@ function useVehicleService() {
   } = useDahuaService();
   const { getAllCameraWithPassword: _getAllSiteCameras } = useSiteCameraRepo();
   const { getById: _getById } = useOrgRepo();
-  const { pushVehicleByNRIC: _pushVehicleByNRIC } = usePersonRepo();
+  const { pushVehicleById: _pushVehicleById } = usePersonRepo();
   const { pullVehicleByRecNo: _pullVehicleByRecNo } = usePersonRepo();
   async function add(value) {
     const session = import_node_server_utils71.useAtlas.getClient()?.startSession();
@@ -15292,9 +15326,9 @@ function useVehicleService() {
             }
             const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
             vehicleValue.recNo = responseData.split("=")[1]?.trim();
-            if (value.nric && vehicleValue.recNo) {
-              await _pushVehicleByNRIC(
-                value.nric,
+            if (value.peopleId && vehicleValue.recNo) {
+              await _pushVehicleById(
+                value.peopleId,
                 {
                   plateNumber,
                   recNo: vehicleValue.recNo
@@ -15454,9 +15488,9 @@ function useVehicleService() {
         value.recNo = responseData.split("=")[1]?.trim();
       }
       value.status = "active" /* ACTIVE */;
-      if (vehicle.nric && value.recNo) {
-        await _pushVehicleByNRIC(
-          vehicle.nric,
+      if (vehicle.peopleId && value.recNo) {
+        await _pushVehicleById(
+          vehicle.peopleId,
           {
             plateNumber: _plateNumber,
             recNo: value.recNo
@@ -15571,9 +15605,9 @@ function useVehicleService() {
         value.recNo = responseData.split("=")[1]?.trim();
       }
       value.status = "active" /* ACTIVE */;
-      if (vehicle.nric && value.recNo) {
-        await _pushVehicleByNRIC(
-          vehicle.nric,
+      if (vehicle.peopleId && value.recNo) {
+        await _pushVehicleById(
+          vehicle.peopleId,
           {
             plateNumber: _plateNumber,
             recNo: value.recNo
@@ -15610,7 +15644,7 @@ function useVehicleService() {
     const _start = vehicle.start;
     const _end = vehicle.end;
     const _recNo = plate.recNo;
-    const _type = plate.type;
+    const _type = value.type ? value.type : plate.type;
     const { name, plateNumber, start, end, recNo, type, unit, site, ...rest } = value;
     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));
@@ -15638,20 +15672,60 @@ function useVehicleService() {
         }
         for (const camera of siteCameras) {
           const { host, username, password } = camera;
-          const dahuaPayload = {
-            host,
-            username,
-            password,
-            plateNumber: plateNumber ? plateNumber : _plateNumber,
-            recno: _recNo,
-            mode: _type === "TrafficBlackList" /* TRAFFIC_BLACKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
-            start: startDahua,
-            end: endDahua,
-            owner: name ? name : _name
-          };
-          const dahuaResponse = await _updatePlateNumber(dahuaPayload);
-          if (dahuaResponse?.statusCode !== 200) {
-            throw new import_node_server_utils71.BadRequestError("Failed to update plate number to ANPR");
+          if (value.type) {
+            const removePlateNumber = {
+              host,
+              username,
+              password,
+              mode: plate.type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+              //whitelist or blocklist
+              recno: _recNo
+            };
+            const responseForDeletion = await _removePlateNumber(
+              removePlateNumber
+            );
+            if (responseForDeletion?.statusCode !== 200) {
+              throw new import_node_server_utils71.BadRequestError(
+                "Failed to delete plate number to ANPR"
+              );
+            }
+            const dahuaPayload = {
+              host,
+              username,
+              password,
+              plateNumber: _plateNumber,
+              mode: value.type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+              //whitelist or blocklist
+              owner: _name,
+              ...startDahua ? { start: startDahua } : {},
+              ...endDahua ? { end: endDahua } : {}
+            };
+            const dahuaResponse = await _addPlateNumber(dahuaPayload);
+            if (dahuaResponse?.statusCode !== 200) {
+              throw new import_node_server_utils71.BadRequestError(
+                "Failed to update plate number to ANPR"
+              );
+            }
+            const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+            value.recNo = responseData.split("=")[1]?.trim();
+          } else {
+            const dahuaPayload = {
+              host,
+              username,
+              password,
+              plateNumber: plateNumber ? plateNumber : _plateNumber,
+              recno: _recNo,
+              mode: _type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+              start: startDahua,
+              end: endDahua,
+              owner: name ? name : _name
+            };
+            const dahuaResponse = await _updatePlateNumber(dahuaPayload);
+            if (dahuaResponse?.statusCode !== 200) {
+              throw new import_node_server_utils71.BadRequestError(
+                "Failed to update plate number to ANPR"
+              );
+            }
           }
         }
       }
@@ -15663,7 +15737,9 @@ function useVehicleService() {
         ...end && { end },
         ...unit && {
           unit: typeof unit === "string" ? new import_mongodb43.ObjectId(unit) : unit
-        }
+        },
+        ...value.recNo && { recNo: value.recNo },
+        ...type && { type: value.type }
       };
       await _updateVehicleById(_id, formattedValue, session);
       await session.commitTransaction();
@@ -19367,8 +19443,24 @@ function useCustomerSiteController() {
 var import_node_server_utils91 = require("@7365admin1/node-server-utils");
 var import_joi51 = __toESM(require("joi"));
 var import_mongodb50 = require("mongodb");
+
+// src/models/base.model.ts
+var AppServiceType = /* @__PURE__ */ ((AppServiceType2) => {
+  AppServiceType2["REAL_ESTATE_DEVELOPER"] = "real_estate_developer";
+  AppServiceType2["PROPERTY_MANAGEMENT_AGENCY"] = "property_management_agency";
+  AppServiceType2["SECURITY_AGENCY"] = "security_agency";
+  AppServiceType2["CLEANING_SERVICES"] = "cleaning_services";
+  AppServiceType2["MECHANICAL_ELECTRICAL_SERVICES"] = "mechanical_electrical_services";
+  AppServiceType2["LANDSCAPING_SERVICES"] = "landscaping_services";
+  AppServiceType2["PEST_CONTROL_SERVICES"] = "pest_control_services";
+  AppServiceType2["POOL_MAINTENANCE_SERVICES"] = "pool_maintenance_services";
+  return AppServiceType2;
+})(AppServiceType || {});
+
+// src/models/attendance-settings.model.ts
 var attendanceSettingsSchema = import_joi51.default.object({
   site: import_joi51.default.string().hex().required(),
+  serviceType: import_joi51.default.string().valid(...Object.values(AppServiceType)).required(),
   isLocationEnabled: import_joi51.default.boolean().required(),
   location: import_joi51.default.when("isLocationEnabled", {
     is: true,
@@ -19411,6 +19503,7 @@ function MAttendanceSettings(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     isLocationEnabled: value.isLocationEnabled,
     location: value.isLocationEnabled && value.location ? value.location : void 0,
     isGeofencingEnabled: value.isLocationEnabled ? value.isGeofencingEnabled ?? false : void 0,
@@ -19435,7 +19528,10 @@ function useAttendanceSettingsRepository() {
   const { delNamespace, setCache, getCache } = (0, import_node_server_utils92.useCache)(namespace_collection);
   async function createIndex() {
     try {
-      await collection.createIndexes([{ key: { site: 1 } }]);
+      await collection.createIndexes([
+        { key: { site: 1 } },
+        { key: { serviceType: 1 } }
+      ]);
     } catch (error) {
       throw new import_node_server_utils92.InternalServerError(
         "Failed to create index on attendance settings."
@@ -19459,15 +19555,16 @@ function useAttendanceSettingsRepository() {
       throw error;
     }
   }
-  async function getAttendanceSettingsBySite(site, session) {
+  async function getAttendanceSettingsBySite(site, serviceType, session) {
     try {
       site = new import_mongodb51.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils92.BadRequestError("Invalid attendance settings site ID format.");
     }
-    const query = { site };
+    const query = { site, serviceType };
     const cacheKey = (0, import_node_server_utils92.makeCacheKey)(namespace_collection, {
-      site: site.toString()
+      site: site.toString(),
+      serviceType
     });
     if (!session) {
       const cachedData = await getCache(cacheKey);
@@ -19539,8 +19636,8 @@ function useAttendanceSettingsRepository() {
   return {
     createIndex,
     createAttendanceSettings,
-    updateAttendanceSettings,
-    getAttendanceSettingsBySite
+    getAttendanceSettingsBySite,
+    updateAttendanceSettings
   };
 }
 
@@ -19551,9 +19648,9 @@ function useAttendanceSettingsService() {
     createAttendanceSettings,
     getAttendanceSettingsBySite: _getAttendanceSettingsBySite
   } = useAttendanceSettingsRepository();
-  async function getAttendanceSettingsBySite(site) {
+  async function getAttendanceSettingsBySite(site, serviceType) {
     try {
-      let settings = await _getAttendanceSettingsBySite(site);
+      let settings = await _getAttendanceSettingsBySite(site, serviceType);
       if (!settings) {
         import_node_server_utils93.logger.info(
           `No attendance settings found for site ${site}, creating default settings`
@@ -19564,12 +19661,13 @@ function useAttendanceSettingsService() {
           await createAttendanceSettings(
             {
               site,
+              serviceType,
               isLocationEnabled: false
             },
             session
           );
           await session?.commitTransaction();
-          settings = await _getAttendanceSettingsBySite(site);
+          settings = await _getAttendanceSettingsBySite(site, serviceType);
         } catch (error) {
           await session?.abortTransaction();
           throw error;
@@ -19593,16 +19691,21 @@ function useAttendanceSettingsController() {
   const { getAttendanceSettingsBySite: _getAttendanceSettingsBySite } = useAttendanceSettingsService();
   const { updateAttendanceSettings: _updateAttendanceSettings } = useAttendanceSettingsRepository();
   async function getAttendanceSettingsBySite(req, res, next) {
-    const validation = import_joi52.default.string().hex().required();
-    const site = req.params.site;
-    const { error } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi52.default.object({
+      site: import_joi52.default.string().hex().required(),
+      serviceType: import_joi52.default.string().valid(...Object.values(AppServiceType)).required()
+    });
+    const { error } = validation.validate(query);
     if (error) {
       import_node_server_utils94.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils94.BadRequestError(error.message));
       return;
     }
+    const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
-      const data = await _getAttendanceSettingsBySite(site);
+      const data = await _getAttendanceSettingsBySite(site, serviceType);
       res.json(data);
       return;
     } catch (error2) {
@@ -19641,6 +19744,7 @@ var import_joi53 = __toESM(require("joi"));
 var import_mongodb52 = require("mongodb");
 var attendanceSchema = import_joi53.default.object({
   site: import_joi53.default.string().hex().required(),
+  serviceType: import_joi53.default.string().valid(...Object.values(AppServiceType)).required(),
   checkIn: import_joi53.default.object({
     timestamp: import_joi53.default.date().required(),
     location: import_joi53.default.object({
@@ -19673,6 +19777,7 @@ function MAttendance(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     checkIn: value.checkIn,
     checkOut: null,
     user: value.user,
@@ -19697,6 +19802,7 @@ function useAttendanceRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { user: 1 } }
       ]);
     } catch (error) {
@@ -19724,13 +19830,15 @@ function useAttendanceRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
-    const query = {};
+    const query = { serviceType };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new import_mongodb53.ObjectId(site);
@@ -20103,7 +20211,11 @@ function useAttendanceService() {
     const session = import_node_server_utils97.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const setting = await getAttendanceSettingsBySite(value.site, session);
+      const setting = await getAttendanceSettingsBySite(
+        value.site,
+        value.serviceType,
+        session
+      );
       if (setting?.isLocationEnabled && setting?.isGeofencingEnabled) {
         if (!setting.location || !value.checkIn.location) {
           throw new import_node_server_utils97.BadRequestError("Location data is required for check-in.");
@@ -20150,6 +20262,7 @@ function useAttendanceService() {
       const attendance = await getRawAttendanceById(_id, session);
       const setting = await getAttendanceSettingsBySite(
         attendance.site,
+        attendance.serviceType,
         session
       );
       if (setting?.isLocationEnabled && setting?.isGeofencingEnabled) {
@@ -20235,7 +20348,8 @@ function useAttendanceController() {
       page: import_joi54.default.number().min(1).optional().allow("", null),
       limit: import_joi54.default.number().min(1).optional().allow("", null),
       search: import_joi54.default.string().optional().allow("", null),
-      site: import_joi54.default.string().hex().required()
+      site: import_joi54.default.string().hex().required(),
+      serviceType: import_joi54.default.string().valid(...Object.values(AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -20247,12 +20361,14 @@ function useAttendanceController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getAllAttendances({
         page,
         limit,
         search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -21669,20 +21785,37 @@ function usePersonController() {
     }
   }
   async function getPeopleByUnit(req, res, next) {
-    const schema2 = import_joi58.default.object({
-      unit: import_joi58.default.string().required(),
-      type: import_joi58.default.string().optional(),
-      status: import_joi58.default.string().optional()
-    });
-    const { unit } = req.params;
-    const { type, status } = req.query;
-    const { error } = schema2.validate({ status, type, unit });
-    if (error) {
-      import_node_server_utils105.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils105.BadRequestError(error.message));
-      return;
-    }
-    try {
+    const PERSON_TYPES3 = Object.values(PersonTypes);
+    console.log(req.query);
+    try {
+      const schema2 = import_joi58.default.object({
+        unit: import_joi58.default.string().required(),
+        type: import_joi58.default.string().optional().allow("", null).custom((value2, helpers) => {
+          if (!value2)
+            return ["resident" /* RESIDENT */];
+          const parsed = value2.split(",").map((v) => v.trim()).filter(Boolean);
+          for (const t of parsed) {
+            if (!PERSON_TYPES3.includes(t)) {
+              return helpers.error("any.only");
+            }
+          }
+          return parsed;
+        }).messages({
+          "any.only": `Type must be one of: ${PERSON_TYPES3.join(", ")}`
+        }),
+        status: import_joi58.default.string().valid(...Object.values(PersonStatus)).optional().default("active" /* ACTIVE */)
+      });
+      const { error, value } = schema2.validate(
+        { unit: req.params.unit, ...req.query },
+        { abortEarly: false }
+      );
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils105.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils105.BadRequestError(messages));
+        return;
+      }
+      const { unit, type, status } = value;
       const data = await _getPeopleByUnit({
         status,
         type,
@@ -21690,9 +21823,9 @@ function usePersonController() {
       });
       res.json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils105.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils105.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -28151,7 +28284,7 @@ function useSiteBillingConfigurationController() {
       (acc, [key, value2]) => ({ ...acc, [key]: value2 }),
       {}
     );
-    req.body.createdBy = cookies?.["user"].toString() ?? "";
+    req.body.createdBy = cookies?.["user"] ? cookies["user"].toString() : req.body.createdBy;
     const data = { ...req.body };
     const { error, value } = schemaBillingConfiguration.validate(data);
     if (error) {
@@ -35216,7 +35349,7 @@ function useStatementOfAccountController() {
       (acc, [key, value]) => ({ ...acc, [key]: value }),
       {}
     );
-    req.body.createdBy = cookies?.["user"].toString() ?? "";
+    req.body.createdBy = cookies?.["user"] ? cookies["user"].toString() : req.body.createdBy;
     const data = { ...req.body };
     const validation = import_joi93.default.object({
       dateFrom: import_joi93.default.string().required(),
@@ -44004,7 +44137,6 @@ var import_node_server_utils213 = require("@7365admin1/node-server-utils");
 var import_mongodb116 = require("mongodb");
 var import_moment_timezone5 = __toESM(require("moment-timezone"));
 async function manpowerEvents(io) {
-  console.log("Manpower events initialized");
   let intervalId = null;
   let activeConnections = 0;
   const { getAttendanceDataCount: _getAttendanceDataCount } = useHrmLabsAttendanceSrvc();
@@ -44822,6 +44954,227 @@ function useRedDotPaymentController() {
     getMerchantDetailsById
   };
 }
+
+// src/models/verification-v2.model.ts
+var import_node_server_utils216 = require("@7365admin1/node-server-utils");
+var import_mongodb121 = require("mongodb");
+var VerificationType = /* @__PURE__ */ ((VerificationType2) => {
+  VerificationType2["USER_SIGN_UP"] = "user-sign-up";
+  VerificationType2["FORGET_PASSWORD"] = "forget-password";
+  VerificationType2["USER_INVITE"] = "user-invite";
+  VerificationType2["MEMBER_INVITE"] = "member-invite";
+  return VerificationType2;
+})(VerificationType || {});
+var MVerificationV2 = class {
+  constructor(value) {
+    this._id = value._id ?? new import_mongodb121.ObjectId();
+    this.type = value.type ?? "";
+    this.email = value.email ?? "";
+    if (value.metadata?.role) {
+      try {
+        value.metadata.role = new import_mongodb121.ObjectId(value.metadata.role);
+      } catch (error) {
+        throw new import_node_server_utils216.BadRequestError("Invalid role ID format.");
+      }
+    }
+    if (value.metadata?.org) {
+      try {
+        value.metadata.org = new import_mongodb121.ObjectId(value.metadata.org);
+      } catch (error) {
+        throw new import_node_server_utils216.BadRequestError("Invalid org ID format.");
+      }
+    }
+    if (value.metadata?.siteId) {
+      try {
+        value.metadata.siteId = new import_mongodb121.ObjectId(value.metadata.siteId);
+      } catch (error) {
+        throw new import_node_server_utils216.BadRequestError("Invalid site ID format.");
+      }
+    }
+    if (value.metadata?.serviceProviderOrgId) {
+      try {
+        value.metadata.serviceProviderOrgId = new import_mongodb121.ObjectId(
+          value.metadata.serviceProviderOrgId
+        );
+      } catch (error) {
+        throw new import_node_server_utils216.BadRequestError("Invalid service provider ID format.");
+      }
+    }
+    this.metadata = { ...value.metadata };
+    this.status = value.status ?? "pending";
+    this.createdAt = value.createdAt ?? /* @__PURE__ */ new Date();
+    this.updatedAt = value.updatedAt ?? null;
+    this.expireAt = value.expireAt ?? new Date(Date.now() + 3600 * 1e3);
+  }
+};
+
+// src/repositories/verification-v2.repo.ts
+var import_node_server_utils217 = require("@7365admin1/node-server-utils");
+function useVerificationRepoV2() {
+  const db = import_node_server_utils217.useAtlas.getDb();
+  if (!db) {
+    throw new import_node_server_utils217.InternalServerError("Unable to connect to server.");
+  }
+  const namespace_collection = "verifications";
+  const collection = db.collection(namespace_collection);
+  async function createIndex() {
+    try {
+      await collection.createIndex([
+        { email: 1 },
+        { type: 1 },
+        { status: 1 },
+        { "metadata.org": 1 }
+      ]);
+    } catch (error) {
+      throw new import_node_server_utils217.InternalServerError("Failed to create index.");
+    }
+  }
+  async function createTextIndex() {
+    try {
+      await collection.createIndex({
+        email: "text"
+      });
+    } catch (error) {
+      throw new import_node_server_utils217.InternalServerError("Failed to create text index on email.");
+    }
+  }
+  const { delNamespace, setCache, getCache, delCache } = (0, import_node_server_utils217.useCache)(namespace_collection);
+  async function add(value, session) {
+    value = new MVerificationV2(value);
+    try {
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        import_node_server_utils217.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        import_node_server_utils217.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      import_node_server_utils217.logger.log({
+        level: "info",
+        message: String(error)
+      });
+      throw new import_node_server_utils217.InternalServerError("Server internal error.");
+    }
+  }
+  return {
+    createIndex,
+    createTextIndex,
+    add
+  };
+}
+
+// src/services/verification-v2.service.ts
+var import_node_server_utils218 = require("@7365admin1/node-server-utils");
+function useVerificationServiceV2() {
+  const MailerConfig = {
+    host: MAILER_TRANSPORT_HOST,
+    port: MAILER_TRANSPORT_PORT,
+    secure: MAILER_TRANSPORT_SECURE,
+    email: MAILER_EMAIL,
+    password: MAILER_PASSWORD
+  };
+  const mailer = new import_node_server_utils218.useMailer(MailerConfig);
+  const { add } = useVerificationRepoV2();
+  const { getUserByEmail } = useUserRepo();
+  async function signUp({
+    email,
+    metadata
+  }) {
+    try {
+      const user = await getUserByEmail(email);
+      if (user) {
+        throw new import_node_server_utils218.BadRequestError(
+          `Email ${email} is already registered, please login to continue.`
+        );
+      }
+      metadata.password = await (0, import_node_server_utils218.hashPassword)(metadata.password);
+      const value = {
+        type: "user-sign-up" /* USER_SIGN_UP */,
+        email,
+        metadata,
+        expireAt: new Date((/* @__PURE__ */ new Date()).getTime() + 5 * 60 * 1e3).toISOString(),
+        // 5mins from now
+        createdAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      const res = await add(value);
+      const dir = __dirname;
+      const filePath = (0, import_node_server_utils218.getDirectory)(dir, "./public/handlebars/sign-up");
+      const emailContent = (0, import_node_server_utils218.compileHandlebar)({
+        context: {
+          email,
+          validity: "5 minutes",
+          link: `${APP_MAIN}/sign-up/${res}`
+        },
+        filePath
+      });
+      mailer.sendMail({
+        to: email,
+        subject: "Sign Up Verification",
+        html: emailContent,
+        sender: "iService365"
+      }).catch((error) => {
+        import_node_server_utils218.logger.log({
+          level: "error",
+          message: `Error sending user invite email: ${error}`
+        });
+      });
+      return res;
+    } catch (error) {
+      throw error;
+    }
+  }
+  return {
+    signUp
+  };
+}
+
+// src/controllers/auth-v2.controller.ts
+var import_joi125 = __toESM(require("joi"));
+var import_node_server_utils219 = require("@7365admin1/node-server-utils");
+function useAuthControllerV2() {
+  const { signUp: _signUp } = useVerificationServiceV2();
+  async function signUp(req, res, next) {
+    const validation = import_joi125.default.object({
+      email: import_joi125.default.string().email().lowercase().trim().required(),
+      password: import_joi125.default.string().trim().required(),
+      country: import_joi125.default.string().min(3).required(),
+      orgName: import_joi125.default.string().min(1).required()
+    });
+    const { error, value } = validation.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message);
+      import_node_server_utils219.logger.log({ level: "error", message: messages.join(", ") });
+      next(new import_node_server_utils219.BadRequestError(messages.join(", ")));
+      return;
+    }
+    const { email, password, country, orgName } = value;
+    try {
+      const message = await _signUp({
+        email,
+        metadata: {
+          password,
+          country,
+          orgName
+        }
+      });
+      res.json({ message });
+      return;
+    } catch (error2) {
+      import_node_server_utils219.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  return {
+    signUp
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ANPRMode,
@@ -44898,6 +45251,7 @@ function useRedDotPaymentController() {
   MVehicle,
   MVehicleTransaction,
   MVerification,
+  MVerificationV2,
   MVisitorTransaction,
   MWorkOrder,
   OrgNature,
@@ -44906,6 +45260,7 @@ function useRedDotPaymentController() {
   PERSON_TYPES,
   PMDashboardCollection,
   Period,
+  PersonStatus,
   PersonTypes,
   SiteCategories,
   SiteStatus,
@@ -44918,6 +45273,7 @@ function useRedDotPaymentController() {
   VehicleSort,
   VehicleStatus,
   VehicleType,
+  VerificationType,
   VisitorSort,
   VisitorStatus,
   addressSchema,
@@ -45042,6 +45398,7 @@ function useRedDotPaymentController() {
   useAttendanceSettingsRepository,
   useAttendanceSettingsService,
   useAuthController,
+  useAuthControllerV2,
   useAuthService,
   useBuildingController,
   useBuildingRepo,
@@ -45195,7 +45552,9 @@ function useRedDotPaymentController() {
   useVehicleService,
   useVerificationController,
   useVerificationRepo,
+  useVerificationRepoV2,
   useVerificationService,
+  useVerificationServiceV2,
   useVisitorTransactionController,
   useVisitorTransactionRepo,
   useVisitorTransactionService,