Add explicit cid, probid, teamid to baloon table

to create a unique index. Also fixes baloons for rejudgings.

fixes #2262

Author: brinky

webapp/migrations/Version20240322141105.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240322141105 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add columns teamid, probid, cid and an uniq index with them to the baloon table.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+
+        // remove dupicates
+        $this->addSql('DELETE b FROM balloon as b LEFT JOIN (SELECT balloonid FROM balloon as b LEFT JOIN submission as s USING (submitid) GROUP BY teamid, probid, cid) as c ON(b.balloonid = c.balloonid) WHERE c.balloonid IS NULL');
+
+        $this->addSql('ALTER TABLE balloon ADD teamid INT UNSIGNED DEFAULT NULL COMMENT \'Team ID\', ADD probid INT UNSIGNED DEFAULT NULL COMMENT \'Problem ID\', ADD cid INT UNSIGNED DEFAULT NULL COMMENT \'Contest ID\'');
+        $this->addSql('ALTER TABLE balloon ADD CONSTRAINT FK_643B3B904DD6ABF3 FOREIGN KEY (teamid) REFERENCES team (teamid) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE balloon ADD CONSTRAINT FK_643B3B90EF049279 FOREIGN KEY (probid) REFERENCES problem (probid) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE balloon ADD CONSTRAINT FK_643B3B904B30D9C4 FOREIGN KEY (cid) REFERENCES contest (cid) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX IDX_643B3B904DD6ABF3 ON balloon (teamid)');
+        $this->addSql('CREATE INDEX IDX_643B3B90EF049279 ON balloon (probid)');
+        $this->addSql('CREATE INDEX IDX_643B3B904B30D9C4 ON balloon (cid)');
+        $this->addSql('CREATE UNIQUE INDEX unique_problem ON balloon (cid, teamid, probid)');
+
+        // copy data
+        $this->addSql('UPDATE balloon AS b JOIN submission AS s USING (submitid) SET b.teamid = s.teamid, b.probid = s.probid, b.cid = s.cid');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE balloon DROP FOREIGN KEY FK_643B3B904DD6ABF3');
+        $this->addSql('ALTER TABLE balloon DROP FOREIGN KEY FK_643B3B90EF049279');
+        $this->addSql('ALTER TABLE balloon DROP FOREIGN KEY FK_643B3B904B30D9C4');
+        $this->addSql('DROP INDEX IDX_643B3B904DD6ABF3 ON balloon');
+        $this->addSql('DROP INDEX IDX_643B3B90EF049279 ON balloon');
+        $this->addSql('DROP INDEX IDX_643B3B904B30D9C4 ON balloon');
+        $this->addSql('DROP INDEX unique_problem ON balloon');
+        $this->addSql('ALTER TABLE balloon DROP teamid, DROP probid, DROP cid');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

webapp/src/Entity/Balloon.php

