Uses the baloonservice for the updates

The computation for which balloons need to be sent out is a bit more
complex than before. Reusing the logic of the BalloonService keeps it
nice and DRY.

Author: tuupke

webapp/src/Service/DOMJudgeService.php

@@ -101,6 +101,7 @@ class DOMJudgeService
 
     public function __construct(
         protected readonly EntityManagerInterface $em,
+        protected readonly BalloonService $balloonService,
         protected readonly LoggerInterface $logger,
         protected readonly RequestStack $requestStack,
         protected readonly ParameterBagInterface $params,
@@ -437,26 +438,14 @@ public function getUpdates(): array
         }
 
         if ($this->checkrole('balloon') && $contest) {
-            $balloonsQuery = $this->em->createQueryBuilder()
-                ->select('b.balloonid', 't.name', 't.location', 'p.name AS pname')
-                ->from(Balloon::class, 'b')
-                ->leftJoin('b.submission', 's')
-                ->leftJoin('s.problem', 'p')
-                ->leftJoin('s.contest', 'co')
-                ->leftJoin('p.contest_problems', 'cp', Join::WITH, 'co.cid = cp.contest AND p.probid = cp.problem')
-                ->leftJoin('s.team', 't')
-                ->andWhere('co.cid = :cid')
-                ->andWhere('b.done = 0')
-                ->setParameter('cid', $contest->getCid());
-
-            $freezetime = $contest->getFreezeTime();
-            if ($freezetime !== null && !(bool)$this->config->get('show_balloons_postfreeze')) {
-                $balloonsQuery
-                    ->andWhere('s.submittime < :freeze')
-                    ->setParameter('freeze', $freezetime);
-            }
-
-            $balloons = $balloonsQuery->getQuery()->getResult();
+            $balloons = array_map(function ($balloon) {
+                return [
+                    'balloonid' => $balloon['data']['balloonid'],
+                    'name' => $balloon['data']['team']->getName(),
+                    'location' => $balloon['data']['location'],
+                    'pname' => $balloon['data']['contestproblem']->getProblem()->getName(),
+                ];
+            }, $this->balloonService->collectBalloonTable($contest, true));
         }
 
         return [