whitelabel-db 1.3.3 → 1.3.4

package/dist/libs/database.js

@@ -42,6 +42,7 @@ const LoyaltyProgramTier_1 = require("../models/LoyaltyProgramTier");
 const BookingLoyaltyRecord_1 = require("../models/BookingLoyaltyRecord");
 const migration_1 = require("./migration");
 const connect = (connectionDetails) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const connection = new sequelize_typescript_1.Sequelize({
         dialect: 'postgres',
         host: connectionDetails.host,
@@ -93,8 +94,31 @@ const connect = (connectionDetails) => __awaiter(void 0, void 0, void 0, functio
         }
         // Only create tables that don't exist, don't alter existing schema
         // This prevents conflicts with migrations
-        yield connection.sync({ force: false, alter: false });
-        console.log('Database sync completed successfully.');
+        try {
+            yield connection.sync({ force: false, alter: false });
+            console.log('Database sync completed successfully.');
+        }
+        catch (syncError) {
+            // Ignore errors about creating indexes on primary key columns
+            // Primary keys already have indexes, so Sequelize trying to create
+            // a separate index on them will fail
+            const errorMessage = (syncError === null || syncError === void 0 ? void 0 : syncError.message) || '';
+            const errorSql = (syncError === null || syncError === void 0 ? void 0 : syncError.sql) || '';
+            const originalCode = ((_a = syncError === null || syncError === void 0 ? void 0 : syncError.original) === null || _a === void 0 ? void 0 : _a.code) || '';
+            if ((errorMessage.includes('already exists') &&
+                errorSql.includes('CREATE INDEX')) ||
+                originalCode === '42P07' || // duplicate_table
+                originalCode === '42710' || // duplicate_object (index already exists)
+                (errorSql.includes('CREATE INDEX') &&
+                    errorSql.includes('_id"') &&
+                    errorSql.includes('"id")'))) {
+                console.log('Sync completed with expected warnings (indexes on primary keys may already exist).');
+            }
+            else {
+                console.error('Error during database sync:', syncError);
+                throw syncError;
+            }
+        }
         return connection;
     }
     catch (err) {

package/dist/migrations/033-add-guest-phone-country-language-currency.d.ts

@@ -0,0 +1,3 @@
+import { QueryInterface } from 'sequelize';
+export declare const up: (queryInterface: QueryInterface) => Promise<void>;
+export declare const down: (queryInterface: QueryInterface) => Promise<void>;

package/dist/migrations/033-add-guest-phone-country-language-currency.js

@@ -0,0 +1,146 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+// Purpose: Add phoneNo, country, language, currency columns to guests table
+const sequelize_1 = require("sequelize");
+const up = (queryInterface) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        // Check which columns already exist
+        const tableDescription = yield queryInterface.describeTable('guests');
+        const existingColumns = Object.keys(tableDescription);
+        // Add phoneNo column
+        if (!existingColumns.includes('phoneNo')) {
+            yield queryInterface.addColumn('guests', 'phoneNo', {
+                type: sequelize_1.DataTypes.STRING,
+                allowNull: true,
+            });
+            console.log('phoneNo column added successfully.');
+        }
+        else {
+            console.log('phoneNo column already exists, skipping.');
+        }
+        // Add country column
+        if (!existingColumns.includes('country')) {
+            yield queryInterface.addColumn('guests', 'country', {
+                type: sequelize_1.DataTypes.STRING,
+                allowNull: true,
+            });
+            console.log('country column added successfully.');
+        }
+        else {
+            console.log('country column already exists, skipping.');
+        }
+        // Add language column
+        if (!existingColumns.includes('language')) {
+            yield queryInterface.addColumn('guests', 'language', {
+                type: sequelize_1.DataTypes.STRING,
+                allowNull: true,
+            });
+            console.log('language column added successfully.');
+        }
+        else {
+            console.log('language column already exists, skipping.');
+        }
+        // Add currency column
+        if (!existingColumns.includes('currency')) {
+            yield queryInterface.addColumn('guests', 'currency', {
+                type: sequelize_1.DataTypes.STRING,
+                allowNull: true,
+            });
+            console.log('currency column added successfully.');
+        }
+        else {
+            console.log('currency column already exists, skipping.');
+        }
+        // Add index for phoneNo for faster lookups
+        try {
+            yield queryInterface.addIndex('guests', ['phoneNo'], {
+                name: 'guests_phoneNo_idx',
+            });
+            console.log('phoneNo index added successfully.');
+        }
+        catch (error) {
+            if (error.message.includes('already exists')) {
+                console.log('phoneNo index already exists, skipping.');
+            }
+            else {
+                throw error;
+            }
+        }
+        // Add unique index for (phoneNo, projectId) only when phoneNo is not null
+        try {
+            yield queryInterface.addIndex('guests', ['phoneNo', 'projectId'], {
+                unique: true,
+                where: {
+                    phoneNo: {
+                        [sequelize_1.Op.ne]: null,
+                    },
+                },
+                name: 'guests_phoneNo_projectId_unique',
+            });
+            console.log('phoneNo-projectId unique index added successfully.');
+        }
+        catch (error) {
+            if (error.message.includes('already exists')) {
+                console.log('phoneNo-projectId unique index already exists, skipping.');
+            }
+            else {
+                throw error;
+            }
+        }
+        console.log('phoneNo, country, language, currency columns added to guests table successfully.');
+    }
+    catch (error) {
+        console.error('Error while adding phoneNo, country, language, currency columns:', error.message);
+        throw error;
+    }
+});
+exports.up = up;
+const down = (queryInterface) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        // Remove the unique index
+        try {
+            yield queryInterface.removeIndex('guests', 'guests_phoneNo_projectId_unique');
+        }
+        catch (error) {
+            if (error.message.includes('does not exist')) {
+                console.log('phoneNo-projectId unique index does not exist, skipping.');
+            }
+            else {
+                throw error;
+            }
+        }
+        // Remove the phoneNo index
+        try {
+            yield queryInterface.removeIndex('guests', 'guests_phoneNo_idx');
+        }
+        catch (error) {
+            if (error.message.includes('does not exist')) {
+                console.log('phoneNo index does not exist, skipping.');
+            }
+            else {
+                throw error;
+            }
+        }
+        // Remove the new columns
+        yield queryInterface.removeColumn('guests', 'phoneNo');
+        yield queryInterface.removeColumn('guests', 'country');
+        yield queryInterface.removeColumn('guests', 'language');
+        yield queryInterface.removeColumn('guests', 'currency');
+        console.log('phoneNo, country, language, currency columns removed from guests table successfully.');
+    }
+    catch (error) {
+        console.error('Error while removing phoneNo, country, language, currency columns:', error.message);
+        throw error;
+    }
+});
+exports.down = down;

