Natural filtering

src/DependencyInjection/EzSystemsEzPlatformGraphQLExtension.php

@@ -39,6 +39,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services/mutations.yml');
         $loader->load('services/resolvers.yml');
         $loader->load('services/schema.yml');
+        $loader->load('services/search.yml');
         $loader->load('services/services.yml');
         $loader->load('default_settings.yml');
     }

src/DependencyInjection/Factory/SearchFeaturesFactory.php

@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace EzSystems\EzPlatformGraphQL\DependencyInjection\Factory;
+
+use eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider;
+
+class SearchFeaturesFactory
+{
+    /**
+     * @var \eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider
+     */
+    private $configurationProvider;
+
+    /**
+     * @var \EzSystems\EzPlatformGraphQL\Search\SearchFeatures[]
+     */
+    private $searchFeatures = [];
+
+    public function __construct(RepositoryConfigurationProvider $configurationProvider, array $searchFeatures)
+    {
+        $this->configurationProvider = $configurationProvider;
+        $this->searchFeatures = $searchFeatures;
+    }
+
+    public function build()
+    {
+        $searchEngine = $this->configurationProvider->getRepositoryConfig()['search']['engine'];
+
+        if (isset($this->searchFeatures[$searchEngine])) {
+            return $this->searchFeatures[$searchEngine];
+        } else {
+            throw new \InvalidArgumentException('Search engine not found');
+        }
+    }
+}

src/GraphQL/DataLoader/CachedContentTypeLoader.php

@@ -23,6 +23,16 @@ class CachedContentTypeLoader implements ContentTypeLoader
      */
     private $loadedItems = [];
 
