Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expand on tag filters #803

Open
wants to merge 6 commits into
base: 1.x
Choose a base branch
from
Open

Expand on tag filters #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca5d6ab
added tag params
abrenoch Sep 21, 2023
a366ba9
updates to tag filtering
abrenoch Sep 21, 2023
9620844
Merge pull request #2 from pimcore/1.x
abrenoch Apr 3, 2024
743b13d
Merge branch '1.x' into tag-filtering
abrenoch Apr 3, 2024
ae4546f
updates & fixes
abrenoch Apr 3, 2024
ddfb9e0
hasAllTags missing
abrenoch Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/GraphQL/Query/QueryType.php
View file
Open in desktop
Expand Up @@ -263,7 +263,18 @@ public function buildDataObjectQueries(&$config = [], $context = []): void
'type' => Type::string(),
'description' => 'Comma separated list of fullpath'
],
'tags' => ['type' => Type::string(), 'description' => 'Comma separated list of tag names'],
'tags' => [
'type' => Type::string(),
'description' => 'Comma separated list of tag names (or idPath if useTagIdPath is true)'
],
'useTagIdPath' => [
'type' => Type::boolean(),
'description' => 'Use idPath instead of name for tags in the tags argument'
],
'hasAllTags' => [
'type' => Type::boolean(),
'description' => 'Results must match all tags in the tags argument'
],
'defaultLanguage' => ['type' => Type::string()],
'first' => ['type' => Type::int()],
'after' => ['type' => Type::int()],
Expand Down
41 changes: 33 additions & 8 deletions src/GraphQL/Resolver/QueryType.php
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@

namespace Pimcore\Bundle\DataHubBundle\GraphQL\Resolver;

use Doctrine\DBAL\ParameterType;
use GraphQL\Type\Definition\ResolveInfo;
use Pimcore;
use Pimcore\Bundle\DataHubBundle\Configuration;
Expand Down Expand Up @@ -438,16 +439,40 @@ static function ($fullpath) use ($db) {
if (!is_array($args['tags'])) {
$args['tags'] = explode(',', $args['tags']);
}
$tags = strtolower(implode(', ', array_map(static function ($tag) use ($db) {
$tag = trim($tag);

return $db->quote($tag);
}, $args['tags'])));
$tags = "";
$tagIds = "";
$tagCondition = sprintf("%s IN (", Service::getVersionDependentDatabaseColumnName('o_id'));
$tagCondition .= "SELECT cId FROM tags_assignment INNER JOIN tags ON tags.id = tags_assignment.tagid";
if (isset($args['useTagIdPath']) && $args['useTagIdPath']) {
foreach ($args['tags'] as $i => $tag) {
$tagParts = explode('/', $tag);
if ($tagParts[count($tagParts) - 1] == '') {
$tagId = $tagParts[count($tagParts) - 2];
$tagParts = array_slice($tagParts, 0, count($tagParts) - 2);
} else {
$tagId = $tagParts[count($tagParts) - 1];
$tagParts = array_slice($tagParts, 0, count($tagParts) - 1);
}
$tagIds .= $db->quote($tagId, ParameterType::INTEGER) . ($i < count($args['tags']) - 1 ? ', ' : '');
$tags .= $db->quote(implode("/", $tagParts) . "/") . ($i < count($args['tags']) - 1 ? ', ' : '');
}
$tagCondition .= " WHERE ctype = 'object' AND LOWER(tags.idPath) IN (" . $tags . ") AND tags.id IN (" . $tagIds . ")";
} else {
$tags = strtolower(implode(', ', array_map(static function ($tag) use ($db) {
$tag = trim($tag);
return $db->quote($tag);
}, $args['tags'])));
$tagCondition .= " WHERE ctype = 'object' AND LOWER(tags.name) IN (" . $tags . ")";
}

if (isset($args['hasAllTags']) && $args['hasAllTags']) {
$tagCondition .= " GROUP BY cId HAVING COUNT(DISTINCT tags.id) = " . count($args['tags']);
}

$tagCondition .= ")";

$conditionParts[] = sprintf("%s IN (
SELECT cId FROM tags_assignment INNER JOIN tags ON tags.id = tags_assignment.tagid
WHERE
ctype = 'object' AND LOWER(tags.name) IN (", Service::getVersionDependentDatabaseColumnName('o_id')) . $tags . '))';
$conditionParts[] = $tagCondition;
}

// paging
Expand Down