Fix fusion file uploads where IFile is in a list

src/HotChocolate/AspNetCore/src/Transport.Abstractions/Serialization/Utf8JsonWriterHelper.cs

@@ -21,7 +21,7 @@ public static void WriteOperationRequest(Utf8JsonWriter writer, OperationRequest
         {
             writer.WriteString(Utf8GraphQLRequestProperties.IdProp, request.Id);
         }
- 
+
         if (request.Query is not null)
         {
             writer.WriteString(Utf8GraphQLRequestProperties.QueryProp, request.Query);
@@ -115,7 +115,7 @@ internal static void WriteFieldValue(
             case Dictionary<string, object?> dict:
                 WriteDictionary(writer, dict);
                 break;
-            
+
             case byte[] bytes:
                 writer.WriteBase64StringValue(bytes);
                 break;
@@ -405,7 +405,7 @@ private static void CollectFiles(
             }
 
             var current = path.Append(i);
-            CollectFiles(item.Value, current, ref files);
+            CollectFiles(item, current, ref files);
         }
     }
 

src/HotChocolate/Fusion/test/Composition.Tests/__snapshots__/DemoIntegrationTests.Accounts_And_Reviews2_Products_With_Nodes.graphql

@@ -70,6 +70,9 @@ type Mutation {
   addUser(input: AddUserInput!): AddUserPayload!
     @variable(subgraph: "Accounts", name: "input", argument: "input")
     @resolver(subgraph: "Accounts", select: "{ addUser(input: $input) }", arguments: [ { name: "input", type: "AddUserInput!" } ])
+  uploadMultipleProductPictures(input: UploadMultipleProductPicturesInput!): UploadMultipleProductPicturesPayload!
+    @variable(subgraph: "Products", name: "input", argument: "input")
+    @resolver(subgraph: "Products", select: "{ uploadMultipleProductPictures(input: $input) }", arguments: [ { name: "input", type: "UploadMultipleProductPicturesInput!" } ])
   uploadProductPicture(input: UploadProductPictureInput!): UploadProductPicturePayload!
     @variable(subgraph: "Products", name: "input", argument: "input")
     @resolver(subgraph: "Products", select: "{ uploadProductPicture(input: $input) }", arguments: [ { name: "input", type: "UploadProductPictureInput!" } ])
@@ -158,6 +161,13 @@ type SomeData {
     @source(subgraph: "Reviews2")
 }
 
+type UploadMultipleProductPicturesPayload {
+  boolean: Boolean
+    @source(subgraph: "Products")
+  errors: [UploadMultipleProductPicturesError!]
+    @source(subgraph: "Products")
+}
+
 type UploadProductPicturePayload {
   boolean: Boolean
     @source(subgraph: "Products")
@@ -210,6 +220,8 @@ interface Node {
 
 union ReviewOrAuthor = User | Review
 
+union UploadMultipleProductPicturesError = ProductNotFoundError
+
 union UploadProductPictureError = ProductNotFoundError
 
 input AddReviewInput {
@@ -224,11 +236,20 @@ input AddUserInput {
   username: String!
 }
 
+input ProductIdWithUploadInput {
+  file: Upload!
+  productId: Int!
+}
+
 input SomeDataInput {
   data: SomeDataInput
   num: Int
 }
 
+input UploadMultipleProductPicturesInput {
+  products: [ProductIdWithUploadInput!]!
+}
+
 input UploadProductPictureInput {
   file: Upload!
   productId: Int!

src/HotChocolate/Fusion/test/Composition.Tests/__snapshots__/DemoIntegrationTests.Accounts_And_Reviews_Products.graphql

@@ -50,6 +50,9 @@ type Mutation {
   addUser(input: AddUserInput!): AddUserPayload!
     @variable(subgraph: "Accounts", name: "input", argument: "input")
     @resolver(subgraph: "Accounts", select: "{ addUser(input: $input) }", arguments: [ { name: "input", type: "AddUserInput!" } ])
+  uploadMultipleProductPictures(input: UploadMultipleProductPicturesInput!): UploadMultipleProductPicturesPayload!
+    @variable(subgraph: "Products", name: "input", argument: "input")
+    @resolver(subgraph: "Products", select: "{ uploadMultipleProductPictures(input: $input) }", arguments: [ { name: "input", type: "UploadMultipleProductPicturesInput!" } ])
   uploadProductPicture(input: UploadProductPictureInput!): UploadProductPicturePayload!
     @variable(subgraph: "Products", name: "input", argument: "input")
     @resolver(subgraph: "Products", select: "{ uploadProductPicture(input: $input) }", arguments: [ { name: "input", type: "UploadProductPictureInput!" } ])
@@ -134,6 +137,13 @@ type SomeData {
     @source(subgraph: "Products")
 }
 
+type UploadMultipleProductPicturesPayload {
+  boolean: Boolean
+    @source(subgraph: "Products")
+  errors: [UploadMultipleProductPicturesError!]
+    @source(subgraph: "Products")
+}
+
 type UploadProductPicturePayload {
   boolean: Boolean
     @source(subgraph: "Products")
@@ -183,6 +193,8 @@ interface Node {
 
 union ReviewOrAuthor = User | Review
 
+union UploadMultipleProductPicturesError = ProductNotFoundError
+
 union UploadProductPictureError = ProductNotFoundError
 
 input AddReviewInput {
@@ -197,11 +209,20 @@ input AddUserInput {
   username: String!
 }
 
+input ProductIdWithUploadInput {
+  file: Upload!
+  productId: Int!
+}
+
 input SomeDataInput {
   data: SomeDataInput
   num: Int
 }
 
+input UploadMultipleProductPicturesInput {
+  products: [ProductIdWithUploadInput!]!
+}
+
 input UploadProductPictureInput {
   file: Upload!
   productId: Int!

src/HotChocolate/Fusion/test/Composition.Tests/__snapshots__/DemoIntegrationTests.Accounts_And_Reviews_Products_AutoCompose_With_Node.graphql

@@ -51,6 +51,9 @@ type Mutation {
   addUser(input: AddUserInput!): AddUserPayload!
     @variable(subgraph: "Accounts", name: "input", argument: "input")
     @resolver(subgraph: "Accounts", select: "{ addUser(input: $input) }", arguments: [ { name: "input", type: "AddUserInput!" } ])
+  uploadMultipleProductPictures(input: UploadMultipleProductPicturesInput!): UploadMultipleProductPicturesPayload!
+    @variable(subgraph: "Products", name: "input", argument: "input")
+    @resolver(subgraph: "Products", select: "{ uploadMultipleProductPictures(input: $input) }", arguments: [ { name: "input", type: "UploadMultipleProductPicturesInput!" } ])
   uploadProductPicture(input: UploadProductPictureInput!): UploadProductPicturePayload!
     @variable(subgraph: "Products", name: "input", argument: "input")
     @resolver(subgraph: "Products", select: "{ uploadProductPicture(input: $input) }", arguments: [ { name: "input", type: "UploadProductPictureInput!" } ])
@@ -147,6 +150,13 @@ type SomeData {
     @source(subgraph: "Products")
 }
 
+type UploadMultipleProductPicturesPayload {
+  boolean: Boolean
+    @source(subgraph: "Products")
+  errors: [UploadMultipleProductPicturesError!]
+    @source(subgraph: "Products")
+}
+
 type UploadProductPicturePayload {
   boolean: Boolean
     @source(subgraph: "Products")
@@ -188,6 +198,8 @@ interface Node {
 
 union ReviewOrAuthor = Author | Review
 
+union UploadMultipleProductPicturesError = ProductNotFoundError
+
 union UploadProductPictureError = ProductNotFoundError
 
 input AddReviewInput {
@@ -202,11 +214,20 @@ input AddUserInput {
   username: String!
 }
 
+input ProductIdWithUploadInput {
+  file: Upload!
+  productId: Int!
+}
+
 input SomeDataInput {
   data: SomeDataInput
   num: Int
 }
 
+input UploadMultipleProductPicturesInput {
+  products: [ProductIdWithUploadInput!]!
+}
+
 input UploadProductPictureInput {
   file: Upload!
   productId: Int!

src/HotChocolate/Fusion/test/Composition.Tests/__snapshots__/DemoIntegrationTests.Accounts_And_Reviews_Products_With_Nodes.graphql

@@ -69,6 +69,9 @@ type Mutation {
   addUser(input: AddUserInput!): AddUserPayload!
     @variable(subgraph: "Accounts", name: "input", argument: "input")
     @resolver(subgraph: "Accounts", select: "{ addUser(input: $input) }", arguments: [ { name: "input", type: "AddUserInput!" } ])
+  uploadMultipleProductPictures(input: UploadMultipleProductPicturesInput!): UploadMultipleProductPicturesPayload!
+    @variable(subgraph: "Products", name: "input", argument: "input")
+    @resolver(subgraph: "Products", select: "{ uploadMultipleProductPictures(input: $input) }", arguments: [ { name: "input", type: "UploadMultipleProductPicturesInput!" } ])
   uploadProductPicture(input: UploadProductPictureInput!): UploadProductPicturePayload!
     @variable(subgraph: "Products", name: "input", argument: "input")
     @resolver(subgraph: "Products", select: "{ uploadProductPicture(input: $input) }", arguments: [ { name: "input", type: "UploadProductPictureInput!" } ])
@@ -153,6 +156,13 @@ type SomeData {
     @source(subgraph: "Products")
 }
 
+type UploadMultipleProductPicturesPayload {
+  boolean: Boolean
+    @source(subgraph: "Products")
+  errors: [UploadMultipleProductPicturesError!]
+    @source(subgraph: "Products")
+}
+
 type UploadProductPicturePayload {
   boolean: Boolean
     @source(subgraph: "Products")
@@ -203,6 +213,8 @@ interface Node {
 
 union ReviewOrAuthor = User | Review
 
+union UploadMultipleProductPicturesError = ProductNotFoundError
+
 union UploadProductPictureError = ProductNotFoundError
 
 input AddReviewInput {
@@ -217,11 +229,20 @@ input AddUserInput {
   username: String!
 }
 
+input ProductIdWithUploadInput {
+  file: Upload!
+  productId: Int!
+}
+
 input SomeDataInput {
   data: SomeDataInput
   num: Int
 }
 
+input UploadMultipleProductPicturesInput {
+  products: [ProductIdWithUploadInput!]!
+}
+
 input UploadProductPictureInput {
   file: Upload!
   productId: Int!

src/HotChocolate/Fusion/test/Composition.Tests/__snapshots__/RequireTests.Require_Scalar_Arguments_No_Overloads.graphql

@@ -55,6 +55,9 @@ type Mutation {
   addUser(input: AddUserInput!): AddUserPayload!
     @variable(subgraph: "Accounts", name: "input", argument: "input")
     @resolver(subgraph: "Accounts", select: "{ addUser(input: $input) }", arguments: [ { name: "input", type: "AddUserInput!" } ])
+  uploadMultipleProductPictures(input: UploadMultipleProductPicturesInput!): UploadMultipleProductPicturesPayload!
+    @variable(subgraph: "Products", name: "input", argument: "input")
+    @resolver(subgraph: "Products", select: "{ uploadMultipleProductPictures(input: $input) }", arguments: [ { name: "input", type: "UploadMultipleProductPicturesInput!" } ])
   uploadProductPicture(input: UploadProductPictureInput!): UploadProductPicturePayload!
     @variable(subgraph: "Products", name: "input", argument: "input")
     @resolver(subgraph: "Products", select: "{ uploadProductPicture(input: $input) }", arguments: [ { name: "input", type: "UploadProductPictureInput!" } ])
@@ -167,6 +170,13 @@ type SomeData {
     @source(subgraph: "Products")
 }
 
+type UploadMultipleProductPicturesPayload {
+  boolean: Boolean
+    @source(subgraph: "Products")
+  errors: [UploadMultipleProductPicturesError!]
+    @source(subgraph: "Products")
+}
+
 type UploadProductPicturePayload {
   boolean: Boolean
     @source(subgraph: "Products")
@@ -208,6 +218,8 @@ interface Node {
 
 union ReviewOrAuthor = Author | Review
 
+union UploadMultipleProductPicturesError = ProductNotFoundError
+
 union UploadProductPictureError = ProductNotFoundError
 
 input AddReviewInput {
@@ -222,11 +234,20 @@ input AddUserInput {
   username: String!
 }
 
+input ProductIdWithUploadInput {
+  file: Upload!
+  productId: Int!
+}
+
 input SomeDataInput {
   data: SomeDataInput
   num: Int
 }
 
+input UploadMultipleProductPicturesInput {
+  products: [ProductIdWithUploadInput!]!
+}
+
 input UploadProductPictureInput {
   file: Upload!
   productId: Int!

src/HotChocolate/Fusion/test/Core.Tests/FileUploadTests.cs

@@ -150,6 +150,70 @@ mutation Upload($input: UploadProductPictureInput!) {
         await snapshot.MatchMarkdownAsync(cts.Token);
     }
 
+    [Fact]
+    public async Task UploadFile_Multiple_In_List()
+    {
+        // arrange
+        using var cts = new CancellationTokenSource(100_000);
+        using var demoProject = await DemoProject.CreateAsync(cts.Token);
+
+        // act
+        var fusionGraph = await new FusionGraphComposer(logFactory: _logFactory).ComposeAsync(
+            new[]
+            {
+                demoProject.Reviews2.ToConfiguration(Reviews2ExtensionSdl, onlyHttp: true),
+                demoProject.Accounts.ToConfiguration(AccountsExtensionSdl, onlyHttp: true),
+                demoProject.Products.ToConfiguration(ProductsExtensionSdl, onlyHttp: true),
+                demoProject.Shipping.ToConfiguration(ShippingExtensionSdl, onlyHttp: true),
+            },
+            default,
+            cts.Token);
+
+        var executor = await new ServiceCollection()
+            .AddSingleton(demoProject.HttpClientFactory)
+            .AddSingleton<IWebSocketConnectionFactory>(new NoWebSockets())
+            .AddFusionGatewayServer()
+            .ConfigureFromDocument(SchemaFormatter.FormatAsDocument(fusionGraph))
+            .BuildRequestExecutorAsync(cancellationToken: cts.Token);
+
+        var request = Parse(
+            """
+            mutation UploadMultiple($input: UploadMultipleProductPicturesInput!) {
+                uploadMultipleProductPictures(input: $input) {
+                  boolean
+                }
+            }
+            """);
+
+        var input = new Dictionary<string, object?>
+        {
+            ["products"] = new List<Dictionary<string, object?>> {
+                new () {
+                    ["productId"] = 1,
+                    ["file"] = new StreamFile("abc", () => new MemoryStream("abc"u8.ToArray())),
+                },
+                new () {
+                    ["productId"] = 2,
+                    ["file"] = new StreamFile("abc", () => new MemoryStream("abc"u8.ToArray())),
+                },
+            },
+        };
+
+        // act
+        var result = await executor.ExecuteAsync(
+            QueryRequestBuilder
+                .New()
+                .SetQuery(request)
+                .SetVariableValue("input", input)
+                .Create(),
+            cts.Token);
+
+        // assert
+        var snapshot = new Snapshot();
+        CollectSnapshotData(snapshot, request, result, fusionGraph);
+        await snapshot.MatchMarkdownAsync(cts.Token);
+    }
+
     private sealed class NoWebSockets : IWebSocketConnectionFactory
     {
         public IWebSocketConnection CreateConnection(string name)