[Fusion] Cleanup and modify tests (#8783)

Author: tobias-tengler

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/Partitioners/SelectionSetByTypePartitioner.cs

@@ -101,7 +101,10 @@ private void CollectSelections(
             return;
         }
 
-        var selectionsWithPath = GetSelectionsWithPath(context.FragmentPath, selections);
+        var selectionsWithPath = GetSelectionsWithPath(
+            context.FragmentPath,
+            selections,
+            context.SelectionSetIndexBuilder);
 
         if (type == context.SharedType)
         {
@@ -180,13 +183,21 @@ private void AddSelectionsForConcreteType(
 
     private static List<ISelectionNode> GetSelectionsWithPath(
         Stack<InlineFragmentNode> fragmentPath,
-        List<ISelectionNode> selections)
+        List<ISelectionNode> selections,
+        SelectionSetIndexBuilder indexBuilder)
     {
         var start = selections;
 
         foreach (var fragment in fragmentPath)
         {
-            start = [fragment.WithSelectionSet(new SelectionSetNode(start))];
+            var newSelectionSet = new SelectionSetNode(start);
+
+            if (!indexBuilder.IsRegistered(newSelectionSet))
+            {
+                indexBuilder.Register(newSelectionSet);
+            }
+
+            start = [fragment.WithSelectionSet(newSelectionSet)];
         }
 
         return start;

src/HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/GlobalObjectIdentificationTests.cs

@@ -4,7 +4,6 @@
 namespace HotChocolate.Fusion;
 
 // TODO:
-// - Conditional selections (on, on top of and below node field, also with conditional fragment)
 // - Selections on interface, all types of interfaces are on same subgraph and there's only node lookup
 public class GlobalObjectIdentificationTests : FusionTestBase
 {
@@ -389,7 +388,7 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               title: String!
             }
@@ -407,7 +406,7 @@ interface Node {
               id: ID!
             }
 
-            type Author implements Node @key(fields: "id") {
+            type Author implements Node {
               id: ID!
               username: String!
             }
@@ -455,7 +454,7 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               title: String!
             }
@@ -556,7 +555,7 @@ ... on Discussion {
         await MatchSnapshotAsync(gateway, request, result);
     }
 
-    [Fact]
+    [Fact(Skip = "This behavior is incorrect")]
     public async Task No_By_Id_Lookup_On_Best_Matching_Source_Schema()
     {
         // arrange
@@ -715,7 +714,7 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               title: String!
             }
@@ -768,7 +767,7 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               name: String
             }
@@ -785,7 +784,7 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               commentCount: Int
             }
@@ -837,13 +836,13 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               viewerRating: Float!
               product: Product
             }
 
-            type Product @key(fields: "id") {
+            type Product {
               id: ID!
             }
             """);
@@ -859,7 +858,7 @@ interface Node {
               id: ID!
             }
 
-            type Product implements Node @key(fields: "id") {
+            type Product implements Node {
               id: ID!
               name: String
             }
@@ -913,12 +912,12 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               product: Product
             }
 
-            type Product @key(fields: "id") {
+            type Product {
               id: ID!
             }
             """);
@@ -934,12 +933,12 @@ interface Node {
               id: ID!
             }
 
