Merge remote-tracking branch 'origin/AC-5984' into Hammer_Community_Backlog_06092022

Author: glo71317

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Category.php

@@ -17,6 +17,7 @@
 use Magento\Framework\Api\Search\AggregationValueInterface;
 use Magento\Framework\Api\Search\BucketInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\GraphQl\Query\Uid;
 
 /**
  * Category layer builder
@@ -75,6 +76,9 @@ class Category implements LayerBuilderInterface
      */
     private Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly;
 
+    /** @var Uid */
+    private Uid $uidEncoder;
+
     /**
      * @param CategoryAttributeQuery $categoryAttributeQuery
      * @param CategoryAttributesMapper $attributesMapper
@@ -83,6 +87,7 @@ class Category implements LayerBuilderInterface
      * @param LayerFormatter $layerFormatter
      * @param Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
      * @param CollectionFactory $categoryCollectionFactory
+     * @param Uid $uidEncoder
      */
     public function __construct(
         CategoryAttributeQuery $categoryAttributeQuery,
@@ -91,7 +96,8 @@ public function __construct(
         ResourceConnection $resourceConnection,
         LayerFormatter $layerFormatter,
         Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly,
-        CollectionFactory $categoryCollectionFactory
+        CollectionFactory $categoryCollectionFactory,
+        Uid $uidEncoder
     ) {
         $this->categoryAttributeQuery = $categoryAttributeQuery;
         $this->attributesMapper = $attributesMapper;
@@ -100,6 +106,7 @@ public function __construct(
         $this->layerFormatter = $layerFormatter;
         $this->includeDirectChildrenOnly = $includeDirectChildrenOnly;
         $this->categoryCollectionFactory = $categoryCollectionFactory;
+        $this->uidEncoder = $uidEncoder;
     }
 
     /**
@@ -155,7 +162,7 @@ function (AggregationValueInterface $value) {
             }
             $result['options'][] = $this->layerFormatter->buildItem(
                 $categoryLabels[$categoryId] ?? $categoryId,
-                $categoryId,
+                $this->uidEncoder->encode((string) $categoryId),
                 $value->getMetrics()['count']
             );
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchCategoryAggregationsTest.php

@@ -7,13 +7,30 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Framework\GraphQl\Query\Uid;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
  * Test of search by category ID aggregation.
  */
 class ProductSearchCategoryAggregationsTest extends GraphQlAbstract
 {
+    /** @var ObjectManager */
+    private $objectManager;
+
+    /** @var Uid */
+    private $uid;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->uid = $this->objectManager->get(Uid::class);
+    }
     /**
      * Test category_id aggregation on filter by "eq" category ID condition.
      *
@@ -84,6 +101,7 @@ private function aggregationCategoryTesting(string $filterValue, string $include
     {
         $query = $this->getGraphQlQuery($filterValue, $includeDirectChildrenOnly);
         $result = $this->graphQlQuery($query);
+
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertArrayHasKey('aggregations', $result['products']);
         $categoryAggregation = array_filter(
@@ -99,7 +117,7 @@ function ($a) {
         foreach ($categoryAggregation['options'] as $option) {
             $this->assertNotEmpty($option['value']);
             $this->assertNotEmpty($option['label']);
-            $categoryAggregationIdsLabel[(int)$option['value']] = $option['label'];
+            $categoryAggregationIdsLabel[$this->uid->decode($option['value'])] = $option['label'];
         }
         return $categoryAggregationIdsLabel;
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php

@@ -1680,7 +1680,7 @@ public function testFilterProductsForExactMatchingName()
                 'options' => [
                     [
                         'label' => 'Colorful Category',
-                        'value' => '330',
+                        'value' => 'MzMw',
                         'count' => 2,
                     ],
                 ],