whitelabel-db 1.1.93 → 1.1.95

package/dist/libs/database.d.ts

@@ -5,4 +5,4 @@ export interface ConnectionDetails {
     password: string;
     dbname: string;
 }
-export declare const connect: (connectionDetails: ConnectionDetails) => Promise<void | Sequelize>;
+export declare const connect: (connectionDetails: ConnectionDetails) => Promise<Sequelize>;

package/dist/libs/database.js

@@ -72,14 +72,17 @@ const connect = (connectionDetails) => __awaiter(void 0, void 0, void 0, functio
             CollectionItemCustomField_1.CollectionItemCustomField,
         ],
     });
-    return connection
-        .authenticate()
-        .then(() => {
+    try {
+        yield connection.authenticate();
         console.log('Database connection has been established successfully.');
-        return connection.sync();
-    })
-        .catch((err) => {
+        // Ensure sync completes and creates necessary tables including SequelizeMeta
+        yield connection.sync({ alter: false });
+        console.log('Database sync completed successfully.');
+        return connection;
+    }
+    catch (err) {
         console.error('Unable to connect to the database:', err);
-    });
+        throw err;
+    }
 });
 exports.connect = connect;

package/dist/libs/migration.js

@@ -44,14 +44,37 @@ const runMigrations = (sequelize) => __awaiter(void 0, void 0, void 0, function*
         console.error(`Migrations directory not found at: ${migrationsPath}`);
         return;
     }
+    // Ensure SequelizeMeta table exists - this handles cases where sync() didn't create it
+    try {
+        yield sequelize.query(`
+      CREATE TABLE IF NOT EXISTS "SequelizeMeta" (
+        "name" VARCHAR(255) NOT NULL,
+        PRIMARY KEY ("name")
+      );
+    `);
+        console.log('SequelizeMeta table ensured to exist');
+    }
+    catch (error) {
+        console.error('Error creating SequelizeMeta table:', error);
+        throw error;
+    }
     // Read and sort migration files
     const migrationFiles = fs_1.default
         .readdirSync(migrationsPath)
         .filter((file) => file.match(/^\d{3}-.+\.ts$/) || file.match(/^\d{3}-.+\.js$/)) // Matches .ts and .js files
         .filter((file) => !file.endsWith('.d.ts')) // Exclude .d.ts files
         .sort(); // Sort files by name
-    const [results] = yield sequelize.query('SELECT name FROM "SequelizeMeta"');
-    const executedMigrations = results.map((row) => row.name);
+    // Get executed migrations - now this should always work since we ensured the table exists
+    let executedMigrations = [];
+    try {
+        const [results] = yield sequelize.query('SELECT name FROM "SequelizeMeta"');
+        executedMigrations = results.map((row) => row.name);
+        console.log(`Found ${executedMigrations.length} previously executed migrations`);
+    }
+    catch (error) {
+        console.error('Unexpected error fetching executed migrations:', error);
+        throw error;
+    }
     for (const file of migrationFiles) {
         if (!executedMigrations.includes(file)) {
             const migration = yield Promise.resolve(`${path_1.default.join(migrationsPath, file)}`).then(s => __importStar(require(s)));
@@ -59,10 +82,11 @@ const runMigrations = (sequelize) => __awaiter(void 0, void 0, void 0, function*
                 console.log(`Running migration: ${file}`);
                 yield migration.up(sequelize.getQueryInterface());
                 yield sequelize.query(`INSERT INTO "SequelizeMeta" (name) VALUES ('${file}')`);
+                console.log(`Completed migration: ${file}`);
             }
         }
         else {
-            console.log(`Skipping migration: ${file}`);
+            console.log(`Skipping migration: ${file} (already executed)`);
         }
     }
     console.log('Migrations completed.');

package/dist/migrations/023-add-anonymous-user-support.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/023-add-anonymous-user-support.js

@@ -0,0 +1,104 @@
+"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 anonymous user support to guests table
+const sequelize_1 = require("sequelize");
+const up = (queryInterface) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        // Step 1: Drop the existing unique index on (email, projectId)
+        yield queryInterface.removeIndex('guests', ['email', 'projectId']);
+        // Step 2: Make firstName, lastName, and email nullable
+        yield queryInterface.changeColumn('guests', 'firstName', {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: true,
+        });
+        yield queryInterface.changeColumn('guests', 'lastName', {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: true,
+        });
+        yield queryInterface.changeColumn('guests', 'email', {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: true,
+        });
+        // Step 3: Add new columns for anonymous user support
+        yield queryInterface.addColumn('guests', 'isAnonymous', {
+            type: sequelize_1.DataTypes.BOOLEAN,
+            allowNull: false,
+            defaultValue: false, // Existing users are not anonymous
+        });
+        yield queryInterface.addColumn('guests', 'sessionToken', {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: true,
+        });
+        yield queryInterface.addColumn('guests', 'lastSeen', {
+            type: sequelize_1.DataTypes.DATE,
+            allowNull: false,
+            defaultValue: sequelize_1.DataTypes.NOW,
+        });
+        // Step 4: Create new partial unique index for (email, projectId) only when email is not null
+        yield queryInterface.addIndex('guests', ['email', 'projectId'], {
+            unique: true,
+            where: {
+                email: {
+                    [sequelize_1.Op.ne]: null,
+                },
+            },
+            name: 'guests_email_projectId_unique',
+        });
+        // Step 5: Add index for sessionToken for faster lookups
+        yield queryInterface.addIndex('guests', ['sessionToken'], {
+            name: 'guests_sessionToken_idx',
+        });
+        console.log('Anonymous user support added to guests table successfully.');
+    }
+    catch (error) {
+        console.error('Error while adding anonymous user support:', error.message);
+        throw error;
+    }
+});
+exports.up = up;
+const down = (queryInterface) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        // Step 1: Remove the new indexes
+        yield queryInterface.removeIndex('guests', 'guests_email_projectId_unique');
+        yield queryInterface.removeIndex('guests', 'guests_sessionToken_idx');
+        // Step 2: Remove the new columns
+        yield queryInterface.removeColumn('guests', 'isAnonymous');
+        yield queryInterface.removeColumn('guests', 'sessionToken');
+        yield queryInterface.removeColumn('guests', 'lastSeen');
+        // Step 3: Revert firstName, lastName, and email to not nullable
+        // Note: This might fail if there are existing null values
+        yield queryInterface.changeColumn('guests', 'firstName', {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: false,
+        });
+        yield queryInterface.changeColumn('guests', 'lastName', {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: false,
+        });
+        yield queryInterface.changeColumn('guests', 'email', {
+            type: sequelize_1.DataTypes.STRING,
+            allowNull: false,
+        });
+        // Step 4: Recreate the original unique index
+        yield queryInterface.addIndex('guests', ['email', 'projectId'], {
+            unique: true,
+            name: 'guests_email_projectId_unique',
+        });
+        console.log('Anonymous user support removed from guests table successfully.');
+    }
+    catch (error) {
+        console.error('Error while removing anonymous user support:', error.message);
+        throw error;
+    }
+});
+exports.down = down;

