payservedb 6.1.2 → 6.1.3

package/index.js

@@ -208,7 +208,6 @@ async function getModelFromDB(dbConnection, modelName, schema) {
 
 // Function to initialize service with specific models
 function initializeService(modelNames = []) {
-  const serviceModels = {};
   let currentConnection = null;
   
   // Enhanced connect function that also registers models
@@ -216,72 +215,38 @@ function initializeService(modelNames = []) {
     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 = {};
+    // Register models with the current connection and make them globally accessible
     modelNames.forEach(modelName => {
       if (models[modelName]) {
-        if (!dbConnection.models[modelName]) {
-          dbModels[modelName] = dbConnection.model(modelName, models[modelName]);
+        // Check if it's already a mongoose model or if it has a schema property
+        let schema;
+        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 {
-          dbModels[modelName] = dbConnection.models[modelName];
+          schema = models[modelName];
+        }
+        
+        if (!currentConnection.models[modelName]) {
+          const modelInstance = currentConnection.model(modelName, schema);
+          // Make model globally accessible
+          module.exports[modelName] = modelInstance;
+        } else {
+          module.exports[modelName] = currentConnection.models[modelName];
         }
       }
     });
     
-    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
   };
 }

package/package.json

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