remove conn

telefonicaid · Dec 5, 2024 · a611f16 · a611f16
1 parent 26d9db6
commit a611f16
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/lib/model/Configuration.js b/lib/model/Configuration.js
@@ -69,9 +69,9 @@ const Configuration = new Schema({
     transport: String
 });
 
-function load(db) {
+function load() {
     Configuration.index({ apikey: 1, resource: 1, protocol: 1 }, { unique: true });
-    module.exports.model = db.model('Configuration', Configuration);
+    module.exports.model = mongoose.model('Configuration', Configuration);
     module.exports.internalSchema = Configuration;
 }
 

diff --git a/lib/model/Protocol.js b/lib/model/Protocol.js
@@ -31,9 +31,9 @@ const Protocol = new Schema({
     description: String
 });
 
-function load(db) {
+function load() {
     Protocol.index({ protocol: 1, resource: 1 }, { unique: true });
-    module.exports.model = db.model('Protocol', Protocol);
+    module.exports.model = mongoose.model('Protocol', Protocol);
     module.exports.internalSchema = Protocol;
 }
 

diff --git a/lib/model/dbConn.js b/lib/model/dbConn.js
@@ -30,14 +30,13 @@ const mongoose = require('mongoose');
 const config = require('../utils/commonConfig');
 const constants = require('../utils/constants');
 const errors = require('../errors');
-let defaultDb;
 const DEFAULT_DB_NAME = 'iotagent-manager';
 
 mongoose.Promise = global.Promise; // not including this causes DeprecationWarning
 
 function loadModels() {
-    require('./Protocol').load(defaultDb);
-    require('./Configuration').load(defaultDb);
+    require('./Protocol').load();
+    require('./Configuration').load();
 }
 
 // Delay function for nodejs16
@@ -72,7 +71,7 @@ async function init(logger, host, db, port, username, password, options) {
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
         try {
             logger.info(`Attempt ${attempt}: Connecting to MongoDB at ${url}`);
-            defaultDb = await mongoose.connect(url, options);
+            await mongoose.connect(url, options);
             logger.info('Successfully connected to MongoDB.');
 
             // Register events
@@ -122,5 +121,4 @@ async function configureDb(logger) {
 }
 
 exports.configureDb = configureDb;
-exports.db = defaultDb;
 exports.DEFAULT_DB_NAME = DEFAULT_DB_NAME;