Change jury team pages to use external IDs instead of internal IDs

nickygerritsen · nickygerritsen · commit 928befb23f50 · 2025-11-30T09:43:49.000+01:00
Part of #3024
diff --git a/webapp/src/Controller/Jury/RejudgingController.php b/webapp/src/Controller/Jury/RejudgingController.php
@@ -705,7 +705,7 @@ public function createAction(Request $request): Response
             'language' => 'l.externalid',
             'problem' => 'p.externalid',
             'submission' => 's.externalid',
-            'team' => 's.team',
+            'team' => 't.externalid',
             'user' => 's.user',
             'rejudging' => 'j2.rejudging',
         ];
diff --git a/webapp/src/Controller/Jury/TeamController.php b/webapp/src/Controller/Jury/TeamController.php
@@ -91,8 +91,7 @@ public function indexAction(): Response
         $teams_that_solved = array_column($teams_that_solved, 'num_correct', 'teamid');
 
         $table_fields = [
-            'teamid' => ['title' => 'ID', 'sort' => true, 'default_sort' => true],
-            'externalid' => ['title' => 'external ID', 'sort' => true],
+            'externalid' => ['title' => 'ID', 'sort' => true, 'default_sort' => true],
             'label' => ['title' => 'label', 'sort' => true,],
             'effective_name' => ['title' => 'name', 'sort' => true,],
             'category' => ['title' => 'category', 'sort' => true,],
@@ -120,7 +119,7 @@ public function indexAction(): Response
             $teamdata    = [];
             $teamactions = [];
 
-            $this->addEntityCheckbox($teamdata, $t, $t->getTeamid(), 'team-checkbox', fn(Team $team) => !$team->isLocked());
+            $this->addEntityCheckbox($teamdata, $t, $t->getExternalid(), 'team-checkbox', fn(Team $team) => !$team->isLocked());
 
             // Get whatever fields we can from the team object itself.
             foreach ($table_fields as $k => $v) {
@@ -155,14 +154,14 @@ public function indexAction(): Response
                     'icon' => 'edit',
                     'title' => 'edit this team',
                     'link' => $this->generateUrl('jury_team_edit', [
-                        'teamId' => $t->getTeamid(),
+                        'teamId' => $t->getExternalid(),
                     ]),
                 ];
                 $teamactions[] = [
                     'icon' => 'trash-alt',
                     'title' => 'delete this team',
                     'link' => $this->generateUrl('jury_team_delete', [
-                        'teamId' => $t->getTeamId(),
+                        'teamId' => $t->getExternalid(),
                     ]),
                     'ajaxModal' => true,
                 ];
@@ -171,7 +170,7 @@ public function indexAction(): Response
                 'icon' => 'envelope',
                 'title' => 'send clarification to this team',
                 'link' => $this->generateUrl('jury_clarification_new', [
-                    'teamto' => $t->getTeamId(),
+                    'teamto' => $t->getExternalid(),
                 ])
             ];
 
@@ -218,7 +217,7 @@ public function indexAction(): Response
             $teams_table[] = [
                 'data' => $teamdata,
                 'actions' => $teamactions,
-                'link' => $this->generateUrl('jury_team', ['teamId' => $t->getTeamId()]),
+                'link' => $this->generateUrl('jury_team', ['teamId' => $t->getExternalid()]),
                 'cssclass' => ($t->getCategory() ? ("category" . $t->getCategory()->getCategoryId()) : '') .
                     ($t->getEnabled() ? '' : ' disabled'),
             ];
