payservedb 3.7.1 → 3.7.3

package/index.js

@@ -121,7 +121,8 @@ const models = {
     InvoiceSettings: require('./src/models/levy_invoice_settings'),
     Account: require('./src/models/account'),
     FacilityPaymentDetails: require('./src/models/facility_payment_details'),
-    DefaultPaymentDetails: require('./src/models/default_payment_details')
+    DefaultPaymentDetails: require('./src/models/default_payment_details'),
+    UserAccount: require('./src/models/user_account')
 
 
 };

package/package.json

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

package/src/models/invoice.js

@@ -1,6 +1,5 @@
 const mongoose = require("mongoose");
 
-// Define the schema for Invoice
 const invoiceSchema = new mongoose.Schema(
   {
     invoiceNumber: {
@@ -14,9 +13,19 @@ const invoiceSchema = new mongoose.Schema(
       unique: true,
     },
     client: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Customer",
-      required: true,
+      clientId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "Customer",
+        required: true,
+      },
+      firstName: {
+        type: String,
+        required: true
+      },
+      lastName: {
+        type: String,
+        required: true
+      }
     },
     facility: {
       id: {
@@ -48,6 +57,16 @@ const invoiceSchema = new mongoose.Schema(
       type: Number,
       required: true,
     },
+    amountPaid: {
+      type: Number,
+      default: 0,
+      min: 0,
+    },
+    overpay: {
+      type: Number,
+      default: 0,
+      min: 0,
+    },
     issueDate: {
       type: Date,
       required: true,
@@ -81,6 +100,21 @@ const invoiceSchema = new mongoose.Schema(
         notificationTypes: [String],
       },
     ],
+    reconciliationHistory: [{
+      date: { type: Date, required: true },
+      amount: { type: Number, required: true },
+      type: {
+        type: String,
+        enum: ['payment', 'overpay-transfer', 'balance-deduction', 'overpay-received'],
+        required: true
+      },
+      sourceInvoice: String,
+      destinationInvoice: String,
+      paymentReference: String,
+      paymentCompletion: String,
+      remainingBalance: Number,
+      notes: String
+    }],
     paymentDetails: {
       paymentStatus: { type: String, required: true },
       paymentMethod: { type: String },
@@ -93,6 +127,18 @@ const invoiceSchema = new mongoose.Schema(
   }
 );
 
-const Invoice = mongoose.model("Invoice", invoiceSchema);
+// Add indexes for frequently queried fields
+invoiceSchema.index({ accountNumber: 1 });
+invoiceSchema.index({ status: 1 });
+invoiceSchema.index({ 'client.clientId': 1, status: 1 });
+invoiceSchema.index({ 'reconciliationHistory.paymentReference': 1 });
+invoiceSchema.index({ issueDate: -1 });
+
+// Add virtual field for calculating balance
+invoiceSchema.virtual('calculatedBalance').get(function () {
+  return this.totalAmount - (this.amountPaid || 0);
+});
+
+const Invoice = mongoose.model('Invoice', invoiceSchema);
 
 module.exports = Invoice;

package/src/models/user_account.js

@@ -0,0 +1,60 @@
+const mongoose = require('mongoose');
+
+const userAccountSchema = new mongoose.Schema({
+    account_no: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    customerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    payment_type: {
+        type: String,
+        required: true,
+        enum: ['Postpaid', 'Prepaid']
+    },
+    previousReading: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    currentReading: {
+        type: Number,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Active', 'Inactive'],
+        default: 'Active'
+    },
+    created_on: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    meter_id: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Meter',
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const UserAccount = mongoose.model('UserAccount', userAccountSchema);
+
+module.exports = UserAccount;