vr-models 1.0.41 → 1.0.43

package/dist/models/eventLog.models.d.ts

@@ -1,14 +1,16 @@
 import { Model, InferAttributes, InferCreationAttributes, CreationOptional, NonAttribute, ModelStatic } from "vr-migrations";
 import type { User } from "./user.models";
 import { UserRole } from "./securityClearance.models";
-export interface SessionPayload {
+export interface DeviceSessionPayload {
     sessionId: string;
     startedAt: number;
     expiresAt: number;
     userId: string;
     tokenVersion: number;
+    deviceSerialNumber: string;
+    minutesGranted: number;
 }
-export declare const EVENT_ACTIONS: readonly ["USER_READ", "USER_CREATED", "USER_UPDATED", "USER_DELETED", "USER_SUSPENDED", "USER_BANNED", "USER_VERIFIED", "USERS_LISTED", "ADMIN_FORGOT_PASSWORD", "ADMIN_LOGGED_IN", "ADMIN_LOGGED_OUT", "PASSENGER_ACCOUNT_DEACTIVATED", "PASSENGER_ACCOUNT_DELETED", "AGENT_CREATED_RIDER", "AGENT_UPDATED_RIDER", "ADMIN_CREATED_USER", "ADMIN_UPDATED_USER", "SUPER_ADMIN_PASSWORD_CHANGED", "SUPER_ADMIN_CHANGED_USER_ACCOUNT_STATUS", "SUPER_ADMIN_UPDATED_USER", "SUPER_ADMIN_CREATED_USER", "PRODUCT_CREATED", "PRODUCT_READ", "PRODUCT_UPDATED", "PRODUCT_DELETED", "PRODUCTS_LISTED", "PRODUCTS_ACTIVATED", "PRODUCTS_DEACTIVATED", "PRODUCTS_LISTED", "PRODUCT_STOCK_SET_MANUALLY", "PRODUCT_STOCK_INCREMENTED", "PRODUCT_STOCK_DECREMENTED", "PRICING_CREATED", "PRICING_READ", "PRICING_UPDATED", "PRICING_DELETED", "DEVICE_CREATED", "DEVICES_BULK_CREATED", "DEVICE_ASSIGNED", "DEVICE_READ", "DEVICE_UPDATED", "DEVICES_LISTED", "DEVICE_LOCKED", "DEVICE_UNLOCKED", "DEVICE_DISABLED", "DEVICE_REACTIVATED", "DEVICE_DELETED_PERMANENTLY", "DEVICE_REPOSSESSED", "DEVICE_PAYMENT_PLAN_CREATED", "DEVICE_PAYMENT_PLAN_READ", "DEVICE_PAYMENT_PLAN_UPDATED", "DEVICE_PAYMENT_PLAN_MARKED_DEFAULTED", "DEVICE_PAYMENT_PLAN_SOFT_DELETED", "DEVICE_PAYMENT_PLAN_DELETED_PERMANENTLY", "PAYMENT_RECORDED", "PAYMENT_READ", "PAYMENTS_LISTED", "TRANSACTION_READ", "TRANSACTIONS_LISTED", "EVENT_LOG_READ", "EVENT_LOGS_LISTED", "SECURITY_CLEARANCE_MANAGED", "DEVICE_LOCK_OVERRIDDEN", "SESSION_EXTENDED"];
+export declare const EVENT_ACTIONS: readonly ["USER_READ", "USER_CREATED", "USER_UPDATED", "USER_DELETED", "USER_SUSPENDED", "USER_BANNED", "USER_VERIFIED", "USER_UPGRADED_TO_RIDER", "USERS_LISTED", "ADMIN_FORGOT_PASSWORD", "ADMIN_LOGGED_IN", "ADMIN_LOGGED_OUT", "PASSENGER_ACCOUNT_DEACTIVATED", "PASSENGER_ACCOUNT_DELETED", "AGENT_CREATED_RIDER", "AGENT_UPDATED_RIDER", "ADMIN_CREATED_USER", "ADMIN_UPDATED_USER", "SUPER_ADMIN_PASSWORD_CHANGED", "SUPER_ADMIN_CHANGED_USER_ACCOUNT_STATUS", "SUPER_ADMIN_UPDATED_USER", "SUPER_ADMIN_CREATED_USER", "PRODUCT_CREATED", "PRODUCT_READ", "PRODUCT_UPDATED", "PRODUCT_DELETED", "PRODUCTS_LISTED", "PRODUCTS_ACTIVATED", "PRODUCTS_DEACTIVATED", "PRODUCT_STOCK_SET_MANUALLY", "PRODUCT_STOCK_INCREMENTED", "PRODUCT_STOCK_DECREMENTED", "PRICING_CREATED", "PRICING_READ", "PRICING_UPDATED", "PRICING_DELETED", "DEVICE_CREATED", "DEVICES_BULK_CREATED", "DEVICE_ASSIGNED", "DEVICE_READ", "DEVICE_UPDATED", "DEVICES_LISTED", "DEVICE_LOCKED", "DEVICE_UNLOCKED", "DEVICE_DISABLED", "DEVICE_REACTIVATED", "DEVICE_DELETED_PERMANENTLY", "DEVICE_REPOSSESSED", "DEVICE_PAYMENT_PLAN_CREATED", "DEVICE_PAYMENT_PLAN_READ", "DEVICE_PAYMENT_PLAN_UPDATED", "DEVICE_PAYMENT_PLAN_MARKED_DEFAULTED", "DEVICE_PAYMENT_PLAN_SOFT_DELETED", "DEVICE_PAYMENT_PLAN_DELETED_PERMANENTLY", "PAYMENT_RECORDED", "PAYMENT_READ", "PAYMENTS_LISTED", "TRANSACTION_READ", "TRANSACTIONS_LISTED", "EVENT_LOG_READ", "EVENT_LOGS_LISTED", "SECURITY_CLEARANCE_MANAGED", "DEVICE_LOCK_OVERRIDDEN", "SESSION_EXTENDED"];
 export type EventAction = (typeof EVENT_ACTIONS)[number];
 export interface EventLogAttributes {
     id: string;
@@ -20,14 +22,17 @@ export interface EventLogAttributes {
     metadata: Record<string, any>;
     ipAddress: string | null;
     userAgent: string | null;
-    session: SessionPayload;
+    deviceSession?: DeviceSessionPayload | null;
+    authTokenVersion?: number;
     createdAt: Date;
     actor?: User;
 }
-export interface EventLogCreationAttributes extends Omit<EventLogAttributes, "id" | "createdAt" | "metadata" | "actorType"> {
+export interface EventLogCreationAttributes extends Omit<EventLogAttributes, "id" | "createdAt" | "metadata" | "actorType" | "deviceSession"> {
     id?: string;
     metadata?: Record<string, any>;
     actorType: UserRole;
+    deviceSession?: DeviceSessionPayload | null;
+    authTokenVersion?: number;
 }
 export declare class EventLog extends Model<InferAttributes<EventLog>, InferCreationAttributes<EventLog>> implements EventLogAttributes {
     id: CreationOptional<string>;
@@ -39,7 +44,8 @@ export declare class EventLog extends Model<InferAttributes<EventLog>, InferCrea
     metadata: CreationOptional<Record<string, any>>;
     ipAddress: CreationOptional<string | null>;
     userAgent: CreationOptional<string | null>;
-    session: SessionPayload;
+    deviceSession: CreationOptional<DeviceSessionPayload | null>;
+    authTokenVersion: CreationOptional<number>;
     readonly createdAt: CreationOptional<Date>;
     actor?: NonAttribute<User>;
     static initialize(sequelize: any): void;

package/dist/models/eventLog.models.js

@@ -11,6 +11,7 @@ exports.EVENT_ACTIONS = [
     "USER_SUSPENDED",
     "USER_BANNED",
     "USER_VERIFIED",
+    "USER_UPGRADED_TO_RIDER", // New action for rider upgrades
     "USERS_LISTED",
     "ADMIN_FORGOT_PASSWORD",
     "ADMIN_LOGGED_IN",
@@ -32,7 +33,6 @@ exports.EVENT_ACTIONS = [
     "PRODUCTS_LISTED",
     "PRODUCTS_ACTIVATED",
     "PRODUCTS_DEACTIVATED",
-    "PRODUCTS_LISTED",
     "PRODUCT_STOCK_SET_MANUALLY",
     "PRODUCT_STOCK_INCREMENTED",
     "PRODUCT_STOCK_DECREMENTED",
@@ -47,7 +47,7 @@ exports.EVENT_ACTIONS = [
     "DEVICE_UPDATED",
     "DEVICES_LISTED",
     "DEVICE_LOCKED",
-    "DEVICE_UNLOCKED",
+    "DEVICE_UNLOCKED", // Device unlocked via BLE
     "DEVICE_DISABLED",
     "DEVICE_REACTIVATED",
     "DEVICE_DELETED_PERMANENTLY",
@@ -67,7 +67,7 @@ exports.EVENT_ACTIONS = [
     "EVENT_LOGS_LISTED",
     "SECURITY_CLEARANCE_MANAGED",
     "DEVICE_LOCK_OVERRIDDEN",
-    "SESSION_EXTENDED",
+    "SESSION_EXTENDED", // Device session extended
 ];
 class EventLog extends vr_migrations_1.Model {
     // Static initialization method
@@ -81,7 +81,7 @@ class EventLog extends vr_migrations_1.Model {
             actorType: {
                 type: vr_migrations_1.DataTypes.ENUM("RIDER", "PASSENGER", "AGENT", "ADMIN", "SUPER_ADMIN"),
                 allowNull: false,
-                defaultValue: "ADMIN",
+                defaultValue: "PASSENGER",
             },
             actorId: {
                 type: vr_migrations_1.DataTypes.UUID,
@@ -112,26 +112,65 @@ class EventLog extends vr_migrations_1.Model {
                 type: vr_migrations_1.DataTypes.TEXT,
                 allowNull: true,
             },
-            session: {
+            // In EventLog.initialize()
+            deviceSession: {
                 type: vr_migrations_1.DataTypes.JSONB,
                 allowNull: true,
+                field: "session",
                 validate: {
-                    isValidSessionObject(value) {
+                    isValidDeviceSessionObject(value) {
                         if (value === null || value === undefined)
                             return;
                         if (typeof value !== "object" || Array.isArray(value)) {
-                            throw new Error("Sessions must be a session object");
+                            throw new Error("Device session must be a session object");
+                        }
+                        // Required fields for device sessions
+                        const required = [
+                            "sessionId",
+                            "startedAt",
+                            "expiresAt",
+                            "userId",
+                            "tokenVersion",
+                            "deviceSerialNumber",
+                            "minutesGranted",
+                            "isExtension",
+                            "paymentPlanId",
+                        ];
+                        for (const field of required) {
+                            if (!(field in value)) {
+                                throw new Error(`Device session missing required field: ${field}`);
+                            }
+                        }
+                        // Type validation
+                        if (typeof value.sessionId !== "string") {
+                            throw new Error("sessionId must be a string");
+                        }
+                        if (typeof value.startedAt !== "number") {
+                            throw new Error("startedAt must be a number");
+                        }
+                        if (typeof value.expiresAt !== "number") {
+                            throw new Error("expiresAt must be a number");
                         }
-                        if (typeof value.sessionId !== "string" ||
-                            typeof value.startedAt !== "number" ||
-                            typeof value.expiresAt !== "number" ||
-                            typeof value.userId !== "string" ||
-                            typeof value.tokenVersion !== "number") {
-                            throw new Error("Invalid session object: must have a string sessionId and userId plus numeric startetAt ,expiresAt and tokenVersion");
+                        if (typeof value.userId !== "string") {
+                            throw new Error("userId must be a string");
+                        }
+                        if (typeof value.tokenVersion !== "number") {
+                            throw new Error("tokenVersion must be a number");
+                        }
+                        if (typeof value.deviceSerialNumber !== "string") {
+                            throw new Error("deviceSerialNumber must be a string");
+                        }
+                        if (typeof value.minutesGranted !== "number") {
+                            throw new Error("minutesGranted must be a number");
                         }
                     },
                 },
             },
+            authTokenVersion: {
+                type: vr_migrations_1.DataTypes.INTEGER,
+                allowNull: true,
+                field: "auth_token_version",
+            },
             createdAt: {
                 type: vr_migrations_1.DataTypes.DATE,
                 defaultValue: vr_migrations_1.DataTypes.NOW,
@@ -173,7 +212,7 @@ class EventLog extends vr_migrations_1.Model {
         });
     }
     getSummary() {
-        return `${this.actorType}:${this.actorId} performed ${this.action} on ${this.entity}${this.entityId ? `:${this.entityId}` : ""}`;
+        return `${this.actorType}:${this.actorId} performed ${this.action} on ${this.entity}${this.entityId ? `:${this.entityId}` : ""}${this.deviceSession ? ` (session: ${this.deviceSession.sessionId})` : ""}`;
     }
 }
 exports.EventLog = EventLog;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-models",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "Shared database models package for VR applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",