PWA-1303: [M2 Commerce] Gift card incorrectly applied to multiple orders using "free" payment method via graphql

Author: cspruiell

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

@@ -15,6 +15,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\PaymentMethodManagementInterface;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
@@ -44,22 +45,30 @@ class PlaceOrder implements ResolverInterface
      */
     private $checkCartCheckoutAllowance;
 
+    /**
+     * @var PaymentMethodManagementInterface
+     */
+    private $paymentMethodManagement;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param CartManagementInterface $cartManagement
      * @param OrderRepositoryInterface $orderRepository
      * @param CheckCartCheckoutAllowance $checkCartCheckoutAllowance
+     * @param PaymentMethodManagementInterface $paymentMethodManagement
      */
     public function __construct(
         GetCartForUser $getCartForUser,
         CartManagementInterface $cartManagement,
         OrderRepositoryInterface $orderRepository,
-        CheckCartCheckoutAllowance $checkCartCheckoutAllowance
+        CheckCartCheckoutAllowance $checkCartCheckoutAllowance,
+        PaymentMethodManagementInterface $paymentMethodManagement
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->cartManagement = $cartManagement;
         $this->orderRepository = $orderRepository;
         $this->checkCartCheckoutAllowance = $checkCartCheckoutAllowance;
+        $this->paymentMethodManagement = $paymentMethodManagement;
     }
 
     /**
@@ -84,7 +93,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         try {
-            $orderId = $this->cartManagement->placeOrder($cart->getId());
+            $cartId = $cart->getId();
+            $orderId = $this->cartManagement->placeOrder($cartId, $this->paymentMethodManagement->get($cartId));
             $order = $this->orderRepository->get($orderId);
 
             return [

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

@@ -275,6 +275,28 @@ public function testPlaceOrderWithNoPaymentMethod()
         $this->graphQlMutation($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoConfigFixture default_store carriers/flatrate/active 1
+     * @magentoConfigFixture default_store carriers/tablerate/active 1
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_free_payment_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testPlaceOrderWithFreePaymentMethodNonZeroTotal()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('Unable to place order: The requested Payment Method is not available');
+        $this->graphQlMutation($query);
+    }
+
     /**
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoConfigFixture default_store carriers/flatrate/active 1

dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_free_payment_method.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Payment\Model\Method\Free;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Api\Data\PaymentInterfaceFactory;
+use Magento\Quote\Api\PaymentMethodManagementInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var PaymentInterfaceFactory $paymentFactory */
+$paymentFactory = Bootstrap::getObjectManager()->get(PaymentInterfaceFactory::class);
+/** @var PaymentMethodManagementInterface $paymentMethodManagement */
+$paymentMethodManagement = Bootstrap::getObjectManager()->get(PaymentMethodManagementInterface::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+
+$payment = $paymentFactory->create([
+    'data' => [
+        PaymentInterface::KEY_METHOD => Free::PAYMENT_METHOD_FREE_CODE
+    ]
+]);
+$paymentMethodManagement->set($quote->getId(), $payment);