MC-36456: union implementation

Author: cpartica

dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php renamed to dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/TestUnion.php

@@ -10,27 +10,12 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
 
 /**
- * Resolver for Union Type 1
+ * Resolver for Union type TestUnion
  */
-class UnionType1 implements ResolverInterface
+class TestUnion implements ResolverInterface
 {
-    /**
-     * @var CollectionFactoryInterface
-     */
-    private $collectionFactory;
-
-    /**
-     * @param CollectionFactoryInterface $collectionFactory
-     */
-    public function __construct(
-        CollectionFactoryInterface $collectionFactory
-    ) {
-        $this->collectionFactory = $collectionFactory;
-    }
-
     /**
      * @inheritDoc
      */

dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls

@@ -3,7 +3,7 @@
 
 type Query {
     testItem(id: Int!) : Item @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\Item")
-    testUnion: UnionType1 @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionType1")
+    testUnion: TestUnion @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\TestUnion")
 }
 
 type Mutation {
@@ -20,7 +20,7 @@ type MutationItem {
     name: String
 }
 
-union UnionType1 @doc(description: "some kind of union") @typeResolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionTypeResolver")  =
+union TestUnion @doc(description: "some kind of union") @typeResolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionTypeResolver")  =
     TypeCustom1 | TypeCustom2
 
 type TypeCustom1 {

dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php

@@ -107,11 +107,6 @@ public function testQueryTestUnionResults()
 
         $query = <<<QUERY
 {
-    testItem(id: {$id})
-    {
-        item_id
-        name
-    }
     testUnion {
       __typename
       ... on TypeCustom1 {
@@ -125,12 +120,6 @@ public function testQueryTestUnionResults()
 QUERY;
 
         $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('testItem', $response);
-        $testItem = $response['testItem'];
-        $this->assertArrayHasKey('item_id', $testItem);
-        $this->assertArrayHasKey('name', $testItem);
-        $this->assertEquals(1, $testItem['item_id']);
-        $this->assertEquals('itemName', $testItem['name']);
 
         $this->assertArrayHasKey('testUnion', $response);
         $testUnion = $response['testUnion'];

lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php

@@ -92,15 +92,18 @@ public function __construct(
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType): array
     {
-        $typeConfig = [
-            'fields' => function () use ($configElement, $outputType) {
-                $fieldsConfig = [];
-                foreach ($configElement->getFields() as $field) {
-                    $fieldsConfig[$field->getName()] = $this->getFieldConfig($configElement, $outputType, $field);
+        $typeConfig = [];
+        if ($configElement instanceof TypeInterface) {
+            $typeConfig = [
+                'fields' => function () use ($configElement, $outputType) {
+                    $fieldsConfig = [];
+                    foreach ($configElement->getFields() as $field) {
+                        $fieldsConfig[$field->getName()] = $this->getFieldConfig($configElement, $outputType, $field);
+                    }
+                    return $fieldsConfig;
                 }
-                return $fieldsConfig;
-            }
-        ];
+            ];
+        }
         return $typeConfig;
     }
 

lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php

@@ -42,6 +42,6 @@ public function format(ConfigElementInterface $configElement, OutputTypeInterfac
             $formattedConfig[] = $formatter->format($configElement, $outputType);
         }
 
-        return  array_merge($defaultConfig, ...$formattedConfig);
+        return array_merge($defaultConfig, ...$formattedConfig);
     }
 }

lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php

@@ -330,13 +330,14 @@ private static function getModuleNameForRelevantFile(string $file): string
      */
     private function addModuleNameToTypes(array $source, string $filePath): array
     {
-        foreach ($source as $typeName => $type) {
-            if ((!isset($type['module']))
-                && (($type['type'] ?? '' === InterfaceType::GRAPHQL_INTERFACE && isset($type['typeResolver']))
-                    || isset($type['implements'])
-                )
-            ) {
-                $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
+        foreach ($source as $typeName => $typeDefinition) {
+            if (!isset($typeDefinition['module'])) {
+                $hasTypeResolver = (bool)$typeDefinition['typeResolver'] ?? false;
+                $hasImplements = (bool)$typeDefinition['implements'] ?? false;
+                $typeDefinition = (bool)$typeDefinition['type'] ?? false;
+                if ((($typeDefinition === InterfaceType::GRAPHQL_INTERFACE && $hasTypeResolver) || $hasImplements)) {
+                    $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
+                }
             }
         }