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

nickygerritsen · nickygerritsen · commit c2121c574b40 · 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
@@ -706,7 +706,7 @@ public function createAction(Request $request): Response
             'problem' => 'p.externalid',
             'submission' => 's.externalid',
             'team' => 't.externalid',
-            'user' => 's.user',
+            'user' => 'u.externalid',
             'rejudging' => 'j2.rejudging',
         ];
 
@@ -741,6 +741,7 @@ public function createAction(Request $request): Response
                 ->leftJoin('s.language', 'l')
                 ->leftJoin('s.problem', 'p')
                 ->leftJoin('s.team', 't')
+                ->leftJoin('s.user', 'u')
                 ->leftJoin('j.runs', 'jr')
                 ->leftJoin('jr.judgetask', 'jt')
                 ->select('j', 's', 'r', 't')
diff --git a/webapp/src/Controller/Jury/UserController.php b/webapp/src/Controller/Jury/UserController.php
@@ -62,7 +62,7 @@ public function indexAction(): Response
 
         $table_fields = [
             'username'   => ['title' => 'username', 'sort' => true, 'default_sort' => true],
-            'externalid' => ['title' => 'external ID', 'sort' => true],
+            'externalid' => ['title' => 'ID', 'sort' => true],
             'name'       => ['title' => 'name', 'sort' => true],
             'email'      => ['title' => 'email', 'sort' => true],
             'user_roles' => ['title' => 'roles', 'sort' => true],
@@ -86,7 +86,7 @@ public function indexAction(): Response
             $userdata    = [];
             $useractions = [];
 
-            $this->addEntityCheckbox($userdata, $u, $u->getUserid(), 'user-checkbox', fn(User $user) => $user->getUserid() !== $this->dj->getUser()->getUserid());
+            $this->addEntityCheckbox($userdata, $u, $u->getExternalid(), 'user-checkbox', fn(User $user) => $user->getUserid() !== $this->dj->getUser()->getUserid());
 
             // Get whatever fields we can from the user object itself.
             foreach ($table_fields as $k => $v) {
@@ -108,9 +108,9 @@ public function indexAction(): Response
                 ];
                 $userdata['team'] = [
                     'value' => $u->getTeamName(),
-                    'sortvalue' => $u->getTeam()->getTeamid(),
+                    'sortvalue' => $u->getTeam()->getExternalid(),
                     'link' => $this->generateUrl('jury_team', [
-                        'teamId' => $u->getTeam()->getTeamid(),
+                        'teamId' => $u->getTeam()->getExternalid(),
                     ]),
                     'title' => $u->getTeam()->getEffectiveName(),
                 ];
@@ -138,14 +138,14 @@ public function indexAction(): Response
                     'icon' => 'edit',
                     'title' => 'edit this user',
                     'link' => $this->generateUrl('jury_user_edit', [
-                        'userId' => $u->getUserid(),
+                        'userId' => $u->getExternalid(),
                     ])
                 ];
                 $useractions[] = [
                     'icon' => 'trash-alt',
                     'title' => 'delete this user',
                     'link' => $this->generateUrl('jury_user_delete', [
-                        'userId' => $u->getUserid(),
+                        'userId' => $u->getExternalid(),
                     ]),
                     'ajaxModal' => true,
                 ];
@@ -163,7 +163,7 @@ public function indexAction(): Response
             $users_table[] = [
                 'data' => $userdata,
                 'actions' => $useractions,
-                'link' => $this->generateUrl('jury_user', ['userId' => $u->getUserid()]),
+                'link' => $this->generateUrl('jury_user', ['userId' => $u->getExternalid()]),
                 'cssclass' => $u->getEnabled() ? '' : 'disabled',
             ];
         }
@@ -218,10 +218,10 @@ public function checkPasswordLength(User $user, FormInterface $form): ?Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/{userId<\d+>}/edit', name: 'jury_user_edit')]
-    public function editAction(Request $request, int $userId): Response
+    #[Route(path: '/{userId}/edit', name: 'jury_user_edit')]
+    public function editAction(Request $request, string $userId): Response
     {
-        $user = $this->em->getRepository(User::class)->find($userId);
+        $user = $this->em->getRepository(User::class)->findByExternalId($userId);
         if (!$user) {
             throw new NotFoundHttpException(sprintf('User with ID %s not found', $userId));
         }
@@ -247,7 +247,7 @@ public function editAction(Request $request, int $userId): Response
                 $this->tokenStorage->setToken($token);
             }
 
