B2B-2459: Optimize Product Permissions in GraphQL with product inline fragments

joanhe · joanhe · commit df464a8cff67 · 2022-11-18T09:47:24.000-06:00
diff --git a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
@@ -114,22 +114,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\BundleGraphQl\Model\Resolver\Options\Label">
-        <arguments>
-            <argument name="product" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct</argument>
-        </arguments>
-    </type>
-    <type name="Magento\BundleGraphQl\Model\Resolver\PriceRange">
-        <arguments>
-            <argument name="productDataProvider" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct</argument>
-        </arguments>
-    </type>
-    <virtualType name="Magento\BundleGraphQl\Model\Resolver\Options\Product"
-                 type="Magento\CatalogGraphQl\Model\Resolver\Product">
-        <arguments>
-            <argument name="productDataProvider" xsi:type="object">
-                Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct
-            </argument>
-        </arguments>
-    </virtualType>
 </config>
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -69,7 +69,7 @@ type BundleItemOption @doc(description: "Defines the characteristics that compri
     price: Float @doc(description: "The price of the selected option.")
     price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
     can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
-    product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\Product")
+    product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
     uid: ID! @doc(description: "The unique ID for a `BundleItemOption` object.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid")
 }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/ChildCollectionFactory.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/ChildCollectionFactory.php
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/CollectionFactory.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/CollectionFactory.php
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
@@ -37,13 +37,6 @@ public function process(
     ): Collection {
         $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
         $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
-        if ($context) {
-            $store = $context->getExtensionAttributes()->getStore();
-            if ($store) {
-                $websiteId = $store->getWebsiteId();
-                $collection->addWebsiteFilter([$websiteId]);
-            }
-        }
 
         return $collection;
     }
diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
@@ -196,22 +196,6 @@
             <argument name="dataObjectProcessor" xsi:type="object">Magento\CatalogGraphQl\Category\DataObjectProcessor</argument>
         </arguments>
     </type>
-    <virtualType name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ChildProduct"
-                 type="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product">
-        <arguments>
-            <argument name="collectionFactory" xsi:type="object">
-                Magento\Catalog\Model\ResourceModel\Product\ChildCollectionFactory
-            </argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct"
-                 type="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product">
-        <arguments>
-            <argument name="productDataProvider" xsi:type="object">
-                Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ChildProduct
-            </argument>
-        </arguments>
-    </virtualType>
     <virtualType
         name="Magento\CatalogGraphQl\Category\DataObjectProcessor"
         type="Magento\Framework\Reflection\DataObjectProcessor"
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -153,7 +153,6 @@ private function fetch(ContextInterface $context) : array
             $childCollection = $this->childCollectionFactory->create();
             $childCollection->setProductFilter($product);
             $childCollection->addWebsiteFilter($context->getExtensionAttributes()->getStore()->getWebsiteId());
-            $childCollection->setFlag('product_children', true);
             $this->collectionProcessor->process(
                 $childCollection,
                 $this->searchCriteriaBuilder->create(),
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -85,12 +85,4 @@
     <type name="Magento\Quote\Model\Quote">
         <plugin name="update_customized_options" type="Magento\ConfigurableProductGraphQl\Plugin\Quote\UpdateCustomizedOptions"/>
     </type>
-    <virtualType name="Magento\ConfigurableProductGraphQl\Model\Resolver\Variant\Product"
-                 type="Magento\CatalogGraphQl\Model\Resolver\Product">
-        <arguments>
-            <argument name="productDataProvider" xsi:type="object">
-                Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct
-            </argument>
-        </arguments>
-    </virtualType>
 </config>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -12,7 +12,7 @@ type ConfigurableProduct implements ProductInterface, RoutableInterface, Physica
 
 type ConfigurableVariant @doc(description: "Contains all the simple product variants of a configurable product.") {
     attributes: [ConfigurableAttributeOption] @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes") @doc(description: "An array of configurable attribute options.")
-    product: SimpleProduct @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Product") @doc(description: "An array of linked simple products.")
+    product: SimpleProduct @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product") @doc(description: "An array of linked simple products.")
 }
 
 type ConfigurableAttributeOption @doc(description: "Contains details about a configurable product attribute option.") {
diff --git a/app/code/Magento/GroupedProductGraphQl/etc/graphql/di.xml b/app/code/Magento/GroupedProductGraphQl/etc/graphql/di.xml
@@ -53,17 +53,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\GroupedProductGraphQl\Model\Resolver\GroupedItems">
-        <arguments>
-            <argument name="productResolver" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct</argument>
-        </arguments>
-    </type>
-    <virtualType name="Magento\GroupedProductGraphQl\Model\Resolver\GroupedItem\Product"
-                 type="Magento\CatalogGraphQl\Model\Resolver\Product">
-        <arguments>
-            <argument name="productDataProvider" xsi:type="object">
-                Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct
-            </argument>
-        </arguments>
-    </virtualType>
 </config>
diff --git a/app/code/Magento/GroupedProductGraphQl/etc/schema.graphqls b/app/code/Magento/GroupedProductGraphQl/etc/schema.graphqls
@@ -8,7 +8,7 @@ type GroupedProduct implements ProductInterface, RoutableInterface, PhysicalProd
 type GroupedProductItem @doc(description: "Contains information about an individual grouped product item."){
     qty: Float @doc(description: "The quantity of this grouped product item.")
     position: Int @doc(description: "The relative position of this item compared to the other group items.")
-    product: ProductInterface @doc(description: "Details about this product option.") @resolver(class: "Magento\\GroupedProductGraphQl\\Model\\Resolver\\GroupedItem\\Product")
+    product: ProductInterface @doc(description: "Details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
 }
 
 type GroupedProductWishlistItem implements WishlistItemInterface @doc(description: "A grouped product wish list item.") {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ type BundleItemOption @doc(description: "Defines the characteristics that compri`
`69`	`69`	`price: Float @doc(description: "The price of the selected option.")`
`70`	`70`	`price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")`
`71`	`71`	`can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")`
`72`		`- product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\Product")`
	`72`	`+ product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")`
`73`	`73`	uid: ID! @doc(description: "The unique ID for a `BundleItemOption` object.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid")
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ type ConfigurableProduct implements ProductInterface, RoutableInterface, Physica`
`12`	`12`
`13`	`13`	`type ConfigurableVariant @doc(description: "Contains all the simple product variants of a configurable product.") {`
`14`	`14`	`attributes: [ConfigurableAttributeOption] @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes") @doc(description: "An array of configurable attribute options.")`
`15`		`- product: SimpleProduct @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Product") @doc(description: "An array of linked simple products.")`
	`15`	`+ product: SimpleProduct @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product") @doc(description: "An array of linked simple products.")`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`type ConfigurableAttributeOption @doc(description: "Contains details about a configurable product attribute option.") {`