payservedb 4.2.8 → 4.3.0

package/index.js

@@ -106,10 +106,9 @@ const models = {
     Staff: require('./src/models/staff'),
     ServiceRequest: require('./src/models/servicerequest'),
     CountryTaxRate: require('./src/models/country_tax'),
-    Meter: require('./src/models/smart_water_meter'),
+    WaterMeter: require('./src/models/water_meters'),
     DailyConsumption: require('./src/models/smart_meter_daily_consumption'),
     WaterMeterSettings: require('./src/models/water_meter_settings'),
-    AnalogMeter: require('./src/models/analog_water_meter'),
     AnalogBilling: require('./src/models/analog_water_billing'),
     MeterSize: require('./src/models/water_meter_size'),
     WaterInvoice: require('./src/models/water_invoice'),
@@ -127,7 +126,7 @@ const models = {
     FacilityPaymentDetails: require('./src/models/facility_payment_details'),
     DefaultPaymentDetails: require('./src/models/default_payment_details'),
     Currency: require('./src/models/currency_settings'),
-    UserAccount: require('./src/models/water_meter_account'),
+    WaterMeterAccount: require('./src/models/water_meter_account'),
     CashPayment: require('./src/models/cashpayment'),
     VasPayment: require('./src/models/vas_payments'),
     VasInvoicesQuickBooks: require('./src/models/vas_invoices_upload'),

package/package.json

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

package/src/models/water_meter_account.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
 
-const userAccountSchema = new mongoose.Schema({
+const waterMeterAccountSchema = new mongoose.Schema({
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Facility',
@@ -69,6 +69,6 @@ const userAccountSchema = new mongoose.Schema({
     timestamps: true
 });
 
-const UserAccount = mongoose.model('UserAccount', userAccountSchema);
+const WaterMeterAccount = mongoose.model('WaterMeterAccount', waterMeterAccountSchema);
 
-module.exports = UserAccount;
+module.exports = WaterMeterAccount;

package/src/models/water_meters.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
 
-const meterSchema = new mongoose.Schema({
+const waterMeterSchema = new mongoose.Schema({
     meterType: {
         type: String,
         required: true,
@@ -103,8 +103,8 @@ const meterSchema = new mongoose.Schema({
     timestamps: true
 });
 
-meterSchema.index({ meterNumber: 1, status: 1 });
+waterMeterSchema.index({ meterNumber: 1, status: 1 });
 
-const Meter = mongoose.model('Meter', meterSchema);
+const WaterMeter = mongoose.model('WaterMeter', waterMeterSchema);
 
-module.exports = Meter;
+module.exports = WaterMeter;