Skip to content

Expose samples/problemset after the contest start #3036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions webapp/src/Controller/API/AbstractApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ public function __construct(
* Get the query builder used for getting contests.
*
* @param bool $onlyActive return only contests that are active
* @param bool $filterBeforeContest return only contests that have started
*/
protected function getContestQueryBuilder(bool $onlyActive = false): QueryBuilder
{
protected function getContestQueryBuilder(
bool $onlyActive = false, bool $filterBeforeContest = true
): QueryBuilder {
$now = Utils::now();
$qb = $this->em->createQueryBuilder();
$qb
Expand All @@ -63,6 +65,10 @@ protected function getContestQueryBuilder(bool $onlyActive = false): QueryBuilde
} else {
$qb->andWhere('c.public = 1');
}
if ($filterBeforeContest) {
$qb->andWhere('c.starttime <= :now')
->setParameter('now', $now);
}
}

return $qb;
Expand All @@ -77,7 +83,10 @@ protected function getContestId(Request $request): int
throw new BadRequestHttpException('cid parameter missing');
}

$qb = $this->getContestQueryBuilder($request->query->getBoolean('onlyActive', false));
$qb = $this->getContestQueryBuilder(
onlyActive: $request->query->getBoolean('onlyActive', false),
filterBeforeContest: false
);
$qb
->andWhere(sprintf('c.%s = :cid', $this->getContestIdField()))
->setParameter('cid', $request->attributes->get('cid'));
Expand Down
10 changes: 5 additions & 5 deletions webapp/src/Controller/API/ContestController.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function singleAction(Request $request, string $cid): Response
public function bannerAction(Request $request, string $cid): Response
{
/** @var Contest|null $contest */
$contest = $this->getQueryBuilder($request)
$contest = $this->getQueryBuilder($request, filterBeforeContest: false)
->andWhere(sprintf('%s = :id', $this->getIdField()))
->setParameter('id', $cid)
->getQuery()
Expand Down Expand Up @@ -934,10 +934,10 @@ public function samplesDataZipAction(Request $request): Response
return $this->dj->getSamplesZipForContest($contest);
}

protected function getQueryBuilder(Request $request): QueryBuilder
protected function getQueryBuilder(Request $request, bool $filterBeforeContest = true): QueryBuilder
{
try {
return $this->getContestQueryBuilder($request->query->getBoolean('onlyActive', false));
return $this->getContestQueryBuilder($request->query->getBoolean('onlyActive', false), $filterBeforeContest);
} catch (TypeError) {
throw new BadRequestHttpException('\'onlyActive\' must be a boolean.');
}
Expand All @@ -954,7 +954,7 @@ protected function getIdField(): string
*/
protected function getContestWithId(Request $request, string $id): Contest
{
$queryBuilder = $this->getQueryBuilder($request)
$queryBuilder = $this->getQueryBuilder($request, filterBeforeContest: false)
->andWhere(sprintf('%s = :id', $this->getIdField()))
->setParameter('id', $id);

Expand All @@ -971,7 +971,7 @@ protected function getContestWithId(Request $request, string $id): Contest
private function getContestAndCheckIfLocked(Request $request, string $cid): Contest
{
/** @var Contest|null $contest */
$contest = $this->getQueryBuilder($request)
$contest = $this->getQueryBuilder($request, filterBeforeContest: false)
->andWhere(sprintf('%s = :id', $this->getIdField()))
->setParameter('id', $cid)
->getQuery()
Expand Down
Loading