payservedb 4.2.5 → 4.2.7

package/index.js

@@ -9,22 +9,24 @@ const connections = {};
 // Utility function to connect to MongoDB
 async function connectToMongoDB(dbName, secured, username, password, url, port) {
     try {
-        if (secured === true) {
-            // This should be the secure connection with credentials
-            const connectionString = `mongodb://${username}:${password}@${url}:${port}/${dbName}?authSource=admin`;
+        if (secured === false) {
+            const url_ = url + ":" + port;
+            const connectionString = `mongodb://${url_}/${dbName}`;
             await mongoose.connect(connectionString, {
                 useNewUrlParser: true,
             });
-            console.log('Connected to MongoDB with security');
+            console.log('Connected to MongoDB');
         }
         else {
-            // This is the unsecured connection
-            const connectionString = `mongodb://${url}:${port}/${dbName}`;
+            const url_ = `${username}:${password}@${url}${port}`;
+            const source = '?authSource=admin'
+            const connectionString = `mongodb://${url_}/${dbName}${source}`;
             await mongoose.connect(connectionString, {
                 useNewUrlParser: true,
             });
-            console.log('Connected to MongoDB without security');
+            console.log('Connected to MongoDB');
         }
+
     } catch (err) {
         console.error('Error connecting to MongoDB:', err);
         throw err;
@@ -33,19 +35,13 @@ async function connectToMongoDB(dbName, secured, username, password, url, port)
 
 
 // Function to switch databases dynamically
-async function switchDB(dbName, secured, username, password, url, port) {
+async function switchDB(dbName) {
     // Check if there's already a connection to the desired database
     if (connections[dbName]) {
         return connections[dbName]; // Return existing connection
     }
     try {
-        let connectionString;
-        if (secured === true) {
-            connectionString = `mongodb://${username}:${password}@${url}:${port}/${dbName}?authSource=admin`;
-        } else {
-            connectionString = `mongodb://${url}:${port}/${dbName}`;
-        }
-        
+        const connectionString = `mongodb://${url}/${dbName}${source}`;
         const dbConnection = await mongoose.createConnection(connectionString, {
             useNewUrlParser: true,
         });
@@ -131,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.5",
+  "version": "4.2.7",
   "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/water_meters.js

@@ -0,0 +1,110 @@
+const mongoose = require('mongoose');
+
+const meterSchema = new mongoose.Schema({
+    meterType: {
+        type: String,
+        required: true,
+        enum: ['analog', 'smart']
+    },
+    meterNumber: { 
+        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: mongoose.Schema.Types.ObjectId,
+        ref: 'MeterManufacturer',
+    },
+    protocol: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'MeterProtocol',
+    },
+    size: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'MeterSize',
+    },
+    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
+    },
+    readingHistory: [{
+        previousReading: Number,
+        currentReading: Number,
+        readingDate: {
+            type: Date,
+            default: Date.now
+        },
+        readBy: String,
+        consumption: Number
+    }],
+    status: {
+        type: String,
+        required: true,
+        enum: ['open', 'closed', 'maintenance', 'faulty'],
+        default: 'open',
+    },
+    customerType: { 
+        type: String,
+        enum: ['postpaid', 'prepaid'],
+    },
+    isInstalled: {
+        type: Boolean,
+        default: false
+    },
+    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
+});
+
+meterSchema.index({ meterNumber: 1, status: 1 });
+
+const Meter = mongoose.model('Meter', meterSchema);
+
+module.exports = Meter;