payservedb 2.6.9 → 2.7.1

package/package.json

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

package/src/models/leaseagreement.js

@@ -7,85 +7,80 @@ const leaseAgreementSchema = new mongoose.Schema({
         ref: 'Facility',
         required: true
     },
-    propertyType: {
-        type: String,
-        enum: ['Residential', 'Commercial'],
-        required: true
-    },
-    propertyAddress: {
-        type: String,
-        required: true
-    },
     unitNumber: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Unit',
         required: true
     },
-    landReferenceNumber: {
-        type: String
-    },
-
-    // Parties Information
-    landlord: {
-        name: { type: String, required: true },
-        identificationNumber: { type: String },
-        address: { type: String },
-        contactPhone: { type: String },
-        contactEmail: { type: String }
-    },
     tenant: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Customer',
         required: true
     },
-
-    // Lease Terms
+    landlord: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+    },
     leaseTerms: {
         startDate: { type: Date, required: true },
         endDate: { type: Date, required: true },
-        duration: { type: Number, required: true }, // in months
+        duration: { type: Number, required: true },
         autoRenewal: { type: Boolean, default: false }
     },
-
     financialTerms: {
         monthlyRent: { type: Number, required: true },
-        paymentDueDate: { type: Number, required: true }, // Day of month
-        paymentMethod: {
-            type: String,
-            enum: ['Bank Transfer', 'Mobile Money', 'Cheque', 'Cash']
-        },
-        securityDeposit: { type: Number, required: true },
-        annualRentEscalation: { type: Number, default: 0 }
+        paymentDueDate: { type: Number, required: true },
+        paymentMethod: { type: String, enum: ['Bank Transfer', 'Mobile Money', 'Cheque', 'Cash'] },
+        securityDeposit: { type: Number, required: true }
     },
-
-    serviceCharge: {
-        amount: { type: Number },
-        description: { type: String }
+    billingCycle: {
+        frequency: { type: String, enum: ['Monthly', 'Quarterly', 'Annually'], required: true },
+        nextInvoiceDate: { type: Date },
+        autoSend: { type: Boolean, default: false }
     },
-
-    maintenanceTerms: {
-        tenantResponsibilities: [String],
-        landlordResponsibilities: [String]
-    },
-
-    utilities: {
-        electricity: { type: String, enum: ['Tenant', 'Landlord'] },
-        water: { type: String, enum: ['Tenant', 'Landlord'] },
-        gas: { type: String, enum: ['Tenant', 'Landlord'] },
-        internet: { type: String, enum: ['Tenant', 'Landlord'] }
+    invoices: [
+        { type: mongoose.Schema.Types.ObjectId, ref: 'Invoice' }
+    ],
+    leaseTemplate: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'LeaseTemplate',
+        required: true // Ensures that every lease uses a valid template
     },
-
+    leaseDocuments: [
+        {
+            fileName: { type: String },
+            fileUrl: { type: String },
+            uploadedAt: { type: Date, default: Date.now }
+        }
+    ],
+    reminders: [
+        {
+            type: { type: String, enum: ['SMS', 'Email', 'WhatsApp'], required: true },
+            scheduledDate: { type: Date, required: true },
+            status: { type: String, enum: ['Pending', 'Sent'], default: 'Pending' }
+        }
+    ],
     status: {
         type: String,
         enum: ['Active', 'Pending', 'Expired', 'Terminated'],
-        default: 'Pending'
+        default: 'Active'
     },
+    payments: [
+        {
+            invoiceId: { type: mongoose.Schema.Types.ObjectId, ref: 'Invoice', required: true },
+            method: { type: String, enum: ['Cash', 'Bank Transfer'], required: true },
+            amount: { type: Number, required: true },
+            receivedBy: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true },
+            receivedAt: { type: Date, default: Date.now }
+        }
+    ],
     createdBy: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'User'
     }
 }, {
-    timestamps: true 
+    timestamps: true
 });
 
 const LeaseAgreement = mongoose.model('LeaseAgreement', leaseAgreementSchema);

package/src/models/leasetemplate.js

@@ -1,13 +1,18 @@
 const mongoose = require("mongoose");
 
-
 const LeaseTemplateSchema = new mongoose.Schema({
     name: { type: String, required: true },
     description: { type: String, required: true },
     templateContent: { type: String, required: true },
-    createdBy: { type: String, required: true },
+    leaseAgreementId: { 
+        type: mongoose.Schema.Types.ObjectId, 
+        ref: 'LeaseAgreement', 
+        required: false 
+    },
+    createdBy: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true },
     createdAt: { type: Date, default: Date.now },
-  });
-  
-  module.exports = mongoose.model('LeaseTemplate', LeaseTemplateSchema);
+});
+
+module.exports = mongoose.model('LeaseTemplate', LeaseTemplateSchema);
+