ACP2E-2885: Products graphql returned disabled categories in the category aggregations

dhorytskyi · dhorytskyi · commit 806602c88fcb · 2024-03-01T15:08:15.000-06:00
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -6,7 +6,9 @@
 
 namespace Magento\Catalog\Model\Indexer\Category\Product;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
@@ -303,19 +305,17 @@ protected function getPathFromCategoryId($categoryId)
     protected function getNonAnchorCategoriesSelect(Store $store)
     {
         if (!isset($this->nonAnchorSelects[$store->getId()])) {
-            $statusAttributeId = $this->config->getAttribute(
-                Product::ENTITY,
-                'status'
-            )->getId();
-            $visibilityAttributeId = $this->config->getAttribute(
-                Product::ENTITY,
-                'visibility'
-            )->getId();
+            $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId();
+            $visibilityAttributeId = $this->config->getAttribute(Product::ENTITY, 'visibility')->getId();
+            $isActiveAttributeId = $this->config->getAttribute(Category::ENTITY, 'is_active')->getId();
 
             $rootPath = $this->getPathFromCategoryId($store->getRootCategoryId());
 
-            $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
-            $linkField = $metadata->getLinkField();
+            $productMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+            $productLinkField = $productMetadata->getLinkField();
+            $categoryMetadata = $this->metadataPool->getMetadata(CategoryInterface::class);
+            $categoryLinkField = $categoryMetadata->getLinkField();
+
             $select = $this->connection->select()->from(
                 ['cc' => $this->getTable('catalog_category_entity')],
                 []
@@ -333,28 +333,37 @@ protected function getNonAnchorCategoriesSelect(Store $store)
                 []
             )->joinInner(
                 ['cpsd' => $this->getTable('catalog_product_entity_int')],
-                'cpsd.' . $linkField . ' = cpe.' . $linkField . ' AND cpsd.store_id = 0' .
-                ' AND cpsd.attribute_id = ' .
-                $statusAttributeId,
+                'cpsd.' . $productLinkField . ' = cpe.' . $productLinkField . ' AND cpsd.store_id = 0' .
+                ' AND cpsd.attribute_id = ' . $statusAttributeId,
                 []
             )->joinLeft(
                 ['cpss' => $this->getTable('catalog_product_entity_int')],
-                'cpss.' . $linkField . ' = cpe.' . $linkField . ' AND cpss.attribute_id = cpsd.attribute_id' .
-                ' AND cpss.store_id = ' .
-                $store->getId(),
+                'cpss.' . $productLinkField . ' = cpe.' . $productLinkField .
+                ' AND cpss.attribute_id = cpsd.attribute_id AND cpss.store_id = ' . $store->getId(),
                 []
             )->joinInner(
                 ['cpvd' => $this->getTable('catalog_product_entity_int')],
-                'cpvd.' . $linkField . ' = cpe.' . $linkField . ' AND cpvd.store_id = 0' .
-                ' AND cpvd.attribute_id = ' .
-                $visibilityAttributeId,
+                'cpvd.' . $productLinkField . ' = cpe.' . $productLinkField . ' AND cpvd.store_id = 0' .
+                ' AND cpvd.attribute_id = ' . $visibilityAttributeId,
                 []
             )->joinLeft(
                 ['cpvs' => $this->getTable('catalog_product_entity_int')],
-                'cpvs.' . $linkField . ' = cpe.' . $linkField . ' AND cpvs.attribute_id = cpvd.attribute_id' .
-                ' AND cpvs.store_id = ' .
-                $store->getId(),
+                'cpvs.' . $productLinkField . ' = cpe.' . $productLinkField .
+                ' AND cpvs.attribute_id = cpvd.attribute_id AND cpvs.store_id = ' . $store->getId(),
+                []
+            )->joinInner(
+                ['ccacd' => $this->getTable('catalog_category_entity_int')],
+                'ccacd.' . $categoryLinkField . ' = cc.' . $categoryLinkField . ' AND ccacd.store_id = 0' .
+                ' AND ccacd.attribute_id = ' . $isActiveAttributeId,
                 []
+            )->joinLeft(
+                ['ccacs' => $this->getTable('catalog_category_entity_int')],
+                'ccacs.' . $categoryLinkField . ' = cc.' . $categoryLinkField .
+                ' AND ccacs.attribute_id = ccacd.attribute_id AND ccacs.store_id = ' . $store->getId(),
+                []
+            )->where(
+                $this->connection->getIfNullSql('ccacs.value', 'ccacd.value') . ' = ?',
+                1
             )->where(
                 'cc.path LIKE ' . $this->connection->quote($rootPath . '/%')
             )->where(
@@ -525,10 +534,8 @@ protected function hasAnchorSelect(Store $store)
     protected function createAnchorSelect(Store $store)
     {
         $this->setCurrentStore($store);
-        $isAnchorAttributeId = $this->config->getAttribute(
-            \Magento\Catalog\Model\Category::ENTITY,
-            'is_anchor'
-        )->getId();
+        $isAnchorAttributeId = $this->config->getAttribute(Category::ENTITY, 'is_anchor')->getId();
+        $isActiveAttributeId = $this->config->getAttribute(Category::ENTITY, 'is_active')->getId();
         $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId();
         $visibilityAttributeId = $this->config->getAttribute(Product::ENTITY, 'visibility')->getId();
         $rootCatIds = explode('/', $this->getPathFromCategoryId($store->getRootCategoryId()));
@@ -537,7 +544,7 @@ protected function createAnchorSelect(Store $store)
         $temporaryTreeTable = $this->makeTempCategoryTreeIndex();
 
         $productMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
-        $categoryMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
+        $categoryMetadata = $this->metadataPool->getMetadata(CategoryInterface::class);
         $productLinkField = $productMetadata->getLinkField();
         $categoryLinkField = $categoryMetadata->getLinkField();
 
@@ -575,21 +582,18 @@ protected function createAnchorSelect(Store $store)
             []
         )->joinLeft(
             ['cpss' => $this->getTable('catalog_product_entity_int')],
-            'cpss.' . $productLinkField . ' = cpe.' . $productLinkField . ' AND cpss.attribute_id = cpsd.attribute_id' .
-            ' AND cpss.store_id = ' .
-            $store->getId(),
+            'cpss.' . $productLinkField . ' = cpe.' . $productLinkField .
+            ' AND cpss.attribute_id = cpsd.attribute_id AND cpss.store_id = ' . $store->getId(),
             []
         )->joinInner(
             ['cpvd' => $this->getTable('catalog_product_entity_int')],
             'cpvd.' . $productLinkField . ' = cpe. ' . $productLinkField . ' AND cpvd.store_id = 0' .
-            ' AND cpvd.attribute_id = ' .
-            $visibilityAttributeId,
+            ' AND cpvd.attribute_id = ' . $visibilityAttributeId,
             []
         )->joinLeft(
             ['cpvs' => $this->getTable('catalog_product_entity_int')],
             'cpvs.' . $productLinkField . ' = cpe.' . $productLinkField .
-            ' AND cpvs.attribute_id = cpvd.attribute_id ' . 'AND cpvs.store_id = ' .
-            $store->getId(),
+            ' AND cpvs.attribute_id = cpvd.attribute_id ' . 'AND cpvs.store_id = ' . $store->getId(),
             []
         )->joinInner(
             ['ccad' => $this->getTable('catalog_category_entity_int')],
@@ -599,9 +603,21 @@ protected function createAnchorSelect(Store $store)
         )->joinLeft(
             ['ccas' => $this->getTable('catalog_category_entity_int')],
             'ccas.' . $categoryLinkField . ' = cc.' . $categoryLinkField
-            . ' AND ccas.attribute_id = ccad.attribute_id AND ccas.store_id = ' .
-            $store->getId(),
+            . ' AND ccas.attribute_id = ccad.attribute_id AND ccas.store_id = ' . $store->getId(),
             []
+        )->joinInner(
+            ['ccacd' => $this->getTable('catalog_category_entity_int')],
+            'ccacd.' . $categoryLinkField . ' = cc.' . $categoryLinkField . ' AND ccacd.store_id = 0' .
+            ' AND ccacd.attribute_id = ' . $isActiveAttributeId,
+            []
+        )->joinLeft(
+            ['ccacs' => $this->getTable('catalog_category_entity_int')],
+            'ccacs.' . $categoryLinkField . ' = cc.' . $categoryLinkField
+            . ' AND ccacs.attribute_id = ccacd.attribute_id AND ccacs.store_id = ' . $store->getId(),
+            []
+        )->where(
+            $this->connection->getIfNullSql('ccacs.value', 'ccacd.value') . ' = ?',
+            1
         )->where(
             'cpw.website_id = ?',
             $store->getWebsiteId()
@@ -711,11 +727,8 @@ protected function makeTempCategoryTreeIndex()
      */
     protected function fillTempCategoryTreeIndex($temporaryName)
     {
-        $isActiveAttributeId = $this->config->getAttribute(
-            \Magento\Catalog\Model\Category::ENTITY,
-            'is_active'
-        )->getId();
-        $categoryMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
+        $isActiveAttributeId = $this->config->getAttribute(Category::ENTITY, 'is_active')->getId();
+        $categoryMetadata = $this->metadataPool->getMetadata(CategoryInterface::class);
         $categoryLinkField = $categoryMetadata->getLinkField();
         $selects = $this->prepareSelectsByRange(
             $this->connection->select()
diff --git a/app/code/Magento/Catalog/Test/Fixture/AssignCategories.php b/app/code/Magento/Catalog/Test/Fixture/AssignCategories.php
@@ -0,0 +1,65 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ***********************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Fixture;
+
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Framework\Exception\InvalidArgumentException;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Fixture\DataFixtureInterface;
+
+/**
+ * Assigning product to categories
+ */
+class AssignCategories implements DataFixtureInterface
+{
+    private const PRODUCT = 'product';
+    private const CATEGORIES = 'categories';
+
+    /**
+     * @param CategoryLinkManagementInterface $categoryLinkManagement
+     */
+    public function __construct(
+        private readonly CategoryLinkManagementInterface $categoryLinkManagement
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     * @throws InvalidArgumentException
+     */
+    public function apply(array $data = []): ?DataObject
+    {
+        if (empty($data[self::PRODUCT])) {
+            throw new InvalidArgumentException(__('"%field" is required', ['field' => self::PRODUCT]));
+        }
+        if (empty($data[self::CATEGORIES])) {
+            throw new InvalidArgumentException(__('"%field" is required', ['field' => self::CATEGORIES]));
+        }
+        if (!is_array($data[self::CATEGORIES])) {
+            throw new InvalidArgumentException(__('"%field" must be an array', ['field' => self::CATEGORIES]));
+        }
+
+        $this->categoryLinkManagement->assignProductToCategories(
+            $data[self::PRODUCT]->getSku(),
+            array_map(fn ($category) => $category->getId(), $data[self::CATEGORIES])
+        );
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Action/Rows.php b/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Action/Rows.php
@@ -75,8 +75,7 @@ public function afterExecute(
         array $entityIds,
         bool $useTempTable = false
     ): ActionRows {
-        $indexer = $this->indexerRegistry->get(FulltextIndexer::INDEXER_ID);
-        if (!empty($entityIds) && $indexer->isScheduled()) {
+        if (!empty($entityIds)) {
             $productIds = [];
 
             foreach ($this->storeManager->getStores() as $store) {
@@ -86,7 +85,12 @@ public function afterExecute(
 
             $productIds = array_merge([], ...$productIds);
             if (!empty($productIds)) {
-                $indexer->getView()->getChangelog()->addList($productIds);
+                $indexer = $this->indexerRegistry->get(FulltextIndexer::INDEXER_ID);
+                if ($indexer->isScheduled()) {
+                    $indexer->getView()->getChangelog()->addList($productIds);
+                } else {
+                    $indexer->reindexList($productIds);
+                }
             }
         }
 
diff --git a/app/code/Magento/Elasticsearch/etc/indexer.xml b/app/code/Magento/Elasticsearch/etc/indexer.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Indexer/etc/indexer.xsd">
     <indexer id="catalogsearch_fulltext">
         <dependencies>
-            <indexer id="catalog_category_product" />
+            <indexer id="catalog_product_category" />
             <indexer id="cataloginventory_stock" />
             <indexer id="catalog_product_price" />
         </dependencies>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchCategoryAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchCategoryAggregationsTest.php
@@ -7,7 +7,13 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Catalog\Test\Fixture\AssignCategories as AssignCategoriesFixture;
+use Magento\Catalog\Test\Fixture\Category as CategoryFixture;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Framework\GraphQl\Query\Uid;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -17,6 +23,11 @@
  */
 class ProductSearchCategoryAggregationsTest extends GraphQlAbstract
 {
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     /** @var ObjectManager */
     private $objectManager;
 
@@ -28,6 +39,7 @@ class ProductSearchCategoryAggregationsTest extends GraphQlAbstract
      */
     protected function setUp(): void
     {
+        $this->fixtures = DataFixtureStorageManager::getStorage();
         $this->objectManager = Bootstrap::getObjectManager();
         $this->uid = $this->objectManager->get(Uid::class);
     }
@@ -92,6 +104,22 @@ public function testAggregationInCategory()
         $this->assertEquals($expectedSubcategorie, $categoryAggregation);
     }
 
+    #[
+        DataFixture(ProductFixture::class, as: 'prod1'),
+        DataFixture(CategoryFixture::class, ['name' => 'Category 1'], as: 'cat1'),
+        DataFixture(CategoryFixture::class, ['name' => 'Category 2', 'is_active' => false], as: 'cat2'),
+        DataFixture(AssignCategoriesFixture::class, ['categories' => ['$cat1$', '$cat2$'], 'product' => '$prod1$']),
+    ]
+    public function testAggregationDisabledCategory(): void
+    {
+        $cat1 = $this->fixtures->get('cat1');
+        $cat2 = $this->fixtures->get('cat2');
+        $filterValue = "{category_id: {in: [\"{$cat1->getId()}\",\"{$cat2->getId()}\"]}}";
+        $categoryAggregation = $this->aggregationCategoryTesting($filterValue, 'false');
+        $expectedCategories = [$cat1->getId() => $cat1->getName()];
+        $this->assertEquals($expectedCategories, $categoryAggregation);
+    }
+
     /**
      * @param string $filterValue
      *
