payservedb 8.0.0 → 8.0.2

package/package.json

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

package/src/models/facilityBillingPrices.js

@@ -1,3 +1,5 @@
+const mongoose = require("mongoose");
+
 const FacilityBillingPriceSchema = new mongoose.Schema({
   facilityId: {
     type: mongoose.Schema.Types.ObjectId,

package/src/models/invoice.js

@@ -120,6 +120,28 @@ const invoiceSchema = new mongoose.Schema(
       type: Number,
       default: 0,
     },
+    // NEW FIELD 1: Year-Month for easy filtering
+    yearMonth: {
+      type: String,
+      required: true,
+      match: /^\d{4}-\d{2}$/, // Validates format like "2025-08"
+      index: true
+    },
+    // NEW FIELD 2: Simple notification tracking
+    notificationsSent: {
+      sms: {
+        type: Boolean,
+        default: false
+      },
+      email: {
+        type: Boolean,
+        default: false
+      },
+      attempts: {
+        type: Number,
+        default: 0
+      }
+    },
     voidMetadata: {
       voidedBy: {
         userId: { type: mongoose.Schema.Types.ObjectId, ref: "User" },
@@ -237,6 +259,11 @@ invoiceSchema.index({ 'viewStatus.openedBy.facilityId': 1 }); // Add index for f
 // Add index for double entry accounts
 invoiceSchema.index({ invoiceDoubleEntryAccount: 1 });
 invoiceSchema.index({ paymentDoubleEntryAccount: 1 });
+// NEW INDEXES for new fields
+invoiceSchema.index({ yearMonth: 1 }); // For filtering by year-month
+invoiceSchema.index({ yearMonth: 1, status: 1 }); // Combined index for monthly reports
+invoiceSchema.index({ 'notificationsSent.sms': 1 }); // For finding SMS sent/not sent
+invoiceSchema.index({ 'notificationsSent.email': 1 }); // For finding email sent/not sent
 
 // Add virtual field for calculating balance
 invoiceSchema.virtual('calculatedBalance').get(function () {
@@ -321,6 +348,24 @@ invoiceSchema.statics.findUnviewedInvoices = function (facilityId) {
   });
 };
 
+// NEW STATIC METHODS for new fields
+// Find invoices by year-month
+invoiceSchema.statics.findByYearMonth = function (yearMonth) {
+  return this.find({ yearMonth: yearMonth });
+};
+
+// Find invoices where notifications haven't been sent
+invoiceSchema.statics.findPendingNotifications = function (facilityId) {
+  return this.find({
+    'facility.id': facilityId,
+    status: { $in: ['Unpaid', 'Overdue'] },
+    $or: [
+      { 'notificationsSent.sms': false },
+      { 'notificationsSent.email': false }
+    ]
+  });
+};
+
 // 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
@@ -329,6 +374,14 @@ invoiceSchema.pre('save', function (next) {
   } else {
     this.overpay = 0; // No overpay if there's no negative balance
   }
+
+  // NEW: Auto-generate yearMonth from issueDate if not provided
+  if (!this.yearMonth && this.issueDate) {
+    const year = this.issueDate.getFullYear();
+    const month = String(this.issueDate.getMonth() + 1).padStart(2, '0');
+    this.yearMonth = `${year}-${month}`;
+  }
+
   next();
 });