Merge pull request #528 from magento-performance/ACPT-1191

ACPT-1191: Fix Quote related issues on Application Server

Author: andimov

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/ResourceModel/Entity/Attribute.php

@@ -17,6 +17,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\ResourceModel\Db\Context;
@@ -53,23 +54,32 @@ class Attribute extends AbstractDb
      */
     private $config;
 
+    /**
+     * @var PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * Class constructor
      *
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param Type $eavEntityType
      * @param string $connectionName
+     * @param PoisonPillPutInterface|null $pillPut
      * @codeCoverageIgnore
      */
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManager,
         Type $eavEntityType,
-        $connectionName = null
+        $connectionName = null,
+        PoisonPillPutInterface $pillPut = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_eavEntityType = $eavEntityType;
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(PoisonPillPutInterface::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -235,6 +245,7 @@ protected function _afterSave(AbstractModel $object)
             $object
         );
         $this->getConfig()->clear();
+        $this->pillPut->put();
         return parent::_afterSave($object);
     }
 
@@ -249,6 +260,7 @@ protected function _afterSave(AbstractModel $object)
     protected function _afterDelete(AbstractModel $object)
     {
         $this->getConfig()->clear();
+        $this->pillPut->put();
         return $this;
     }
 
@@ -390,7 +402,7 @@ protected function _saveOption(AbstractModel $object)
         if ($object->getDefaultValue()) {
             $defaultValue[] = $object->getDefaultValue();
         }
-        
+
         $this->_saveDefaultValue($object, $defaultValue);
         return $this;
     }

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/Store/Model/StoreManager.php

@@ -18,7 +18,8 @@
  */
 class StoreManager implements
     \Magento\Store\Model\StoreManagerInterface,
-    \Magento\Store\Api\StoreWebsiteRelationInterface
+    \Magento\Store\Api\StoreWebsiteRelationInterface,
+    ResetAfterRequestInterface
 {
     /**
      * Application run code
@@ -329,4 +330,12 @@ public function __debugInfo()
     {
         return ['currentStoreId' => $this->currentStoreId];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->reinitStores();
+    }
 }

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

@@ -22,6 +22,7 @@
 
 /**
  * Tax Calculation Model
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -526,11 +527,13 @@ public function getRateRequest(
                     //fallback to default address for registered customer
                     try {
                         $defaultBilling = $this->customerAccountManagement->getDefaultBillingAddress($customerId);
+                        // phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
                     } catch (NoSuchEntityException $e) {
                     }
 
                     try {
                         $defaultShipping = $this->customerAccountManagement->getDefaultShippingAddress($customerId);
+                        // phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
                     } catch (NoSuchEntityException $e) {
                     }
 

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
@@ -385,7 +386,9 @@ private function getQuery(
     public function testSetShippingMethodOnAnEmptyCart()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The shipping method can\'t be set for an empty cart. Add an item to cart and try again.');
+        $this->expectExceptionMessage(
+            'The shipping method can\'t be set for an empty cart. Add an item to cart and try again.'
+        );
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $carrierCode = 'flatrate';