MC-39744: Expose group_id through storeConfig query

- fix single/current store config query

Author: cpartica

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

@@ -50,10 +50,15 @@ public function getStoreByWebsiteId($websiteId)
      * @param int $websiteId
      * @param bool $available
      * @param int|null $storeGroupId
+     * @param int|null $storeId
      * @return array
      */
-    public function getWebsiteStores(int $websiteId, bool $available = false, int $storeGroupId = null): array
-    {
+    public function getWebsiteStores(
+        int $websiteId,
+        bool $available = false,
+        int $storeGroupId = null,
+        int $storeId = null
+    ): array {
         $connection = $this->resource->getConnection();
         $storeTable = $this->resource->getTableName('store_website');
         $storeSelect = $connection->select()
@@ -87,6 +92,13 @@ public function getWebsiteStores(int $websiteId, bool $available = false, int $s
             );
         }
 
+        if ($storeId) {
+            $storeSelect = $storeSelect->where(
+                'store_table.store_id = ?',
+                $storeId
+            );
+        }
+
         if ($available) {
             $storeSelect = $storeSelect->where(
                 'store_table.is_active = 1'

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

@@ -65,8 +65,19 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        $defaultStoreConfig = $this->storeConfigManager->getStoreConfigs([$store->getCode()]);
-        return $this->prepareStoreConfigData(current($defaultStoreConfig), $store->getData());
+        $defaultWebsiteStore = $this->storeWebsiteRelation->getWebsiteStores(
+            (int) $store->getWebsiteId(),
+            true,
+            (int) $store->getStoreGroupId(),
+            (int) $store->getStoreId()
+        );
+        if (empty($defaultWebsiteStore)) {
+            return [];
+        }
+
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs([$store->getCode()]);
+
+        return $this->prepareStoreConfigData(current($storeConfigs), current($defaultWebsiteStore));
     }
 
     /**
@@ -101,15 +112,16 @@ public function getAvailableStoreConfig(int $websiteId, int $storeGroupId = null
      */
     private function prepareStoreConfigData(StoreConfigInterface $storeConfig, array $storeData): array
     {
-        $x=1;
         return array_merge([
             'id' => $storeConfig->getId(),
             'code' => $storeConfig->getCode(),
             'store_code' => $storeConfig->getCode(),
             'store_name' => $storeData['name'] ?? null,
             'store_sort_order' => $storeData['sort_order'] ?? null,
+            'is_default_store' => $storeData['default_store_id'] == $storeConfig->getId() ?? null,
             'store_group_code' => $storeData['store_group_code'] ?? null,
             'store_group_name' => $storeData['store_group_name'] ?? null,
+            'is_default_store_group' => $storeData['default_group_id'] == $storeData['group_id'] ?? null,
             'store_group_default_store_code' => $storeData['store_group_default_store_code'] ?? null,
             'website_id' => $storeConfig->getWebsiteId(),
             'website_code' => $storeData['website_code'] ?? null,

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

@@ -22,8 +22,10 @@ type StoreConfig @doc(description: "The type contains information about a store
     store_code: ID @doc(description: "The unique ID for a `StoreConfig` object representing store view and used as optional `Store` in Headers to select a current store view.")
     store_name : String @doc(description: "The name of the store view.")
     store_sort_order : Float @doc(description: "The store view sort order")
-    store_group_code : ID @doc(description: "The unique ID/Code for a store group of which the `StoreConfig` belongs")
-    store_group_name : String @doc(description: "The store group name for which the `StoreConfig` belongs")
+    is_default_store : Boolean @doc(description: "The default store for the store group")
+    store_group_code : ID @doc(description: "The unique ID/Code for a store group the `StoreConfig` belongs to")
+    store_group_name : String @doc(description: "The store group name the `StoreConfig` belongs to")
+    is_default_store_group : Boolean @doc(description: "The default store group for which the `StoreConfig` belongs")
     website_id : Int @deprecated(reason: "The field should not be used on the storefront") @doc(description: "The ID number assigned to the website store belongs")
     website_code : ID @doc(description: "The unique ID/Code for a website group of which the `StoreConfig` belongs")
     website_name : ID @doc(description: "The name of the website")