MAGETWO-44615: Add product to guest cart via API shows zero price

- moved default addresses code into QuoteManagement createEmptyCart method

Author: Partica, Cristian

app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php

@@ -12,7 +12,6 @@
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Model\Quote\Address;
 
 /**
  * Cart Management class for guest carts.
@@ -36,29 +35,21 @@ class GuestCartManagement implements GuestCartManagementInterface
      */
     protected $cartRepository;
 
-    /**
-     * @var \Magento\Quote\Model\Quote\AddressFactory
-     */
-    protected $quoteAddressFactory;
-
     /**
      * Initialize dependencies.
      *
      * @param CartManagementInterface $quoteManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory
      * @param CartRepositoryInterface $cartRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         CartManagementInterface $quoteManagement,
         QuoteIdMaskFactory $quoteIdMaskFactory,
-        \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
         CartRepositoryInterface $cartRepository
     ) {
         $this->quoteManagement = $quoteManagement;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-        $this->quoteAddressFactory = $quoteAddressFactory;
         $this->cartRepository = $cartRepository;
     }
 
@@ -70,15 +61,6 @@ public function createEmptyCart()
         /** @var $quoteIdMask \Magento\Quote\Model\QuoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create();
         $cartId = $this->quoteManagement->createEmptyCart();
-
-        /** @var \Magento\Quote\Model\Quote  $cart */
-        $cart = $this->cartRepository->get($cartId);
-        $billingAddress = $this->quoteAddressFactory->create()->setAddressType(Address::TYPE_BILLING);
-        $cart->addAddress($billingAddress);
-        $shippingAddress = $this->quoteAddressFactory->create()->setAddressType(Address::TYPE_SHIPPING);
-        $cart->addAddress($shippingAddress);
-        $cart->save();
-
         $quoteIdMask->setQuoteId($cartId)->save();
         return $quoteIdMask->getMaskedId();
     }

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -20,6 +20,7 @@
 use Magento\Sales\Api\Data\OrderInterfaceFactory as OrderFactory;
 use Magento\Sales\Api\OrderManagementInterface as OrderManagement;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Quote\Model\Quote\Address;
 
 /**
  * Class QuoteManagement
@@ -94,6 +95,11 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
      */
     protected $customerModelFactory;
 
+    /**
+     * @var \Magento\Quote\Model\Quote\AddressFactory
+     */
+    protected $quoteAddressFactory;
+
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
      */
@@ -154,6 +160,7 @@ public function __construct(
         QuoteRepository $quoteRepository,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
         \Magento\Customer\Model\CustomerFactory $customerModelFactory,
+        \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         StoreManagerInterface $storeManager,
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -173,6 +180,7 @@ public function __construct(
         $this->quoteRepository = $quoteRepository;
         $this->customerRepository = $customerRepository;
         $this->customerModelFactory = $customerModelFactory;
+        $this->quoteAddressFactory = $quoteAddressFactory;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->storeManager = $storeManager;
         $this->checkoutSession = $checkoutSession;
@@ -188,6 +196,9 @@ public function createEmptyCart()
         $storeId = $this->storeManager->getStore()->getStoreId();
         $quote = $this->createAnonymousCart($storeId);
 
+        $quote->setBillingAddress($this->quoteAddressFactory->create());
+        $quote->setShippingAddress($this->quoteAddressFactory->create());
+
         try {
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {

app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php

@@ -24,11 +24,6 @@ class GuestCartManagementTest extends \PHPUnit_Framework_TestCase
      */
     protected $quoteIdMaskFactoryMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $quoteAddressFactory;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -69,15 +64,6 @@ protected function setUp()
             '',
             false
         );
-
-        $this->quoteAddressFactory = $this->getMock(
-            'Magento\Quote\Model\Quote\AddressFactory',
-            ['create'],
-            [],
-            '',
-            false
-        );
-
         $this->quoteIdMaskMock = $this->getMock(
             'Magento\Quote\Model\QuoteIdMask',
             ['getQuoteId', 'getMaskedId', 'load', 'save', 'setQuoteId'],
@@ -109,7 +95,6 @@ protected function setUp()
             [
                 'quoteManagement' => $this->quoteManagementMock,
                 'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
-                'quoteAddressFactory' => $this->quoteAddressFactory,
                 'cartRepository' => $this->cartRepositoryMock
             ]
         );
@@ -119,30 +104,11 @@ public function testCreateEmptyCart()
     {
         $maskedCartId = 'masked1cart2id3';
         $cartId = 1;
-        $quoteMock = $this->getMock(
-            'Magento\Quote\Model\Quote',
-            ['get', 'save', 'addAddress'],
-            [],
-            '',
-            false
-        );
-        $quoteAddress = $this->getMock(
-            '\Magento\Quote\Model\Quote\Address',
-            ['get'],
-            [],
-            '',
-            false
-        );
         $this->quoteIdMaskMock->expects($this->once())->method('setQuoteId')->with($cartId)->willReturnSelf();
         $this->quoteIdMaskMock->expects($this->once())->method('save')->willReturnSelf();
         $this->quoteIdMaskMock->expects($this->once())->method('getMaskedId')->willreturn($maskedCartId);
         $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteIdMaskMock);
         $this->quoteManagementMock->expects($this->once())->method('createEmptyCart')->willReturn($cartId);
-        $this->quoteAddressFactory->expects($this->any())->method('create')->willReturn($quoteAddress);
-        $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteIdMaskMock);
-        $this->cartRepositoryMock->expects($this->once())->method('get')->willReturn($quoteMock);
-        $quoteMock->expects($this->any())->method('addAddress')->with($quoteAddress)->willReturnSelf();
-        $quoteMock->expects($this->any())->method('save')->willReturnSelf();
 
         $this->assertEquals($maskedCartId, $this->guestCartManagement->createEmptyCart());
     }

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -87,6 +87,11 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase
      */
     protected $customerFactoryMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $quoteAddressFactory;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -203,6 +208,14 @@ protected function setUp()
             false
         );
 
