fix: Multipart @part body (map) breaks when multiple @path parameter …

…is used. (#633) * feat: added PreventNullToAbsent annotation, which allows sending null values to server. * fix: Multipart @part body (map) doesn't breaks when multiple @path parameter is used. * fix: Multipart @part body (map) doesn't breaks when multiple @path parameter is used. * test: Multipart @part body (map) doesn't breaks when multiple @path parameter is used.
trevorwang · Oct 28, 2023 · ddcfd26 · ddcfd26
1 parent a53b4f0
commit ddcfd26
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 15 deletions.
diff --git a/example/lib/example.dart b/example/lib/example.dart
@@ -249,6 +249,14 @@ abstract class RestClient {
   Future<String> nestedGenericOther(
     @Body() ValueWrapper<ValueWrapper<TaskQuery>> request,
   );
+
+  @MultiPart()
+  @POST('post/{id}/comments/{commentId}')
+  Future<String> multipartBodyWithMultiplePathParameter(
+    @Path("id") String id,
+    @Path("commentId") String commentId,
+    @Part() Map<String, dynamic> body,
+  );
 }
 
 @JsonSerializable()

diff --git a/generator/lib/src/generator.dart b/generator/lib/src/generator.dart
@@ -1747,32 +1747,20 @@ ${bodyName.displayName} == null
 
     final parts = _getAnnotations(m, retrofit.Part);
     if (parts.isNotEmpty) {
-      if (m.parameters.length == 1 && m.parameters.first.type.isDartCoreMap) {
+      if (parts.length == 1 && parts.keys.first.type.isDartCoreMap) {
         blocks.add(
           declareFinal(dataVar)
               .assign(
                 refer('FormData').newInstanceNamed(
                   'fromMap',
-                  [CodeExpression(Code(m.parameters.first.displayName))],
-                ),
-              )
-              .statement,
-        );
-        return;
-      } else if (m.parameters.length == 2 &&
-          m.parameters[1].type.isDartCoreMap) {
-        blocks.add(
-          declareFinal(dataVar)
-              .assign(
-                refer('FormData').newInstanceNamed(
-                  'fromMap',
-                  [CodeExpression(Code(m.parameters[1].displayName))],
+                  [CodeExpression(Code(parts.keys.first.displayName))],
                 ),
               )
               .statement,
         );
         return;
       }
+
       blocks.add(
         declareFinal(dataVar)
             .assign(refer('FormData').newInstance([]))

diff --git a/generator/test/src/generator_test_src.dart b/generator/test/src/generator_test_src.dart
@@ -1957,3 +1957,53 @@ abstract class ProtoSupport {
   @GET('/')
   Future<Result> get(@Body() Params params);
 }
+
+@ShouldGenerate(
+  '''
+    final _data = FormData.fromMap(body);
+  ''',
+  contains: true,
+)
+@RestApi()
+abstract class MultipartWithMultplePathParams {
+  @MultiPart()
+  @POST('post/{id}/comments/{commentId}')
+  Future<String> multipartBodyWithMultiplePathParameter(
+    @Path("id") String id,
+    @Path("commentId") String commentId,
+    @Part() Map<String, dynamic> body,
+  );
+}
+
+@ShouldGenerate(
+  '''
+    final _data = FormData.fromMap(body);
+  ''',
+  contains: true,
+)
+@RestApi()
+abstract class MultipartWithSinglePathParams {
+  @MultiPart()
+  @POST('post/{id}/comments')
+  Future<String> multipartBodyWithSinglePathParameter(
+    @Path("id") String id,
+    @Part() Map<String, dynamic> body,
+  );
+}
+
+@ShouldGenerate(
+  '''
+    final _data = FormData.fromMap(body);
+  ''',
+  contains: true,
+)
+@RestApi()
+abstract class MultipartWithMultplePathParamsPUT {
+  @MultiPart()
+  @PUT('post/{id}/comments/{commentId}')
+  Future<String> multipartBodyWithMultiplePathParameter(
+    @Path("id") String id,
+    @Path("commentId") String commentId,
+    @Part() Map<String, dynamic> body,
+  );
+}