@7365admin1/core 2.25.0 → 2.26.0

package/dist/index.mjs

@@ -4129,7 +4129,10 @@ function useOrgRepo() {
 import { ObjectId as ObjectId16 } from "mongodb";
 
 // src/models/site.model.ts
-import { BadRequestError as BadRequestError16, logger as logger11 } from "@7365admin1/node-server-utils";
+import {
+  BadRequestError as BadRequestError16,
+  logger as logger11
+} from "@7365admin1/node-server-utils";
 import Joi9 from "joi";
 import { ObjectId as ObjectId15 } from "mongodb";
 var addressSchema = Joi9.object({
@@ -4186,7 +4189,9 @@ var siteSchema = Joi9.object({
   category: Joi9.string().valid(...Object.values(SiteCategories)).default("commercial" /* COMMERCIAL */),
   deliveryCompanyList: Joi9.array().items(Joi9.string()).optional().allow(null),
   isOpenGate: Joi9.boolean().optional().default(false),
-  dahuaTimeExpiration: Joi9.number().optional().allow(null)
+  dahuaTimeExpiration: Joi9.number().optional().allow(null),
+  siteDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, "")),
+  unitDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, ""))
 });
 var updateSiteSchema = Joi9.object({
   _id: Joi9.string().hex().length(24).required(),
@@ -4194,7 +4199,9 @@ var updateSiteSchema = Joi9.object({
   metadata: metadataSchema3.optional(),
   deliveryCompanyList: Joi9.array().items(Joi9.string().trim()).optional().allow(null),
   isOpenGate: Joi9.boolean().optional().allow(null),
-  dahuaTimeExpiration: Joi9.number().optional().allow(null)
+  dahuaTimeExpiration: Joi9.number().optional().allow(null),
+  siteDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, "")),
+  unitDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, ""))
 });
 function MSite(value) {
   const { error } = siteSchema.validate(value);
@@ -4221,6 +4228,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 ?? ""
   };
