Show label or external ID when set in jury clarification recipient dropdown.

Author: nickygerritsen

webapp/src/Form/Type/JuryClarificationType.php

@@ -6,6 +6,7 @@
 use App\Entity\Team;
 use App\Service\ConfigurationService;
 use App\Service\DOMJudgeService;
+use App\Service\EventLogService;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -22,6 +23,7 @@ public function __construct(
         private readonly EntityManagerInterface $em,
         private readonly ConfigurationService $config,
         private readonly DOMJudgeService $dj,
+        private readonly EventLogService $eventLogService,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -33,12 +35,12 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
 
         $limitToTeam = $options['limit_to_team'] ?? null;
         if ($limitToTeam) {
-            $recipientOptions[sprintf("%s (t%s)", $limitToTeam->getEffectiveName(), $limitToTeam->getTeamid())] = $limitToTeam->getTeamid();
+            $recipientOptions[$this->getTeamLabel($limitToTeam)] = $limitToTeam->getTeamid();
         } else {
             /** @var Team|null $limitToTeam */
             $teams = $this->em->getRepository(Team::class)->findAll();
             foreach ($teams as $team) {
-                $recipientOptions[sprintf("%s (t%s)", $team->getEffectiveName(), $team->getTeamid())] = $team->getTeamid();
+                $recipientOptions[$this->getTeamLabel($team)] = $team->getTeamid();
             }
         }
 
@@ -110,4 +112,17 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('limit_to_team', null);
     }
+
+    private function getTeamLabel(Team $team): string
+    {
+        if ($team->getLabel()) {
+            return sprintf('%s (%s)', $team->getEffectiveName(), $team->getLabel());
+        }
+
+        if ($this->eventLogService->externalIdFieldForEntity($team)) {
+            return sprintf('%s (%s)', $team->getEffectiveName(), $team->getExternalId());
+        }
+
+        return sprintf('%s (t%s)', $team->getEffectiveName(), $team->getTeamid());
+    }
 }

webapp/tests/Unit/Controller/Jury/ClarificationControllerTest.php

@@ -97,8 +97,8 @@ public function testClarificationRequestComposeForm(): void
 
         $options = $crawler->filter('option')->extract(['_text']);
         self::assertEquals('ALL', $options[1]);
-        self::assertEquals('DOMjudge (t1)', $options[2]);
-        self::assertEquals('Example teamname (t2)', $options[3]);
+        self::assertEquals('DOMjudge (domjudge)', $options[2]);
+        self::assertEquals('Example teamname (exteam)', $options[3]);
 
         $labels = $crawler->filter('label')->extract(['_text']);
         self::assertEquals('Send to', $labels[0]);