MC-13613: Product mass update

Author: slopukhov

app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php

@@ -7,8 +7,6 @@
 
 namespace Magento\MessageQueue\Api;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-
 /**
  * Interface describes how to describes how to compare poison pill with latest in DB.
  *
@@ -19,8 +17,8 @@ interface PoisonPillCompareInterface
     /**
      * Check if version of current poison pill is latest.
      *
-     * @param PoisonPillInterface $poisonPill
+     * @param int $poisonPillVersion
      * @return bool
      */
-    public function isLatest(PoisonPillInterface $poisonPill): bool;
+    public function isLatestVersion(int $poisonPillVersion): bool;
 }

app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php

@@ -7,8 +7,6 @@
 
 namespace Magento\MessageQueue\Api;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-
 /**
  * Describes how to get latest version of poison pill.
  *
@@ -17,9 +15,9 @@
 interface PoisonPillReadInterface
 {
     /**
-     * Returns latest poison pill.
+     * Returns get latest version of poison pill.
      *
-     * @return PoisonPillInterface
+     * @return int
      */
-    public function getLatest(): PoisonPillInterface;
+    public function getLatestVersion(): int;
 }

app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\MessageQueue\CallbackInvokerInterface;
 use Magento\Framework\MessageQueue\QueueInterface;
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
 use Magento\MessageQueue\Api\PoisonPillCompareInterface;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 
@@ -24,9 +23,9 @@ class CallbackInvoker implements CallbackInvokerInterface
     private $poisonPillRead;
 
     /**
-     * @var PoisonPillInterface $poisonPill
+     * @var int $poisonPillVersion
      */
-    private $poisonPill;
+    private $poisonPillVersion;
 
     /**
      * @var PoisonPillCompareInterface
@@ -51,12 +50,12 @@ public function __construct(
      */
     public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
     {
-        $this->poisonPill = $this->poisonPillRead->getLatest();
+        $this->poisonPillVersion = $this->poisonPillRead->getLatestVersion();
         for ($i = $maxNumberOfMessages; $i > 0; $i--) {
             do {
                 $message = $queue->dequeue();
             } while ($message === null && (sleep(1) === 0));
-            if (false === $this->poisonPillCompare->isLatest($this->poisonPill)) {
+            if (false === $this->poisonPillCompare->isLatestVersion($this->poisonPillVersion)) {
                 $queue->reject($message);
                 exit(0);
             }

app/code/Magento/MessageQueue/Model/CallbackInvoker.php

@@ -7,7 +7,6 @@
 
 namespace Magento\MessageQueue\Model;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
 use Magento\MessageQueue\Api\PoisonPillCompareInterface;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 
@@ -34,8 +33,8 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function isLatest(PoisonPillInterface $poisonPill): bool
+    public function isLatestVersion(int $poisonPillVersion): bool
     {
-        return $poisonPill->getVersion() === $this->poisonPillRead->getLatest()->getVersion();
+        return $poisonPillVersion === $this->poisonPillRead->getLatestVersion();
     }
 }

app/code/Magento/MessageQueue/Model/PoisonPill.php

@@ -7,8 +7,6 @@
 
 namespace Magento\MessageQueue\Model\ResourceModel;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-use Magento\MessageQueue\Api\Data\PoisonPillInterfaceFactory;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 use Magento\MessageQueue\Api\PoisonPillPutInterface;
 use Magento\Framework\Model\ResourceModel\Db\Context;
@@ -24,24 +22,16 @@ class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPil
      */
     const QUEUE_POISON_PILL_TABLE = 'queue_poison_pill';
 
-    /**
-     * @var PoisonPillInterfaceFactory
-     */
-    private $poisonPillFactory;
-
     /**
      * PoisonPill constructor.
      *
      * @param Context $context
-     * @param PoisonPillInterfaceFactory $poisonPillFactory
      * @param string|null $connectionName
      */
     public function __construct(
         Context $context,
-        PoisonPillInterfaceFactory $poisonPillFactory,
         string $connectionName = null
     ) {
-        $this->poisonPillFactory = $poisonPillFactory;
         parent::__construct($context, $connectionName);
     }
 
@@ -67,7 +57,7 @@ public function put(): int
     /**
      * @inheritdoc
      */
-    public function getLatest() : PoisonPillInterface
+    public function getLatestVersion() : int
     {
         $select = $this->getConnection()->select()->from(
             $this->getTable(self::QUEUE_POISON_PILL_TABLE),
@@ -78,10 +68,8 @@ public function getLatest() : PoisonPillInterface
             1
         );
 
-        $version = $this->getConnection()->fetchOne($select);
-
-        $poisonPill = $this->poisonPillFactory->create(['data' => ['version' => (int) $version]]);
+        $version = (int)$this->getConnection()->fetchOne($select);
 
-        return $poisonPill;
+        return $version;
     }
 }

app/code/Magento/MessageQueue/Model/PoisonPillCompare.php

@@ -13,7 +13,6 @@
     <preference for="Magento\Framework\MessageQueue\EnvelopeInterface" type="Magento\Framework\MessageQueue\Envelope"/>
     <preference for="Magento\Framework\MessageQueue\ConsumerInterface" type="Magento\Framework\MessageQueue\Consumer"/>
     <preference for="Magento\Framework\MessageQueue\MergedMessageInterface" type="Magento\Framework\MessageQueue\MergedMessage"/>
-    <preference for="Magento\MessageQueue\Api\Data\PoisonPillInterface" type="Magento\MessageQueue\Model\PoisonPill"/>
     <preference for="Magento\MessageQueue\Api\PoisonPillCompareInterface" type="Magento\MessageQueue\Model\PoisonPillCompare"/>
     <preference for="Magento\MessageQueue\Api\PoisonPillPutInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
     <preference for="Magento\MessageQueue\Api\PoisonPillReadInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>