MAGETWO-82674: GraphQL Full Text Search

Author: Eric Bohanon

app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter.php

@@ -54,7 +54,7 @@ public function __construct(
     public function format(Product $product)
     {
         $productData = $product->getData();
-        $productData['id'] = $productData['entity_id'];
+        $productData['id'] = $product->getId();
         unset($productData['entity_id']);
 
         $productData = $this->mediaGalleryEntriesFormatter->format($product, $productData);

app/code/Magento/GraphQlConfigurableProduct/Model/Plugin/Model/Resolver/Products/DataProvider/ProductPlugin.php

@@ -8,7 +8,6 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection
     as AttributeCollection;
@@ -17,6 +16,7 @@
 use Magento\Framework\Api\SearchResultsInterface;
 use Magento\Framework\Api\SearchResultsInterfaceFactory;
 use Magento\Framework\DataObject;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 
@@ -47,6 +47,11 @@ class ProductPlugin
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * ProductPlugin constructor.
      *
@@ -55,19 +60,22 @@ class ProductPlugin
      * @param ProductCollection $productCollection
      * @param ProductRepositoryInterface $productRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param MetadataPool $metadataPool
      */
     public function __construct(
         Configurable $configurable,
         AttributeCollection $attributeCollection,
         ProductCollection $productCollection,
         ProductRepositoryInterface $productRepository,
-        SearchCriteriaBuilder $searchCriteriaBuilder
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        MetadataPool $metadataPool
     ) {
         $this->configurable = $configurable;
         $this->attributeCollection = $attributeCollection;
         $this->productCollection = $productCollection;
         $this->productRepository = $productRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->metadataPool = $metadataPool;
     }
 
     /**
@@ -111,12 +119,13 @@ public function afterGetList(Product $subject, SearchResultsInterface $result)
      */
     private function addConfigurableData($result, $children, $attributes)
     {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         foreach ($result->getItems() as $product) {
             if ($product->getTypeId() === Configurable::TYPE_CODE) {
                 $extensionAttributes = $product->getExtensionAttributes();
                 $childrenIds = [];
                 foreach ($children as $child) {
-                    if ($child->getParentId() === $product->getId()) {
+                    if ($child->getParentId() === $product->getData($linkField)) {
                         $childrenIds[] = $child->getId();
                     }
                 }

app/code/Magento/GraphQlConfigurableProduct/Model/Resolver/Products/Query/ConfigurableProductPostProcessor.php

@@ -82,7 +82,9 @@ public function process(array $productData)
             $childData = $this->formatter->format($childProduct);
             $childId = (int)$childProduct->getId();
             foreach ($productData as $key => $item) {
-                if (array_key_exists($childId, $item['configurable_product_links'])) {
+                if (isset($item['configurable_product_links'])
+                    && array_key_exists($childId, $item['configurable_product_links'])
+                ) {
                     $productData[$key]['configurable_product_links'][$childId] = $childData;
                     $categoryLinks = $this->productResource->getCategoryIds($childProduct);
                     foreach ($categoryLinks as $position => $link) {

app/code/Magento/GraphQlConfigurableProduct/composer.json

@@ -7,6 +7,7 @@
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-eav": "100.3.*",
         "magento/module-catalog": "100.2.*",
+        "magento/module-configurable-product": "100.2.*",
         "magento/module-graph-ql": "100.0.*",
         "magento/module-graph-ql-catalog": "100.0.*",
         "magento/framework": "100.3.*"

app/code/Magento/GraphQlConfigurableProduct/etc/module.xml

@@ -11,6 +11,7 @@
             <module name="Magento_Catalog"/>
             <module name="Magento_ConfigurableProduct"/>
             <module name="Magento_GraphQl"/>
+            <module name="Magento_GraphQlCatalog"/>
         </sequence>
     </module>
 </config>

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

@@ -455,21 +455,15 @@ private function assertOptions($product, $actualResponse)
     {
         $productOptions = $product->getOptions();
         $this->assertNotEmpty($actualResponse['options'], "Precondition failed: 'options' must not be empty");
-        usort(
-            $actualResponse['options'],
-            function ($a, $b) {
-                return strcmp($a['title'], $b['title']);
-            }
-        );
-        usort(
-            $productOptions,
-            function ($a, $b) {
-                return strcmp($a['title'], $b['title']);
+        foreach ($actualResponse['options'] as $optionsArray) {
+            $option = null;
+            /** @var \Magento\Catalog\Model\Product\Option $optionSelect */
+            foreach ($productOptions as $optionSelect) {
+                if ($optionSelect->getOptionId() == $optionsArray['option_id']) {
+                    $option = $optionSelect;
+                    break;
+                }
             }
-        );
-        foreach ($actualResponse['options'] as $optionsIndex => $optionsArray) {
-            /** @var \Magento\Catalog\Model\Product\Option $option */
-            $option = $productOptions[$optionsIndex];
             $assertionMap = [
                 ['response_field' => 'product_sku', 'expected_value' => $option->getProductSku()],
                 ['response_field' => 'sort_order', 'expected_value' => $option->getSortOrder()],