payservedb 5.6.7 → 5.6.8

package/src/models/water_meter_manufacturer.js

@@ -1,36 +1,36 @@
-const mongoose = require('mongoose');
-
-const manufacturerSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
-    },
-    country: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    contactPerson: {
-        type: String,
-        trim: true
-    },
-    email: {
-        type: String,
-        required: true,
-        trim: true,
-        lowercase: true
-    },
-    phoneNumber: {
-        type: String,
-        required: true,
-        trim: true
-    }
-}, {
-    timestamps: true
-});
-
-const MeterManufacturer = mongoose.model('MeterManufacturer', manufacturerSchema);
-
+const mongoose = require('mongoose');
+
+const manufacturerSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    country: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    contactPerson: {
+        type: String,
+        trim: true
+    },
+    email: {
+        type: String,
+        required: true,
+        trim: true,
+        lowercase: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true
+});
+
+const MeterManufacturer = mongoose.model('MeterManufacturer', manufacturerSchema);
+
 module.exports = MeterManufacturer;

package/src/models/water_meter_monthly_history.js

@@ -1,37 +1,37 @@
-const mongoose = require('mongoose');
-
-const monthlyWaterMeterHistorySchema = new mongoose.Schema({
-    meterId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'WaterMeter',
-        required: true,
-        index: true
-    },
-    yearMonth: {
-        type: String,
-        required: true
-    },
-    initialReading: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    finalReading: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    consumption: {
-        type: Number,
-        default: function() {
-            return this.finalReading - this.initialReading;
-        }
-    }
-}, {
-    timestamps: true
-});
-
-monthlyWaterMeterHistorySchema.index({ meterId: 1, yearMonth: 1 });
-const MonthlyWaterMeterHistory = mongoose.model('MonthlyWaterMeterHistory', monthlyWaterMeterHistorySchema);
-
+const mongoose = require('mongoose');
+
+const monthlyWaterMeterHistorySchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true,
+        index: true
+    },
+    yearMonth: {
+        type: String,
+        required: true
+    },
+    initialReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    finalReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    consumption: {
+        type: Number,
+        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_settings.js

@@ -1,89 +1,115 @@
-const mongoose = require('mongoose');
-
-const waterMeterSettingsSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true
-  },
-  minAmount: {
-    type: Number,
-    required: true,
-    default: 1
-  },
-  maxAmount: {
-    type: Number,
-    required: true,
-    default: 10000
-  },
-  gracePeriod: {
-    type: Number,
-    required: true,
-    default: 10
-  },
-  invoiceDay: {
-    type: Number,
-    required: true,
-    min: 0,
-    max: 30,
-    default: 3
-  },
-  enforcePayment: {
-    type: String,
-    enum: ['yes', 'no'],
-    required: true,
-    default: 'no'
-  },
-  minimumPaymentAmount: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  tariff: {
-    type: String,
-    enum: ['yes', 'no'],
-    required: true,
-    default: 'no'
-  },
-  tariffAmount: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  tariffAmountSmart: {
-    type: Number,
-    default: 0
-  },
-  fixedTariffAmount: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  meterLoan: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  notifications: {
-    type: Boolean,
-    default: false
-  },
-  dailyNotifications: {
-    type: Boolean,
-    default: false
-  },
-  weeklyNotifications: {
-    type: Boolean,
-    default: false
-  },
-  allNotifications: {
-    type: Boolean,
-    default: false
-  }
-}, {
-  timestamps: true
-});
-
-const WaterMeterSettings = mongoose.model('WaterMeterSettings', waterMeterSettingsSchema);
-
+const mongoose = require('mongoose');
+
+const waterMeterSettingsSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true
+  },
+  minAmount: {
+    type: Number,
+    required: true,
+    default: 1
+  },
+  maxAmount: {
+    type: Number,
+    required: true,
+    default: 10000
+  },
+  gracePeriod: {
+    type: Number,
+    required: true,
+    default: 10
+  },
+  invoiceDay: {
+    type: Number,
+    required: true,
+    min: 0,
+    max: 30,
+    default: 3
+  },
+  enforcePayment: {
+    type: String,
+    enum: ['yes', 'no'],
+    required: true,
+    default: 'no'
+  },
+  minimumPaymentAmount: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  tariff: {
+    type: String,
+    enum: ['yes', 'no'],
+    required: true,
+    default: 'no'
+  },
+  tariffAmount: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  tariffAmountSmart: {
+    type: Number,
+    default: 0
+  },
+  fixedTariffAmount: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  meterLoan: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  notifications: {
+    type: Boolean,
+    default: false
+  },
+  dailyNotifications: {
+    type: Boolean,
+    default: false
+  },
+  weeklyNotifications: {
+    type: Boolean,
+    default: false
+  },
+  allNotifications: {
+    type: Boolean,
+    default: false
+  },
+  glAccounts: {
+    invoice: {
+      debit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      },
+      credit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      }
+    },
+    payment: {
+      debit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      },
+      credit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      }
+    }
+  },
+}, {
+  timestamps: true
+});
+
+const WaterMeterSettings = mongoose.model('WaterMeterSettings', waterMeterSettingsSchema);
+
 module.exports = WaterMeterSettings;

package/src/models/water_meter_single_day_history.js

