vr-commons 1.0.176 → 1.0.178

package/dist/constants/regex.constants.d.ts

@@ -0,0 +1,19 @@
+/** Shared regular expressions used across validation and utility modules. */
+export declare const PHONE_NUMBER_REGEX: RegExp;
+export declare const LOCAL_RWANDA_PHONE_NUMBER_REGEX: RegExp;
+export declare const EMAIL_ADDRESS_REGEX: RegExp;
+export declare const PASSWORD_REGEX: RegExp;
+export declare const STRONG_PASSWORD_REGEX: RegExp;
+export declare const RIDER_PIN_REGEX: RegExp;
+export declare const FOUR_DIGIT_PIN_REGEX: RegExp;
+export declare const JACKET_ID_REGEX: RegExp;
+export declare const PLATE_NUMBER_REGEX: RegExp;
+export declare const RWANDA_PLATE_NUMBER_REGEX: RegExp;
+export declare const DEVICE_SERIAL_NUMBER_REGEX: RegExp;
+export declare const DEVICE_PAIR_ID_REGEX: RegExp;
+export declare const ISO_DATE_REGEX: RegExp;
+export declare const DAY_MONTH_YEAR_REGEX: RegExp;
+export declare const DAY_MONTH_YEAR_SLASH_REGEX: RegExp;
+export declare const ISO_DATE_SLASH_REGEX: RegExp;
+export declare const NUMERIC_STRING_REGEX: RegExp;
+export declare const BEARER_TOKEN_PREFIX_REGEX: RegExp;

package/dist/constants/regex.constants.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BEARER_TOKEN_PREFIX_REGEX = exports.NUMERIC_STRING_REGEX = exports.ISO_DATE_SLASH_REGEX = exports.DAY_MONTH_YEAR_SLASH_REGEX = exports.DAY_MONTH_YEAR_REGEX = exports.ISO_DATE_REGEX = exports.DEVICE_PAIR_ID_REGEX = exports.DEVICE_SERIAL_NUMBER_REGEX = exports.RWANDA_PLATE_NUMBER_REGEX = exports.PLATE_NUMBER_REGEX = exports.JACKET_ID_REGEX = exports.FOUR_DIGIT_PIN_REGEX = exports.RIDER_PIN_REGEX = exports.STRONG_PASSWORD_REGEX = exports.PASSWORD_REGEX = exports.EMAIL_ADDRESS_REGEX = exports.LOCAL_RWANDA_PHONE_NUMBER_REGEX = exports.PHONE_NUMBER_REGEX = void 0;
+/** Shared regular expressions used across validation and utility modules. */
+exports.PHONE_NUMBER_REGEX = /^\+250(78|79|73|72)[0-9]{7}$/;
+exports.LOCAL_RWANDA_PHONE_NUMBER_REGEX = /^(078|079|072|073)\d{7}$/;
+exports.EMAIL_ADDRESS_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+exports.PASSWORD_REGEX = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/;
+exports.STRONG_PASSWORD_REGEX = /^(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#^()_\-+=])[A-Za-z\d@$!%*?&#^()_\-+=]{8,}$/;
+exports.RIDER_PIN_REGEX = /^(?!(\d)\1{3})\d{4}$/;
+exports.FOUR_DIGIT_PIN_REGEX = /^\d{4}$/;
+exports.JACKET_ID_REGEX = /^JKT-\d{9}$/;
+// These two existing rules express different accepted formats. Keep both
+// centralized until the product requirements choose one canonical plate format.
+exports.PLATE_NUMBER_REGEX = /^[A-Z0-9]{3,10}$/i;
+exports.RWANDA_PLATE_NUMBER_REGEX = /^R[ABCDEFGHIJKLMNPQRSTUVWXYZ]\s?\d{3}\s?[ABCDEFGHIJKLMNPQRSTUVWXYZ]$/;
+exports.DEVICE_SERIAL_NUMBER_REGEX = /^(VBRD|VIBERIDE)-(PASSENGER|RIDER)-([A-Z]{2}\d{3}[A-Z])$/;
+exports.DEVICE_PAIR_ID_REGEX = /^[A-NP-Z]{2}[0-9]{3}[A-NP-Z]{1}$/;
+exports.ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
+exports.DAY_MONTH_YEAR_REGEX = /^\d{2}-\d{2}-\d{4}$/;
+exports.DAY_MONTH_YEAR_SLASH_REGEX = /^\d{2}\/\d{2}\/\d{4}$/;
+exports.ISO_DATE_SLASH_REGEX = /^\d{4}\/\d{2}\/\d{2}$/;
+exports.NUMERIC_STRING_REGEX = /^\d+$/;
+exports.BEARER_TOKEN_PREFIX_REGEX = /^Bearer /;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./middlewares";
 export * from "./validations";
 export * from "./utils";
-export { validate } from "./validations/validate.validations";

package/dist/index.js

@@ -14,10 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = void 0;
 // Core Functionality
 __exportStar(require("./middlewares"), exports);
 __exportStar(require("./validations"), exports);
 __exportStar(require("./utils"), exports);
-var validate_validations_1 = require("./validations/validate.validations");
-Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return validate_validations_1.validate; } });

