[utils] deepMergeObjecs() added

Author: Georgii Petrov

Common/config/default.json

@@ -177,7 +177,7 @@
 				"connectionlimit": 10,
 				"max_allowed_packet": 1048575,
 				"pgPoolExtraOptions": {
-					"idleTimeoutMillis": 3000,
+					"idleTimeoutMillis": 30000,
 					"maxLifetimeSeconds ": 60000,
 					"statement_timeout ": 60000,
 					"query_timeout  ": 60000,
@@ -202,7 +202,7 @@
 						"trustServerCertificate": true
 					},
 					"pool": {
-						"idleTimeoutMillis": 3000
+						"idleTimeoutMillis": 30000
 					}
 				}
 			},

Common/sources/utils.js

@@ -1111,3 +1111,32 @@ exports.checksumFile = function(hashName, path) {
     stream.on('end', () => resolve(hash.digest('hex')));
   });
 };
+
+function isObject(item) {
+  return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+function deepMergeObjects(target, ...sources) {
+  if (!sources.length) {
+    return target;
+  }
+
+  const source = sources.shift();
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) {
+          Object.assign(target, { [key]: {} });
+        }
+
+        deepMergeObjects(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return deepMergeObjects(target, ...sources);
+}
+exports.isObject = isObject;
+exports.deepMergeObjects = deepMergeObjects;

DocService/sources/databaseConnectors/damengConnector.js

@@ -29,7 +29,7 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-
+// git actions trigger
 'use strict';
 
 const connectorUtilities = require('./connectorUtilities');

DocService/sources/databaseConnectors/mssqlConnector.js

@@ -54,17 +54,7 @@ const connectionConfiguration = {
   }
 };
 const additionalOptions = configSql.get('msSqlExtraOptions');
-
-const mergedObjects = {};
-for (const option in additionalOptions) {
-  if (connectionConfiguration.hasOwnProperty(option) && typeof connectionConfiguration[option] === 'object') {
-    mergedObjects[option] = Object.assign({}, connectionConfiguration[option], additionalOptions[option]);
-  } else {
-    mergedObjects[option] = additionalOptions[option];
-  }
-}
-
-const configuration = Object.assign({}, connectionConfiguration, mergedObjects);
+const configuration = utils.deepMergeObjects({}, connectionConfiguration, additionalOptions);
 
 const placeholderPrefix = 'ph_';