Add helper functions for query parameters (#14)

* Add helper functions for query parameters

* Add query parameter values to Request data class

* Add another test for query param parsing

* Add another test for query param parsing

Author: blockvote

router/src/main/kotlin/io/moia/router/Router.kt

@@ -76,5 +76,9 @@ class RouterFunction<I, T>(
 data class Request<I>(val apiRequest: APIGatewayProxyRequestEvent, val body: I, val pathPattern: String = apiRequest.path) {
 
     val pathParameters by lazy { UriTemplate.from(pathPattern).extract(apiRequest.path) }
+    val queryParameters: Map<String, String>? by lazy { apiRequest.queryStringParameters }
+    val multiValueQueryStringParameters: Map<String, List<String>>? by lazy { apiRequest.multiValueQueryStringParameters }
     fun getPathParameter(name: String): String? = pathParameters[name]
+    fun getQueryParameter(name: String): String? = queryParameters?.get(name)
+    fun getMultiValueQueryStringParameter(name: String): List<String>? = multiValueQueryStringParameters?.get(name)
 }

router/src/test/kotlin/io/moia/router/RequestHandlerTest.kt

@@ -3,6 +3,7 @@ package io.moia.router
 import assertk.assert
 import assertk.assertions.isEqualTo
 import assertk.assertions.isFalse
+import assertk.assertions.isNotNull
 import assertk.assertions.isNullOrEmpty
 import assertk.assertions.isTrue
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
@@ -352,6 +353,24 @@ class RequestHandlerTest {
         assert(response.statusCode).isEqualTo(204)
     }
 
+    @Test
+    fun `Should handle query parameters successfully`() {
+        TestQueryParamParsingHandler().handleRequest(
+            GET("/search")
+                .withQueryStringParameters(mapOf(
+                    "testQueryParam" to "foo"
+                ))
+                .withMultiValueQueryStringParameters(mapOf(
+                    "testMultiValueQueryStringParam" to listOf("foo", "bar")
+                )),
+            mockk()
+        )
+        TestQueryParamParsingHandler().handleRequest(
+            GET("/search?testQueryParam=foo&testMultiValueQueryStringParam=foo&testMultiValueQueryStringParam=bar"),
+            mockk()
+        )
+    }
+
     class TestRequestHandlerAuthorization : RequestHandler() {
         override val router = router {
             GET("/some") { _: Request<Unit> ->
@@ -423,6 +442,7 @@ class RequestHandlerTest {
                 throw IllegalArgumentException("boom")
             }
             GET("/some/{id}") { r: Request<Unit> ->
+                assert(r.pathParameters.containsKey("id")).isTrue()
                 ResponseEntity.ok(
                     TestResponse(
                         "Hello ${r.getPathParameter("id")}"
@@ -457,4 +477,19 @@ class RequestHandlerTest {
             }
         }
     }
+
+    class TestQueryParamParsingHandler : RequestHandler() {
+
+        override val router = router {
+            GET("/search") { r: Request<TestRequestHandler.TestRequest> ->
+                assert(r.getQueryParameter("testQueryParam")).isNotNull()
+                assert(r.getQueryParameter("testQueryParam")).isEqualTo("foo")
+                assert(r.queryParameters!!["testQueryParam"]).isNotNull()
+                assert(r.getMultiValueQueryStringParameter("testMultiValueQueryStringParam")).isNotNull()
+                assert(r.getMultiValueQueryStringParameter("testMultiValueQueryStringParam")).isEqualTo(listOf("foo", "bar"))
+                assert(r.multiValueQueryStringParameters!!["testMultiValueQueryStringParam"]).isNotNull()
+                ResponseEntity.ok(null)
+            }
+        }
+    }
 }