package/dist/middlewares/admin/admin.auth.middleware.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAdminAuthentication = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const vr_models_1 = require("vr-models");
+const shared_responses_utils_1 = require("../../utils/shared/shared.responses.utils");
+const checkAdminAuthentication = (allowedRoles) => async (req, res, next) => {
+    try {
+        const token = req.cookies?.access_token;
+        if (!token) {
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Authentication required", 401);
+        }
+        let payload;
+        try {
+            payload = jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
+        }
+        catch (error) {
+            if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
+                return (0, shared_responses_utils_1.sendErrorResponse)(res, "Session expired. Please login again.", 401);
+            }
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Invalid session", 401);
+        }
+        const user = await vr_models_1.User.findOne({
+            where: { id: payload.userId },
+            include: [
+                {
+                    model: vr_models_1.SecurityClearance,
+                    as: "securityClearance",
+                },
+            ],
+        });
+        if (!user || !user.securityClearance) {
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "User not found", 400);
+        }
+        // 🔐 Token versioning
+        if (user.tokenVersion !== payload.tokenVersion) {
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Session expired", 401);
+        }
+        // 🧱 Role enforcement
+        if (!allowedRoles.includes(user.securityClearance.role)) {
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Access denied", 403);
+        }
+        // Attach user to request (same as before)
+        req.userId = user.id;
+        req.firstName = user.firstName;
+        req.lastName = user.lastName;
+        req.scRole = user.securityClearance.role;
+        req.scLevel = user.securityClearance.level;
+        req.tokenVersion = user.tokenVersion;
+        next();
+    }
+    catch (error) {
+        console.error("Authentication error:", error);
+        next(error);
+    }
+};
+exports.checkAdminAuthentication = checkAdminAuthentication;

package/dist/middlewares/index.d.ts

@@ -1,5 +1,4 @@
-export { checkAdminAuthentication } from "./auth.admin.middlewares";
-export { checkUserAuthentication } from "./auth.users.middlewares";
-export { checkIsUserBanned, checkIsUserSuspended, checkUserAccountStatus, } from "./account.shared.middlewares";
-export { idempotencyMiddleware, storeIdempotencyResponse, } from "./idempotency.middlewares";
-export { errorHandler } from "./errorHandler.middleware";
+export { checkAdminAuthentication } from "./admin/admin.auth.middleware";
+export { checkUserAuthentication } from "./users/users.auth.middleware";
+export { checkIsUserBanned, checkIsUserSuspended, checkUserAccountStatus, } from "./shared/shared.account.middleware";
+export { errorHandler } from "./shared/shared.errorHandler.middleware";

