ACPT-1191: Fix Quote related issues on Application Server

Author: aa-kashk

app/code/Magento/Config/Model/ResourceModel/Config.php

@@ -6,6 +6,7 @@
 namespace Magento\Config\Model\ResourceModel;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface;
 
 /**
  * Core Resource Resource Model
@@ -17,14 +18,23 @@
 class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
     \Magento\Framework\App\Config\ConfigResource\ConfigInterface
 {
+    /**
+     * @var PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * Define main table
-     *
+     * @param PoisonPillPutInterface|null $pillPut
      * @return void
      */
-    protected function _construct()
+    protected function _construct(
+        PoisonPillPutInterface $pillPut = null
+    )
     {
         $this->_init('core_config_data', 'config_id');
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(PoisonPillPutInterface::class);
     }
 
     /**
@@ -61,6 +71,7 @@ public function saveConfig($path, $value, $scope = ScopeConfigInterface::SCOPE_T
         } else {
             $connection->insert($this->getMainTable(), $newData);
         }
+        $this->pillPut->put();
         return $this;
     }
 
@@ -83,6 +94,7 @@ public function deleteConfig($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DE
                 $connection->quoteInto('scope_id = ?', $scopeId)
             ]
         );
+        $this->pillPut->put();
         return $this;
     }
 }

app/code/Magento/Eav/Model/Config.php

@@ -990,5 +990,6 @@ public function _resetState(): void
     {
         $this->attributesPerSet = [];
         $this->_attributeData = [];
+        $this->attributes = [];
     }
 }

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

@@ -26,6 +26,7 @@
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
 use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Payment\Model\Method\AbstractMethod;
 use Magento\Quote\Api\CartManagementInterface;
@@ -41,6 +42,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderInterfaceFactory as OrderFactory;
 use Magento\Sales\Api\OrderManagementInterface as OrderManagement;
+use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -50,7 +52,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
-class QuoteManagement implements CartManagementInterface
+class QuoteManagement implements CartManagementInterface, ResetAfterRequestInterface
 {
     private const LOCK_PREFIX = 'PLACE_ORDER_';
 
@@ -774,4 +776,12 @@ private function rollbackAddresses(
             throw new \Exception($message, 0, $e);
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->storeManager = ObjectManager::getInstance()->get(StoreManager::class);
+    }
 }

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

@@ -51,8 +51,7 @@ public function __construct(QuoteTotalsCollector $quoteTotalsCollector)
      */
     public function _resetState(): void
     {
-        $this->quoteTotals = [];
-        $this->addressTotals = [];
+        $this->clearTotals();
     }
 
     /**

app/code/Magento/Tax/Model/Calculation.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Store;
 use Magento\Tax\Api\TaxClassRepositoryInterface;
@@ -24,7 +25,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Calculation extends \Magento\Framework\Model\AbstractModel
+class Calculation extends \Magento\Framework\Model\AbstractModel implements ResetAfterRequestInterface
 {
     /**
      * Identifier constant for Tax calculation before discount excluding TAX
@@ -720,4 +721,13 @@ public function getTaxRates($billingAddress, $shippingAddress, $customerTaxClass
         }
         return $productRates;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_rateCache = [];
+        $this->_rateCalculationProcess = [];
+    }
 }

app/code/Magento/Tax/Model/ResourceModel/Calculation.php

@@ -9,7 +9,9 @@
  */
 namespace Magento\Tax\Model\ResourceModel;
 
-class Calculation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
+class Calculation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements ResetAfterRequestInterface
 {
     /**
      * Store ISO 3166-1 alpha-2 USA country code
@@ -473,4 +475,12 @@ public function getRateIds($request)
 
         return $result;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_ratesCache = [];
+    }
 }

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

@@ -198,6 +198,7 @@ public function testCartPromotionsMultipleCartRules()
      * Tax rate = 7.5%
      * Cart rule to apply 50% for products assigned to a specific category
      *
+     * @magentoConfigFixture default_store tax/calculation/discount_tax 1
      * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
      * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_calculation_price_and_cart_display_settings.php

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php

@@ -39,6 +39,7 @@ protected function setUp(): void
     }
 
     /**
+     * @magentoConfigFixture default_store tax/calculation/price_includes_tax 1
      * @magentoConfigFixture default_store tax/calculation/shipping_includes_tax 1
      * @magentoConfigFixture default_store tax/cart_display/shipping 2
      * @magentoConfigFixture default_store tax/classes/shipping_tax_class 2

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php

@@ -133,6 +133,7 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumbe
     }
 
     /**
+     * @magentoConfigFixture default_store payment/purchaseorder/active 0
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php

@@ -138,6 +138,7 @@ public function testReSetShippingMethod()
     }
 
     /**
+     * @magentoConfigFixture default_store carriers/freeshipping/active 0
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php