payservedb 6.6.3 → 6.6.5

package/src/models/bookingreservation.js

@@ -1,193 +1,193 @@
-const mongoose = require('mongoose');
-
-// Define the schema for Booking Reservations
-const bookingReservationSchema = new mongoose.Schema({
-    checkOutActual: {
-        type: Date
-    },
-    // Field for checkout notes
-    checkoutNotes: {
-        type: String,
-        default: ''
-    },
-    // Field for the final amount paid (may differ from original totalAmount)
-    finalAmount: {
-        type: Number
-    },
-    // Field for additional charges at checkout
-    additionalCheckoutCharges: [{
-        description: {
-            type: String,
-            required: true
-        },
-        amount: {
-            type: Number,
-            required: true
-        },
-        reason: {
-            type: String
-        },
-        addedAt: {
-            type: Date,
-            default: Date.now
-        }
-    }],
-    // Field to track if this reservation has been included in revenue calculations
-    revenueProcessed: {
-        type: Boolean,
-        default: false
-    },
-    // Field to store the checkout date
-    checkoutDate: {
-        type: Date
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    bookingPropertyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BookingProperty',
-        required: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    bookingReservationId: {
-        type: String,
-        required: true,
-        unique: true
-    },
-    guestInfo: {
-        name: {
-            type: String,
-            required: true
-        },
-        email: {
-            type: String,
-            required: true
-        },
-        phone: {
-            type: String,
-            required: true
-        },
-        idNumber: {
-            type: String,
-            required: true
-        }
-    },
-    checkIn: {
-        type: Date,
-        required: true
-    },
-    checkOut: {
-        type: Date,
-        required: true
-    },
-    guests: {
-        adults: {
-            type: Number,
-            default: 1
-        },
-        children: {
-            type: Number,
-            default: 0
-        }
-    },
-    basePrice: {
-        type: Number,
-        required: false
-    },
-    totalAmount: {
-        type: Number,
-        required: false
-    },
-    commission: {
-        type: Number,
-        required: false
-    },
-    landlordAmount: {
-        type: Number,
-        required: false
-    },
-    currencyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Currency',
-        required: false
-    },
-    paymentMethod: {
-        type: String,
-        enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
-        required: false
-    },
-    paymentTiming: {
-        type: String,
-        enum: ['Before', 'After', 'Split'],
-        default: 'Before'
-    },
-    invoiceId: {
-        type: String
-    },
-    // For additional services
-    additionalServices: [{
-        serviceId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'ValueAddedService'
-        },
-        serviceName: {
-            type: String,
-            required: true
-        },
-        quantity: {
-            type: Number,
-            default: 1
-        },
-        price: {
-            type: Number,
-            required: true
-        }
-    }],
-    specialRequests: {
-        type: String
-    },
-    status: {
-        type: String,
-        enum: ['new', 'confirmed', 'cancelled', 'completed'],
-        default: 'new'
-    },
-    statusHistory: [{
-        status: {
-            type: String,
-            enum: ['new', 'confirmed', 'cancelled', 'completed'],
-            required: true
-        },
-        timestamp: {
-            type: Date,
-            default: Date.now
-        },
-        updatedBy: mongoose.Schema.Types.ObjectId
-    }],
-    cancellationDetails: {
-        date: Date,
-        reason: String,
-        refundAmount: Number
-    },
-    createdBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User',
-    },
-    updatedBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    }
-}, {
-    timestamps: true
-});
-
-// Create model from schema
-const BookingReservation = mongoose.model('BookingReservation', bookingReservationSchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for Booking Reservations
+const bookingReservationSchema = new mongoose.Schema({
+    checkOutActual: {
+        type: Date
+    },
+    // Field for checkout notes
+    checkoutNotes: {
+        type: String,
+        default: ''
+    },
+    // Field for the final amount paid (may differ from original totalAmount)
+    finalAmount: {
+        type: Number
+    },
+    // Field for additional charges at checkout
+    additionalCheckoutCharges: [{
+        description: {
+            type: String,
+            required: true
+        },
+        amount: {
+            type: Number,
+            required: true
+        },
+        reason: {
+            type: String
+        },
+        addedAt: {
+            type: Date,
+            default: Date.now
+        }
+    }],
+    // Field to track if this reservation has been included in revenue calculations
+    revenueProcessed: {
+        type: Boolean,
+        default: false
+    },
+    // Field to store the checkout date
+    checkoutDate: {
+        type: Date
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    bookingPropertyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BookingProperty',
+        required: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    bookingReservationId: {
+        type: String,
+        required: true,
+        unique: true
+    },
+    guestInfo: {
+        name: {
+            type: String,
+            required: true
+        },
+        email: {
+            type: String,
+            required: true
+        },
+        phone: {
+            type: String,
+            required: true
+        },
+        idNumber: {
+            type: String,
+            required: true
+        }
+    },
+    checkIn: {
+        type: Date,
+        required: true
+    },
+    checkOut: {
+        type: Date,
+        required: true
+    },
+    guests: {
+        adults: {
+            type: Number,
+            default: 1
+        },
+        children: {
+            type: Number,
+            default: 0
+        }
+    },
+    basePrice: {
+        type: Number,
+        required: false
+    },
+    totalAmount: {
+        type: Number,
+        required: false
+    },
+    commission: {
+        type: Number,
+        required: false
+    },
+    landlordAmount: {
+        type: Number,
+        required: false
+    },
+    currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: false
+    },
+    paymentMethod: {
+        type: String,
+        enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
+        required: false
+    },
+    paymentTiming: {
+        type: String,
+        enum: ['Before', 'After', 'Split'],
+        default: 'Before'
+    },
+    invoiceId: {
+        type: String
+    },
+    // For additional services
+    additionalServices: [{
+        serviceId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'ValueAddedService'
+        },
+        serviceName: {
+            type: String,
+            required: true
+        },
+        quantity: {
+            type: Number,
+            default: 1
+        },
+        price: {
+            type: Number,
+            required: true
+        }
+    }],
+    specialRequests: {
+        type: String
+    },
+    status: {
+        type: String,
+        enum: ['new', 'confirmed', 'cancelled', 'completed'],
+        default: 'new'
+    },
+    statusHistory: [{
+        status: {
+            type: String,
+            enum: ['new', 'confirmed', 'cancelled', 'completed'],
+            required: true
+        },
+        timestamp: {
+            type: Date,
+            default: Date.now
+        },
+        updatedBy: mongoose.Schema.Types.ObjectId
+    }],
+    cancellationDetails: {
+        date: Date,
+        reason: String,
+        refundAmount: Number
+    },
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+    },
+    updatedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    }
+}, {
+    timestamps: true
+});
+
+// Create model from schema
+const BookingReservation = mongoose.model('BookingReservation', bookingReservationSchema);
+
 module.exports = BookingReservation;