package/dist/middlewares/index.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errorHandler = exports.storeIdempotencyResponse = exports.idempotencyMiddleware = exports.checkUserAccountStatus = exports.checkIsUserSuspended = exports.checkIsUserBanned = exports.checkUserAuthentication = exports.checkAdminAuthentication = void 0;
-var auth_admin_middlewares_1 = require("./auth.admin.middlewares");
-Object.defineProperty(exports, "checkAdminAuthentication", { enumerable: true, get: function () { return auth_admin_middlewares_1.checkAdminAuthentication; } });
-var auth_users_middlewares_1 = require("./auth.users.middlewares");
-Object.defineProperty(exports, "checkUserAuthentication", { enumerable: true, get: function () { return auth_users_middlewares_1.checkUserAuthentication; } });
-var account_shared_middlewares_1 = require("./account.shared.middlewares");
-Object.defineProperty(exports, "checkIsUserBanned", { enumerable: true, get: function () { return account_shared_middlewares_1.checkIsUserBanned; } });
-Object.defineProperty(exports, "checkIsUserSuspended", { enumerable: true, get: function () { return account_shared_middlewares_1.checkIsUserSuspended; } });
-Object.defineProperty(exports, "checkUserAccountStatus", { enumerable: true, get: function () { return account_shared_middlewares_1.checkUserAccountStatus; } });
-var idempotency_middlewares_1 = require("./idempotency.middlewares");
-Object.defineProperty(exports, "idempotencyMiddleware", { enumerable: true, get: function () { return idempotency_middlewares_1.idempotencyMiddleware; } });
-Object.defineProperty(exports, "storeIdempotencyResponse", { enumerable: true, get: function () { return idempotency_middlewares_1.storeIdempotencyResponse; } });
-var errorHandler_middleware_1 = require("./errorHandler.middleware");
-Object.defineProperty(exports, "errorHandler", { enumerable: true, get: function () { return errorHandler_middleware_1.errorHandler; } });
+exports.errorHandler = exports.checkUserAccountStatus = exports.checkIsUserSuspended = exports.checkIsUserBanned = exports.checkUserAuthentication = exports.checkAdminAuthentication = void 0;
+var admin_auth_middleware_1 = require("./admin/admin.auth.middleware");
+Object.defineProperty(exports, "checkAdminAuthentication", { enumerable: true, get: function () { return admin_auth_middleware_1.checkAdminAuthentication; } });
+var users_auth_middleware_1 = require("./users/users.auth.middleware");
+Object.defineProperty(exports, "checkUserAuthentication", { enumerable: true, get: function () { return users_auth_middleware_1.checkUserAuthentication; } });
+var shared_account_middleware_1 = require("./shared/shared.account.middleware");
+Object.defineProperty(exports, "checkIsUserBanned", { enumerable: true, get: function () { return shared_account_middleware_1.checkIsUserBanned; } });
+Object.defineProperty(exports, "checkIsUserSuspended", { enumerable: true, get: function () { return shared_account_middleware_1.checkIsUserSuspended; } });
+Object.defineProperty(exports, "checkUserAccountStatus", { enumerable: true, get: function () { return shared_account_middleware_1.checkUserAccountStatus; } });
+var shared_errorHandler_middleware_1 = require("./shared/shared.errorHandler.middleware");
+Object.defineProperty(exports, "errorHandler", { enumerable: true, get: function () { return shared_errorHandler_middleware_1.errorHandler; } });

package/dist/middlewares/shared/auth.admin.middlewares.d.ts

@@ -0,0 +1,3 @@
+import { Request, Response, NextFunction } from "express";
+import { UserRole } from "vr-models";
+export declare const checkAdminAuthentication: (allowedRoles: UserRole[]) => (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middlewares/{auth.admin.middlewares.js → shared/auth.admin.middlewares.js}

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAdminAuthentication = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const vr_models_1 = require("vr-models");
-const response_utils_1 = require("../utils/response.utils");
+const shared_responses_utils_1 = require("../../utils/shared/shared.responses.utils");
 const checkAdminAuthentication = (allowedRoles) => async (req, res, next) => {
     try {
         const token = req.cookies?.access_token;
         if (!token) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Authentication required", 401);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Authentication required", 401);
         }
         let payload;
         try {
@@ -19,9 +19,9 @@ const checkAdminAuthentication = (allowedRoles) => async (req, res, next) => {
         }
         catch (error) {
             if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
-                return (0, response_utils_1.sendErrorResponse)(res, "Session expired. Please login again.", 401);
+                return (0, shared_responses_utils_1.sendErrorResponse)(res, "Session expired. Please login again.", 401);
             }
-            return (0, response_utils_1.sendErrorResponse)(res, "Invalid session", 401);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Invalid session", 401);
         }
         const user = await vr_models_1.User.findOne({
             where: { id: payload.userId },
@@ -33,15 +33,15 @@ const checkAdminAuthentication = (allowedRoles) => async (req, res, next) => {
             ],
         });
         if (!user || !user.securityClearance) {
-            return (0, response_utils_1.sendErrorResponse)(res, "User not found", 400);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "User not found", 400);
         }
         // 🔐 Token versioning
         if (user.tokenVersion !== payload.tokenVersion) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Session expired", 401);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Session expired", 401);
         }
         // 🧱 Role enforcement
         if (!allowedRoles.includes(user.securityClearance.role)) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Access denied", 403);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Access denied", 403);
         }
         // Attach user to request (same as before)
         req.userId = user.id;

