diff --git a/src/Controllers/ResourceController.php b/src/Controllers/ResourceController.php index 9bff5be..dde5887 100644 --- a/src/Controllers/ResourceController.php +++ b/src/Controllers/ResourceController.php @@ -110,23 +110,16 @@ protected function getFilteredModels( $factory = null; $filterResults = null; - if ($resourceDefinition) { - $factory = StaticResourceDefinitionFactory::getFactoryOrDefaultFactory($resourceDefinition); - - if ($isQueryBuilder) { - $filterResults = $this->resourceTransformer->applyFilters( - $this->getRequest()->query(), - $filters, - $context, - $queryBuilder - ); - - $queryBuilder = $filterResults->getQueryBuilder(); - } - } - - // apply global filters. if ($isQueryBuilder) { + $filterResults = $this->resourceTransformer->applyFilters( + $this->getRequest()->query(), + $filters, + $context, + $queryBuilder + ); + + $queryBuilder = $filterResults->getQueryBuilder(); + $this->applyGlobalFilters($queryBuilder, $factory?->getDefault(), $context); }