#27952: missing store_name in GraphQL resolver - added store_name

Author: sasha19957099

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

@@ -7,7 +7,7 @@
 
 /**
  * StoreConfig interface
- *
+ * Interface for store config
  * @api
  * @since 100.0.2
  */
@@ -141,7 +141,7 @@ public function setWeightUnit($weightUnit);
     public function getBaseUrl();
 
     /**
-     * set base URL
+     * Set base URL
      *
      * @param string $baseUrl
      * @return $this
@@ -201,7 +201,7 @@ public function setBaseMediaUrl($baseMediaUrl);
     public function getSecureBaseUrl();
 
     /**
-     * set secure base URL
+     * Set secure base URL
      *
      * @param string $secureBaseUrl
      * @return $this
@@ -269,4 +269,19 @@ 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

@@ -7,7 +7,7 @@
 
 /**
  * Class StoreConfig
- *
+ * Allows to get and set store config values
  * @codeCoverageIgnore
  */
 class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implements
@@ -29,6 +29,7 @@ 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
@@ -188,7 +189,7 @@ public function getBaseUrl()
     }
 
     /**
-     * set base URL
+     * Set base URL
      *
      * @param string $baseUrl
      * @return $this
@@ -293,7 +294,7 @@ public function getSecureBaseUrl()
     }
 
     /**
-     * set secure base URL
+     * Set secure base URL
      *
      * @param string $secureBaseUrl
      * @return $this
@@ -367,7 +368,7 @@ public function setSecureBaseMediaUrl($secureBaseMediaUrl)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Store\Api\Data\StoreConfigExtensionInterface|null
      */
@@ -377,7 +378,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
      * @return $this
@@ -387,4 +388,25 @@ 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

@@ -5,6 +5,10 @@
  */
 namespace Magento\Store\Model\Service;
 
+/**
+ * Class StoreConfigManager
+ * Allows to get store config
+ */
 class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterface
 {
     /**
@@ -53,6 +57,8 @@ public function __construct(
     }
 
     /**
+     * Get store configs
+     *
      * @param string[] $storeCodes list of stores by store codes, will return all if storeCodes is not set
      * @return \Magento\Store\Api\Data\StoreConfigInterface[]
      */
@@ -71,6 +77,8 @@ public function getStoreConfigs(array $storeCodes = null)
     }
 
     /**
+     * Get store config
+     *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Store\Api\Data\StoreConfigInterface
      */
@@ -81,7 +89,8 @@ protected function getStoreConfig($store)
 
         $storeConfig->setId($store->getId())
             ->setCode($store->getCode())
-            ->setWebsiteId($store->getWebsiteId());
+            ->setWebsiteId($store->getWebsiteId())
+            ->setStoreName($store->getName());
 
         foreach ($this->configPaths as $methodName => $configPath) {
             $configValue = $this->scopeConfig->getValue(

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

@@ -87,6 +87,9 @@ 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']],
@@ -145,6 +148,7 @@ public function testGetStoreConfigs()
         $baseCurrencyCode = 'USD';
         $defaultDisplayCurrencyCode = 'GBP';
         $weightUnit = 'lbs';
+        $storeName = 'Default Store View';
 
         $storeMocks = [];
         $storeConfigs = [
@@ -159,6 +163,7 @@ public function testGetStoreConfigs()
             'secure_base_static_url' => $secureBaseStaticUrl,
             'base_media_url' => $baseMediaUrl,
             'secure_base_media_url' => $secureBaseMediaUrl,
+            'store_name' => $storeName,
         ];
         $storeMocks[] = $this->getStoreMock($storeConfigs);
 
@@ -205,6 +210,7 @@ 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

@@ -55,11 +55,10 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        $storeConfigData = array_merge(
-            $this->getBaseConfigData($store),
-            $this->getExtendedConfigData((int)$store->getId())
+        return array_merge(
+            $this->getExtendedConfigData((int)$store->getId()),
+            $this->getBaseConfigData($store)
         );
-        return $storeConfigData;
     }
 
     /**
@@ -72,7 +71,7 @@ private function getBaseConfigData(StoreInterface $store) : array
     {
         $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
 
-        $storeConfigData = [
+        return [
             'id' => $storeConfig->getId(),
             'code' => $storeConfig->getCode(),
             'website_id' => $storeConfig->getWebsiteId(),
@@ -88,9 +87,9 @@ private function getBaseConfigData(StoreInterface $store) : array
             'secure_base_url' => $storeConfig->getSecureBaseUrl(),
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
-            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
+            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
+            'store_name' => $storeConfig->getStoreName()
         ];
-        return $storeConfigData;
     }
 
     /**

composer.lock

@@ -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('Test Store', $response['storeConfig']['store_name']);
+        $this->assertEquals($storeConfig->getStoreName(), $response['storeConfig']['store_name']);
     }
 }