package/dist/middlewares/{account.shared.middlewares.js → shared/shared.account.middleware.js}

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkIsUserBanned = checkIsUserBanned;
 exports.checkIsUserSuspended = checkIsUserSuspended;
 exports.checkUserAccountStatus = checkUserAccountStatus;
-const account_utils_1 = require("../utils/account.utils");
-const response_utils_1 = require("../utils/response.utils");
+const shared_accounts_utils_1 = require("../../utils/shared/shared.accounts.utils");
+const shared_responses_utils_1 = require("../../utils/shared/shared.responses.utils");
 // Check if user is banned
 async function checkIsUserBanned(req, res, next) {
     try {
@@ -12,12 +12,12 @@ async function checkIsUserBanned(req, res, next) {
         if (!userId) {
             return next();
         }
-        const { isBanned, banDetails } = await (0, account_utils_1.checkBanStatus)(userId);
+        const { isBanned, banDetails } = await (0, shared_accounts_utils_1.checkBanStatus)(userId);
         if (isBanned && banDetails && !banDetails.revokedAt) {
             const message = banDetails.isPermanent
                 ? "Your account has been permanently banned"
                 : `Your account was banned at: ${banDetails.bannedAt.toISOString()}`;
-            return (0, response_utils_1.sendErrorResponse)(res, message, 403, banDetails);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, message, 403, banDetails);
         }
         next();
     }
@@ -32,12 +32,12 @@ async function checkIsUserSuspended(req, res, next) {
         if (!userId) {
             return next();
         }
-        const { isSuspended, suspensionDetails } = await (0, account_utils_1.checkSuspensionStatus)(userId);
+        const { isSuspended, suspensionDetails } = await (0, shared_accounts_utils_1.checkSuspensionStatus)(userId);
         if (isSuspended && suspensionDetails) {
             const daysRemaining = Math.ceil((new Date(suspensionDetails.endsAt).getTime() - new Date().getTime()) /
                 (1000 * 60 * 60 * 24));
             const message = `Your account is suspended for ${daysRemaining} more day(s) until ${suspensionDetails.endsAt.toISOString()}`;
-            return (0, response_utils_1.sendErrorResponse)(res, message, 403, suspensionDetails);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, message, 403, suspensionDetails);
         }
         next();
     }
@@ -52,9 +52,9 @@ async function checkUserAccountStatus(req, res, next) {
         if (!userId) {
             return next();
         }
-        const result = await (0, account_utils_1.checkIsUserBannedOrSuspended)(userId);
+        const result = await (0, shared_accounts_utils_1.checkIsUserBannedOrSuspended)(userId);
         if (result.isRestricted) {
-            return (0, response_utils_1.sendErrorResponse)(res, result.message, 403, result.details);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, result.message, 403, result.details);
         }
         next();
     }

package/dist/middlewares/{errorHandler.middleware.js → shared/shared.errorHandler.middleware.js}

@@ -1,5 +1,4 @@
 "use strict";
