payservedb 6.1.3 → 6.1.5

package/index.js

@@ -66,6 +66,7 @@ async function switchDB(dbName) {
 }
 
 // Importing all model files (Note: models may need to be re-registered for different connections)
+// This maintains backward compatibility for existing services
 const models = {
   User: require("./src/models/user"),
   AuditLog: require("./src/models/auditlog"),
@@ -206,37 +207,37 @@ async function getModelFromDB(dbConnection, modelName, schema) {
   return dbConnection.models[modelName]; // Return existing model if already registered
 }
 
-// Function to initialize service with specific models
+// Function to initialize service with specific models - NEW FEATURE
 function initializeService(modelNames = []) {
   let currentConnection = null;
   
-  // Enhanced connect function that also registers models
+  // Enhanced connect function that only registers specified models
   async function connectWithModels(dbName, secured, username, password, url, port) {
     await connectToMongoDB(dbName, secured, username, password, url, port);
     currentConnection = mongoose.connection;
     
-    // Register models with the current connection and make them globally accessible
+    // Only register the models specified in modelNames
     modelNames.forEach(modelName => {
       if (models[modelName]) {
-        // Check if it's already a mongoose model or if it has a schema property
         let schema;
+        
+        // Extract schema from the imported model
         if (models[modelName].schema) {
           schema = models[modelName].schema;
-        } else if (typeof models[modelName] === 'function' && models[modelName].prototype) {
-          // It's likely already a model, skip it
-          console.warn(`Model ${modelName} appears to already be a Mongoose model`);
-          return;
         } else {
-          schema = models[modelName];
+          console.warn(`Unable to extract schema from model ${modelName}`);
+          return;
         }
         
         if (!currentConnection.models[modelName]) {
           const modelInstance = currentConnection.model(modelName, schema);
-          // Make model globally accessible
+          // Make model globally accessible through payservedb
           module.exports[modelName] = modelInstance;
         } else {
           module.exports[modelName] = currentConnection.models[modelName];
         }
+      } else {
+        console.warn(`Model ${modelName} not found in models registry`);
       }
     });
     
@@ -256,5 +257,5 @@ module.exports = {
   switchDB,
   getModelFromDB,
   initializeService,
-  ...models, // Spread operator to export all models
+  ...models, // Spread operator to export all models for backward compatibility
 };

package/package.json

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

package/src/models/powerMeterCustomerBand.js

@@ -1,40 +1,9 @@
 const mongoose = require('mongoose');
 
 const powerMeterCustomerBandSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    meterSerialNumber: {
-        type: String,
-        required: true
-    },
-    deviceId: {
-        type: Number,
-        required: false
-    },
-    gatewayId: {
-        type: String,
-        required: true
-    },
-    meterReading: {
-        type: Number,
-        required: true
-    },
-    lastUpdated: {
-        type: Date,
-        required: true
-    },
-    manufacturer: {
+    name: {
         type: String,
         required: true
-    },
-    type: {
-        type: String,
-        required: true,
-        enum: ['2 phase', '3 phase'],
-        default: '2 phase'
     }
 }, {
     timestamps: true