-            return $this->redirectToRoute('jury_user', ['userId' => $user->getUserid()]);
+            return $this->redirectToRoute('jury_user', ['userId' => $user->getExternalid()]);
         }
 
         return $this->render('jury/user_edit.html.twig', [
@@ -257,10 +257,10 @@ public function editAction(Request $request, int $userId): Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/{userId<\d+>}/delete', name: 'jury_user_delete')]
-    public function deleteAction(Request $request, int $userId): Response
+    #[Route(path: '/{userId}/delete', name: 'jury_user_delete')]
+    public function deleteAction(Request $request, string $userId): Response
     {
-        $user = $this->em->getRepository(User::class)->find($userId);
+        $user = $this->em->getRepository(User::class)->findByExternalId($userId);
         if (!$user) {
             throw new NotFoundHttpException(sprintf('User with ID %s not found', $userId));
         }
@@ -269,7 +269,7 @@ public function deleteAction(Request $request, int $userId): Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/add', name: 'jury_user_add')]
+    #[Route(path: '/add', name: 'jury_user_add', priority: 1)]
     public function addAction(
         Request $request,
         #[MapQueryParameter]
@@ -286,7 +286,7 @@ public function addAction(
 
         if ($response = $this->processAddFormForExternalIdEntity(
             $form, $user,
-            fn() => $this->generateUrl('jury_user', ['userId' => $user->getUserid()]),
+            fn() => $this->generateUrl('jury_user', ['userId' => $user->getExternalid()]),
             function () use ($user, $form) {
                 if ($errorResult = $this->checkPasswordLength($user, $form)) {
                     return $errorResult;
@@ -306,7 +306,7 @@ function () use ($user, $form) {
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/generate-passwords', name: 'jury_generate_passwords')]
+    #[Route(path: '/generate-passwords', name: 'jury_generate_passwords', priority: 1)]
     public function generatePasswordsAction(Request $request): Response
     {
         $form = $this->createForm(GeneratePasswordsType::class);
@@ -371,7 +371,7 @@ public function generatePasswordsAction(Request $request): Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/reset_login_status', name: 'jury_reset_login_status')]
+    #[Route(path: '/reset_login_status', name: 'jury_reset_login_status', priority: 1)]
     public function resetTeamLoginStatus(Request $request): Response
     {
         /** @var Role $teamRole */
@@ -392,7 +392,7 @@ public function resetTeamLoginStatus(Request $request): Response
     }
 
     #[IsGranted('ROLE_ADMIN')]
-    #[Route(path: '/delete-multiple', name: 'jury_user_delete_multiple', methods: ['GET', 'POST'])]
+    #[Route(path: '/delete-multiple', name: 'jury_user_delete_multiple', methods: ['GET', 'POST'], priority: 1)]
     public function deleteMultipleAction(Request $request): Response
     {
         return $this->deleteMultiple(
diff --git a/webapp/src/Form/Type/UserType.php b/webapp/src/Form/Type/UserType.php
@@ -78,6 +78,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'choice_label' => 'effective_name',
             'required' => false,
             'placeholder' => '-- no team --',
+            'choice_value' => 'externalid',
             'choices' => $teams,
         ]);
         $builder->add('user_roles', EntityType::class, [
diff --git a/webapp/templates/jury/user.html.twig b/webapp/templates/jury/user.html.twig
@@ -1,7 +1,7 @@
 {% extends "jury/base.html.twig" %}
 {% import "jury/jury_macros.twig" as macros %}
 
-{% block title %}User {{ user.userid }} - {{ parent() }}{% endblock %}
+{% block title %}User {{ user.externalid }} - {{ parent() }}{% endblock %}
 
 {% block extrahead %}
     {{ parent() }}
@@ -18,10 +18,6 @@
             <table class="table table-sm table-striped">
                 <tr>
                     <th>ID</th>
-                    <td>{{ user.userid }}</td>
-                </tr>
-                <tr>
-                    <th>External ID</th>
                     <td>{{ user.externalid }}</td>
                 </tr>
                 <tr>
@@ -78,7 +74,7 @@
                     <th>Team</th>
                     {% if user.team %}
                         <td class="teamid">
-                            <a href="{{ path('jury_team', {'teamId': user.team.teamid}) }}">
+                            <a href="{{ path('jury_team', {'teamId': user.team.externalid}) }}">
                                 {{ user.team.effectiveName }} {{ user.team | entityIdBadge }}
                             </a>
                         </td>
@@ -137,10 +133,10 @@
 
     <div class="button-row">
         {%- if is_granted('ROLE_ADMIN') -%}
-            {{ button(path('jury_user_edit', {'userId': user.userid}), 'Edit', 'primary', 'edit') }}
-            {{ button(path('jury_user_delete', {'userId': user.userid}), 'Delete', 'danger', 'trash-alt', true) }}
+            {{ button(path('jury_user_edit', {'userId': user.externalid}), 'Edit', 'primary', 'edit') }}
+            {{ button(path('jury_user_delete', {'userId': user.externalid}), 'Delete', 'danger', 'trash-alt', true) }}
         {% endif %}
-        {% include 'jury/partials/rejudge_form.html.twig' with {table: 'user', id: user.userid, buttonClass: 'btn-secondary'} %}
+        {% include 'jury/partials/rejudge_form.html.twig' with {table: 'user', id: user.externalid, buttonClass: 'btn-secondary'} %}
     </div>
 
     <h2>Submissions for {{ user.name }}</h2>
diff --git a/webapp/templates/jury/user_edit.html.twig b/webapp/templates/jury/user_edit.html.twig
@@ -1,7 +1,7 @@
 {% extends "jury/base.html.twig" %}
 {% import "jury/jury_macros.twig" as macros %}
 
-{% block title %}Edit user {{ user.userid }} - {{ parent() }}{% endblock %}
+{% block title %}Edit user {{ user.externalid }} - {{ parent() }}{% endblock %}
 
 {% block extrahead %}
     {{ parent() }}
@@ -10,15 +10,11 @@
 
 {% block content %}
 
-    <h1>Edit user {{ user.userid }}</h1>
+    <h1>Edit user {{ user.externalid }}</h1>
 
     <div class="row">
         <div class="col-lg-4">
             <table class="table table-sm table-striped">
-                <tr>
-                    <th>User ID</th>
-                    <td>{{ user.userid }}</td>
-                </tr>
                 <tr>
                     <th>Username</th>
                     <td class="teamid">{{ user.username }}</td>
