Merge remote-tracking branch 'remotes/origin/MAGETWO-81530-support-all-product-types' into MAGETWO-87147-Implement-Product-Schema

Eric Bohanon · Eric Bohanon · commit e1408776c942 · 2018-02-01T16:24:16.000-06:00
diff --git a/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
@@ -18,7 +18,7 @@ class BundleProductTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        if ($data['type_id'] == 'bundle') {
+        if (isset($data['type_id']) && $data['type_id'] == 'bundle') {
             return 'BundleProduct';
         }
 
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Products/Query/BundleProductPostProcessor.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Products/Query/BundleProductPostProcessor.php
@@ -81,7 +81,7 @@ public function process(array $resultData)
         $childrenSkus = [];
         $bundleMap = [];
         foreach ($resultData as $productKey => $product) {
-            if ($product['type_id'] === Bundle::TYPE_CODE) {
+            if (isset($product['type_id']) && $product['type_id'] === Bundle::TYPE_CODE) {
                 $resultData[$productKey] = $this->formatBundleAttributes($product);
                 if (isset($product['bundle_product_options'])) {
                     $bundleMap[$product['sku']] = [];
diff --git a/app/code/Magento/CatalogGraphQl/Model/CatalogProductTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/CatalogProductTypeResolver.php
@@ -18,9 +18,9 @@ class CatalogProductTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        if ($data['type_id'] == 'simple') {
+        if (isset($data['type_id']) && $data['type_id'] == 'simple') {
             return 'SimpleProduct';
-        } elseif ($data['type_id'] == 'virtual') {
+        } elseif (isset($data['type_id']) && $data['type_id'] == 'virtual') {
             return 'VirtualProduct';
         }
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php
@@ -23,9 +23,11 @@ class ProductLinksTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        $linkType = $data['link_type'];
-        if (in_array($linkType, $this->linkTypes)) {
-            return 'ProductLinks';
+        if (isset($data['type_id'])) {
+            $linkType = $data['link_type'];
+            if (in_array($linkType, $this->linkTypes)) {
+                return 'ProductLinks';
+            }
         }
 
         return null;
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
@@ -18,7 +18,7 @@ class ConfigurableProductTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        if ($data['type_id'] == 'configurable') {
+        if (isset($data['type_id']) && $data['type_id'] == 'configurable') {
             return 'ConfigurableProduct';
         }
 
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Products/Query/ConfigurableProductPostProcessor.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Products/Query/ConfigurableProductPostProcessor.php
@@ -65,7 +65,7 @@ public function process(array $resultData)
     {
         $childrenIds = [];
         foreach ($resultData as $key => $product) {
-            if ($product['type_id'] === Configurable::TYPE_CODE) {
+            if (isset($product['type_id']) && $product['type_id'] === Configurable::TYPE_CODE) {
                 $formattedChildIds = [];
                 if (isset($product['configurable_product_links'])) {
                     foreach ($product['configurable_product_links'] as $childId) {
diff --git a/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php b/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php
@@ -18,7 +18,7 @@ class DownloadableProductTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        if ($data['type_id'] == 'downloadable') {
+        if (isset($data['type_id']) && $data['type_id'] == 'downloadable') {
             return 'DownloadableProduct';
         }
 
diff --git a/app/code/Magento/DownloadableGraphQl/Model/Resolver/Products/Query/DownloadableProductPostProcessor.php b/app/code/Magento/DownloadableGraphQl/Model/Resolver/Products/Query/DownloadableProductPostProcessor.php
@@ -44,7 +44,7 @@ public function __construct(EnumLookup $enumLookup, DownloadableHelper $download
     public function process(array $resultData)
     {
         foreach ($resultData as $productKey => $product) {
-            if ($product['type_id'] === Downloadable::TYPE_DOWNLOADABLE) {
+            if (isset($product['type_id']) && $product['type_id'] === Downloadable::TYPE_DOWNLOADABLE) {
                 if (isset($product['downloadable_product_samples'])) {
                     $resultData[$productKey]['downloadable_product_samples']
                         = $this->formatSamples($product['downloadable_product_samples']);
diff --git a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php
@@ -23,9 +23,11 @@ class GroupedProductLinksTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        $linkType = $data['link_type'];
-        if (in_array($linkType, $this->linkTypes)) {
-            return 'GroupedProductLinks';
+        if (isset($data['link_type'])) {
+            $linkType = $data['link_type'];
+            if (in_array($linkType, $this->linkTypes)) {
+                return 'GroupedProductLinks';
+            }
         }
 
         return null;
diff --git a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php
@@ -18,7 +18,7 @@ class GroupedProductTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        if ($data['type_id'] == 'grouped') {
+        if (isset($data['type_id']) && $data['type_id'] == 'grouped') {
             return 'GroupedProduct';
         }
 
diff --git a/app/code/Magento/GroupedProductGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/ProductLinks.php b/app/code/Magento/GroupedProductGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/ProductLinks.php
@@ -26,7 +26,7 @@ class ProductLinks implements FormatterInterface
     public function format(Product $product, array $productData = [])
     {
         $productLinks = $product->getProductLinks();
-        if ($productLinks && $product->getTypeId() === Grouped::TYPE_CODE) {
+        if ($productLinks && $product->getTypeId() === Grouped::TYPE_CODE && isset($productData['items'])) {
             /** @var Link $productLink */
             foreach ($productLinks as $productLinkKey => $productLink) {
                 if ($productLink->getLinkType() === self::LINK_TYPE) {
diff --git a/app/code/Magento/GroupedProductGraphQl/composer.json b/app/code/Magento/GroupedProductGraphQl/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-catalog": "101.2.*",
-        "magento/module-grouped": "100.3.*",
+        "magento/module-grouped-product": "100.3.*",
         "magento/module-catalog-graph-ql": "100.0.*",
         "magento/framework": "100.3.*"
     },
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\TestFramework\TestCase;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
@@ -17,7 +17,7 @@ class BundleProductViewTest extends GraphQlAbstract
 {
     const KEY_PRICE_TYPE_FIXED = 'FIXED';
     /**
-     * @magentoApiDataFixture Magento/Bundle/_files/product.php
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
      */
     public function testAllFielsBundleProducts()
     {
@@ -302,7 +302,7 @@ public function testAndMaxMinPriceBundleProduct()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Bundle/_files/product.php
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testNonExistentFieldQtyExceptionOnBundleProduct()
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -429,7 +429,6 @@ public function testFilterProductsInNextPageSortedByNameASC()
           page_size
           current_page
         }
-        
     }
 }
 QUERY;
@@ -632,7 +631,6 @@ public function testQueryPageOutOfBoundException()
           page_size
           current_page
         }
-
     }
 }
 QUERY;
@@ -665,10 +663,8 @@ public function testQueryWithNoSearchOrFilterArgumentException()
                weight
            }
            category_ids                
-           
        }
    }
-  
 }
 QUERY;
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
@@ -13,7 +13,6 @@
 
 class VirtualProductViewTest extends GraphQlAbstract
 {
-
     /**
      *
      * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
@@ -49,11 +48,9 @@ public function testQueryAllFieldsVirtualProduct()
            }
        }
    }
-   
 }
 QUERY;
 
-
         $response = $this->graphQlQuery($query);
 
         /** @var ProductRepositoryInterface $productRepository */
@@ -64,7 +61,11 @@ public function testQueryAllFieldsVirtualProduct()
         $this->assertEquals(1, count($response['products']['items']));
         $this->assertArrayHasKey(0, $response['products']['items']);
         $this->assertBaseFields($product, $response['products']['items'][0]);
-        $this->assertArrayNotHasKey('weight', $response['products']['items'][0], "response does contain the key weight");
+        $this->assertArrayNotHasKey(
+            'weight',
+            $response['products']['items'][0],
+            "response does contain the key weight"
+        );
     }
 
     /**
@@ -101,14 +102,14 @@ public function testCannotQueryWeightOnVirtualProductException()
             sku          
            }
        }
-   }
-   
+   }   
 }
 QUERY;
 
-
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors: Cannot query field "weight" on type "VirtualProduct"');
+        $this->expectExceptionMessage(
+            'GraphQL response contains errors: Cannot query field "weight" on type "VirtualProduct"'
+        );
         $this->graphQlQuery($query);
     }
 
@@ -118,7 +119,6 @@ public function testCannotQueryWeightOnVirtualProductException()
      */
     private function assertBaseFields($product, $actualResponse)
     {
-        // ['product_object_field_name', 'expected_value']
         $assertionMap = [
             ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
             ['response_field' => 'id', 'expected_value' => $product->getId()],
@@ -131,7 +131,6 @@ private function assertBaseFields($product, $actualResponse)
         $this->assertResponseFields($actualResponse, $assertionMap);
     }
 
-
     /**
      * @param array $actualResponse
      * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
@@ -170,7 +170,6 @@ public function testQueryConfigurableProductLinks()
             }
         }
     }
-    
 }
 QUERY;
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
@@ -71,11 +71,9 @@ public function testQueryAllFieldsDownloadableProducts()
               sample_type
               sample_file
             }
-            
            }
        }
    }
-  
 }
 QUERY;
         $response = $this->graphQlQuery($query);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
@@ -63,7 +63,6 @@ public function testProductUrlResolver()
    canonical_url
    type
   }
-    
 }
 QUERY;
         $response = $this->graphQlQuery($query);
@@ -108,7 +107,6 @@ public function testProductUrlWithCanonicalUrlInput()
    canonical_url
    type
   }
-    
 }
 QUERY;
         $response = $this->graphQlQuery($query);
@@ -151,8 +149,7 @@ public function testCategoryUrlResolver()
    id
    canonical_url
    type
-  }
-    
+  } 
 }
 QUERY;
         $response = $this->graphQlQuery($query);
@@ -189,7 +186,6 @@ public function testCMSPageUrlResolver()
    canonical_url
    type
   }
-    
 }
 QUERY;
         $response = $this->graphQlQuery($query);
@@ -232,8 +228,7 @@ public function testProductUrlRewriteResolver()
    id
    canonical_url
    type
-  }
-    
+  } 
 }
 QUERY;
         $response = $this->graphQlQuery($query);
@@ -274,7 +269,6 @@ public function testInvalidUrlResolverInput()
    canonical_url
    type
   }
-    
 }
 QUERY;
         $response = $this->graphQlQuery($query);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php
@@ -3,37 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 /*
  * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
  * bundled items should not contain products with required custom options.
  * However, if to create such a bundle product, it will be always out of stock.
  */
 require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
-
 /** @var $objectManager \Magento\TestFramework\ObjectManager */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 $sampleProduct = $productRepository->get('simple');
-
 /** @var $product \Magento\Catalog\Model\Product */
 $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId('bundle')
     ->setId(3)
     ->setAttributeSetId(4)
-    ->setWeight(2)
     ->setWebsiteIds([1])
     ->setName('Bundle Product')
     ->setSku('bundle-product')
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setPriceView(1)
-    ->setSkuType(1)
-    ->setWeightType(1)
     ->setPriceType(1)
-    ->setShipmentType(0)
+    ->setShipmentType(1)
     ->setPrice(10.0)
     ->setBundleOptionsData(
         [
@@ -50,16 +44,13 @@
             [
                 [
                     'product_id' => $sampleProduct->getId(),
-                    'selection_price_value' => 2.75,
                     'selection_qty' => 1,
                     'selection_can_change_qty' => 1,
                     'delete' => '',
-
                 ],
             ],
         ]
     );
-
 if ($product->getBundleOptionsData()) {
     $options = [];
     foreach ($product->getBundleOptionsData() as $key => $optionData) {
@@ -68,7 +59,6 @@
                 ->create(['data' => $optionData]);
             $option->setSku($product->getSku());
             $option->setOptionId(null);
-
             $links = [];
             $bundleLinks = $product->getBundleSelectionsData();
             if (!empty($bundleLinks[$key])) {
@@ -80,7 +70,6 @@
                         $linkProduct = $productRepository->getById($linkData['product_id']);
                         $link->setSku($linkProduct->getSku());
                         $link->setQty($linkData['selection_qty']);
-                        $link->setPrice($linkData['selection_price_value']);
                         if (isset($linkData['selection_can_change_qty'])) {
                             $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
                         }
@@ -96,5 +85,4 @@
     $extension->setBundleProductOptions($options);
     $product->setExtensionAttributes($extension);
 }
-//$product->save();
-$productRepository->save($product, true);
+$product->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1.php
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1_rollback.php

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class BundleProductTypeResolver implements TypeResolverInterface`
`18`	`18`	`*/`
`19`	`19`	`public function resolveType(array $data)`
`20`	`20`	`{`
`21`		`- if ($data['type_id'] == 'bundle') {`
	`21`	`+ if (isset($data['type_id']) && $data['type_id'] == 'bundle') {`
`22`	`22`	`return 'BundleProduct';`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ class CatalogProductTypeResolver implements TypeResolverInterface`
`18`	`18`	`*/`
`19`	`19`	`public function resolveType(array $data)`
`20`	`20`	`{`
`21`		`- if ($data['type_id'] == 'simple') {`
	`21`	`+ if (isset($data['type_id']) && $data['type_id'] == 'simple') {`
`22`	`22`	`return 'SimpleProduct';`
`23`		`- } elseif ($data['type_id'] == 'virtual') {`
	`23`	`+ } elseif (isset($data['type_id']) && $data['type_id'] == 'virtual') {`
`24`	`24`	`return 'VirtualProduct';`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,11 @@ class ProductLinksTypeResolver implements TypeResolverInterface`
`23`	`23`	`*/`
`24`	`24`	`public function resolveType(array $data)`
`25`	`25`	`{`
`26`		`- $linkType = $data['link_type'];`
`27`		`- if (in_array($linkType, $this->linkTypes)) {`
`28`		`- return 'ProductLinks';`
	`26`	`+ if (isset($data['type_id'])) {`
	`27`	`+ $linkType = $data['link_type'];`
	`28`	`+ if (in_array($linkType, $this->linkTypes)) {`
	`29`	`+ return 'ProductLinks';`
	`30`	`+ }`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class ConfigurableProductTypeResolver implements TypeResolverInterface`
`18`	`18`	`*/`
`19`	`19`	`public function resolveType(array $data)`
`20`	`20`	`{`
`21`		`- if ($data['type_id'] == 'configurable') {`
	`21`	`+ if (isset($data['type_id']) && $data['type_id'] == 'configurable') {`
`22`	`22`	`return 'ConfigurableProduct';`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function process(array $resultData)`
`65`	`65`	`{`
`66`	`66`	`$childrenIds = [];`
`67`	`67`	`foreach ($resultData as $key => $product) {`
`68`		`- if ($product['type_id'] === Configurable::TYPE_CODE) {`
	`68`	`+ if (isset($product['type_id']) && $product['type_id'] === Configurable::TYPE_CODE) {`
`69`	`69`	`$formattedChildIds = [];`
`70`	`70`	`if (isset($product['configurable_product_links'])) {`
`71`	`71`	`foreach ($product['configurable_product_links'] as $childId) {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class DownloadableProductTypeResolver implements TypeResolverInterface`
`18`	`18`	`*/`
`19`	`19`	`public function resolveType(array $data)`
`20`	`20`	`{`
`21`		`- if ($data['type_id'] == 'downloadable') {`
	`21`	`+ if (isset($data['type_id']) && $data['type_id'] == 'downloadable') {`
`22`	`22`	`return 'DownloadableProduct';`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(EnumLookup $enumLookup, DownloadableHelper $download`
`44`	`44`	`public function process(array $resultData)`
`45`	`45`	`{`
`46`	`46`	`foreach ($resultData as $productKey => $product) {`
`47`		`- if ($product['type_id'] === Downloadable::TYPE_DOWNLOADABLE) {`
	`47`	`+ if (isset($product['type_id']) && $product['type_id'] === Downloadable::TYPE_DOWNLOADABLE) {`
`48`	`48`	`if (isset($product['downloadable_product_samples'])) {`
`49`	`49`	`$resultData[$productKey]['downloadable_product_samples']`
`50`	`50`	`= $this->formatSamples($product['downloadable_product_samples']);`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,11 @@ class GroupedProductLinksTypeResolver implements TypeResolverInterface`
`23`	`23`	`*/`
`24`	`24`	`public function resolveType(array $data)`
`25`	`25`	`{`
`26`		`- $linkType = $data['link_type'];`
`27`		`- if (in_array($linkType, $this->linkTypes)) {`
`28`		`- return 'GroupedProductLinks';`
	`26`	`+ if (isset($data['link_type'])) {`
	`27`	`+ $linkType = $data['link_type'];`
	`28`	`+ if (in_array($linkType, $this->linkTypes)) {`
	`29`	`+ return 'GroupedProductLinks';`
	`30`	`+ }`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class GroupedProductTypeResolver implements TypeResolverInterface`
`18`	`18`	`*/`
`19`	`19`	`public function resolveType(array $data)`
`20`	`20`	`{`
`21`		`- if ($data['type_id'] == 'grouped') {`
	`21`	`+ if (isset($data['type_id']) && $data['type_id'] == 'grouped') {`
`22`	`22`	`return 'GroupedProduct';`
`23`	`23`	`}`
`24`	`24`