Add current to judgement endpoint

Author: nickygerritsen

webapp/src/Controller/API/AbstractRestController.php

@@ -3,6 +3,7 @@
 namespace App\Controller\API;
 
 use App\Entity\BaseApiEntity;
+use App\Utils\CcsApiVersion;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -73,7 +74,9 @@ protected function renderData(
         $view->getContext()->setAttribute('domjudge_service', $this->dj);
         $view->getContext()->setAttribute('config_service', $this->config);
 
-        $groups = [static::GROUP_DEFAULT];
+        /** @var CcsApiVersion $ccsApiVersion */
+        $ccsApiVersion = $this->config->get('ccs_api_version');
+        $groups = [static::GROUP_DEFAULT, $ccsApiVersion->value];
         if (!$request->query->has('strict') || !$request->query->getBoolean('strict')) {
             $groups[] = static::GROUP_NONSTRICT;
         }

webapp/src/Controller/API/AccessController.php

@@ -4,6 +4,7 @@
 
 use App\DataTransferObject\Access;
 use App\DataTransferObject\AccessEndpoint;
+use App\Utils\CcsApiVersion;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
 use FOS\RestBundle\Controller\Annotations as Rest;
@@ -99,6 +100,9 @@ public function getStatusAction(Request $request): Access
             $capabilities[] = 'admin_clar';
         }
 
+        /** @var CcsApiVersion $ccsApiVersion */
+        $ccsApiVersion = $this->config->get('ccs_api_version');
+
         return new Access(
             capabilities: $capabilities,
             endpoints: [
@@ -252,6 +256,7 @@ public function getStatusAction(Request $request): Access
                         'end_time',
                         'end_contest_time',
                         'max_run_time',
+                        'current',
                         // DOMjudge specific properties:
                         'valid',
                     ],

webapp/src/Entity/Judging.php

@@ -335,6 +335,14 @@ public function getValid(): bool
         return $this->valid;
     }
 
+    // Note: we can't use CCSApiVersion::Format_2025_DRAFT->value in PHP 8.1, only in 8.2+
+    #[Serializer\Groups([ARC::GROUP_NONSTRICT, '2025-draft'])]
+    #[Serializer\VirtualProperty]
+    public function getCurrent(): bool
+    {
+        return $this->getValid();
+    }
+
     /**
      * @param resource|string $outputCompile
      */

webapp/tests/Unit/Controller/API/AccessControllerTest.php

@@ -39,7 +39,7 @@ public function testAccessAsAdmin(): void
             'accounts' => ['id', 'username', 'name', 'type'],
             'state' => ['started', 'frozen', 'ended', 'thawed', 'finalized', 'end_of_updates'],
             'submissions' => ['id', 'language_id', 'problem_id', 'team_id', 'time', 'contest_time', 'entry_point', 'files'],
-            'judgements' => ['id', 'submission_id', 'judgement_type_id', 'start_time', 'start_contest_time', 'end_time', 'end_contest_time', 'max_run_time'],
+            'judgements' => ['id', 'submission_id', 'judgement_type_id', 'start_time', 'start_contest_time', 'end_time', 'end_contest_time', 'max_run_time', 'current'],
             'runs' => ['id', 'judgement_id', 'ordinal', 'judgement_type_id', 'time', 'contest_time', 'run_time'],
             'clarifications' => ['id', 'from_team_id', 'problem_id', 'text', 'time', 'contest_time'],
             'awards' => ['id', 'citation', 'team_ids'],