@@ -1,35 +1,35 @@
-const mongoose = require('mongoose');
-
-const singleDayWaterMeterHistorySchema = new mongoose.Schema({
-    meterId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'WaterMeter',
-        required: true,
-        index: true
-    },
-    date: {
-        type: String,
-        required: true
-    },
-    reading: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    status: {
-        type: String,
-        enum: ['opened', 'closed', 'maintenance', 'faulty'],
-        default: 'opened',
-    },
-    time: {
-        type: String,
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-singleDayWaterMeterHistorySchema.index({ meterId: 1, date: 1 });
-const SingleDayWaterMeterHistory = mongoose.model('SingleDayWaterMeterHistory', singleDayWaterMeterHistorySchema);
-
+const mongoose = require('mongoose');
+
+const singleDayWaterMeterHistorySchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true,
+        index: true
+    },
+    date: {
+        type: String,
+        required: true
+    },
+    reading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    status: {
+        type: String,
+        enum: ['opened', 'closed', 'maintenance', 'faulty'],
+        default: 'opened',
+    },
+    time: {
+        type: String,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+singleDayWaterMeterHistorySchema.index({ meterId: 1, date: 1 });
+const SingleDayWaterMeterHistory = mongoose.model('SingleDayWaterMeterHistory', singleDayWaterMeterHistorySchema);
+
 module.exports = SingleDayWaterMeterHistory;

package/src/models/water_meter_size.js

@@ -1,16 +1,16 @@
-const mongoose = require('mongoose');
-
-const meterSizeSchema = new mongoose.Schema({
-    code: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true, // Example: DN-15, DN-20, etc.
-    }
-}, {
-    timestamps: true
-});
-
-const MeterSize = mongoose.model('MeterSize', meterSizeSchema);
-
+const mongoose = require('mongoose');
+
+const meterSizeSchema = new mongoose.Schema({
+    code: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true, // Example: DN-15, DN-20, etc.
+    }
+}, {
+    timestamps: true
+});
+
+const MeterSize = mongoose.model('MeterSize', meterSizeSchema);
+
 module.exports = MeterSize;

package/src/models/water_meters.js

@@ -1,118 +1,118 @@
-const mongoose = require('mongoose');
-
-const waterMeterSchema = new mongoose.Schema({
-    meterType: {
-        type: String,
-        required: true,
-        enum: ['analog', 'smart']
-    },
-    meterNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true,
-        index: true
-    },
-    serialNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true,
-        index: true
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-    },
-    manufacturer: {
-        type: String,
-        required: true,
-    },
-    protocol: {
-        type: String,
-        required: true,
-    },
-    size: {
-        type: String,
-        required: true,
-    },
-    initialReading: {
-        type: Number,
-        required: true,
-        min: 0,
-        default: 0
-    },
-    previousReading: {
-        type: Number,
-        min: 0,
-    },
-    currentReading: {
-        type: Number,
-        min: 0,
-        default: 0
-    },
-    lastReadingDate: {
-        type: Date,
-        default: Date.now
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['opened', 'closed', 'maintenance', 'faulty'],
-        default: 'opened',
-    },
-    customerType: {
-        type: String,
-        enum: ['postpaid', 'prepaid'],
-    },
-    isInstalled: {
-        type: Boolean,
-        default: false
-    },
-    enforcement: {
-        type: Boolean,
-        default: false
-    },
-    concentratorSerialNumber: { 
-        type: String
-    },
-    imageUrl: {
-        type: String,
-        trim: true
-    },
-    valveType: { // Specific to smart meters
-        type: String,
-        enum: ['automatic', 'manual'],
-        default: 'automatic'
-    },
-    accountBalance: { // Specific to smart meters
-        type: Number,
-        default: 0
-    },
-    negativeBalance: { // Specific to smart meters
-        type: Number,
-        default: 0
-    },
-}, {
-    timestamps: true
-});
-
-waterMeterSchema.index({ meterNumber: 1, status: 1 });
-
-const WaterMeter = mongoose.model('WaterMeter', waterMeterSchema);
-
+const mongoose = require('mongoose');
+
+const waterMeterSchema = new mongoose.Schema({
+    meterType: {
+        type: String,
+        required: true,
+        enum: ['analog', 'smart']
+    },
+    meterNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        index: true
+    },
+    serialNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        index: true
+    },
+    accountNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    manufacturer: {
+        type: String,
+        required: true,
+    },
+    protocol: {
+        type: String,
+        required: true,
+    },
+    size: {
+        type: String,
+        required: true,
+    },
+    initialReading: {
+        type: Number,
+        required: true,
+        min: 0,
+        default: 0
+    },
+    previousReading: {
+        type: Number,
+        min: 0,
+    },
+    currentReading: {
+        type: Number,
+        min: 0,
+        default: 0
+    },
+    lastReadingDate: {
+        type: Date,
+        default: Date.now
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['opened', 'closed', 'maintenance', 'faulty'],
+        default: 'opened',
+    },
+    customerType: {
+        type: String,
+        enum: ['postpaid', 'prepaid'],
+    },
+    isInstalled: {
+        type: Boolean,
+        default: false
+    },
+    enforcement: {
+        type: Boolean,
+        default: false
+    },
+    concentratorSerialNumber: { 
+        type: String
+    },
+    imageUrl: {
+        type: String,
+        trim: true
+    },
+    valveType: { // Specific to smart meters
+        type: String,
+        enum: ['automatic', 'manual'],
+        default: 'automatic'
+    },
+    accountBalance: { // Specific to smart meters
+        type: Number,
+        default: 0
+    },
+    negativeBalance: { // Specific to smart meters
+        type: Number,
+        default: 0
+    },
+}, {
+    timestamps: true
+});
+
+waterMeterSchema.index({ meterNumber: 1, status: 1 });
+
+const WaterMeter = mongoose.model('WaterMeter', waterMeterSchema);
+
 module.exports = WaterMeter;