Change source fetching to single query

Also removes some redundant twig variables and prepares the logic for
more submissions to diff against.

Author: Kevinjil

webapp/src/Controller/Jury/SubmissionController.php

@@ -849,22 +849,10 @@ public function sourceAction(
             ->getQuery()
             ->getResult();
 
-        $originalSubmission = $originalFiles = null;
-
-        if ($submission->getOriginalSubmission()) {
-            /** @var Submission $originalSubmission */
-            $originalSubmission = $this->em->getRepository(Submission::class)->find($submission->getOriginalSubmission()->getSubmitid());
-
-            /** @var SubmissionFile[] $files */
-            $originalFiles = $this->em->createQueryBuilder()
-                ->from(SubmissionFile::class, 'file')
-                ->select('file')
-                ->andWhere('file.submission = :submission')
-                ->setParameter('submission', $originalSubmission)
-                ->orderBy('file.ranknumber')
-                ->getQuery()
-                ->getResult();
-
+        $otherSubmissions = [];
+        $originalSubmission = $submission->getOriginalSubmission();
+        if ($originalSubmission) {
+            $otherSubmissions[] = $originalSubmission;
             /** @var Submission $oldSubmission */
             $oldSubmission = $this->em->createQueryBuilder()
                 ->from(Submission::class, 's')
@@ -898,30 +886,39 @@ public function sourceAction(
                 ->getQuery()
                 ->getOneOrNullResult();
         }
+        if ($oldSubmission !== null) {
+            $otherSubmissions[] = $oldSubmission;
+        }
 
         /** @var SubmissionFile[] $files */
         $oldFiles = $this->em->createQueryBuilder()
             ->from(SubmissionFile::class, 'file')
             ->select('file')
-            ->andWhere('file.submission = :submission')
-            ->setParameter('submission', $oldSubmission)
-            ->orderBy('file.ranknumber')
+            ->andWhere('file.submission in (:submissions)')
+            ->setParameter('submissions', array_map(fn($s) => $s->getSubmitid(), $otherSubmissions))
+            ->orderBy('file.submission, file.ranknumber')
             ->getQuery()
             ->getResult();
 
-        $oldFileStats      = $oldFiles !== null ? $this->determineFileChanged($files, $oldFiles) : [];
-        $originalFileStats = $originalFiles !== null ? $this->determineFileChanged($files, $originalFiles) : [];
+        $otherFiles = [];
+        foreach ($oldFiles as $f) {
+            $submitId = $f->getSubmission()->getSubmitid();
+            $otherFiles[$submitId] ??= [];
+            $otherFiles[$submitId][] = $f;
+        }
+
+        foreach ($otherFiles as $s => $v) {
+            $otherFiles[$s] = $this->determineFileChanged($files, $v);
+        }
 
         return $this->render('jury/submission_source.html.twig', [
             'submission' => $submission,
             'files' => $files,
             'oldSubmission' => $oldSubmission,
-            'oldFiles' => $oldFiles,
-            'oldFileStats' => $oldFileStats,
             'originalSubmission' => $originalSubmission,
-            'originalFiles' => $originalFiles,
-            'originalFileStats' => $originalFileStats,
             'allowEdit' => $this->allowEdit(),
+            'otherSubmissions' => $otherSubmissions,
+            'otherFiles' => $otherFiles,
         ]);
     }
 

webapp/templates/jury/submission_source.html.twig

@@ -42,7 +42,7 @@
     {%- endif %}
 
     {% if oldSubmission %}
-        {%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: oldSubmission, oldFiles: oldFiles, oldFileStats: oldFileStats} %}
+        {%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: oldSubmission, oldFileStats: otherFiles[oldSubmission.submitid]} %}
     {% else %}
         <ul class="nav nav-tabs source-tab-nav">
             {%- for file in files %}
@@ -84,7 +84,7 @@
             </a>
         </h2>
 
-        {%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: originalSubmission, oldFiles: originalFiles, oldFileStats: originalFileStats} %}
+        {%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: originalSubmission, oldFileStats: otherFiles[originalSubmission.submitid]} %}
     {%- endif %}
 
 {% endblock %}