payservedb 5.1.7 → 5.1.9

package/package.json

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

package/src/models/leaseagreement.js

@@ -102,6 +102,7 @@ const leaseAgreementSchema = new mongoose.Schema({
             phoneNumber: String
         },
         escalations: [{
+            _id: { type: mongoose.Schema.Types.ObjectId, auto: true },
             effectiveDate: { type: Date, required: true },
             type: {
                 type: String,

package/src/models/water_meter_daily_history.js

@@ -1,5 +1,7 @@
 const mongoose = require('mongoose');
 
+const mongoose = require('mongoose');
+
 const dailyWaterMeterHistorySchema = new mongoose.Schema({
     meterId: {
         type: mongoose.Schema.Types.ObjectId,
@@ -19,7 +21,7 @@ const dailyWaterMeterHistorySchema = new mongoose.Schema({
     },
     timeStamps: {
         type: [Date],
-        required: true
+        default: []
     }
 }, {
     timestamps: true

package/src/models/water_meter_monthly_history.js

@@ -8,31 +8,30 @@ const monthlyWaterMeterHistorySchema = new mongoose.Schema({
         index: true
     },
     yearMonth: {
-        type: Number,
+        type: String,
         required: true
     },
-    previousReading: {
+    initialReading: {
         type: Number,
         required: true,
         min: 0
     },
-    currentReading: {
+    finalReading: {
         type: Number,
         required: true,
         min: 0
     },
     consumption: {
         type: Number,
-        required: true,
-        min: 0,
-
+        default: function() {
+            return this.finalReading - this.initialReading;
+        }
     }
 }, {
     timestamps: true
 });
 
 monthlyWaterMeterHistorySchema.index({ meterId: 1, yearMonth: 1 });
-
 const MonthlyWaterMeterHistory = mongoose.model('MonthlyWaterMeterHistory', monthlyWaterMeterHistorySchema);
 
 module.exports = MonthlyWaterMeterHistory;

package/src/models/water_meter_single_day_history.js

@@ -8,9 +8,8 @@ const singleDayWaterMeterHistorySchema = new mongoose.Schema({
         index: true
     },
     date: {
-        type: Date,
-        required: true,
-        index: true
+        type: String, 
+        required: true
     },
     reading: {
         type: Number,
@@ -18,7 +17,7 @@ const singleDayWaterMeterHistorySchema = new mongoose.Schema({
         min: 0
     },
     time: {
-        type: String,
+        type: String, 
         required: true
     }
 }, {
@@ -26,7 +25,6 @@ const singleDayWaterMeterHistorySchema = new mongoose.Schema({
 });
 
 singleDayWaterMeterHistorySchema.index({ meterId: 1, date: 1 });
-
 const SingleDayWaterMeterHistory = mongoose.model('SingleDayWaterMeterHistory', singleDayWaterMeterHistorySchema);
 
 module.exports = SingleDayWaterMeterHistory;