Skip to content

Commit

Permalink
NGSTACK-461 Add 'parent' sorting option for query types
Browse files Browse the repository at this point in the history
  • Loading branch information
RandyCupic committed Nov 6, 2020
1 parent 206d178 commit ef37864
Showing 1 changed file with 25 additions and 12 deletions.
37 changes: 25 additions & 12 deletions lib/Core/Site/QueryType/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,10 @@ final public function getQuery(array $parameters = []): Query
$parameters = $this->getOptionsResolver()->resolve($parameters);
$query = $this->buildQuery();

$sortDefinitions = $parameters['sort'];
if (!\is_array($sortDefinitions)) {
$sortDefinitions = [$sortDefinitions];
}

$query->query = $this->getQueryCriterion($parameters);
$query->filter = $this->resolveFilterCriteria($parameters);
$query->facetBuilders = $this->getFacetBuilders($parameters);
$query->sortClauses = $this->getSortClauses($sortDefinitions);
$query->sortClauses = $this->getSortClauses($parameters);

if ($parameters['limit'] !== null) {
$query->limit = $parameters['limit'];
Expand Down Expand Up @@ -400,18 +395,36 @@ private function resolveFilterCriteria(array $parameters): ?Criterion
*/
private function getSortClauses(array $parameters): array
{
$sortDefinitions = $parameters['sort'];
$sortClauses = [];

if (empty($sortDefinitions)) {
return $sortClauses;
}

if (\strtolower(\trim($sortDefinitions)) === 'parent' && array_key_exists('location', $parameters)) {
/** @var \Netgen\EzPlatformSiteApi\API\Values\Location $location */
$location = $parameters['location'];

return $location->innerLocation->getSortClauses();
}

if (!\is_array($sortDefinitions)) {
$sortDefinitions = [$sortDefinitions];
}

$sortClauses = [];

foreach ($parameters as $parameter) {
if (\is_string($parameter)) {
$parameter = $this->parseSortString($parameter);
foreach ($sortDefinitions as $sortDefinition) {
if (\is_string($sortDefinition)) {
$sortDefinition = $this->parseSortString($sortDefinition);
}

if (\is_string($parameter)) {
$parameter = $this->parseCustomSortString($parameter);
if (\is_string($sortDefinition)) {
$sortDefinition = $this->parseCustomSortString($sortDefinition);
}

$sortClauses[] = $parameter;
$sortClauses[] = $sortDefinition;
}

return $sortClauses;
Expand Down

0 comments on commit ef37864

Please sign in to comment.