MC-18070: Website-level admin user edits to themes impacts grid for other admin users

Author: dhorytskyi

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

@@ -7,28 +7,48 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeTreeProviderInterface;
-use Magento\Store\Model\Group;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\Website;
+use Magento\Store\Api\GroupRepositoryInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 
+/**
+ * Class for building scopes tree.
+ */
 class ScopeTreeProvider implements ScopeTreeProviderInterface
 {
     /**
-     * @var StoreManagerInterface
+     * @var WebsiteRepositoryInterface
+     */
+    private $websiteRepository;
+
+    /**
+     * @var GroupRepositoryInterface
+     */
+    private $groupRepository;
+
+    /**
+     * @var StoreRepositoryInterface
      */
-    protected $storeManager;
+    private $storeRepository;
 
     /**
-     * @param StoreManagerInterface $storeManager
+     * @param WebsiteRepositoryInterface $websiteRepository
+     * @param GroupRepositoryInterface $groupRepository
+     * @param StoreRepositoryInterface $storeRepository
      */
     public function __construct(
-        StoreManagerInterface $storeManager
+        WebsiteRepositoryInterface $websiteRepository,
+        GroupRepositoryInterface $groupRepository,
+        StoreRepositoryInterface $storeRepository
     ) {
-        $this->storeManager = $storeManager;
+        $this->websiteRepository = $websiteRepository;
+        $this->groupRepository = $groupRepository;
+        $this->storeRepository = $storeRepository;
     }
 
     /**
      * @inheritdoc
+     * @return array
      */
     public function get()
     {
@@ -38,24 +58,37 @@ public function get()
             'scopes' => [],
         ];
 
+        $groups = [];
+        foreach ($this->groupRepository->getList() as $group) {
+            $groups[$group->getWebsiteId()][] = $group;
+        }
+        $stores = [];
+        foreach ($this->storeRepository->getList() as $store) {
+            $stores[$store->getStoreGroupId()][] = $store;
+        }
+
         /** @var Website $website */
-        foreach ($this->storeManager->getWebsites() as $website) {
+        foreach ($this->websiteRepository->getList() as $website) {
+            if (!$website->getId()) {
+                continue;
+            }
+
             $websiteScope = [
                 'scope' => ScopeInterface::SCOPE_WEBSITES,
                 'scope_id' => $website->getId(),
                 'scopes' => [],
             ];
 
             /** @var Group $group */
-            foreach ($website->getGroups() as $group) {
+            foreach ($groups[$website->getId()] as $group) {
                 $groupScope = [
                     'scope' => ScopeInterface::SCOPE_GROUP,
                     'scope_id' => $group->getId(),
                     'scopes' => [],
                 ];
 
                 /** @var Store $store */
-                foreach ($group->getStores() as $store) {
+                foreach ($stores[$group->getId()] as $store) {
                     $storeScope = [
                         'scope' => ScopeInterface::SCOPE_STORES,
                         'scope_id' => $store->getId(),
@@ -67,6 +100,7 @@ public function get()
             }
             $defaultScope['scopes'][] = $websiteScope;
         }
+
         return $defaultScope;
     }
 }

app/code/Magento/Store/Test/Unit/Model/ScopeTreeProviderTest.php

@@ -5,9 +5,12 @@
  */
 namespace Magento\Store\Test\Unit\Model;
 
-use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Api\Data\GroupInterface;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Api\GroupRepositoryInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\Store\Model\Group;
 use Magento\Store\Model\ScopeTreeProvider;
 use Magento\Store\Model\Store;
@@ -16,20 +19,42 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\Website;
 
+/**
+ * @covers \Magento\Store\Model\ScopeTreeProvider
+ */
 class ScopeTreeProviderTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var ScopeTreeProvider */
-    protected $model;
+    /**
+     * @var ScopeTreeProvider
+     */
+    private $model;
 
-    /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManagerMock;
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|WebsiteRepositoryInterface
+     */
+    private $websiteRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|GroupRepositoryInterface
+     */
+    private $groupRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|StoreRepositoryInterface
+     */
+    private $storeRepositoryMock;
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->getMockForAbstractClass();
+        $this->websiteRepositoryMock = $this->createMock(WebsiteRepositoryInterface::class);
+        $this->groupRepositoryMock = $this->createMock(GroupRepositoryInterface::class);
+        $this->storeRepositoryMock = $this->createMock(StoreRepositoryInterface::class);
 
-        $this->model = new ScopeTreeProvider($this->storeManagerMock);
+        $this->model = new ScopeTreeProvider(
+            $this->websiteRepositoryMock,
+            $this->groupRepositoryMock,
+            $this->storeRepositoryMock
+        );
     }
 
     public function testGet()
@@ -58,40 +83,34 @@ public function testGet()
             'scopes' => [$websiteData],
         ];
 
-        /** @var Website|\PHPUnit_Framework_MockObject_MockObject $websiteMock */
-        $websiteMock = $this->getMockBuilder(\Magento\Store\Model\Website::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $websiteMock->expects($this->any())
+        $websiteMock = $this->createMock(WebsiteInterface::class);
+        $websiteMock->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($websiteId);
+        $this->websiteRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->willReturn([$websiteMock]);
 
-        /** @var Group|\PHPUnit_Framework_MockObject_MockObject $groupMock */
-        $groupMock = $this->getMockBuilder(\Magento\Store\Model\Group::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $groupMock->expects($this->any())
+        $groupMock = $this->createMock(GroupInterface::class);
+        $groupMock->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($groupId);
+        $groupMock->expects($this->atLeastOnce())
+            ->method('getWebsiteId')
+            ->willReturn($websiteId);
+        $this->groupRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->willReturn([$groupMock, $groupMock]);
 
-        /** @var Store|\PHPUnit_Framework_MockObject_MockObject $storeMock */
-        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $storeMock->expects($this->any())
+        $storeMock = $this->createMock(StoreInterface::class);
+        $storeMock->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($storeId);
-
-        $this->storeManagerMock->expects($this->any())
-            ->method('getWebsites')
-            ->willReturn([$websiteMock]);
-
-        $websiteMock->expects($this->any())
-            ->method('getGroups')
-            ->willReturn([$groupMock, $groupMock]);
-
-        $groupMock->expects($this->any())
-            ->method('getStores')
+        $storeMock->expects($this->atLeastOnce())
+            ->method('getStoreGroupId')
+            ->willReturn($groupId);
+        $this->storeRepositoryMock->expects($this->once())
+            ->method('getList')
             ->willReturn([$storeMock, $storeMock, $storeMock]);
 
         $this->assertEquals($result, $this->model->get());