package/src/models/bookingrevenuerecord.js

@@ -1,85 +1,85 @@
-const mongoose = require('mongoose');
-
-// Define the schema for Revenue Records
-const revenueRecordSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true
-    },
-    reservationId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BookingReservation',
-        required: true,
-        index: true
-    },
-    bookingPropertyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BookingProperty',
-        required: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    checkoutDate: {
-        type: Date,
-        required: true,
-        index: true
-    },
-    baseAmount: {
-        type: Number,
-        required: true
-    },
-    finalAmount: {
-        type: Number,
-        required: true
-    },
-    additionalChargesAmount: {
-        type: Number,
-        default: 0
-    },
-    currencyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Currency',
-        required: true
-    },
-    // For easier querying and aggregation
-    month: {
-        type: Number, // 1-12
-        required: true,
-        index: true
-    },
-    year: {
-        type: Number,
-        required: true,
-        index: true
-    },
-    quarter: {
-        type: Number, // 1-4
-        required: true,
-        index: true
-    },
-    bookingDuration: {
-        type: Number, // Number of days
-        default: 0
-    },
-    createdAt: {
-        type: Date,
-        default: Date.now
-    }
-}, {
-    // Enable timestamps
-    timestamps: true
-});
-
-// Create compound indices for efficient querying
-revenueRecordSchema.index({ facilityId: 1, year: 1, month: 1 });
-revenueRecordSchema.index({ facilityId: 1, year: 1, quarter: 1 });
-
-// Create model from schema
-const RevenueRecord = mongoose.model('RevenueRecord', revenueRecordSchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for Revenue Records
+const revenueRecordSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true
+    },
+    reservationId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BookingReservation',
+        required: true,
+        index: true
+    },
+    bookingPropertyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BookingProperty',
+        required: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    checkoutDate: {
+        type: Date,
+        required: true,
+        index: true
+    },
+    baseAmount: {
+        type: Number,
+        required: true
+    },
+    finalAmount: {
+        type: Number,
+        required: true
+    },
+    additionalChargesAmount: {
+        type: Number,
+        default: 0
+    },
+    currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: true
+    },
+    // For easier querying and aggregation
+    month: {
+        type: Number, // 1-12
+        required: true,
+        index: true
+    },
+    year: {
+        type: Number,
+        required: true,
+        index: true
+    },
+    quarter: {
+        type: Number, // 1-4
+        required: true,
+        index: true
+    },
+    bookingDuration: {
+        type: Number, // Number of days
+        default: 0
+    },
+    createdAt: {
+        type: Date,
+        default: Date.now
+    }
+}, {
+    // Enable timestamps
+    timestamps: true
+});
+
+// Create compound indices for efficient querying
+revenueRecordSchema.index({ facilityId: 1, year: 1, month: 1 });
+revenueRecordSchema.index({ facilityId: 1, year: 1, quarter: 1 });
+
+// Create model from schema
+const RevenueRecord = mongoose.model('RevenueRecord', revenueRecordSchema);
+
 module.exports = RevenueRecord;