payservedb 4.6.6 → 4.6.9

package/index.js

@@ -127,6 +127,9 @@ const models = {
     DefaultPaymentDetails: require('./src/models/default_payment_details'),
     Currency: require('./src/models/currency_settings'),
     WaterMeterAccount: require('./src/models/water_meter_account'),
+    SingleDayWaterMeterHistory: require('./src/models/water_meter_single_day_history'),
+    DailyWaterMeterHistory: require('./src/models/water_meter_daily_history'),
+    MonthlyWaterMeterHistory: require('./src/models/water_meter_monthly_history'),
     CashPayment: require('./src/models/cashpayment'),
     VasPayment: require('./src/models/vas_payments'),
     VasInvoicesQuickBooks: require('./src/models/vas_invoices_upload'),
@@ -137,7 +140,15 @@ const models = {
     Supplier: require('./src/models/suppliers'),
     PurchaseRequest: require('./src/models/purchase_request'),
     PurchaseOrder: require('./src/models/purchase_order'),
-    RFQ: require('./src/models/quotation')
+    RFQ: require('./src/models/quotation'),
+    CommonAreaElectricityReading: require('./src/models/common_area_electricity'),
+    CommonAreaWaterReading: require('./src/models/common_area_water'),
+    CommonAreaGeneratorReading: require('./src/models/common_area_generator'),
+    BookingProperty: require('./src/models/bookingproperty'),
+    BookingReservation: require('./src/models/bookingreservation'),
+    BookingConfig: require('./src/models/bookingconfig'),
+    BookingAnalytics: require('./src/models/bookinganalytics'),
+    RevenueRecord: require('./src/models/bookingrevenuerecord')
 
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "4.6.6",
+  "version": "4.6.9",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/bookinganalytics.js

@@ -0,0 +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);
+
+module.exports = BookingAnalytics;

package/src/models/bookingconfig.js

@@ -0,0 +1,46 @@
+const mongoose = require('mongoose');
+
+// Define schema for API Configuration (for Booking.com integration if needed)
+const bookingConfigSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    apiKey: {
+        type: String,
+        required: false
+    },
+    apiSecret: {
+        type: String,
+        required: false
+    },
+    isEnabled: {
+        type: Boolean,
+        default: false
+    },
+    lastConnected: {
+        type: Date
+    },
+    settings: {
+        autoAcceptBookings: {
+            type: Boolean,
+            default: false
+        },
+        syncCalendar: {
+            type: Boolean,
+            default: true
+        },
+        defaultCommission: {
+            type: Number,
+            default: 10
+        }
+    }
+}, {
+    timestamps: true
+});
+
+// Create model from schema
+const BookingConfig = mongoose.model('BookingConfig', bookingConfigSchema);
+
+module.exports = BookingConfig;

package/src/models/bookingproperty.js

@@ -0,0 +1,113 @@
+const mongoose = require('mongoose');
+
+// Define the schema for Booking Properties (listing configuration)
+const bookingPropertySchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    division: {
+        type: String,
+        required: false
+    },
+    description: {
+        type: String,
+        required: false
+    },
+    amenities: [{
+        type: String
+    }],
+    basePrice: {
+        type: Number,
+        required: true
+    },
+    currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: true
+    },
+    weekendPriceAdjustment: {
+        type: Number,
+        default: 0
+    },
+    minimumStay: {
+        type: Number,
+        default: 1
+    },
+    maximumStay: {
+        type: Number,
+        default: 30
+    },
+    advanceBookingDays: {
+        type: Number,
+        default: 0
+    },
+    cancellationPolicy: {
+        type: String,
+        enum: ['Flexible', 'Moderate', 'Strict'],
+        default: 'Moderate'
+    },
+    isListed: {
+        type: Boolean,
+        default: false
+    },
+    commission: {
+        type: Number,
+        required: true,
+        default: 10 // Default commission percentage
+    },
+    blockedDates: [{
+        startDate: {
+            type: Date,
+            required: true
+        },
+        endDate: {
+            type: Date,
+            required: true
+        },
+        reason: {
+            type: String,
+            enum: ['Reservation', 'Renovation', 'Owner Use'],
+            required: true
+        },
+        notes: {
+            type: String
+        }
+    }],
+    // For seasonal pricing or custom date ranges
+    specialPricing: [{
+        startDate: {
+            type: Date,
+            required: true
+        },
+        endDate: {
+            type: Date,
+            required: true
+        },
+        price: {
+            type: Number,
+            required: true
+        },
+        name: {
+            type: String
+        }
+    }],
+    status: {
+        type: String,
+        enum: ['Active', 'Inactive', 'Pending Approval'],
+        default: 'Active'
+    }
+}, {
+    timestamps: true
+});
+
+// Create model from schema
+const BookingProperty = mongoose.model('BookingProperty', bookingPropertySchema);
+
+module.exports = BookingProperty;

package/src/models/bookingreservation.js

@@ -0,0 +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: true
+    },
+    totalAmount: {
+        type: Number,
+        required: true
+    },
+    commission: {
+        type: Number,
+        required: true
+    },
+    landlordAmount: {
+        type: Number,
+        required: true
+    },
+    currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: true
+    },
+    paymentMethod: {
+        type: String,
+        enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
+        required: true
+    },
+    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

@@ -0,0 +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);
+
+module.exports = RevenueRecord;

package/src/models/common_area_electricity.js

