fix: fix merge config to default config

use lodash merge to merge deep object
Botfuel · Apr 18, 2018 · 6d9943c · 6d9943c
1 parent 147670e
commit 6d9943c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/packages/botfuel-dialog/src/config.js b/packages/botfuel-dialog/src/config.js
@@ -16,7 +16,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { omitBy } = require('lodash');
+const _ = require('lodash');
 const logger = require('logtown')('Config');
 const LoggerManager = require('./logger-manager');
 const ConfigurationError = require('./errors/configuration-error');
@@ -108,11 +108,13 @@ const getComponentRoots = function (config) {
  */
 const getConfiguration = (botConfig = {}) => {
   // get the config by extending defaultConfig with botConfig
-  const config = Object.assign(
+  const config = _.merge(
     defaultConfig,
-    omitBy(botConfig, (val, key) => !whitelist.includes(key)),
+    _.omitBy(botConfig, (val, key) => !whitelist.includes(key)),
   );
 
+  Object.assign(defaultConfig);
+
   config.brain.conversationDuration =
     config.brain.conversationDuration || DEFAULT_CONVERSATION_DURATION;
 

diff --git a/packages/test-modules/test-config.js b/packages/test-modules/test-config.js
@@ -28,7 +28,6 @@ module.exports = {
   modules: ['botfuel-module-sample'],
   nlu: {
     name: 'sample-module',
-    intentThreshold: 0.75,
     nluSecretSauce: 43,
   },
   path: __dirname,

diff --git a/packages/test-qna/botfuel-config.js b/packages/test-qna/botfuel-config.js
@@ -20,7 +20,6 @@ module.exports = {
   },
   nlu: {
     name: 'botfuel',
-    intentThreshold: 0.75,
     qna: {
       when: 'after',
     },

diff --git a/packages/test-qna/shell-config.js b/packages/test-qna/shell-config.js
@@ -17,7 +17,6 @@
 module.exports = {
   nlu: {
     name: 'botfuel',
-    intentThreshold: 0.75,
     qna: {
       when: 'after',
     },

diff --git a/packages/test-qna/test-config.js b/packages/test-qna/test-config.js
@@ -20,7 +20,6 @@ module.exports = {
   },
   nlu: {
     name: 'botfuel',
-    intentThreshold: 0.75,
     qna: {},
   },
   logger: 'error',

diff --git a/packages/test-resolvers/test-config.js b/packages/test-resolvers/test-config.js
@@ -27,7 +27,6 @@ module.exports = {
   logger: 'error',
   nlu: {
     name: 'custom',
-    intentThreshold: 0.75,
     nluSecretSauce: 43,
   },
   path: __dirname,
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ module.exports = { @@
       },
       nlu: {
         name: 'botfuel',
-        intentThreshold: 0.75,
         qna: {
           when: 'after',
         },
@@ Expand Down @@