#27952: missing store_name in GraphQL resolver - added requested changes

Author: sasha19957099

app/code/Magento/Store/Api/Data/StoreConfigInterface.php

@@ -269,19 +269,4 @@ public function getExtensionAttributes();
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
     );
-
-    /**
-     * Get store code
-     *
-     * @return string
-     */
-    public function getStoreName();
-
-    /**
-     * Set store name
-     *
-     * @param string $storeName
-     * @return $this
-     */
-    public function setStoreName(string $storeName);
 }

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

@@ -29,7 +29,6 @@ class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implem
     const KEY_SECURE_BASE_LINK_URL = 'secure_base_link_url';
     const KEY_SECURE_BASE_STATIC_URL = 'secure_base_static_url';
     const KEY_SECURE_BASE_MEDIA_URL = 'secure_base_media_url';
-    const KEY_STORE_NAME = 'store_name';
 
     /**
      * Get store id
@@ -388,25 +387,4 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
-
-    /**
-     * Get store code
-     *
-     * @return string
-     */
-    public function getStoreName()
-    {
-        return $this->_get(self::KEY_STORE_NAME);
-    }
-
-    /**
-     * Set store name
-     *
-     * @param string $storeName
-     * @return $this
-     */
-    public function setStoreName(string $storeName)
-    {
-        return $this->setData(self::KEY_STORE_NAME, $storeName);
-    }
 }

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

@@ -89,8 +89,7 @@ protected function getStoreConfig($store)
 
         $storeConfig->setId($store->getId())
             ->setCode($store->getCode())
-            ->setWebsiteId($store->getWebsiteId())
-            ->setStoreName($store->getName());
+            ->setWebsiteId($store->getWebsiteId());
 
         foreach ($this->configPaths as $methodName => $configPath) {
             $configValue = $this->scopeConfig->getValue(

app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php

@@ -87,9 +87,6 @@ protected function getStoreMock(array $storeConfig)
         $storeMock->expects($this->once())
             ->method('getWebsiteId')
             ->willReturn($storeConfig['website_id']);
-        $storeMock->expects($this->any())
-            ->method('getName')
-            ->willReturn($storeConfig['store_name']);
 
         $urlMap = [
             [UrlInterface::URL_TYPE_WEB, false, $storeConfig['base_url']],
@@ -148,7 +145,6 @@ public function testGetStoreConfigs()
         $baseCurrencyCode = 'USD';
         $defaultDisplayCurrencyCode = 'GBP';
         $weightUnit = 'lbs';
-        $storeName = 'Default Store View';
 
         $storeMocks = [];
         $storeConfigs = [
@@ -163,7 +159,6 @@ public function testGetStoreConfigs()
             'secure_base_static_url' => $secureBaseStaticUrl,
             'base_media_url' => $baseMediaUrl,
             'secure_base_media_url' => $secureBaseMediaUrl,
-            'store_name' => $storeName,
         ];
         $storeMocks[] = $this->getStoreMock($storeConfigs);
 
@@ -210,7 +205,6 @@ public function testGetStoreConfigs()
         $this->assertEquals($secureBaseStaticUrl, $result[0]->getSecureBaseStaticUrl());
         $this->assertEquals($baseMediaUrl, $result[0]->getBaseMediaUrl());
         $this->assertEquals($secureBaseMediaUrl, $result[0]->getSecureBaseMediaUrl());
-        $this->assertEquals($storeName, $result[0]->getStoreName());
 
         $this->assertEquals($timeZone, $result[0]->getTimezone());
         $this->assertEquals($locale, $result[0]->getLocale());

app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php

@@ -56,8 +56,8 @@ public function __construct(
     public function getStoreConfigData(StoreInterface $store): array
     {
         return array_merge(
+            $this->getBaseConfigData($store),
             $this->getExtendedConfigData((int)$store->getId()),
-            $this->getBaseConfigData($store)
         );
     }
 
@@ -88,7 +88,7 @@ private function getBaseConfigData(StoreInterface $store) : array
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
             'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
-            'store_name' => $storeConfig->getStoreName()
+            'store_name' => $store->getName()
         ];
     }
 

app/code/Magento/StoreGraphQl/etc/graphql/di.xml

@@ -23,11 +23,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
-        <arguments>
-            <argument name="extendedConfigData" xsi:type="array">
-                <item name="store_name" xsi:type="string">store/information/name</item>
-            </argument>
-        </arguments>
-    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php

@@ -91,6 +91,6 @@ public function testGetStoreConfig()
             $response['storeConfig']['secure_base_static_url']
         );
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
-        $this->assertEquals($storeConfig->getStoreName(), $response['storeConfig']['store_name']);
+        $this->assertEquals($store->getName(), $response['storeConfig']['store_name']);
     }
 }