-            type Review implements Node @key(fields: "id") {
+            type Review implements Node {
               id: ID!
               product: Product
             }
 
-            type Product @key(fields: "id") {
+            type Product {
               id: ID!
             }
             """);
@@ -955,7 +954,7 @@ interface Node {
               id: ID!
             }
 
-            type Product implements Node @key(fields: "id") {
+            type Product implements Node {
               id: ID!
               name: String
             }
@@ -1013,12 +1012,12 @@ interface Node {
               id: ID!
             }
 
-            type Discussion implements Node @key(fields: "id") {
+            type Discussion implements Node {
               id: ID!
               product: Product
             }
 
-            type Product @key(fields: "id") {
+            type Product {
               id: ID!
             }
             """);
@@ -1034,12 +1033,12 @@ interface Node {
               id: ID!
             }
 
-            type Review implements Node @key(fields: "id") {
+            type Review implements Node {
               id: ID!
               product: Product
             }
 
-            type Product @key(fields: "id") {
+            type Product {
               id: ID!
             }
             """);
@@ -1055,7 +1054,7 @@ interface Node {
               id: ID!
             }
 
-            type Product implements Node @key(fields: "id") {
+            type Product implements Node {
               id: ID!
               name: String
             }
@@ -1118,13 +1117,13 @@ interface Votable {
               viewerCanVote: Boolean!
             }
 
-            type Discussion implements Node & Votable @key(fields: "id") {
+            type Discussion implements Node & Votable {
               id: ID!
               viewerCanVote: Boolean!
               viewerRating: Float!
             }
 
-            type Comment implements Node & Votable @key(fields: "id") {
+            type Comment implements Node & Votable {
               id: ID!
               viewerCanVote: Boolean!
             }
@@ -1177,13 +1176,13 @@ interface Votable {
               viewerCanVote: Boolean!
             }
 
-            type Discussion implements Node & Votable @key(fields: "id") {
+            type Discussion implements Node & Votable {
               id: ID!
               viewerCanVote: Boolean!
               viewerRating: Float!
             }
 
-            type Comment implements Node & Votable @key(fields: "id") {
+            type Comment implements Node & Votable {
               id: ID!
               viewerCanVote: Boolean!
             }
@@ -1239,18 +1238,18 @@ interface ProductList {
               products: [Product]
             }
 
-            type Item1 implements Node & ProductList @key(fields: "id") {
+            type Item1 implements Node & ProductList {
               id: ID!
               products: [Product]
             }
 
-            type Item2 implements Node & ProductList @key(fields: "id") {
+            type Item2 implements Node & ProductList {
               id: ID!
               products: [Product]
               singularProduct: Product
             }
 
-            type Product implements Node @key(fields: "id") {
+            type Product implements Node {
               id: ID!
             }
             """);
@@ -1266,7 +1265,7 @@ interface Node {
               id: ID!
             }
 
-            type Product implements Node @key(fields: "id") {
+            type Product implements Node {
               id: ID!
               name: String
             }
@@ -1301,7 +1300,7 @@ ... on Item2 {
               }
             }
             """,
-            variables: new Dictionary<string, object?> { ["id"] = /* Item1:1 */ "SXRlbTE6MQ==" });
+            variables: new Dictionary<string, object?> { ["id"] = /* Item2:1 */ "SXRlbTI6MQ==" });
 
         using var result = await client.PostAsync(
             request,
@@ -1330,17 +1329,17 @@ interface ProductList {
               products: [Product]
             }
 
-            type Item1 implements Node & ProductList @key(fields: "id") {
+            type Item1 implements Node & ProductList {
               id: ID!
               products: [Product]
             }
 
-            type Item2 implements Node & ProductList @key(fields: "id") {
+            type Item2 implements Node & ProductList {
               id: ID!
               products: [Product]
             }
 
-            type Product implements Node @key(fields: "id") {
+            type Product implements Node {
               id: ID!
             }
             """);
@@ -1356,7 +1355,7 @@ interface Node {
               id: ID!
             }
 
-            type Product implements Node @key(fields: "id") {
+            type Product implements Node {
               id: ID!
               name: String
             }
@@ -1394,4 +1393,86 @@ ... on ProductList {
         // assert
         await MatchSnapshotAsync(gateway, request, result);
     }
+
+    [Fact]
+    public async Task Node_Field_Selections_On_Interface_And_Concrete_Type_Both_Have_Same_Dependency()
+    {
+        // arrange
+        using var server1 = CreateSourceSchema(
+            "A",
+            """
+            type Query {
+              node(id: ID!): Node @lookup
+            }
+
+            interface Node {
+              id: ID!
+            }
+
+            interface Authorable {
+              author: Author
+            }
+
+            type Discussion implements Node & Authorable {
+              id: ID!
+              author: Author
+              title: String
+            }
+
+            type Author implements Node {
+              id: ID!
+            }
+            """);
+
+        using var server2 = CreateSourceSchema(
+            "B",
+            """
+            type Query {
+              authorById(id: ID!): Author @lookup
+            }
+
+            type Author {
+              id: ID!
+              username: String
+              rating: Int
+            }
+            """);
+
+        using var gateway = await CreateCompositeSchemaAsync(
+        [
+            ("A", server1),
+            ("B", server2)
+        ]);
+
+        // act
+        using var client = GraphQLHttpClient.Create(gateway.CreateClient());
+
+        var request = new OperationRequest(
+            """
+            query testQuery($id: ID!) {
+              node(id: $id) {
+                __typename
+                id
+                ... on Authorable {
+                  author {
+                    username
+                  }
+                }
+                ... on Discussion {
+                  author {
+                    rating
+                  }
+                }
+              }
+            }
+            """,
+            variables: new Dictionary<string, object?> { ["id"] = /* Discussion:1 */ "RGlzY3Vzc2lvbjox" });
+
+        using var result = await client.PostAsync(
+            request,
+            new Uri("http://localhost:5000/graphql"));
+
+        // assert
+        await MatchSnapshotAsync(gateway, request, result);
+    }
 }