Refactor query mapper

GraphQL/InputMapper/Search/Criterion/ContentTypeId.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace BD\EzPlatformGraphQLBundle\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query\CriterionInterface;
+use eZ\Publish\API\Repository\Values\Content\Query;
+use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException;
+
+class ContentTypeId implements SearchCriterion
+{
+    public function map($value): array
+    {
+        return [new Query\Criterion\ContentTypeId($value)];
+    }
+
+}

GraphQL/InputMapper/Search/Criterion/Created.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace BD\EzPlatformGraphQLBundle\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class Created extends DateMetadata
+{
+    const TARGET = Query\Criterion\DateMetadata::CREATED;
+}

GraphQL/InputMapper/Search/Criterion/DateMetadata.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace BD\EzPlatformGraphQLBundle\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class DateMetadata implements SearchCriterion
+{
+    public function map($value): array
+    {
+        $dateOperatorsMap = [
+            'on' => Query\Criterion\Operator::EQ,
+            'before' => Query\Criterion\Operator::LTE,
+            'after' => Query\Criterion\Operator::GTE,
+        ];
+
+        $criteria = [];
+        foreach ($value as $operator => $dateString) {
+            if (!isset($dateOperatorsMap[$operator])) {
+                echo "Not a valid operator\n";
+                continue;
+            }
+
+            $criteria[] = new Query\Criterion\DateMetadata(
+                static::TARGET,
+                $dateOperatorsMap[$operator],
+                strtotime($dateString)
+            );
+        }
+
+        return $criteria;
+    }
+
+}

GraphQL/InputMapper/Search/Criterion/Field.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace BD\EzPlatformGraphQLBundle\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class Field implements SearchCriterion
+{
+    public function map($value): array
+    {
+        $criteria = [];
+
+        if (isset($value['target'])) {
+            $criteria[] = $this->mapInputToFieldCriterion($value);
+        } else {
+            $criteria = array_merge(
+                $criteria,
+                array_map(
+                    function($input) {
+                        return $this->mapInputToFieldCriterion($input);
+                    },
+                    $value
+                )
+            );
+        }
+
+        return $criteria;
+    }
+
+    private function mapInputToFieldCriterion($input)
+    {
+        $operators = ['in', 'eq', 'like', 'contains', 'between', 'lt', 'lte', 'gt', 'gte'];
+        foreach ($operators as $opString) {
+            if (isset($input[$opString])) {
+                $value = $input[$opString];
+                $operator = constant('eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator::' . strtoupper($opString));
+            }
+        }
+
+        if (!isset($operator)) {
+            throw new InvalidArgumentException("Unspecified operator");
+        }
+
+        return new Query\Criterion\Field($input['target'], $operator, $value);
+    }
+}

GraphQL/InputMapper/Search/Criterion/Modified.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace BD\EzPlatformGraphQLBundle\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class Modified extends DateMetadata
+{
+    const TARGET = Query\Criterion\DateMetadata::MODIFIED;
+}

GraphQL/InputMapper/Search/Criterion/Text.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace BD\EzPlatformGraphQLBundle\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query\CriterionInterface;
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class Text implements SearchCriterion
+{
+    public function map($value): array
+    {
+        $criteria = [];
+
+        foreach ($value as $text) {
+            $criteria[] = new Query\Criterion\FullText($text);
+        }
+
+        return $criteria;
+    }
+}

src/DependencyInjection/Compiler/SearchQueryMappersPass.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\DependencyInjection\Compiler;
+
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\SearchQueryMapper;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class SearchQueryMappersPass implements CompilerPassInterface
+{
+    const ID = SearchQueryMapper::class;
+
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->has(self::ID)) {
+            return;
+        }
+
+        $definition = $container->findDefinition(self::ID);
+        $taggedServices = $container->findTaggedServiceIds('ezplatform_graphql.query_input_visitor');
+
+        $queryInputVisitors = [];
+        foreach ($taggedServices as $id => $tags) {
+            foreach ($tags as $tag) {
+                if (isset($tag['inputKey'])) {
+                    $queryInputVisitors[$tag['inputKey']] = new Reference($id);
+                }
+            }
+        }
+
+        $definition->setArgument('$queryInputVisitors', $queryInputVisitors);
+    }
+}

src/DependencyInjection/EzSystemsEzPlatformGraphQLExtension.php

@@ -31,6 +31,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('schema.yml');
         $loader->load('resolvers.yml');
         $loader->load('services.yml');
