Fix tests to be in sync with external ID changes

Part of #3024

Author: nickygerritsen

webapp/src/Controller/API/BalloonController.php

@@ -59,14 +59,14 @@ public function listAction(
         foreach ($balloonsData as $b) {
             /** @var Team $team */
             $team = $b['data']['team'];
-            $teamName = "t" . $team->getTeamid() . ": " . $team->getEffectiveName();
+            $teamName = $team->getExternalid() . ": " . $team->getEffectiveName();
             $balloons[] = new Balloon(
                 balloonid: $b['data']['balloonid'],
                 time: $b['data']['time'],
                 problem: $b['data']['problem'],
                 contestproblem: $b['data']['contestproblem'],
                 team: $teamName,
-                teamid: $team->getTeamid(),
+                teamid: $team->getExternalid(),
                 location: $b['data']['location'],
                 affiliation: $b['data']['affiliation'],
                 affiliationid: $b['data']['affiliationid'],

webapp/src/Controller/Jury/ProblemController.php

@@ -1016,7 +1016,7 @@ public function editAction(Request $request, string $probId): Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/delete-multiple', name: 'jury_problem_delete_multiple', methods: ['GET', 'POST'])]
+    #[Route(path: '/delete-multiple', name: 'jury_problem_delete_multiple', methods: ['GET', 'POST'], priority: 1)]
     public function deleteMultipleAction(Request $request): Response
     {
         return $this->deleteMultiple(

webapp/src/Controller/Jury/TeamController.php

@@ -218,7 +218,7 @@ public function indexAction(): Response
                 'data' => $teamdata,
                 'actions' => $teamactions,
                 'link' => $this->generateUrl('jury_team', ['teamId' => $t->getExternalid()]),
-                'cssclass' => ($t->getCategory() ? ("category" . $t->getCategory()->getCategoryId()) : '') .
+                'cssclass' => ($t->getCategory() ? ("category" . $t->getCategory()->getExternalid()) : '') .
                     ($t->getEnabled() ? '' : ' disabled'),
             ];
         }

webapp/src/Controller/Jury/UserController.php

@@ -403,7 +403,7 @@ public function deleteMultipleAction(Request $request): Response
         return $this->deleteMultiple(
             $request,
             User::class,
-            'userid',
+            'externalid',
             'jury_users',
             'No users could be deleted (you cannot delete your own account).',
             fn(User $user) => $user->getUserid() !== $this->dj->getUser()->getUserid()

webapp/src/DataTransferObject/Balloon.php

@@ -16,12 +16,12 @@ public function __construct(
         public readonly string $problem,
         public readonly ContestProblem $contestproblem,
         public readonly string $team,
-        public readonly int $teamid,
+        public readonly string $teamid,
         public readonly ?string $location,
         public readonly ?string $affiliation,
-        public readonly ?int $affiliationid,
+        public readonly ?string $affiliationid,
         public readonly ?string $category,
-        public readonly ?int $categoryid,
+        public readonly ?string $categoryid,
         #[Serializer\Type('array<string, App\Entity\ContestProblem>')]
         public readonly array $total,
         public readonly bool $done,

webapp/src/Entity/User.php

@@ -214,7 +214,7 @@ public function getName(): ?string
 
     public function getShortDescription(): string
     {
-        return $this->getName();
+        return $this->getName() ?: $this->getUsername();
     }
 
     public function setEmail(?string $email): User

webapp/src/Service/BalloonService.php

@@ -85,8 +85,8 @@ public function updateBalloons(
 
     /**
      * @return array<array{data: array{balloonid: int, time: string, problem: string, contestproblem: ContestProblem,
-     *                                 team: Team, teamid: int, location: string|null, affiliation: string|null,
-     *                                 affiliationid: int, category: string, categoryid: int, total: array<string, ContestProblem>,
+     *                                 team: Team, teamid: string, location: string|null, affiliation: string|null,
+     *                                 affiliationid: string, category: string, categoryid: string, total: array<string, ContestProblem>,
      *                                 done: bool}}>
     */
     public function collectBalloonTable(Contest $contest, bool $todo = false): array

webapp/templates/jury/versions.html.twig

@@ -17,7 +17,7 @@
                 Language <code>{{ lang.language.langid }}</code>
                 {% if is_granted('ROLE_ADMIN') %}
                 <span style="float: right">
-                    {{ button(path('jury_language_edit', {'langId': lang.language.langid}), 'Edit version command(s)', 'primary btn-sm', 'edit') }}
+                    {{ button(path('jury_language_edit', {'langId': lang.language.externalid}), 'Edit version command(s)', 'primary btn-sm', 'edit') }}
                 </span>
                 {% endif %}
             </div>

webapp/templates/partials/scoreboard_summary.html.twig

@@ -32,7 +32,7 @@
                 <td style="text-align: left;">
                     {% set link = null %}
                     {% if jury %}
-                        {% set link = path('jury_problem', {'probId': problem.probid}) %}
+                        {% set link = path('jury_problem', {'probId': problem.externalid}) %}
                     {% endif %}
                     <a {% if link %}href="{{ link }}"{% endif %}>
                         <i class="fas fa-thumbs-up fa-fw"></i>

webapp/tests/Unit/Controller/API/BalloonsControllerTest.php

@@ -37,7 +37,7 @@ public function testBalloonsNoJudgings(): void
 
     public function testMarkAsDone(): void
     {
-        $expectedBalloon = ['team'=>'t2: Example teamname', 'problem'=>'U'];
+        $expectedBalloon = ['team'=>'exteam: Example teamname', 'problem'=>'U'];
         $contestId = $this->getUnitContestId();
         $url = "/contests/$contestId/balloons?todo=1";
         $this->loadFixtures([BalloonCorrectSubmissionFixture::class,BalloonUserFixture::class]);