payservedb 3.9.2 → 3.9.4

package/package.json

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

package/src/models/analog_water_billing.js

@@ -0,0 +1,48 @@
+const mongoose = require('mongoose');
+
+const analogBillingSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    meterNumber: {
+        type: String,
+        required: true,
+    },
+    currentReading: {
+        type: Number,
+        required: true,
+    },
+    previousReading: {
+        type: Number,
+        required: true,
+    },
+    yearMonth: {
+        type: String, // Expected format: 'YYYY-MM'
+        required: true,
+    },
+    totalUsage: {
+        type: Number,
+        required: true,
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    status: {
+        type: String,
+        enum: ['pending', 'reviewed', 'billed'],
+        default: 'pending',
+    }
+}, {
+    timestamps: true,
+});
+
+analogBillingSchema.index({ meterNumber: 1, yearMonth: 1 }, { unique: true });
+
+module.exports = mongoose.model('AnalogBilling', analogBillingSchema);

package/src/models/handover.js

@@ -54,12 +54,12 @@ const handoverSchema = new mongoose.Schema({
     ref: 'Unit',
     required: true
   },
+  // IMPORTANT: For Customer, we don't specify 'ref' since it's in a different database
+  // This avoids the cross-database population errors
   customerId: {
     type: mongoose.Schema.Types.ObjectId,
-    ref: 'Customer',
     required: true
   },
-  // propertyManagerId removed as requested
   
   // Handover details
   handoverType: {
@@ -236,6 +236,7 @@ handoverSchema.methods.compareWithMoveIn = async function() {
   return differences;
 };
 
+// Create and export the model with the standard pattern
 const Handover = mongoose.model('Handover', handoverSchema);
 
 module.exports = Handover;