ACPT-1191: Fix Quote related issues on Application Server

Author: aa-kashk

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

@@ -24,8 +24,8 @@ class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implem
     private $pillPut;
 
     /**
-     *
      * Define main table
+     *
      * @param PoisonPillPutInterface|null $pillPut
      * @return void
      */

app/code/Magento/Customer/Model/Attribute.php

@@ -7,17 +7,15 @@
 
 use Magento\Catalog\Api\Data\EavAttributeInterface;
 use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
-use Magento\Quote\Api\Data\AddressInterface;
 
 /**
  * Customer attribute model
  *
  * @method int getSortOrder()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Attribute extends \Magento\Eav\Model\Attribute implements ResetAfterRequestInterface
+class Attribute extends \Magento\Eav\Model\Attribute
 {
     /**
      * Name of the module
@@ -223,14 +221,4 @@ public function __wakeup()
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->indexerRegistry = $objectManager->get(\Magento\Framework\Indexer\IndexerRegistry::class);
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        if ($this->getName() === AddressInterface::KEY_TELEPHONE) {
-            $this->unsetData();
-        }
-    }
 }

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);
     }
 
@@ -199,6 +209,24 @@ protected function _beforeSave(AbstractModel $object)
         return parent::_beforeSave($object);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function save(\Magento\Framework\Model\AbstractModel $object)
+    {
+        $this->pillPut->put();
+        return parent::save($object);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(\Magento\Framework\Model\AbstractModel $object)
+    {
+        $this->pillPut->put();
+        return parent::delete($object);
+    }
+
     /**
      * @inheritdoc
      *
@@ -390,7 +418,7 @@ protected function _saveOption(AbstractModel $object)
         if ($object->getDefaultValue()) {
             $defaultValue[] = $object->getDefaultValue();
         }
-        
+
         $this->_saveDefaultValue($object, $defaultValue);
         return $this;
     }