MAGETWO-89238: [Sales email] Disabled invoice emails produce performance issue

Author: RuslanKostiv1

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

@@ -37,8 +37,6 @@ public function execute()
         try {
             $model->delete();
 
-            //$this->_eventManager->dispatch('store_delete', ['store' => $model]);
-
             $this->messageManager->addSuccess(__('You deleted the store view.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {

app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php

@@ -46,7 +46,6 @@ private function processWebsiteSave($postData)
      */
     private function processStoreSave($postData)
     {
-        //$eventName = 'store_edit';
         /** @var \Magento\Store\Model\Store $storeModel */
         $storeModel = $this->_objectManager->create(\Magento\Store\Model\Store::class);
         $postData['store']['name'] = $this->filterManager->removeTags($postData['store']['name']);
@@ -56,7 +55,6 @@ private function processStoreSave($postData)
         $storeModel->setData($postData['store']);
         if ($postData['store']['store_id'] == '') {
             $storeModel->setId(null);
-            //$eventName = 'store_add';
         }
         $groupModel = $this->_objectManager->create(
             \Magento\Store\Model\Group::class
@@ -70,8 +68,6 @@ private function processStoreSave($postData)
             );
         }
         $storeModel->save();
-        //$this->_objectManager->get(\Magento\Store\Model\StoreManager::class)->reinitStores();
-        //$this->_eventManager->dispatch($eventName, ['store' => $storeModel]);
         $this->messageManager->addSuccess(__('You saved the store view.'));
 
         return $postData;
@@ -102,7 +98,6 @@ private function processGroupSave($postData)
             );
         }
         $groupModel->save();
-        //$this->_eventManager->dispatch('store_group_save', ['group' => $groupModel]);
         $this->messageManager->addSuccess(__('You saved the store.'));
 
         return $postData;

app/code/Magento/Store/Model/Config/Importer/Processor/Create.php

@@ -218,9 +218,7 @@ private function createStores(array $items, array $data)
             $store->getResource()->addCommitCallback(function () use ($store, $group, $website) {
                 $store->setGroup($group);
                 $store->setWebsite($website);
-                $store->getResource()->save($store);
-
-                //$this->eventManager->dispatch('store_add', ['store' => $store]);
+                $store->save();
             });
         }
     }

app/code/Magento/Store/Model/Config/Importer/Processor/Delete.php

@@ -169,10 +169,6 @@ private function deleteStores(array $items)
         foreach ($items as $storeCode) {
             $store = $this->storeRepository->get($storeCode);
             $store->delete();
-//            $store->getResource()->delete($store);
-//            $store->getResource()->addCommitCallback(function () use ($store) {
-//                $this->eventManager->dispatch('store_delete', ['store' => $store]);
-//            });
         }
     }
 

app/code/Magento/Store/Model/Config/Importer/Processor/Update.php

@@ -177,10 +177,6 @@ private function updateStores(array $items, array $data)
             }
 
             $store->save();
-//            $store->getResource()->save($store);
-//            $store->getResource()->addCommitCallback(function () use ($store) {
-//                $this->eventManager->dispatch('store_edit', ['store' => $store]);
-//            });
         }
     }
 
@@ -216,10 +212,6 @@ private function updateGroups(array $items, array $data)
                 $group->setWebsite($website);
             }
             $group->save();
-//            $group->getResource()->save($group);
-//            $group->getResource()->addCommitCallback(function () use ($group) {
-//                $this->eventManager->dispatch('store_group_save', ['group' => $group]);
-//            });
         }
     }
 

app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php

@@ -175,7 +175,7 @@ public function testRun()
                     $updateData[ScopeInterface::SCOPE_STORES],
                 ],
             ]);
-        $this->websiteMock->expects($this->exactly(4))
+        $this->websiteMock->expects($this->atLeastOnce())
             ->method('getResource')
             ->willReturn($this->websiteResourceMock);
         $this->websiteMock->expects($this->once())
@@ -203,7 +203,7 @@ public function testRun()
         $this->groupFactoryMock->expects($this->exactly(3))
             ->method('create')
             ->willReturn($this->groupMock);
-        $this->groupMock->expects($this->exactly(5))
+        $this->groupMock->expects($this->atLeastOnce())
             ->method('getResource')
             ->willReturn($this->groupResourceMock);
         $this->groupMock->expects($this->once())
@@ -227,7 +227,7 @@ public function testRun()
         $this->storeFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->storeMock);
-        $this->storeMock->expects($this->exactly(4))
+        $this->storeMock->expects($this->atLeastOnce())
             ->method('getResource')
             ->willReturn($this->storeResourceMock);
         $this->storeMock->expects($this->once())
@@ -244,9 +244,9 @@ public function testRun()
         $this->storeMock->expects($this->once())
             ->method('setData')
             ->with($updateData[ScopeInterface::SCOPE_STORES]['test']);
-        $this->storeResourceMock->expects($this->once())
+        $this->storeMock->expects($this->once())
             ->method('save')
-            ->with($this->storeMock);
+            ->willReturnSelf();
 
         $this->model->run($data);
     }

dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php

@@ -107,13 +107,6 @@ private function prepareAdditionalStore()
             ->setGroupId($storeGroup->getId())
             ->save();
 
-        /* Refresh stores memory cache */
-        //$this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
-//        /* Dispatch "store_group_save" event */
-//        $this->objectManager->get(
-//            \Magento\Framework\Event\ManagerInterface::class
-//        )->dispatch('store_group_save', ['group' => $storeGroup]);
-
         return $store;
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php

@@ -42,15 +42,6 @@
     $store->save();
 }
 
-/* Refresh stores memory cache */
-//\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-//    \Magento\Store\Model\StoreManagerInterface::class
-//)->reinitStores();
-/* Dispatch "store_add" event */
-//\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-//    \Magento\Framework\Event\ManagerInterface::class
-//)->dispatch('store_add', ['store' => $store]);
-
 /** @var \Magento\Catalog\Model\Category $newCategory */
 $newCategory = $factory->create();
 $newCategory

dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites.php

@@ -19,7 +19,7 @@
 
 $website->save();
 
-//$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
+$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
 
 /** @var $product \Magento\Catalog\Model\Product */
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()

dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php

@@ -32,4 +32,4 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
 
-//$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
+$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();