payservedb 6.5.2 → 6.5.3

package/package.json

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

package/src/models/asset.js

@@ -1,35 +1,92 @@
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 
-const assetSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility', 
-    required: true,
+const inspection_certificate = new mongoose.Schema(
+  {
+    dateInspected: {
+      type: Date,
+      required: true,
+    },
+    status: {
+      type: String,
+      enum: ["Passed", "Failed", "Pending"],
+      required: true,
+    },
+    certificate: {
+      type: String,
+      required: true,
+    },
   },
-  name: {
-    type: String,
-    required: true,
-  },
-  serialNumber: {
-    type: String,
-    unique: true, 
-    required: true,
+  { _id: false },
+);
+
+const documents = new mongoose.Schema(
+  {
+    name: {
+      type: String,
+      required: true,
+    },
+    type: {
+      type: String,
+      enum: ["PDF", "Image", "Video"],
+      required: true,
+    },
+    url: {
+      type: String,
+      required: true,
+    },
   },
-  dateBought: {
-    type: String, // Year or full date, e.g., '2023' or '2023-01-01'
-    required: true,
+  { _id: false },
+);
+
+const assetSchema = new mongoose.Schema(
+  {
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    location: {
+      type: String,
+      required: true,
+    },
+    inspection_certificate: [
+      {
+        type: inspection_certificate,
+        required: false,
+      },
+    ],
+    documents: [
+      {
+        type: documents,
+        required: false,
+      },
+    ],
+    serialNumber: {
+      type: String,
+      unique: true,
+      required: true,
+    },
+    dateBought: {
+      type: String,
+      required: true,
+    },
+    insuranceStatus: {
+      type: String,
+      enum: ["Insured", "Not Insured", "Expired"],
+      required: true,
+    },
+    assigned: {
+      type: Boolean,
+      default: false,
+    },
   },
-  insuranceStatus: {
-    type: String,
-    enum: ['Insured', 'Not Insured', 'Expired'], 
-    required: true,
+  {
+    timestamps: true,
   },
-  assigned: {
-    type: Boolean,
-    default: false
-  }
-}, {
-  timestamps: true, 
-});
+);
 
-module.exports = mongoose.model('Asset', assetSchema);
+module.exports = mongoose.model("Asset", assetSchema);

package/src/models/leaseagreement.js

@@ -26,13 +26,10 @@ const leaseAgreementSchema = new mongoose.Schema({
         ref: 'Customer',
         required: true
     },
-    
-    // *** NEW FIELD: Add billing address support ***
-    billerAddressId: {
+     billerAddressId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'BillerAddress'
     },
-    
     // GL Account configurations
     invoiceDoubleEntryAccount: {
         type: mongoose.Schema.Types.ObjectId,
@@ -99,28 +96,6 @@ const leaseAgreementSchema = new mongoose.Schema({
             type: mongoose.Schema.Types.ObjectId,
             ref: 'Penalty'
         },
-        
-        // *** ENHANCED: Add payment configuration flags ***
-        bankPayment: {
-            type: Boolean,
-            default: false
-        },
-        mobilePayment: {
-            type: Boolean,
-            default: false
-        },
-        
-        // *** ENHANCED: Add structured payment method references ***
-        bankAccountId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'BankAccount'
-        },
-        paymentMethodId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'PaymentMethod'
-        },
-        
-        // Existing M-Pesa fields (keep for backward compatibility)
         mpesaEnabled: {
             type: Boolean,
             default: false
@@ -130,7 +105,6 @@ const leaseAgreementSchema = new mongoose.Schema({
             accountNumber: String,
             phoneNumber: String
         },
-        
         escalations: [{
             _id: { type: mongoose.Schema.Types.ObjectId, auto: true },
             effectiveDate: { type: Date, required: true },

package/src/models/water_invoice.js

@@ -37,6 +37,30 @@ const waterInvoiceSchema = new mongoose.Schema(
       default: 0
     },
 
+    // PAYMENTS
+    paymentMethods: {
+      mobilePayment: {
+        status: {
+          type: Boolean,
+          default: false
+        },
+        paymentId: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: 'FacilityPaymentDetails'
+        }
+      },
+      bankPayment: {
+        status: {
+          type: Boolean,
+          default: false
+        },
+        paymentId: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: 'BankDetails'
+        }
+      }
+    },
+
     // Biller Address Information (added from WaterMeterSettings)
     billerAddress: {
       name: {