payservedb 5.0.3 → 5.0.5

package/src/models/item_inspection.js

@@ -1,68 +1,68 @@
-const mongoose = require('mongoose');
-
-// Define the schema for inspection items
-const inspectionItemSchema = new mongoose.Schema({
-  name: {
-    type: String,
-    required: [true, 'Item name is required'],
-    trim: true
-  },
-  category: {
-    type: String,
-    required: [true, 'Category is required'],
-    trim: true
-  },
-  subcategory: {
-    type: String,
-    trim: true,
-    default: null
-  },
-  description: {
-    type: String,
-    trim: true
-  },
-  possibleConditions: {
-    type: [String],
-    default: ['Excellent', 'Good', 'Fair', 'Poor', 'Damaged', 'Non-functional'],
-    validate: {
-      validator: function(v) {
-        return v.length > 0;
-      },
-      message: 'At least one possible condition is required'
-    }
-  },
-  defaultCondition: {
-    type: String,
-    default: 'Good'
-  },
-  isRequired: {
-    type: Boolean,
-    default: true
-  },
-  defaultQuantity: {
-    type: Number,
-    default: 1,
-    min: [1, 'Default quantity must be at least 1']
-  },
-  active: {
-    type: Boolean,
-    default: true
-  },
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true
-  }
-}, { 
-  timestamps: true 
-});
-
-// Add indexes for common queries
-inspectionItemSchema.index({ facilityId: 1 });
-inspectionItemSchema.index({ facilityId: 1, category: 1 });
-inspectionItemSchema.index({ facilityId: 1, active: 1 });
-
-// Create InspectionItem model
-const InspectionItem = mongoose.model('InspectionItem', inspectionItemSchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for inspection items
+const inspectionItemSchema = new mongoose.Schema({
+  name: {
+    type: String,
+    required: [true, 'Item name is required'],
+    trim: true
+  },
+  category: {
+    type: String,
+    required: [true, 'Category is required'],
+    trim: true
+  },
+  subcategory: {
+    type: String,
+    trim: true,
+    default: null
+  },
+  description: {
+    type: String,
+    trim: true
+  },
+  possibleConditions: {
+    type: [String],
+    default: ['Excellent', 'Good', 'Fair', 'Poor', 'Damaged', 'Non-functional'],
+    validate: {
+      validator: function(v) {
+        return v.length > 0;
+      },
+      message: 'At least one possible condition is required'
+    }
+  },
+  defaultCondition: {
+    type: String,
+    default: 'Good'
+  },
+  isRequired: {
+    type: Boolean,
+    default: true
+  },
+  defaultQuantity: {
+    type: Number,
+    default: 1,
+    min: [1, 'Default quantity must be at least 1']
+  },
+  active: {
+    type: Boolean,
+    default: true
+  },
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true
+  }
+}, { 
+  timestamps: true 
+});
+
+// Add indexes for common queries
+inspectionItemSchema.index({ facilityId: 1 });
+inspectionItemSchema.index({ facilityId: 1, category: 1 });
+inspectionItemSchema.index({ facilityId: 1, active: 1 });
+
+// Create InspectionItem model
+const InspectionItem = mongoose.model('InspectionItem', inspectionItemSchema);
+
 module.exports = InspectionItem;

package/src/models/leaseagreement.js

@@ -1,169 +1,170 @@
-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 }
-        }
-    ],
-    // New field to track lease edit history
-    editHistory: [
-        {
-            editedBy: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'User'
-            },
-            editedAt: { type: Date, default: Date.now },
-            reason: { type: String, required: true },
-            changes: { type: Object } // Optional: Store what fields were changed
-        }
-    ],
-    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 }
+    },
+    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']
+            },
+            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 }
+        }
+    ],
+    // New field to track lease edit history
+    editHistory: [
+        {
+            editedBy: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'User'
+            },
+            editedAt: { type: Date, default: Date.now },
+            reason: { type: String, required: true },
+            changes: { type: Object } // Optional: Store what fields were changed
+        }
+    ],
+    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);
+