vr-commons 1.0.161 → 1.0.163

package/dist/utils/admin.device.utils.js

@@ -7,6 +7,10 @@ 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 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);
+};
 /**
  * Extract dedication from serial number
  */
@@ -411,7 +415,7 @@ exports.stockUtil = {
         return await vr_models_1.Device.findAll({
             where: {
                 pairId: { [sequelize_1.Op.in]: pairIds },
-                deletedAt: null, // ✅ Exclude soft deleted
+                // ✅ Exclude soft deleted
             },
             include: [{ model: vr_models_1.DevicePaymentPlan, as: "paymentPlan" }],
             transaction,
@@ -456,7 +460,6 @@ exports.stockUtil = {
         const devices = await vr_models_1.Device.findAll({
             where: {
                 pairId: pairId,
-                deletedAt: null, // ✅ Exclude soft deleted
             },
             transaction,
         });
@@ -514,7 +517,6 @@ exports.stockUtil = {
         const devices = await vr_models_1.Device.findAll({
             where: {
                 pairId: pairId,
-                deletedAt: null,
             },
             include: [{ model: vr_models_1.DevicePaymentPlan, as: "paymentPlan" }],
             transaction,
@@ -564,7 +566,6 @@ exports.stockUtil = {
         const devices = await vr_models_1.Device.findAll({
             where: {
                 pairId: pairId,
-                deletedAt: null,
             },
             include: [{ model: vr_models_1.DevicePaymentPlan, as: "paymentPlan" }],
             transaction,
@@ -620,40 +621,25 @@ exports.stockUtil = {
             let batchNumber = 0;
             let hasMore = true;
             let offset = 0;
-            // Build WHERE clause for the query
             const whereClause = buildWhereClause(condition);
-            // Build UPDATE SET clause
             const setClause = buildSetClause(update);
             console.log(`🔄 Resetting device pairs at ${new Date().toISOString()}`);
             console.log(`📋 WHERE: ${whereClause}`);
             console.log(`📝 SET: ${setClause}`);
-            // Log start
-            if (isSystem) {
-                await (0, systemLog_utils_1.logInfo)(`Reset device pairs job started`, {
-                    category: "CRONJOB",
-                    source: "device-reset.cronjob",
-                    details: { triggeredBy, batchSize, maxRetries, condition, update },
-                });
-            }
-            else {
-                await (0, systemLog_utils_1.logInfo)(`Reset device pairs triggered by ${actorRole}`, {
-                    category: "DEVICE",
-                    userId: actorId || undefined,
-                    userRole: actorRole,
-                    source: "device-reset.manual",
-                    details: { triggeredBy, batchSize, maxRetries, condition, update },
-                });
-            }
+            // Log start - SystemLog only
+            await (0, systemLog_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 },
+            });
             const sequelizeInstance = vr_models_1.Device.sequelize;
             if (!sequelizeInstance) {
                 throw new Error("Sequelize instance not available");
             }
-            // Process in batches
             while (hasMore) {
                 batchNumber++;
                 offset = (batchNumber - 1) * batchSize;
-                // Get distinct pairIds that match the condition
-                const [pairIdsResult] = await sequelizeInstance.query(`
+                const pairIdsResult = await sequelizeInstance.query(`
         SELECT "pairId"
         FROM "devices"
         WHERE "deletedAt" IS NULL
@@ -661,17 +647,21 @@ exports.stockUtil = {
         GROUP BY "pairId"
         HAVING COUNT(*) = 2
         ORDER BY "pairId" ASC
-        LIMIT :limit
-        OFFSET :offset
+        LIMIT $1
+        OFFSET $2
         `, {
-                    replacements: {
-                        limit: batchSize,
-                        offset: offset,
-                    },
+                    bind: [batchSize, offset],
                     type: "SELECT",
                     transaction: transaction,
                 });
-                const pairIds = pairIdsResult.map((p) => p.pairId);
+                let pairIds = [];
+                if (Array.isArray(pairIdsResult)) {
+                    pairIds = pairIdsResult.map((p) => p.pairId);
+                }
+                else if (pairIdsResult && typeof pairIdsResult === "object") {
+                    const rows = pairIdsResult.rows || [];
+                    pairIds = rows.map((p) => p.pairId);
+                }
                 if (pairIds.length === 0) {
                     hasMore = false;
                     break;
@@ -686,7 +676,6 @@ exports.stockUtil = {
                             const devices = await vr_models_1.Device.findAll({
                                 where: {
                                     pairId: pairId,
-                                    deletedAt: null,
                                     ...buildSequelizeWhere(condition),
                                 },
                                 transaction: transaction,
@@ -694,7 +683,6 @@ exports.stockUtil = {
                             if (devices.length !== 2) {
                                 throw new Error(`Incomplete pair ${pairId}: expected 2 devices, found ${devices.length}`);
                             }
-                            // Check if update would be a no-op
                             const shouldUpdate = devices.some((d) => {
                                 const updateObj = buildUpdateObject(update);
                                 return Object.keys(updateObj).some((key) => d[key] !== updateObj[key]);
@@ -747,78 +735,61 @@ exports.stockUtil = {
                     : ""}`,
             };
             console.log(`✅ Reset device pairs completed:`, result);
-            // Log single event with summary
-            await (0, eventLog_utils_1.logEvent)({
-                actorId: isSystem ? null : actorId,
-                actorType: isSystem ? "ADMIN" : actorRole,
-                action: "DEVICES_UPDATED",
-                entity: "Device",
-                entityId: null,
-                metadata: {
-                    action: "RESET_DEVICES_STATUS",
-                    triggeredBy: triggeredBy,
-                    condition: condition,
-                    update: update,
-                    summary: {
-                        totalPairsProcessed: result.pairsProcessed,
-                        totalDevicesUpdated: result.updatedCount,
-                        totalPairsUpdated: updatedPairIds.length,
-                        failedPairs: result.failedCount,
-                        failedPairIds: result.failedPairIds,
-                        errors: result.errors,
-                        deviceIds: allDeviceIds.slice(0, 100),
-                    },
-                    batchDetails: {
-                        totalBatches: batchNumber,
-                        batchSize: batchSize,
-                        maxRetries: maxRetries,
-                    },
-                    timestamp: new Date().toISOString(),
+            // Log completion - SystemLog only
+            await (0, systemLog_utils_1.logInfo)(`Reset device pairs job completed`, {
+                category: isSystem ? "CRONJOB" : "DEVICE",
+                source: isSystem ? "device-reset.cronjob" : "device-reset.manual",
+                details: {
+                    updatedDevices: result.updatedCount,
+                    updatedPairs: updatedPairIds.length,
+                    failedPairs: result.failedCount,
+                    totalPairs: result.pairsProcessed,
+                    hasErrors: result.errors.length > 0,
                 },
-                deviceSession: null,
-                transaction: transaction,
             });
-            // Log to system logs
-            if (isSystem) {
-                await (0, systemLog_utils_1.logInfo)(`Reset device pairs job completed`, {
-                    category: "CRONJOB",
-                    source: "device-reset.cronjob",
-                    details: {
-                        updatedDevices: result.updatedCount,
-                        updatedPairs: updatedPairIds.length,
-                        failedPairs: result.failedCount,
-                        totalPairs: result.pairsProcessed,
-                        hasErrors: result.errors.length > 0,
-                    },
-                });
-            }
-            else {
-                await (0, systemLog_utils_1.logInfo)(`Reset device pairs completed by ${actorRole}`, {
-                    category: "DEVICE",
-                    userId: actorId || undefined,
-                    userRole: actorRole,
-                    source: "device-reset.manual",
-                    details: {
-                        updatedDevices: result.updatedCount,
-                        updatedPairs: updatedPairIds.length,
-                        failedPairs: result.failedCount,
-                        totalPairs: result.pairsProcessed,
-                        hasErrors: result.errors.length > 0,
-                    },
-                });
-            }
             if (result.errors.length > 0) {
                 await (0, systemLog_utils_1.logError)(`Reset device pairs had ${result.errors.length} failures`, {
                     category: isSystem ? "CRONJOB" : "DEVICE",
                     source: isSystem ? "device-reset.cronjob" : "device-reset.manual",
-                    userId: isSystem ? null : actorId || undefined,
-                    userRole: isSystem ? null : actorRole,
                     details: {
                         failedPairs: result.failedPairIds,
                         errors: result.errors,
                     },
                 });
             }
+            // Log EventLog ONLY for user-triggered actions
+            if (!isSystem && actorId && isValidUUID(actorId)) {
+                await (0, eventLog_utils_1.logEvent)({
+                    actorId: actorId,
+                    actorType: actorRole,
+                    action: "DEVICES_UPDATED",
+                    entity: "Device",
+                    entityId: null,
+                    metadata: {
+                        action: "RESET_DEVICES_STATUS",
+                        triggeredBy: triggeredBy,
+                        condition: condition,
+                        update: update,
+                        summary: {
+                            totalPairsProcessed: result.pairsProcessed,
+                            totalDevicesUpdated: result.updatedCount,
+                            totalPairsUpdated: updatedPairIds.length,
+                            failedPairs: result.failedCount,
+                            failedPairIds: result.failedPairIds,
+                            errors: result.errors,
+                            deviceIds: allDeviceIds.slice(0, 100),
+                        },
+                        batchDetails: {
+                            totalBatches: batchNumber,
+                            batchSize: batchSize,
+                            maxRetries: maxRetries,
+                        },
+                        timestamp: new Date().toISOString(),
+                    },
+                    deviceSession: null,
+                    transaction: transaction,
+                });
+            }
             return result;
         }
         catch (err) {
@@ -834,22 +805,11 @@ exports.stockUtil = {
                 pairsProcessed: 0,
                 message: `Reset device pairs job failed: ${errorMessage}`,
             };
-            if (isSystem) {
-                await (0, systemLog_utils_1.logError)(`Reset device pairs job failed`, {
-                    category: "CRONJOB",
-                    source: "device-reset.cronjob",
-                    details: { error: errorMessage },
-                });
-            }
-            else {
-                await (0, systemLog_utils_1.logError)(`Reset device pairs failed`, {
-                    category: "DEVICE",
-                    userId: actorId || undefined,
-                    userRole: actorRole,
-                    source: "device-reset.manual",
-                    details: { error: errorMessage },
-                });
-            }
+            await (0, systemLog_utils_1.logError)(`Reset device pairs job failed`, {
+                category: isSystem ? "CRONJOB" : "DEVICE",
+                source: isSystem ? "device-reset.cronjob" : "device-reset.manual",
+                details: { error: errorMessage },
+            });
             return result;
         }
     },

package/dist/utils/index.d.ts

@@ -15,4 +15,4 @@ 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 { logApi, logAuth, logCronjob, logDebug, logDevice, logError, logInfo, logPayment, logSecurity, logSystem, logWarning, } from "./systemLog.utils";
+export { logDebug, logError, logInfo, logSystem, logWarning, } from "./systemLog.utils";

package/dist/utils/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateContactValue = exports.detectContactType = exports.sendVerificationCode = exports.sendSMS = exports.sendEmail = exports.getVerificationMethod = exports.getOTPExpiry = exports.generateOTP = exports.createDeviceSession = exports.suspensionUtil = exports.banUtil = exports.hasHigherAuthority = exports.getModeratableRoles = exports.canModerateUser = exports.canModerate = 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.sendErrorResponse = exports.sendSuccessResponse = exports.logEvent = exports.formatTimeRemaining = exports.getTokenTimeRemaining = exports.generateToken = exports.shouldRefreshToken = exports.verifyToken = exports.generateRiderToken = exports.generatePassengerToken = exports.generateAdminToken = exports.checkSuspensionStatus = exports.checkIsUserBannedOrSuspended = exports.checkBanStatus = exports.hasActiveDependencies = exports.checkAccountDependencies = void 0;
-exports.logWarning = exports.logSystem = exports.logSecurity = exports.logPayment = exports.logInfo = exports.logError = exports.logDevice = exports.logDebug = exports.logCronjob = exports.logAuth = exports.logApi = exports.extractDedicatedUserFromSerial = exports.buildUserSearchConditions = exports.buildSearchConditions = exports.buildEventLogWhereClause = exports.formatEventLogs = exports.formatEventLog = exports.formatDeviceSession = exports.DPP_OperationsUtil = exports.cloudinaryUtil = exports.stockUtil = exports.hierarchicalView = exports.validateHierarchy = exports.isSuperiorOrEqual = exports.isSuperior = exports.isSubordinateOrEqual = exports.isSubordinate = exports.isRankEqual = exports.getUserLevel = void 0;
+exports.logWarning = exports.logSystem = exports.logInfo = exports.logError = exports.logDebug = exports.extractDedicatedUserFromSerial = exports.buildUserSearchConditions = exports.buildSearchConditions = exports.buildEventLogWhereClause = exports.formatEventLogs = exports.formatEventLog = exports.formatDeviceSession = exports.DPP_OperationsUtil = exports.cloudinaryUtil = exports.stockUtil = exports.hierarchicalView = exports.validateHierarchy = exports.isSuperiorOrEqual = exports.isSuperior = exports.isSubordinateOrEqual = exports.isSubordinate = exports.isRankEqual = exports.getUserLevel = void 0;
 var account_utils_1 = require("./account.utils");
 Object.defineProperty(exports, "checkAccountDependencies", { enumerable: true, get: function () { return account_utils_1.checkAccountDependencies; } });
 Object.defineProperty(exports, "hasActiveDependencies", { enumerable: true, get: function () { return account_utils_1.hasActiveDependencies; } });
@@ -94,14 +94,8 @@ Object.defineProperty(exports, "buildUserSearchConditions", { enumerable: true,
 var deviceUtils_1 = require("./deviceUtils");
 Object.defineProperty(exports, "extractDedicatedUserFromSerial", { enumerable: true, get: function () { return deviceUtils_1.extractDedicatedUserFromSerial; } });
 var systemLog_utils_1 = require("./systemLog.utils");
-Object.defineProperty(exports, "logApi", { enumerable: true, get: function () { return systemLog_utils_1.logApi; } });
-Object.defineProperty(exports, "logAuth", { enumerable: true, get: function () { return systemLog_utils_1.logAuth; } });
-Object.defineProperty(exports, "logCronjob", { enumerable: true, get: function () { return systemLog_utils_1.logCronjob; } });
 Object.defineProperty(exports, "logDebug", { enumerable: true, get: function () { return systemLog_utils_1.logDebug; } });
-Object.defineProperty(exports, "logDevice", { enumerable: true, get: function () { return systemLog_utils_1.logDevice; } });
 Object.defineProperty(exports, "logError", { enumerable: true, get: function () { return systemLog_utils_1.logError; } });
 Object.defineProperty(exports, "logInfo", { enumerable: true, get: function () { return systemLog_utils_1.logInfo; } });
-Object.defineProperty(exports, "logPayment", { enumerable: true, get: function () { return systemLog_utils_1.logPayment; } });
-Object.defineProperty(exports, "logSecurity", { enumerable: true, get: function () { return systemLog_utils_1.logSecurity; } });
 Object.defineProperty(exports, "logSystem", { enumerable: true, get: function () { return systemLog_utils_1.logSystem; } });
 Object.defineProperty(exports, "logWarning", { enumerable: true, get: function () { return systemLog_utils_1.logWarning; } });

package/dist/utils/systemLog.utils.d.ts

@@ -1,4 +1,4 @@
-import { LogLevel, LogCategory, UserRole } from "vr-models";
+import { LogLevel, LogCategory } from "vr-models";
 import { Transaction } from "sequelize";
 export interface SystemLogInput {
     level?: LogLevel;
@@ -6,55 +6,13 @@ export interface SystemLogInput {
     message: string;
     details?: Record<string, any> | null;
     source?: string | null;
-    userId?: string | null;
-    userRole?: UserRole | null;
     ipAddress?: string | null;
     userAgent?: string | null;
     timestamp?: Date;
     transaction?: Transaction;
 }
-/**
- * Create a system log entry
- * Uses the static methods from SystemLog model
- */
-export declare const logSystem: ({ level, category, message, details, source, userId, userRole, ipAddress, userAgent, timestamp, transaction, }: SystemLogInput) => Promise<void>;
-/**
- * Log an error
- */
+export declare const logSystem: ({ level, category, message, details, source, ipAddress, userAgent, timestamp, transaction, }: SystemLogInput) => Promise<void>;
 export declare const logError: (message: string, options?: Omit<SystemLogInput, "level" | "message">) => Promise<void>;
-/**
- * Log a warning
- */
 export declare const logWarning: (message: string, options?: Omit<SystemLogInput, "level" | "message">) => Promise<void>;
-/**
- * Log an info message
- */
 export declare const logInfo: (message: string, options?: Omit<SystemLogInput, "level" | "message">) => Promise<void>;
-/**
- * Log debug info
- */
 export declare const logDebug: (message: string, options?: Omit<SystemLogInput, "level" | "message">) => Promise<void>;
-/**
- * Log a cronjob event
- */
-export declare const logCronjob: (message: string, options?: Omit<SystemLogInput, "level" | "category" | "message">) => Promise<void>;
-/**
- * Log a payment event
- */
-export declare const logPayment: (message: string, options?: Omit<SystemLogInput, "level" | "category" | "message">) => Promise<void>;
-/**
- * Log a device event
- */
-export declare const logDevice: (message: string, options?: Omit<SystemLogInput, "level" | "category" | "message">) => Promise<void>;
-/**
- * Log an auth event
- */
-export declare const logAuth: (message: string, options?: Omit<SystemLogInput, "level" | "category" | "message">) => Promise<void>;
-/**
- * Log a security event
- */
-export declare const logSecurity: (message: string, options?: Omit<SystemLogInput, "level" | "category" | "message">) => Promise<void>;
-/**
- * Log an API request
- */
-export declare const logApi: (message: string, options?: Omit<SystemLogInput, "level" | "category" | "message">) => Promise<void>;

package/dist/utils/systemLog.utils.js

@@ -1,148 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logApi = exports.logSecurity = exports.logAuth = exports.logDevice = exports.logPayment = exports.logCronjob = exports.logDebug = exports.logInfo = exports.logWarning = exports.logError = exports.logSystem = void 0;
+exports.logDebug = exports.logInfo = exports.logWarning = exports.logError = exports.logSystem = void 0;
 // src/utils/systemLog.utils.ts
 const vr_models_1 = require("vr-models");
-/**
- * Create a system log entry
- * Uses the static methods from SystemLog model
- */
-const logSystem = async ({ level = "INFO", category = "SYSTEM", message, details = null, source = null, userId = null, userRole = null, ipAddress = null, userAgent = null, timestamp, transaction, }) => {
+const logSystem = async ({ level = "INFO", category = "SYSTEM", message, details = null, source = null, ipAddress = null, userAgent = null, timestamp, transaction, }) => {
     try {
         const logData = {
             level,
             category,
             message,
-            details,
-            source,
-            userId,
-            userRole,
-            ipAddress,
-            userAgent,
-            timestamp,
+            details: details || null,
+            source: source || null,
+            ipAddress: ipAddress || null,
+            userAgent: userAgent || null,
+            timestamp: timestamp || new Date(),
         };
-        // Create log entry with optional transaction
         await vr_models_1.SystemLog.create(logData, { transaction });
     }
     catch (err) {
         console.error("❌ Failed to create system log:", err);
-        // Don't throw - system logging should not break the main operation
     }
 };
 exports.logSystem = logSystem;
-/**
- * Log an error
- */
 const logError = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "ERROR",
-        message,
-        ...options,
-    });
+    await (0, exports.logSystem)({ level: "ERROR", message, ...options });
 };
 exports.logError = logError;
-/**
- * Log a warning
- */
 const logWarning = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "WARNING",
-        message,
-        ...options,
-    });
+    await (0, exports.logSystem)({ level: "WARNING", message, ...options });
 };
 exports.logWarning = logWarning;
-/**
- * Log an info message
- */
 const logInfo = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "INFO",
-        message,
-        ...options,
-    });
+    await (0, exports.logSystem)({ level: "INFO", message, ...options });
 };
 exports.logInfo = logInfo;
-/**
- * Log debug info
- */
 const logDebug = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "DEBUG",
-        message,
-        ...options,
-    });
+    await (0, exports.logSystem)({ level: "DEBUG", message, ...options });
 };
 exports.logDebug = logDebug;
-/**
- * Log a cronjob event
- */
-const logCronjob = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "INFO",
-        category: "CRONJOB",
-        message,
-        ...options,
-    });
-};
-exports.logCronjob = logCronjob;
-/**
- * Log a payment event
- */
-const logPayment = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "INFO",
-        category: "PAYMENT",
-        message,
-        ...options,
-    });
-};
-exports.logPayment = logPayment;
-/**
- * Log a device event
- */
-const logDevice = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "INFO",
-        category: "DEVICE",
-        message,
-        ...options,
-    });
-};
-exports.logDevice = logDevice;
-/**
- * Log an auth event
- */
-const logAuth = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "INFO",
-        category: "AUTH",
-        message,
-        ...options,
-    });
-};
-exports.logAuth = logAuth;
-/**
- * Log a security event
- */
-const logSecurity = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "INFO",
-        category: "SECURITY",
-        message,
-        ...options,
-    });
-};
-exports.logSecurity = logSecurity;
-/**
- * Log an API request
- */
-const logApi = async (message, options = {}) => {
-    await (0, exports.logSystem)({
-        level: "INFO",
-        category: "API",
-        message,
-        ...options,
-    });
-};
-exports.logApi = logApi;

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

