configure database-name outside connection string

Author: nsandstrom

.azure/ref.parameters.json

@@ -12,6 +12,7 @@
       "value": {
         "API_VERSION": "^2.0.0",
         "CONSOLE_ENABLED": "false",
+        "DATABASE_NAME": "test",
         "LOGGING_ACCESS_LOG": "false",
         "LOGGING_LEVEL": "info",
         "NODE_ENV": "production",

config/serverSettings.js

@@ -7,7 +7,7 @@
  * *************************************************
  *
  */
-const { getEnv, unpackMongodbConfig, unpackApiKeysConfig, devDefaults } = require('kth-node-configuration')
+const { getEnv, unpackApiKeysConfig, devDefaults } = require('kth-node-configuration')
 
 // DEFAULT SETTINGS used for dev, if you want to override these for you local environment, use env-vars in .env
 const devPrefixPath = devDefaults('/api/node')
@@ -31,7 +31,10 @@ module.exports = {
   api_keys: unpackApiKeysConfig('API_KEYS', devApiKeys),
 
   // Services
-  db: unpackMongodbConfig('MONGODB_URI', devMongodb),
+  mongodb: {
+    connectionString: getEnv('MONGODB_URI', devMongodb),
+    databaseName: getEnv('DATABASE_NAME'),
+  },
 
   // Logging
   logging: {

server/controllers/systemCtrl.js

@@ -3,10 +3,10 @@
 const os = require('os')
 const fs = require('fs')
 const log = require('@kth/log')
-const db = require('@kth/mongo')
 const { getPaths } = require('kth-node-express-routing')
 const { monitorRequest } = require('@kth/monitor')
 
+const db = require('../database')
 const configServer = require('../configuration').server
 const version = require('../../config/version')
 const packageFile = require('../../package.json')

server/controllers/systemCtrl.test.js

@@ -15,6 +15,11 @@ jest.mock('@kth/log', () => ({
   error: jest.fn(() => {}),
 }))
 
+jest.mock('../database', () => ({
+  connect: jest.fn(),
+  isOk: jest.fn(() => true),
+}))
+
 jest.mock('../../server/configuration', () => ({
   server: {
     api_keys: '1234',

server/database.js

@@ -1,24 +1,20 @@
 'use strict'
 
 const log = require('@kth/log')
-const nodeMongo = require('@kth/mongo')
+const mongoose = require('mongoose')
 const config = require('./configuration').server
 
-const mongoOptions = {
-  user: config.db.username,
-  pass: config.db.password,
-  ssl: config.db.ssl,
-  dbUri: config.db.authDatabase !== '' ? config.db.uri + `?authSource=${config.db.authDatabase}` : config.db.uri,
-  logger: log,
-}
-
-module.exports.connect = function connect() {
-  nodeMongo
-    .connect(mongoOptions)
+const connect = () => {
+  mongoose
+    .connect(config.mongodb.connectionString, { dbName: config.mongodb.databaseName })
     .then(() => {
       log.info('MongoDB: connected')
     })
     .catch(err => {
       log.error({ err }, 'MongoDB: ERROR connecting DB')
     })
 }
+
+const isOk = () => mongoose.connection.readyState === 1
+
+module.exports = { connect, isOk }