payservedb 2.6.3 → 2.6.5

package/index.js

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

package/package.json

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

package/src/models/leaseagreement.js

@@ -1,71 +1,91 @@
 const mongoose = require('mongoose');
 
+// Define the schema for Lease Agreements
 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,
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
     },
-    bankDetails: {
-      accountName: { type: String },
-      bankName: { type: String },
-      accountNumber: { type: String },
-      branch: { type: String },
+    propertyType: {
+        type: String,
+        enum: ['Residential', 'Commercial'],
+        required: true
     },
-  },
-  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 },
+    propertyAddress: {
+        type: String,
+        required: true
+    },
+    unitNumber: {
+        type: String
+    },
+    landReferenceNumber: {
+        type: String
+    },
+
+    // Parties Information
+    landlord: {
+        name: { type: String, required: true },
+        identificationNumber: { type: String },
+        address: { type: String },
+        contactPhone: { type: String },
+        contactEmail: { type: String }
+    },
+    tenant: {
+        name: { type: String, required: true },
+        identificationNumber: { type: String },
+        address: { type: String },
+        contactPhone: { type: String },
+        contactEmail: { type: String }
+    },
+
+    // Lease Terms
+    leaseTerms: {
+        startDate: { type: Date, required: true },
+        endDate: { type: Date, required: true },
+        duration: { type: Number, required: true }, // in months
+        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 }
+    },
+
+    serviceCharge: {
+        amount: { type: Number },
+        description: { type: String }
+    },
+
+    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'] }
+    },
+
+    status: {
+        type: String,
+        enum: ['Active', 'Pending', 'Expired', 'Terminated'],
+        default: 'Pending'
+    },
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    }
+}, {
+    timestamps: true 
 });
 
 const LeaseAgreement = mongoose.model('LeaseAgreement', leaseAgreementSchema);

package/src/models/workorder.js

@@ -0,0 +1,30 @@
+const mongoose = require('mongoose');
+
+const workOrderSchema = new mongoose.Schema({
+    workDescription: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    assignedTo: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    status: {
+      type: String,
+      enum: ['in progress', 'completed', 'suspended', 'pending' , 'cancelled'],
+      default: 'pending',
+    },
+    payment: {
+      type: Number,
+      required: true,
+      min: 0,
+    },
+  }, {
+    timestamps: true, 
+  });
+  
+  const WorkOrder = mongoose.model('WorkOrder', workOrderSchema);
+  
+  module.exports = WorkOrder;