@@ -2,6 +2,7 @@
 namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use JMS\Serializer\Annotation as Serializer;
 
 /**
  * Balloons to be handed out.
@@ -13,6 +14,7 @@
     'comment' => 'Balloons to be handed out',
 ])]
 #[ORM\Index(columns: ['submitid'], name: 'submitid')]
+#[ORM\UniqueConstraint(name: 'unique_problem', columns: ['cid', 'teamid', 'probid'])]
 class Balloon
 {
     #[ORM\Id]
@@ -27,6 +29,21 @@ class Balloon
     #[ORM\JoinColumn(name: 'submitid', referencedColumnName: 'submitid', onDelete: 'CASCADE')]
     private Submission $submission;
 
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(name: 'teamid', referencedColumnName: 'teamid', onDelete: 'CASCADE')]
+    #[Serializer\Exclude]
+    private Team $team;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(name: 'probid', referencedColumnName: 'probid', onDelete: 'CASCADE')]
+    #[Serializer\Exclude]
+    private Problem $problem;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(name: 'cid', referencedColumnName: 'cid', onDelete: 'CASCADE')]
+    #[Serializer\Exclude]
+    private Contest $contest;
+
     public function getBalloonid(): int
     {
         return $this->balloonid;
@@ -53,4 +70,38 @@ public function getSubmission(): Submission
     {
         return $this->submission;
     }
+
+    public function getTeam(): Team
+    {
+        return $this->team;
+    }
+
+    public function setTeam(Team $team): Balloon
+    {
+        $this->team = $team;
+        return $this;
+    }
+
+    public function getProblem(): Problem
+    {
+        return $this->problem;
+    }
+
+    public function setProblem(Problem $problem): Balloon
+    {
+        $this->problem = $problem;
+        return $this;
+    }
+
+    public function getContest(): Contest
+    {
+        return $this->contest;
+    }
+
+    public function setContest(Contest $contest): Balloon
+    {
+        $this->contest = $contest;
+        return $this;
+    }
+
 }

webapp/src/Service/BalloonService.php

@@ -6,10 +6,12 @@
 use App\Entity\Contest;
 use App\Entity\ContestProblem;
 use App\Entity\Judging;
+use App\Entity\Problem;
 use App\Entity\ScoreCache;
 use App\Entity\Submission;
 use App\Entity\Team;
 use App\Entity\TeamAffiliation;
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
@@ -36,15 +38,15 @@ public function __construct(
     public function updateBalloons(
         Contest $contest,
         Submission $submission,
-        ?Judging $judging = null
+        Judging $judging
     ): void {
         // Balloon processing disabled for contest.
         if (!$contest->getProcessBalloons()) {
             return;
         }
 
         // Make sure judging is correct.
-        if (!$judging || $judging->getResult() !== Judging::RESULT_CORRECT) {
+        if ($judging->getResult() !== Judging::RESULT_CORRECT) {
             return;
         }
 
@@ -57,12 +59,10 @@ public function updateBalloons(
         // Prevent duplicate balloons in case of multiple correct submissions.
         $numCorrect = $this->em->createQueryBuilder()
             ->from(Balloon::class, 'b')
-            ->join('b.submission', 's')
             ->select('COUNT(b.submission) AS numBalloons')
-            ->andWhere('s.valid = 1')
-            ->andWhere('s.problem = :probid')
-            ->andWhere('s.team = :teamid')
-            ->andWhere('s.contest = :cid')
+            ->andWhere('b.problem = :probid')
+            ->andWhere('b.team = :teamid')
+            ->andWhere('b.contest = :cid')
             ->setParameter('probid', $submission->getProblem())
             ->setParameter('teamid', $submission->getTeam())
             ->setParameter('cid', $submission->getContest())
@@ -71,10 +71,16 @@ public function updateBalloons(
 
         if ($numCorrect == 0) {
             $balloon = new Balloon();
-            $balloon->setSubmission(
-                $this->em->getReference(Submission::class, $submission->getSubmitid()));
+            $balloon->setSubmission($this->em->getReference(Submission::class, $submission->getSubmitid()));
+            $balloon->setTeam($this->em->getReference(Team::class, $submission->getTeamId()));
+            $balloon->setContest(
+                $this->em->getReference(Contest::class, $submission->getContest()->getCid()));
+            $balloon->setProblem($this->em->getReference(Problem::class, $submission->getProblemId()));
             $this->em->persist($balloon);
-            $this->em->flush();
+            try {
+                $this->em->flush();
+            } catch (UniqueConstraintViolationException $e) {
+            }
         }
     }
 
@@ -108,10 +114,10 @@ public function collectBalloonTable(Contest $contest, bool $todo = false): array
                 'a.affilid AS affilid', 'a.shortname AS affilshort')
             ->from(Balloon::class, 'b')
             ->leftJoin('b.submission', 's')
-            ->leftJoin('s.problem', 'p')
-            ->leftJoin('s.contest', 'co')
+            ->leftJoin('b.problem', 'p')
+            ->leftJoin('b.contest', 'co')
             ->leftJoin('p.contest_problems', 'cp', Join::WITH, 'co.cid = cp.contest AND p.probid = cp.problem')
-            ->leftJoin('s.team', 't')
+            ->leftJoin('b.team', 't')
             ->leftJoin('t.category', 'c')
             ->leftJoin('t.affiliation', 'a')
             ->andWhere('co.cid = :cid')

webapp/src/Service/RejudgingService.php

@@ -277,9 +277,10 @@ public function finishRejudging(Rejudging $rejudging, string $action, ?callable
                     }
 
                     // Update balloons.
-                    $contest    = $this->em->getRepository(Contest::class)->find($submission['cid']);
-                    $submission = $this->em->getRepository(Submission::class)->find($submission['submitid']);
-                    $this->balloonService->updateBalloons($contest, $submission);
+                    $contest          = $this->em->getRepository(Contest::class)->find($submission['cid']);
+                    $submissionEntity = $this->em->getRepository(Submission::class)->find($submission['submitid']);
+                    $judging          = $this->em->getRepository(Judging::class)->find($submission['judgingid']);
+                    $this->balloonService->updateBalloons($contest, $submissionEntity, $judging);
                 });
             } elseif ($action === self::ACTION_CANCEL) {
                 // Reset submission and invalidate judging tasks.