@7365admin1/core 2.37.0 → 2.38.0

package/dist/index.mjs

@@ -4842,6 +4842,7 @@ function useSiteRepo() {
 
 // src/services/verification.service.ts
 import Joi11 from "joi";
+import path from "path";
 function useVerificationService() {
   const MailerConfig = {
     host: MAILER_TRANSPORT_HOST,
@@ -4872,7 +4873,6 @@ function useVerificationService() {
       expireAt: new Date(
         (/* @__PURE__ */ new Date()).getTime() + 72 * 60 * 60 * 1e3
       ).toISOString(),
-      // 72 hours (3 days) from now
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
     if (value.metadata?.org)
@@ -4960,8 +4960,11 @@ function useVerificationService() {
         subject = "Service Provider Organization Invite";
       }
       const res = await add(value);
-      const dir = __dirname;
-      const filePath = getDirectory(dir, `./public/handlebars/${value.type}`);
+      const filePath = path.resolve(
+        __dirname,
+        "../public/handlebars",
+        value.type
+      );
       const link = org ? `${APP_MAIN}/verify/${value.type}/${res}` : `${APP_ORG}/organizations/create?email=${email}`;
       const emailContent = compileHandlebar({
         context: {
@@ -4997,6 +5000,9 @@ function useVerificationService() {
     };
     try {
       const user = await getUserByEmail(email);
+      if (!user) {
+        throw new NotFoundError9("Email not found");
+      }
       const res = await add(value);
       const dir = __dirname;
       const filePath = getDirectory(dir, "./public/handlebars/forget-password");
@@ -13197,7 +13203,7 @@ var schemaVisitorTransaction = Joi36.object({
   checkOutRemarks: Joi36.string().optional().allow("", null),
   expectedCheckIn: Joi36.string().isoDate().optional(),
   purpose: Joi36.string().optional().allow(null, ""),
-  invitedId: Joi36.any().optional().allow(null, "")
+  inviterId: Joi36.any().optional().allow(null, "")
 });
 var schemaUpdateVisTrans = Joi36.object({
   _id: Joi36.string().hex().length(24).required(),
@@ -13306,11 +13312,11 @@ function MVisitorTransaction(value) {
       return p;
     });
   }
-  if (value.invitedId && typeof value.invitedId === "string") {
+  if (value.inviterId && typeof value.inviterId === "string") {
     try {
-      value.invitedId = new ObjectId39(value.invitedId);
+      value.inviterId = new ObjectId39(value.inviterId);
     } catch (error2) {
-      throw new Error("Invalid invited ID.");
+      throw new Error("Invalid inviter ID.");
     }
   }
   const newDate = /* @__PURE__ */ new Date();
@@ -13353,11 +13359,11 @@ function MVisitorTransaction(value) {
     numberOfPassengers: value.numberOfPassengers ?? null,
     email: value.email,
     isOvernightParking: value.isOvernightParking ?? false,
-    invitedId: value.invitedId ?? "",
+    inviterId: value.inviterId ?? "",
     overnightParking: value.isOvernightParking == true ? {
       status: "pending approval",
       remarks: "",
-      updatedBy: value.invitedId ?? ""
+      updatedBy: value.inviterId ?? ""
     } : null,
     arrivalTime: value.arrivalTime,
     duration: value.duration
@@ -13408,14 +13414,15 @@ function useVisitorTransactionRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    status = "registered",
+    status,
     org = "",
     site = "",
     dateTo = "",
     dateFrom = "",
     type = "",
     checkedOut,
-    plateNumber = ""
+    plateNumber = "",
+    tab = ""
   }) {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
@@ -13433,7 +13440,6 @@ function useVisitorTransactionRepo() {
         expectedCheckInFilter.$lte = new Date(dateTo);
     }
     const query = {
-      status,
       ...ObjectId40.isValid(org) && { org: new ObjectId40(org) },
       ...ObjectId40.isValid(site) && { site: new ObjectId40(site) },
       ...Object.keys(checkInFilter).length > 0 && { checkIn: checkInFilter },
@@ -13441,7 +13447,9 @@ function useVisitorTransactionRepo() {
       ...Array.isArray(type) ? { type: { $in: type } } : type ? { type } : {},
       ...checkedOut == false && { checkOut: { $eq: null } },
       ...search && { $text: { $search: search } },
-      ...plateNumber && { plateNumber }
+      ...plateNumber && { plateNumber },
+      ...status && { status },
+      ...tab == "Overnight Parking" && { isOvernightParking: true }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
@@ -13587,7 +13595,31 @@ function useVisitorTransactionRepo() {
           },
           { $sort: sort },
           { $skip: skip },
-          { $limit: limit }
+          { $limit: limit },
+          {
+            $lookup: {
+              from: "users",
+              localField: "inviterId",
+              foreignField: "_id",
+              as: "inviterData"
+            }
+          },
+          {
+            $unwind: {
+              path: "$inviterData",
+              preserveNullAndEmptyArrays: true
+            }
+          },
+          {
+            $addFields: {
+              inviterName: "$inviterData.name"
+            }
+          },
+          {
+            $project: {
+              inviterData: 0
+            }
+          }
         ]).toArray(),
         collection.aggregate([...basePipeline, { $count: "total" }]).toArray()
       ]);
@@ -13903,7 +13935,7 @@ function MVehicle(value) {
     block: value.block ?? 0,
     level: value.level ?? "",
     unit: value.unit ?? "",
-    nric: value.nric,
+    nric: value.nric ?? "",
     remarks: value.remarks ?? "",
     seasonPassType: value.seasonPassType ?? "",
     start: value.start ?? createdAt,
@@ -13963,7 +13995,7 @@ function MVehicleTransaction(value) {
 import { BadRequestError as BadRequestError71, logger as logger52 } from "@7365admin1/node-server-utils";
 import { promises as fsAsync } from "fs";
 import Joi39 from "joi";
-import * as path from "path";
+import * as path2 from "path";
 import { request } from "urllib";
 
 // src/repositories/vehicle.repo.ts
@@ -14607,6 +14639,66 @@ function useVehicleRepo() {
       throw error;
     }
   }
+  async function bulkUpsertVehicles(values, session) {
+    try {
+      if (!Array.isArray(values) || values.length === 0) {
+        return {
+          matchedCount: 0,
+          modifiedCount: 0,
+          upsertedCount: 0
+        };
+      }
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const operations = values.map((item) => {
+        const vehicle = MVehicle(item);
+        const plateNumber = Array.isArray(vehicle.plateNumber) ? vehicle.plateNumber[0] : vehicle.plateNumber;
+        const { createdAt, ...rest } = vehicle;
+        return {
+          updateOne: {
+            filter: {
+              site: vehicle.site,
+              plateNumber,
+              $or: [
+                { deletedAt: "" },
+                { deletedAt: null },
+                { deletedAt: { $exists: false } }
+              ]
+            },
+            update: {
+              $set: {
+                ...rest,
+                plateNumber,
+                updatedAt: now
+              },
+              $setOnInsert: {
+                createdAt: vehicle.createdAt || now
+              }
+            },
+            upsert: true
+          }
+        };
+      });
+      const res = await collection.bulkWrite(operations, {
+        ordered: false,
+        session
+      });
+      return {
+        matchedCount: res.matchedCount,
+        modifiedCount: res.modifiedCount,
+        upsertedCount: res.upsertedCount,
+        upsertedIds: res.upsertedIds
+      };
+    } catch (error) {
+      logger49.log({
+        level: "error",
+        message: error.message
+      });
+      if (error instanceof AppError9) {
+        throw error;
+      }
+      throw new Error("Failed to bulk upsert vehicles.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -14621,7 +14713,8 @@ function useVehicleRepo() {
     getVehiclesByNRIC,
     deleteExpiredVehicles,
     getAllVehiclesByUnitId,
-    getAllExpiredVehicles
+    getAllExpiredVehicles,
+    bulkUpsertVehicles
   };
 }
 
@@ -15267,7 +15360,8 @@ function useVehicleService() {
     getVehicleById: _getVehicleById,
     deleteExpiredVehicles: _deleteExpiredVehicles,
     getVehicleByPlateNumber: _getVehicleByPlateNumber,
-    getAllExpiredVehicles: _getAllExpiredVehicles
+    getAllExpiredVehicles: _getAllExpiredVehicles,
+    bulkUpsertVehicles: _bulkUpsertVehicles
   } = useVehicleRepo();
   const {
     addPlateNumber: _addPlateNumber,
@@ -15884,13 +15978,38 @@ function useVehicleService() {
       session.endSession();
     }
   }
+  async function bulkUpsertVehicles(values) {
+    const session = useAtlas33.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Unable to start session for vehicle service.");
+    }
+    try {
+      if (!Array.isArray(values) || values.length === 0) {
+        throw new Error("Vehicle list is required.");
+      }
+      const sanitizedValues = values.map((item) => {
+        const plateNumber = Array.isArray(item.plateNumber) ? item.plateNumber[0] : item.plateNumber;
+        return {
+          ...item,
+          plateNumber: typeof plateNumber === "string" ? plateNumber.trim() : plateNumber
+        };
+      }).filter((item) => item.site && item.plateNumber);
+      if (sanitizedValues.length === 0) {
+        throw new Error("No valid vehicle plate numbers found.");
+      }
+      return await _bulkUpsertVehicles(sanitizedValues, session);
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     add,
     deleteVehicle,
     approveVehicleById,
     processDeletingExpiredVehicles,
     reactivateVehicleById,
-    updateVehicleById
+    updateVehicleById,
+    bulkUpsertVehicles
   };
 }
 
@@ -16164,8 +16283,8 @@ function useDahuaService() {
       const utcMs = Number(UTCMs) || Date.now() % 1e3;
       const timeData = createFileNameFromEvent(utcSec, utcMs);
       const filename = plateNumber ? `${gate}-${timeData}-${plateNumber}.jpeg` : `${gate}-${timeData}.jpeg`;
-      const snapFolder = path.join(__dirname, `../snap/${site}/${filename}`);
-      const dir = path.dirname(snapFolder);
+      const snapFolder = path2.join(__dirname, `../snap/${site}/${filename}`);
+      const dir = path2.dirname(snapFolder);
       try {
         await fsAsync.mkdir(dir, { recursive: true });
         await fsAsync.writeFile(snapFolder, accumulatedImageBuffer);
@@ -18600,13 +18719,18 @@ function useBuildingUnitController() {
 // src/controllers/vehicle.controller.ts
 import { BadRequestError as BadRequestError83, logger as logger65 } from "@7365admin1/node-server-utils";
 import Joi46 from "joi";
+import ExcelJS from "exceljs";
+import { Readable } from "stream";
+import csv from "csv-parser";
+import fs from "fs";
 function useVehicleController() {
   const {
     add: _add,
     deleteVehicle: _deleteVehicle,
     approveVehicleById: _approveVehicleById,
     reactivateVehicleById: _reactivateVehicleById,
-    updateVehicleById: _updateVehicleById
+    updateVehicleById: _updateVehicleById,
+    bulkUpsertVehicles: _bulkUpsertVehicles
   } = useVehicleService();
   const {
     getSeasonPassTypes: _getSeasonPassTypes,
@@ -18615,6 +18739,141 @@ function useVehicleController() {
     getVehiclesByNRIC: _getVehiclesByNRIC,
     getAllVehiclesByUnitId: _getAllVehiclesByUnitId
   } = useVehicleRepo();
+  function normalizeRow(row) {
+    return Object.fromEntries(
+      Object.entries(row).map(([key, value]) => [
+        key,
+        typeof value === "string" ? value.trim() : value
+      ])
+    );
+  }
+  function mapRowToVehicle(row) {
+    const cleanRow = normalizeRow(row);
+    return {
+      name: cleanRow.fullName,
+      category: cleanRow.userType,
+      type: cleanRow.recordType,
+      phoneNumber: cleanRow.phoneNumber || "",
+      block: Number(cleanRow.block),
+      level: String(cleanRow.level || ""),
+      unitName: String(cleanRow.unit || ""),
+      plateNumber: String(cleanRow.plateNumber || "").toUpperCase(),
+      remarks: `Model: ${cleanRow.vehicleModel || ""}, Color: ${cleanRow.vehicleColor || ""}`,
+      org: cleanRow.org,
+      site: cleanRow.site,
+      end: parseExpiryDate(cleanRow.subscriptionExpiry)
+    };
+  }
+  function parseExpiryDate(value) {
+    if (!value)
+      return void 0;
+    const [day, monthStr, yearShort] = value.split("-");
+    const months = {
+      Jan: 0,
+      Feb: 1,
+      Mar: 2,
+      Apr: 3,
+      May: 4,
+      Jun: 5,
+      Jul: 6,
+      Aug: 7,
+      Sep: 8,
+      Oct: 9,
+      Nov: 10,
+      Dec: 11
+    };
+    const month = months[monthStr];
+    if (month === void 0)
+      return void 0;
+    const year = 2e3 + Number(yearShort);
+    const date = new Date(year, month, Number(day));
+    return isNaN(date.getTime()) ? void 0 : date.toISOString();
+  }
+  async function uploadCsvVehicles(req, res, next) {
+    try {
+      if (!req.file) {
+        next(new BadRequestError83("CSV file is required."));
+        return;
+      }
+      if (!req.file.originalname.toLowerCase().endsWith(".csv")) {
+        next(new BadRequestError83("Only .csv files are allowed."));
+        return;
+      }
+      const rows = [];
+      const stream = Readable.from(req.file.buffer);
+      stream.pipe(csv()).on("data", (row) => {
+        rows.push(row);
+      }).on("end", async () => {
+        try {
+          const vehicles = rows.map(mapRowToVehicle);
+          const data = await _bulkUpsertVehicles(vehicles);
+          res.status(200).json({
+            message: "CSV import completed.",
+            count: rows.length,
+            data
+          });
+        } catch (error) {
+          logger65.log({ level: "error", message: error.message });
+          next(error);
+        }
+      }).on("error", (error) => {
+        logger65.log({ level: "error", message: error.message });
+        next(error);
+      });
+    } catch (error) {
+      logger65.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
+  async function uploadExcelVehicles(req, res, next) {
+    try {
+      if (!req.file) {
+        next(new BadRequestError83("Excel file is required."));
+        return;
+      }
+      if (!req.file.originalname.toLowerCase().endsWith(".xlsx")) {
+        next(new BadRequestError83("Only .xlsx files are allowed."));
+        return;
+      }
+      const workbook = new ExcelJS.Workbook();
+      await workbook.xlsx.readFile(req.file.path);
+      const worksheet = workbook.worksheets[0];
+      if (!worksheet) {
+        next(new BadRequestError83("No worksheet found in uploaded Excel file."));
+        return;
+      }
+      const rows = [];
+      const headerRow = worksheet.getRow(1);
+      const headers = (headerRow.values || []).slice(1).map((header) => String(header ?? "").trim());
+      worksheet.eachRow((row, rowNumber) => {
+        if (rowNumber === 1)
+          return;
+        const rowData = {};
+        headers.forEach((header, index) => {
+          rowData[header] = row.getCell(index + 1).value ?? "";
+        });
+        const hasValue = Object.values(rowData).some(
+          (value) => value !== null && value !== void 0 && value !== ""
+        );
+        if (hasValue) {
+          rows.push(rowData);
+        }
+      });
+      const vehicles = rows.map(mapRowToVehicle);
+      const data = await _bulkUpsertVehicles(vehicles);
+      res.status(200).json({
+        message: "Excel import completed.",
+        sheetName: worksheet.name,
+        count: rows.length,
+        data
+      });
+      fs.unlink(req.file.path, () => {
+      });
+    } catch (error) {
+      logger65.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
   async function add(req, res, next) {
     const { error, value } = vehicleSchema.validate(req.body, {
       abortEarly: false
@@ -18939,6 +19198,69 @@ function useVehicleController() {
       return;
     }
   }
+  async function bulkUpsertVehicles(req, res, next) {
+    const items = Array.isArray(req.body) ? req.body : req.body?.items;
+    if (!Array.isArray(items) || items.length === 0) {
+      next(new BadRequestError83("A non-empty array of vehicles is required."));
+      return;
+    }
+    const success = [];
+    const failed = [];
+    try {
+      for (let index = 0; index < items.length; index++) {
+        const item = items[index];
+        const schema2 = Joi46.object({
+          fullName: Joi46.string().trim().required(),
+          category: Joi46.string().trim().lowercase().valid(...Object.values(PersonTypes)).required(),
+          type: Joi46.string().trim().lowercase().valid(...Object.values(VehicleType)),
+          phoneNumber: Joi46.string().trim().allow(null, "").optional(),
+          block: Joi46.number().integer().min(1).required(),
+          level: Joi46.string().trim().required(),
+          unit: Joi46.string().trim().required(),
+          plateNumber: Joi46.string().trim().uppercase().required(),
+          vehicleModel: Joi46.string().trim().required(),
+          vehicleColor: Joi46.string().trim().required(),
+          subscriptionExpiry: Joi46.string().trim().allow(null, "").optional()
+        });
+        const { error, value } = schema2.validate(item, {
+          abortEarly: false
+        });
+        if (error) {
+          const message = error.details.map((d) => d.message).join(", ");
+          failed.push({
+            index,
+            item,
+            message
+          });
+          continue;
+        }
+        try {
+          const data = await _bulkUpsertVehicles(value);
+          success.push({
+            index,
+            data
+          });
+        } catch (error2) {
+          failed.push({
+            index,
+            item,
+            message: error2.message
+          });
+        }
+      }
+      res.status(201).json({
+        message: "Bulk vehicle import completed.",
+        successCount: success.length,
+        failedCount: failed.length,
+        success,
+        failed
+      });
+    } catch (error) {
+      logger65.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
   return {
     add,
     getVehicles,
@@ -18949,7 +19271,10 @@ function useVehicleController() {
     approveVehicleById,
     getVehiclesByNRIC,
     reactivateVehicleById,
-    getAllVehiclesByUnitId
+    getAllVehiclesByUnitId,
+    bulkUpsertVehicles,
+    uploadCsvVehicles,
+    uploadExcelVehicles
   };
 }
 
@@ -22198,7 +22523,7 @@ function useVisitorTransactionService() {
         org: inviter?.org.toString(),
         site: inviter?.site.toString(),
         status: "approved" /* APPROVED */,
-        invitedId: inviter?._id
+        inviterId: userId
       };
       const result = await _add(payload);
       const emailContent = compileHandlebar2({
@@ -22349,7 +22674,8 @@ function useVisitorTransactionController() {
         }).optional().allow(null, ""),
         checkedOut: Joi55.boolean().allow(null, ""),
         plateNumber: Joi55.string().optional().allow(null, ""),
-        order: Joi55.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */)
+        order: Joi55.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
+        tab: Joi55.string().optional().allow(null, "")
       });
       const { error, value } = validation.validate(req.query, {
         abortEarly: false
@@ -22373,7 +22699,8 @@ function useVisitorTransactionController() {
         checkedOut,
         sort,
         order,
-        plateNumber
+        plateNumber,
+        tab
       } = value;
       const sortObj = {
         [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
@@ -22390,7 +22717,8 @@ function useVisitorTransactionController() {
         dateFrom,
         type,
         checkedOut,
-        plateNumber
+        plateNumber,
+        tab
       });
       res.status(200).json(data);
       return;
@@ -29729,7 +30057,7 @@ function useSiteBillingItemService() {
     }
     try {
       await session.startTransaction();
-      const billing_item = await _getBillingItemById(id, session);
+      const billing_item = await _getBillingItemById(id);
       if (!billing_item) {
         throw new BadRequestError131("Billing item not found.");
       }
@@ -30749,10 +31077,32 @@ function useEventManagementController() {
 import { BadRequestError as BadRequestError137, logger as logger116 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId85 } from "mongodb";
 import Joi83 from "joi";
+var Status = /* @__PURE__ */ ((Status3) => {
+  Status3["PENDING"] = "pending";
+  Status3["COMPLETED"] = "completed";
+  Status3["APPROVED"] = "approved";
+  Status3["REJECTED"] = "rejected";
+  Status3["CANCELLED"] = "cancelled";
+  Status3["RECURRING"] = "recurring";
+  Status3["NONRECURRING"] = "non-recurring";
+  Status3["ACTIVE"] = "active";
+  Status3["INACTIVE"] = "inactive";
+  return Status3;
+})(Status || {});
+var PStatus = /* @__PURE__ */ ((PStatus2) => {
+  PStatus2["PROCESSING"] = "processing";
+  PStatus2["UNPAID"] = "unpaid";
+  PStatus2["PAID"] = "paid";
+  PStatus2["OVERDUE"] = "overdue";
+  PStatus2["PARTIAL"] = "partial-payment";
+  PStatus2["AWAITING_PAYMENT"] = "awaiting-payment";
+  PStatus2["FAILED"] = "failed";
+  return PStatus2;
+})(PStatus || {});
 var schemaUnitBilling = Joi83.object({
   _id: Joi83.string().hex().optional(),
-  site: Joi83.string().hex().required(),
-  org: Joi83.string().hex().required(),
+  site: Joi83.string().hex().optional().allow(null, ""),
+  org: Joi83.string().hex().optional().allow(null, ""),
   billItem: Joi83.string().hex().optional().allow(null, ""),
   billName: Joi83.string().optional().allow(null, ""),
   unitId: Joi83.string().hex().optional().allow(null, ""),
@@ -30772,6 +31122,7 @@ var schemaUnitBilling = Joi83.object({
   paymentStatus: Joi83.string().optional().allow(null, ""),
   status: Joi83.string().optional().allow(null, ""),
   amountPaid: Joi83.number().optional().allow(null, ""),
+  balanceAmount: Joi83.number().optional().allow(null, ""),
   paidBy: Joi83.string().hex().optional().allow(null, ""),
   datePaid: Joi83.date().optional().allow(null, ""),
   transaction_id: Joi83.string().optional().allow(null, ""),
@@ -30795,6 +31146,7 @@ var schemaUpdateSiteUnitBilling = Joi83.object({
   category: Joi83.string().optional().allow(null, ""),
   frequency: Joi83.string().optional().allow(null, ""),
   totalAmount: Joi83.number().optional().allow(null, ""),
+  balanceAmount: Joi83.number().optional().allow(null, ""),
   taxPercentage: Joi83.number().optional().allow(null, ""),
   taxAmount: Joi83.number().optional().allow(null, ""),
   amount: Joi83.number().optional().allow(null, ""),
@@ -30860,8 +31212,8 @@ function MUnitBilling(value) {
   }
   return {
     _id: value._id ?? new ObjectId85(),
-    site: value.site,
-    org: value.org,
+    site: value.site ?? "",
+    org: value.org ?? "",
     billItem: value.billItem ?? "",
     billName: value.billName ?? "",
     unitId: value.unitId ?? "",
@@ -30881,6 +31233,7 @@ function MUnitBilling(value) {
     paymentStatus: value.paymentStatus ?? "",
     status: value.status ?? "active",
     amountPaid: value.amountPaid ?? 0,
+    balanceAmount: value.balanceAmount ?? 0,
     paidBy: value.paidBy ?? "",
     datePaid: value.datePaid ?? "",
     transaction_id: value.transaction_id ?? "",
@@ -30933,7 +31286,7 @@ function useSiteUnitBillingRepo() {
       value = MUnitBilling(value);
       const res = await collection.insertOne(value, { session });
       const acronym = createAcronym(value.billName || "NA");
-      const dateFormatted = formatDateString2(/* @__PURE__ */ new Date());
+      const dateFormatted = formatDateString(/* @__PURE__ */ new Date());
       const newId = new ObjectId86(res.insertedId).toString().slice(-6);
       const referenceNumber = `${acronym}${newId}${dateFormatted}`;
       await collection.updateOne(
@@ -31359,7 +31712,7 @@ function useSiteUnitBillingRepo() {
   function createAcronym(billName) {
     return billName.split(" ").map((word) => word.charAt(0).toUpperCase()).join("");
   }
-  function formatDateString2(today) {
+  function formatDateString(today) {
     today = typeof today === "string" ? new Date(today) : today;
     let month = today.getMonth() + 1;
     let day = today.getDate();
@@ -31884,8 +32237,8 @@ import {
 import { ObjectId as ObjectId89 } from "mongodb";
 
 // src/utils/access-management.ts
-import fs from "fs";
-import path2 from "path";
+import fs2 from "fs";
+import path3 from "path";
 import axios from "axios";
 import { parseStringPromise } from "xml2js";
 import crypto from "crypto";
@@ -31914,8 +32267,8 @@ var minifyXml = (xml) => {
   return xml.replace(/>\s+</g, "><").replace(/\n/g, "").replace(/\r/g, "").replace(/\t/g, "").trim();
 };
 var readTemplate = (name, params) => {
-  const template = fs.readFileSync(
-    path2.join(__dirname, `../src/public/xml-templates/${name}.xml`),
+  const template = fs2.readFileSync(
+    path3.join(__dirname, `../src/public/xml-templates/${name}.xml`),
     "utf-8"
   );
   if (!params)
@@ -32024,14 +32377,14 @@ import { parseStringPromise as parseStringPromise2 } from "xml2js";
 
 // src/utils/rsa-encryption.ts
 import * as crypto2 from "crypto";
-import fs2 from "fs";
-import path3 from "path";
-var pub = path3.resolve(process.cwd(), "./src/public/rsa-keys/new_rsa_512_pub.pem");
-var priv = path3.resolve(process.cwd(), "./src/public/rsa-keys/new_rsa_512_priv.pem");
+import fs3 from "fs";
+import path4 from "path";
+var pub = path4.resolve(process.cwd(), "./src/public/rsa-keys/new_rsa_512_pub.pem");
+var priv = path4.resolve(process.cwd(), "./src/public/rsa-keys/new_rsa_512_priv.pem");
 var EncryptionCredentials = class {
 };
-EncryptionCredentials.RAW_PUBLIC_KEY = fs2.readFileSync(pub, "utf8");
-EncryptionCredentials.RAW_PRIVATE_KEY = fs2.readFileSync(priv, "utf8");
+EncryptionCredentials.RAW_PUBLIC_KEY = fs3.readFileSync(pub, "utf8");
+EncryptionCredentials.RAW_PRIVATE_KEY = fs3.readFileSync(priv, "utf8");
 var EntrypassRSAEncryption = class extends EncryptionCredentials {
   static hexToCardNumber(hex) {
     if (!/^[0-9A-Fa-f]{8}$/.test(hex)) {
@@ -33987,7 +34340,7 @@ import Joi85 from "joi";
 
 // src/services/access-management.service.ts
 import { parseStringPromise as parseStringPromise3 } from "xml2js";
-import { Readable } from "stream";
+import { Readable as Readable2 } from "stream";
 import * as xlsx from "xlsx";
 function useAccessManagementSvc() {
   const {
@@ -34192,7 +34545,7 @@ function useAccessManagementSvc() {
   };
   const convertBufferFile = async (bufferFile) => {
     return new Promise((resolve, reject) => {
-      const fileStream = Readable.from(bufferFile);
+      const fileStream = Readable2.from(bufferFile);
       let fileBuffer = Buffer.alloc(0);
       fileStream.on("data", (chunk) => {
         fileBuffer = Buffer.concat([fileBuffer, chunk]);
@@ -46614,121 +46967,8 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-import { ObjectId as ObjectId127 } from "mongodb";
-
-// src/utils/date-format.util.ts
-import moment6 from "moment-timezone";
-function formatDateString(today, format, dateRange) {
-  today = typeof today === "string" ? new Date(today) : today;
-  let month = today.getMonth() + 1;
-  let day = today.getDate();
-  let year = today.getFullYear();
-  let formattedDate;
-  if (format === "mm-dd-yyyy") {
-    formattedDate = `${month.toString().padStart(2, "0")}-${day.toString().padStart(2, "0")}-${year}`;
-  } else if (format === "dd-mm-yyyy") {
-    formattedDate = `${day.toString().padStart(2, "0")}-${month.toString().padStart(2, "0")}-${year}`;
-  } else if (format === "for-ref") {
-    formattedDate = `${month.toString().padStart(2, "0")}${day.toString().padStart(2, "0")}${year}`;
-  } else if (format === "mm/dd/yyyy") {
-    formattedDate = `${month.toString().padStart(2, "0")}/${day.toString().padStart(2, "0")}/${year}`;
-  } else {
-    formattedDate = `${year}-${month.toString().padStart(2, "0")}-${day.toString().padStart(2, "0")}`;
-  }
-  return formattedDate;
-}
-
-// src/models/credit-card.model.ts
-import { ObjectId as ObjectId124 } from "mongodb";
-var MCardInfo = class {
-  // this is coming from RDP transaction
-  constructor({
-    _id = new ObjectId124(),
-    userId,
-    cardType,
-    cardNumber,
-    cardId,
-    fullName,
-    expiryDate,
-    cvv,
-    site,
-    siteName,
-    organization,
-    createdBy,
-    createdAt,
-    updatedAt,
-    transaction_id
-  } = {}) {
-    this._id = _id;
-    this.userId = userId;
-    this.cardType = cardType;
-    this.cardNumber = cardNumber;
-    this.cardId = cardId;
-    this.fullName = fullName;
-    this.expiryDate = expiryDate;
-    this.cvv = cvv;
-    this.site = site;
-    this.siteName = siteName;
-    this.organization = organization;
-    this.createdBy = createdBy;
-    this.createdAt = createdAt;
-    this.updatedAt = updatedAt;
-    this.transaction_id = transaction_id;
-  }
-};
-
-// src/models/cart.model.ts
-import { ObjectId as ObjectId125 } from "mongodb";
-var MUnitBillings = class {
-  // transaction response messages
-  constructor({
-    _id = new ObjectId125(),
-    unit,
-    unitId,
-    unitBill,
-    paymentStatus = "Processing" /* processing */,
-    referenceNumber,
-    amountPaid,
-    paidBy,
-    datePaid,
-    billCategory,
-    billFrom,
-    billTo,
-    site,
-    organization,
-    createdBy,
-    createdAt,
-    updatedAt,
-    message
-  } = {}) {
-    this._id = _id;
-    this.unit = unit;
-    this.unitId = unitId;
-    this.referenceNumber = referenceNumber;
-    this.unitBill = unitBill;
-    this.paymentStatus = paymentStatus;
-    this.amountPaid = amountPaid;
-    this.site = site;
-    this.organization = organization;
-    this.paidBy = paidBy;
-    this.datePaid = datePaid;
-    this.billCategory = billCategory;
-    this.billFrom = billFrom;
-    this.billTo = billTo;
-    this.createdBy = createdBy;
-    this.createdAt = createdAt;
-    this.updatedAt = updatedAt;
-    this.message = message;
-  }
-};
-
-// src/repositories/payment.repository.ts
-import { ObjectId as ObjectId126 } from "mongodb";
-import {
-  InternalServerError as InternalServerError66,
-  useAtlas as useAtlas110
-} from "@7365admin1/node-server-utils";
-var PaymentBillRepo = () => {
+import { InternalServerError as InternalServerError66, useAtlas as useAtlas110 } from "@7365admin1/node-server-utils";
+var useRedDotPaymentRepo = () => {
   const getDB2 = () => {
     const db = useAtlas110.getDb();
     if (!db) {
@@ -46736,350 +46976,75 @@ var PaymentBillRepo = () => {
     }
     return db;
   };
-  const collection = () => {
-    return getDB2().collection("unit-bill");
+  const paymentCollection = () => {
+    return getDB2().collection("payments");
   };
-  const billCollection = () => {
-    return getDB2().collection("bill-records");
+  const unitBillingCollection = () => {
+    return getDB2().collection("site.unit.billing");
   };
-  const creditCollection = () => {
-    return getDB2().collection("credit-info");
+  const orgCollection = () => {
+    return getDB2().collection("organizations");
   };
-  const cartCollection = () => {
-    return getDB2().collection("checkout-cart");
+  const redDotMerchantCollection = () => {
+    return getDB2().collection("payment-gateways");
   };
-  const payUnitBill = async (refId, payload) => {
+  async function paySingleUnitBill(refId, payload) {
     try {
       if (refId)
         refId = refId.toString();
-      const unitBillInfo = await collection().findOne({ referenceNumber: refId });
-      const unitBillId = unitBillInfo?._id;
+      const unitBillInfo = await unitBillingCollection().findOne({
+        referenceNumber: refId
+      });
       if (!unitBillInfo) {
         throw new Error("Unit bill info not found");
       }
-      if (unitBillInfo?.status === "Inactive" /* inactive */) {
+      if (unitBillInfo?.status === "inactive" /* INACTIVE */) {
         throw new Error("This Bill is Inactive!");
       }
-      const billId = new ObjectId126(unitBillInfo?.billId);
-      const billInfo = await billCollection().findOne({ _id: billId });
-      if (!billInfo) {
-        throw new Error("Bill info not found");
-      }
-      if (payload.paymentStatus === "Partial Payment" /* partial */ && payload.amountPaid) {
-        const price = parseInt(billInfo?.price);
-        const amount = payload.amountPaid;
-        const numericPrice = typeof price === "string" ? parseInt(price) : price;
-        const numericAmount = typeof amount === "string" ? parseInt(amount) : amount;
-        if (typeof amount !== "number") {
-          throw new Error("Amount is not a valid number");
-        } else if (typeof price !== "number") {
-          throw new Error("Price s not a valid number");
+      if (payload.paymentStatus === "partial-payment" /* PARTIAL */ && payload.amountPaid) {
+        const totalAmount = parseInt(unitBillInfo.totalAmount);
+        const amountPaid = payload.amountPaid;
+        if (typeof totalAmount !== "number") {
+          throw new Error("Total Amount is not a valid number");
+        } else if (typeof amountPaid !== "number") {
+          throw new Error("Amount Paid is not a valid number");
         }
-        payload.balance = numericPrice - numericAmount;
-      } else if (payload.paymentStatus === "Paid" /* paid */ && payload.amountPaid) {
+        payload.balanceAmount = totalAmount - amountPaid;
+      } else if (payload.paymentStatus === "paid" /* PAID */ && payload.amountPaid) {
         payload.datePaid = /* @__PURE__ */ new Date();
-        payload.paymentStatus = "Paid" /* paid */;
+        payload.paymentStatus = "paid" /* PAID */;
         payload.amountPaid;
         payload.transaction_id;
-      } else if (payload.paymentStatus === "Failed" /* failed */) {
+      } else if (payload.paymentStatus === "failed" /* FAILED */) {
         payload.amountPaid = 0;
-        payload.paidBy = "";
-        payload.datePaid = "";
-        payload.paymentStatus = "Failed" /* failed */;
+        payload.paymentStatus = "failed" /* FAILED */;
         payload.transaction_id;
       }
-      const updatedAt = formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
-      payload.updatedAt = updatedAt;
-      const result = await collection().findOneAndUpdate({ _id: unitBillId }, { $set: payload }, { returnDocument: "after" });
-      return result;
-    } catch (error) {
-      throw new Error(error.message || error || "Server Internal Error");
-    }
-  };
-  const saveCreditCardInfo = async (payload) => {
-    try {
-      if (payload.userId)
-        payload.userId = new ObjectId126(payload.userId);
-      if (payload.site)
-        payload.site = new ObjectId126(payload.site);
-      if (payload.organization)
-        payload.organization = new ObjectId126(payload.organization);
-      if (payload.createdBy)
-        payload.createdBy = new ObjectId126(payload.createdBy);
-      const createdAt = formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
-      payload.createdAt = createdAt;
-      const result = await creditCollection().insertOne(new MCardInfo(payload));
-      return result;
-    } catch (error) {
-      throw new Error(error.message || error || "Server Internal Error");
-    }
-  };
-  const checkOutUnitBills = async (payload) => {
-    try {
-      if (payload.unitId)
-        payload.unitId = new ObjectId126(payload.unitId);
-      if (payload.site)
-        payload.site = new ObjectId126(payload.site);
-      if (payload.organization)
-        payload.organization = new ObjectId126(payload.organization);
-      payload.createdAt = await formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
-      const addToCart = await cartCollection().insertOne(new MUnitBillings(payload));
-      const unitId = payload.unitId;
-      const dateFormatted = formatDateString(/* @__PURE__ */ new Date(), "for-ref");
-      const unit = unitId?.toString().slice(-4);
-      const newId = new ObjectId126(addToCart?.insertedId).toString().slice(-4);
-      const referenceNumber = `CRT${unit}${newId}${dateFormatted}`;
-      const result = await cartCollection().findOneAndUpdate({ _id: new ObjectId126(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
-      return result;
-    } catch (error) {
-      throw new Error(error.message || error || "Server Internal Error");
-    }
-  };
-  const payUnitCart = async (refId, payload) => {
-    try {
-      if (refId)
-        refId = refId.toString();
-      const updatedAt = formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
-      const cartInfo = await cartCollection().findOne({ referenceNumber: refId });
-      const refNumber = cartInfo?.unitBill;
-      if (payload.paymentStatus === "Paid" /* paid */ && payload.amountPaid) {
-        payload.datePaid = /* @__PURE__ */ new Date();
-        payload.paymentStatus = "Paid" /* paid */;
-        payload.amountPaid;
-      } else if (payload.paymentStatus === "Failed" /* failed */) {
-        payload.amountPaid = 0;
-        payload.paidBy = "";
-        payload.datePaid = "";
-        payload.paymentStatus = "Failed" /* failed */;
-      }
-      payload.updatedAt = updatedAt;
-      const result = await cartCollection().findOneAndUpdate({ referenceNumber: refId }, { $set: payload }, { returnDocument: "after" });
-      if (!result) {
-        throw new Error("Failed to Process Transaction. Please Try Again Later");
-      } else {
-        for (const ref of refNumber) {
-          const unitBillInfo = await collection().findOne({ referenceNumber: ref });
-          const billId = unitBillInfo?.billId;
-          const billInfo = await billCollection().findOne({ _id: new ObjectId126(billId) });
-          const billAmount = billInfo?.price;
-          payload.updatedAt = updatedAt;
-          payload.amountPaid = billAmount;
-          const eachRef = await payUnitBill(ref, payload);
-        }
-        if (!cartInfo) {
-          throw new Error("Cart info not found");
-        }
-      }
+      payload.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      const result = await unitBillingCollection().findOneAndUpdate(
+        { _id: unitBillInfo._id },
+        { $set: payload },
+        { returnDocument: "after" }
+      );
       return result;
     } catch (error) {
       throw new Error(error.message || error || "Server Internal Error");
     }
-  };
-  const getCheckedOutBillings = async (refId) => {
-    try {
-      if (refId)
-        refId = refId.toString();
-      const result = await cartCollection().aggregate([
-        { $match: { referenceNumber: refId } },
-        {
-          $lookup: {
-            from: "unit-bill",
-            localField: "unitBill",
-            foreignField: "referenceNumber",
-            as: "unitBill"
-          }
-        },
-        {
-          $unwind: "$unitBill"
-        },
-        {
-          $lookup: {
-            from: "bill-records",
-            localField: "unitBill.billId",
-            foreignField: "_id",
-            as: "billDetails"
-          }
-        },
-        {
-          $unwind: {
-            path: "$billDetails",
-            preserveNullAndEmptyArrays: true
-          }
-        },
-        {
-          $addFields: {
-            "unitBill.billItemName": "$billDetails.billItem"
-          }
-        },
-        {
-          $project: {
-            "unitBill.paidBy": 0,
-            "unitBill.preDueDateAlert": 0,
-            "unitBill.category": 0,
-            "unitBill.contactNumber": 0,
-            "unitBill.email": 0,
-            "unitBill.site": 0,
-            "unitBill.siteName": 0,
-            "unitBill.organization": 0,
-            "unitBill.billStatus": 0,
-            "unitBill.createdBy": 0,
-            "unitBill.createdAt": 0,
-            "unitBill.updatedAt": 0,
-            "billDetails": 0
-            // Exclude the full billDetails as it's no longer needed
-          }
-        },
-        {
-          $group: {
-            _id: "$_id",
-            unitId: { $first: "$unitId" },
-            referenceNumber: { $first: "$referenceNumber" },
-            unitBill: { $push: "$unitBill" },
-            paymentStatus: { $first: "$paymentStatus" },
-            amountPaid: { $first: "$amountPaid" },
-            site: { $first: "$site" },
-            organization: { $first: "$organization" },
-            paidBy: { $first: "$paidBy" },
-            datePaid: { $first: "$referenceNumber" },
-            billCategory: { $first: "$billCategory" },
-            billFrom: { $first: "$billFrom" },
-            billTo: { $first: "$billTo" },
-            createdBy: { $first: "$createdBy" },
-            createdAt: { $first: "$createdAt" },
-            updatedAt: { $first: "$updatedAt" },
-            transaction_id: { $first: "$transaction_id" }
-          }
-        }
-      ]).toArray();
-      if (!result || result.length === 0) {
-        return { success: false, message: "Cart Info Not Found" };
-      }
-      return result[0];
-    } catch (error) {
-      throw new Error(error.message || error || "Server Internal Error");
-    }
-  };
-  const cancelCheckedOutBillings = async (refId) => {
-    try {
-      if (refId)
-        refId = refId.toString();
-      const result = await cartCollection().findOneAndDelete({ referenceNumber: refId });
-      if (!result) {
-        return { success: false, message: "Cart Info Not Found" };
-      }
-      return { success: true, message: "Cart Deleted Successfully!", referenceNumber: result?.referenceNumber };
-    } catch (error) {
-      throw new Error(error.message || error || "Server Internal Error");
-    }
-  };
-  return {
-    saveCreditCardInfo,
-    checkOutUnitBills,
-    payUnitBill,
-    payUnitCart,
-    getCheckedOutBillings,
-    cancelCheckedOutBillings
-  };
-};
-
-// src/repositories/reddot-payment.repository.ts
-import {
-  InternalServerError as InternalServerError67,
-  useAtlas as useAtlas111
-} from "@7365admin1/node-server-utils";
-var useRedDotPaymentRepo = () => {
-  const getDB2 = () => {
-    const db = useAtlas111.getDb();
-    if (!db) {
-      throw new InternalServerError67("Unable to connect to server.");
-    }
-    return db;
-  };
-  const collection = () => {
-    return getDB2().collection("unit-bill");
-  };
-  const orgCollection = () => {
-    return getDB2().collection("organizations");
-  };
-  const cartCollection = () => {
-    return getDB2().collection("checkout-cart");
-  };
-  const redDotMerchantCollection = () => {
-    return getDB2().collection("reddot-merchant");
-  };
-  const createRedDotAccount = async (_id, payload) => {
-    try {
-      const merchant = await redDotMerchantCollection().insertOne(payload);
-      if (!merchant) {
-        throw new Error("Failed to Add Merchant Details");
-      }
-      const merchantId = merchant?.insertedId;
-      const orgId = new ObjectId127(_id);
-      const result = await orgCollection().findOneAndUpdate({ _id: orgId }, { $push: { merchant: merchantId } }, {
-        returnDocument: "after"
-      });
-      if (!result) {
-        throw new Error("Organization not found");
-      }
-      return {
-        success: true,
-        message: "Merchant Details successfully added."
-      };
-    } catch (error) {
-      throw new Error(error.message || error || "Server Internal Error");
-    }
-  };
-  const payUnitBillings = async (refId, payload) => {
-    const checkCart = await cartCollection().findOne({ referenceNumber: refId });
-    if (checkCart) {
-      const multiple = await PaymentBillRepo().payUnitCart(refId, payload);
-      if (multiple) {
-        return await PaymentBillRepo().getCheckedOutBillings(refId);
-      }
-    }
-    const single = await PaymentBillRepo().payUnitBill(refId, payload);
-    return single;
-  };
-  const getMerchantDetailsById = async (_id) => {
-    try {
-      if (_id)
-        _id = new ObjectId127(_id);
-      const result = await redDotMerchantCollection().aggregate([
-        {
-          $match: {
-            _id
-          }
-        },
-        {
-          $facet: {
-            totalCount: [{ $count: "count" }],
-            items: [{ $sort: { _id: -1 } }]
-          }
-        }
-      ]).toArray();
-      const items = result[0].items;
-      return items;
-    } catch (error) {
-      throw new Error(error.message || error || "Server Internal Error");
-    }
-  };
-  return {
-    createRedDotAccount,
-    payUnitBillings,
-    getMerchantDetailsById
-  };
+  }
+  return { paySingleUnitBill };
 };
 
 // src/services/reddot-payment.service.ts
 var useRedDotPaymentSvc = () => {
-  const createRedDotAccount = async (_id, payload) => {
-    return useRedDotPaymentRepo().createRedDotAccount(_id, payload);
-  };
+  const { paySingleUnitBill } = useRedDotPaymentRepo();
   const redirectPaymentTransaction = async (payload) => {
     try {
       const SECRET_KEY2 = payload.merchant_key;
       if (!payload.mid && !payload.merchant_key) {
-        return { success: false, message: "RDP Not Available on this account. Please Contact Management" };
+        return {
+          success: false,
+          message: "RDP Not Available on this account. Please Contact Management"
+        };
       }
       const data = {
         mid: payload.mid,
@@ -47102,7 +47067,9 @@ var useRedDotPaymentSvc = () => {
         "Content-Length": String(dataString.length)
       };
       if (!process.env.MERCHANT_PAYMENT) {
-        throw new Error("MERCHANT_PAYMENT environment variable is not defined.");
+        throw new Error(
+          "MERCHANT_PAYMENT environment variable is not defined."
+        );
       }
       const url = process.env.MERCHANT_PAYMENT;
       const response = await axios3.post(url, dataString, { headers });
@@ -47116,7 +47083,10 @@ var useRedDotPaymentSvc = () => {
     try {
       const SECRET_KEY2 = payload.merchant_key;
       if (!payload.request_mid && !payload.merchant_key) {
-        return { success: false, message: "RDP Not Available on this account. Please Contact Management" };
+        return {
+          success: false,
+          message: "RDP Not Available on this account. Please Contact Management"
+        };
       }
       const data = {
         request_mid: payload.request_mid,
@@ -47131,7 +47101,9 @@ var useRedDotPaymentSvc = () => {
         "Content-Type": "application/json"
       };
       if (!process.env.MERCHANT_ENQUIRY) {
-        throw new Error("MERCHANT_PAYMENT environment variable is not defined.");
+        throw new Error(
+          "MERCHANT_PAYMENT environment variable is not defined."
+        );
       }
       const url = process.env.MERCHANT_ENQUIRY;
       const response = await axios3.post(url, dataString, { headers });
@@ -47145,25 +47117,24 @@ var useRedDotPaymentSvc = () => {
       if (result.response_code === "0") {
         const success = {
           method: payload.method,
-          paymentStatus: "Paid" /* paid */,
-          amountPaid: amount,
-          paidBy: payer,
+          paymentStatus: "paid" /* PAID */,
+          amountPaid: parseInt(amount),
           updatedAt: invoiceDate,
           transaction_id: transactionId,
           message
         };
-        await useRedDotPaymentRepo().payUnitBillings(refId, success);
+        await paySingleUnitBill(refId, success);
       } else if (result.response_code !== "0") {
         const fail = {
           method: payload.method,
-          paymentStatus: "Failed" /* failed */,
+          paymentStatus: "failed" /* FAILED */,
           updatedAt: invoiceDate,
           paidBy: "",
-          amountPaid: "0",
+          amountPaid: 0,
           transaction_id: transactionId,
           message
         };
-        await useRedDotPaymentRepo().payUnitBillings(refId, fail);
+        await paySingleUnitBill(refId, fail);
       }
       return result;
     } catch (error) {
@@ -47183,7 +47154,9 @@ var useRedDotPaymentSvc = () => {
         "Content-Length": String(dataString.length)
       };
       if (!process.env.MERCHANT_PAYMENT) {
-        throw new Error("MERCHANT_PAYMENT environment variable is not defined.");
+        throw new Error(
+          "MERCHANT_PAYMENT environment variable is not defined."
+        );
       }
       const url = process.env.MERCHANT_PAYMENT;
       const response = await axios3.post(url, dataString, { headers });
@@ -47192,45 +47165,16 @@ var useRedDotPaymentSvc = () => {
       return Promise.reject(error || error.message || "Server Internal Error!");
     }
   };
-  const getMerchantDetailsById = async (_id) => {
-    return useRedDotPaymentRepo().getMerchantDetailsById(_id);
-  };
   return {
-    createRedDotAccount,
     redirectPaymentTransaction,
     enquirePaymentTransaction,
-    payInvoice,
-    getMerchantDetailsById
+    payInvoice
   };
 };
 
 // src/controllers/reddot-payment.controller.ts
 import Joi124 from "joi";
 function useRedDotPaymentController() {
-  const createRedDotAccount = async (req, res) => {
-    try {
-      const data = req.body;
-      const id = req.params.id;
-      const schema2 = Joi124.object({
-        id: Joi124.string().hex().required(),
-        // organization id
-        paymentMethod: Joi124.string().required(),
-        // payment method (e.g. "Visa / Mastercard / PayNow QR Code")
-        merchant_id: Joi124.string().required(),
-        // merchant id
-        merchant_key: Joi124.string().required()
-        // secret key
-      });
-      const { error } = schema2.validate({ id, ...data });
-      if (error) {
-        return res.status(400).json({ data: null, message: error.message });
-      }
-      const result = await useRedDotPaymentSvc().createRedDotAccount(id, data);
-      return res.json(result);
-    } catch (error) {
-      return res.status(500).json({ message: error.message || error });
-    }
-  };
   const redirectPaymentTransaction = async (req, res) => {
     try {
       const data = req.body;
@@ -47247,7 +47191,9 @@ function useRedDotPaymentController() {
       if (error) {
         return res.status(400).json({ data: null, message: error.message });
       }
-      const result = await useRedDotPaymentSvc().redirectPaymentTransaction(data);
+      const result = await useRedDotPaymentSvc().redirectPaymentTransaction(
+        data
+      );
       return res.json(result);
     } catch (error) {
       return res.status(500).json({ message: error.message || error });
@@ -47266,52 +47212,36 @@ function useRedDotPaymentController() {
       if (error) {
         return res.status(400).json({ data: null, message: error.message });
       }
-      const result = await useRedDotPaymentSvc().enquirePaymentTransaction(data);
+      const result = await useRedDotPaymentSvc().enquirePaymentTransaction(
+        data
+      );
       return res.json(result);
     } catch (error) {
       return res.status(500).json({ message: error.message || error });
     }
   };
-  const getMerchantDetailsById = async (req, res, next) => {
-    try {
-      const _id = req.params.id;
-      const schema2 = Joi124.object({
-        _id: Joi124.string().hex().required()
-      });
-      const { error } = schema2.validate({ _id });
-      if (error) {
-        return res.status(400).json({ data: null, message: error.message });
-      }
-      const result = await useRedDotPaymentSvc().getMerchantDetailsById(_id);
-      return res.json(result);
-    } catch (error) {
-      next(error);
-    }
-  };
   return {
-    createRedDotAccount,
     redirectPaymentTransaction,
-    enquirePaymentTransaction,
-    getMerchantDetailsById
+    enquirePaymentTransaction
   };
 }
 
 // src/repositories/verification-v2.repo.ts
 import {
   BadRequestError as BadRequestError195,
-  InternalServerError as InternalServerError68,
+  InternalServerError as InternalServerError67,
   logger as logger175,
   makeCacheKey as makeCacheKey64,
   paginate as paginate57,
   toObjectId as toObjectId18,
-  useAtlas as useAtlas112,
+  useAtlas as useAtlas111,
   useCache as useCache66
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId128 } from "mongodb";
+import { ObjectId as ObjectId124 } from "mongodb";
 function useVerificationRepoV2() {
-  const db = useAtlas112.getDb();
+  const db = useAtlas111.getDb();
   if (!db) {
-    throw new InternalServerError68("Unable to connect to server.");
+    throw new InternalServerError67("Unable to connect to server.");
   }
   const namespace_collection = "verifications";
   const collection = db.collection(namespace_collection);
@@ -47324,7 +47254,7 @@ function useVerificationRepoV2() {
         { "metadata.org": 1 }
       ]);
     } catch (error) {
-      throw new InternalServerError68("Failed to create index.");
+      throw new InternalServerError67("Failed to create index.");
     }
   }
   async function createTextIndex() {
@@ -47333,7 +47263,7 @@ function useVerificationRepoV2() {
         email: "text"
       });
     } catch (error) {
-      throw new InternalServerError68("Failed to create text index on email.");
+      throw new InternalServerError67("Failed to create text index on email.");
     }
   }
   const { delNamespace, setCache, getCache, delCache } = useCache66(namespace_collection);
@@ -47355,12 +47285,12 @@ function useVerificationRepoV2() {
         level: "info",
         message: String(error)
       });
-      throw new InternalServerError68("Server internal error.");
+      throw new InternalServerError67("Server internal error.");
     }
   }
   async function updateVerificationStatusById(_id, status, session) {
     try {
-      _id = new ObjectId128(_id);
+      _id = new ObjectId124(_id);
     } catch (error) {
       throw new BadRequestError195("Invalid verification ID format.");
     }
@@ -47380,7 +47310,7 @@ function useVerificationRepoV2() {
       });
       return result;
     } catch (error) {
-      throw new InternalServerError68("Error updating verification status.");
+      throw new InternalServerError67("Error updating verification status.");
     }
   }
   async function getByVerificationCode(verificationCode) {
@@ -47403,7 +47333,7 @@ function useVerificationRepoV2() {
       });
       return data;
     } catch (error) {
-      throw new InternalServerError68(
+      throw new InternalServerError67(
         "Internal server error, failed to retrieve verification."
       );
     }
@@ -47425,7 +47355,7 @@ function useVerificationRepoV2() {
       });
       return data;
     } catch (error) {
-      throw new InternalServerError68(
+      throw new InternalServerError67(
         "Internal server error, failed to retrieve verification."
       );
     }
@@ -47503,7 +47433,7 @@ function useVerificationRepoV2() {
   }
   async function updateStatusById(_id, status, session) {
     try {
-      _id = new ObjectId128(_id);
+      _id = new ObjectId124(_id);
     } catch (error) {
       throw new BadRequestError195("Invalid verification ID format.");
     }
@@ -47529,7 +47459,7 @@ function useVerificationRepoV2() {
       });
       return result;
     } catch (error) {
-      throw new InternalServerError68("Error updating verification status.");
+      throw new InternalServerError67("Error updating verification status.");
     }
   }
   return {
@@ -47552,8 +47482,8 @@ import {
   getDirectory as getDirectory4,
   BadRequestError as BadRequestError196,
   NotFoundError as NotFoundError51,
-  InternalServerError as InternalServerError69,
-  useAtlas as useAtlas113,
+  InternalServerError as InternalServerError68,
+  useAtlas as useAtlas112,
   hashPassword as hashPassword4
 } from "@7365admin1/node-server-utils";
 import crypto4 from "crypto";
@@ -47620,7 +47550,7 @@ function useVerificationServiceV2() {
     email,
     metadata
   }) {
-    const session = useAtlas113.getClient()?.startSession();
+    const session = useAtlas112.getClient()?.startSession();
     try {
       session?.startTransaction();
       const user = await _getUserByEmailStatus(email);
@@ -47672,7 +47602,7 @@ function useVerificationServiceV2() {
     }
   }
   async function verify(verificationCode) {
-    const session = useAtlas113.getClient()?.startSession();
+    const session = useAtlas112.getClient()?.startSession();
     try {
       session?.startTransaction();
       const item = await _getByVerificationCode(verificationCode);
@@ -47873,14 +47803,14 @@ function useVerificationServiceV2() {
       });
       return "Successfully created a link to reset password. Please check your email.";
     } catch (error) {
-      throw new InternalServerError69("Failed to create forget password link.");
+      throw new InternalServerError68("Failed to create forget password link.");
     }
   }
   async function cancelUserInvitation(id) {
     try {
       await _updateStatusById(id, "cancelled");
     } catch (error) {
-      throw new InternalServerError69(
+      throw new InternalServerError68(
         `Error cancelling user invitation: ${error}`
       );
     }
@@ -48098,17 +48028,17 @@ import { BadRequestError as BadRequestError201, logger as logger180 } from "@736
 import {
   BadRequestError as BadRequestError199,
   comparePassword as comparePassword3,
-  InternalServerError as InternalServerError71,
+  InternalServerError as InternalServerError70,
   NotFoundError as NotFoundError53,
   useCache as useCache68
 } from "@7365admin1/node-server-utils";
 import { v4 as uuidv42 } from "uuid";
 
 // src/repositories/user-v2.repo.ts
-import { ObjectId as ObjectId129 } from "mongodb";
+import { ObjectId as ObjectId125 } from "mongodb";
 import {
-  useAtlas as useAtlas114,
-  InternalServerError as InternalServerError70,
+  useAtlas as useAtlas113,
+  InternalServerError as InternalServerError69,
   logger as logger178,
   BadRequestError as BadRequestError198,
   paginate as paginate58,
@@ -48122,9 +48052,9 @@ function useUserRepoV2() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
   const { updateWorkOrderCreatedByName } = useWorkOrderRepo();
   const { updateUserNameBySignatureId } = useOccurrenceEntryRepo();
-  const db = useAtlas114.getDb();
+  const db = useAtlas113.getDb();
   if (!db) {
-    throw new InternalServerError70("Unable to connect to server.");
+    throw new InternalServerError69("Unable to connect to server.");
   }
   const namespace_collection = "users";
   const collection = db.collection(namespace_collection);
@@ -48133,14 +48063,14 @@ function useUserRepoV2() {
     try {
       await collection.createIndexes([{ key: { email: 1 } }]);
     } catch (error) {
-      throw new InternalServerError70("Failed to create text index on user.");
+      throw new InternalServerError69("Failed to create text index on user.");
     }
   }
   async function createTextIndex() {
     try {
       await collection.createIndex({ name: "text", email: "text" });
     } catch (error) {
-      throw new InternalServerError70("Failed to create text index on user.");
+      throw new InternalServerError69("Failed to create text index on user.");
     }
   }
   async function createUniqueIndex() {
@@ -48150,7 +48080,7 @@ function useUserRepoV2() {
         { unique: true }
       );
     } catch (error) {
-      throw new InternalServerError70("Failed to create unique index on user.");
+      throw new InternalServerError69("Failed to create unique index on user.");
     }
   }
   async function createUser(value, session) {
@@ -48190,7 +48120,7 @@ function useUserRepoV2() {
       );
       return data;
     } catch (error) {
-      throw new InternalServerError70("Failed to get user by email.");
+      throw new InternalServerError69("Failed to get user by email.");
     }
   }
   async function getUserByEmailStatus(email) {
@@ -48213,7 +48143,7 @@ function useUserRepoV2() {
       );
       return data;
     } catch (error) {
-      throw new InternalServerError70("Failed to get user by email.");
+      throw new InternalServerError69("Failed to get user by email.");
     }
   }
   async function getUserById(id) {
@@ -48253,7 +48183,7 @@ function useUserRepoV2() {
     } catch (error) {
       if (error instanceof AppError27)
         throw error;
-      throw new InternalServerError70("Failed to get user by id.");
+      throw new InternalServerError69("Failed to get user by id.");
     }
   }
   async function getUserByReferralCode(referralCode) {
@@ -48270,7 +48200,7 @@ function useUserRepoV2() {
       );
       return data;
     } catch (error) {
-      throw new InternalServerError70("Failed to get user by referral code.");
+      throw new InternalServerError69("Failed to get user by referral code.");
     }
   }
   async function getByEmailApp(email, app) {
@@ -48290,7 +48220,7 @@ function useUserRepoV2() {
       );
       return data;
     } catch (error) {
-      throw new InternalServerError70("Failed to get user by email and app.");
+      throw new InternalServerError69("Failed to get user by email and app.");
     }
   }
   async function getUsersByOrgId({
@@ -48317,7 +48247,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new ObjectId129(organization);
+        query.defaultOrg = new ObjectId125(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new BadRequestError198("Invalid organization ID format.");
@@ -48436,7 +48366,7 @@ function useUserRepoV2() {
       });
       return result;
     } catch (error) {
-      throw new InternalServerError70("Failed to update user password.");
+      throw new InternalServerError69("Failed to update user password.");
     }
   }
   async function updateUserFieldById({ _id, field, value } = {}, session) {
@@ -48456,13 +48386,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new ObjectId129(_id);
+      _id = new ObjectId125(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new ObjectId129(value);
+        value = new ObjectId125(value);
       } catch (error) {
         throw new BadRequestError198("Invalid organization ID.");
       }
@@ -48493,7 +48423,7 @@ function useUserRepoV2() {
       });
       return `Successfully updated user ${field}.`;
     } catch (error) {
-      throw new InternalServerError70(`Failed to update user ${field}.`);
+      throw new InternalServerError69(`Failed to update user ${field}.`);
     }
   }
   async function updateBirthday({
@@ -48503,7 +48433,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new ObjectId129(_id);
+      _id = new ObjectId125(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid user ID format.");
     }
@@ -48528,12 +48458,12 @@ function useUserRepoV2() {
       });
       return "Successfully updated user birthday.";
     } catch (error) {
-      throw new InternalServerError70("Failed to update user birthday.");
+      throw new InternalServerError69("Failed to update user birthday.");
     }
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new ObjectId129(_id);
+      _id = new ObjectId125(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid user ID format.");
     }
@@ -48551,7 +48481,7 @@ function useUserRepoV2() {
       });
       return result;
     } catch (error) {
-      throw new InternalServerError70("Failed to update user password.");
+      throw new InternalServerError69("Failed to update user password.");
     }
   }
   return {
@@ -48591,7 +48521,7 @@ function useAuthServiceV2() {
         );
       }
       if (!user._id) {
-        throw new InternalServerError71("Valid user ID.");
+        throw new InternalServerError70("Valid user ID.");
       }
       if (user.status === "suspended") {
         throw new BadRequestError199(
@@ -48625,7 +48555,7 @@ function useAuthServiceV2() {
       await delCache(`sid:${sid}`);
       return "Session deleted successfully";
     } catch (error) {
-      throw new InternalServerError71("Error deleting token");
+      throw new InternalServerError70("Error deleting token");
     }
   }
   async function verifyPassword(_id, password) {
@@ -48640,7 +48570,7 @@ function useAuthServiceV2() {
       if (error instanceof BadRequestError199) {
         throw error;
       }
-      throw new InternalServerError71("Error during password verification");
+      throw new InternalServerError70("Error during password verification");
     }
   }
   return {
@@ -48655,9 +48585,9 @@ import {
   BadRequestError as BadRequestError200,
   comparePassword as comparePassword4,
   hashPassword as hashPassword5,
-  InternalServerError as InternalServerError72,
+  InternalServerError as InternalServerError71,
   NotFoundError as NotFoundError54,
-  useAtlas as useAtlas115,
+  useAtlas as useAtlas114,
   useS3 as useS33
 } from "@7365admin1/node-server-utils";
 import "multer";
@@ -48684,7 +48614,7 @@ function useUserServiceV2() {
     id = "",
     name = ""
   }) {
-    const session = useAtlas115.getClient()?.startSession();
+    const session = useAtlas114.getClient()?.startSession();
     session?.startTransaction();
     try {
       const signUp = await _getVerificationById(id);
@@ -48750,12 +48680,12 @@ function useUserServiceV2() {
       throw new BadRequestError200("Passwords do not match.");
     }
     let hashedPassword;
-    const session = useAtlas115.getClient()?.startSession();
+    const session = useAtlas114.getClient()?.startSession();
     session?.startTransaction();
     try {
       hashedPassword = await hashPassword5(newPassword);
     } catch (error) {
-      throw new InternalServerError72(`Error hashing password: ${error}`);
+      throw new InternalServerError71(`Error hashing password: ${error}`);
     }
     try {
       const otpDoc = await _getVerificationById(id);
@@ -48770,7 +48700,7 @@ function useUserServiceV2() {
         throw new NotFoundError54("User not found.");
       }
       if (!user._id) {
-        throw new InternalServerError72("Invalid user ID.");
+        throw new InternalServerError71("Invalid user ID.");
       }
       await Promise.all([
         _updateVerificationStatusById(id, "complete" /* COMPLETE */, session),
@@ -48801,7 +48731,7 @@ function useUserServiceV2() {
     user,
     previousProfile
   }) {
-    const session = useAtlas115.getClient()?.startSession();
+    const session = useAtlas114.getClient()?.startSession();
     session?.startTransaction();
     const _file = {
       name: file.originalname,
@@ -48845,7 +48775,7 @@ function useUserServiceV2() {
     try {
       hashedPassword = await hashPassword5(newPassword);
       if (!hashedPassword)
-        throw new InternalServerError72("Error hashing password.");
+        throw new InternalServerError71("Error hashing password.");
       return await updatePassword({ _id: id, password: hashedPassword });
     } catch (error) {
       throw error;
@@ -49288,6 +49218,178 @@ function useUserControllerV2() {
     updatePasswordById
   };
 }
+
+// src/models/role-v2.model.ts
+import { BadRequestError as BadRequestError203 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId126 } from "mongodb";
+var MRoleV2 = class {
+  constructor(value) {
+    if (typeof value._id === "string") {
+      try {
+        value._id = new ObjectId126(value._id);
+      } catch (error) {
+        throw new BadRequestError203("Invalid role-v2 ID format.");
+      }
+    }
+    if (typeof value.site === "string" && value.site.length === 24) {
+      try {
+        value.site = new ObjectId126(value.site);
+      } catch (error) {
+        throw new BadRequestError203("Invalid site ID format.");
+      }
+    }
+    if (typeof value.org === "string" && value.org.length === 24) {
+      try {
+        value.org = new ObjectId126(value.org);
+      } catch (error) {
+        throw new BadRequestError203("Invalid org ID format.");
+      }
+    }
+    if (value.createdBy) {
+      try {
+        value.createdBy = new ObjectId126(value.createdBy);
+      } catch (error) {
+        throw new BadRequestError203("Invalid created by ID format.");
+      }
+    }
+    this._id = value._id ?? new ObjectId126();
+    this.name = value.name ?? "";
+    this.permissions = value.permissions ?? [];
+    this.site = value.site ?? "";
+    this.platform = value.platform ?? "";
+    this.type = value.type ?? "account";
+    this.org = value.org ?? "";
+    this.status = value.status ?? "active";
+    this.createdBy = value.createdBy ?? "";
+    this.createdAt = value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
+    this.updatedAt = value.updatedAt ?? "";
+    this.deletedAt = value.deletedAt ?? "";
+  }
+};
+
+// src/repositories/role-v2.repo.ts
+import {
+  BadRequestError as BadRequestError204,
+  InternalServerError as InternalServerError72,
+  useAtlas as useAtlas115,
+  logger as logger182,
+  useCache as useCache69
+} from "@7365admin1/node-server-utils";
+function useRoleRepoV2() {
+  const db = useAtlas115.getDb();
+  if (!db) {
+    throw new InternalServerError72("Unable to connect to server.");
+  }
+  const namespace_collection = "roles.v2";
+  const collection = db.collection(namespace_collection);
+  async function createIndex() {
+    try {
+      await collection.createIndexes([
+        { key: { name: 1 } },
+        { key: { type: 1 } },
+        { key: { status: 1 } }
+      ]);
+    } catch (error) {
+      throw new InternalServerError72("Failed to create index on role.");
+    }
+  }
+  async function createTextIndex() {
+    try {
+      await collection.createIndex({ name: "text" });
+    } catch (error) {
+      throw new InternalServerError72("Failed to create text index on role.");
+    }
+  }
+  async function createUniqueIndex() {
+    try {
+      await collection.createIndex(
+        { name: 1, site: 1, platform: 1, type: 1, org: 1, deletedAt: 1 },
+        { unique: true }
+      );
+    } catch (error) {
+      throw new InternalServerError72("Failed to create unique index on role.");
+    }
+  }
+  const { delNamespace } = useCache69(namespace_collection);
+  async function addRole(value, session) {
+    value = new MRoleV2(value);
+    try {
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        logger182.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger182.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      logger182.log({ level: "error", message: `${error}` });
+      const isDuplicated = error.message.includes("duplicate");
+      if (isDuplicated) {
+        throw new BadRequestError204("Role already exists.");
+      }
+      throw new InternalServerError72("Failed to create role.");
+    }
+  }
+  return {
+    createIndex,
+    createTextIndex,
+    createUniqueIndex,
+    addRole
+  };
+}
+
+// src/services/role-v2.service.ts
+function useRoleServiceV2() {
+  const { addRole: _addRole } = useRoleRepoV2();
+  async function createRole(value) {
+    try {
+      return await _addRole(value);
+    } catch (error) {
+      throw error;
+    }
+  }
+  return { createRole };
+}
+
+// src/controllers/role-v2.controller.ts
+import Joi129 from "joi";
+import { BadRequestError as BadRequestError205, logger as logger183 } from "@7365admin1/node-server-utils";
+function useRoleControllerV2() {
+  const { createRole: _createRole } = useRoleServiceV2();
+  async function createRole(req, res, next) {
+    const validation = Joi129.object({
+      name: Joi129.string().required(),
+      site: Joi129.string().hex().required(),
+      platform: Joi129.string().required(),
+      permissions: Joi129.array().items(Joi129.string()).required(),
+      type: Joi129.string().optional().allow("", null),
+      org: Joi129.string().hex().optional().allow("", null)
+    });
+    const payload = { ...req.body };
+    const { error, value } = validation.validate(payload, { abortEarly: false });
+    if (error) {
+      const message = error.details.map((item) => item.message).join(", ");
+      logger183.log({ level: "error", message });
+      next(new BadRequestError205(message));
+      return;
+    }
+    try {
+      const role = await _createRole(value);
+      res.status(201).json({ message: "Successfully created role.", data: { role } });
+      return;
+    } catch (error2) {
+      logger183.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  return {
+    createRole
+  };
+}
 export {
   ANPRMode,
   AccessTypeProps,
@@ -49351,6 +49453,7 @@ export {
   MPromoCode,
   MRobot,
   MRole,
+  MRoleV2,
   MServiceProvider,
   MServiceProviderBilling,
   MSession,
@@ -49373,6 +49476,7 @@ export {
   OvernightParkingRequestStatus,
   PERSON_TYPES,
   PMDashboardCollection,
+  PStatus,
   Period,
   PersonStatus,
   PersonTypes,
@@ -49380,6 +49484,7 @@ export {
   SiteStatus,
   SortFields,
   SortOrder,
+  Status,
   SubscriptionType,
   UseAccessManagementRepo,
   UserStatus,
@@ -49634,7 +49739,10 @@ export {
   useRobotRepo,
   useRobotService,
   useRoleController,
+  useRoleControllerV2,
   useRoleRepo,
+  useRoleRepoV2,
+  useRoleServiceV2,
   useServiceProviderBillingController,
   useServiceProviderBillingRepo,
   useServiceProviderBillingService,