payservedb 4.4.7 → 4.4.8

package/src/models/leaseagreement.js

@@ -1,168 +1,157 @@
-const mongoose = require('mongoose');
-
-const leaseAgreementSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    currency: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Currency',
-        required: true
-    },
-    unitNumber: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    tenant: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-        required: true
-    },
-    landlord: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-        required: true
-    },
-    leaseTerms: {
-        startDate: { type: Date, required: true },
-        endDate: { type: Date, required: true },
-        duration: { type: Number, required: true },
-        autoRenewal: { type: Boolean, default: false }
-    },
-    financialTerms: {
-        monthlyRent: { type: Number, required: true },
-        paymentDueDate: { type: Number, required: true },
-        paymentMethods: [{
-            type: {
-                type: String,
-                required: true,
-                enum: ['Bank Transfer', 'Cash', 'Cheque']
-            },
-            details: {
-                bankName: String,
-                accountName: String,
-                accountNumber: String,
-                branch: String,
-                swiftCode: String,
-                bankToDraft: String,
-                chequeAccountNumber: String,
-                preferredCashLocation: String
-            },
-            isPrimary: { type: Boolean, default: false }
-        }],
-        securityDeposit: { type: Number, required: true },
-        depositMonths: { type: Number, required: true }, // New field to specify deposit months
-        balanceBroughtForward: { type: Number, required: true, default: 0 },
-        penaltyId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Penalty'
-        },
-        mpesaEnabled: {
-            type: Boolean,
-            default: false
-        },
-        mpesaDetails: {
-            businessNumber: String,
-            accountNumber: String,
-            phoneNumber: String
-        }
-    },
-    billingCycle: {
-        frequency: {
-            type: String,
-            enum: ['Monthly', 'Quarterly', 'Annually'],
-            required: true
-        },
-        nextInvoiceDate: { type: Date },
-        autoSend: { type: Boolean, default: false }
-    },
-    invoices: [
-        { type: mongoose.Schema.Types.ObjectId, ref: 'Invoice' }
-    ],
-    leaseTemplate: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'LeaseTemplate',
-        required: true
-    },
-    leaseDocuments: [
-        {
-            fileName: { type: String },
-            fileUrl: { type: String },
-            uploadedAt: { type: Date, default: Date.now }
-        }
-    ],
-    reminders: [
-        {
-            reminderId: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'Reminder'
-            },
-            status: {
-                type: String,
-                enum: ['Pending', 'Sent'],
-                default: 'Pending'
-            }
-        }
-    ],
-    status: {
-        type: String,
-        enum: ['Active', 'Pending', 'Expired', 'Terminated'],
-        default: 'Active'
-    },
-    // New field for landlord approval
-    requireLandlordApproval: {
-        type: Boolean,
-        default: false
-    },
-    landlordApprovalStatus: {
-        type: String,
-        enum: ['Pending', 'Approved', 'Rejected'],
-        default: 'Pending'
-    },
-    payments: [
-        {
-            invoiceId: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'Invoice',
-                required: true
-            },
-            method: {
-                type: {
-                    type: String,
-                    enum: ['Bank Transfer', 'Cash', 'Cheque', 'MPESA'],
-                    required: true
-                },
-                details: {
-                    bankName: String,
-                    accountNumber: String,
-                    transactionId: String,
-                    chequeNumber: String,
-                    mpesaTransactionId: String,
-                    mpesaPhoneNumber: String
-                }
-            },
-            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
-});
-
-leaseAgreementSchema.index({ facilityId: 1 });
-
-const LeaseAgreement = mongoose.model('LeaseAgreement', leaseAgreementSchema);
-
+const mongoose = require('mongoose');
+
+const leaseAgreementSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    currency: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: true
+    },
+    unitNumber: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    tenant: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+        required: true
+    },
+    landlord: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+        required: true
+    },
+    leaseTerms: {
+        startDate: { type: Date, required: true },
+        endDate: { type: Date, required: true },
+        duration: { type: Number, required: true },
+        autoRenewal: { type: Boolean, default: false }
+    },
+    financialTerms: {
+        monthlyRent: { type: Number, required: true },
+        paymentDueDate: { type: Number, required: true },
+        paymentMethods: [{
+            type: {
+                type: String,
+                required: true,
+                enum: ['Bank Transfer', 'Cash', 'Cheque']
+            },
+            details: {
+                bankName: String,
+                accountName: String,
+                accountNumber: String,
+                branch: String,
+                swiftCode: String,
+                bankToDraft: String,
+                chequeAccountNumber: String,
+                preferredCashLocation: String
+            },
+            isPrimary: { type: Boolean, default: false }
+        }],
+        securityDeposit: { type: Number, required: true },
+        balanceBroughtForward: { type: Number, required: true, default: 0 },
+        penaltyId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Penalty'
+        },
+        mpesaEnabled: {
+            type: Boolean,
+            default: false
+        },
+        mpesaDetails: {
+            businessNumber: String,
+            accountNumber: String,
+            phoneNumber: String
+        }
+    },
+    billingCycle: {
+        frequency: {
+            type: String,
+            enum: ['Monthly', 'Quarterly', 'Annually'],
+            required: true
+        },
+        nextInvoiceDate: { type: Date },
+        autoSend: { type: Boolean, default: false }
+    },
+    invoices: [
+        { type: mongoose.Schema.Types.ObjectId, ref: 'Invoice' }
+    ],
+    leaseTemplate: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'LeaseTemplate',
+        required: true
+    },
+    leaseDocuments: [
+        {
+            fileName: { type: String },
+            fileUrl: { type: String },
+            uploadedAt: { type: Date, default: Date.now }
+        }
+    ],
+    reminders: [
+        {
+            reminderId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'Reminder'
+            },
+            status: {
+                type: String,
+                enum: ['Pending', 'Sent'],
+                default: 'Pending'
+            }
+        }
+    ],
+    status: {
+        type: String,
+        enum: ['Active', 'Pending', 'Expired', 'Terminated'],
+        default: 'Active'
+    },
+    payments: [
+        {
+            invoiceId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'Invoice',
+                required: true
+            },
+            method: {
+                type: {
+                    type: String,
+                    enum: ['Bank Transfer', 'Cash', 'Cheque', 'MPESA'],
+                    required: true
+                },
+                details: {
+                    bankName: String,
+                    accountNumber: String,
+                    transactionId: String,
+                    chequeNumber: String,
+                    mpesaTransactionId: String,
+                    mpesaPhoneNumber: String
+                }
+            },
+            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
+});
+
+leaseAgreementSchema.index({ facilityId: 1 });
+
+const LeaseAgreement = mongoose.model('LeaseAgreement', leaseAgreementSchema);
+
 module.exports = LeaseAgreement;

