Simplify code by doing this check as part of the ContestProblem

The same check is needed for another PR and this makes it much easier to
read.

Co-authored-by: Nicky Gerritsen <nickygerritsen@me.com>

Author: vmcj

webapp/src/Entity/ContestProblem.php

@@ -1,6 +1,7 @@
 <?php declare(strict_types=1);
 namespace App\Entity;
 
+use App\Service\DOMJudgeService as DJS;
 use App\Service\EventLogService;
 use App\Utils\Utils;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -204,6 +205,16 @@ public function getLazyEvalResults(): int
         return $this->lazyEvalResults;
     }
 
+    public function determineOnDemand(int $config_lazy_eval_results): bool {
+        if ($this->lazyEvalResults === DJS::EVAL_DEMAND) {
+            return true;
+        }
+        if ($this->lazyEvalResults === DJS::EVAL_DEFAULT && $config_lazy_eval_results === DJS:: EVAL_DEMAND) {
+            return true;
+        }
+        return false;
+    }
+
     public function setContest(?Contest $contest = null): ContestProblem
     {
         $this->contest = $contest;

webapp/src/Service/DOMJudgeService.php

@@ -1163,8 +1163,7 @@ public function maybeCreateJudgeTasks(Judging $judging, int $priority = JudgeTas
 
         $evalOnDemand = false;
         // We have 2 cases, the problem picks the global value or the value is set.
-        if (($problem->getLazyEvalResults() === DOMJudgeService::EVAL_DEFAULT && $this->config->get('lazy_eval_results') === static::EVAL_DEMAND)
-             || $problem->getLazyEvalResults() === DOMJudgeService::EVAL_DEMAND) {
+        if ($problem->determineOnDemand($this->config->get('lazy_eval_results'))) {
             $evalOnDemand = true;
 
             // Special case, we're shadow and someone submits on our side in that case