Merge remote-tracking branch 'magento-l3/ACP2E-1315' into PR-L3-21-02-2023

Author: mirceaRosmeteniuc

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php

@@ -89,7 +89,7 @@ public function getList(
 
         $this->collectionPreProcessor->process($collection, $searchCriteria, $attributes, $context);
 
-        if ($isChildSearch) {
+        if (!$isChildSearch) {
             $visibilityIds = $isSearch
                 ? $this->visibility->getVisibleInSearchIds()
                 : $this->visibility->getVisibleInCatalogIds();

app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php

@@ -94,9 +94,7 @@ private function findRelations(array $products, array $loadAttributes, int $link
         $this->searchCriteriaBuilder->addFilter('entity_id', $relatedIds, 'in');
         $relatedSearchResult = $this->productDataProvider->getList(
             $this->searchCriteriaBuilder->create(),
-            $loadAttributes,
-            false,
-            true
+            $loadAttributes
         );
         //Filling related products map.
         /** @var \Magento\Catalog\Api\Data\ProductInterface[] $relatedProducts */

dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php

@@ -212,7 +212,7 @@ public function testBundleProductWithNotVisibleChildren()
         }
         $this->assertBundleBaseFields($bundleProduct, $response['products']['items'][0]);
 
-        $this->assertBundleProductOptions($bundleProduct, $response['products']['items'][0], false);
+        $this->assertBundleProductOptions($bundleProduct, $response['products']['items'][0]);
         $this->assertNotEmpty(
             $response['products']['items'][0]['items'],
             "Precondition failed: 'items' must not be empty"
@@ -242,9 +242,8 @@ private function assertBundleBaseFields($product, $actualResponse)
     /**
      * @param ProductInterface $product
      * @param  array $actualResponse
-     * @param bool $isChildVisible
      */
-    private function assertBundleProductOptions($product, $actualResponse, $isChildVisible = true)
+    private function assertBundleProductOptions($product, $actualResponse)
     {
         $this->assertNotEmpty(
             $actualResponse['items'],
@@ -284,22 +283,18 @@ private function assertBundleProductOptions($product, $actualResponse, $isChildV
             ]
         );
         $this->assertEquals(
-            $isChildVisible ? $childProduct->getName() : null,
+            $childProduct->getName(),
             $actualResponse['items'][0]['options'][0]['label']
         );
-        if ($isChildVisible) {
-            $this->assertResponseFields(
-                $actualResponse['items'][0]['options'][0]['product'],
-                [
-                    'id' => $childProduct->getId(),
-                    'name' => $childProduct->getName(),
-                    'type_id' => $childProduct->getTypeId(),
-                    'sku' => $childProduct->getSku()
-                ]
-            );
-        } else {
-            $this->assertNull($actualResponse['items'][0]['options'][0]['product']);
-        }
+        $this->assertResponseFields(
+            $actualResponse['items'][0]['options'][0]['product'],
+            [
+                'id' => $childProduct->getId(),
+                'name' => $childProduct->getName(),
+                'type_id' => $childProduct->getTypeId(),
+                'sku' => $childProduct->getSku()
+            ]
+        );
     }
 
     /**