+        $this->quoteAddressFactory = $this->getMock(
+            'Magento\Quote\Model\Quote\AddressFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
         $this->dataObjectHelperMock = $this->getMock('\Magento\Framework\Api\DataObjectHelper', [], [], '', false);
         $this->checkoutSessionMock = $this->getMock(
             'Magento\Checkout\Model\Session',
@@ -236,6 +249,7 @@ protected function setUp()
                 'quoteRepository' => $this->quoteRepositoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
                 'customerModelFactory' => $this->customerFactoryMock,
+                'quoteAddressFactory' => $this->quoteAddressFactory,
                 'dataObjectHelper' => $this->dataObjectHelperMock,
                 'storeManager' => $this->storeManagerMock,
                 'checkoutSession' => $this->checkoutSessionMock,
@@ -252,6 +266,13 @@ public function testCreateEmptyCartAnonymous()
 
         $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
 
+        $quoteAddress = $this->getMock('\Magento\Quote\Model\Quote\Address', [], [], '', false);
+
+        $quoteMock->expects($this->any())->method('setBillingAddress')->with($quoteAddress)->willReturnSelf();
+        $quoteMock->expects($this->any())->method('setShippingAddress')->with($quoteAddress)->willReturnSelf();
+
+        $this->quoteAddressFactory->expects($this->any())->method('create')->willReturn($quoteAddress);
+
         $this->quoteRepositoryMock->expects($this->once())->method('create')->willReturn($quoteMock);
         $quoteMock->expects($this->any())->method('setStoreId')->with($storeId);
 
@@ -681,6 +702,7 @@ public function testPlaceOrderIfCustomerIsGuest()
                 'quoteRepository' => $this->quoteRepositoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
                 'customerModelFactory' => $this->customerFactoryMock,
+                'quoteAddressFactory' => $this->quoteAddressFactory,
                 'dataObjectHelper' => $this->dataObjectHelperMock,
                 'storeManager' => $this->storeManagerMock,
                 'checkoutSession' => $this->checkoutSessionMock,
@@ -737,6 +759,7 @@ public function testPlaceOrder()
                 'quoteRepository' => $this->quoteRepositoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
                 'customerModelFactory' => $this->customerFactoryMock,
+                'quoteAddressFactory' => $this->quoteAddressFactory,
                 'dataObjectHelper' => $this->dataObjectHelperMock,
                 'storeManager' => $this->storeManagerMock,
                 'checkoutSession' => $this->checkoutSessionMock,