package/dist/models/Guest.d.ts

@@ -6,6 +6,10 @@ export declare class Guest extends Model<Partial<Guest>> {
     firstName: string;
     lastName: string;
     email: string;
+    phoneNo: string;
+    country: string;
+    language: string;
+    currency: string;
     password: string;
     projectId?: string;
     liteApiGuestId: number;
@@ -24,14 +28,20 @@ export declare class Guest extends Model<Partial<Guest>> {
     project?: Project;
     bookings?: Booking[];
     static checkEmail(email: string, projectId: string): Promise<void>;
+    static checkPhoneNo(phoneNo: string, projectId: string): Promise<void>;
+    static checkEmailOrPhone(email?: string, phoneNo?: string, projectId?: string): Promise<void>;
     generateSession(secret: string): string;
     static createAnonymous(projectId: string, sessionToken: string): Promise<Guest>;
     static findBySessionToken(sessionToken: string, projectId: string): Promise<Guest | null>;
     convertToRegistered(userData: {
-        firstName: string;
-        lastName: string;
-        email: string;
+        firstName?: string;
+        lastName?: string;
+        email?: string;
+        phoneNo?: string;
         password?: string;
+        country?: string;
+        language?: string;
+        currency?: string;
     }): Promise<this>;
     updateLastSeen(): Promise<this>;
 }

package/dist/models/Guest.js

@@ -38,6 +38,28 @@ let Guest = Guest_1 = class Guest extends sequelize_typescript_1.Model {
             }
         });
     }
+    static checkPhoneNo(phoneNo, projectId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!phoneNo)
+                return; // Handle null phone numbers
+            if (yield Guest_1.findOne({ where: { phoneNo, projectId } })) {
+                throw new Error('This phone number is already registered to another account.');
+            }
+        });
+    }
+    static checkEmailOrPhone(email, phoneNo, projectId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!email && !phoneNo) {
+                throw new Error('Either email or phone number must be provided.');
+            }
+            if (email) {
+                yield Guest_1.checkEmail(email, projectId);
+            }
+            if (phoneNo) {
+                yield Guest_1.checkPhoneNo(phoneNo, projectId);
+            }
+        });
+    }
     generateSession(secret) {
         return jsonwebtoken_1.default.sign({ id: this.id, projectId: this.projectId }, secret, {
             algorithm: 'HS256',
@@ -66,14 +88,32 @@ let Guest = Guest_1 = class Guest extends sequelize_typescript_1.Model {
     // New method to convert anonymous to registered
     convertToRegistered(userData) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.firstName = userData.firstName;
-            this.lastName = userData.lastName;
-            this.email = userData.email.toLowerCase();
+            if (userData.firstName) {
+                this.firstName = userData.firstName;
+            }
+            if (userData.lastName) {
+                this.lastName = userData.lastName;
+            }
+            if (userData.email) {
+                this.email = userData.email.toLowerCase();
+            }
+            if (userData.phoneNo) {
+                this.phoneNo = userData.phoneNo;
+            }
             if (userData.password) {
                 this.password = userData.password;
             }
+            if (userData.country) {
+                this.country = userData.country;
+            }
+            if (userData.language) {
+                this.language = userData.language;
+            }
+            if (userData.currency) {
+                this.currency = userData.currency;
+            }
             this.isAnonymous = false;
-            this.isVerified = false; // Will be verified through email verification process
+            this.isVerified = false; // Will be verified through email/phone verification process
             this.lastSeen = new Date();
             return yield this.save();
         });
@@ -118,6 +158,35 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], Guest.prototype, "email", void 0);
+__decorate([
+    sequelize_typescript_1.Index,
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.STRING,
+        allowNull: true,
+    }),
+    __metadata("design:type", String)
+], Guest.prototype, "phoneNo", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.STRING,
+        allowNull: true,
+    }),
+    __metadata("design:type", String)
+], Guest.prototype, "country", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.STRING,
+        allowNull: true,
+    }),
+    __metadata("design:type", String)
+], Guest.prototype, "language", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.STRING,
+        allowNull: true,
+    }),
+    __metadata("design:type", String)
+], Guest.prototype, "currency", void 0);
 __decorate([
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.STRING,
@@ -252,6 +321,15 @@ exports.Guest = Guest = Guest_1 = __decorate([
                     },
                 },
             },
+            {
+                unique: true,
+                fields: ['phoneNo', 'projectId'],
+                where: {
+                    phoneNo: {
+                        [sequelize_1.Op.ne]: null,
+                    },
+                },
+            },
         ],
     })
 ], Guest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whitelabel-db",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",