fixup! refactor: enrich types from server config api (#200)

intershop · May 18, 2020 · ea45359 · ea45359
1 parent 5181417
commit ea45359
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/app/core/models/server-config/server-config.mapper.ts b/src/app/core/models/server-config/server-config.mapper.ts
@@ -1,4 +1,4 @@
-import { omit } from 'lodash-es';
+import { mapValues, omit } from 'lodash-es';
 
 import { ServerConfigData, ServerConfigDataEntry } from './server-config.interface';
 import { ServerConfig } from './server-config.model';
@@ -16,11 +16,6 @@ export class ServerConfigMapper {
     }
     return val;
   }
-  private static transformTypes(obj) {
-    return Object.entries(obj)
-      .map(v => v)
-      .reduce((acc, val) => ({ ...acc, [val[0]]: ServerConfigMapper.transformType(val[1]) }), {});
-  }
 
   private static mapEntries(entries: ServerConfigDataEntry[]) {
     return entries.reduce(
@@ -29,10 +24,11 @@ export class ServerConfigMapper {
         [entry.id]: Array.isArray(entry.elements)
           ? // do recursion if elements array is set
             ServerConfigMapper.mapEntries(entry.elements)
-          : // transform string types to better values
-            ServerConfigMapper.transformTypes(
+          : mapValues(
               // filter out unnecessary 'id' attribute
-              omit(entry, 'id')
+              omit(entry, 'id'),
+              // transform string types to better values
+              ServerConfigMapper.transformType
             ),
       }),
       {}

diff --git a/tslint.json b/tslint.json
@@ -337,7 +337,7 @@
           "from": "lodash.*"
         },
         {
-          "import": "^(?!(range|uniq|memoize|once|groupBy|countBy|flatten|isEqual|intersection|omit|pick)$).*",
+          "import": "^(?!(range|uniq|memoize|once|groupBy|countBy|flatten|isEqual|intersection|omit|pick|mapValues)$).*",
           "from": "lodash.*"
         },
         {