Merge branch 'MC-31470' of https://github.com/magento-tango/magento2ce into Tango-PR-02-25-2020-23

Author: Roman Lytvynenko

app/code/Magento/Customer/Model/Indexer/Processor.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Indexer;
+
+use Magento\Customer\Model\Customer;
+
+/**
+ * Customer indexer
+ */
+class Processor extends \Magento\Framework\Indexer\AbstractProcessor
+{
+    const INDEXER_ID = Customer::CUSTOMER_GRID_INDEXER_ID;
+}

app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php

@@ -6,6 +6,7 @@
 namespace Magento\CustomerImportExport\Model\Import;
 
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Customer\Model\Indexer\Processor;
 
 /**
  * Import entity customer combined model
@@ -148,6 +149,11 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      */
     protected $masterAttributeCode = 'email';
 
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -158,6 +164,7 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * @param \Magento\CustomerImportExport\Model\ResourceModel\Import\CustomerComposite\DataFactory $dataFactory
      * @param \Magento\CustomerImportExport\Model\Import\CustomerFactory $customerFactory
      * @param \Magento\CustomerImportExport\Model\Import\AddressFactory $addressFactory
+     * @param Processor $indexerProcessor
      * @param array $data
      * @throws \Magento\Framework\Exception\LocalizedException
      *
@@ -173,6 +180,7 @@ public function __construct(
         \Magento\CustomerImportExport\Model\ResourceModel\Import\CustomerComposite\DataFactory $dataFactory,
         \Magento\CustomerImportExport\Model\Import\CustomerFactory $customerFactory,
         \Magento\CustomerImportExport\Model\Import\AddressFactory $addressFactory,
+        Processor $indexerProcessor,
         array $data = []
     ) {
         parent::__construct($string, $scopeConfig, $importFactory, $resourceHelper, $resource, $errorAggregator, $data);
@@ -230,6 +238,7 @@ public function __construct(
         } else {
             $this->_nextCustomerId = $resourceHelper->getNextAutoincrement($this->_customerEntity->getEntityTable());
         }
+        $this->indexerProcessor = $indexerProcessor;
     }
 
     /**
@@ -273,11 +282,12 @@ protected function _importData()
         $this->countItemsCreated += $this->_customerEntity->getCreatedItemsCount();
         $this->countItemsUpdated += $this->_customerEntity->getUpdatedItemsCount();
         $this->countItemsDeleted += $this->_customerEntity->getDeletedItemsCount();
-
         if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE) {
-            return $result && $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->importData();
+            $result = $result && $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->importData();
+        }
+        if ($result) {
+            $this->indexerProcessor->markIndexerAsInvalid();
         }
-
         return $result;
     }
 

app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php

@@ -15,7 +15,7 @@
 use Magento\ImportExport\Model\Import\Source\Csv;
 
 /**
- * Customer composite test
+ * The test for Customer composite model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -88,6 +88,12 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
      */
     protected $errorFactory;
 
+    /**
+     * @var \Magento\Customer\Model\Indexer\Processor
+     * |\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $indexerProcessor;
+
     /**
      * Expected prepared data after method CustomerComposite::_prepareRowForDb
      *
@@ -141,6 +147,7 @@ protected function setUp()
             ->getMock();
 
         $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->indexerProcessor = $this->createMock(\Magento\Customer\Model\Indexer\Processor::class);
     }
 
     /**
@@ -159,6 +166,7 @@ protected function _createModelMock($data)
             $this->_dataFactory,
             $this->_customerFactory,
             $this->_addressFactory,
+            $this->indexerProcessor,
             $data
         );
     }