payservedb 6.1.2 → 6.1.4

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,82 +207,47 @@ 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 = []) {
-  const serviceModels = {};
   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
-    modelNames.forEach(modelName => {
-      if (models[modelName] && !currentConnection.models[modelName]) {
-        serviceModels[modelName] = currentConnection.model(modelName, models[modelName]);
-      } else if (currentConnection.models[modelName]) {
-        serviceModels[modelName] = currentConnection.models[modelName];
-      }
-    });
-    
-    return serviceModels;
-  }
-  
-  // Enhanced switchDB function that also registers models
-  async function switchDBWithModels(dbName) {
-    const dbConnection = await switchDB(dbName);
-    currentConnection = dbConnection;
-    
-    // Register models with the new connection
-    const dbModels = {};
+    // Only register the models specified in modelNames
     modelNames.forEach(modelName => {
       if (models[modelName]) {
-        if (!dbConnection.models[modelName]) {
-          dbModels[modelName] = dbConnection.model(modelName, models[modelName]);
+        let schema;
+        
+        // Extract schema from the imported model
+        if (models[modelName].schema) {
+          schema = models[modelName].schema;
         } else {
-          dbModels[modelName] = dbConnection.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 through payservedb
+          module.exports[modelName] = modelInstance;
+        } else {
+          module.exports[modelName] = currentConnection.models[modelName];
+        }
+      } else {
+        console.warn(`Model ${modelName} not found in models registry`);
       }
     });
     
-    return { connection: dbConnection, models: dbModels };
-  }
-  
-  // Function to get models for the current connection
-  function getModels() {
-    if (!currentConnection) {
-      throw new Error('No active database connection. Please connect first.');
-    }
-    
-    const connectionModels = {};
-    modelNames.forEach(modelName => {
-      if (currentConnection.models[modelName]) {
-        connectionModels[modelName] = currentConnection.models[modelName];
-      }
-    });
-    
-    return connectionModels;
-  }
-  
-  // Function to get a specific model
-  function getModel(modelName) {
-    if (!currentConnection) {
-      throw new Error('No active database connection. Please connect first.');
-    }
-    
-    if (!modelNames.includes(modelName)) {
-      throw new Error(`Model ${modelName} not initialized in this service`);
-    }
-    
-    return currentConnection.models[modelName];
+    return module.exports;
   }
   
   return {
     connectToMongoDB: connectWithModels,
-    switchDB: switchDBWithModels,
-    getModels,
-    getModel,
+    switchDB,
+    getModelFromDB,
     getCurrentConnection: () => currentConnection
   };
 }
@@ -291,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.2",
+  "version": "6.1.4",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"