updates to tag filtering

pimcore · Sep 21, 2023 · a366ba9 · a366ba9
1 parent ca5d6ab
commit a366ba9
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/GraphQL/Resolver/QueryType.php b/src/GraphQL/Resolver/QueryType.php
@@ -438,10 +438,21 @@ static function ($fullpath) use ($db) {
                 return $db->quote($tag);
             }, $args['tags'])));
 
-            $conditionParts[] = "o_id IN (
+            $field = "name";
+            if (isset($args['useTagIdPath']) && $args['useTagIdPath']) {
+                $field = "idPath";
+            }
+
+            $statement = "o_id IN (
                             SELECT cId FROM tags_assignment INNER JOIN tags ON tags.id = tags_assignment.tagid
                             WHERE
-                                ctype = 'object' AND LOWER(tags.name) IN (" . $tags . '))';
+                                ctype = 'object' AND LOWER(tags." . $field . ") IN (" . $tags . ')';
+
+            if (isset($args['hasAllTags']) && $args['hasAllTags']) {
+                $statement .= " GROUP BY cId HAVING COUNT(DISTINCT  tags." . $field . ") = " . count($args['tags']);
+            }
+
+            $conditionParts[] = $statement . ")";
         }
 
         // paging