payservedb 4.2.6 → 4.2.8

package/index.js

@@ -127,7 +127,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/user_account'),
+    UserAccount: 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.6",
+  "version": "4.2.8",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/{user_account.js → water_meter_account.js}

@@ -63,13 +63,7 @@ const userAccountSchema = new mongoose.Schema({
     },
     meter_id: {
         type: mongoose.Schema.Types.ObjectId,
-        required: true,
-        refPath: 'meterModel'
-    },
-    meterModel: {
-        type: String,
-        required: true,
-        enum: ['Meter', 'AnalogMeter']
+        ref: 'Meter',
     }
 }, {
     timestamps: true

package/src/models/analog_water_meter.js

@@ -1,68 +0,0 @@
-const mongoose = require('mongoose');
-
-const analogMeterSchema = new mongoose.Schema({
-    meterNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-        trim: true,
-        unique: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-    },
-    initialReading: {
-        type: Number,
-        required: true,
-        min: 0,
-        default: 0
-    },
-    previousReading: {
-        type: Number,
-        min: 0,
-    },
-    currentReading: {
-        type: Number,
-        min: 0,
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['open', 'closed', 'maintenance', 'faulty'],
-        default: 'open',
-    },
-    customerType: {
-        type: String,
-        enum: ['postpaid', 'prepaid'],
-    },
-    lastReadingDate: {
-        type: Date,
-        default: Date.now
-    },
-    readingHistory: [{
-        previousReading: Number,
-        currentReading: Number,
-        readingDate: {
-            type: Date,
-            default: Date.now
-        },
-        readBy: String,
-        consumption: Number
-    }]
-}, {
-    timestamps: true
-});
-
-const AnalogMeter = mongoose.model('AnalogMeter', analogMeterSchema);
-
-module.exports = AnalogMeter;

package/src/models/smart_water_meter.js

@@ -1,86 +0,0 @@
-const mongoose = require('mongoose');
-
-const meterSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-    },
-    serialNumber: {
-        type: String,
-        required: true,
-        trim: true,
-        unique: true,
-        index: true
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-        trim: true,
-        unique: true
-    },
-    accountBalance: {
-        type: Number,
-        trim: true,
-    },
-    negativeBalance: {
-        type: Number,
-        trim: true,
-    },
-    userType: {
-        type: String,
-        enum: ['postpaid', 'prepaid'],
-    },
-    valveType: {
-        type: String,
-        enum: ['automatic', 'manual'],
-        default: 'automatic'
-    },
-    isInstalled: {
-        type: Boolean,
-        default: false
-    },
-    manufacturer: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'MeterManufacturer',
-    },
-    protocol: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'MeterProtocol',
-    },
-    size: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'MeterSize',
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['open', 'closed', 'maintenance', 'faulty'],
-        default: 'closed',
-    },
-    initialReading: {
-        type: Number,
-        min: 0,
-        default: 0,
-    },
-    currentReading: {
-        type: Number,
-        min: 0,
-        default: 0,
-    },
-}, {
-    timestamps: true,
-});
-
-meterSchema.index({ serialNumber: 1, status: 1 });
-
-const Meter = mongoose.model('Meter', meterSchema);
-
-module.exports = Meter;