Skip to content

Commit 0deaf29

Browse files
meisterTmeisterT
committed
Add option to set a different set of languages allowed to submit per contest.
If empty, falls back to the global definition. This is part of #2521.
1 parent 5533e60 commit 0deaf29

File tree

15 files changed

+145
-42
lines changed

15 files changed

+145
-42
lines changed

‎webapp/migrations/Version20241122144232.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace DoctrineMigrations;
6+
7+
use Doctrine\DBAL\Schema\Schema;
8+
use Doctrine\Migrations\AbstractMigration;
9+
10+
/**
11+
* Auto-generated Migration: Please modify to your needs!
12+
*/
13+
final class Version20241122144232 extends AbstractMigration
14+
{
15+
public function getDescription(): string
16+
{
17+
return 'Add many to many relation between contest and langs.';
18+
}
19+
20+
public function up(Schema $schema): void
21+
{
22+
// this up() migration is auto-generated, please modify it to your needs
23+
$this->addSql('CREATE TABLE contestlanguage (cid INT UNSIGNED NOT NULL COMMENT \'Contest ID\', langid VARCHAR(32) NOT NULL COMMENT \'Language ID (string)\', INDEX IDX_ADCB43234B30D9C4 (cid), INDEX IDX_ADCB43232271845 (langid), PRIMARY KEY(cid, langid)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
24+
$this->addSql('ALTER TABLE contestlanguage ADD CONSTRAINT FK_ADCB43234B30D9C4 FOREIGN KEY (cid) REFERENCES contest (cid) ON DELETE CASCADE');
25+
$this->addSql('ALTER TABLE contestlanguage ADD CONSTRAINT FK_ADCB43232271845 FOREIGN KEY (langid) REFERENCES language (langid) ON DELETE CASCADE');
26+
}
27+
28+
public function down(Schema $schema): void
29+
{
30+
// this down() migration is auto-generated, please modify it to your needs
31+
$this->addSql('ALTER TABLE contestlanguage DROP FOREIGN KEY FK_ADCB43234B30D9C4');
32+
$this->addSql('ALTER TABLE contestlanguage DROP FOREIGN KEY FK_ADCB43232271845');
33+
$this->addSql('DROP TABLE contestlanguage');
34+
}
35+
36+
public function isTransactional(): bool
37+
{
38+
return false;
39+
}
40+
}

‎webapp/src/Controller/Jury/ContestController.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,15 @@ public function viewAction(Request $request, int $contestId): Response
346346
->getQuery()
347347
->getResult();
348348

349+
$languages = $this->dj->getAllowedLanguagesForContest($contest);
350+
349351
return $this->render('jury/contest.html.twig', [
350352
'contest' => $contest,
351353
'allowRemovedIntervals' => $this->getParameter('removed_intervals'),
352354
'removedIntervalForm' => $form,
353355
'removedIntervals' => $removedIntervals,
354356
'problems' => $problems,
357+
'languages' => $languages,
355358
]);
356359
}
357360

‎webapp/src/Controller/Team/LanguageController.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,9 @@ public function languagesAction(): Response
4040
if (!$languagesEnabled) {
4141
throw new BadRequestHttpException("You are not allowed to view this page.");
4242
}
43+
$currentContest = $this->dj->getCurrentContest();
4344
/** @var Language[] $languages */
44-
$languages = $this->em->createQueryBuilder()
45-
->select('l')
46-
->from(Language::class, 'l')
47-
->andWhere('l.allowSubmit = 1')
48-
->orderBy('l.langid')
49-
->getQuery()->getResult();
45+
$languages = $this->dj->getAllowedLanguagesForContest($currentContest);
5046
return $this->render('team/languages.html.twig', ['languages' => $languages]);
5147
}
5248
}

‎webapp/src/Controller/Team/MiscController.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,9 @@ public function printAction(Request $request): Response
195195
]);
196196
}
197197

198+
$currentContest = $this->dj->getCurrentContest();
198199
/** @var Language[] $languages */
199-
$languages = $this->em->createQueryBuilder()
200-
->from(Language::class, 'l')
201-
->select('l')
202-
->andWhere('l.allowSubmit = 1')
203-
->getQuery()
204-
->getResult();
200+
$languages = $this->dj->getAllowedLanguagesForContest($currentContest);
205201

