Remove JudgehostRestriction feature

ChangeLog

@@ -35,6 +35,7 @@ Version 8.0.0 - DEV
  - Improve API action to add submission to adhere to the CCS spec.
  - Add API action to create clarification following CCS spec.
  - Add support for showing (pending) awards on the scoreboard. Thanks @shuibinlong!
+ - Remove JudgehostRestriction feature due to new Judgehost API
 
 
 Version 7.3.2 - 23 November 2020

webapp/src/Controller/API/JudgehostController.php

@@ -1137,28 +1137,6 @@ private function getSubmissionsToJudge(Judgehost $judgehost, $restrictJudgingOnS
             ->addOrderBy('s.submittime', 'ASC')
             ->addOrderBy('s.submitid', 'ASC');
 
-        // Apply restrictions
-        if ($judgehost->getRestriction()) {
-            $restrictions = $judgehost->getRestriction()->getRestrictions();
-
-            if (isset($restrictions['contest'])) {
-                $queryBuilder
-                    ->andWhere('s.contest IN (:restrictionContestIds)')
-                    ->setParameter(':restrictionContestIds', $restrictions['contest']);
-            }
-
-            if (isset($restrictions['problem'])) {
-                $queryBuilder
-                    ->andWhere('s.problem IN (:restrictionProblemIds)')
-                    ->setParameter(':restrictionProblemIds', $restrictions['problem']);
-            }
-
-            if (isset($restrictions['language'])) {
-                $queryBuilder
-                    ->andWhere('s.language IN (:restrictionLanguageIds)')
-                    ->setParameter(':restrictionLanguageIds', $restrictions['language']);
-            }
-        }
         if ($restrictJudgingOnSameJudgehost) {
             $queryBuilder
                 ->leftJoin('s.judgings', 'j', Join::WITH, 'j.judgehost = :judgehost')

webapp/src/Controller/Jury/AuditLogController.php

@@ -161,8 +161,6 @@ private function generateDatatypeUrl(string $type, $id): ?string
                 return $this->generateUrl('jury_judgehosts');
             case 'judgehosts':
                 return $this->generateUrl('jury_judgehosts');
-            case 'judgehost_restriction':
-                return $this->generateUrl('jury_judgehost_restriction', ['restrictionId' => $id]);
             case 'judging':
                 return $this->generateUrl('jury_submission_by_judging', ['jid' => $id]);
             case 'external_judgement':

webapp/src/Controller/Jury/ContestController.php

@@ -675,20 +675,13 @@ public function prefetchAction(Request $request, int $contestId)
         $cnt = 0;
         foreach ($judgehosts as $judgehost) {
             /** @var Judgehost $judgehost */
-            $judgehostRestriction = $judgehost->getRestriction();
             foreach ($contest->getProblems() as $contestProblem) {
                 /** @var ContestProblem $contestProblem */
                 if (!$contestProblem->getAllowJudge() || !$contestProblem->getAllowSubmit()) {
                     continue;
                 }
                 /** @var Problem $problem */
                 $problem = $contestProblem->getProblem();
-                if ($judgehostRestriction !== null) {
-                    $restrictedProblems = $judgehostRestriction->getProblems();
-                    if (!empty($restrictedProblems) && !in_array($problem->getProbid(), $restrictedProblems)) {
-                        continue;
-                    }
-                }
                 foreach ($problem->getTestcases() as $testcase) {
                     /** @var Testcase $testcase */
                     $judgeTask = new JudgeTask();
@@ -723,12 +716,6 @@ public function prefetchAction(Request $request, int $contestId)
             );
             foreach ($languages as $language) {
                 /** @var Language $language */
-                if ($judgehostRestriction !== null) {
-                    $restrictedLangs = $judgehostRestriction->getLanguages();
-                    if (!empty($restrictedLangs) && !in_array($language->getLangid(), $restrictedLangs)) {
-                        continue;
-                    }
-                }
                 $compileExec = $language->getCompileExecutable()->getImmutableExecutable();
                 $judgeTask = new JudgeTask();
                 $judgeTask

webapp/src/Controller/Jury/JudgehostController.php

@@ -81,8 +81,7 @@ public function indexAction(Request $request): Response
         /** @var Judgehost[] $judgehosts */
         $judgehosts = $this->em->createQueryBuilder()
             ->from(Judgehost::class, 'j')
-            ->leftJoin('j.restriction', 'r')
-            ->select('j', 'r')
+            ->select('j')
             ->andWhere('j.hidden = 0')
             ->orderBy('j.hostname')
             ->getQuery()->getResult();
@@ -92,7 +91,6 @@ public function indexAction(Request $request): Response
             'hostname' => ['title' => 'hostname'],
             'active' => ['title' => 'active'],
             'status' => ['title' => 'status'],
-            'restriction' => ['title' => 'restriction'],
             'load' => ['title' => 'load'],
             'last_judgingid' => ['title' => 'last judging'],
         ];
@@ -207,9 +205,6 @@ public function indexAction(Request $request): Response
                 'active' => [
                     'value' => $judgehost->getActive() ? 'yes' : 'no',
                 ],
-                'restriction' => [
-                    'value' => $judgehost->getRestriction() ? $judgehost->getRestriction()->getName() : '<i>none</i>',
-                ],
             ]);
 
             // Create action links
@@ -275,8 +270,7 @@ public function viewAction(Request $request, int $judgehostid): Response
         /** @var Judgehost $judgehost */
         $judgehost = $this->em->createQueryBuilder()
             ->from(Judgehost::class, 'j')
-            ->leftJoin('j.restriction', 'r')
-            ->select('j', 'r')
+            ->select('j')
             ->andWhere('j.judgehostid = :judgehostid')
             ->setParameter(':judgehostid', $judgehostid)
             ->getQuery()
@@ -341,8 +335,7 @@ public function deleteAction(Request $request, int $judgehostid): Response
         /** @var Judgehost $judgehost */
         $judgehost = $this->em->createQueryBuilder()
             ->from(Judgehost::class, 'j')
-            ->leftJoin('j.restriction', 'r')
-            ->select('j', 'r')
+            ->select('j')
             ->andWhere('j.judgehostid = :judgehostid')
             ->setParameter(':judgehostid', $judgehostid)
             ->getQuery()