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

Author: cspruiell

app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php

@@ -85,6 +85,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new LocalizedException(__($e->getMessage()), $e);
         }
 
+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId, $storeId);
         return [
             'cart' => [
                 'model' => $cart,

app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php

@@ -69,6 +69,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
         $this->setBillingAddressOnCart->execute($context, $cart, $billingAddress);
+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
 
         return [
             'cart' => [

app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php

@@ -69,6 +69,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
         $this->setShippingMethodsOnCart->execute($context, $cart, $shippingMethods);
+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
 
         return [
             'cart' => [

app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php

@@ -83,6 +83,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }
 
+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         return [
             'cart' => [
                 'model' => $cart,

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php

@@ -316,7 +316,7 @@ public function testUpdateGiftMessageCartForItem()
         $query = $this->getUpdateGiftMessageQuery($messageTo, $messageFrom, $message);
         foreach ($this->graphQlMutation($query)['updateCartItems']['cart']['items'] as $item) {
             self::assertArrayHasKey('gift_message', $item);
-            self::assertSame(null, $item['gift_message']);
+            self::assertSame(['to' => '', 'from' => '', 'message' => ''], $item['gift_message']);
         }
     }