@@ -325,10 +324,10 @@ public function viewAction(
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/{teamId<\d+>}/edit', name: 'jury_team_edit')]
-    public function editAction(Request $request, int $teamId): Response
+    #[Route(path: '/{teamId}/edit', name: 'jury_team_edit')]
+    public function editAction(Request $request, string $teamId): Response
     {
-        $team = $this->em->getRepository(Team::class)->find($teamId);
+        $team = $this->em->getRepository(Team::class)->findByExternalId($teamId);
         if (!$team) {
             throw new NotFoundHttpException(sprintf('Team with ID %s not found', $teamId));
         }
@@ -341,7 +340,7 @@ public function editAction(Request $request, int $teamId): Response
             $this->possiblyAddUser($team);
             $this->assetUpdater->updateAssets($team);
             $this->saveEntity($team, $team->getTeamid(), false);
-            return $this->redirectToRoute('jury_team', ['teamId' => $team->getTeamid()]);
+            return $this->redirectToRoute('jury_team', ['teamId' => $team->getExternalid()]);
         }
 
         return $this->render('jury/team_edit.html.twig', [
@@ -351,10 +350,10 @@ public function editAction(Request $request, int $teamId): Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/{teamId<\d+>}/delete', name: 'jury_team_delete')]
-    public function deleteAction(Request $request, int $teamId): Response
+    #[Route(path: '/{teamId}/delete', name: 'jury_team_delete')]
+    public function deleteAction(Request $request, string $teamId): Response
     {
-        $team = $this->em->getRepository(Team::class)->find($teamId);
+        $team = $this->em->getRepository(Team::class)->findByExternalId($teamId);
         if (!$team) {
             throw new NotFoundHttpException(sprintf('Team with ID %s not found', $teamId));
         }
@@ -363,13 +362,13 @@ public function deleteAction(Request $request, int $teamId): Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/delete-multiple', name: 'jury_team_delete_multiple', methods: ['GET', 'POST'])]
+    #[Route(path: '/delete-multiple', name: 'jury_team_delete_multiple', methods: ['GET', 'POST'], priority: 1)]
     public function deleteMultipleAction(Request $request): Response
     {
         return $this->deleteMultiple(
             $request,
             Team::class,
-            'teamid',
+            'externalid',
             'jury_teams',
             'No teams could be deleted (they might be in a locked contest).',
             fn(Team $team) => !$team->isLocked()
@@ -388,7 +387,7 @@ public function addAction(Request $request): Response
 
         if ($response = $this->processAddFormForExternalIdEntity(
             $form, $team,
-            fn() => $this->generateUrl('jury_team', ['teamId' => $team->getTeamid()]),
+            fn() => $this->generateUrl('jury_team', ['teamId' => $team->getExternalid()]),
             function () use ($team) {
                 $this->possiblyAddUser($team);
                 $this->em->persist($team);
diff --git a/webapp/src/Form/Type/TeamType.php b/webapp/src/Form/Type/TeamType.php
@@ -67,6 +67,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         ]);
         $builder->add('category', EntityType::class, [
             'class' => TeamCategory::class,
+            'choice_value' => 'externalid',
         ]);
         $builder->add('publicdescription', TextareaType::class, [
             'label' => 'Public description',
@@ -76,6 +77,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'class'         => TeamAffiliation::class,
             'required'      => false,
             'choice_label'  => 'name',
+            'choice_value' => 'externalid',
             'placeholder'   => '-- no affiliation --',
             'query_builder' => fn(EntityRepository $er) => $er->createQueryBuilder('a')->orderBy('a.name'),
         ]);
@@ -97,6 +99,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'class'         => Contest::class,
             'required'      => false,
             'choice_label'  => 'name',
+            'choice_value' => 'externalid',
             'multiple'      => true,
             'by_reference'  => false,
             'query_builder' => fn(EntityRepository $er) => $er
@@ -132,6 +135,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'label'        => "User",
             'required'     => true,
             'choice_label' => 'name',
+            'choice_value' => 'externalid',
         ]);
         $builder->add('newUsername', TextType::class, [
             'label'    => 'Username',
diff --git a/webapp/templates/jury/partials/team_score_and_submissions.html.twig b/webapp/templates/jury/partials/team_score_and_submissions.html.twig
@@ -8,7 +8,7 @@
     Submissions
     {% if restrictionText %}
     <small class="text-muted">
-        restricted to {{ restrictionText }} (<a href="{{ path('jury_team', {'teamId': team.teamid}) }}">show all</a>)
+        restricted to {{ restrictionText }} (<a href="{{ path('jury_team', {'teamId': team.externalid}) }}">show all</a>)
     </small>
     {% endif %}
 </h2>
diff --git a/webapp/templates/jury/team.html.twig b/webapp/templates/jury/team.html.twig
@@ -1,7 +1,7 @@
 {% extends "jury/base.html.twig" %}
 {% import "jury/jury_macros.twig" as macros %}
 
-{% block title %}Team {{ team.teamid }} - {{ parent() }}{% endblock %}
+{% block title %}Team {{ team.externalid }} - {{ parent() }}{% endblock %}
 
 {% block extrahead %}
     {{ parent() }}
@@ -18,10 +18,6 @@
             <table class="table table-sm table-striped">
                 <tr>
                     <th>ID</th>
-                    <td>{{ team.teamid }}</td>
-                </tr>
-                <tr>
-                    <th>External ID</th>
                     <td>{{ team.externalid }}</td>
                 </tr>
                 <tr>
@@ -94,10 +90,10 @@
                     <th>User</th>
                     <td>
                         {% for user in team.users %}
-                            <a href="{{ path('jury_user', {'userId': user.userid}) }}">{{ user.username }}</a>
+                            <a href="{{ path('jury_user', {'userId': user.externalid}) }}">{{ user.username }}</a>
                         {% else %}
                             {%- if is_granted('ROLE_ADMIN') -%}
-                                <a href="{{ path('jury_user_add', {'team': team.teamid}) }}">
+                                <a href="{{ path('jury_user_add', {'team': team.externalid}) }}">
                                     <i class="fas fa-user-plus"></i> add user
                                 </a>
                             {% endif %}
@@ -113,7 +109,7 @@
                     <th>Category</th>
                     <td>
                         {% if team.category %}
-                            <a href="{{ path('jury_team_category', {'categoryId': team.category.categoryid}) }}">
+                            <a href="{{ path('jury_team_category', {'categoryId': team.category.externalid}) }}">
                                 {{ team.category.name }}
                             </a>
                         {% else %}
@@ -131,7 +127,7 @@
                                 <img src="{{ asset(affiliationLogo) }}" alt="{{ team.affiliation.shortname }}"
                                      title="{{ team.affiliation.shortname }}" class="affiliation-logo"/>
                             {% endif %}
-                            <a href="{{ path('jury_team_affiliation', {'affilId': team.affiliation.affilid}) }}">
+                            <a href="{{ path('jury_team_affiliation', {'affilId': team.affiliation.externalid}) }}">
                                 {{ team.affiliation.name }}
                             </a>
                         </td>
@@ -150,7 +146,7 @@
                     <th>Contests</th>
                     <td>
                         {% for ucontest in team.contests %}
-                            <a href="{{ path('jury_contest', {'contestId': ucontest.cid}) }}">{{ ucontest.shortname }}</a>
+                            <a href="{{ path('jury_contest', {'contestId': ucontest.externalid}) }}">{{ ucontest.shortname }}</a>
                         {% endfor %}
                     </td>
                 </tr>
@@ -183,11 +179,11 @@
 
     <div class="button-row">
         {%- if is_granted('ROLE_ADMIN') -%}
-            {{ button(path('jury_team_edit', {'teamId': team.teamid}), 'Edit', 'primary', 'edit') }}
-            {{ button(path('jury_team_delete', {'teamId': team.teamid}), 'Delete', 'danger', 'trash-alt', true) }}
+            {{ button(path('jury_team_edit', {'teamId': team.externalid}), 'Edit', 'primary', 'edit') }}
+            {{ button(path('jury_team_delete', {'teamId': team.externalid}), 'Delete', 'danger', 'trash-alt', true) }}
         {% endif %}
-        {{ button(path('jury_clarification_new', {'teamto': team.teamid}), 'Send message', 'secondary', 'envelope') }}
-        {% include 'jury/partials/rejudge_form.html.twig' with {table: 'team', id: team.teamid, buttonClass: 'btn-secondary'} %}
+        {{ button(path('jury_clarification_new', {'teamto': team.externalid}), 'Send message', 'secondary', 'envelope') }}
+        {% include 'jury/partials/rejudge_form.html.twig' with {table: 'team', id: team.externalid, buttonClass: 'btn-secondary'} %}
     </div>
 
     <div data-ajax-refresh-target>
diff --git a/webapp/templates/jury/team_edit.html.twig b/webapp/templates/jury/team_edit.html.twig
@@ -1,7 +1,7 @@
 {% extends "jury/base.html.twig" %}
 {% import "jury/jury_macros.twig" as macros %}
 
-{% block title %}Edit team {{ team.teamid }} - {{ parent() }}{% endblock %}
+{% block title %}Edit team {{ team.externalid }} - {{ parent() }}{% endblock %}
 
 {% block extrahead %}
     {{ parent() }}
@@ -12,17 +12,6 @@
 
     <h1>Edit team {{ team.teamid }}</h1>
 
-    <div class="row">
-        <div class="col-lg-4">
-            <table class="table table-sm table-striped">
-                <tr>
-                    <th>Team ID</th>
-                    <td>{{ team.teamid }}</td>
-                </tr>
-            </table>
-        </div>
-    </div>
-
     {% include 'jury/partials/team_form.html.twig' %}
 
 {% endblock %}
