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

Fixes #1937 preventing displaying all products from catalog on deleted virtual category #2007

Open
wants to merge 2 commits into
base: 2.9.x
Choose a base branch
from
Open

Fixes #1937 preventing displaying all products from catalog on deleted virtual category #2007

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f6b11
Fixes #1937 preventing displaying all products from catalog on delete…
vahonc Nov 27, 2020
4eb1f6a
Fixes #1937, update conditions
vahonc Dec 7, 2020
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
10 changes: 8 additions & 2 deletions src/module-elasticsuite-virtual-category/Model/Rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,21 @@ public function __toString(): string
public function getCategorySearchQuery($category, $excludedCategories = []): ?QueryInterface
{
$query = null;
$rootCategory = null;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't a reason to initialize that variable since it is systematically overwritten in your additional condition.


if (!is_object($category)) {
$category = $this->categoryFactory->create()->setStoreId($this->getStoreId())->load($category);
}

if (!in_array($category->getId(), $excludedCategories)) {
$excludedCategories[] = $category->getId();

if ((bool) $category->getIsVirtualCategory() && $category->getIsActive()) {
if ($category->getIsVirtualCategory() && $category->getVirtualCategoryRoot() !== null
&& !empty($category->getVirtualCategoryRoot())) {
$rootCategoryId = $category->getVirtualCategoryRoot();
$rootCategory = $this->categoryFactory->create()->setStoreId($this->getStoreId())->load($rootCategoryId);
$catId = $rootCategory->getId();
}
if ((bool) $category->getIsVirtualCategory() && $category->getIsActive() && isset($catId)) {
Comment on lines +150 to +156
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a fan of the approach since it integrates part of the logic of checking the existence of the root category in \Smile\ElasticsuiteVirtualCategory\Model\Rule::getVirtualRootCategory.
I would change the logic of \Smile\ElasticsuiteVirtualCategory\Model\Rule::getVirtualCategoryQuery so that it returns a null query if \Smile\ElasticsuiteVirtualCategory\Model\Rule::getVirtualRootCategory returns null and change this section of code in \Smile\ElasticsuiteVirtualCategory\Model\Rule::getCategorySearchQuery
with something like this :

            if ($category->getIsActive()) {
                if ((bool) $category->getIsVirtualCategory()) {
                  $query = $this->getVirtualCategoryQuery($category, $excludedCategories, $category->getData('virtual_category_root'));
                }
                if (!$query) {
                  if ($category->getId() {
                    $query = $this->getStandardCategoryQuery($category, $excludedCategories);
                  }
                }
            }
            if ($query && $category->hasChildren()) {
                $query = $this->addChildrenQueries($query, $category, $excludedCategories);
            }

But it's not perfect, and still a bit more complex.

On an additional note, your fix will apply when visiting the virtual category, but won't have any effect on parent categories, so we might want to address the problem as a whole by looking at what would happen in \Smile\ElasticsuiteVirtualCategory\Model\Rule::addChildrenQueries

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conclusion: we need to discuss this.

$query = $this->getVirtualCategoryQuery($category, $excludedCategories, $category->getData('virtual_category_root'));
} elseif ($category->getId() && $category->getIsActive()) {
$query = $this->getStandardCategoryQuery($category, $excludedCategories);
Expand Down