Fix category import

Author: nickygerritsen

webapp/src/Service/ImportExportService.php

@@ -804,13 +804,26 @@ public function importGroupsJson(array $data, ?string &$message = null, ?array &
     {
         // TODO: can we have this use the DTO?
         $groupData = [];
-        foreach ($data as $group) {
+        foreach ($data as $index => $group) {
+            if (isset($group['types'])) {
+                $types = [];
+                $typeMapping = array_flip(TeamCategory::TYPES_TO_STRING);
+                foreach ($group['types'] as $type) {
+                    if (!isset($typeMapping[$type])) {
+                        $message = sprintf('Invalid group type at index %d: %s', $index, $type);
+                        return -1;
+                    }
+                    $types[] = $typeMapping[$type];
+                }
+            } else {
+                $types = [TeamCategory::TYPE_SCORING, TeamCategory::TYPE_BADGE_TOP];
+            }
             $groupData[] = [
                 'categoryid' => @$group['id'],
                 'icpc_id' => @$group['icpc_id'],
                 'name' => $group['name'] ?? '',
                 'visible' => !($group['hidden'] ?? false),
-                'types' => $group['types'] ?? [TeamCategory::TYPE_SCORING, TeamCategory::TYPE_BADGE_TOP],
+                'types' => $types,
                 'sortorder' => @$group['sortorder'],
                 'color' => @$group['color'],
                 'css_class' => @$group['css_class'],
@@ -825,7 +838,7 @@ public function importGroupsJson(array $data, ?string &$message = null, ?array &
      * Import group data from the given array
      *
      * @param array<array{categoryid: string, icpc_id?: string, name: string, visible?: bool,
-     *              types?: string[]|null, sortorder?: int|null, color?: string|null, css_class?: string|null,
+     *              types?: int[]|null, sortorder?: int|null, color?: string|null, css_class?: string|null,
      *              allow_self_registration: bool}> $groupData
      * @param TeamCategory[]|null $saved The saved groups
      *
@@ -858,6 +871,7 @@ protected function importGroupData(
                 }
                 $added = true;
             }
+            /** @var list<int> $types */
             $types = $groupItem['types'] ?? [TeamCategory::TYPE_SCORING, TeamCategory::TYPE_BADGE_TOP];
             $sortOrder = $groupItem['sortorder'] ?? null;
             if (in_array(TeamCategory::TYPE_SCORING, $types, true) && $sortOrder === null) {

webapp/tests/Unit/Service/ImportExportServiceTest.php

@@ -1058,6 +1058,16 @@ public function testImportGroupsJson(): void
 }, {
     "id": "23",
     "name": "Spectators"
+}, {
+    "id": "24",
+    "name": "Color",
+    "types": ["background"],
+    "color": "#123123"
+}, {
+    "id": "25",
+    "name": "CSS",
+    "types": ["css-class"],
+    "css_class": "test"
 }]
 EOF;
 
@@ -1066,15 +1076,32 @@ public function testImportGroupsJson(): void
                 'externalid' => '13337',
                 'name' => 'Companies',
                 'icpcid' => '123',
+                'sortorder' => 0,
                 'visible' => false,
             ], [
                 'externalid' => '47',
                 'name' => 'Participants',
+                'sortorder' => 0,
                 'visible' => true,
             ], [
                 'externalid' => '23',
                 'name' => 'Spectators',
+                'sortorder' => 0,
+                'visible' => true,
+            ], [
+                'externalid' => '24',
+                'name' => 'Color',
+                'types' => [TeamCategory::TYPE_BACKGROUND],
+                'sortorder' => null,
+                'visible' => true,
+                'color' => '#123123',
+            ], [
+                'externalid' => '25',
+                'name' => 'CSS',
+                'types' => [TeamCategory::TYPE_CSS_CLASS],
+                'sortorder' => null,
                 'visible' => true,
+                'cssClass' => 'test',
             ],
         ];
 
@@ -1098,7 +1125,11 @@ public function testImportGroupsJson(): void
             self::assertNotNull($category, "Team cagegory $data[name] does not exist");
             self::assertEquals($data['icpcid'] ?? null, $category->getIcpcId());
             self::assertEquals($data['name'], $category->getName());
+            self::assertEquals($data['types'] ?? [TeamCategory::TYPE_SCORING, TeamCategory::TYPE_BADGE_TOP], $category->getTypes());
             self::assertEquals($data['visible'], $category->getVisible());
+            self::assertEquals($data['sortorder'] ?? null, $category->getSortorder());
+            self::assertEquals($data['color'] ?? null, $category->getColor());
+            self::assertEquals($data['cssClass'] ?? null, $category->getCssClass());
         }
     }