@@ -4237,7 +4246,7 @@ import {
   logger as logger12,
   makeCacheKey as makeCacheKey9,
   AppError as AppError4,
-  toObjectId
+  toObjectId as toObjectId2
 } from "@7365admin1/node-server-utils";
 import Joi10 from "joi";
 function useSiteRepo() {
@@ -4623,7 +4632,7 @@ function useSiteRepo() {
     }
   }
   async function updateSiteById(id, payload, session) {
-    const _id = toObjectId(id);
+    const _id = toObjectId2(id);
     payload.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
       const res = await collection.updateOne(
@@ -8487,7 +8496,7 @@ import {
 import { z } from "zod";
 import { ObjectId as ObjectId25 } from "mongodb";
 import { BadRequestError as BadRequestError38 } from "@7365admin1/node-server-utils";
-function toObjectId2(value) {
+function toObjectId3(value) {
   if (typeof value === "string") {
     if (!/^[a-fA-F0-9]{24}$/.test(value)) {
       throw new BadRequestError38(`Invalid ObjectId format: ${value}`);
@@ -8539,7 +8548,7 @@ var TInvoice = z.object({
       message: "Invalid ObjectId: Must be a 24-character hex string."
     }),
     z.instanceof(ObjectId25, { message: "Invalid ObjectId instance." })
-  ]).optional().transform((val) => val ? toObjectId2(val) : void 0),
+  ]).optional().transform((val) => val ? toObjectId3(val) : void 0),
   invoiceNumber: z.string({ required_error: "Invoice number is required." }),
   type: TInvoiceType.default("other"),
   amount: z.number().min(0, { message: "Invoice amount must be at least 0." }),
@@ -12292,7 +12301,7 @@ import {
   logger as logger46,
   makeCacheKey as makeCacheKey21,
   paginate as paginate16,
-  toObjectId as toObjectId4,
+  toObjectId as toObjectId5,
   useAtlas as useAtlas29,
   useCache as useCache22
 } from "@7365admin1/node-server-utils";
@@ -12520,7 +12529,7 @@ function useSiteCameraRepo() {
     });
   }
   async function getBySite(site, options = {}) {
-    const _site = toObjectId4(site);
+    const _site = toObjectId5(site);
     const cacheKeyOptions = {
       site,
       tag: "get-by-site",
@@ -12756,7 +12765,7 @@ import {
   logger as logger47,
   makeCacheKey as makeCacheKey22,
   paginate as paginate17,
-  toObjectId as toObjectId5,
+  toObjectId as toObjectId6,
   useAtlas as useAtlas30,
   useCache as useCache23
 } from "@7365admin1/node-server-utils";
@@ -12769,17 +12778,22 @@ import { ObjectId as ObjectId38 } from "mongodb";
 import { BadRequestError as BadRequestError64 } from "@7365admin1/node-server-utils";
 import Joi35 from "joi";
 import { ObjectId as ObjectId37 } from "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",
@@ -13250,7 +13264,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getOpenByPlateNumber(plateNumber, site) {
-    const _site = typeof site === "string" ? site : toObjectId5(site);
+    const _site = typeof site === "string" ? site : toObjectId6(site);
     const cacheKey = makeCacheKey22(visitors_namespace_collection, {
       plateNumber,
       key: "get-open-transaction-plate-number",
@@ -13367,7 +13381,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getExpiredCheckedOutTransactionsBySite(siteId) {
-    const site = toObjectId5(siteId);
+    const site = toObjectId6(siteId);
     try {
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const expiredTransactions = await collection.find({
@@ -13498,7 +13512,8 @@ var vehicleSchema = Joi37.object({
   start: Joi37.date().optional().allow("", null),
   end: Joi37.date().optional().allow("", null),
   unitName: Joi37.string().optional().allow("", null),
-  status: Joi37.string().optional().valid(...Object.values(VehicleStatus)).allow("")
+  status: Joi37.string().optional().valid(...Object.values(VehicleStatus)).allow(""),
+  peopleId: Joi37.string().hex().length(24).optional().allow(null, "")
 });
 function MVehicle(value) {
   const { error } = vehicleSchema.validate(value);
@@ -13527,6 +13542,13 @@ function MVehicle(value) {
       throw new BadRequestError66("Invalid building unit ID format.");
     }
   }
+  if (value.peopleId) {
+    try {
+      value.peopleId = new ObjectId40(value.peopleId);
+    } catch (error2) {
+      throw new BadRequestError66("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);
@@ -13551,6 +13573,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 ?? ""
@@ -13615,7 +13638,7 @@ import {
   makeCacheKey as makeCacheKey23,
   NotFoundError as NotFoundError17,
   paginate as paginate18,
-  toObjectId as toObjectId6,
+  toObjectId as toObjectId7,
   useAtlas as useAtlas31,
   useCache as useCache24
 } from "@7365admin1/node-server-utils";
@@ -14340,7 +14363,7 @@ function useVehicleRepo() {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
     try {
-      const unit = toObjectId6(unitId);
+      const unit = toObjectId7(unitId);
       const query = {
         unit
       };
@@ -14413,7 +14436,7 @@ import {
   useAtlas as useAtlas32,
   useCache as useCache25,
   AppError as AppError10,
-  toObjectId as toObjectId7
+  toObjectId as toObjectId8
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId42 } from "mongodb";
 var site_people_namespace_collection = "site.people";
@@ -14727,7 +14750,7 @@ function usePersonRepo() {
   }
   async function getPeopleByUnit({
     status = "active",
-    type,
+    type = [],
     unit
   }, session) {
     const cacheKey = makeCacheKey24(site_people_namespace_collection, {
@@ -14736,13 +14759,20 @@ function usePersonRepo() {
       type,
       key: "get-residents-by-unit"
     });
+    const cacheData = await getCache(cacheKey);
+    if (cacheData) {
+      logger50.info(`Cache hit for key: ${cacheKey}`);
+      return cacheData;
+    }
     try {
-      const cacheData = await getCache(cacheKey);
-      if (cacheData) {
-        logger50.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(() => {
         logger50.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -14884,13 +14914,14 @@ function usePersonRepo() {
       throw new InternalServerError25("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 = toObjectId8(id);
     try {
       const updateExisting = await collection.updateOne(
         {
-          nric,
+          _id,
           "plates.plateNumber": plateNumber
         },
         {
@@ -14903,7 +14934,7 @@ function usePersonRepo() {
       );
       if (updateExisting.matchedCount === 0) {
         await collection.updateOne(
-          { nric },
+          { _id },
           {
             $push: {
               plates: {
@@ -14944,7 +14975,7 @@ function usePersonRepo() {
     }
   }
   async function getByUserId(userId) {
-    const user = toObjectId7(userId);
+    const user = toObjectId8(userId);
     const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       user: userId
     });
@@ -14995,7 +15026,7 @@ function usePersonRepo() {
     getCompany,
     getPeopleByPlateNumber,
     getPeopleByNRIC,
-    pushVehicleByNRIC,
+    pushVehicleById,
     pullVehicleByRecNo,
     getByUserId
   };
@@ -15026,7 +15057,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 = useAtlas33.getClient()?.startSession();
@@ -15133,9 +15164,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
@@ -15295,9 +15326,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
@@ -15412,9 +15443,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
@@ -15451,7 +15482,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));
@@ -15479,20 +15510,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 BadRequestError69("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 BadRequestError69(
+                "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 BadRequestError69(
+                "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 BadRequestError69(
+                "Failed to update plate number to ANPR"
+              );
+            }
           }
         }
       }
@@ -15504,7 +15575,9 @@ function useVehicleService() {
         ...end && { end },
         ...unit && {
           unit: typeof unit === "string" ? new ObjectId43(unit) : unit
-        }
+        },
+        ...value.recNo && { recNo: value.recNo },
+        ...type && { type: value.type }
       };
       await _updateVehicleById(_id, formattedValue, session);
       await session.commitTransaction();
@@ -17014,7 +17087,7 @@ import {
   logger as logger60,
   makeCacheKey as makeCacheKey26,
   paginate as paginate21,
-  toObjectId as toObjectId8,
+  toObjectId as toObjectId10,
   useAtlas as useAtlas37,
   useCache as useCache28
 } from "@7365admin1/node-server-utils";
@@ -17176,8 +17249,8 @@ function useBuildingUnitRepo() {
     const query = {
       status,
       ...search && { $text: { $search: search } },
-      ...site && { site: toObjectId8(site) },
-      ...building && { building: toObjectId8(building) }
+      ...site && { site: toObjectId10(site) },
+      ...building && { building: toObjectId10(building) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheParams = {
@@ -19257,8 +19330,24 @@ function useCustomerSiteController() {
 import { BadRequestError as BadRequestError88, logger as logger69 } from "@7365admin1/node-server-utils";
 import Joi51 from "joi";
 import { ObjectId as ObjectId50 } from "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 = Joi51.object({
   site: Joi51.string().hex().required(),
+  serviceType: Joi51.string().valid(...Object.values(AppServiceType)).required(),
   isLocationEnabled: Joi51.boolean().required(),
   location: Joi51.when("isLocationEnabled", {
     is: true,
@@ -19301,6 +19390,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,
@@ -19333,7 +19423,10 @@ function useAttendanceSettingsRepository() {
   const { delNamespace, setCache, getCache } = useCache30(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 InternalServerError30(
         "Failed to create index on attendance settings."
@@ -19357,15 +19450,16 @@ function useAttendanceSettingsRepository() {
       throw error;
     }
   }
-  async function getAttendanceSettingsBySite(site, session) {
+  async function getAttendanceSettingsBySite(site, serviceType, session) {
     try {
       site = new ObjectId51(site);
     } catch (error) {
       throw new BadRequestError89("Invalid attendance settings site ID format.");
     }
-    const query = { site };
+    const query = { site, serviceType };
     const cacheKey = makeCacheKey28(namespace_collection, {
-      site: site.toString()
+      site: site.toString(),
+      serviceType
     });
     if (!session) {
       const cachedData = await getCache(cacheKey);
@@ -19437,8 +19531,8 @@ function useAttendanceSettingsRepository() {
   return {
     createIndex,
     createAttendanceSettings,
-    updateAttendanceSettings,
-    getAttendanceSettingsBySite
+    getAttendanceSettingsBySite,
+    updateAttendanceSettings
   };
 }
 
@@ -19449,9 +19543,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) {
         logger71.info(
           `No attendance settings found for site ${site}, creating default settings`
@@ -19462,12 +19556,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;
@@ -19491,16 +19586,21 @@ function useAttendanceSettingsController() {
   const { getAttendanceSettingsBySite: _getAttendanceSettingsBySite } = useAttendanceSettingsService();
   const { updateAttendanceSettings: _updateAttendanceSettings } = useAttendanceSettingsRepository();
   async function getAttendanceSettingsBySite(req, res, next) {
-    const validation = Joi52.string().hex().required();
-    const site = req.params.site;
-    const { error } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = Joi52.object({
+      site: Joi52.string().hex().required(),
+      serviceType: Joi52.string().valid(...Object.values(AppServiceType)).required()
+    });
+    const { error } = validation.validate(query);
     if (error) {
       logger72.log({ level: "error", message: error.message });
       next(new BadRequestError90(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) {
@@ -19539,6 +19639,7 @@ import Joi53 from "joi";
 import { ObjectId as ObjectId52 } from "mongodb";
 var attendanceSchema = Joi53.object({
   site: Joi53.string().hex().required(),
+  serviceType: Joi53.string().valid(...Object.values(AppServiceType)).required(),
   checkIn: Joi53.object({
     timestamp: Joi53.date().required(),
     location: Joi53.object({
@@ -19571,6 +19672,7 @@ function MAttendance(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     checkIn: value.checkIn,
     checkOut: null,
     user: value.user,
@@ -19604,6 +19706,7 @@ function useAttendanceRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { user: 1 } }
       ]);
     } catch (error) {
@@ -19631,13 +19734,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 ObjectId53(site);
@@ -20014,7 +20119,11 @@ function useAttendanceService() {
     const session = useAtlas46.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 BadRequestError93("Location data is required for check-in.");
@@ -20061,6 +20170,7 @@ function useAttendanceService() {
       const attendance = await getRawAttendanceById(_id, session);
       const setting = await getAttendanceSettingsBySite(
         attendance.site,
+        attendance.serviceType,
         session
       );
       if (setting?.isLocationEnabled && setting?.isGeofencingEnabled) {
@@ -20146,7 +20256,8 @@ function useAttendanceController() {
       page: Joi54.number().min(1).optional().allow("", null),
       limit: Joi54.number().min(1).optional().allow("", null),
       search: Joi54.string().optional().allow("", null),
-      site: Joi54.string().hex().required()
+      site: Joi54.string().hex().required(),
+      serviceType: Joi54.string().valid(...Object.values(AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -20158,12 +20269,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;
@@ -21601,20 +21714,37 @@ function usePersonController() {
     }
   }
   async function getPeopleByUnit(req, res, next) {
-    const schema2 = Joi58.object({
-      unit: Joi58.string().required(),
-      type: Joi58.string().optional(),
-      status: Joi58.string().optional()
-    });
-    const { unit } = req.params;
-    const { type, status } = req.query;
-    const { error } = schema2.validate({ status, type, unit });
-    if (error) {
-      logger82.log({ level: "error", message: error.message });
-      next(new BadRequestError100(error.message));
-      return;
-    }
-    try {
+    const PERSON_TYPES3 = Object.values(PersonTypes);
+    console.log(req.query);
+    try {
+      const schema2 = Joi58.object({
+        unit: Joi58.string().required(),
+        type: Joi58.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: Joi58.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(", ");
+        logger82.log({ level: "error", message: messages });
+        next(new BadRequestError100(messages));
+        return;
+      }
+      const { unit, type, status } = value;
       const data = await _getPeopleByUnit({
         status,
         type,
@@ -21622,9 +21752,9 @@ function usePersonController() {
       });
       res.json(data);
       return;
-    } catch (error2) {
-      logger82.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      logger82.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -25419,7 +25549,7 @@ import {
   makeCacheKey as makeCacheKey37,
   NotFoundError as NotFoundError27,
   paginate as paginate31,
-  toObjectId as toObjectId9,
+  toObjectId as toObjectId11,
   useAtlas as useAtlas60,
   useCache as useCache39
 } from "@7365admin1/node-server-utils";
@@ -25475,7 +25605,7 @@ function useSiteFacilityBookingRepo() {
     page = page > 0 ? page - 1 : 0;
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const skip = page * limit;
-    const siteId = toObjectId9(site);
+    const siteId = toObjectId11(site);
     const query = {
       site: siteId,
       status,
@@ -25521,7 +25651,7 @@ function useSiteFacilityBookingRepo() {
     }
   }
   async function getSiteFacilityBookingById(id, session) {
-    const _id = toObjectId9(id);
+    const _id = toObjectId11(id);
     const cacheKey = makeCacheKey37(facility_bookings_namespace_collection, {
       id
     });
@@ -25547,17 +25677,17 @@ function useSiteFacilityBookingRepo() {
   }
   async function updateSiteFacilityBookingById(id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const _id = toObjectId9(id);
+    const _id = toObjectId11(id);
     if (value.site)
-      value.site = typeof value.site === "string" ? toObjectId9(value.site) : value.site;
+      value.site = typeof value.site === "string" ? toObjectId11(value.site) : value.site;
     if (value.user)
-      value.user = typeof value.user === "string" ? toObjectId9(value.user) : value.user;
+      value.user = typeof value.user === "string" ? toObjectId11(value.user) : value.user;
     if (value.date)
       value.date = value.date ? new Date(value.date).toISOString() : value.date;
     if (value.approvedBy)
-      value.approvedBy = typeof value.approvedBy === "string" ? toObjectId9(value.approvedBy) : value.approvedBy;
+      value.approvedBy = typeof value.approvedBy === "string" ? toObjectId11(value.approvedBy) : value.approvedBy;
     if (value.createdBy)
-      value.createdBy = typeof value.createdBy === "string" ? toObjectId9(value.createdBy) : value.createdBy;
+      value.createdBy = typeof value.createdBy === "string" ? toObjectId11(value.createdBy) : value.createdBy;
     try {
       const res = await collection.updateOne(
         { _id },
@@ -28199,7 +28329,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) {
@@ -35329,7 +35459,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 = Joi93.object({
       dateFrom: Joi93.string().required(),
@@ -40002,7 +40132,7 @@ import {
   InternalServerError as InternalServerError59,
   logger as logger155,
   makeCacheKey as makeCacheKey57,
-  toObjectId as toObjectId10,
+  toObjectId as toObjectId12,
   useAtlas as useAtlas97,
   useCache as useCache59
 } from "@7365admin1/node-server-utils";
@@ -40094,7 +40224,7 @@ function useNewDashboardRepo() {
     securityDashboardCollection
   );
   async function getMetric(collectionString, siteId, period) {
-    const site = toObjectId10(siteId);
+    const site = toObjectId12(siteId);
     const range = getPeriodRangeWithPrevious(period);
     const collection = db.collection(collectionString);
     const current = await collection.countDocuments({
@@ -42072,7 +42202,7 @@ import {
   InternalServerError as InternalServerError63,
   logger as logger163,
   makeCacheKey as makeCacheKey61,
-  toObjectId as toObjectId11,
+  toObjectId as toObjectId13,
   useAtlas as useAtlas102,
   useCache as useCache63
 } from "@7365admin1/node-server-utils";
@@ -42151,7 +42281,7 @@ function useOvernightParkingRepo() {
     }
   }
   async function getSiteOvernightParking(site) {
-    const siteId = toObjectId11(site);
+    const siteId = toObjectId13(site);
     const cacheKey = makeCacheKey61(overnight_parking_namespace_collection, {
       site
     });
@@ -42247,7 +42377,7 @@ function useOvernightParkingController() {
 
 // src/models/overnight-parking-request.model.ts
 import Joi118 from "joi";
-import { toObjectId as toObjectId12 } from "@7365admin1/node-server-utils";
+import { toObjectId as toObjectId14 } from "@7365admin1/node-server-utils";
 var OvernightParkingRequestStatus = /* @__PURE__ */ ((OvernightParkingRequestStatus2) => {
   OvernightParkingRequestStatus2["PENDING"] = "pending";
   OvernightParkingRequestStatus2["APPROVED"] = "approved";
@@ -42284,7 +42414,7 @@ function MOvernightParkingRequest(value) {
     throw new Error(error.details[0].message);
   }
   if (value.site && typeof value.site === "string")
-    value.site = toObjectId12(value.site);
+    value.site = toObjectId14(value.site);
   const data = {
     ...value,
     createdAt: value.createdAt ? new Date(value.createdAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
@@ -42301,7 +42431,7 @@ import {
   logger as logger165,
   makeCacheKey as makeCacheKey62,
   paginate as paginate54,
-  toObjectId as toObjectId13,
+  toObjectId as toObjectId15,
   useAtlas as useAtlas103,
   useCache as useCache64
 } from "@7365admin1/node-server-utils";
@@ -42369,7 +42499,7 @@ function useOvernightParkingRequestRepo() {
   }) {
     page = page ? page - 1 : 0;
     const skip = page * limit;
-    const siteId = toObjectId13(site);
+    const siteId = toObjectId15(site);
     const query = {
       site: siteId,
       ...status && { status }
@@ -42420,7 +42550,7 @@ function useOvernightParkingRequestRepo() {
         logger165.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
-      const _id = toObjectId13(id);
+      const _id = toObjectId15(id);
       const data = await collection.findOne({ _id });
       if (!data)
         throw new BadRequestError187("Overnight parking request not found.");
@@ -42436,7 +42566,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function updateOvernightParkingRequestById(id, value, session) {
     try {
-      const _id = toObjectId13(id);
+      const _id = toObjectId15(id);
       value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       const data = await collection.updateOne(
         { _id },
@@ -42462,7 +42592,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function deleteOvernightParkingRequestById(id, session) {
     try {
-      const _id = toObjectId13(id);
+      const _id = toObjectId15(id);
       const value = {
         deletedAt: (/* @__PURE__ */ new Date()).toISOString(),
         status: "deleted" /* DELETED */
@@ -42491,7 +42621,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function updateExpiredRequests(site, session) {
     try {
-      const _site = toObjectId13(site);
+      const _site = toObjectId15(site);
       const value = {
         status: "expired" /* EXPIRED */
       };
@@ -44258,7 +44388,6 @@ import { useAtlas as useAtlas108 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId116 } from "mongodb";
 import moment5 from "moment-timezone";
 async function manpowerEvents(io) {
-  console.log("Manpower events initialized");
   let intervalId = null;
   let activeConnections = 0;
   const { getAttendanceDataCount: _getAttendanceDataCount } = useHrmLabsAttendanceSrvc();
@@ -45082,6 +45211,239 @@ function useRedDotPaymentController() {
     getMerchantDetailsById
   };
 }
+
+// src/models/verification-v2.model.ts
+import { BadRequestError as BadRequestError194 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId121 } from "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 ObjectId121();
+    this.type = value.type ?? "";
+    this.email = value.email ?? "";
+    if (value.metadata?.role) {
+      try {
+        value.metadata.role = new ObjectId121(value.metadata.role);
+      } catch (error) {
+        throw new BadRequestError194("Invalid role ID format.");
+      }
+    }
+    if (value.metadata?.org) {
+      try {
+        value.metadata.org = new ObjectId121(value.metadata.org);
+      } catch (error) {
+        throw new BadRequestError194("Invalid org ID format.");
+      }
+    }
+    if (value.metadata?.siteId) {
+      try {
+        value.metadata.siteId = new ObjectId121(value.metadata.siteId);
+      } catch (error) {
+        throw new BadRequestError194("Invalid site ID format.");
+      }
+    }
+    if (value.metadata?.serviceProviderOrgId) {
+      try {
+        value.metadata.serviceProviderOrgId = new ObjectId121(
+          value.metadata.serviceProviderOrgId
+        );
+      } catch (error) {
+        throw new BadRequestError194("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
+import {
+  InternalServerError as InternalServerError68,
+  logger as logger175,
+  useAtlas as useAtlas111,
+  useCache as useCache66
+} from "@7365admin1/node-server-utils";
+function useVerificationRepoV2() {
+  const db = useAtlas111.getDb();
+  if (!db) {
+    throw new InternalServerError68("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 InternalServerError68("Failed to create index.");
+    }
+  }
+  async function createTextIndex() {
+    try {
+      await collection.createIndex({
+        email: "text"
+      });
+    } catch (error) {
+      throw new InternalServerError68("Failed to create text index on email.");
+    }
+  }
+  const { delNamespace, setCache, getCache, delCache } = useCache66(namespace_collection);
+  async function add(value, session) {
+    value = new MVerificationV2(value);
+    try {
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        logger175.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger175.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      logger175.log({
+        level: "info",
+        message: String(error)
+      });
+      throw new InternalServerError68("Server internal error.");
+    }
+  }
+  return {
+    createIndex,
+    createTextIndex,
+    add
+  };
+}
+
+// src/services/verification-v2.service.ts
+import {
+  useMailer as useMailer4,
+  compileHandlebar as compileHandlebar4,
+  logger as logger176,
+  getDirectory as getDirectory4,
+  BadRequestError as BadRequestError196,
+  hashPassword as hashPassword4
+} from "@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 useMailer4(MailerConfig);
+  const { add } = useVerificationRepoV2();
+  const { getUserByEmail } = useUserRepo();
+  async function signUp({
+    email,
+    metadata
+  }) {
+    try {
+      const user = await getUserByEmail(email);
+      if (user) {
+        throw new BadRequestError196(
+          `Email ${email} is already registered, please login to continue.`
+        );
+      }
+      metadata.password = await hashPassword4(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 = getDirectory4(dir, "./public/handlebars/sign-up");
+      const emailContent = compileHandlebar4({
+        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) => {
+        logger176.log({
+          level: "error",
+          message: `Error sending user invite email: ${error}`
+        });
+      });
+      return res;
+    } catch (error) {
+      throw error;
+    }
+  }
+  return {
+    signUp
+  };
+}
+
+// src/controllers/auth-v2.controller.ts
+import Joi125 from "joi";
+import { BadRequestError as BadRequestError197, logger as logger177 } from "@7365admin1/node-server-utils";
+function useAuthControllerV2() {
+  const { signUp: _signUp } = useVerificationServiceV2();
+  async function signUp(req, res, next) {
+    const validation = Joi125.object({
+      email: Joi125.string().email().lowercase().trim().required(),
+      password: Joi125.string().trim().required(),
+      country: Joi125.string().min(3).required(),
+      orgName: Joi125.string().min(1).required()
+    });
+    const { error, value } = validation.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message);
+      logger177.log({ level: "error", message: messages.join(", ") });
+      next(new BadRequestError197(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) {
+      logger177.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  return {
+    signUp
+  };
+}
 export {
   ANPRMode,
   AccessTypeProps,
@@ -45157,6 +45519,7 @@ export {
   MVehicle,
   MVehicleTransaction,
   MVerification,
+  MVerificationV2,
   MVisitorTransaction,
   MWorkOrder,
   OrgNature,
@@ -45165,6 +45528,7 @@ export {
   PERSON_TYPES,
   PMDashboardCollection,
   Period,
+  PersonStatus,
   PersonTypes,
   SiteCategories,
   SiteStatus,
@@ -45177,6 +45541,7 @@ export {
   VehicleSort,
   VehicleStatus,
   VehicleType,
+  VerificationType,
   VisitorSort,
   VisitorStatus,
   addressSchema,
@@ -45301,6 +45666,7 @@ export {
   useAttendanceSettingsRepository,
   useAttendanceSettingsService,
   useAuthController,
+  useAuthControllerV2,
   useAuthService,
   useBuildingController,
   useBuildingRepo,
@@ -45454,7 +45820,9 @@ export {
   useVehicleService,
   useVerificationController,
   useVerificationRepo,
+  useVerificationRepoV2,
   useVerificationService,
+  useVerificationServiceV2,
   useVisitorTransactionController,
   useVisitorTransactionRepo,
   useVisitorTransactionService,