Skip to content

Commit 558b550

Browse files
committed
Applied review remarks
1 parent 18e63f6 commit 558b550

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

src/bundle/Controller/SiteAccess/SiteAccessController.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ public function __construct(SiteaccessResolverInterface $nonAdminSiteAccessResol
2222
$this->nonAdminSiteAccessResolver = $nonAdminSiteAccessResolver;
2323
}
2424

25-
public function loadNonAdminSiteAccessesForLocation(Location $location): SiteAccessesList
25+
public function loadForLocation(Location $location, string $resolverType = 'non_admin'): SiteAccessesList
2626
{
27-
return new SiteAccessesList(
28-
$this->nonAdminSiteAccessResolver->getSiteAccessesListForLocation($location)
29-
);
27+
switch ($resolverType) {
28+
default: $siteAccesses = $this->nonAdminSiteAccessResolver->getSiteAccessesListForLocation($location);
29+
}
30+
31+
return new SiteAccessesList($siteAccesses);
3032
}
3133
}

src/bundle/Resources/config/routing_rest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ ibexa.rest.content_type.load_field_definitions_from_expression:
143143
#
144144

145145
ibexa.rest.site_access.load_for_location:
146-
path: /site-access/load-non-admin-for-location/{locationId}
147-
controller: 'Ibexa\Bundle\AdminUi\Controller\SiteAccess\SiteAccessController::loadNonAdminSiteAccessesForLocation'
146+
path: /site-access/by-location/{locationId}
147+
controller: 'Ibexa\Bundle\AdminUi\Controller\SiteAccess\SiteAccessController::loadForLocation'
148148
methods: [GET]
149149
options:
150150
expose: true

src/lib/REST/Output/ValueObjectVisitor/SiteAccess/SiteAccessesListVisitor.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public function visit(Visitor $visitor, Generator $generator, $data): void
2626
foreach ($data->getSiteAccesses() as $siteAccess) {
2727
$generator->startObjectElement('SiteAccess');
2828

29-
$generator->startValueElement('name', $siteAccess->name);
30-
$generator->endValueElement('name');
29+
$generator->valueElement('name', $siteAccess->name);
3130

3231
$generator->endObjectElement('SiteAccess');
3332
}

tests/integration/REST/GetSiteAccessesListTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Ibexa\Contracts\Test\Rest\Request\Value\EndpointRequestDefinition;
1212

1313
/**
14-
* Coverage for /site-access/load-non-admin-for-location/{locationId} REST endpoint.
14+
* Coverage for /site-access/by-location/{locationId} REST endpoint.
1515
*/
1616
final class GetSiteAccessesListTest extends BaseAdminUiRestWebTestCase
1717
{
@@ -44,7 +44,7 @@ protected static function getEndpointsToTest(): iterable
4444
foreach (self::REQUIRED_FORMATS as $format) {
4545
yield new EndpointRequestDefinition(
4646
'GET',
47-
'/api/ibexa/v2/site-access/load-non-admin-for-location/2',
47+
'/api/ibexa/v2/site-access/by-location/2?resolver_type=non_admin',
4848
'SiteAccessesList',
4949
"application/vnd.ibexa.api.SiteAccessesList+$format",
5050
['HTTP_X-SiteAccess' => 'admin'],

0 commit comments

Comments
 (0)