payservedb 6.5.3 → 6.5.5

package/src/models/billerAddress.js

@@ -1,120 +1,120 @@
-const mongoose = require("mongoose");
-
-// Define the schema for Biller Address
-const billerAddressSchema = new mongoose.Schema(
-  {
-    name: {
-      type: String,
-      required: [true, "Address name is required"],
-      trim: true,
-      minlength: [1, "Address name must be at least 1 character long"],
-    },
-    companyName: {
-      type: String,
-      required: [true, "Company name is required"],
-      trim: true,
-    },
-    website: {
-      type: String,
-      trim: true,
-      validate: {
-        validator: function (v) {
-          // If website is empty or null, it's valid (optional field)
-          if (!v || v.trim() === '') return true;
-
-          // Updated regex pattern that's more flexible for various URL formats
-          return /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%.\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%\+.~#?&//=]*)$/.test(v);
-        },
-        message: "Please enter a valid website URL (e.g., https://example.com, www.example.com, or example.com)"
-      }
-    },
-    email: {
-      type: String,
-      required: [true, "Email is required"],
-      trim: true,
-      lowercase: true,
-      validate: {
-        validator: function (v) {
-          return /^\w+([\.-]?\w+)@\w+([\.-]?\w+)(\.\w{2,3})+$/.test(v);
-        },
-        message: "Please enter a valid email address"
-      }
-    },
-    phone: {
-      type: String,
-      trim: true,
-    },
-    address: {
-      type: String,
-      required: [true, "Address is required"],
-      trim: true,
-    },
-    city: {
-      type: String,
-      required: [true, "City is required"],
-      trim: true,
-    },
-    state: {
-      type: String,
-      trim: true,
-    },
-    country: {
-      type: String,
-      required: [true, "Country is required"],
-      trim: true,
-      default: "Kenya"
-    },
-    postalCode: {
-      type: String,
-      trim: true,
-    },
-    logo: {
-      type: String, // Will store the file path/URL of the uploaded logo
-      required: false,
-    },
-    isDefault: {
-      type: Boolean,
-      default: false,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-    createdBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "User",
-    },
-    updatedBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "User",
-    }
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// Index for efficient queries
-billerAddressSchema.index({ facilityId: 1 });
-billerAddressSchema.index({ facilityId: 1, isDefault: 1 });
-
-// Pre-save middleware to ensure only one default address per facility
-billerAddressSchema.pre('save', async function (next) {
-  if (this.isDefault && this.isModified('isDefault')) {
-    // If this address is being set as default, unset all other defaults for this facility
-    await this.constructor.updateMany(
-      {
-        facilityId: this.facilityId,
-        _id: { $ne: this._id }
-      },
-      { $set: { isDefault: false } }
-    );
-  }
-  next();
-});
-
-// Compile the model from the schema
-const BillerAddress = mongoose.model("BillerAddress", billerAddressSchema);
-
+const mongoose = require("mongoose");
+
+// Define the schema for Biller Address
+const billerAddressSchema = new mongoose.Schema(
+  {
+    name: {
+      type: String,
+      required: [true, "Address name is required"],
+      trim: true,
+      minlength: [1, "Address name must be at least 1 character long"],
+    },
+    companyName: {
+      type: String,
+      required: [true, "Company name is required"],
+      trim: true,
+    },
+    website: {
+      type: String,
+      trim: true,
+      validate: {
+        validator: function (v) {
+          // If website is empty or null, it's valid (optional field)
+          if (!v || v.trim() === '') return true;
+
+          // Updated regex pattern that's more flexible for various URL formats
+          return /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%.\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%\+.~#?&//=]*)$/.test(v);
+        },
+        message: "Please enter a valid website URL (e.g., https://example.com, www.example.com, or example.com)"
+      }
+    },
+    email: {
+      type: String,
+      required: [true, "Email is required"],
+      trim: true,
+      lowercase: true,
+      validate: {
+        validator: function (v) {
+          return /^\w+([\.-]?\w+)@\w+([\.-]?\w+)(\.\w{2,3})+$/.test(v);
+        },
+        message: "Please enter a valid email address"
+      }
+    },
+    phone: {
+      type: String,
+      trim: true,
+    },
+    address: {
+      type: String,
+      required: [true, "Address is required"],
+      trim: true,
+    },
+    city: {
+      type: String,
+      required: [true, "City is required"],
+      trim: true,
+    },
+    state: {
+      type: String,
+      trim: true,
+    },
+    country: {
+      type: String,
+      required: [true, "Country is required"],
+      trim: true,
+      default: "Kenya"
+    },
+    postalCode: {
+      type: String,
+      trim: true,
+    },
+    logo: {
+      type: String, // Will store the file path/URL of the uploaded logo
+      required: false,
+    },
+    isDefault: {
+      type: Boolean,
+      default: false,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+    createdBy: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "User",
+    },
+    updatedBy: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "User",
+    }
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Index for efficient queries
+billerAddressSchema.index({ facilityId: 1 });
+billerAddressSchema.index({ facilityId: 1, isDefault: 1 });
+
+// Pre-save middleware to ensure only one default address per facility
+billerAddressSchema.pre('save', async function (next) {
+  if (this.isDefault && this.isModified('isDefault')) {
+    // If this address is being set as default, unset all other defaults for this facility
+    await this.constructor.updateMany(
+      {
+        facilityId: this.facilityId,
+        _id: { $ne: this._id }
+      },
+      { $set: { isDefault: false } }
+    );
+  }
+  next();
+});
+
+// Compile the model from the schema
+const BillerAddress = mongoose.model("BillerAddress", billerAddressSchema);
+
 module.exports = BillerAddress;

package/src/models/booking_invoice.js

@@ -1,152 +1,152 @@
-const mongoose = require('mongoose');
-
-// Define the schema for Booking Invoices
-const bookingInvoiceSchema = new mongoose.Schema({
-    invoiceNumber: {
-        type: String,
-        required: true,
-        unique: true,
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    invoiceId: {
-        type: String,
-        required: true,
-        unique: true
-    },
-    bookingReservationId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BookingReservation',
-        required: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    guestInfo: {
-        name: {
-            type: String,
-            required: true
-        },
-        email: {
-            type: String,
-            required: true
-        },
-        phone: {
-            type: String,
-            required: true
-        },
-        idNumber: {
-            type: String
-        }
-    },
-    issueDate: {
-        type: Date,
-        default: Date.now,
-        required: true
-    },
-    dueDate: {
-        type: Date,
-        required: true
-    },
-    checkIn: {
-        type: Date,
-        required: true
-    },
-    checkOut: {
-        type: Date,
-        required: true
-    },
-    basePrice: {
-        type: Number,
-        required: true
-    },
-    totalAmount: {
-        type: Number,
-        required: true
-    },
-    additionalServices: [{
-        serviceId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'ValueAddedService'
-        },
-        serviceName: {
-            type: String,
-            required: true
-        },
-        quantity: {
-            type: Number,
-            default: 1
-        },
-        price: {
-            type: Number,
-            required: true
-        }
-    }],
-    discountAmount: {
-        type: Number,
-        default: 0
-    },
-    taxAmount: {
-        type: Number,
-        default: 0
-    },
-    paymentMethod: {
-        type: String,
-        enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
-        required: true
-    },
-    paymentStatus: {
-        type: String,
-        enum: ['Pending', 'Paid', 'Partially Paid', 'Refunded', 'Cancelled'],
-        default: 'Pending'
-    },
-    paymentHistory: [{
-        amount: {
-            type: Number,
-            required: true
-        },
-        paymentMethod: {
-            type: String,
-            enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
-            required: true
-        },
-        transactionId: String,
-        date: {
-            type: Date,
-            default: Date.now
-        },
-        notes: String
-    }],
-    currencyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Currency',
-        required: true
-    },
-    status: {
-        type: String,
-        enum: ['active', 'cancelled', 'void'],
-        default: 'active'
-    },
-    notes: {
-        type: String
-    },
-    createdBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    },
-    updatedBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    }
-}, {
-    timestamps: true
-});
-
-const BookingInvoice = mongoose.model('BookingInvoice', bookingInvoiceSchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for Booking Invoices
+const bookingInvoiceSchema = new mongoose.Schema({
+    invoiceNumber: {
+        type: String,
+        required: true,
+        unique: true,
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    invoiceId: {
+        type: String,
+        required: true,
+        unique: true
+    },
+    bookingReservationId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BookingReservation',
+        required: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    guestInfo: {
+        name: {
+            type: String,
+            required: true
+        },
+        email: {
+            type: String,
+            required: true
+        },
+        phone: {
+            type: String,
+            required: true
+        },
+        idNumber: {
+            type: String
+        }
+    },
+    issueDate: {
+        type: Date,
+        default: Date.now,
+        required: true
+    },
+    dueDate: {
+        type: Date,
+        required: true
+    },
+    checkIn: {
+        type: Date,
+        required: true
+    },
+    checkOut: {
+        type: Date,
+        required: true
+    },
+    basePrice: {
+        type: Number,
+        required: true
+    },
+    totalAmount: {
+        type: Number,
+        required: true
+    },
+    additionalServices: [{
+        serviceId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'ValueAddedService'
+        },
+        serviceName: {
+            type: String,
+            required: true
+        },
+        quantity: {
+            type: Number,
+            default: 1
+        },
+        price: {
+            type: Number,
+            required: true
+        }
+    }],
+    discountAmount: {
+        type: Number,
+        default: 0
+    },
+    taxAmount: {
+        type: Number,
+        default: 0
+    },
+    paymentMethod: {
+        type: String,
+        enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
+        required: true
+    },
+    paymentStatus: {
+        type: String,
+        enum: ['Pending', 'Paid', 'Partially Paid', 'Refunded', 'Cancelled'],
+        default: 'Pending'
+    },
+    paymentHistory: [{
+        amount: {
+            type: Number,
+            required: true
+        },
+        paymentMethod: {
+            type: String,
+            enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
+            required: true
+        },
+        transactionId: String,
+        date: {
+            type: Date,
+            default: Date.now
+        },
+        notes: String
+    }],
+    currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: true
+    },
+    status: {
+        type: String,
+        enum: ['active', 'cancelled', 'void'],
+        default: 'active'
+    },
+    notes: {
+        type: String
+    },
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    },
+    updatedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    }
+}, {
+    timestamps: true
+});
+
+const BookingInvoice = mongoose.model('BookingInvoice', bookingInvoiceSchema);
+
 module.exports = BookingInvoice;

