payservedb 3.8.7 → 3.8.9

package/index.js

@@ -107,6 +107,7 @@ const models = {
     ServiceRequest: require('./src/models/servicerequest'),
     CountryTaxRate: require('./src/models/country_tax'),
     Meter: require('./src/models/smart_water_meter'),
+    DailyConsumption: require('./src/models/smart_meter_daily_consumption'),
     AnalogMeter: require('./src/models/analog_water_meter'),
     MeterSize: require('./src/models/water_meter_size'),
     MeterProtocol: require('./src/models/water_meter_communication'),

package/package.json

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

package/src/models/levy.js

@@ -14,11 +14,6 @@ const levySchema = new mongoose.Schema(
       ref: "LevyType",
       required: true,
     },
-    //Commented out Name field
-    // levyTypeName: {
-    //   type: String,
-    //   required: true,
-    // },
     amount: {
       type: Number,
       required: true,
@@ -42,6 +37,21 @@ const levySchema = new mongoose.Schema(
       type: String,
       required: true,
     },
+    // New fields added from levy contract
+    currency: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Currency",
+      required: false,
+    },
+    mobilePayment: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+    paymentMethodId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: false,
+    },
     disabled: {
       type: Boolean,
       required: false,

package/src/models/levycontract.js

@@ -40,20 +40,13 @@ const levyContractSchema = new mongoose.Schema({
         required: true,
         enum: ['Active', 'Inactive']
     },
+    // We keep paymentFrequency in the schema for backward compatibility
+    // But it will now be populated from the levy's collectionFrequency
     paymentFrequency: {
         type: String,
         required: true,
         trim: true
     },
-    currency: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Currency',
-        required: true
-    },
-    paymentMethodId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: false
-    },
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Facility',

package/src/models/smart_meter_daily_consumption.js

@@ -0,0 +1,45 @@
+const mongoose = require('mongoose');
+ 
+const dailyConsumptionSchema = new mongoose.Schema({
+  meterId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Meter',
+    required: true,
+  },
+  date: {
+    type: Date,
+    required: true,
+  },
+  totalConsumption: {
+    type: Number,
+    default: 0,
+  },
+  
+  updates: [{
+    timestamp: { 
+      type: Date, 
+      default: Date.now 
+    },
+    previousReading: { 
+      type: Number, 
+      required: true 
+    },
+    currentReading: { 
+      type: Number, 
+      required: true 
+    },
+    // Delta can be computed as (currentReading - previousReading)
+    delta: { 
+      type: Number, 
+      required: true 
+    },
+  }],
+}, {
+  timestamps: true,
+});
+
+dailyConsumptionSchema.index({ meterId: 1, date: 1 }, { unique: true });
+
+const DailyConsumption = mongoose.model('DailyConsumption', dailyConsumptionSchema);
+
+module.exports = DailyConsumption;

package/src/models/smart_water_meter.js

@@ -41,7 +41,7 @@ const meterSchema = new mongoose.Schema({
     valveType: {
         type: String,
         enum: ['automatic', 'manual'],
-        default: 'manual'
+        default: 'automatic'
     },
     isInstalled: {
         type: Boolean,
@@ -70,11 +70,6 @@ const meterSchema = new mongoose.Schema({
         min: 0,
         default: 0,
     },
-    readingHistory: [{
-        reading: Number,
-        date: Date,
-        time: Date
-    }],
     currentReading: {
         type: Number,
         min: 0,