payservedb 4.4.9 → 4.5.1

package/src/models/invoice.js

@@ -1,252 +1,252 @@
-const mongoose = require("mongoose");
-
-const invoiceSchema = new mongoose.Schema(
-  {
-    invoiceNumber: {
-      type: String,
-      required: true,
-      unique: true,
-    },
-    accountNumber: {
-      type: String,
-      required: true,
-      unique: true,
-    },
-    client: {
-      clientId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "Customer",
-        required: true,
-      },
-      firstName: {
-        type: String,
-        required: true
-      },
-      lastName: {
-        type: String,
-        required: true
-      }
-    },
-    facility: {
-      id: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "Facility",
-        required: true,
-      },
-      name: {
-        type: String,
-        required: true
-      }
-    },
-    unit: {
-      id: { type: mongoose.Schema.Types.ObjectId, ref: "Unit", required: true },
-      name: { type: String, required: true },
-    },
-    currency: {
-      id: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "Currency",
-        required: true
-      },
-      name: {
-        type: String,
-        required: true
-      },
-      code: {
-        type: String,
-        required: true,
-        uppercase: true,
-        minlength: 3,
-        maxlength: 3
-      }
-    },
-    items: [
-      {
-        description: { type: String, required: true },
-        quantity: { type: Number, required: true, min: 1 },
-        unitPrice: { type: Number, required: true, min: 0 },
-      },
-    ],
-    subTotal: {
-      type: Number,
-      required: true,
-    },
-    tax: {
-      type: Number,
-      required: true,
-    },
-    totalAmount: {
-      type: Number,
-      required: true,
-    },
-    amountPaid: {
-      type: Number,
-      default: 0,
-      min: 0,
-    },
-    // Mark as deprecated, keep for backward compatibility
-    overpay: {
-      type: Number,
-      default: 0,
-      min: 0,
-      deprecated: true
-    },
-    issueDate: {
-      type: Date,
-      required: true,
-    },
-    dueDate: {
-      type: Date,
-      required: true,
-    },
-    status: {
-      type: String,
-      required: true,
-      enum: ["Unpaid", "Pending", "Paid", "Overdue", "Cancelled", "Partially Paid"],
-    },
-    penalty: {
-      type: Number,
-      default: 0,
-    },
-    whatFor: {
-      invoiceType: { type: String, required: true },
-      description: { type: String },
-    },
-    invoiceNote: {
-      type: String,
-      default: null,
-    },
-    // Enhanced balanceBroughtForward field
-    // Positive values = customer owes money
-    // Negative values = credit (previously tracked in overpay field)
-    balanceBroughtForward: {
-      type: Number,
-      default: 0,
-    },
-    lastReminderSent: Date,
-    reminderHistory: [
-      {
-        sentAt: Date,
-        reminderId: mongoose.Schema.Types.ObjectId,
-        notificationTypes: [String],
-      },
-    ],
-    reconciliationHistory: [{
-      date: { type: Date, required: true },
-      amount: { type: Number, required: true },
-      type: {
-        type: String,
-        enum: ['payment', 'cash', 'cheque', 'bank-transfer', 'mpesa-transfer', 'overpay-transfer', 'balance-deduction', 'overpay-received', 'credit-forward', 'debit-forward'],
-        required: true
-      },
-      sourceInvoice: String,
-      destinationInvoice: String,
-      paymentReference: String,
-      paymentCompletion: String,
-      remainingBalance: Number,
-      notes: String,
-      exchangeRate: {
-        type: Number,
-        default: 1  // For cross-currency reconciliations
-      },
-      originalCurrency: {
-        code: String,  // Original currency code if different from invoice currency
-        amount: Number // Amount in original currency
-      }
-    }],
-    paymentDetails: {
-      paymentStatus: { type: String, required: true },
-      paymentMethod: { type: String },
-      paymentDate: { type: Date },
-      transactionId: { type: String },
-    },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// 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 });
-invoiceSchema.index({ 'currency.code': 1 }); // Add index for currency code
-invoiceSchema.index({ 'currency.id': 1 }); // Add index for currency ID
-invoiceSchema.index({ 'currency.code': 1, 'client.clientId': 1, status: 1 }); // Compound index for currency-based queries
-invoiceSchema.index({ 'client.clientId': 1, balanceBroughtForward: 1 }); // Add index for finding invoices with credit balances
-
-// Add virtual field for calculating balance
-invoiceSchema.virtual('calculatedBalance').get(function () {
-  const baseBalance = this.totalAmount - (this.amountPaid || 0);
-
-  // Add positive balanceBroughtForward (customer owes money)
-  if (this.balanceBroughtForward > 0) {
-    return baseBalance + this.balanceBroughtForward;
-  }
-
-  // Subtract negative balanceBroughtForward (credit)
-  return baseBalance;
-});
-
-// Add virtual field for credit balance
-invoiceSchema.virtual('creditBalance').get(function () {
-  return this.balanceBroughtForward < 0 ? Math.abs(this.balanceBroughtForward) : 0;
-});
-
-// Getter for compatible overpay field
-invoiceSchema.virtual('effectiveOverpay').get(function () {
-  return this.balanceBroughtForward < 0 ? Math.abs(this.balanceBroughtForward) : 0;
-});
-
-// Add method for currency conversion if needed
-invoiceSchema.methods.convertAmount = function (amount, fromCurrency, toCurrency, exchangeRate) {
-  if (fromCurrency === toCurrency) {
-    return amount;
-  }
-  return amount * exchangeRate;
-};
-
-// Add static method to find invoices by currency
-invoiceSchema.statics.findByCurrency = function (currencyCode) {
-  return this.find({ 'currency.code': currencyCode.toUpperCase() });
-};
-
-// Add static method to find invoices with credit balance
-invoiceSchema.statics.findWithCreditBalance = function (clientId) {
-  return this.find({
-    'client.clientId': clientId,
-    'balanceBroughtForward': { $lt: 0 }
-  }).sort({ updatedAt: -1 });
-};
-
-// Add static method to calculate totals by currency
-invoiceSchema.statics.calculateTotalsByCurrency = function (query = {}) {
-  return this.aggregate([
-    { $match: query },
-    {
-      $group: {
-        _id: '$currency.code',
-        totalAmount: { $sum: '$totalAmount' },
-        totalPaid: { $sum: '$amountPaid' },
-        count: { $sum: 1 }
-      }
-    }
-  ]);
-};
-
-// Pre-save middleware to ensure overpay and balanceBroughtForward stay in sync during transition
-invoiceSchema.pre('save', function (next) {
-  // If balanceBroughtForward is negative (credit), sync with overpay for backwards compatibility
-  if (this.balanceBroughtForward < 0) {
-    this.overpay = Math.abs(this.balanceBroughtForward);
-  } else {
-    this.overpay = 0; // No overpay if there's no negative balance
-  }
-  next();
-});
-
-const Invoice = mongoose.model('Invoice', invoiceSchema);
-
+const mongoose = require("mongoose");
+
+const invoiceSchema = new mongoose.Schema(
+  {
+    invoiceNumber: {
+      type: String,
+      required: true,
+      unique: true,
+    },
+    accountNumber: {
+      type: String,
+      required: true,
+      unique: true,
+    },
+    client: {
+      clientId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "Customer",
+        required: true,
+      },
+      firstName: {
+        type: String,
+        required: true
+      },
+      lastName: {
+        type: String,
+        required: true
+      }
+    },
+    facility: {
+      id: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "Facility",
+        required: true,
+      },
+      name: {
+        type: String,
+        required: true
+      }
+    },
+    unit: {
+      id: { type: mongoose.Schema.Types.ObjectId, ref: "Unit", required: true },
+      name: { type: String, required: true },
+    },
+    currency: {
+      id: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "Currency",
+        required: true
+      },
+      name: {
+        type: String,
+        required: true
+      },
+      code: {
+        type: String,
+        required: true,
+        uppercase: true,
+        minlength: 3,
+        maxlength: 3
+      }
+    },
+    items: [
+      {
+        description: { type: String, required: true },
+        quantity: { type: Number, required: true, min: 1 },
+        unitPrice: { type: Number, required: true, min: 0 },
+      },
+    ],
+    subTotal: {
+      type: Number,
+      required: true,
+    },
+    tax: {
+      type: Number,
+      required: true,
+    },
+    totalAmount: {
+      type: Number,
+      required: true,
+    },
+    amountPaid: {
+      type: Number,
+      default: 0,
+      min: 0,
+    },
+    // Mark as deprecated, keep for backward compatibility
+    overpay: {
+      type: Number,
+      default: 0,
+      min: 0,
+      deprecated: true
+    },
+    issueDate: {
+      type: Date,
+      required: true,
+    },
+    dueDate: {
+      type: Date,
+      required: true,
+    },
+    status: {
+      type: String,
+      required: true,
+      enum: ["Unpaid", "Pending", "Paid", "Overdue", "Cancelled", "Partially Paid"],
+    },
+    penalty: {
+      type: Number,
+      default: 0,
+    },
+    whatFor: {
+      invoiceType: { type: String, required: true },
+      description: { type: String },
+    },
+    invoiceNote: {
+      type: String,
+      default: null,
+    },
+    // Enhanced balanceBroughtForward field
+    // Positive values = customer owes money
+    // Negative values = credit (previously tracked in overpay field)
+    balanceBroughtForward: {
+      type: Number,
+      default: 0,
+    },
+    lastReminderSent: Date,
+    reminderHistory: [
+      {
+        sentAt: Date,
+        reminderId: mongoose.Schema.Types.ObjectId,
+        notificationTypes: [String],
+      },
+    ],
+    reconciliationHistory: [{
+      date: { type: Date, required: true },
+      amount: { type: Number, required: true },
+      type: {
+        type: String,
+        enum: ['payment', 'cash', 'cheque', 'bank-transfer', 'mpesa-transfer', 'overpay-transfer', 'balance-deduction', 'overpay-received', 'credit-forward', 'debit-forward'],
+        required: true
+      },
+      sourceInvoice: String,
+      destinationInvoice: String,
+      paymentReference: String,
+      paymentCompletion: String,
+      remainingBalance: Number,
+      notes: String,
+      exchangeRate: {
+        type: Number,
+        default: 1  // For cross-currency reconciliations
+      },
+      originalCurrency: {
+        code: String,  // Original currency code if different from invoice currency
+        amount: Number // Amount in original currency
+      }
+    }],
+    paymentDetails: {
+      paymentStatus: { type: String, required: true },
+      paymentMethod: { type: String },
+      paymentDate: { type: Date },
+      transactionId: { type: String },
+    },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// 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 });
+invoiceSchema.index({ 'currency.code': 1 }); // Add index for currency code
+invoiceSchema.index({ 'currency.id': 1 }); // Add index for currency ID
+invoiceSchema.index({ 'currency.code': 1, 'client.clientId': 1, status: 1 }); // Compound index for currency-based queries
+invoiceSchema.index({ 'client.clientId': 1, balanceBroughtForward: 1 }); // Add index for finding invoices with credit balances
+
+// Add virtual field for calculating balance
+invoiceSchema.virtual('calculatedBalance').get(function () {
+  const baseBalance = this.totalAmount - (this.amountPaid || 0);
+
+  // Add positive balanceBroughtForward (customer owes money)
+  if (this.balanceBroughtForward > 0) {
+    return baseBalance + this.balanceBroughtForward;
+  }
+
+  // Subtract negative balanceBroughtForward (credit)
+  return baseBalance;
+});
+
+// Add virtual field for credit balance
+invoiceSchema.virtual('creditBalance').get(function () {
+  return this.balanceBroughtForward < 0 ? Math.abs(this.balanceBroughtForward) : 0;
+});
+
+// Getter for compatible overpay field
+invoiceSchema.virtual('effectiveOverpay').get(function () {
+  return this.balanceBroughtForward < 0 ? Math.abs(this.balanceBroughtForward) : 0;
+});
+
+// Add method for currency conversion if needed
+invoiceSchema.methods.convertAmount = function (amount, fromCurrency, toCurrency, exchangeRate) {
+  if (fromCurrency === toCurrency) {
+    return amount;
+  }
+  return amount * exchangeRate;
+};
+
+// Add static method to find invoices by currency
+invoiceSchema.statics.findByCurrency = function (currencyCode) {
+  return this.find({ 'currency.code': currencyCode.toUpperCase() });
+};
+
+// Add static method to find invoices with credit balance
+invoiceSchema.statics.findWithCreditBalance = function (clientId) {
+  return this.find({
+    'client.clientId': clientId,
+    'balanceBroughtForward': { $lt: 0 }
+  }).sort({ updatedAt: -1 });
+};
+
+// Add static method to calculate totals by currency
+invoiceSchema.statics.calculateTotalsByCurrency = function (query = {}) {
+  return this.aggregate([
+    { $match: query },
+    {
+      $group: {
+        _id: '$currency.code',
+        totalAmount: { $sum: '$totalAmount' },
+        totalPaid: { $sum: '$amountPaid' },
+        count: { $sum: 1 }
+      }
+    }
+  ]);
+};
+
+// Pre-save middleware to ensure overpay and balanceBroughtForward stay in sync during transition
+invoiceSchema.pre('save', function (next) {
+  // If balanceBroughtForward is negative (credit), sync with overpay for backwards compatibility
+  if (this.balanceBroughtForward < 0) {
+    this.overpay = Math.abs(this.balanceBroughtForward);
+  } else {
+    this.overpay = 0; // No overpay if there's no negative balance
+  }
+  next();
+});
+
+const Invoice = mongoose.model('Invoice', invoiceSchema);
+
 module.exports = Invoice;

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;