payservedb 4.7.0 → 4.7.2

package/package.json

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

package/src/models/invoice.js

@@ -160,6 +160,21 @@ const invoiceSchema = new mongoose.Schema(
       paymentDate: { type: Date },
       transactionId: { type: String },
     },
+    // New field to track when an invoice has been viewed
+    viewStatus: {
+      isOpened: { type: Boolean, default: false },
+      openedAt: { type: Date, default: null },
+      openedBy: {
+        facilityId: { type: mongoose.Schema.Types.ObjectId, ref: "Facility" },
+        userId: { type: mongoose.Schema.Types.ObjectId, ref: "User" },
+        userRole: { type: String }
+      },
+      viewHistory: [{
+        viewedAt: { type: Date, required: true },
+        facilityId: { type: mongoose.Schema.Types.ObjectId, ref: "Facility" },
+        userId: { type: mongoose.Schema.Types.ObjectId, ref: "User" }
+      }]
+    }
   },
   {
     timestamps: true,
@@ -176,6 +191,8 @@ 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
+invoiceSchema.index({ 'viewStatus.isOpened': 1 }); // Add index for view status
+invoiceSchema.index({ 'viewStatus.openedBy.facilityId': 1 }); // Add index for facility view tracking
 
 // Add virtual field for calculating balance
 invoiceSchema.virtual('calculatedBalance').get(function () {
@@ -236,6 +253,14 @@ invoiceSchema.statics.calculateTotalsByCurrency = function (query = {}) {
   ]);
 };
 
+// New static method to find all unviewed invoices
+invoiceSchema.statics.findUnviewedInvoices = function (facilityId) {
+  return this.find({
+    'facility.id': facilityId,
+    'viewStatus.isOpened': 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

package/src/models/water_meters.js

@@ -65,8 +65,8 @@ const waterMeterSchema = new mongoose.Schema({
     status: {
         type: String,
         required: true,
-        enum: ['Open', 'Closed', 'maintenance', 'faulty'],
-        default: 'Open',
+        enum: ['open', 'closed', 'maintenance', 'faulty'],
+        default: 'open',
     },
     customerType: { 
         type: String,