Skip to content

Обход проблемы getChildIds #955

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
biz87 wants to merge 1 commit into
base: master
Choose a base branch
from
+106 −0
Open

Обход проблемы getChildIds #955

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
106 changes: 106 additions & 0 deletions core/components/minishop2/elements/snippets/snippet.ms_products.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,112 @@
}
$pdoFetch->addTime('Conditions prepared');

// Workaround: оптимизация обработки parents
// pdoTools использует getChildIds() который возвращает ВСЕ дочерние ресурсы
// Мы фильтруем только msCategory для повышения производительности
$_ms2Parents = isset($scriptProperties['parents']) ? (string)$scriptProperties['parents'] : '';
if ($_ms2Parents !== '' && $_ms2Parents !== '0') {
$_ms2Depth = isset($scriptProperties['depth']) ? (int)$scriptProperties['depth'] : 10;
$_ms2ParentsIn = [];
$_ms2ParentsOut = [];

// Разбираем parents: положительные - включить, отрицательные - исключить
foreach (array_map('trim', explode(',', $_ms2Parents)) as $_ms2Parent) {
$_ms2Parent = (int)$_ms2Parent;
if ($_ms2Parent > 0) {
$_ms2ParentsIn[] = $_ms2Parent;
} elseif ($_ms2Parent < 0) {
$_ms2ParentsOut[] = abs($_ms2Parent);
}
}

// Получаем дочерние категории для включения (только msCategory, не все ресурсы)
if (!empty($_ms2ParentsIn) && $_ms2Depth > 0) {
$_ms2CatIds = $_ms2ParentsIn;
for ($_ms2i = 0; $_ms2i < $_ms2Depth; $_ms2i++) {
$_ms2CatQuery = $modx->newQuery('msCategory');
$_ms2CatQuery->where([
'class_key' => 'msCategory',
'parent:IN' => $_ms2CatIds,
'published' => 1,
'deleted' => 0,
]);
$_ms2CatQuery->select('id');

if ($_ms2CatQuery->prepare() && $_ms2CatQuery->stmt->execute()) {
$_ms2ChildIds = $_ms2CatQuery->stmt->fetchAll(PDO::FETCH_COLUMN);
if (empty($_ms2ChildIds)) {
break;
}
$_ms2ParentsIn = array_merge($_ms2ParentsIn, $_ms2ChildIds);
$_ms2CatIds = $_ms2ChildIds;
} else {
break;
}
}
}

// Получаем дочерние категории для исключения
if (!empty($_ms2ParentsOut) && $_ms2Depth > 0) {
$_ms2CatIds = $_ms2ParentsOut;
for ($_ms2i = 0; $_ms2i < $_ms2Depth; $_ms2i++) {
$_ms2CatQuery = $modx->newQuery('msCategory');
$_ms2CatQuery->where([
'class_key' => 'msCategory',
'parent:IN' => $_ms2CatIds,
'published' => 1,
'deleted' => 0,
]);
$_ms2CatQuery->select('id');

if ($_ms2CatQuery->prepare() && $_ms2CatQuery->stmt->execute()) {
$_ms2ChildIds = $_ms2CatQuery->stmt->fetchAll(PDO::FETCH_COLUMN);
if (empty($_ms2ChildIds)) {
break;
}
$_ms2ParentsOut = array_merge($_ms2ParentsOut, $_ms2ChildIds);
$_ms2CatIds = $_ms2ChildIds;
} else {
break;
}
}
}

// Вычитаем исключённые категории из включённых
$_ms2ParentsIn = array_unique($_ms2ParentsIn);
$_ms2ParentsOut = array_unique($_ms2ParentsOut);
if (!empty($_ms2ParentsOut)) {
$_ms2ParentsIn = array_diff($_ms2ParentsIn, $_ms2ParentsOut);
}

// ВСЕГДА отключаем pdoTools parent processing - мы обрабатываем сами
if (!empty($_ms2ParentsIn)) {
$_ms2ParentsList = implode(',', array_map('intval', $_ms2ParentsIn));

// Получаем товары из дополнительных категорий
$_ms2MemberQuery = $modx->newQuery('msCategoryMember');
$_ms2MemberQuery->where(['category_id:IN' => $_ms2ParentsIn]);
$_ms2MemberQuery->select('product_id');

$_ms2MemberIds = [];
if ($_ms2MemberQuery->prepare() && $_ms2MemberQuery->stmt->execute()) {
$_ms2MemberIds = $_ms2MemberQuery->stmt->fetchAll(PDO::FETCH_COLUMN);
}

// Строим WHERE: parent IN категориях, опционально OR id IN доп. категориях
if (!empty($_ms2MemberIds)) {
$_ms2MembersList = implode(',', array_map('intval', $_ms2MemberIds));
$where[] = "(`msProduct`.`parent` IN ({$_ms2ParentsList}) OR `msProduct`.`id` IN ({$_ms2MembersList}))";
} else {
// Нет товаров в доп. категориях - просто фильтруем по parent
$where[] = "`msProduct`.`parent` IN ({$_ms2ParentsList})";
}

// ВСЕГДА отключаем стандартную фильтрацию pdoTools по parents
$scriptProperties['parents'] = 0;
}
}

// Add filters by options
$joinedOptions = [];
if (!empty($scriptProperties['optionFilters'])) {
Expand Down
Loading