Skip to content

Fix category facet so it matches deep subcategories #1163

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

Open
Pianczetti wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix category facet so it matches deep subcategories #1163

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
175 changes: 167 additions & 8 deletions src/Filters/Converter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
use Configuration;
use Context;
use Db;
use Shop;
use Manufacturer;
use PrestaShop\Module\FacetedSearch\Definition\Availability;
use PrestaShop\Module\FacetedSearch\Filters;
Expand Down Expand Up @@ -448,15 +449,28 @@ public function createFacetedSearchFiltersFromQuery(ProductSearchQuery $query)
break;
case self::TYPE_CATEGORY:
if (isset($receivedFilters[$filterLabel])) {
// Collect valid names
$requestedNames = [];
foreach ($receivedFilters[$filterLabel] as $queryFilter) {
/*
* This works only for categories that are child of the category we are browsing (or home category).
* Categories deeper in the tree will never be found. This could be fixed by providing a unique ID
* to the URL.
*/
$categories = Category::searchByNameAndParentCategoryId($idLang, $queryFilter, (int) $idCategory);
if ($categories) {
$searchFilters[$filter['type']][] = $categories['id_category'];
if (is_string($queryFilter) && $queryFilter !== '') {
$requestedNames[] = $queryFilter;
}
}

if (!empty($requestedNames)) {
// Batch lookup by subtree; returns name => id_category mapping
$foundMap = $this->findCategoriesByNamesInSubtree($idLang, $requestedNames, (int) $idCategory);

foreach ($requestedNames as $queryFilter) {
if (isset($foundMap[$queryFilter])) {
$searchFilters[$filter['type']][] = (int) $foundMap[$queryFilter];
continue;
}
// Fallback per-name (SQL single + BFS) if not resolved in batch
$categoryRow = $this->findCategoryByNameInSubtree($idLang, $queryFilter, (int) $idCategory);
if ($categoryRow) {
$searchFilters[$filter['type']][] = (int) $categoryRow['id_category'];
}
}
}
}
Expand Down Expand Up @@ -576,4 +590,149 @@ private function sortFiltersByLabel(Filter $a, Filter $b)
{
return strnatcasecmp($a->getLabel(), $b->getLabel());
}

/**
* Find a category by exact name within a given subtree (based on nested set nleft/nright), without core changes.
*
* @param int $idLang
* @param string $categoryName
* @param int $idRootCategory
*
* @return array|false
*/
private function findCategoryByNameInSubtree($idLang, $categoryName, $idRootCategory)
{
if (!is_string($categoryName) || $categoryName === '') {
return false;
}

$interval = Category::getInterval((int) $idRootCategory);
if (empty($interval)) {
return false;
}

$query = new \DbQuery();
$query->select('c.*, cl.*');
$query->from('category', 'c');
// Shop association equivalent to Shop::addSqlAssociation('category', 'c')
$query->leftJoin(
'category_shop',
'category_shop',
'c.`id_category` = category_shop.`id_category` AND category_shop.`id_shop` = ' . (int) $this->context->shop->id
);
$query->leftJoin(
'category_lang',
'cl',
'c.`id_category` = cl.`id_category` AND cl.`id_lang` = ' . (int) $idLang . Shop::addSqlRestrictionOnLang('cl')
);
$query->where("cl.`name` = '" . pSQL($categoryName) . "'");
$query->where('c.`nleft` >= ' . (int) $interval['nleft']);
$query->where('c.`nright` <= ' . (int) $interval['nright']);
$query->where('c.`id_category` != ' . (int) Configuration::get('PS_HOME_CATEGORY'));
$query->where('c.`active` = 1');
$query->orderBy('c.`level_depth` ASC');
$query->limit(1);

$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($query);
if ($row) {
return $row;
}

// Fallback: BFS over children if SQL match not found (handles edge cases on older cores/shops setups)
return $this->findCategoryByNameInSubtreeFallback($idLang, $categoryName, (int) $idRootCategory);
}

/**
* Batch variant: resolve multiple names within the subtree in a single query.
* Returns associative map name => id_category (exact matches only).
*
* @param int $idLang
* @param string[] $categoryNames
* @param int $idRootCategory
*
* @return array<string,int>
*/
private function findCategoriesByNamesInSubtree($idLang, array $categoryNames, $idRootCategory)
{
$cleanNames = [];
foreach ($categoryNames as $name) {
if (is_string($name) && $name !== '') {
$cleanNames[] = pSQL($name);
}
}
if (empty($cleanNames)) {
return [];
}

$interval = Category::getInterval((int) $idRootCategory);
if (empty($interval)) {
return [];
}

$inList = "'" . implode("','", $cleanNames) . "'";

$query = new \DbQuery();
$query->select('c.`id_category`, cl.`name`');
$query->from('category', 'c');
$query->leftJoin(
'category_shop',
'category_shop',
'c.`id_category` = category_shop.`id_category` AND category_shop.`id_shop` = ' . (int) $this->context->shop->id
);
$query->leftJoin(
'category_lang',
'cl',
'c.`id_category` = cl.`id_category` AND cl.`id_lang` = ' . (int) $idLang . Shop::addSqlRestrictionOnLang('cl')
);
$query->where('cl.`name` IN (' . $inList . ')');
$query->where('c.`nleft` >= ' . (int) $interval['nleft']);
$query->where('c.`nright` <= ' . (int) $interval['nright']);
$query->where('c.`id_category` != ' . (int) Configuration::get('PS_HOME_CATEGORY'));
$query->where('c.`active` = 1');

$rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query) ?: [];
$map = [];
foreach ($rows as $row) {
// exact name mapping, first match wins (the query is subtree-scoped)
if (!isset($map[$row['name']])) {
$map[$row['name']] = (int) $row['id_category'];
}
}
return $map;
}

/**
* Fallback traversal when SQL subtree lookup finds nothing: breadth-first search by children.
*
* @param int $idLang
* @param string $categoryName
* @param int $idRootCategory
*
* @return array|false
*/
private function findCategoryByNameInSubtreeFallback($idLang, $categoryName, $idRootCategory)
{
$queue = [(int) $idRootCategory];
$visited = [];

while (!empty($queue)) {
$currentId = array_shift($queue);
if (isset($visited[$currentId])) {
continue;
}
$visited[$currentId] = true;

$match = Category::searchByNameAndParentCategoryId($idLang, $categoryName, (int) $currentId);
if ($match && isset($match['id_category'])) {
return $match;
}

$children = Category::getChildren((int) $currentId, $idLang);
foreach ($children as $child) {
$queue[] = (int) $child['id_category'];
}
}

return false;
}
}