+    /**
+     * @var array
+     */
+    private $identifierToIdMap = [];
+
+    /**
+     * @var ContentType[]
+     */
+    private $loadedItemsByIdentifier = [];
+
     public function __construct(ContentTypeLoader $innerLoader)
     {
         $this->innerLoader = $innerLoader;
@@ -31,20 +41,23 @@ public function __construct(ContentTypeLoader $innerLoader)
     public function load($contentTypeId): ContentType
     {
         if (!isset($this->loadedItems[$contentTypeId])) {
-            $this->loadedItems[$contentTypeId] = $this->innerLoader->load($contentTypeId);
+            $contentType = $this->innerLoader->load($contentTypeId);
+            $this->loadedItems[$contentTypeId] = $contentType;
+            $this->identifierToIdMap[$contentType->identifier] = $contentTypeId;
         }
 
         return $this->loadedItems[$contentTypeId];
     }
 
     public function loadByIdentifier($identifier): ContentType
     {
-        $contentType = $this->innerLoader->loadByIdentifier($identifier);
-
-        if (!isset($this->innerLoader[$contentType->id])) {
-            $this->innerLoader[$contentType->id] = $contentType;
+        if (!isset($this->identifierToIdMap[$identifier])) {
+            $contentType = $this->innerLoader->loadByIdentifier($identifier);
+            $this->loadedItems[$contentType->id] = $contentType;
+            $this->identifierToIdMap[$identifier] = $contentType->id;
         }
 
-        return $contentType;
+
+        return $this->loadedItems[$this->identifierToIdMap[$identifier]];
     }
 }

src/GraphQL/InputMapper/FieldsQueryMapper.php

@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper;
+
+use EzSystems\EzPlatformGraphQL\GraphQL\DataLoader\ContentTypeLoader;
+
+/**
+ * Pre-processes the input to change fields passed using their identifier to the Field input key.
+ */
+class FieldsQueryMapper implements QueryMapper
+{
+    /**
+     * @var QueryMapper
+     */
+    private $innerMapper;
+    /**
+     * @var ContentTypeLoader
+     */
+    private $contentTypeLoader;
+
+    public function __construct(ContentTypeLoader $contentTypeLoader, QueryMapper $innerMapper)
+    {
+        $this->innerMapper = $innerMapper;
+        $this->contentTypeLoader = $contentTypeLoader;
+    }
+
+    /**
+     * @param array $inputArray
+     *
+     * @return \eZ\Publish\API\Repository\Values\Content\Query
+     */
+    public function mapInputToQuery(array $inputArray)
+    {
+        if (isset($inputArray['ContentTypeIdentifier']) && isset($inputArray['fieldsFilters'])) {
+            $contentType = $this->contentTypeLoader->loadByIdentifier($inputArray['ContentTypeIdentifier']);
+            $fieldsArgument = [];
+
+            foreach ($inputArray['fieldsFilters'] as $fieldDefinitionIdentifier => $value) {
+                if (($fieldDefinition = $contentType->getFieldDefinition($fieldDefinitionIdentifier)) === null) {
+                    continue;
+                }
+
+                if (!$fieldDefinition->isSearchable) {
+                    continue;
+                }
+
+                $fieldFilter = $this->buildFieldFilter($fieldDefinitionIdentifier, $value);
+                if ($fieldFilter !== null) {
+                    $fieldsArgument[] = $fieldFilter;
+                }
+            }
+
+            $inputArray['Fields'] = $fieldsArgument;
+        }
+
+        return $this->innerMapper->mapInputToQuery($inputArray);
+    }
+
+    private function buildFieldFilter($fieldDefinitionIdentifier, $value)
+    {
+        if (is_array($value) && count($value) === 1) {
+            $value = $value[0];
+        }
+        $operator = 'eq';
+
+        // @todo if 3 items, and first item is 'between', use next two items as value
+        if (is_array($value)) {
+            $operator = 'in';
+        } elseif (is_string($value)) {
+            if ($value[0] === '~') {
+                $operator = 'like';
+                $value = substr($value, 1);
+                if (strpos($value, '%') === false) {
+                    $value = "%$value%";
+                }
+            } elseif ($value[0] === '<') {
+                $value = substr($value, 1);
+                if ($value[0] === '=') {
+                    $operator = 'lte';
+                    $value = substr($value, 2);
+                } else {
+                    $operator = 'lt';
+                    $value = substr($value, 1);
+                }
+            } elseif ($value[0] === '<') {
+                $value = substr($value, 1);
+                if ($value[0] === '=') {
+                    $operator = 'gte';
+                    $value = substr($value, 2);
+                } else {
+                    $operator = 'gt';
+                    $value = substr($value, 1);
+                }
+            }
+        }
+
+        return ['target' => $fieldDefinitionIdentifier, $operator => trim($value)];
+    }
+}

src/GraphQL/InputMapper/QueryMapper.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace EzSystems\EzPlatformGraphQL\GraphQL\InputMapper;
+
+interface QueryMapper
+{
+    /**
+     * @param array $inputArray
+     *
+     * @return \eZ\Publish\API\Repository\Values\Content\Query
+     */
+    public function mapInputToQuery(array $inputArray);
+}

src/GraphQL/InputMapper/SearchQueryMapper.php

@@ -9,7 +9,7 @@
 use eZ\Publish\API\Repository\Values\Content\Query;
 use InvalidArgumentException;
 
-class SearchQueryMapper
+class SearchQueryMapper implements QueryMapper
 {
     /**
      * @param array $inputArray
@@ -36,19 +36,19 @@ public function mapInputToQuery(array $inputArray)
         }
 
         if (isset($inputArray['Field'])) {
-            if (isset($inputArray['Field']['target'])) {
-                $criteria[] = $this->mapInputToFieldCriterion($inputArray['Field']);
-            } else {
-                $criteria = array_merge(
-                    $criteria,
-                    array_map(
-                        function ($input) {
-                            return $this->mapInputToFieldCriterion($input);
-                        },
-                        $inputArray['Field']
-                    )
-                );
-            }
+            $inputArray['Fields'] = [$inputArray['Field']];
+        }
+
+        if (isset($inputArray['Fields'])) {
+            $criteria = array_merge(
+                $criteria,
+                array_map(
+                    function ($input) {
+                        return $this->mapInputToFieldCriterion($input);
+                    },
+                    $inputArray['Fields']
+                )
+            );
         }
 
         if (isset($inputArray['ParentLocationId'])) {

src/GraphQL/Resolver/DomainContentResolver.php

@@ -8,7 +8,7 @@
 
 use EzSystems\EzPlatformGraphQL\GraphQL\DataLoader\ContentLoader;
 use EzSystems\EzPlatformGraphQL\GraphQL\DataLoader\ContentTypeLoader;
-use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\SearchQueryMapper;
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\QueryMapper;
 use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\Core\FieldType;
 use eZ\Publish\API\Repository\Values\Content\Content;
@@ -31,7 +31,7 @@ class DomainContentResolver
     private $typeResolver;
 
     /**
-     * @var SearchQueryMapper
+     * @var \EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\QueryMapper
      */
     private $queryMapper;
 
@@ -53,7 +53,7 @@ class DomainContentResolver
     public function __construct(
         Repository $repository,
         TypeResolver $typeResolver,
-        SearchQueryMapper $queryMapper,
+        QueryMapper $queryMapper,
         ContentLoader $contentLoader,
         ContentTypeLoader $contentTypeLoader)
     {

src/GraphQL/Resolver/SearchResolver.php

@@ -7,7 +7,7 @@
 namespace EzSystems\EzPlatformGraphQL\GraphQL\Resolver;
 
 use EzSystems\EzPlatformGraphQL\GraphQL\DataLoader\ContentLoader;
-use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\SearchQueryMapper;
+use EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\QueryMapper;
 use eZ\Publish\API\Repository\SearchService;
 use Overblog\GraphQLBundle\Relay\Connection\Paginator;
 
@@ -22,7 +22,7 @@ class SearchResolver
     private $searchService;
 
     /**
-     * @var SearchQueryMapper
+     * @var QueryMapper
      */
     private $queryMapper;
 
@@ -31,7 +31,7 @@ class SearchResolver
      */
     private $contentLoader;
 
-    public function __construct(ContentLoader $contentLoader, SearchService $searchService, SearchQueryMapper $queryMapper)
+    public function __construct(ContentLoader $contentLoader, SearchService $searchService, QueryMapper $queryMapper)
     {
         $this->contentLoader = $contentLoader;
         $this->searchService = $searchService;
@@ -48,6 +48,7 @@ public function searchContent($args)
     public function searchContentOfTypeAsConnection($contentTypeIdentifier, $args)
     {
         $query = $args['query'] ?: [];
+        $query['fieldsFilters'] = $args['filter'] ?: [];
         $query['ContentTypeIdentifier'] = $contentTypeIdentifier;
         $query['sortBy'] = $args['sortBy'];
         $query = $this->queryMapper->mapInputToQuery($query);

src/Resources/config/services/search.yml

@@ -0,0 +1,31 @@
+services:
+    _defaults:
+        autoconfigure: true
+        autowire: true
+        public: false
+
+    EzSystems\EzPlatformGraphQL\DependencyInjection\Factory\SearchFeaturesFactory:
+        arguments:
+            $configurationProvider: '@ezpublish.api.repository_configuration_provider'
+            $searchFeatures:
+                solr: '@EzSystems\EzPlatformGraphQL\Search\SolrSearchFeatures'
+                legacy: '@EzSystems\EzPlatformGraphQL\Search\LegacySearchFeatures'
+
+
+    EzSystems\EzPlatformGraphQL\Search\SearchFeatures:
+        factory: ['@EzSystems\EzPlatformGraphQL\DependencyInjection\Factory\SearchFeaturesFactory', build]
+
+    EzSystems\EzPlatformGraphQL\Search\SolrSearchFeatures: ~
+
+    EzSystems\EzPlatformGraphQL\Search\LegacySearchFeatures:
+        arguments:
+            $converterRegistry: '@ezpublish.persistence.legacy.field_value_converter.registry'
+
+    EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\QueryMapper: '@EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\SearchQueryMapper'
+
+    EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\SearchQueryMapper: ~
+
+    EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\FieldsQueryMapper:
+        decorates: EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\SearchQueryMapper
+        arguments:
+            $innerMapper: '@EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\FieldsQueryMapper.inner'

src/Resources/config/services/services.yml

@@ -11,5 +11,3 @@ services:
             -  { name: console.command }
 
     EzSystems\EzPlatformGraphQL\GraphQL\TypeDefinition\ContentTypeMapper: ~
-
-    EzSystems\EzPlatformGraphQL\GraphQL\InputMapper\SearchQueryMapper: ~

src/Schema/Domain/Content/NameHelper.php

@@ -93,6 +93,11 @@ public function fieldDefinitionField(FieldDefinition $fieldDefinition)
         return lcfirst($this->toCamelCase($fieldDefinition->identifier));
     }
 
+    public function filterType(ContentType $contentType)
+    {
+        return $this->domainContentName($contentType) . 'Filter';
+    }
+
     private function toCamelCase($string)
     {
         return $this->caseConverter->denormalize($string);