vr-models 1.0.56 → 1.0.58

package/dist/models/user.models.js

@@ -5,8 +5,11 @@ exports.User = exports.GENDER_OPTIONS = void 0;
 const vr_migrations_1 = require("vr-migrations");
 // ==================== GENDER OPTIONS ====================
 exports.GENDER_OPTIONS = ["male", "female"];
+// ==================== USER MODEL ====================
 class User extends vr_migrations_1.Model {
-    // Static initialization method
+    // ===========================================================================
+    // INITIALIZATION
+    // ===========================================================================
     static initialize(sequelize) {
         this.init({
             id: {
@@ -27,11 +30,6 @@ class User extends vr_migrations_1.Model {
                 allowNull: true,
                 unique: true,
             },
-            email: {
-                type: vr_migrations_1.DataTypes.STRING(100),
-                allowNull: true,
-                unique: true,
-            },
             password: {
                 type: vr_migrations_1.DataTypes.STRING,
                 allowNull: true,
@@ -73,7 +71,7 @@ class User extends vr_migrations_1.Model {
                     max: new Date().getFullYear(),
                 },
             },
-            primaryPhoneId: {
+            primaryContactId: {
                 type: vr_migrations_1.DataTypes.UUID,
                 allowNull: true,
             },
@@ -125,7 +123,9 @@ class User extends vr_migrations_1.Model {
             freezeTableName: true,
         });
     }
-    // Static association method
+    // ===========================================================================
+    // ASSOCIATIONS
+    // ===========================================================================
     static associate(models) {
         this.belongsTo(models.SecurityClearance, {
             foreignKey: "securityClearanceId",
@@ -133,15 +133,16 @@ class User extends vr_migrations_1.Model {
             onDelete: "RESTRICT",
             onUpdate: "CASCADE",
         });
-        this.belongsTo(models.PhoneContact, {
-            foreignKey: "primaryPhoneId",
-            as: "primaryPhone",
+        // NEW: Contact associations (renamed from PhoneContact)
+        this.belongsTo(models.Contact, {
+            foreignKey: "primaryContactId",
+            as: "primaryContact",
             onDelete: "SET NULL",
             onUpdate: "CASCADE",
         });
-        this.hasMany(models.PhoneContact, {
+        this.hasMany(models.Contact, {
             foreignKey: "userId",
-            as: "phones",
+            as: "contacts",
             onDelete: "SET NULL",
             onUpdate: "CASCADE",
         });
@@ -170,7 +171,9 @@ class User extends vr_migrations_1.Model {
             onUpdate: "CASCADE",
         });
     }
-    // Custom instance methods
+    // ===========================================================================
+    // CUSTOM INSTANCE METHODS
+    // ===========================================================================
     async softDelete(deletedBy, reason) {
         this.deletion = {
             deleted: true,
@@ -195,18 +198,25 @@ class User extends vr_migrations_1.Model {
         this.deactivatedAt = null;
         await this.save();
     }
-    // Helper to check if user has verified phone
-    async hasVerifiedPhone() {
-        const PhoneContact = this.constructor.sequelize.models
-            .PhoneContact;
-        const verifiedPhone = await PhoneContact.findOne({
-            where: {
-                userId: this.id,
-                isVerified: true,
-                isActive: true,
-            },
-        });
-        return !!verifiedPhone;
+    // Helper to get primary verified contact
+    async getPrimaryVerifiedContact() {
+        if (this.primaryContactId) {
+            const ContactModel = this.constructor.sequelize.models.Contact;
+            return await ContactModel.findOne({
+                where: {
+                    id: this.primaryContactId,
+                    isVerified: true,
+                    isActive: true,
+                },
+            });
+        }
+        return null;
+    }
+    // Helper to check if user has a verified contact of a specific type
+    async hasVerifiedContactType(type) {
+        if (!this.contacts)
+            return false;
+        return this.contacts.some((contact) => contact.type === type && contact.isVerified && contact.isActive);
     }
     // Helper to get full birth date as Date object
     getBirthDate() {

package/package.json

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

package/dist/models/phoneContact.models.d.ts

@@ -1,71 +0,0 @@
-import { Model, InferAttributes, InferCreationAttributes, CreationOptional, NonAttribute, ModelStatic } from "vr-migrations";
-import type { User } from "./user.models";
-export interface PhoneContactAttributes {
-    id: string;
-    phoneNumber: string;
-    userId: string | null;
-    isVerified: boolean;
-    verifiedAt: Date | null;
-    isPrimary: boolean;
-    isActive: boolean;
-    otp: string | null;
-    otpExpiresAt: Date | null;
-    metadata: {
-        lastOtpSentAt?: Date;
-        otpAttempts?: number;
-        lastFailedAttemptAt?: Date;
-        isLocked?: boolean;
-        lockedUntil: Date | null;
-        carrier?: string;
-        countryCode?: string;
-        deactivatedAt?: Date | null;
-        deactivationReason?: string;
-    };
-    createdAt: Date;
-    updatedAt: Date;
-    user?: NonAttribute<User>;
-}
-export interface PhoneContactCreationAttributes extends Omit<PhoneContactAttributes, "id" | "createdAt" | "updatedAt" | "metadata"> {
-    id?: string;
-    metadata?: Record<string, any>;
-}
-export declare class PhoneContact extends Model<InferAttributes<PhoneContact>, InferCreationAttributes<PhoneContact>> implements PhoneContactAttributes {
-    id: CreationOptional<string>;
-    phoneNumber: string;
-    userId: CreationOptional<string | null>;
-    isVerified: CreationOptional<boolean>;
-    verifiedAt: CreationOptional<Date | null>;
-    isPrimary: CreationOptional<boolean>;
-    isActive: CreationOptional<boolean>;
-    otp: CreationOptional<string | null>;
-    otpExpiresAt: CreationOptional<Date | null>;
-    metadata: CreationOptional<{
-        lastOtpSentAt?: Date;
-        otpAttempts?: number;
-        lastFailedAttemptAt?: Date;
-        isLocked?: boolean;
-        lockedUntil: Date | null;
-        carrier?: string;
-        countryCode?: string;
-        deactivatedAt?: Date | null;
-        deactivationReason?: string;
-    }>;
-    readonly createdAt: CreationOptional<Date>;
-    readonly updatedAt: CreationOptional<Date>;
-    user?: NonAttribute<User>;
-    static initialize(sequelize: any): void;
-    static associate(models: Record<string, ModelStatic<Model>>): void;
-    deactivate(reason?: string): Promise<void>;
-    reactivate(): Promise<void>;
-    isLocked(): boolean;
-    getRemainingLockTime(): number | null;
-    isExpired(): boolean;
-    getRemainingOTPTime(): number | null;
-    static findByPhoneNumber(phoneNumber: string): Promise<PhoneContact | null>;
-    static findVerifiedByPhoneNumber(phoneNumber: string): Promise<PhoneContact | null>;
-    static getUserPrimaryPhone(userId: string): Promise<PhoneContact | null>;
-    static getUserPhones(userId: string): Promise<PhoneContact[]>;
-    static isPhoneNumberAvailable(phoneNumber: string): Promise<boolean>;
-    static cleanupExpiredOTPs(): Promise<void>;
-}
-export type PhoneContactModel = typeof PhoneContact;

package/dist/models/transaction.models.d.ts

@@ -1,44 +0,0 @@
-import { Model, InferAttributes, InferCreationAttributes, CreationOptional, NonAttribute, ModelStatic } from "vr-migrations";
-import type { Payment } from "./payment.models";
-import type { User } from "./user.models";
-export type TransactionStatus = "succeeded" | "failed";
-export interface TransactionAttributes {
-    id: string;
-    userId: string;
-    paymentId: string;
-    amount: number;
-    status: TransactionStatus;
-    providerReference: string;
-    metadata: Record<string, any>;
-    createdAt: Date;
-    updatedAt: Date;
-    payment?: Payment;
-    user?: User;
-}
-export interface TransactionCreationAttributes extends Omit<TransactionAttributes, "id" | "createdAt" | "updatedAt" | "metadata"> {
-    id?: string;
-    metadata?: Record<string, any>;
-}
-export declare class Transaction extends Model<InferAttributes<Transaction>, InferCreationAttributes<Transaction>> implements TransactionAttributes {
-    id: CreationOptional<string>;
-    userId: string;
-    paymentId: string;
-    amount: number;
-    status: TransactionStatus;
-    providerReference: string;
-    metadata: CreationOptional<Record<string, any>>;
-    readonly createdAt: CreationOptional<Date>;
-    readonly updatedAt: CreationOptional<Date>;
-    payment?: NonAttribute<Payment>;
-    user?: NonAttribute<User>;
-    static initialize(sequelize: any): void;
-    static associate(models: Record<string, ModelStatic<Model>>): void;
-    markAsSucceeded(metadata?: Record<string, any>): Promise<void>;
-    markAsFailed(reason: string, metadata?: Record<string, any>): Promise<void>;
-    isSuccessful(): boolean;
-    isFailed(): boolean;
-    getFormattedAmount(): string;
-    static getUserTransactions(userId: string, limit?: number): Promise<Transaction[]>;
-    static getPaymentTransactions(paymentId: string): Promise<Transaction[]>;
-}
-export type TransactionModel = typeof Transaction;

package/dist/models/transaction.models.js

@@ -1,97 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transaction = void 0;
-const vr_migrations_1 = require("vr-migrations");
-class Transaction extends vr_migrations_1.Model {
-    // Static initialization method
-    static initialize(sequelize) {
-        this.init({
-            id: {
-                type: vr_migrations_1.DataTypes.UUID,
-                defaultValue: vr_migrations_1.DataTypes.UUIDV4,
-                primaryKey: true,
-            },
-            userId: { type: vr_migrations_1.DataTypes.UUID, allowNull: false },
-            paymentId: { type: vr_migrations_1.DataTypes.UUID, allowNull: false },
-            amount: {
-                type: vr_migrations_1.DataTypes.FLOAT,
-                allowNull: false,
-                validate: { min: 1 },
-            },
-            status: {
-                type: vr_migrations_1.DataTypes.ENUM("succeeded", "failed"),
-                allowNull: false,
-            },
-            providerReference: { type: vr_migrations_1.DataTypes.STRING, allowNull: false },
-            metadata: {
-                type: vr_migrations_1.DataTypes.JSONB,
-                allowNull: false,
-                defaultValue: {},
-            },
-            createdAt: { type: vr_migrations_1.DataTypes.DATE, defaultValue: vr_migrations_1.DataTypes.NOW },
-            updatedAt: { type: vr_migrations_1.DataTypes.DATE, defaultValue: vr_migrations_1.DataTypes.NOW },
-        }, {
-            sequelize,
-            tableName: "transactions",
-            modelName: "Transaction",
-            timestamps: true,
-        });
-    }
-    // Static association method
-    static associate(models) {
-        this.belongsTo(models.Payment, {
-            foreignKey: "paymentId",
-            as: "payment",
-            onDelete: "SET NULL", // ← This is SET NULL, not CASCADE
-            onUpdate: "CASCADE",
-        });
-        this.belongsTo(models.User, {
-            foreignKey: "userId",
-            as: "user",
-            onDelete: "RESTRICT",
-            onUpdate: "CASCADE",
-        });
-    }
-    // Custom instance methods
-    async markAsSucceeded(metadata) {
-        this.status = "succeeded";
-        if (metadata) {
-            this.metadata = { ...this.metadata, ...metadata };
-        }
-        await this.save();
-    }
-    async markAsFailed(reason, metadata) {
-        this.status = "failed";
-        const failureMetadata = {
-            failureReason: reason,
-            failedAt: new Date().toISOString(),
-            ...metadata,
-        };
-        this.metadata = { ...this.metadata, ...failureMetadata };
-        await this.save();
-    }
-    isSuccessful() {
-        return this.status === "succeeded";
-    }
-    isFailed() {
-        return this.status === "failed";
-    }
-    getFormattedAmount() {
-        return `RWF ${this.amount.toLocaleString()}`;
-    }
-    static async getUserTransactions(userId, limit = 50) {
-        return await this.findAll({
-            where: { userId },
-            order: [["createdAt", "DESC"]],
-            limit,
-            include: ["payment"],
-        });
-    }
-    static async getPaymentTransactions(paymentId) {
-        return await this.findAll({
-            where: { paymentId },
-            order: [["createdAt", "DESC"]],
-        });
-    }
-}
-exports.Transaction = Transaction;