206202
return $this->render('team/print.html.twig', [
207203
'form' => $form,

‎webapp/src/Entity/Contest.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,16 @@ class Contest extends BaseApiEntity implements
343343
#[Serializer\Exclude]
344344
private Collection $teams;
345345

346+
/**
347+
* @var Collection<int, Language>
348+
*/
349+
#[ORM\ManyToMany(targetEntity: Language::class, inversedBy: 'contests')]
350+
#[ORM\JoinTable(name: 'contestlanguage')]
351+
#[ORM\JoinColumn(name: 'cid', referencedColumnName: 'cid', onDelete: 'CASCADE')]
352+
#[ORM\InverseJoinColumn(name: 'langid', referencedColumnName: 'langid', onDelete: 'CASCADE')]
353+
#[Serializer\Exclude]
354+
private Collection $languages;
355+
346356
/**
347357
* @var Collection<int, TeamCategory>
348358
*/
@@ -896,6 +906,22 @@ public function getTeams(): Collection
896906
return $this->teams;
897907
}
898908

909+
public function addLanguage(Language $language): Contest
910+
{
911+
$this->languages[] = $language;
912+
return $this;
913+
}
914+
915+
public function removeLanguage(Language $language): void
916+
{
917+
$this->languages->removeElement($language);
918+
}
919+
920+
public function getLanguages(): Collection
921+
{
922+
return $this->languages;
923+
}
924+
899925
public function addProblem(ContestProblem $problem): Contest
900926
{
901927
$this->problems[] = $problem;
@@ -1591,4 +1617,5 @@ public function getProblemsetForApi(): array
15911617
{
15921618
return array_filter([$this->problemsetForApi]);
15931619
}
1620+
15941621
}

‎webapp/src/Entity/Language.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,13 @@ class Language extends BaseApiEntity implements
149149
#[Serializer\Exclude]
150150
private ?string $runnerVersionCommand = null;
151151

152+
/**
153+
* @var Collection<int, Contest>
154+
*/
155+
#[ORM\ManyToMany(targetEntity: Contest::class, mappedBy: 'languages')]
156+
#[Serializer\Exclude]
157+
private Collection $contests;
158+
152159
/**
153160
* @param Collection<int, Version> $versions
154161
*/
@@ -419,4 +426,9 @@ public function getAceLanguage(): string
419426
default => $this->getLangid(),
420427
};
421428
}
429+
430+
public function getContests(): Collection
431+
{
432+
return $this->contests;
433+
}
422434
}

‎webapp/src/Form/Type/ContestType.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use App\Entity\Contest;
66
use App\Entity\ContestProblem;
7+
use App\Entity\Language;
78
use App\Entity\Team;
89
use App\Entity\TeamCategory;
910
use App\Service\DOMJudgeService;
@@ -200,6 +201,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
200201
'allow_delete' => true,
201202
'label' => false,
202203
]);
204+
$builder->add('languages', EntityType::class, [
205+
'required' => false,
206+
'class' => Language::class,
207+
'multiple' => true,
208+
'choice_label' => fn(Language $language) => sprintf('%s (%s)', $language->getName(), $language->getExternalid()),
209+
'help' => 'List of languages that can be used in this contest. Leave empty to allow all languages that are enabled globally.',
210+
]);
203211

204212
$builder->add('save', SubmitType::class);
205213

‎webapp/src/Form/Type/SubmitProblemType.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
5454
];
5555
$builder->add('problem', EntityType::class, $problemConfig);
5656

57+
$languages = $this->dj->getAllowedLanguagesForContest($contest);
5758
$builder->add('language', EntityType::class, [
5859
'class' => Language::class,
59-
'query_builder' => fn(EntityRepository $er) => $er
60-
->createQueryBuilder('l')
61-
->andWhere('l.allowSubmit = 1'),
60+
'choices' => $languages,
6261
'choice_label' => 'name',
6362
'placeholder' => 'Select a language',
6463
]);

‎webapp/src/Service/DOMJudgeService.php‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,11 +1000,13 @@ public function getTwigDataForProblemsAction(
10001000
$defaultMemoryLimit = (int)$this->config->get('memory_limit');
10011001
$timeFactorDiffers = false;
10021002
if ($showLimits) {
1003+
$languages = $this->getAllowedLanguagesForContest($contest);
10031004
$timeFactorDiffers = $this->em->createQueryBuilder()
10041005
->from(Language::class, 'l')
10051006
->select('COUNT(l)')
1006-
->andWhere('l.allowSubmit = true')
10071007
->andWhere('l.timeFactor <> 1')
1008+
->andWhere('l IN (:languages)')
1009+
->setParameter('languages', $languages)
10081010
->getQuery()
10091011
->getSingleScalarResult() > 0;
10101012
}
@@ -1682,4 +1684,20 @@ public function shadowMode(): bool
16821684
{
16831685
return (bool)$this->config->get('shadow_mode');
16841686
}
1687+
1688+
/** @return Language[] */
1689+
public function getAllowedLanguagesForContest(?Contest $contest) : array {
1690+
if ($contest) {
1691+
$languages = $contest->getLanguages();
1692+
if (!$languages->isEmpty()) {
1693+
return $languages->toArray();
1694+
}
1695+
}
1696+
return $this->em->createQueryBuilder(Language::class)
1697+
->select('l')
1698+
->from(Language::class, 'l')
1699+
->where('l.allowSubmit = 1')
1700+
->getQuery()
1701+
->getResult();
1702+
}
16851703
}

‎webapp/src/Service/ImportProblemService.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -653,12 +653,7 @@ public function importZippedProblem(
653653

654654
// First find all submittable languages:
655655
/** @var Language[] $allowedLanguages */
656-
$allowedLanguages = $this->em->createQueryBuilder()
657-
->from(Language::class, 'l', 'l.langid')
658-
->select('l')
659-
->andWhere('l.allowSubmit = true')
660-
->getQuery()
661-
->getResult();
656+
$allowedLanguages = $this->dj->getAllowedLanguagesForContest($contest);
662657

663658
// Read submission details from optional file.
664659
$submission_file_string = $zip->getFromName($submission_file);
@@ -708,9 +703,9 @@ public function importZippedProblem(
708703
continue;
709704
}
710705
$extension = end($parts);
711-
foreach ($allowedLanguages as $key => $language) {
706+
foreach ($allowedLanguages as $language) {
712707
if (in_array($extension, $language->getExtensions())) {
713-
$languageToUse = $key;
708+
$languageToUse = $language->getLangid();
714709
break 2;
715710
}
716711
}

0 commit comments

Comments
 (0)