Refactoring

ehmicky · Dec 19, 2021 · 33b3027 · 33b3027
1 parent 0b4a4e1
commit 33b3027
Showing 1 changed file with 17 additions and 24 deletions.
diff --git a/src/combination/ids/namespace.js b/src/combination/ids/namespace.js
@@ -60,35 +60,17 @@ const namespaceDimensionId = function (
   combination,
   combDimensionId,
 ) {
-  const similarDimensionId = findSameId(dimensionsIds, combDimensionId)
-
-  if (similarDimensionId === undefined) {
-    // eslint-disable-next-line fp/no-mutating-methods
-    dimensionsIds.push(combDimensionId)
-    return combination
-  }
+  const similarDimensionId = addDimensionId(dimensionsIds, combDimensionId)
 
-  if (isSameDimension(combDimensionId, similarDimensionId)) {
+  if (
+    similarDimensionId === undefined ||
+    isSameDimension(combDimensionId, similarDimensionId)
+  ) {
     return combination
   }
 
-  return renameDimensionId(dimensionsIds, combination, combDimensionId)
-}
-
-const renameDimensionId = function (
-  dimensionsIds,
-  combination,
-  combDimensionId,
-) {
   const combDimensionIdA = addNamespace(combDimensionId, dimensionsIds)
-
-  const similarDimensionId = findSameId(dimensionsIds, combDimensionIdA)
-
-  if (similarDimensionId === undefined) {
-    // eslint-disable-next-line fp/no-mutating-methods
-    dimensionsIds.push(combDimensionIdA)
-  }
-
+  addDimensionId(dimensionsIds, combDimensionIdA)
   const combinationA = setDimensionId(combination, combDimensionIdA)
   return combinationA
 }
@@ -106,6 +88,17 @@ const addNamespace = function (
     : combDimensionIdA
 }
 
+const addDimensionId = function (dimensionsIds, combDimensionId) {
+  const similarDimensionId = findSameId(dimensionsIds, combDimensionId)
+
+  if (similarDimensionId === undefined) {
+    // eslint-disable-next-line fp/no-mutating-methods
+    dimensionsIds.push(combDimensionId)
+  }
+
+  return similarDimensionId
+}
+
 const updateRawResult = function (rawResult, combinations) {
   return rawResult.combinations === combinations
     ? rawResult