payservedb 8.3.3 → 8.3.4

package/src/models/leaseagreement.js

@@ -1,244 +1,237 @@
-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
-    },
-    billerAddressId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BillerAddress'
-    },
-    // Reference to BankDetails instead of storing bank info directly
-    bankDetails: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BankDetails'
-    },
-    // GL Account configurations
-    invoiceDoubleEntryAccount: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'GLAccountDoubleEntries'
-    },
-    paymentDoubleEntryAccount: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'GLAccountDoubleEntries'
-    },
-    // GL Account direct configurations (used when creating double entry records)
-    glAccounts: {
-        invoice: {
-            debit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'GLAccount'
-            },
-            credit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'GLAccount'
-            }
-        },
-        payment: {
-            debit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'GLAccount'
-            },
-            credit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'GLAccount'
-            }
-        }
-    },
-    leaseTerms: {
-        startDate: { type: Date, required: true },
-        endDate: { type: Date, required: true },
-        duration: { type: Number, required: true },
-        autoRenewal: { type: Boolean, default: false }
-    },
-    isNewTenant: { 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']
-            },
-            // Reference bank details ID instead of storing bank info
-            bankDetailsId: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'BankDetails'
-            },
-            // Keep other payment method details for non-bank methods
-            details: {
-                // For non-bank payment methods
-                bankToDraft: String,
-                chequeAccountNumber: String,
-                preferredCashLocation: String,
-                // For mobile money
-                provider: String,
-                phoneNumber: String,
-                accountName: 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
-        },
-        escalations: [{
-            _id: { type: mongoose.Schema.Types.ObjectId, auto: true },
-            effectiveDate: { type: Date, required: true },
-            type: {
-                type: String,
-                enum: ['percentage', 'fixed'],
-                required: true
-            },
-            value: { type: Number, required: true },
-            status: {
-                type: String,
-                enum: ['scheduled', 'applied', 'cancelled'],
-                default: 'scheduled'
-            }
-        }]
-    },
-    // ... rest of the schema remains the same
-    billingCycle: {
-        frequency: {
-            type: String,
-            enum: ['Monthly', 'Quarterly', 'Annually'],
-            required: true
-        },
-        nextInvoiceDate: { type: Date },
-        autoSend: { type: Boolean, default: false },
-        lastInvoiceDate: { type: Date }
-    },
-    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'
-    },
-    requireLandlordApproval: {
-        type: Boolean,
-        default: false
-    },
-    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 }
-        }
-    ],
-    // New field to track lease edit history
-    editHistory: [
-        {
-            editedBy: {
-                type: mongoose.Schema.Types.Mixed,
-                ref: 'User'
-            },
-            editedAt: { type: Date, default: Date.now },
-            reason: { type: String, required: true },
-            changes: { type: Object }
-        }
-    ],
-    createdBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    },
-    lastInvoiceYearMonth: {
-        type: String,
-        default: null
-        // Format: "2025-09", "2025-10", etc.
-    }
-}, {
-    timestamps: true
-});
-
-leaseAgreementSchema.index({ facilityId: 1 });
-leaseAgreementSchema.index({ lastInvoiceYearMonth: 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
+    },
+    billerAddressId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BillerAddress'
+    },
+    // Reference to BankDetails instead of storing bank info directly
+    bankDetails: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BankDetails'
+    },
+    // GL Account configurations
+    invoiceDoubleEntryAccount: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'GLAccountDoubleEntries'
+    },
+    paymentDoubleEntryAccount: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'GLAccountDoubleEntries'
+    },
+    // GL Account direct configurations (used when creating double entry records)
+    glAccounts: {
+        invoice: {
+            debit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'GLAccount'
+            },
+            credit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'GLAccount'
+            }
+        },
+        payment: {
+            debit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'GLAccount'
+            },
+            credit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'GLAccount'
+            }
+        }
+    },
+    leaseTerms: {
+        startDate: { type: Date, required: true },
+        endDate: { type: Date, required: true },
+        duration: { type: Number, required: true },
+        autoRenewal: { type: Boolean, default: false }
+    },
+    isNewTenant: { 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', 'Mobile Money']
+            },
+            // Reference bank details ID instead of storing bank info
+            bankDetailsId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'BankDetails'
+            },
+            // Keep other payment method details for non-bank methods
+            details: {
+                // For non-bank payment methods
+                bankToDraft: String,
+                chequeAccountNumber: String,
+                preferredCashLocation: String,
+                // For mobile money
+                provider: String,
+                businessNumber: String,
+                phoneNumber: String,
+                accountName: String
+            },
+            isPrimary: { type: Boolean, default: false }
+        }],
+        securityDeposit: { type: Number, required: true },
+        balanceBroughtForward: { type: Number, required: true, default: 0 },
+        taxEnabled: { type: Boolean, default: true },
+        penaltyId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Penalty'
+        },
+        escalations: [{
+            _id: { type: mongoose.Schema.Types.ObjectId, auto: true },
+            effectiveDate: { type: Date, required: true },
+            type: {
+                type: String,
+                enum: ['percentage', 'fixed'],
+                required: true
+            },
+            value: { type: Number, required: true },
+            status: {
+                type: String,
+                enum: ['scheduled', 'applied', 'cancelled'],
+                default: 'scheduled'
+            }
+        }]
+    },
+    // ... rest of the schema remains the same
+    billingCycle: {
+        frequency: {
+            type: String,
+            enum: ['Monthly', 'Quarterly', 'Annually'],
+            required: true
+        },
+        nextInvoiceDate: { type: Date },
+        autoSend: { type: Boolean, default: false },
+        lastInvoiceDate: { type: Date }
+    },
+    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'
+    },
+    requireLandlordApproval: {
+        type: Boolean,
+        default: false
+    },
+    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 }
+        }
+    ],
+    // New field to track lease edit history
+    editHistory: [
+        {
+            editedBy: {
+                type: mongoose.Schema.Types.Mixed,
+                ref: 'User'
+            },
+            editedAt: { type: Date, default: Date.now },
+            reason: { type: String, required: true },
+            changes: { type: Object }
+        }
+    ],
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    },
+    lastInvoiceYearMonth: {
+        type: String,
+        default: null
+        // Format: "2025-09", "2025-10", etc.
+    }
+}, {
+    timestamps: true
+});
+
+leaseAgreementSchema.index({ facilityId: 1 });
+leaseAgreementSchema.index({ lastInvoiceYearMonth: 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);
+