From 33b3027b5398a87aade77b92d2391b7f8f4d87cb Mon Sep 17 00:00:00 2001
From: ehmicky <ehmicky@gmail.com>
Date: Sun, 19 Dec 2021 21:37:32 +0100
Subject: [PATCH] Refactoring

---
 src/combination/ids/namespace.js | 41 +++++++++++++-------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/combination/ids/namespace.js b/src/combination/ids/namespace.js
index 67b93d041..061725b7e 100644
--- 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