payservedb 5.3.5 → 5.3.7

package/index.js

@@ -40,11 +40,20 @@ async function switchDB(dbName) {
     if (connections[dbName]) {
         return connections[dbName]; // Return existing connection
     }
+
     try {
-        const connectionString = `mongodb://${url}/${dbName}${source}`;
+        // Use environment variables for connection parameters - same as in connectToMongoDB
+        const username = process.env.MONGODB_USER;
+        const password = process.env.MONGODB_PASSWORD;
+        const url = process.env.MONGODB_HOST;
+        const port = process.env.MONGODB_PORT;
+        const source = '?authSource=admin';
+
+        const connectionString = `mongodb://${username}:${password}@${url}:${port}/${dbName}${source}`;
         const dbConnection = await mongoose.createConnection(connectionString, {
             useNewUrlParser: true,
         });
+
         connections[dbName] = dbConnection; // Store the connection for reuse
         console.log(`Switched to database: ${dbName}`);
         return dbConnection;
@@ -130,6 +139,8 @@ const models = {
     SingleDayWaterMeterHistory: require('./src/models/water_meter_single_day_history'),
     DailyWaterMeterHistory: require('./src/models/water_meter_daily_history'),
     MonthlyWaterMeterHistory: require('./src/models/water_meter_monthly_history'),
+    WaterPrepaidCredit: require('./src/models/water_prepaid_credit'),
+    WaterPrepaidDebit: require('./src/models/water_prepaid_debit'),
     MeterLog: require('./src/models/water_meter_communication_logs'),
     CashPayment: require('./src/models/cashpayment'),
     VasPayment: require('./src/models/vas_payments'),

package/package.json

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

package/src/models/pendingCredentials.js

@@ -1,3 +1,5 @@
+const mongoose = require("mongoose");
+
 const pendingCredentialSchema = new mongoose.Schema({
     userId: {
       type: mongoose.Schema.Types.ObjectId,
@@ -25,5 +27,7 @@ const pendingCredentialSchema = new mongoose.Schema({
       expires: '7d' // Auto-delete after 7 days
     }
   });
+
+  const PendingCredential = mongoose.model("PendingCredential", pendingCredentialSchema);
   
-  module.exports = mongoose.model('PendingCredential', pendingCredentialSchema);
+  module.exports = PendingCredential;