vr-commons 1.0.128 → 1.0.130

package/dist/utils/account.utils.d.ts

@@ -1,4 +1,3 @@
-import { Transaction } from "sequelize";
 import { Ban, Suspension } from "vr-models";
 export interface BanStatus {
     isBanned: boolean;
@@ -16,6 +15,10 @@ export declare const checkIsUserBannedOrSuspended: (userId: string) => Promise<{
     message?: string;
     details?: Ban | Suspension;
 }>;
+/**
+ * Check if user has active dependencies that prevent deletion/update
+ * FIXED: Removed references to non-existent fields
+ */
 export declare const checkAccountDependencies: (userId: string, transaction?: any) => Promise<{
     hasDependencies: boolean;
     activeDevicePlans: number;
@@ -23,7 +26,10 @@ export declare const checkAccountDependencies: (userId: string, transaction?: an
     activeSubscriptions: number;
     messages: string[];
 }>;
-export declare const hasActiveDependencies: (userId: string, transaction?: Transaction) => Promise<boolean>;
+/**
+ * Quick check for active dependencies (returns boolean)
+ */
+export declare const hasActiveDependencies: (userId: string, transaction?: any) => Promise<boolean>;
 export declare const canUserBeModified: (userId: string, transaction?: any) => Promise<{
     allowed: boolean;
     message?: string;

package/dist/utils/account.utils.js

@@ -75,42 +75,59 @@ const checkIsUserBannedOrSuspended = async (userId) => {
     }
 };
 exports.checkIsUserBannedOrSuspended = checkIsUserBannedOrSuspended;
+// src/utils/dependency.utils.ts
+/**
+ * Check if user has active dependencies that prevent deletion/update
+ * FIXED: Removed references to non-existent fields
+ */
 const checkAccountDependencies = async (userId, transaction) => {
     const messages = [];
     // 1. Check for active device payment plans
     const activeDevicePlans = await vr_models_1.DevicePaymentPlan.count({
         where: {
             userId,
-            status: { [sequelize_1.Op.in]: ["ACTIVE", "DEFAULTED"] }, // Adjust based on your status enum
+            status: { [sequelize_1.Op.in]: ["ACTIVE", "DEFAULTED"] },
         },
         transaction,
     });
     if (activeDevicePlans > 0) {
-        messages.push(`You have ${activeDevicePlans} active device payment plan(s)`);
+        messages.push(`User has ${activeDevicePlans} active device payment plan(s)`);
     }
     // 2. Check for pending payments
     const pendingPayments = await vr_models_1.Payment.count({
         where: {
             userId,
-            status: "PENDING", // Adjust based on your status enum
+            status: "PENDING",
         },
         transaction,
     });
     if (pendingPayments > 0) {
-        messages.push(`You have ${pendingPayments} pending payment(s)`);
+        messages.push(`User has ${pendingPayments} pending payment(s)`);
     }
-    // 3. Add more checks as needed (subscriptions, etc.)
-    const hasDependencies = activeDevicePlans > 0 || pendingPayments > 0;
+    // 3. Check for successful payments (optional - if you want to prevent deletion)
+    const successfulPayments = await vr_models_1.Payment.count({
+        where: {
+            userId,
+            status: "SUCCESSFUL",
+        },
+        transaction,
+    });
+    if (successfulPayments > 0) {
+        messages.push(`User has ${successfulPayments} successful payment(s)`);
+    }
+    const hasDependencies = activeDevicePlans > 0 || pendingPayments > 0 || successfulPayments > 0;
     return {
         hasDependencies,
         activeDevicePlans,
         pendingPayments,
-        activeSubscriptions: 0, // Implement if needed
+        activeSubscriptions: 0,
         messages,
     };
 };
 exports.checkAccountDependencies = checkAccountDependencies;
-// Then update the hasActiveDependencies function in passengerUser.utils.ts:
+/**
+ * Quick check for active dependencies (returns boolean)
+ */
 const hasActiveDependencies = async (userId, transaction) => {
     const result = await (0, exports.checkAccountDependencies)(userId, transaction);
     return result.hasDependencies;

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

@@ -91,6 +91,7 @@ export declare const JACKET_ID_REGEX: RegExp;
 export declare const JACKET_ID_PREFIX = "JKT";
 /**
  * Format user profile based on viewer type and options
+ * FIXED: Removed email and nationalId references
  */
 export declare const formatUserProfile: (user: User, viewerType?: UserType, options?: ProfileFormatOptions) => RiderProfile | PassengerProfile | AgentProfile | AdminProfile | SuperAdminProfile;
 /**

package/dist/utils/profiles.utils.js

@@ -18,13 +18,17 @@ exports.JACKET_ID_PREFIX = "JKT";
 // ============================================================================
 /**
  * Format user profile based on viewer type and options
+ * FIXED: Removed email and nationalId references
  */
 const formatUserProfile = (user, viewerType = "ADMIN", options = {}) => {
+    // Get primary contact
+    const primaryContact = user.primaryContact ||
+        user.contacts?.find((c) => c.isPrimary === true);
     const baseProfile = {
         id: user.id,
         firstName: user.firstName,
         lastName: user.lastName,
-        primaryContact: user.primaryContact?.contactValue,
+        primaryContact: primaryContact?.contactValue,
         gender: user.gender || "male",
         birthDate: user.birthDate || null,
         birthMonth: user.birthMonth || null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-commons",
-  "version": "1.0.128",
+  "version": "1.0.130",
   "description": "Shared functions package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",