+        $loader->load('query_input_visitors.yml');
     }
 
     /**

src/EzSystemsEzPlatformGraphQLBundle.php

@@ -16,5 +16,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new Compiler\FieldValueBuildersPass());
         $container->addCompilerPass(new Compiler\SchemaWorkersPass());
         $container->addCompilerPass(new Compiler\SchemaDomainIteratorsPass());
+        $container->addCompilerPass(new Compiler\SearchQueryMappersPass());
     }
 }

src/GraphQL/InputMapper/Search/Criterion/Created.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class Created extends DateMetadata
+{
+    const TARGET = Query\Criterion\DateMetadata::CREATED;
+}

src/GraphQL/InputMapper/Search/Criterion/DateMetadata.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\QueryBuilder;
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\QueryInputVisitor;
+
+class DateMetadata implements QueryInputVisitor
+{
+    public function visit(QueryBuilder $queryBuilder, $value): void
+    {
+        $dateOperatorsMap = [
+            'on' => Query\Criterion\Operator::EQ,
+            'before' => Query\Criterion\Operator::LTE,
+            'after' => Query\Criterion\Operator::GTE,
+        ];
+
+        foreach ($value as $operator => $dateString) {
+            if (!isset($dateOperatorsMap[$operator])) {
+                echo "Not a valid operator\n";
+                continue;
+            }
+
+            $queryBuilder->addCriterion(new Query\Criterion\DateMetadata(
+                static::TARGET,
+                $dateOperatorsMap[$operator],
+                strtotime($dateString)
+            ));
+        }
+    }
+}

src/GraphQL/InputMapper/Search/Criterion/Field.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\QueryBuilder;
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\QueryInputVisitor;
+
+class Field implements QueryInputVisitor
+{
+    public function visit(QueryBuilder $queryBuilder, $value): void
+    {
+        $criteria = [];
+
+        if (isset($value['target'])) {
+            $criteria[] = $this->mapInputToFieldCriterion($value);
+        } else {
+            $criteria = array_merge(
+                $criteria,
+                array_map(
+                    function($input) {
+                        return $this->mapInputToFieldCriterion($input);
+                    },
+                    $value
+                )
+            );
+        }
+
+        foreach ($criteria as $criterion) {
+            $queryBuilder->addCriterion($criterion);
+        }
+    }
+
+    private function mapInputToFieldCriterion($input)
+    {
+        $operators = ['in', 'eq', 'like', 'contains', 'between', 'lt', 'lte', 'gt', 'gte'];
+        foreach ($operators as $opString) {
+            if (isset($input[$opString])) {
+                $value = $input[$opString];
+                $operator = constant('eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator::' . strtoupper($opString));
+            }
+        }
+
+        if (!isset($operator)) {
+            throw new InvalidArgumentException("Unspecified operator");
+        }
+
+        return new Query\Criterion\Field($input['target'], $operator, $value);
+    }
+}

src/GraphQL/InputMapper/Search/Criterion/Modified.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\Criterion;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class Modified extends DateMetadata
+{
+    const TARGET = Query\Criterion\DateMetadata::MODIFIED;
+}

src/GraphQL/InputMapper/Search/Criterion/Standard.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\Criterion;
+
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\QueryBuilder;
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\QueryInputVisitor;
+
+class Standard implements QueryInputVisitor
+{
+    private $criterionClass;
+
+    public function __construct($criterionClass)
+    {
+        $this->criterionClass = $criterionClass;
+    }
+
+    public function visit(QueryBuilder $queryBuilder, $value): void
+    {
+        $queryBuilder->addCriterion(new {$this->criterionClass}($value));
+    }
+}

src/GraphQL/InputMapper/Search/QueryBuilder.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+
+class QueryBuilder
+{
+    /**
+     * @var array
+     */
+    private $criterions = [];
+
+    /** @var Query\SortClause */
+    protected $sortBy;
+
+    public function addCriterion(Query\Criterion $criterion): void
+    {
+        $this->criterions[] = $criterion;
+    }
+
+    public function buildQuery(): Query
+    {
+
+        $query = new Query();
+
+        if (count($this->criterions) === 0) {
+            return $query;
+        }
+
+        $query->filter = count($this->criterions) === 1 ? $this->criterions[0] : new Query\Criterion\LogicalAnd($this->criterions);
+
+        if ($this->sortBy) {
+            $query->sortClauses = $this->sortBy;
+        }
+
+        return $query;
+    }
+}

src/GraphQL/InputMapper/Search/QueryInputVisitor.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search;
+
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\Search\QueryBuilder;
+
+interface QueryInputVisitor
+{
+    public function visit(QueryBuilder $queryBuilder, $value): void;
+}