Commit 7690dcd

committed

Use post_clar capability in new API format

1 parent 7ae056d commit 7690dcdCopy full SHA for 7690dcd

File tree

+17

-5

lines changed

+17

-5

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ public function getStatusAction(Request $request): Access`
`82`	`82`	`$submissionsProperties[] = 'files';`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ /** @var CcsApiVersion $ccsApiVersion */`
	`86`	`+ $ccsApiVersion = $this->config->get('ccs_api_version');`
	`87`	`+`
`85`	`88`	`$capabilities = [];`
`86`	`89`
`87`	`90`	`// Add capabilities`
`@@ -91,7 +94,11 @@ public function getStatusAction(Request $request): Access`
`91`	`94`	`}`
`92`	`95`	`if ($this->dj->checkrole('team') && $this->dj->getUser()->getTeam()) {`
`93`	`96`	`$capabilities[] = 'team_submit';`
`94`		`- $capabilities[] = 'team_clar';`
	`97`	`+ if ($ccsApiVersion->usePostClar()) {`
	`98`	`+ $capabilities[] = 'post_clar';`
	`99`	`+ } else {`
	`100`	`+ $capabilities[] = 'team_clar';`
	`101`	`+ }`
`95`	`102`	`}`
`96`	`103`	`if ($this->dj->checkrole('api_writer')) {`
`97`	`104`	`$capabilities[] = 'proxy_submit';`
`@@ -100,9 +107,6 @@ public function getStatusAction(Request $request): Access`
`100`	`107`	`$capabilities[] = 'admin_clar';`
`101`	`108`	`}`
`102`	`109`
`103`		`- /** @var CcsApiVersion $ccsApiVersion */`
`104`		`- $ccsApiVersion = $this->config->get('ccs_api_version');`
`105`		`-`
`106`	`110`	`return new Access(`
`107`	`111`	`capabilities: $capabilities,`
`108`	`112`	`endpoints: [`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,12 @@ public function useRelTimes(): bool`
`32`	`32`	`default => true,`
`33`	`33`	`};`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ public function usePostClar(): bool`
	`37`	`+ {`
	`38`	`+ return match ($this) {`
	`39`	`+ self::Format_2020_03, self::Format_2023_06 => false,`
	`40`	`+ default => true,`
	`41`	`+ };`
	`42`	`+ }`
`35`	`43`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function testAccessAsAdmin(): void`
`22`	`22`	`$access = $this->verifyApiJsonResponse('GET', $url, 200, 'admin');`
`23`	`23`	`self::assertArrayHasKey('capabilities', $access);`
`24`	`24`	`self::assertSame(`
`25`		`- ['contest_start', 'contest_thaw', 'team_submit', 'team_clar', 'proxy_submit', 'proxy_clar', 'admin_submit', 'admin_clar'],`
	`25`	`+ ['contest_start', 'contest_thaw', 'team_submit', 'post_clar', 'proxy_submit', 'proxy_clar', 'admin_submit', 'admin_clar'],`
`26`	`26`	`$access['capabilities']`
`27`	`27`	`);`
`28`	`28`

Comments

(0)