package/src/models/leasetemplate.js

@@ -1,18 +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 },
-    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);
-
+const mongoose = require("mongoose");
+
+const LeaseTemplateSchema = new mongoose.Schema({
+    name: { type: String, required: true },
+    description: { type: String, required: true },
+    templateContent: { 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);
+
   

package/src/models/levy.js

@@ -1,73 +1,73 @@
-const mongoose = require("mongoose");
-
-// Define the schema for Levy
-const levySchema = new mongoose.Schema(
-  {
-    levyName: {
-      type: String,
-      required: true,
-      trim: true,
-      minlength: [1, "Levy name must be at least 1 character long"],
-    },
-    levyType: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "LevyType",
-      required: true,
-    },
-    amount: {
-      type: Number,
-      required: true,
-      min: [0, "Amount must be a positive number"],
-    },
-    dueDate: {
-      type: String,
-      required: true,
-    },
-    levyApplicant: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    collectionFrequency: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    invoiceDay: {
-      type: String,
-      required: true,
-    },
-    // New fields added from levy contract
-    currency: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Currency",
-      required: false,
-    },
-    mobilePayment: {
-      type: Boolean,
-      default: false,
-      required: false,
-    },
-    paymentMethodId: {
-      type: mongoose.Schema.Types.ObjectId,
-      required: false,
-    },
-    disabled: {
-      type: Boolean,
-      required: false,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// Compile the model from the schema
-const Levy = mongoose.model("Levy", levySchema);
-
+const mongoose = require("mongoose");
+
+// Define the schema for Levy
+const levySchema = new mongoose.Schema(
+  {
+    levyName: {
+      type: String,
+      required: true,
+      trim: true,
+      minlength: [1, "Levy name must be at least 1 character long"],
+    },
+    levyType: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "LevyType",
+      required: true,
+    },
+    amount: {
+      type: Number,
+      required: true,
+      min: [0, "Amount must be a positive number"],
+    },
+    dueDate: {
+      type: String,
+      required: true,
+    },
+    levyApplicant: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    collectionFrequency: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    invoiceDay: {
+      type: String,
+      required: true,
+    },
+    // New fields added from levy contract
+    currency: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Currency",
+      required: false,
+    },
+    mobilePayment: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+    paymentMethodId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: false,
+    },
+    disabled: {
+      type: Boolean,
+      required: false,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Compile the model from the schema
+const Levy = mongoose.model("Levy", levySchema);
+
 module.exports = Levy;

package/src/models/levy_invoice_settings.js

@@ -1,27 +1,27 @@
-const mongoose = require('mongoose');
-
-const InvoiceSettingsSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: [true, 'Facility ID is required']
-    },
-    termsAndConditions: {
-        type: String,
-        default: 'Payment is due within 15 days'
-    },
-    bankName: {
-        type: String,
-        required: [true, 'Bank name is required']
-    },
-    accountNumber: {
-        type: String,
-        required: [true, 'Account number is required']
-    }
-}, {
-    timestamps: true
-});
-
-const InvoiceSettings = mongoose.model('InvoiceSettings', InvoiceSettingsSchema);
-
+const mongoose = require('mongoose');
+
+const InvoiceSettingsSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: [true, 'Facility ID is required']
+    },
+    termsAndConditions: {
+        type: String,
+        default: 'Payment is due within 15 days'
+    },
+    bankName: {
+        type: String,
+        required: [true, 'Bank name is required']
+    },
+    accountNumber: {
+        type: String,
+        required: [true, 'Account number is required']
+    }
+}, {
+    timestamps: true
+});
+
+const InvoiceSettings = mongoose.model('InvoiceSettings', InvoiceSettingsSchema);
+
 module.exports = InvoiceSettings;