@@ -59,53 +59,53 @@ export declare const getDevicesSchema: z.ZodObject<{
         sortBy: z.ZodOptional<z.ZodEnum<["serialNumber", "status", "createdAt", "updatedAt"]>>;
         sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
     }, "strip", z.ZodTypeAny, {
-        productId?: string | undefined;
+        search?: string | undefined;
+        limit?: number | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
         page?: number | undefined;
-        limit?: number | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+        productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }, {
-        productId?: string | undefined;
+        search?: string | undefined;
+        limit?: string | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
         page?: string | undefined;
-        limit?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+        productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
-        productId?: string | undefined;
+        search?: string | undefined;
+        limit?: number | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
         page?: number | undefined;
-        limit?: number | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+        productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }, {
     query: {
-        productId?: string | undefined;
+        search?: string | undefined;
+        limit?: string | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
         page?: string | undefined;
-        limit?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+        productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }>;
 export declare const deleteDevicesByPairsSchema: z.ZodObject<{
@@ -153,32 +153,32 @@ export declare const lockDevicesSchema: z.ZodObject<{
         pairIds: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         serialNumbers: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     }, "strip", z.ZodTypeAny, {
-        pairIds?: string[] | undefined;
         reason?: string | undefined;
+        pairIds?: string[] | undefined;
         serialNumbers?: string[] | undefined;
     }, {
-        pairIds?: string[] | undefined;
         reason?: string | undefined;
+        pairIds?: string[] | undefined;
         serialNumbers?: string[] | undefined;
     }>, {
-        pairIds?: string[] | undefined;
         reason?: string | undefined;
+        pairIds?: string[] | undefined;
         serialNumbers?: string[] | undefined;
     }, {
-        pairIds?: string[] | undefined;
         reason?: string | undefined;
+        pairIds?: string[] | undefined;
         serialNumbers?: string[] | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
-        pairIds?: string[] | undefined;
         reason?: string | undefined;
+        pairIds?: string[] | undefined;
         serialNumbers?: string[] | undefined;
     };
 }, {
     body: {
-        pairIds?: string[] | undefined;
         reason?: string | undefined;
+        pairIds?: string[] | undefined;
         serialNumbers?: string[] | undefined;
     };
 }>;
@@ -328,8 +328,8 @@ export declare const customDeviceResetSchema: z.ZodObject<{
             createdBefore: z.ZodOptional<z.ZodString>;
             createdAfter: z.ZodOptional<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
-            productId?: string | string[] | undefined;
             status?: string | string[] | undefined;
+            productId?: string | string[] | undefined;
             dedicatedUser?: string | string[] | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
             excludeStatus?: string | string[] | undefined;
@@ -338,8 +338,8 @@ export declare const customDeviceResetSchema: z.ZodObject<{
             createdBefore?: string | undefined;
             createdAfter?: string | undefined;
         }, {
-            productId?: string | string[] | undefined;
             status?: string | string[] | undefined;
+            productId?: string | string[] | undefined;
             dedicatedUser?: string | string[] | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
             excludeStatus?: string | string[] | undefined;
@@ -356,25 +356,32 @@ export declare const customDeviceResetSchema: z.ZodObject<{
             activatedAt: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         }, "strip", z.ZodTypeAny, {
             status?: string | undefined;
+            devicePaymentPlanId?: string | null | undefined;
             dedicatedUser?: string | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
-            devicePaymentPlanId?: string | null | undefined;
             activatedAt?: string | null | undefined;
         }, {
             status?: string | undefined;
+            devicePaymentPlanId?: string | null | undefined;
             dedicatedUser?: string | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
-            devicePaymentPlanId?: string | null | undefined;
             activatedAt?: string | null | undefined;
         }>>;
         batchSize: z.ZodOptional<z.ZodNumber>;
         maxRetries: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        update?: {
+            status?: string | undefined;
+            devicePaymentPlanId?: string | null | undefined;
+            dedicatedUser?: string | undefined;
+            isPermanentlyUnlocked?: boolean | undefined;
+            activatedAt?: string | null | undefined;
+        } | undefined;
         batchSize?: number | undefined;
         maxRetries?: number | undefined;
         condition?: {
-            productId?: string | string[] | undefined;
             status?: string | string[] | undefined;
+            productId?: string | string[] | undefined;
             dedicatedUser?: string | string[] | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
             excludeStatus?: string | string[] | undefined;
@@ -383,19 +390,19 @@ export declare const customDeviceResetSchema: z.ZodObject<{
             createdBefore?: string | undefined;
             createdAfter?: string | undefined;
         } | undefined;
+    }, {
         update?: {
             status?: string | undefined;
+            devicePaymentPlanId?: string | null | undefined;
             dedicatedUser?: string | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
-            devicePaymentPlanId?: string | null | undefined;
             activatedAt?: string | null | undefined;
         } | undefined;
-    }, {
         batchSize?: number | undefined;
         maxRetries?: number | undefined;
         condition?: {
-            productId?: string | string[] | undefined;
             status?: string | string[] | undefined;
+            productId?: string | string[] | undefined;
             dedicatedUser?: string | string[] | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
             excludeStatus?: string | string[] | undefined;
@@ -404,21 +411,21 @@ export declare const customDeviceResetSchema: z.ZodObject<{
             createdBefore?: string | undefined;
             createdAfter?: string | undefined;
         } | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
         update?: {
             status?: string | undefined;
+            devicePaymentPlanId?: string | null | undefined;
             dedicatedUser?: string | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
-            devicePaymentPlanId?: string | null | undefined;
             activatedAt?: string | null | undefined;
         } | undefined;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    body: {
         batchSize?: number | undefined;
         maxRetries?: number | undefined;
         condition?: {
-            productId?: string | string[] | undefined;
             status?: string | string[] | undefined;
+            productId?: string | string[] | undefined;
             dedicatedUser?: string | string[] | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
             excludeStatus?: string | string[] | undefined;
@@ -427,21 +434,21 @@ export declare const customDeviceResetSchema: z.ZodObject<{
             createdBefore?: string | undefined;
             createdAfter?: string | undefined;
         } | undefined;
+    };
+}, {
+    body: {
         update?: {
             status?: string | undefined;
+            devicePaymentPlanId?: string | null | undefined;
             dedicatedUser?: string | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
-            devicePaymentPlanId?: string | null | undefined;
             activatedAt?: string | null | undefined;
         } | undefined;
-    };
-}, {
-    body: {
         batchSize?: number | undefined;
         maxRetries?: number | undefined;
         condition?: {
-            productId?: string | string[] | undefined;
             status?: string | string[] | undefined;
+            productId?: string | string[] | undefined;
             dedicatedUser?: string | string[] | undefined;
             isPermanentlyUnlocked?: boolean | undefined;
             excludeStatus?: string | string[] | undefined;
@@ -450,12 +457,5 @@ export declare const customDeviceResetSchema: z.ZodObject<{
             createdBefore?: string | undefined;
             createdAfter?: string | undefined;
         } | undefined;
-        update?: {
-            status?: string | undefined;
-            dedicatedUser?: string | undefined;
-            isPermanentlyUnlocked?: boolean | undefined;
-            devicePaymentPlanId?: string | null | undefined;
-            activatedAt?: string | null | undefined;
-        } | undefined;
     };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-commons",
-  "version": "1.0.161",
+  "version": "1.0.163",
   "description": "Shared functions package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -103,7 +103,7 @@
     "rimraf": "^5.0.5",
     "streamifier": "^0.1.1",
     "typescript": "^5.3.3",
-    "vr-models": "^1.0.83",
+    "vr-models": "^1.0.85",
     "zod": "^3.25.20"
   },
   "dependencies": {