-// src/middleware/errorHandler.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorHandler = errorHandler;
 /**

package/dist/middlewares/{auth.users.middlewares.js → users/users.auth.middleware.js}

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkUserAuthentication = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const vr_models_1 = require("vr-models");
-const response_utils_1 = require("../utils/response.utils");
-const authTokens_utils_1 = require("../utils/authTokens.utils");
+const shared_responses_utils_1 = require("../../utils/shared/shared.responses.utils");
+const shared_authTokens_utils_1 = require("../../utils/shared/shared.authTokens.utils");
 const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
     try {
         const authHeader = req.headers.authorization;
         if (!authHeader || !authHeader.startsWith("Bearer ")) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Missing or invalid token", 401);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Missing or invalid token", 401);
         }
         const token = authHeader.split(" ")[1];
         let payload;
@@ -21,9 +21,9 @@ const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
         }
         catch (error) {
             if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
-                return (0, response_utils_1.sendErrorResponse)(res, "Token expired. Please re-verify your Email/Phone", 401);
+                return (0, shared_responses_utils_1.sendErrorResponse)(res, "Token expired. Please re-verify your Email/Phone", 401);
             }
-            return (0, response_utils_1.sendErrorResponse)(res, "Token invalid", 401);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Token invalid", 401);
         }
         const user = await vr_models_1.User.findOne({
             where: { id: payload.userId },
@@ -36,15 +36,15 @@ const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
         });
         // Check if user exists
         if (!user || !user.securityClearance) {
-            return (0, response_utils_1.sendErrorResponse)(res, "User not found", 400);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "User not found", 400);
         }
         // 🔐 Token versioning (logout all devices)
         if (user.tokenVersion !== payload.tokenVersion) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Session expired. Please re-verify your Email/Phone", 401);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Session expired. Please re-verify your Email/Phone", 401);
         }
         // 🧱 Role enforcement
         if (!allowedRoles.includes(user.securityClearance.role)) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Access denied", 403);
+            return (0, shared_responses_utils_1.sendErrorResponse)(res, "Access denied", 403);
         }
         // ✅ Extend req with user info
         req.userId = user.id;
@@ -58,8 +58,8 @@ const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
             req.sessionId = payload.sessionId;
         }
         // 🔄 Auto-refresh token if it's about to expire (within 5 days)
-        if ((0, authTokens_utils_1.shouldRefreshToken)(token)) {
-            const newToken = (0, authTokens_utils_1.generateToken)(user.id, user.securityClearance.role, user.securityClearance.level, user.tokenVersion, payload.sessionId, // Preserve sessionId if exists
+        if ((0, shared_authTokens_utils_1.shouldRefreshToken)(token)) {
+            const newToken = (0, shared_authTokens_utils_1.generateToken)(user.id, user.securityClearance.role, user.securityClearance.level, user.tokenVersion, payload.sessionId, // Preserve sessionId if exists
             user.securityClearance.role === "ADMIN"
                 ? "ADMIN"
                 : user.securityClearance.role === "RIDER"

package/dist/utils/{admin.devicePayment.utils.d.ts → admin/admin.devicePayments.utils.d.ts}

@@ -7,7 +7,8 @@ export interface DeleteCheckResult {
 export declare const DPP_OperationsUtil: {
     /**
      * Check if a payment plan can be deleted
-     * Rule: Can only delete if NO payments have been made
+     * Financial records are permanent: delete only plans with no payments and
+     * no installments of any status.
      */
     canDeletePlan(planId: string, transaction?: Transaction): Promise<DeleteCheckResult>;
     /**

package/dist/utils/{admin.devicePayment.utils.js → admin/admin.devicePayments.utils.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DPP_OperationsUtil = void 0;
-// src/utils/admin.devicePayment.utils.ts
 const vr_models_1 = require("vr-models");
 exports.DPP_OperationsUtil = {
     /**
      * Check if a payment plan can be deleted
-     * Rule: Can only delete if NO payments have been made
+     * Financial records are permanent: delete only plans with no payments and
+     * no installments of any status.
      */
     async canDeletePlan(planId, transaction) {
         // Check if any payments exist for this plan
@@ -20,18 +20,14 @@ exports.DPP_OperationsUtil = {
                 reason: `Cannot delete plan with ${paymentCount} payment(s) already recorded`,
             };
         }
