Fix query parameters avoiding duplicates

multiValueQueryStringParameters is a superset of queryStringParameters
andre-bisa · Mar 11, 2024 · fa50c27 · fa50c27
1 parent 0279c1c
commit fa50c27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/lambda-http4s/src/main/scala/feral/lambda/http4s/ApiGatewayProxyHandler.scala b/lambda-http4s/src/main/scala/feral/lambda/http4s/ApiGatewayProxyHandler.scala
@@ -61,11 +61,8 @@ object ApiGatewayProxyHandler {
 
   private[http4s] def decodeEvent[F[_]: Concurrent](
       event: ApiGatewayProxyEvent): F[Request[F]] = {
-    val queryString: String = List(
-      getQueryStringParameters(event.queryStringParameters),
-      getMultiValueQueryStringParameters(event.multiValueQueryStringParameters)
-    ).filter(_.nonEmpty).mkString("&")
-
+    val queryString: String = getMultiValueQueryStringParameters(
+      event.multiValueQueryStringParameters)
     val uriString: String = event.path + (if (queryString.nonEmpty) s"?$queryString" else "")
 
     for {
@@ -97,12 +94,6 @@ object ApiGatewayProxyHandler {
     )
   }
 
-  private def getQueryStringParameters(
-      queryStringParameters: Option[Map[String, String]]): String =
-    queryStringParameters.fold("") { params =>
-      params.map { case (key, value) => s"$key=$value" }.mkString("&")
-    }
-
   private def getMultiValueQueryStringParameters(
       multiValueQueryStringParameters: Option[Map[String, List[String]]]): String =
     multiValueQueryStringParameters.fold("") { params =>

diff --git a/lambda-http4s/src/test/scala/feral/lambda/http4s/ApiGatewayProxyHandlerSuite.scala b/lambda-http4s/src/test/scala/feral/lambda/http4s/ApiGatewayProxyHandlerSuite.scala
@@ -57,7 +57,7 @@ class ApiGatewayProxyHandlerSuite extends CatsEffectSuite {
       event <- event.as[ApiGatewayProxyEvent].liftTo[IO]
       request <- ApiGatewayProxyHandler.decodeEvent[IO](event)
       _ <- IO(assertEquals(request.method, Method.POST))
-      _ <- IO(assertEquals(request.uri, uri"/path/to/resource?foo=bar&foo=bar"))
+      _ <- IO(assertEquals(request.uri, uri"/path/to/resource?foo=bar"))
       _ <- IO(assertEquals(request.headers, expectedHeaders))
       responseBody <- request.bodyText.compile.string
       _ <- IO(assertEquals(responseBody, expectedBody))