From 88b64017288d02c3849301cabfdc230c1bd70ab1 Mon Sep 17 00:00:00 2001
From: Alex <silyadev@gmail.com>
Date: Mon, 18 Mar 2019 12:43:37 +0200
Subject: [PATCH 1/3] Fill data_hash from BULK response with correct data

---
 .../Model/MassSchedule.php                      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index eae92e1663fc8..eb760a82916a6 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -20,6 +20,7 @@
 use Psr\Log\LoggerInterface;
 use Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Encryption\Encryptor;
 
 /**
  * Class MassSchedule used for adding multiple entities as Operations to Bulk Management with the status tracking
@@ -63,6 +64,11 @@ class MassSchedule
      */
     private $userContext;
 
+    /**
+     * @var Encryptor
+     */
+    private $encryptor;
+
     /**
      * Initialize dependencies.
      *
@@ -73,6 +79,7 @@ class MassSchedule
      * @param LoggerInterface $logger
      * @param OperationRepository $operationRepository
      * @param UserContextInterface $userContext
+     * @param Encryptor|null $encryptor
      */
     public function __construct(
         IdentityGeneratorInterface $identityService,
@@ -81,7 +88,8 @@ public function __construct(
         BulkManagementInterface $bulkManagement,
         LoggerInterface $logger,
         OperationRepository $operationRepository,
-        UserContextInterface $userContext = null
+        UserContextInterface $userContext = null,
+        Encryptor $encryptor = null
     ) {
         $this->identityService = $identityService;
         $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
@@ -90,6 +98,7 @@ public function __construct(
         $this->logger = $logger;
         $this->operationRepository = $operationRepository;
         $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+        $this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(Encryptor::class);
     }
 
     /**
@@ -130,10 +139,12 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
             $requestItem = $this->itemStatusInterfaceFactory->create();
 
             try {
-                $operations[] = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $operation = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $operations[] = $operation;
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
-                $requestItems[] = $requestItem;
+                $requestItem->setDataHash($this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256));
+                $requestItems[] = $requestItem;git
             } catch (\Exception $exception) {
                 $this->logger->error($exception);
                 $requestItem->setId($key);

From 705416eb167111285653c5656673f5bc6655f63c Mon Sep 17 00:00:00 2001
From: Alex <silyadev@gmail.com>
Date: Mon, 18 Mar 2019 13:10:54 +0200
Subject: [PATCH 2/3] Fix extra symbols

---
 app/code/Magento/AsynchronousOperations/Model/MassSchedule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index eb760a82916a6..3ab6dc12054be 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -144,7 +144,7 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
                 $requestItem->setDataHash($this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256));
-                $requestItems[] = $requestItem;git
+                $requestItems[] = $requestItem;
             } catch (\Exception $exception) {
                 $this->logger->error($exception);
                 $requestItem->setId($key);

From a07956c5a2336fb48b86e9585e7e18882691e31c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 20 Mar 2019 14:59:54 +0200
Subject: [PATCH 3/3] ENGCOM-4531: Static tests fix.

---
 .../Magento/AsynchronousOperations/Model/MassSchedule.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index 3ab6dc12054be..89d468159c6e9 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -143,7 +143,9 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
                 $operations[] = $operation;
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
-                $requestItem->setDataHash($this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256));
+                $requestItem->setDataHash(
+                    $this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256)
+                );
                 $requestItems[] = $requestItem;
             } catch (\Exception $exception) {
                 $this->logger->error($exception);