magento/magento2#28569:Multi-store: Missing store codes in relation t…

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

@@ -27,6 +27,8 @@ public function __construct(ResourceConnection $resource)
     }
 
     /**
+     * Get store by website id
+     *
      * @param int $websiteId
      * @return array
      */
@@ -41,4 +43,29 @@ public function getStoreByWebsiteId($websiteId)
         $data = $connection->fetchCol($storeSelect);
         return $data;
     }
+
+    /**
+     * Get website store data
+     *
+     * @param int $websiteId
+     * @param bool $available
+     * @return array
+     */
+    public function getWebsiteStores(int $websiteId, bool $available = false): array
+    {
+        $connection = $this->resource->getConnection();
+        $storeTable = $this->resource->getTableName('store');
+        $storeSelect = $connection->select()->from($storeTable)->where(
+            'website_id = ?',
+            $websiteId
+        );
+
+        if ($available) {
+            $storeSelect = $storeSelect->where(
+                'is_active = 1'
+            );
+        }
+
+        return $connection->fetchAll($storeSelect);
+    }
 }

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

@@ -3,27 +3,33 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Service;
 
-/**
- * Allows to get store config
- */
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\Data\StoreConfigInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Data\StoreConfig;
+use Magento\Store\Model\Data\StoreConfigFactory;
+use Magento\Store\Model\ResourceModel\Store\CollectionFactory;
+use Magento\Store\Model\Store;
+
 class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterface
 {
     /**
-     * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
+     * @var CollectionFactory
      */
     protected $storeCollectionFactory;
 
     /**
-     * @var \Magento\Store\Model\Data\StoreConfigFactory
+     * @var StoreConfigFactory
      */
     protected $storeConfigFactory;
 
     /**
      * Core store config
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $scopeConfig;
 
@@ -41,25 +47,25 @@ class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterfa
     ];
 
     /**
-     * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\Data\StoreConfigFactory $storeConfigFactory
+     * @param CollectionFactory $storeCollectionFactory
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreConfigFactory $storeConfigFactory
      */
     public function __construct(
-        \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\Data\StoreConfigFactory $storeConfigFactory
+        CollectionFactory $storeCollectionFactory,
+        ScopeConfigInterface $scopeConfig,
+        StoreConfigFactory $storeConfigFactory
     ) {
         $this->storeCollectionFactory = $storeCollectionFactory;
         $this->scopeConfig = $scopeConfig;
         $this->storeConfigFactory = $storeConfigFactory;
     }
 
     /**
-     * Get store configs
+     * Get store configurations
      *
      * @param string[] $storeCodes list of stores by store codes, will return all if storeCodes is not set
-     * @return \Magento\Store\Api\Data\StoreConfigInterface[]
+     * @return StoreConfigInterface[]
      */
     public function getStoreConfigs(array $storeCodes = null)
     {
@@ -76,14 +82,14 @@ public function getStoreConfigs(array $storeCodes = null)
     }
 
     /**
-     * Get store config
+     * Get store specific configs
      *
-     * @param \Magento\Store\Model\Store $store
-     * @return \Magento\Store\Api\Data\StoreConfigInterface
+     * @param Store|StoreInterface $store
+     * @return StoreConfigInterface
      */
     protected function getStoreConfig($store)
     {
-        /** @var \Magento\Store\Model\Data\StoreConfig $storeConfig */
+        /** @var StoreConfig $storeConfig */
         $storeConfig = $this->storeConfigFactory->create();
 
         $storeConfig->setId($store->getId())

app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\StoreGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider;
+
+/**
+ * AvailableStores page field resolver, used for GraphQL request processing.
+ */
+class AvailableStoresResolver implements ResolverInterface
+{
+    /**
+     * @var StoreConfigDataProvider
+     */
+    private $storeConfigDataProvider;
+
+    /**
+     * @param StoreConfigDataProvider $storeConfigsDataProvider
+     */
+    public function __construct(
+        StoreConfigDataProvider $storeConfigsDataProvider
+    ) {
+        $this->storeConfigDataProvider = $storeConfigsDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        return $this->storeConfigDataProvider->getAvailableStoreConfig(
+            (int)$context->getExtensionAttributes()->getStore()->getWebsiteId()
+        );
+    }
+}

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

@@ -8,7 +8,9 @@
 namespace Magento\StoreGraphQl\Model\Resolver\Store;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Model\ResourceModel\StoreWebsiteRelation;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -32,19 +34,27 @@ class StoreConfigDataProvider
      */
     private $extendedConfigData;
 
+    /**
+     * @var StoreWebsiteRelation
+     */
+    private $storeWebsiteRelation;
+
     /**
      * @param StoreConfigManagerInterface $storeConfigManager
      * @param ScopeConfigInterface $scopeConfig
+     * @param StoreWebsiteRelation $storeWebsiteRelation
      * @param array $extendedConfigData
      */
     public function __construct(
         StoreConfigManagerInterface $storeConfigManager,
         ScopeConfigInterface $scopeConfig,
+        StoreWebsiteRelation $storeWebsiteRelation,
         array $extendedConfigData = []
     ) {
         $this->storeConfigManager = $storeConfigManager;
         $this->scopeConfig = $scopeConfig;
         $this->extendedConfigData = $extendedConfigData;
+        $this->storeWebsiteRelation = $storeWebsiteRelation;
     }
 
     /**
@@ -55,23 +65,42 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        return array_merge(
-            $this->getBaseConfigData($store),
-            $this->getExtendedConfigData((int)$store->getId())
-        );
+        $defaultStoreConfig = $this->storeConfigManager->getStoreConfigs([$store->getCode()]);
+        return $this->prepareStoreConfigData(current($defaultStoreConfig), $store->getName());
     }
 
     /**
-     * Get base config data
+     * Get available website stores
      *
-     * @param StoreInterface $store
+     * @param int $websiteId
      * @return array
      */
-    private function getBaseConfigData(StoreInterface $store) : array
+    public function getAvailableStoreConfig(int $websiteId): array
     {
-        $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
+        $websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, true);
+        $storeCodes = array_column($websiteStores, 'code');
+
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs($storeCodes);
+        $storesConfigData = [];
+
+        foreach ($storeConfigs as $storeConfig) {
+            $key = array_search($storeConfig->getCode(), array_column($websiteStores, 'code'), true);
+            $storesConfigData[] = $this->prepareStoreConfigData($storeConfig, $websiteStores[$key]['name']);
+        }
 
-        return [
+        return $storesConfigData;
+    }
+
+    /**
+     * Prepare store config data
+     *
+     * @param StoreConfigInterface $storeConfig
+     * @param string $storeName
+     * @return array
+     */
+    private function prepareStoreConfigData(StoreConfigInterface $storeConfig, string $storeName): array
+    {
+        return array_merge([
             'id' => $storeConfig->getId(),
             'code' => $storeConfig->getCode(),
             'website_id' => $storeConfig->getWebsiteId(),
@@ -82,14 +111,14 @@ private function getBaseConfigData(StoreInterface $store) : array
             'weight_unit' => $storeConfig->getWeightUnit(),
             'base_url' => $storeConfig->getBaseUrl(),
             'base_link_url' => $storeConfig->getBaseLinkUrl(),
-            'base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
+            'base_static_url' => $storeConfig->getBaseStaticUrl(),
             'base_media_url' => $storeConfig->getBaseMediaUrl(),
             'secure_base_url' => $storeConfig->getSecureBaseUrl(),
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
             'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
-            'store_name' => $store->getName()
-        ];
+            'store_name' => $storeName,
+        ], $this->getExtendedConfigData((int)$storeConfig->getId()));
     }
 
     /**
@@ -98,7 +127,7 @@ private function getBaseConfigData(StoreInterface $store) : array
      * @param int $storeId
      * @return array
      */
-    private function getExtendedConfigData(int $storeId)
+    private function getExtendedConfigData(int $storeId): array
     {
         $extendedConfigData = [];
         foreach ($this->extendedConfigData as $key => $path) {

app/code/Magento/StoreGraphQl/etc/schema.graphqls

@@ -2,6 +2,7 @@
 # See COPYING.txt for license details.
 type Query {
     storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query") @cache(cacheable: false)
+    availableStores: [StoreConfig] @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\AvailableStoresResolver") @doc(description: "Get a list of available store views and their config information.")
 }
 
 type Website @doc(description: "Website is deprecated because it is should not be used on storefront. The type contains information about a website") {