vr-commons 1.0.108 → 1.0.110

package/dist/middlewares/idempotency.middlewares.d.ts

@@ -0,0 +1,3 @@
+import { Request, Response, NextFunction } from "express";
+export declare const idempotencyMiddleware: (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
+export declare const storeIdempotencyResponse: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middlewares/idempotency.middlewares.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.storeIdempotencyResponse = exports.idempotencyMiddleware = void 0;
+const vr_models_1 = require("vr-models");
+const response_utils_1 = require("../utils/response.utils");
+const idempotencyMiddleware = async (req, res, next) => {
+    // Skip for GET requests
+    if (req.method === "GET") {
+        return next();
+    }
+    const idempotencyKey = req.headers["idempotency-key"];
+    if (!idempotencyKey) {
+        return (0, response_utils_1.sendErrorResponse)(res, "Idempotency-Key header is required", 400);
+    }
+    // Validate UUID format
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (!uuidRegex.test(idempotencyKey)) {
+        return (0, response_utils_1.sendErrorResponse)(res, "Idempotency-Key must be a valid UUID", 400);
+    }
+    try {
+        const existing = await vr_models_1.IdempotencyRecord.findOne({
+            where: { key: idempotencyKey },
+        });
+        if (existing && existing.isValid()) {
+            const response = existing.getResponse();
+            return res.status(response?.statusCode || 200).json(response?.body);
+        }
+        if (existing && existing.isExpired()) {
+            await vr_models_1.IdempotencyRecord.invalidate(idempotencyKey);
+        }
+        // Store original response methods
+        const originalJson = res.json.bind(res);
+        const originalStatus = res.status.bind(res);
+        res.json = function (body) {
+            res.locals.responseBody = body;
+            return originalJson(body);
+        };
+        res.status = function (code) {
+            res.locals.statusCode = code;
+            return originalStatus(code);
+        };
+        req.idempotencyKey = idempotencyKey;
+        next();
+    }
+    catch (error) {
+        console.error("Idempotency middleware error:", error);
+        next(error);
+    }
+};
+exports.idempotencyMiddleware = idempotencyMiddleware;
+// Store response after completion
+const storeIdempotencyResponse = async (req, res, next) => {
+    if (req.method === "GET" || !req.idempotencyKey) {
+        return next();
+    }
+    try {
+        const expiresAt = new Date();
+        expiresAt.setHours(expiresAt.getHours() + 24);
+        await vr_models_1.IdempotencyRecord.create({
+            key: req.idempotencyKey,
+            requestMethod: req.method,
+            requestPath: req.path,
+            requestParams: req.body,
+            responseStatusCode: res.locals.statusCode || 200,
+            responseBody: res.locals.responseBody || {},
+            expiresAt, // Add this
+        });
+    }
+    catch (error) {
+        console.error("Failed to store idempotency record:", error);
+    }
+    next();
+};
+exports.storeIdempotencyResponse = storeIdempotencyResponse;

package/dist/utils/profiles.utils.d.ts

@@ -13,7 +13,10 @@ export interface BaseUserProfile {
     lastName: string;
     primaryPhone: string;
     email: string | null;
-    nationalId: string;
+    gender: "male" | "female";
+    birthDate: number | null;
+    birthMonth: number | null;
+    birthYear: number | null;
     isActive: boolean;
     lastLoginAt: Date | null;
     createdAt: Date;
@@ -65,6 +68,7 @@ export interface UserSearchFilters {
     isSuspended?: boolean;
     isBanned?: boolean;
     isDeactivated?: boolean;
+    gender?: "male" | "female";
     startDate?: string;
     endDate?: string;
     search?: string;
@@ -84,7 +88,6 @@ export interface GetUsersResult {
     total: number;
 }
 export declare const PHONE_REGEX: RegExp;
-export declare const NATIONAL_ID_REGEX: RegExp;
 export declare const JACKET_ID_REGEX: RegExp;
 export declare const JACKET_ID_PREFIX = "JKT";
 /**
@@ -156,10 +159,10 @@ export interface ValidationError {
 }
 /**
  * Validate unique user fields (phone number is in PhoneContact table)
+ * Note: nationalId has been removed
  */
 export declare const validateUniqueFields: (fields: {
     phoneNumber?: string;
-    nationalId?: string;
     email?: string | null;
     jacketId?: string;
 }, excludeUserId?: string) => Promise<ValidationError[]>;
@@ -172,7 +175,7 @@ export declare const validatePassword: (plainPassword: string, hashedPassword: s
  */
 export declare const hashPassword: (password: string) => Promise<string>;
 /**
- * Soft delete user
+ * Soft delete user (updated - no nationalId reference)
  */
 export declare const softDeleteUser: (userId: string, options?: {
     reason?: string;
@@ -200,7 +203,6 @@ declare const _default: {
     generateJacketId: () => Promise<string>;
     validateUniqueFields: (fields: {
         phoneNumber?: string;
-        nationalId?: string;
         email?: string | null;
         jacketId?: string;
     }, excludeUserId?: string) => Promise<ValidationError[]>;

package/dist/utils/profiles.utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.softDeleteUser = exports.hashPassword = exports.validatePassword = exports.validateUniqueFields = exports.generateJacketId = exports.getSortOrder = exports.generateEventSearchConditions = exports.generateUserSearchConditions = exports.findSecurityClearanceByRole = exports.getUsersByRole = exports.getUserById = exports.isAccountAccessible = exports.canModifyAccount = exports.hasAllPermissions = exports.hasAnyPermission = exports.hasPermission = exports.hasRole = exports.formatUserListResponse = exports.formatUserProfile = exports.JACKET_ID_PREFIX = exports.JACKET_ID_REGEX = exports.NATIONAL_ID_REGEX = exports.PHONE_REGEX = void 0;
+exports.softDeleteUser = exports.hashPassword = exports.validatePassword = exports.validateUniqueFields = exports.generateJacketId = exports.getSortOrder = exports.generateEventSearchConditions = exports.generateUserSearchConditions = exports.findSecurityClearanceByRole = exports.getUsersByRole = exports.getUserById = exports.isAccountAccessible = exports.canModifyAccount = exports.hasAllPermissions = exports.hasAnyPermission = exports.hasPermission = exports.hasRole = exports.formatUserListResponse = exports.formatUserProfile = exports.JACKET_ID_PREFIX = exports.JACKET_ID_REGEX = exports.PHONE_REGEX = void 0;
 const vr_models_1 = require("vr-models");
 const bcryptjs_1 = __importDefault(require("bcryptjs"));
 const sequelize_1 = require("sequelize");
@@ -11,7 +11,6 @@ const sequelize_1 = require("sequelize");
 // REGEX PATTERNS & CONSTANTS
 // ============================================================================
 exports.PHONE_REGEX = /^(078|079|072|073)\d{7}$/;
-exports.NATIONAL_ID_REGEX = /^\d{16}$/;
 exports.JACKET_ID_REGEX = /^JKT-\d{9}$/;
 exports.JACKET_ID_PREFIX = "JKT";
 // ============================================================================
@@ -27,7 +26,10 @@ const formatUserProfile = (user, viewerType = "ADMIN", options = {}) => {
         lastName: user.lastName,
         primaryPhone: user.primaryPhone?.phoneNumber,
         email: user.email,
-        nationalId: user.nationalId,
+        gender: user.gender || "male",
+        birthDate: user.birthDate || null,
+        birthMonth: user.birthMonth || null,
+        birthYear: user.birthYear || null,
         isActive: user.isActive,
         lastLoginAt: user.lastLoginAt,
         createdAt: user.createdAt,
@@ -202,6 +204,8 @@ const getUsersByRole = async (role, filters = {}, pagination) => {
         where.isSuspended = filters.isSuspended;
     if (filters.isDeactivated !== undefined)
         where.isDeactivated = filters.isDeactivated;
+    if (filters.gender !== undefined)
+        where.gender = filters.gender;
     if (filters.isBanned !== undefined) {
         if (filters.isBanned) {
             where.bannedAt = { [sequelize_1.Op.ne]: null };
@@ -227,7 +231,6 @@ const getUsersByRole = async (role, filters = {}, pagination) => {
             { lastName: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
             { phoneNumber: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
             { email: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
-            { nationalId: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
             { jacketId: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
         ];
     }
@@ -288,6 +291,9 @@ const generateUserSearchConditions = (filters) => {
     if (filters.isSuspended !== undefined) {
         where.isSuspended = filters.isSuspended;
     }
+    if (filters.gender !== undefined) {
+        where.gender = filters.gender;
+    }
     if (filters.isBanned !== undefined) {
         if (filters.isBanned) {
             where.bannedAt = { [sequelize_1.Op.ne]: null };
@@ -312,7 +318,6 @@ const generateUserSearchConditions = (filters) => {
             { lastName: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
             { phoneNumber: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
             { email: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
-            { nationalId: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
             { jacketId: { [sequelize_1.Op.iLike]: `%${filters.search}%` } },
         ];
     }
@@ -348,7 +353,7 @@ exports.generateEventSearchConditions = generateEventSearchConditions;
  * Get sort order for queries
  */
 const getSortOrder = (sortBy = "createdAt", order = "desc") => {
-    const validSortFields = ["firstName", "lastLoginAt", "createdAt"];
+    const validSortFields = ["firstName", "lastLoginAt", "createdAt", "gender"];
     const sortField = validSortFields.includes(sortBy) ? sortBy : "createdAt";
     const sortOrder = order.toLowerCase() === "asc" ? "ASC" : "DESC";
     if (sortField === "firstName") {
@@ -383,6 +388,7 @@ const generateJacketId = async () => {
 exports.generateJacketId = generateJacketId;
 /**
  * Validate unique user fields (phone number is in PhoneContact table)
+ * Note: nationalId has been removed
  */
 const validateUniqueFields = async (fields, excludeUserId) => {
     const errors = [];
@@ -403,20 +409,6 @@ const validateUniqueFields = async (fields, excludeUserId) => {
             });
         }
     }
-    // Check nationalId (on User model)
-    if (fields.nationalId) {
-        const userWhere = { nationalId: fields.nationalId };
-        if (excludeUserId) {
-            userWhere.id = { [sequelize_1.Op.ne]: excludeUserId };
-        }
-        const existingUser = await vr_models_1.User.findOne({ where: userWhere });
-        if (existingUser) {
-            errors.push({
-                field: "nationalId",
-                message: "National ID already registered",
-            });
-        }
-    }
     // Check email (on User model)
     if (fields.email) {
         const userWhere = { email: fields.email };
@@ -466,7 +458,7 @@ exports.hashPassword = hashPassword;
 // ACCOUNT MANAGEMENT FUNCTIONS
 // ============================================================================
 /**
- * Soft delete user
+ * Soft delete user (updated - no nationalId reference)
  */
 const softDeleteUser = async (userId, options) => {
     const updateData = {
@@ -479,7 +471,6 @@ const softDeleteUser = async (userId, options) => {
     updateData.email = null;
     updateData.password = null;
     updateData.phoneNumber = `DELETED_${timestamp}`;
-    updateData.nationalId = `DELETED_${timestamp}`;
     updateData.jacketId = `DELETED_${timestamp}`;
     await vr_models_1.User.update(updateData, {
         where: { id: userId },

package/dist/validations/admin.devicePayment.validations.d.ts

@@ -7,28 +7,28 @@ export declare const createPlanSchema: z.ZodObject<{
         productId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     }, {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     };
 }, {
     body: {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     };
 }>;
 export declare const listPlansSchema: z.ZodObject<{
@@ -43,49 +43,49 @@ export declare const listPlansSchema: z.ZodObject<{
         sortBy: z.ZodOptional<z.ZodEnum<["createdAt", "updatedAt", "nextInstallmentDueAt", "paidAmount", "outstandingAmount"]>>;
         sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
     }, "strip", z.ZodTypeAny, {
-        page: number;
         limit: number;
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }, {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        search?: string | undefined;
+        limit?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         page?: string | undefined;
-        limit?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
-        page: number;
         limit: number;
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }, {
     query: {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        search?: string | undefined;
+        limit?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         page?: string | undefined;
-        limit?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }>;
 export declare const getPlanSchema: z.ZodObject<{
@@ -117,10 +117,10 @@ export declare const getUserPlansSchema: z.ZodObject<{
         status: z.ZodOptional<z.ZodEnum<["ACTIVE", "COMPLETED", "DEFAULTED", "CANCELLED"]>>;
         includeCompleted: z.ZodOptional<z.ZodEnum<["true", "false"]>>;
     }, "strip", z.ZodTypeAny, {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     }, {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
@@ -128,7 +128,7 @@ export declare const getUserPlansSchema: z.ZodObject<{
         userId: string;
     };
     query?: {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     } | undefined;
 }, {
@@ -136,7 +136,7 @@ export declare const getUserPlansSchema: z.ZodObject<{
         userId: string;
     };
     query?: {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     } | undefined;
 }>;
@@ -172,44 +172,44 @@ export declare const limitedUpdateSchema: z.ZodObject<{
         userId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     }, {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     }>, {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     }, {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
     body: {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
     };
-}, {
     params: {
         id: string;
     };
+}, {
     body: {
         userId: string;
+        productId: string;
         deviceIds: string[];
         pricingId: string;
-        productId: string;
+    };
+    params: {
+        id: string;
     };
 }>;
 export declare const recordPaymentSchema: z.ZodObject<{
@@ -228,33 +228,33 @@ export declare const recordPaymentSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
     }, {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
     body: {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
     };
-}, {
     params: {
         id: string;
     };
+}, {
     body: {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
+    };
+    params: {
+        id: string;
     };
 }>;
 export declare const deletePlanSchema: z.ZodObject<{

package/dist/validations/admin.devices.validations.d.ts

@@ -58,17 +58,17 @@ export declare const updateDeviceSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         status?: "locked" | "unlocked" | "disabled" | undefined;
         serialNumber?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | null | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | null | undefined;
     }, {
         status?: "locked" | "unlocked" | "disabled" | undefined;
         serialNumber?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | null | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | null | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
         status?: "locked" | "unlocked" | "disabled" | undefined;
         serialNumber?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | null | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | null | undefined;
     };
     params: {
         id: string;
@@ -77,7 +77,7 @@ export declare const updateDeviceSchema: z.ZodObject<{
     body: {
         status?: "locked" | "unlocked" | "disabled" | undefined;
         serialNumber?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | null | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | null | undefined;
     };
     params: {
         id: string;
@@ -120,7 +120,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     }, {
@@ -131,7 +131,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     }>;
@@ -144,7 +144,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     };
@@ -157,7 +157,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
-        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
+        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     };

package/dist/validations/auth.validations.d.ts

@@ -121,27 +121,27 @@ export declare const riderLoginSchema: z.ZodObject<{
         phoneNumber: z.ZodString;
         nationalId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        nationalId: string;
         phoneNumber: string;
-    }, {
         nationalId: string;
+    }, {
         phoneNumber: string;
+        nationalId: string;
     }>;
     query: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
     params: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
     headers: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
 }, "strip", z.ZodTypeAny, {
     body: {
-        nationalId: string;
         phoneNumber: string;
+        nationalId: string;
     };
     query?: {} | undefined;
     params?: {} | undefined;
     headers?: {} | undefined;
 }, {
     body: {
-        nationalId: string;
         phoneNumber: string;
+        nationalId: string;
     };
     query?: {} | undefined;
     params?: {} | undefined;