MC-37484: Cart query error when trying to switch store view

Author: cspruiell

app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php

@@ -11,13 +11,24 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\QuoteRepository;
 
 /**
  * Set single shipping address for a specified shopping cart
  */
 class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
 {
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedQuoteId;
+
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
     /**
      * @var AssignShippingAddressToCart
      */
@@ -34,15 +45,21 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
     private $quoteRepository;
 
     /**
+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+     * @param GetCartForUser $getCartForUser
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      * @param GetShippingAddress $getShippingAddress
      * @param QuoteRepository|null $quoteRepository
      */
     public function __construct(
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
+        GetCartForUser $getCartForUser,
         AssignShippingAddressToCart $assignShippingAddressToCart,
         GetShippingAddress $getShippingAddress,
         QuoteRepository $quoteRepository = null
     ) {
+        $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+        $this->getCartForUser = $getCartForUser;
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
         $this->getShippingAddress = $getShippingAddress;
         $this->quoteRepository = $quoteRepository
@@ -81,7 +98,10 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
             throw $e;
         }
         $this->assignShippingAddressToCart->execute($cart, $shippingAddress);
-        // trigger quote re-evaluation after address change
+
+        // reload updated cart & trigger quote re-evaluation after address change
+        $maskedId = $this->quoteIdToMaskedQuoteId->execute((int)$cart->getId());
+        $cart = $this->getCartForUser->execute($maskedId, $context->getUserId(), $cart->getStoreId());
         $this->quoteRepository->save($cart);
     }
 }