Merge remote-tracking branch 'origin/PWA-1619-PR' into PWA-1655

Author: Prabhu Ram

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

@@ -7,6 +7,7 @@
 
 namespace Magento\WishlistGraphQl\Model\Resolver;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -16,6 +17,7 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist\CollectionFactory as WishlistCollectionFactory;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\Wishlist\Config as WishlistConfig;
+use Magento\Wishlist\Model\WishlistFactory;
 use Magento\WishlistGraphQl\Mapper\WishlistDataMapper;
 
 /**
@@ -38,19 +40,28 @@ class CustomerWishlists implements ResolverInterface
      */
     private $wishlistCollectionFactory;
 
+    /**
+     * @var WishlistFactory
+     */
+    private $wishlistFactory;
+
     /**
      * @param WishlistDataMapper $wishlistDataMapper
      * @param WishlistConfig $wishlistConfig
      * @param WishlistCollectionFactory $wishlistCollectionFactory
+     * @param WishlistFactory $wishlistFactory
      */
     public function __construct(
         WishlistDataMapper $wishlistDataMapper,
         WishlistConfig $wishlistConfig,
-        WishlistCollectionFactory $wishlistCollectionFactory
+        WishlistCollectionFactory $wishlistCollectionFactory,
+        WishlistFactory $wishlistFactory = null
     ) {
         $this->wishlistDataMapper = $wishlistDataMapper;
         $this->wishlistConfig = $wishlistConfig;
         $this->wishlistCollectionFactory = $wishlistCollectionFactory;
+        $this->wishlistFactory = $wishlistFactory ?:
+            ObjectManager::getInstance()->get(WishlistFactory::class);
     }
 
     /**
@@ -96,7 +107,11 @@ public function resolve(
         foreach ($collection->getItems() as $wishList) {
             array_push($wishlists, $this->wishlistDataMapper->map($wishList));
         }
-
+        if (empty($wishlists)) {
+            $newWishlist = $this->wishlistFactory->create();
+            $newWishlist->loadByCustomerId($context->getUserId(), true);
+            array_push($wishlists, $this->wishlistDataMapper->map($newWishlist));
+        }
         return $wishlists;
     }
 }

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

@@ -15,6 +15,8 @@
 use Magento\Wishlist\Model\Item;
 use Magento\Wishlist\Model\ResourceModel\Wishlist\CollectionFactory;
 use Magento\Wishlist\Model\Wishlist;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Registry;
 
 /**
  * Test coverage for customer wishlists
@@ -68,6 +70,80 @@ public function testCustomerWishlist(): void
         $this->assertEquals('simple', $wishlistItemResponse['product']['sku']);
     }
 
+    /**
+     * @magentoConfigFixture default_store wishlist/general/active 1
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @throws Exception
+     */
+    public function testWishlistCreationScenario(): void
+    {
+        try {
+            $customerEmail = 'customer@wishlist.com';
+            $this->graphQlMutation(
+                $this->getCreateCustomerQuery($customerEmail),
+                [],
+                ''
+            );
+            $response = $this->graphQlQuery(
+                $this->getQuery(),
+                [],
+                '',
+                $this->getCustomerAuthHeaders($customerEmail, '123123^q')
+            );
+            $this->assertArrayHasKey('wishlists', $response['customer']);
+            $wishlists = $response['customer']['wishlists'];
+            $this->assertNotEmpty($wishlists);
+            $wishlist = $wishlists[0];
+            $this->assertEquals(0, $wishlist['items_count']);
+            $sku = 'simple-1';
+            $qty = 1;
+            $addProductToWishlistQuery =
+                <<<QUERY
+mutation{
+   addProductsToWishlist(
+     wishlistId:{$wishlist['id']}
+     wishlistItems:[
+      {
+        sku:"{$sku}"
+        quantity:{$qty}
+      }
+    ])
+  {
+     wishlist{
+     id
+     items_count
+     items{product{name sku} description qty}
+    }
+    user_errors{code message}
+  }
+}
+
+QUERY;
+            $addToWishlistResponse = $this->graphQlMutation(
+                $addProductToWishlistQuery,
+                [],
+                '',
+                $this->getCustomerAuthHeaders($customerEmail, '123123^q')
+            );
+            $this->assertArrayHasKey('user_errors', $addToWishlistResponse['addProductsToWishlist']);
+            $this->assertCount(0, $addToWishlistResponse['addProductsToWishlist']['user_errors']);
+        } finally {
+            /** @var Registry $registry */
+            $registry = Bootstrap::getObjectManager()
+                ->get(Registry::class);
+            $registry->unregister('isSecureArea');
+            $registry->register('isSecureArea', true);
+
+            $objectManager = Bootstrap::getObjectManager();
+            $customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+            $customer = $customerRepository->get($customerEmail);
+            $customerRepository->delete($customer);
+
+            $registry->unregister('isSecureArea');
+            $registry->register('isSecureArea', false);
+        }
+    }
+
     /**
      * Testing fetching the wishlist when wishlist is disabled
      *
@@ -109,11 +185,13 @@ private function getQuery(): string
 query {
   customer {
     wishlists {
+      id
       items_count
       sharing_code
       updated_at
       items_v2 {
-        items {product {name sku}
+        items {
+        product {name sku}
         }
       }
     }
@@ -122,6 +200,25 @@ private function getQuery(): string
 QUERY;
     }
 
+    private function getCreateCustomerQuery($customerEmail): string
+    {
+        return <<<QUERY
+mutation {
+  createCustomer(input: {
+    firstname: "test"
+    lastname: "test"
+    email: "$customerEmail"
+    password: "123123^q"
+  })
+   {
+  customer {
+    email
+  }
+}
+}
+QUERY;
+    }
+
     /**
      * Getting customer auth headers
      *