Merge remote-tracking branch 'mainline/2.2-develop' into chaika-pr22

Author: Oleksandr Dubovyk

app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php

@@ -10,6 +10,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Abstract action reindex class
@@ -70,25 +71,33 @@ abstract class AbstractAction
      */
     private $cacheCleaner;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory $indexerFactory
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Indexer\CacheContext $cacheContext
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         ResourceConnection $resource,
         \Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory $indexerFactory,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Framework\Indexer\CacheContext $cacheContext,
-        \Magento\Framework\Event\ManagerInterface $eventManager
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        MetadataPool $metadataPool = null
     ) {
         $this->_resource = $resource;
         $this->_indexerFactory = $indexerFactory;
         $this->_catalogProductType = $catalogProductType;
         $this->cacheContext = $cacheContext;
         $this->eventManager = $eventManager;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
@@ -154,10 +163,15 @@ protected function _getTable($entityName)
     public function getRelationsByChild($childIds)
     {
         $connection = $this->_getConnection();
-        $select = $connection->select()
-            ->from($this->_getTable('catalog_product_relation'), 'parent_id')
-            ->where('child_id IN(?)', $childIds);
-
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
+        $select = $connection->select()->from(
+            ['cpe' => $this->_getTable('catalog_product_entity')],
+            'entity_id'
+        )->join(
+            ['relation' => $this->_getTable('catalog_product_relation')],
+            'relation.parent_id = cpe.' . $linkField
+        )->where('child_id IN(?)', $childIds);
         return $connection->fetchCol($select);
     }
 
@@ -230,7 +244,8 @@ protected function _reindexRows($productIds = [])
         if (!is_array($productIds)) {
             $productIds = [$productIds];
         }
-
+        $parentIds = $this->getRelationsByChild($productIds);
+        $productIds = $parentIds ? array_unique(array_merge($parentIds, $productIds)) : $productIds;
         $this->getCacheCleaner()->clean($productIds, function () use ($productIds) {
             $this->doReindex($productIds);
         });
@@ -248,13 +263,10 @@ private function doReindex($productIds = [])
     {
         $connection = $this->_getConnection();
 
-        $parentIds = $this->getRelationsByChild($productIds);
-        $processIds = $parentIds ? array_merge($parentIds, $productIds) : $productIds;
-
         // retrieve product types by processIds
         $select = $connection->select()
             ->from($this->_getTable('catalog_product_entity'), ['entity_id', 'type_id'])
-            ->where('entity_id IN(?)', $processIds);
+            ->where('entity_id IN(?)', $productIds);
         $pairs = $connection->fetchPairs($select);
 
         $byType = [];

app/code/Magento/CatalogInventory/Model/Plugin/ReindexUpdatedProducts.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogInventory\Model\Plugin;
+
+use Magento\Catalog\Model\Product\Action as ProductAction;
+
+/**
+ * Plugin for Magento\Catalog\Model\Product\Action
+ */
+class ReindexUpdatedProducts
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+     */
+    private $indexerProcessor;
+
+    /**
+     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor  $indexerProcessor
+     */
+    public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Processor $indexerProcessor)
+    {
+        $this->indexerProcessor = $indexerProcessor;
+    }
+
+    /**
+     * Reindex on product attribute mass change
+     *
+     * @param ProductAction $subject
+     * @param ProductAction $action
+     * @param array $productIds
+     * @return ProductAction
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterUpdateAttributes(
+        ProductAction $subject,
+        ProductAction $action,
+        $productIds
+    ) {
+        $this->indexerProcessor->reindexList(array_unique($productIds));
+        return $action;
+    }
+}

app/code/Magento/CatalogInventory/etc/di.xml

@@ -78,6 +78,9 @@
     <type name="Magento\Catalog\Model\Product">
         <plugin name="catalogInventoryAfterLoad" type="Magento\CatalogInventory\Model\Plugin\AfterProductLoad"/>
     </type>
+    <type name="Magento\Catalog\Model\Product\Action">
+        <plugin name="ReindexUpdatedProducts" type="Magento\CatalogInventory\Model\Plugin\ReindexUpdatedProducts"/>
+    </type>
     <type name="Magento\CatalogInventory\Setup\UpgradeData">
         <arguments>
             <argument name="indexerProcessor" xsi:type="object">Magento\CatalogInventory\Model\Indexer\Stock\Processor</argument>

app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd case creation interface
+ *
+ * Interface of service for new Signifyd case creation and registering it on Magento side.
+ * Implementation should send request to Signifyd API and create new entity in Magento.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface CaseCreationServiceInterface
+{
+    /**
+     * Create new case for order with specified id.
+     *
+     * @param int $orderId
+     * @return bool
+     * @throws \Magento\Framework\Exception\NotFoundException If order does not exists
+     * @throws \Magento\Framework\Exception\AlreadyExistsException If case for $orderId already exists
+     * @since 100.2.0
+     */
+    public function createForOrder($orderId);
+}

app/code/Magento/Signifyd/Api/CaseManagementInterface.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd management interface
+ * Allows to performs operations with Signifyd cases.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface CaseManagementInterface
+{
+    /**
+     * Creates new Case entity linked to order id.
+     *
+     * @param int $orderId
+     * @return \Magento\Signifyd\Api\Data\CaseInterface
+     * @throws \Magento\Framework\Exception\NotFoundException If order does not exists
+     * @throws \Magento\Framework\Exception\AlreadyExistsException If case for $orderId already exists
+     * @since 100.2.0
+     */
+    public function create($orderId);
+
+    /**
+     * Gets Case entity associated with order id.
+     *
+     * @param int $orderId
+     * @return \Magento\Signifyd\Api\Data\CaseInterface|null
+     * @since 100.2.0
+     */
+    public function getByOrderId($orderId);
+}

app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd Case repository interface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface CaseRepositoryInterface
+{
+    /**
+     * Saves case entity.
+     *
+     * @param \Magento\Signifyd\Api\Data\CaseInterface $case
+     * @return \Magento\Signifyd\Api\Data\CaseInterface
+     * @since 100.2.0
+     */
+    public function save(\Magento\Signifyd\Api\Data\CaseInterface $case);
+
+    /**
+     * Gets case entity by order id.
+     *
+     * @param int $id
+     * @return \Magento\Signifyd\Api\Data\CaseInterface
+     * @since 100.2.0
+     */
+    public function getById($id);
+
+    /**
+     * Gets entity by Signifyd case id.
+     *
+     * @param int $caseId
+     * @return \Magento\Signifyd\Api\Data\CaseInterface|null
+     * @since 100.2.0
+     */
+    public function getByCaseId($caseId);
+
+    /**
+     * Deletes case entity.
+     *
+     * @param \Magento\Signifyd\Api\Data\CaseInterface $case
+     * @return bool
+     * @since 100.2.0
+     */
+    public function delete(\Magento\Signifyd\Api\Data\CaseInterface $case);
+
+    /**
+     * Gets list of case entities.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Signifyd\Api\Data\CaseSearchResultsInterface
+     * @since 100.2.0
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+}