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

Add a new match mode to the TaggerGetResourcesWhere snippet #145

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Add a new match mode to the TaggerGetResourcesWhere snippet #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions core/components/tagger/elements/snippets/TaggerGetResourcesWhere.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* current getResources call, move it here
* &likeComparison int optional If set to 1, tags will compare using LIKE
* &tagField string optional Field that will be used to compare with given tags. Default: alias
* &matchAll int optional If set to 1, resource must have all specified tags. Default: 0
* &matchAll int optional If set to 1, resource must have all specified tags. Default: 0 | If set to 2, an AND condition is used between different groups, an OR condition is used for tags in the same group
* &errorOnInvalidTags bool optional If set to true, will 404 on an invalid tag name request. Default: false
* &field string optional modResource field that will be used to compare with assigned resource ID
*
Expand Down Expand Up @@ -94,6 +94,7 @@

$c = $modx->newQuery(TaggerTag::class);
$c->leftJoin(TaggerGroup::class, 'Group');
$c->select($modx->getSelectColumns(TaggerTag::class, 'TaggerTag', '', ['id', 'group']));

$c->where($conditions);
} else {
Expand All @@ -110,7 +111,7 @@
$groups = \Tagger\Utils::explodeAndClean($groups);

$c = $modx->newQuery(TaggerTag::class);
$c->select($modx->getSelectColumns(TaggerTag::class, 'TaggerTag', '', ['id']));
$c->select($modx->getSelectColumns(TaggerTag::class, 'TaggerTag', '', ['id', 'group']));

$compare = [
$tagField . ':IN' => $tags,
Expand Down Expand Up @@ -138,7 +139,22 @@

$c->prepare();
$c->stmt->execute();
$tagIDs = $c->stmt->fetchAll(PDO::FETCH_COLUMN, 0);

$tagGroups = [];
$tagIDs = [];
if ($matchAll === 2) {
// Group the tags
$taggerTags = $c->stmt->fetchAll(PDO::FETCH_ASSOC);
foreach ($taggerTags as $tag) {
if (!array_key_exists($tag['group'], $tagGroups)) {
$tagGroups[$tag['group']] = [];
}
$tagGroups[$tag['group']][] = $tag['id'];
$tagIDs[] = $tag['id'];
}
} else {
$tagIDs = $c->stmt->fetchAll(PDO::FETCH_COLUMN, 0);
}

if (count($tagIDs) == 0) {
$tagIDs[] = 0;
Expand All @@ -152,6 +168,13 @@
',',
$tagIDs
) . ") AND r.resource = modResource." . $field . ")";
} elseif ($matchAll === 2) {
foreach ($tagGroups as $tagGroupIDs) {
$where[] = "EXISTS (SELECT 1 FROM {$modx->getTableName(TaggerTagResource::class)} r WHERE r.tag IN (" . implode(
',',
$tagGroupIDs
) . ") AND r.resource = modResource." . $field . ")";
}
} else {
$where[] = "EXISTS (SELECT 1 as found FROM {$modx->getTableName(TaggerTagResource::class)} r WHERE r.tag IN ("
. implode(',', $tagIDs) . ") AND r.resource = modResource." . $field . " GROUP BY found HAVING count(found) = "
Expand Down