change query param format

kilork · Apr 25, 2024 · 1c02550 · 1c02550
1 parent 186d8b4
commit 1c02550
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/examples/openapi.rs b/examples/openapi.rs
@@ -435,16 +435,16 @@ mod openapi {
 
             output.extend(query_parameters.into_iter().flat_map(
                 |(query_parameter, query_parameter_name)| {
-                    let value = match &query_parameter.schema {
-                        Kind::Generic(Generic::Array { .. }) => r#"v.join(",")"#,
-                        _ => "v",
+                    let value = match query_parameter.schema {
+                        Kind::Generic(Generic::Array { .. }) => format!(
+                            r#"v.into_iter().map(|e| ("{}", e)).collect::<Vec<_>>()"#,
+                            query_parameter.name
+                        ),
+                        _ => format!(r#"[("{}", v)]"#, query_parameter.name),
                     };
                     [
                         format!("if let Some(v) = {query_parameter_name} {{"),
-                        format!(
-                            r#"    builder = builder.query(&[("{}", {value})]);"#,
-                            query_parameter.name
-                        ),
+                        format!(r#"    builder = builder.query(&{value});"#,),
                         "}".into(),
                     ]
                     .map(|line| format!("    {line}"))

diff --git a/src/rest/generated_rest.rs b/src/rest/generated_rest.rs
@@ -5405,13 +5405,21 @@ impl<TS: KeycloakTokenSupplier> KeycloakAdmin<TS> {
             builder = builder.query(&[("max", v)]);
         }
         if let Some(v) = operation_types {
-            builder = builder.query(&[("operationTypes", v.join(","))]);
+            builder = builder.query(
+                &v.into_iter()
+                    .map(|e| ("operationTypes", e))
+                    .collect::<Vec<_>>(),
+            );
         }
         if let Some(v) = resource_path {
             builder = builder.query(&[("resourcePath", v)]);
         }
         if let Some(v) = resource_types {
-            builder = builder.query(&[("resourceTypes", v.join(","))]);
+            builder = builder.query(
+                &v.into_iter()
+                    .map(|e| ("resourceTypes", e))
+                    .collect::<Vec<_>>(),
+            );
         }
         let response = builder.send().await?;
         Ok(error_check(response).await?.json().await?)
@@ -5951,7 +5959,7 @@ impl<TS: KeycloakTokenSupplier> KeycloakAdmin<TS> {
             builder = builder.query(&[("max", v)]);
         }
         if let Some(v) = type_ {
-            builder = builder.query(&[("type", v.join(","))]);
+            builder = builder.query(&v.into_iter().map(|e| ("type", e)).collect::<Vec<_>>());
         }
         if let Some(v) = user {
             builder = builder.query(&[("user", v)]);