package/dist/models/Guest.d.ts

@@ -14,6 +14,9 @@ export declare class Guest extends Model<Partial<Guest>> {
     isVerified: boolean;
     isAgent: boolean;
     bypassPayment: boolean;
+    isAnonymous: boolean;
+    sessionToken: string;
+    lastSeen: Date;
     vouchers: number[];
     favoriteHotelIds: string[];
     feedbackCount: number;
@@ -22,4 +25,13 @@ export declare class Guest extends Model<Partial<Guest>> {
     bookings?: Booking[];
     static checkEmail(email: 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;
+        password?: string;
+    }): Promise<this>;
+    updateLastSeen(): Promise<this>;
 }

package/dist/models/Guest.js

@@ -24,12 +24,15 @@ var Guest_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Guest = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const Project_1 = require("./Project");
 const Booking_1 = require("./Booking");
 let Guest = Guest_1 = class Guest extends sequelize_typescript_1.Model {
     static checkEmail(email, projectId) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!email)
+                return; // Handle null emails for anonymous users
             if (yield Guest_1.findOne({ where: { email: email.toLowerCase(), projectId } })) {
                 throw new Error('This email is already registered to another account.');
             }
@@ -41,6 +44,47 @@ let Guest = Guest_1 = class Guest extends sequelize_typescript_1.Model {
             expiresIn: 1209600, // 14 days
         });
     }
+    // New method to create anonymous guest
+    static createAnonymous(projectId, sessionToken) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield Guest_1.create({
+                projectId,
+                isAnonymous: true,
+                sessionToken,
+                lastSeen: new Date(),
+            });
+        });
+    }
+    // New method to find guest by session token
+    static findBySessionToken(sessionToken, projectId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield Guest_1.findOne({
+                where: { sessionToken, projectId },
+            });
+        });
+    }
+    // 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.password) {
+                this.password = userData.password;
+            }
+            this.isAnonymous = false;
+            this.isVerified = false; // Will be verified through email verification process
+            this.lastSeen = new Date();
+            return yield this.save();
+        });
+    }
+    // New method to update last seen
+    updateLastSeen() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.lastSeen = new Date();
+            return yield this.save();
+        });
+    }
 };
 exports.Guest = Guest;
 __decorate([
@@ -55,14 +99,14 @@ __decorate([
 __decorate([
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.STRING,
-        allowNull: false,
+        allowNull: true, // Changed from false to support anonymous users
     }),
     __metadata("design:type", String)
 ], Guest.prototype, "firstName", void 0);
 __decorate([
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.STRING,
-        allowNull: false,
+        allowNull: true, // Changed from false to support anonymous users
     }),
     __metadata("design:type", String)
 ], Guest.prototype, "lastName", void 0);
@@ -70,7 +114,7 @@ __decorate([
     sequelize_typescript_1.Index,
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.STRING,
-        allowNull: false,
+        allowNull: true, // Changed from false to support anonymous users
     }),
     __metadata("design:type", String)
 ], Guest.prototype, "email", void 0);
@@ -131,6 +175,28 @@ __decorate([
     }),
     __metadata("design:type", Boolean)
 ], Guest.prototype, "bypassPayment", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.BOOLEAN,
+        defaultValue: false, // Default to anonymous
+    }),
+    __metadata("design:type", Boolean)
+], Guest.prototype, "isAnonymous", 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, "sessionToken", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)({
+        type: sequelize_typescript_1.DataType.DATE,
+        defaultValue: sequelize_typescript_1.DataType.NOW,
+    }),
+    __metadata("design:type", Date)
+], Guest.prototype, "lastSeen", void 0);
 __decorate([
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.ARRAY(sequelize_typescript_1.DataType.JSONB),
@@ -180,6 +246,11 @@ exports.Guest = Guest = Guest_1 = __decorate([
             {
                 unique: true,
                 fields: ['email', 'projectId'],
+                where: {
+                    email: {
+                        [sequelize_1.Op.ne]: null,
+                    },
+                },
             },
         ],
     })

package/package.json

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