From 54eae52b91bca1ae8676c750bf9cfaaa20b783ad Mon Sep 17 00:00:00 2001 From: ehmicky Date: Sun, 12 Sep 2021 15:59:41 +0200 Subject: [PATCH] Refactoring --- src/combination/ids.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/combination/ids.js b/src/combination/ids.js index ac2b2fc43..d67b2e40e 100644 --- a/src/combination/ids.js +++ b/src/combination/ids.js @@ -12,16 +12,13 @@ export const hasSameCombinationIds = function (combinationA, combinationB) { // Retrieve all unique combinations identifiers. // For all combinations of a given result. export const getCombinationsIds = function (combinations) { - return combinations.flatMap(getIdInfos).filter(isNotSameDimDuplicate) -} - -// Same but for a single combination -export const getCombinationIds = function (combination) { - return getIdInfos(combination) + return combinations.flatMap(getCombinationIds).filter(isNotSameDimDuplicate) } export const getCombinationName = function (combination) { - return getIdInfos(combination).map(getDimensionName).join(noteColor(', ')) + return getCombinationIds(combination) + .map(getDimensionName) + .join(noteColor(', ')) } const getDimensionName = function ({ dimension, id }, index) { @@ -33,7 +30,7 @@ const titleize = function (string) { return `${string.charAt(0).toUpperCase()}${string.slice(1)}` } -const getIdInfos = function (combination) { +export const getCombinationIds = function (combination) { return DIMENSIONS.map(({ dimension, idName }) => ({ dimension, id: combination[idName],