diff --git a/src/API/OrganizationsByPersonProviderInterface.php b/src/API/OrganizationsByPersonProviderInterface.php deleted file mode 100644 index 30457bdd283972cd3d421caa08d003553f86640e..0000000000000000000000000000000000000000 --- a/src/API/OrganizationsByPersonProviderInterface.php +++ /dev/null @@ -1,16 +0,0 @@ -<?php - -declare(strict_types=1); - -namespace Dbp\Relay\BaseOrganizationBundle\API; - -use Dbp\Relay\CoreBundle\Exception\ApiError; -use Dbp\Relay\CoreBundle\Pagination\Paginator; - -interface OrganizationsByPersonProviderInterface -{ - /** - * @throws ApiError - */ - public function getOrganizationsByPerson(string $personId, array $options = []): Paginator; -} diff --git a/src/DataProvider/OrganizationDataProvider.php b/src/DataProvider/OrganizationDataProvider.php index a33413456dc0e59cb994e031596d264f7cf8638a..77f3c9dd0197b69396d65b09407109f95938fca9 100644 --- a/src/DataProvider/OrganizationDataProvider.php +++ b/src/DataProvider/OrganizationDataProvider.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Dbp\Relay\BaseOrganizationBundle\DataProvider; use Dbp\Relay\BaseOrganizationBundle\API\OrganizationProviderInterface; -use Dbp\Relay\BaseOrganizationBundle\API\OrganizationsByPersonProviderInterface; use Dbp\Relay\BaseOrganizationBundle\Entity\Organization; use Dbp\Relay\CoreBundle\DataProvider\AbstractDataProvider; use Dbp\Relay\CoreBundle\Locale\Locale; @@ -15,13 +14,9 @@ class OrganizationDataProvider extends AbstractDataProvider /** @var OrganizationProviderInterface */ private $organizationProvider; - /** @var OrganizationsByPersonProviderInterface */ - private $organizationsByPersonProvider; - - public function __construct(OrganizationProviderInterface $organizationProvider, OrganizationsByPersonProviderInterface $organizationsByPersonProvider) + public function __construct(OrganizationProviderInterface $organizationProvider) { $this->organizationProvider = $organizationProvider; - $this->organizationsByPersonProvider = $organizationsByPersonProvider; } protected function getResourceClass(): string @@ -51,19 +46,6 @@ class OrganizationDataProvider extends AbstractDataProvider $this->tryAddDeprecatedLangQueryParameter($options, $filters); //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - // @deprecate The 'person' filter is deprecate. Use the 'identifiers' filter in your custom organization wrapper. - $personId = $filters['person'] ?? ''; - if ($personId !== '') { - $organizations = []; - foreach ($this->organizationsByPersonProvider->getOrganizationsByPerson($personId, $options) as $organizationId) { - $organizations[] = $this->organizationProvider->getOrganizationById($organizationId, $options); - } - - return $organizations; - } - //------------------------------------------------------------------------- - if ($search = ($filters['search'] ?? null)) { $options['search'] = $search; } diff --git a/src/Entity/Organization.php b/src/Entity/Organization.php index 499e7231f69508d8cab82d83d7694f25329c83ee..7cfbab6a272c9bcfe7ff1f223a3dcf0f94f009f5 100644 --- a/src/Entity/Organization.php +++ b/src/Entity/Organization.php @@ -19,7 +19,6 @@ use Dbp\Relay\CoreBundle\LocalData\LocalDataAwareTrait; * "tags" = {"BaseOrganization"}, * "parameters" = { * {"name" = "search", "in" = "query", "description" = "Search filter (partial, case-insensitive text search on 'name' attribute)", "type" = "string", "required" = false}, - * {"name" = "person", "in" = "query", "description" = "DEPRECATED: Get organizations of a person (ID of BasePerson resource)", "type" = "string", "required" = false}, * {"name" = "queryLocal", "in" = "query", "description" = "Local query parameters to apply", "type" = "string"}, * {"name" = "includeLocal", "in" = "query", "description" = "Local data attributes to include", "type" = "string", "example" = "code"} * } diff --git a/src/Service/DummyOrganizationsByPersonProvider.php b/src/Service/DummyOrganizationsByPersonProvider.php deleted file mode 100644 index 952c50d013f56a35be80d05ec0eb9d47e548092b..0000000000000000000000000000000000000000 --- a/src/Service/DummyOrganizationsByPersonProvider.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -declare(strict_types=1); - -namespace Dbp\Relay\BaseOrganizationBundle\Service; - -use Dbp\Relay\BaseOrganizationBundle\API\OrganizationsByPersonProviderInterface; -use Dbp\Relay\CoreBundle\Pagination\Paginator; -use Dbp\Relay\CoreBundle\Pagination\WholeResultPaginator; - -class DummyOrganizationsByPersonProvider implements OrganizationsByPersonProviderInterface -{ - public function getOrganizationsByPerson(string $personId, array $options = []): Paginator - { - return new WholeResultPaginator([], 1, 30); - } -}