combines if statements, fixes joins

Author: tuupke

webapp/src/Controller/API/JudgehostController.php

@@ -914,28 +914,15 @@ protected function giveBackJudging(int $judgingId, ?Judgehost $judgehost): void
         if ($judging) {
             $q = $this->em->createQueryBuilder()
                 ->update(JudgingRun::class, 'jr')
-                ->join(JudgeTask::class, 'jt')
+                ->join('jr.judgetask', 'jt')
                 ->andWhere('jr.runresult IS NOT NULL')
                 ->andWhere('jr.judgingid = :judgingid')
                 ->setParameter('judgingid', $judgingId);
 
             if ($judgehost === null) {
                 // This is coming from internal errors, reset the whole judging.
-                $q->set('jt.valid', 0);
-            } else {
-                $q->andWhere('jr.run_result IS NOT NULL')
-                    ->join(JudgeHost::class, 'jh')
-                    ->set('jt.judgehostid', ':judgehostid')
-                    ->set('jt.starttime', ':starttime')
-                    ->setParameter('judgehostid', null)
-                    ->setParameter('starttime', null)
-                    ->andWhere('jh.hostname = :judgehost')
-                    ->setParameter('judgehost', $judgehost->getHostname());
-            }
-
-            $q->getQuery()->execute();
+                $q->set('jt.valid', 0)->getQuery()->execute();
 
-            if ($judgehost === null) {
                 // Invalidate old judging and create a new one - but without judgetasks yet since this was triggered by
                 // an internal error.
                 $judging->setValid(false);
@@ -947,6 +934,16 @@ protected function giveBackJudging(int $judgingId, ?Judgehost $judgehost): void
                     ->setOriginalJudging($judging);
                 $this->em->persist($newJudging);
                 $this->em->flush();
+            } else {
+                $q->andWhere('jr.run_result IS NOT NULL')
+                    ->join('jt.judgehost', 'jh')
+                    ->set('jt.judgehostid', ':judgehostid')
+                    ->set('jt.starttime', ':starttime')
+                    ->setParameter('judgehostid', null)
+                    ->setParameter('starttime', null)
+                    ->andWhere('jh.hostname = :judgehost')
+                    ->setParameter('judgehost', $judgehost->getHostname())
+                    ->getQuery()->execute();
             }
 
             $this->dj->auditlog('judging', $judgingId, 'given back'