package/src/models/bookinganalytics.js

@@ -1,64 +1,64 @@
-const mongoose = require('mongoose');
-
-// Define schema for Booking Analytics
-const bookingAnalyticsSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    date: {
-        type: Date,
-        required: true
-    },
-    metrics: {
-        totalBookings: {
-            type: Number,
-            default: 0
-        },
-        totalRevenue: {
-            type: Number,
-            default: 0
-        },
-        pmCommission: {
-            type: Number,
-            default: 0
-        },
-        landlordRevenue: {
-            type: Number,
-            default: 0
-        },
-        occupancyRate: {
-            type: Number,
-            default: 0
-        },
-        averageDailyRate: {
-            type: Number,
-            default: 0
-        }
-    },
-    bookingsByStatus: {
-        new: {
-            type: Number,
-            default: 0
-        },
-        confirmed: {
-            type: Number,
-            default: 0
-        },
-        cancelled: {
-            type: Number,
-            default: 0
-        },
-        completed: {
-            type: Number,
-            default: 0
-        }
-    }
-}, {
-    timestamps: true
-});
-// Create model from schema
-const BookingAnalytics = mongoose.model('BookingAnalytics', bookingAnalyticsSchema);
-
+const mongoose = require('mongoose');
+
+// Define schema for Booking Analytics
+const bookingAnalyticsSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    date: {
+        type: Date,
+        required: true
+    },
+    metrics: {
+        totalBookings: {
+            type: Number,
+            default: 0
+        },
+        totalRevenue: {
+            type: Number,
+            default: 0
+        },
+        pmCommission: {
+            type: Number,
+            default: 0
+        },
+        landlordRevenue: {
+            type: Number,
+            default: 0
+        },
+        occupancyRate: {
+            type: Number,
+            default: 0
+        },
+        averageDailyRate: {
+            type: Number,
+            default: 0
+        }
+    },
+    bookingsByStatus: {
+        new: {
+            type: Number,
+            default: 0
+        },
+        confirmed: {
+            type: Number,
+            default: 0
+        },
+        cancelled: {
+            type: Number,
+            default: 0
+        },
+        completed: {
+            type: Number,
+            default: 0
+        }
+    }
+}, {
+    timestamps: true
+});
+// Create model from schema
+const BookingAnalytics = mongoose.model('BookingAnalytics', bookingAnalyticsSchema);
+
 module.exports = BookingAnalytics;