@@ -0,0 +1,41 @@
+const mongoose = require('mongoose');
+
+const commonAreaElectricityReadingSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true
+  },
+  date: {
+    type: Date,
+    required: true,
+    default: Date.now
+  },
+  location: {
+    type: String,
+    enum: ['Common Area', 'Lift', 'Pumps'],
+    required: true,
+    trim: true
+  },
+  openingReadingKWh: {
+    type: Number,
+    required: true
+  },
+  closingReadingKWh: {
+    type: Number,
+    required: true
+  },
+  consumptionKWh: {
+    type: Number,
+    required: true
+  },
+  total: {
+    type: Number
+  }
+}, {
+  timestamps: true
+});
+
+const CommonAreaElectricityReading = mongoose.model('CommonAreaElectricityReading', commonAreaElectricityReadingSchema);
+module.exports = CommonAreaElectricityReading;

package/src/models/common_area_generator.js

@@ -0,0 +1,38 @@
+const mongoose = require('mongoose');
+
+const commonAreaGeneratorReadingSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true
+  },
+  date: {
+    type: Date,
+    required: true
+  },
+  openingReadingHrs: {
+    type: Number,
+    required: true
+  },
+  closingReadingHrs: {
+    type: Number,
+    required: true
+  },
+  totalHrsRun: {
+    type: Number,
+    required: true
+  },
+  fuelLevel: {
+    type: String,
+    trim: true
+  },
+  refillAmountLiters: {
+    type: Number
+  }
+}, {
+  timestamps: true
+});
+
+const CommonAreaGeneratorReading = mongoose.model('CommonAreaGeneratorReading', commonAreaGeneratorReadingSchema);
+module.exports = CommonAreaGeneratorReading;

package/src/models/common_area_water.js

@@ -0,0 +1,39 @@
+const mongoose = require('mongoose');
+
+const commonAreaWaterReadingSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true
+  },
+  date: {
+    type: Date,
+    required: true,
+    default: Date.now
+  },
+  sourceType: {
+    type: String,
+    enum: ['City Council', 'Borehole'],
+    required: true,
+    trim: true
+  },
+  openingReadingM3: {
+    type: Number,
+    required: true
+  },
+  closingReadingM3: {
+    type: Number,
+    required: true
+  },
+  consumptionM3: {
+    type: Number,
+    required: true
+  }
+}, {
+  timestamps: true
+});
+
+const CommonAreaWaterReading = mongoose.model('CommonAreaWaterReading', commonAreaWaterReadingSchema);
+module.exports = CommonAreaWaterReading;
+

package/src/models/dutyroster.js

@@ -3,7 +3,7 @@ const mongoose = require('mongoose');
 const dutyRosterSchema = new mongoose.Schema({
   facilityId: {
     type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility', 
+    ref: 'Facility',
     required: true,
   },
   name: {
@@ -18,10 +18,22 @@ const dutyRosterSchema = new mongoose.Schema({
     type: String,
     required: true,
   },
-  time: {
-    type: String, 
+  startTime: {
+    type: String,
+    required: true
+  },
+  endTime: {
+    type: String,
     required: true
   },
+  approved: {
+    type: Boolean,
+    default: false
+  },
+  approvedBy: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User'
+  },
   schedule: [{
     date: {
       type: Date,

package/src/models/water_meter_daily_history.js

@@ -0,0 +1,32 @@
+const mongoose = require('mongoose');
+
+const dailyWaterMeterHistorySchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true,
+        index: true
+    },
+    date: {
+        type: Date,
+        required: true,
+        index: true
+    },
+    reading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    timeStamps: {
+        type: [Date],
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+dailyWaterMeterHistorySchema.index({ meterId: 1, date: 1 });
+
+const DailyWaterMeterHistory = mongoose.model('DailyWaterMeterHistory', dailyWaterMeterHistorySchema);
+
+module.exports = DailyWaterMeterHistory;

package/src/models/water_meter_monthly_history.js

@@ -0,0 +1,38 @@
+const mongoose = require('mongoose');
+
+const monthlyWaterMeterHistorySchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true,
+        index: true
+    },
+    yearMonth: {
+        type: Number,
+        required: true
+    },
+    previousReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    currentReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    consumption: {
+        type: Number,
+        required: true,
+        min: 0,
+
+    }
+}, {
+    timestamps: true
+});
+
+monthlyWaterMeterHistorySchema.index({ meterId: 1, yearMonth: 1 });
+
+const MonthlyWaterMeterHistory = mongoose.model('MonthlyWaterMeterHistory', monthlyWaterMeterHistorySchema);
+
+module.exports = MonthlyWaterMeterHistory;

package/src/models/water_meter_single_day_history.js

@@ -0,0 +1,32 @@
+const mongoose = require('mongoose');
+
+const singleDayWaterMeterHistorySchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true,
+        index: true
+    },
+    date: {
+        type: Date,
+        required: true,
+        index: true
+    },
+    reading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    time: {
+        type: String,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+singleDayWaterMeterHistorySchema.index({ meterId: 1, date: 1 });
+
+const SingleDayWaterMeterHistory = mongoose.model('SingleDayWaterMeterHistory', singleDayWaterMeterHistorySchema);
+
+module.exports = SingleDayWaterMeterHistory;

package/src/models/water_meters.js

@@ -62,21 +62,11 @@ const waterMeterSchema = new mongoose.Schema({
         type: Date,
         default: Date.now
     },
-    readingHistory: [{
-        previousReading: Number,
-        currentReading: Number,
-        readingDate: {
-            type: Date,
-            default: Date.now
-        },
-        readBy: String,
-        consumption: Number
-    }],
     status: {
         type: String,
         required: true,
-        enum: ['open', 'closed', 'maintenance', 'faulty'],
-        default: 'open',
+        enum: ['Open', 'Closed', 'maintenance', 'faulty'],
+        default: 'Open',
     },
     customerType: { 
         type: String,