[TASK] Refactor SkillGroupingViewHelper

Classes/ViewHelpers/SkillGroupingViewHelper.php

@@ -62,11 +62,7 @@ class SkillGroupingViewHelper extends AbstractViewHelper
         $skillSet = $arguments['skillSet'];
         $as = $arguments['as'];
 
-        if ($skillSet) {
-            $groups = self::group($skillSet->getSkills());
-        } else {
-            $groups = self::group($skills);
-        }
+        $groups = self::group($skillSet ? $skillSet->getSkills() : $skills);
 
         $templateVariableContainer = $renderingContext->getVariableProvider();
         $output = '';
@@ -84,23 +80,19 @@ class SkillGroupingViewHelper extends AbstractViewHelper
      */
     protected static function group(array $skills): array
     {
-        $domainTags = [];
-        foreach ($skills as $skill) {
-            $domainTags[] = isset($skill->toArray()['domainTag']) ? $skill->toArray()['domainTag']['title'] : "none";
-        }
-        $domainTags = array_unique($domainTags);
-
         $result = [];
-        foreach ($domainTags as $domainTag) {
-            $result[] = [
-                'title' => $domainTag,
-                'skills' => array_filter($skills, function (Skill $skill) use ($domainTag) {
-                    if (!isset($skill->toArray()['domainTag'])) {
-                        return $domainTag === "none";
-                    }
-                    return $skill->toArray()['domainTag']['title'] === $domainTag;
-                })
-            ];
+        foreach ($skills as $skill) {
+            $skillAsArray = $skill->toArray();
+            $domainTag = !empty($skillAsArray['domainTag']) ? $skillAsArray['domainTag'] : ['uid' => 0, 'title' => ''];
+
+            if (!isset($result[$domainTag['uid']])) {
+                $result[$domainTag['uid']] = [
+                    'uid' => $domainTag['uid'],
+                    'title' => $domainTag['title'],
+                    'skills' => [],
+                ];
+            }
+            $result[$domainTag['uid']]['skills'][] = $skill;
         }
         return $result;
     }