payservedb 2.6.1 → 2.6.3

package/index.js

@@ -86,7 +86,8 @@ const models = {
     Stocksandspare:require('./src/models/stocksandspare'),
     ServiceVendor:require('./src/models/servicevendor'),
     MaintenanceService:require('./src/models/maintenanceservice'),
-    Requisition:require('./src/models/maintenancerequisition')
+    Requisition:require('./src/models/maintenancerequisition'),
+    LeaseAgreement:require('./src/models/leaseagreement')
     
 };
 

package/package.json

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

package/src/models/lease.js

@@ -1,32 +1,77 @@
 const mongoose = require("mongoose");
 
 const LeaseSchema = new mongoose.Schema({
-    customerId: { type: mongoose.Schema.Types.ObjectId, ref: 'Customer', required: true },
-    startDate: { type: Date, required: true },
-    endDate: { type: Date, required: true },
-    facilityId: { type: mongoose.Schema.Types.ObjectId, ref: 'Facility', required: true },
-    rentValue: { type: Number, required: true, min: 0 },
-    paymentFrequency: { 
-      type: String, 
-      enum: ['monthly', 'quarterly', 'annually'], 
-      required: true 
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+        required: true
+    },
+    propertyManagerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User', 
+        required: true
+    },
+    startDate: {
+        type: Date,
+        required: true
+    },
+    endDate: {
+        type: Date,
+        required: true
+    },
+    rentValue: {
+        type: Number,
+        required: true,
+        min: 0
     },
     levies: [{
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Levy'
-  }],
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Levy'
+    }],
+    securityDeposit: {
+        type: Number
+    },
+    responsibilities: {
+        type: String
+    },
     penalties: [{
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Penalty'
-  }],
-    status: { 
-      type: String, 
-      enum: ['active', 'expired', 'terminated', 'draft'], 
-      required: true 
-    },
-    templateId: { type: mongoose.Schema.Types.ObjectId, ref: 'LeaseTemplate', required: true },
-    signedCopyUrl: { type: String, match: /^https?:\/\/.*/, required: false },
-    unsignedCopyUrl: { type: String, match: /^https?:\/\/.*/, required: false },
-  });
-  
-  module.exports = mongoose.model('Lease', LeaseSchema);
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Penalty'
+    }],
+    paymentFrequency: {
+        type: String,
+        enum: ['monthly', 'quarterly', 'annually'],
+        required: true
+    },
+    status: {
+        type: String,
+        enum: ['active', 'expired', 'terminated', 'draft'],
+        required: true
+    },
+    templateId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'LeaseTemplate',
+        required: true
+    },
+    signedCopy: {
+        type: String
+    },
+    unsignedCopyUrl: {
+        type: String,
+        match: /^https?:\/\/.*/, 
+        required: false
+    },
+    createdAt: {
+        type: Date,
+        default: Date.now
+    }
+});
+
+const Lease = mongoose.model('Lease', LeaseSchema);
+
+module.exports = Lease;

package/src/models/leaseagreement.js

@@ -0,0 +1,73 @@
+const mongoose = require('mongoose');
+
+const leaseAgreementSchema = new mongoose.Schema({
+  landlord: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User', 
+    required: true,
+  },
+  tenant: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Customer', 
+    required: true,
+  },
+  premises: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility', 
+    required: true,
+  },
+  term: {
+    commencementDate: { type: Date, required: true },
+    expirationDate: { type: Date, required: true },
+    duration: { type: Number, required: true },
+  },
+  rent: {
+    monthlyAmount: { type: Number, required: true },
+    dueDate: { type: Number, required: true }, 
+    paymentMethod: {
+      type: String,
+      enum: ['Bank Transfer', 'Mobile Money', 'Cheque', 'Cash'],
+      required: true,
+    },
+    bankDetails: {
+      accountName: { type: String },
+      bankName: { type: String },
+      accountNumber: { type: String },
+      branch: { type: String },
+    },
+  },
+  securityDeposit: {
+    amount: { type: Number, required: true },
+    equivalentMonths: { type: Number, required: true },
+    interest: { type: Boolean, default: false },
+  },
+  maintenance: {
+    tenantResponsibilities: { type: String },
+    landlordResponsibilities: { type: String },
+    repairLimits: { type: Number }, 
+  },
+  utilities: {
+    electricity: { type: String, enum: ['Tenant', 'Landlord'], required: true },
+    water: { type: String, enum: ['Tenant', 'Landlord'], required: true },
+    gas: { type: String, enum: ['Tenant', 'Landlord'] },
+    internet: { type: String, enum: ['Tenant', 'Landlord'] },
+    garbageCollection: { type: String, enum: ['Tenant', 'Landlord'] },
+  },
+  additionalTerms: {
+    insurance: { type: String },
+    governingLaw: { type: String },
+    terminationConditions: { type: String },
+    disputeResolution: { type: String },
+  },
+  schedules: {
+    scheduleA: { type: String }, 
+    scheduleB: { type: String }, 
+    scheduleC: { type: String }, 
+  },
+  createdAt: { type: Date, default: Date.now },
+  updatedAt: { type: Date, default: Date.now },
+});
+
+const LeaseAgreement = mongoose.model('LeaseAgreement', leaseAgreementSchema);
+
+module.exports = LeaseAgreement;