Merge tag 'v0.3.3'

ezsystems · Jan 17, 2019 · afc5898 · afc5898
2 parents 57a881e + 3bda7e0
commit afc5898
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 14 deletions.
diff --git a/src/GraphQL/InputMapper/SearchQueryMapper.php b/src/GraphQL/InputMapper/SearchQueryMapper.php
@@ -29,20 +29,21 @@ public function mapInputToQuery(array $inputArray)
             $criteria[] = new Query\Criterion\FullText($inputArray['Text']);
         }
 
-        if (isset($inputArray['Field'])) {
-            $args = $inputArray['Field'];
-            foreach (['in', 'eq', 'like', 'contains', 'between', 'lt', 'lte', 'gt', 'gte'] as $opString) {
-                if (isset($args[$opString])) {
-                    $value = $args[$opString];
-                    $operator = constant(Query\Criterion\Operator::class . '::' . strtoupper($opString));
-                }
+        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']
+                    )
+                );
             }
-
-            if (!isset($operator) || !isset($value)) {
-                throw new InvalidArgumentException("Unspecified operator");
-            }
-
-            $criteria[] = new Query\Criterion\Field($args['target'], $operator, $value);
         }
 
         $criteria = array_merge($criteria, $this->mapDateMetadata($inputArray, 'Modified'));
@@ -131,4 +132,20 @@ private function mapDateMetadata(array $queryArg = [], $dateMetadata)
 
         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);    }
 }
diff --git a/src/Resources/config/graphql/Search.types.yml b/src/Resources/config/graphql/Search.types.yml
@@ -21,7 +21,7 @@ ContentSearchQuery:
                 type: "[Int]"
                 description: "Filter content based on its parent location id"
             Field:
-                type: "FieldCriterionInput"
+                type: "[FieldCriterionInput]"
                 description: "Field filter"
 
 FieldCriterionInput: