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

Author: RuslanKostiv1

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

@@ -168,10 +168,11 @@ private function deleteStores(array $items)
 
         foreach ($items as $storeCode) {
             $store = $this->storeRepository->get($storeCode);
-            $store->getResource()->delete($store);
-            $store->getResource()->addCommitCallback(function () use ($store) {
-                $this->eventManager->dispatch('store_delete', ['store' => $store]);
-            });
+            $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

@@ -176,10 +176,11 @@ private function updateStores(array $items, array $data)
                 $store->setGroup($group);
             }
 
-            $store->getResource()->save($store);
-            $store->getResource()->addCommitCallback(function () use ($store) {
-                $this->eventManager->dispatch('store_edit', ['store' => $store]);
-            });
+            $store->save();
+//            $store->getResource()->save($store);
+//            $store->getResource()->addCommitCallback(function () use ($store) {
+//                $this->eventManager->dispatch('store_edit', ['store' => $store]);
+//            });
         }
     }
 
@@ -214,11 +215,11 @@ private function updateGroups(array $items, array $data)
             if ($website && $website->getId() != $group->getWebsiteId()) {
                 $group->setWebsite($website);
             }
-
-            $group->getResource()->save($group);
-            $group->getResource()->addCommitCallback(function () use ($group) {
-                $this->eventManager->dispatch('store_group_save', ['group' => $group]);
-            });
+            $group->save();
+//            $group->getResource()->save($group);
+//            $group->getResource()->addCommitCallback(function () use ($group) {
+//                $this->eventManager->dispatch('store_group_save', ['group' => $group]);
+//            });
         }
     }
 

app/code/Magento/Store/Model/Group.php

@@ -414,8 +414,12 @@ public function beforeDelete()
      */
     public function afterDelete()
     {
-        $result = parent::afterDelete();
         $this->_storeManager->reinitStores();
+        $group = $this;
+        $this->getResource()->addCommitCallback(function () use ($group) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($this->_eventPrefix . '_delete', ['group' => $group]);
+        });
 
         if ($this->getId() === $this->getWebsite()->getDefaultGroupId()) {
             $ids = $this->getWebsite()->getGroupIds();
@@ -428,7 +432,7 @@ public function afterDelete()
             $this->getWebsite()->setDefaultGroupId($defaultId);
             $this->getWebsite()->save();
         }
-        return $result;
+        return parent::afterDelete();
     }
 
     /**
@@ -437,8 +441,11 @@ public function afterDelete()
     public function afterSave()
     {
         $this->_storeManager->reinitStores();
-        $this->eventManager->dispatch($this->_eventPrefix . '_save', ['group' => $this]);
-
+        $group = $this;
+        $this->getResource()->addCommitCallback(function () use ($group) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($this->_eventPrefix . '_save', ['group' => $group]);
+        });
         return parent::afterSave();
     }
 

app/code/Magento/Store/Model/Store.php

@@ -1062,7 +1062,11 @@ public function afterSave()
         } else {
             $event = $this->_eventPrefix . '_edit';
         }
-        $this->eventManager->dispatch($event, ['store' => $this]);
+        $store  = $this;
+        $this->getResource()->addCommitCallback(function () use ($event, $store) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($event, ['store' => $store]);
+        });
         return parent::afterSave();
     }
 
@@ -1258,7 +1262,11 @@ public function afterDelete()
             $this->getGroup()->setDefaultStoreId($defaultId);
             $this->getGroup()->save();
         }
-
+        $store = $this;
+        $this->getResource()->addCommitCallback(function () use ($store) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($this->_eventPrefix . '_delete', ['store' => $store]);
+        });
         return $this;
     }