-        // Also check if any installments are paid
-        const paidInstallments = await vr_models_1.Installment.count({
-            where: {
-                devicePaymentPlanId: planId,
-                status: "PAID",
-            },
+        const installmentCount = await vr_models_1.Installment.count({
+            where: { devicePaymentPlanId: planId },
             transaction,
         });
-        if (paidInstallments > 0) {
+        if (installmentCount > 0) {
             return {
                 canDelete: false,
-                reason: "Cannot delete plan with paid installments",
+                reason: `Cannot delete plan with ${installmentCount} installment(s) recorded`,
             };
         }
         return { canDelete: true };
@@ -158,6 +154,7 @@ exports.DPP_OperationsUtil = {
         const planData = {
             id: plan.id,
             userId: plan.userId,
+            productId: plan.productId,
             pricingSnapshot: plan.pricingSnapshot,
             totalAmount: plan.totalAmount, // ✅ Added
             paidAmount: plan.paidAmount,
@@ -178,6 +175,7 @@ exports.DPP_OperationsUtil = {
         return {
             id: planData.id,
             userId: planData.userId,
+            productId: planData.productId,
             pricingSnapshot: {
                 id: planData.pricingSnapshot?.id || null,
                 name: planData.pricingSnapshot?.name || null,
@@ -191,7 +189,12 @@ exports.DPP_OperationsUtil = {
                 autoLockOnMiss: planData.pricingSnapshot?.autoLockOnMiss ?? true,
                 minOrderQuantity: planData.pricingSnapshot?.minOrderQuantity || 1,
                 maxOrderQuantity: planData.pricingSnapshot?.maxOrderQuantity || 1,
+                productId: planData.pricingSnapshot?.productId || planData.productId,
+                productName: planData.pricingSnapshot?.productName || null,
+                pairId: planData.pricingSnapshot?.pairId || null,
+                deviceIds: planData.pricingSnapshot?.deviceIds || [],
             },
+            historicalDeviceIds: planData.pricingSnapshot?.deviceIds || [],
             totalAmount: totalAmount, // ✅ Added
             paidAmount: planData.paidAmount || 0,
             outstandingAmount: planData.outstandingAmount || 0,

package/dist/utils/{admin.device.utils.d.ts → admin/admin.devices.utils.d.ts}

@@ -1,6 +1,6 @@
 import { Device, UserRole } from "vr-models";
 import { Transaction } from "sequelize";
-import { DeviceResetOptions, DeviceResetResult, StockChangeResult } from "./types";
+import { DeviceResetOptions, DeviceResetResult, StockChangeResult } from "../shared/shared.types";
 export declare const stockUtil: {
     /**
      * Increment stock when devices are added/created

package/dist/utils/{admin.device.utils.js → admin/admin.devices.utils.js}

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stockUtil = void 0;
-// src/utils/stock.util.ts
 const vr_models_1 = require("vr-models");
 const sequelize_1 = require("sequelize");
-const eventLog_utils_1 = require("./eventLog.utils");
-const admin_devices_validations_1 = require("../validations/admin.devices.validations");
-const systemLog_utils_1 = require("./systemLog.utils");
+const shared_eventLogs_utils_1 = require("../shared/shared.eventLogs.utils");
+const admin_devices_validations_1 = require("../../validations/admin/admin.devices.validations");
+const admin_systemLogs_utils_1 = require("./admin.systemLogs.utils");
 const isValidUUID = (str) => {
     const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     return uuidRegex.test(str);
@@ -192,7 +191,7 @@ exports.stockUtil = {
         }
         // Log stock change
         if (options?.actorId) {
-            await (0, eventLog_utils_1.logEvent)({
+            await (0, shared_eventLogs_utils_1.logEvent)({
                 actorId: options.actorId,
                 actorType: options.actorType,
                 action: "PRODUCT_STOCK_INCREMENTED",
@@ -241,7 +240,7 @@ exports.stockUtil = {
         }
         // Log stock change
         if (options?.actorId) {
-            await (0, eventLog_utils_1.logEvent)({
+            await (0, shared_eventLogs_utils_1.logEvent)({
                 actorId: options.actorId,
                 actorType: options.actorType,
                 action: "PRODUCT_STOCK_DECREMENTED",
@@ -283,7 +282,7 @@ exports.stockUtil = {
         await product.save({ transaction: options?.transaction });
         // Log stock change
         if (options?.actorId) {
-            await (0, eventLog_utils_1.logEvent)({
+            await (0, shared_eventLogs_utils_1.logEvent)({
                 actorId: options.actorId,
                 actorType: options.actorType,
                 action: "PRODUCT_STOCK_SET_MANUALLY",
@@ -627,7 +626,7 @@ exports.stockUtil = {
             console.log(`📋 WHERE: ${whereClause}`);
             console.log(`📝 SET: ${setClause}`);
             // Log start - SystemLog only
-            await (0, systemLog_utils_1.logInfo)(`Reset device pairs job started`, {
+            await (0, admin_systemLogs_utils_1.logInfo)(`Reset device pairs job started`, {
                 category: isSystem ? "CRONJOB" : "DEVICE",
                 source: isSystem ? "device-reset.cronjob" : "device-reset.manual",
                 details: { triggeredBy, batchSize, maxRetries, condition, update },
@@ -735,7 +734,7 @@ exports.stockUtil = {
             };
             console.log(`✅ Reset device pairs completed:`, result);
             // Log completion - SystemLog only
-            await (0, systemLog_utils_1.logInfo)(`Reset device pairs job completed`, {
+            await (0, admin_systemLogs_utils_1.logInfo)(`Reset device pairs job completed`, {
                 category: isSystem ? "CRONJOB" : "DEVICE",
                 source: isSystem ? "device-reset.cronjob" : "device-reset.manual",
                 details: {
@@ -747,7 +746,7 @@ exports.stockUtil = {
                 },
             });
             if (result.errors.length > 0) {
-                await (0, systemLog_utils_1.logError)(`Reset device pairs had ${result.errors.length} failures`, {
+                await (0, admin_systemLogs_utils_1.logError)(`Reset device pairs had ${result.errors.length} failures`, {
                     category: isSystem ? "CRONJOB" : "DEVICE",
                     source: isSystem ? "device-reset.cronjob" : "device-reset.manual",
                     details: {
@@ -758,7 +757,7 @@ exports.stockUtil = {
             }
             // Log EventLog ONLY for user-triggered actions
             if (!isSystem && actorId && isValidUUID(actorId)) {
-                await (0, eventLog_utils_1.logEvent)({
+                await (0, shared_eventLogs_utils_1.logEvent)({
                     actorId: actorId,
                     actorType: actorRole,
                     action: "DEVICES_UPDATED",
@@ -804,7 +803,7 @@ exports.stockUtil = {
                 pairsProcessed: 0,
                 message: `Reset device pairs job failed: ${errorMessage}`,
             };
-            await (0, systemLog_utils_1.logError)(`Reset device pairs job failed`, {
+            await (0, admin_systemLogs_utils_1.logError)(`Reset device pairs job failed`, {
                 category: isSystem ? "CRONJOB" : "DEVICE",
                 source: isSystem ? "device-reset.cronjob" : "device-reset.manual",
                 details: { error: errorMessage },

package/dist/utils/{eventlogs.admin.utils.js → admin/admin.eventLogs.utils.js}

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildUserSearchConditions = exports.buildSearchConditions = exports.buildEventLogWhereClause = exports.formatEventLogs = exports.formatEventLog = exports.formatDeviceSession = void 0;
-// src/modules/event-logs/utils/eventLogs.utils.ts
 const sequelize_1 = require("sequelize");
 /**
  * Format device session for response

package/dist/utils/{hierarchy.utils.js → admin/admin.hierarchy.utils.js}

@@ -8,7 +8,6 @@ exports.isRankEqual = isRankEqual;
 exports.isSubordinateOrEqual = isSubordinateOrEqual;
 exports.isSuperiorOrEqual = isSuperiorOrEqual;
 exports.validateHierarchy = validateHierarchy;
-// src/utils/hierarchy.utils.ts
 const vr_models_1 = require("vr-models");
 /**
  * Get user's security clearance level
@@ -93,7 +92,6 @@ function validateHierarchy(adminLevel, targetLevel, action, allowEqual = false)
     }
     return { allowed: false, message: `Cannot ${action} this user` };
 }
-// src/utils/hierarchical.util.ts
 /**
  * Filter users based on hierarchical permissions using security clearance levels
  * Pure function - no database calls

package/dist/utils/{product.utils.d.ts → admin/admin.products.utils.d.ts}

@@ -1,5 +1,5 @@
 import { Request } from "express";
-import { UploadResult } from "./types";
+import { UploadResult } from "../shared/shared.types";
 export declare const cloudinaryUtil: {
     /**
      * Upload file buffer to Cloudinary

package/dist/utils/{systemLog.utils.js → admin/admin.systemLogs.utils.js}

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logDebug = exports.logInfo = exports.logWarning = exports.logError = exports.logSystem = void 0;
-// src/utils/systemLog.utils.ts
 const vr_models_1 = require("vr-models");
 const logSystem = async ({ level = "INFO", category = "SYSTEM", message, details = null, source = null, ipAddress = null, userAgent = null, timestamp, transaction, }) => {
     try {

package/dist/utils/index.d.ts

@@ -1,18 +1,16 @@
-export { checkAccountDependencies, hasActiveDependencies, checkBanStatus, checkIsUserBannedOrSuspended, checkSuspensionStatus, } from "./account.utils";
-export { generateAdminToken, generatePassengerToken, generateRiderToken, verifyToken, JWTPayload, shouldRefreshToken, generateToken, getTokenTimeRemaining, formatTimeRemaining, } from "./authTokens.utils";
-export { logEvent } from "./eventLog.utils";
-export { sendSuccessResponse, sendErrorResponse } from "./response.utils";
-export { formatUserProfile, formatUserListResponse, hasRole, hasPermission, hasAnyPermission, hasAllPermissions, canModifyAccount, isAccountAccessible, getUserById, getUsersByRole, findSecurityClearanceByRole, generateUserSearchConditions, generateEventSearchConditions, getSortOrder, generateJacketId, validateUniqueFields, validatePassword, hashPassword, softDeleteUser, } from "./profiles.utils";
-export { canModerate, canModerateUser, getModeratableRoles, hasHigherAuthority, } from "./moderation.utils";
-export { banUtil } from "./bans.utils";
-export { suspensionUtil } from "./suspension.utils";
-export { createDeviceSession } from "./session.utils";
-export { generateOTP, getOTPExpiry, getVerificationMethod, sendEmail, sendSMS, sendVerificationCode, detectContactType, validateContactValue, } from "./verification.utils";
-export { getUserLevel, isRankEqual, isSubordinate, isSubordinateOrEqual, isSuperior, isSuperiorOrEqual, validateHierarchy, hierarchicalView, } from "./hierarchy.utils";
-export { stockUtil } from "./admin.device.utils";
-export { cloudinaryUtil } from "./product.utils";
-export { DPP_OperationsUtil } from "./admin.devicePayment.utils";
-export { PendingRegistration, VerificationMethod, ConfirmResponse, UploadResult, StockChangeResult, } from "./types";
-export { formatDeviceSession, formatEventLog, formatEventLogs, buildEventLogWhereClause, buildSearchConditions, buildUserSearchConditions, } from "./eventlogs.admin.utils";
-export { extractDedicatedUserFromSerial } from "./deviceUtils";
-export { logDebug, logError, logInfo, logSystem, logWarning, } from "./systemLog.utils";
+export { checkAccountDependencies, hasActiveDependencies, checkBanStatus, checkIsUserBannedOrSuspended, checkSuspensionStatus, } from "./shared/shared.accounts.utils";
+export { generateAdminToken, generatePassengerToken, generateRiderToken, verifyToken, JWTPayload, shouldRefreshToken, generateToken, getTokenTimeRemaining, formatTimeRemaining, } from "./shared/shared.authTokens.utils";
+export { logEvent } from "./shared/shared.eventLogs.utils";
+export { sendSuccessResponse, sendErrorResponse } from "./shared/shared.responses.utils";
+export { formatUserProfile, formatUserListResponse, hasRole, hasPermission, hasAnyPermission, hasAllPermissions, canModifyAccount, isAccountAccessible, getUserById, getUsersByRole, findSecurityClearanceByRole, generateUserSearchConditions, generateEventSearchConditions, getSortOrder, generateJacketId, validateUniqueFields, validatePassword, hashPassword, softDeleteUser, } from "./shared/shared.profiles.utils";
+export { canModerate, canModerateUser, getModeratableRoles, hasHigherAuthority, } from "./admin/admin.moderation.utils";
+export { banUtil } from "./admin/admin.bans.utils";
+export { suspensionUtil } from "./admin/admin.suspensions.utils";
+export { getUserLevel, isRankEqual, isSubordinate, isSubordinateOrEqual, isSuperior, isSuperiorOrEqual, validateHierarchy, hierarchicalView, } from "./admin/admin.hierarchy.utils";
+export { stockUtil } from "./admin/admin.devices.utils";
+export { cloudinaryUtil } from "./admin/admin.products.utils";
+export { DPP_OperationsUtil } from "./admin/admin.devicePayments.utils";
+export { formatDeviceSession, formatEventLog, formatEventLogs, buildEventLogWhereClause, buildSearchConditions, buildUserSearchConditions, } from "./admin/admin.eventLogs.utils";
+export { logDebug, logError, logInfo, logSystem, logWarning, } from "./admin/admin.systemLogs.utils";
+export { generateOTP, getOTPExpiry, getVerificationMethod, sendEmail, sendSMS, sendVerificationCode, detectContactType, validateContactValue, } from "./users/users.verification.utils";
+export { PendingRegistration, VerificationMethod, ConfirmResponse, UploadResult, StockChangeResult, DeviceResetResult, DeviceResetOptions, } from "./shared/shared.types";