Refactoring the downloadable product logic

Author: eduard13

app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php renamed to app/code/Magento/DownloadableGraphQl/Model/Wishlist/ItemLinks.php

@@ -5,20 +5,20 @@
  */
 declare(strict_types=1);
 
-namespace Magento\WishlistGraphQl\Model\Resolver\Type\Downloadable;
+namespace Magento\DownloadableGraphQl\Model\Wishlist;
 
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Downloadable\Helper\Catalog\Product\Configuration;
 use Magento\DownloadableGraphQl\Model\ConvertLinksToArray;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Wishlist\Model\Item;
 
 /**
- * Fetches the selected downloadable links
+ * Fetches the selected item downloadable links
  */
-class Links implements ResolverInterface
+class ItemLinks implements ResolverInterface
 {
     /**
      * @var ConvertLinksToArray
@@ -52,13 +52,15 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['wishlistItemModel'])) {
-            throw new LocalizedException(__('Missing key "wishlistItemModel" in Wishlist Item value data'));
+        if (!$value['itemModel'] instanceof ItemInterface) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
+                'instance' => ItemInterface::class
+            ]));
         }
-        /** @var Item $wishlistItem */
-        $wishlistItem = $value['wishlistItemModel'];
+        /** @var ItemInterface $wishlistItem */
+        $itemItem = $value['itemModel'];
 
-        $links = $this->downloadableConfiguration->getLinks($wishlistItem);
+        $links = $this->downloadableConfiguration->getLinks($itemItem);
         $links = $this->convertLinksToArray->execute($links);
 
         return $links;

app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php

@@ -13,7 +13,6 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Wishlist\Model\Item;
 
 /**
  * Fetches the Product data according to the GraphQL schema

app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php

@@ -43,12 +43,12 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['wishlistItemModel'] instanceof Item) {
-            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+        if (!$value['itemModel'] instanceof Item) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
                 'instance' => Item::class
             ]));
         }
 
-        return $this->bundleOptionDataProvider->getData($value['wishlistItemModel']);
+        return $this->bundleOptionDataProvider->getData($value['itemModel']);
     }
 }

app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php

@@ -28,14 +28,14 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['wishlistItemModel'] instanceof Item) {
-            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+        if (!$value['itemModel'] instanceof Item) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
                 'instance' => Item::class
             ]));
         }
 
         /** @var Item $wishlistItem */
-        $wishlistItem = $value['wishlistItemModel'];
+        $wishlistItem = $value['itemModel'];
         $optionProduct = $wishlistItem->getProduct()->getCustomOption('simple_product')->getProduct();
 
         return $optionProduct->getSku();

app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php

@@ -43,14 +43,14 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['wishlistItemModel'] instanceof Item) {
-            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+        if (!$value['itemModel'] instanceof Item) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
                 'instance' => Item::class
             ]));
         }
 
         /** @var Item $wishlistItem */
-        $wishlistItem = $value['wishlistItemModel'];
+        $wishlistItem = $value['itemModel'];
         $result = [];
 
         foreach ($this->configurationHelper->getOptions($wishlistItem) as $option) {

app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php

@@ -71,7 +71,7 @@ public function resolve(
                 'description' => $wishlistItem->getDescription(),
                 'added_at' => $wishlistItem->getAddedAt(),
                 'model' => $wishlistItem->getProduct(),
-                'wishlistItemModel' => $wishlistItem,
+                'itemModel' => $wishlistItem,
             ];
         }
         return $data;

app/code/Magento/WishlistGraphQl/composer.json

@@ -7,8 +7,6 @@
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-graph-ql": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-downloadable-graphql": "*",
         "magento/module-wishlist": "*",
         "magento/module-store": "*"
     },

app/code/Magento/WishlistGraphQl/etc/schema.graphqls

@@ -52,7 +52,7 @@ type ConfigurableWishlistItem implements WishlistItemInterface {
 }
 
 type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "Downloadable Wishlist Item") {
-    links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Downloadable\\Links")
+    links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\DownloadableGraphQl\\Model\\Wishlist\\ItemLinks")
     samples: [DownloadableProductSamples] @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
 }
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php

@@ -160,7 +160,7 @@ private function getQuery(
     }
 
     /**
-     * Generates Id_v2 for super configurable product super attributes
+     * Generates uid for super configurable product super attributes
      *
      * @param int $attributeId
      * @param int $valueIndex

dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php

@@ -221,7 +221,7 @@ private function getQuery(
     }
 
     /**
-     * Generates Id_v2 for downloadable links
+     * Generates uid for downloadable links
      *
      * @param int $linkId
      *