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

Part of #3024

Author: nickygerritsen

webapp/src/Controller/Jury/RejudgingController.php

@@ -807,10 +807,10 @@ private function generateFlashMessagesForSkippedJudgings(array $skipped): void
         /** @var Judging $judging */
         foreach ($skipped as $judging) {
             $submission = $judging->getSubmission();
-            $submitid = $submission->getSubmitid();
+            $submitid = $submission->getExternalid();
             $rejudgingid = $submission->getRejudging()->getRejudgingid();
             $msg = sprintf(
-                'Skipping submission s%d since it is ' .
+                'Skipping submission %s since it is ' .
                 'already part of rejudging r%d.',
                 $submitid,
                 $rejudgingid
@@ -840,7 +840,7 @@ private function getStats(Rejudging $rejudging): array
             ->leftJoin('j.rejudging', 'r')
             ->leftJoin('j.submission', 's')
             ->leftJoin('jt.judgehost', 'jh')
-            ->select('r.rejudgingid, j.judgingid', 's.submitid', 'jh.hostname', 'j.result',
+            ->select('r.rejudgingid, j.judgingid', 's.externalid as submitid', 'jh.hostname', 'j.result',
                 'AVG(jr.runtime) AS runtime_avg', 'COUNT(jr.runtime) AS ntestcases',
                 '(j.endtime - j.starttime) AS duration'
             )
@@ -899,7 +899,8 @@ private function getStats(Rejudging $rejudging): array
                 ->select('t.ranknumber', 'MAX(jr.runtime) - MIN(jr.runtime) AS spread')
                 ->leftJoin('jr.judging', 'j')
                 ->leftJoin('jr.testcase', 't')
-                ->andWhere('j.submission = :submitid')
+                ->leftJoin('j.submission', 's')
+                ->andWhere('s.externalid = :submitid')
                 ->setParameter('submitid', $submitid)
                 ->groupBy('jr.testcase')
                 ->getQuery()

webapp/src/Form/Type/RejudgingType.php

@@ -53,6 +53,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'required' => false,
             'multiple' => true,
             'choice_label' => 'name',
+            'choice_value' => 'externalid',
             'query_builder' => fn(EntityRepository $er) => $er
                 ->createQueryBuilder('c')
                 ->where('c.enabled = 1')
@@ -64,6 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'class' => Problem::class,
             'required' => false,
             'choice_label' => 'name',
+            'choice_value' => 'externalid',
             'choices' => [],
         ]);
         $builder->add('languages', EntityType::class, [
@@ -72,6 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'class' => Language::class,
             'required' => false,
             'choice_label' => 'name',
+            'choice_value' => 'externalid',
             'query_builder' => fn(EntityRepository $er) => $er
                 ->createQueryBuilder('l')
                 ->where('l.allowSubmit = 1')
@@ -83,6 +86,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'class' => Team::class,
             'required' => false,
             'choice_label' => 'name',
+            'choice_value' => 'externalid',
             'choices' => [],
         ]);
         $builder->add('users', EntityType::class, [
@@ -91,6 +95,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'required' => false,
             'multiple' => true,
             'choice_label' => 'name',
+            'choice_value' => 'externalid',
             'query_builder' => fn(EntityRepository $er) => $er
                 ->createQueryBuilder('u')
                 ->where('u.enabled = 1')