MAGETWO-89246: Fix bundle issues

Author: Eric Bohanon

app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php

@@ -99,34 +99,20 @@ public function joinValues($storeId)
      */
     public function setProductIdFilter($productId)
     {
-        $this->productIds[] = $productId;
-
         $productTable = $this->getTable('catalog_product_entity');
         $linkField = $this->getConnection()->getAutoIncrementField($productTable);
         $this->getSelect()->join(
             ['cpe' => $productTable],
             'cpe.'.$linkField.' = main_table.parent_id',
             []
         )->where(
-            "cpe.entity_id = (?)",
-            $this->productIds
+            "cpe.entity_id = ?",
+            $productId
         );
 
         return $this;
     }
 
-    /**
-     * Clear product id's after load to insure valid future usage of collection.
-     *
-     * @return $this
-     */
-    protected function _afterLoad()
-    {
-        $this->productIds = [];
-
-        return parent::_afterLoad();
-    }
-
     /**
      * Set product link filter
      *

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php

@@ -99,9 +99,17 @@ private function fetch() : array
         $optionsCollection = $this->bundleOptionFactory->create()->getResourceCollection();
         // All products in collection will have same store id.
         $optionsCollection->joinValues($this->storeManager->getStore()->getId());
-        foreach ($this->skuMap as $parentInfo) {
-            $optionsCollection->setProductIdFilter($parentInfo['entity_id']);
-        }
+
+        $productTable = $optionsCollection->getTable('catalog_product_entity');
+        $linkField = $optionsCollection->getConnection()->getAutoIncrementField($productTable);
+        $optionsCollection->getSelect()->join(
+            ['cpe' => $productTable],
+            'cpe.'.$linkField.' = main_table.parent_id',
+            []
+        )->where(
+            "cpe.entity_id IN (?)",
+            $this->skuMap
+        );
         $optionsCollection->setPositionOrder();
 
         $this->extensionAttributesJoinProcessor->process($optionsCollection);