Merge remote-tracking branch 'magento-chaika/MC-20490' into MPI-PR-10012019

Author: arnobsh

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php

@@ -29,8 +29,11 @@ public function __construct(
     }
 
     /**
+     * Get breadcrumbs data
+     *
      * @param string $categoryPath
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getData(string $categoryPath): array
     {
@@ -41,7 +44,7 @@ public function getData(string $categoryPath): array
 
         if (count($parentCategoryIds)) {
             $collection = $this->collectionFactory->create();
-            $collection->addAttributeToSelect(['name', 'url_key']);
+            $collection->addAttributeToSelect(['name', 'url_key', 'url_path']);
             $collection->addAttributeToFilter('entity_id', $parentCategoryIds);
 
             foreach ($collection as $category) {
@@ -50,6 +53,7 @@ public function getData(string $categoryPath): array
                     'category_name' => $category->getName(),
                     'category_level' => $category->getLevel(),
                     'category_url_key' => $category->getUrlKey(),
+                    'category_url_path' => $category->getUrlPath(),
                 ];
             }
         }

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -223,6 +223,7 @@ type Breadcrumb @doc(description: "Breadcrumb item."){
     category_name: String @doc(description: "Category name.")
     category_level: Int @doc(description: "Category level.")
     category_url_key: String @doc(description: "Category URL key.")
+    category_url_path: String @doc(description: "Category URL path.")
 }
 
 type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option.") {

app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php

@@ -11,6 +11,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ProductCategoryList;
+use Magento\Store\Model\Store;
 
 /**
  * Class Product
@@ -106,7 +107,7 @@ function ($attribute) {
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param array &$attributes
      * @return void
@@ -164,6 +165,8 @@ public function addToCollection($collection)
     }
 
     /**
+     * Adds Attributes that belong to Global Scope
+     *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return $this
@@ -200,6 +203,8 @@ protected function addGlobalAttribute(
     }
 
     /**
+     * Adds Attributes that don't belong to Global Scope
+     *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @return $this
@@ -208,7 +213,7 @@ protected function addNotGlobalAttribute(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
         \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
     ) {
-        $storeId =  $this->storeManager->getStore()->getId();
+        $storeId = $this->storeManager->getStore()->getId();
         $values = $collection->getAllAttributeValues($attribute);
         $validEntities = [];
         if ($values) {
@@ -218,7 +223,9 @@ protected function addNotGlobalAttribute(
                         $validEntities[] = $entityId;
                     }
                 } else {
-                    if ($this->validateAttribute($storeValues[\Magento\Store\Model\Store::DEFAULT_STORE_ID])) {
+                    if (isset($storeValues[Store::DEFAULT_STORE_ID]) &&
+                        $this->validateAttribute($storeValues[Store::DEFAULT_STORE_ID])
+                    ) {
                         $validEntities[] = $entityId;
                     }
                 }
@@ -236,7 +243,7 @@ protected function addNotGlobalAttribute(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return string
      */
@@ -257,7 +264,7 @@ public function getMappedSqlField()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
      * @return $this

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

@@ -502,6 +502,57 @@ public function testAnchorCategory()
         $this->assertEquals($expectedResponse, $response);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testBreadCrumbs()
+    {
+        /** @var CategoryCollection $categoryCollection */
+        $categoryCollection = $this->objectManager->create(CategoryCollection::class);
+        $categoryCollection->addFieldToFilter('name', 'Category 1.1.1');
+        /** @var CategoryInterface $category */
+        $category = $categoryCollection->getFirstItem();
+        $categoryId = $category->getId();
+        $this->assertNotEmpty($categoryId, "Preconditions failed: category is not available.");
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+    name
+    breadcrumbs {
+      category_id
+      category_name
+      category_level
+      category_url_key
+      category_url_path
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $expectedResponse = [
+            'category' => [
+                'name' => 'Category 1.1.1',
+                'breadcrumbs' => [
+                    [
+                        'category_id' => 3,
+                        'category_name' => "Category 1",
+                        'category_level' => 2,
+                        'category_url_key' => "category-1",
+                        'category_url_path' => "category-1"
+                    ],
+                    [
+                        'category_id' => 4,
+                        'category_name' => "Category 1.1",
+                        'category_level' => 3,
+                        'category_url_key' => "category-1-1",
+                        'category_url_path' => "category-1/category-1-1"
+                    ],
+                ]
+            ]
+        ];
+        $this->assertEquals($expectedResponse, $response);
+    }
+
     /**
      * @param ProductInterface $product
      * @param array $actualResponse