imprv: add InvalidFormatException to 422 mapping error (#13)

* imprv: add InvalidFormatException to 422 mapping errors

* imprv: add test

* imprv: remove hooker method

* imprv: override method implementation (test)

* imprv: override method implementation (test) - fix

Author: ruibritopt

router-protobuf/src/test/kotlin/io/moia/router/proto/RequestHandlerTest.kt

@@ -121,11 +121,13 @@ class RequestHandlerTest {
                 .setCode(error.code)
                 .build()
 
-        override fun createUnprocessableEntityErrorBody(error: UnprocessableEntityError): Any =
-            io.moia.router.proto.sample.SampleOuterClass.UnprocessableEntityError.newBuilder()
-                .setMessage(error.message)
-                .setCode(error.code)
-                .setPath(error.path)
-                .build()
+        override fun createUnprocessableEntityErrorBody(errors: List<UnprocessableEntityError>): Any =
+            errors.map { error ->
+                io.moia.router.proto.sample.SampleOuterClass.UnprocessableEntityError.newBuilder()
+                    .setMessage(error.message)
+                    .setCode(error.code)
+                    .setPath(error.path)
+                    .build()
+            }
     }
 }

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

@@ -4,6 +4,7 @@ import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent
+import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.common.net.MediaType
@@ -119,8 +120,7 @@ abstract class RequestHandler : RequestHandler<APIGatewayProxyRequestEvent, APIG
     /**
      * Customize the format of an unprocessable entity error
      */
-    open fun createUnprocessableEntityErrorBody(error: UnprocessableEntityError): Any =
-        error
+    open fun createUnprocessableEntityErrorBody(errors: List<UnprocessableEntityError>): Any = errors
 
     open fun createApiExceptionErrorResponse(contentType: MediaType, input: APIGatewayProxyRequestEvent, ex: ApiException): APIGatewayProxyResponseEvent =
         createErrorBody(ex.toApiError()).let {
@@ -138,12 +138,19 @@ abstract class RequestHandler : RequestHandler<APIGatewayProxyRequestEvent, APIG
 
     open fun createUnexpectedErrorResponse(contentType: MediaType, input: APIGatewayProxyRequestEvent, ex: Exception): APIGatewayProxyResponseEvent =
         when (ex) {
+            is InvalidFormatException ->
+                createResponse(contentType, input,
+                    ResponseEntity(422, createUnprocessableEntityErrorBody(listOf(
+                        UnprocessableEntityError(
+                        message = "INVALID_FIELD_FORMAT",
+                        code = "FIELD",
+                        path = ex.path.last().fieldName.orEmpty())))))
             is MissingKotlinParameterException ->
                 createResponse(contentType, input,
-                    ResponseEntity(422, createUnprocessableEntityErrorBody(UnprocessableEntityError(
-                        message = "Missing required field",
-                        code = "MISSING_REQUIRED_FIELDS",
-                        path = ex.parameter.name.orEmpty()))))
+                    ResponseEntity(422, createUnprocessableEntityErrorBody(listOf(UnprocessableEntityError(
+                        message = "MISSING_REQUIRED_FIELDS",
+                        code = "FIELD",
+                        path = ex.parameter.name.orEmpty())))))
             else -> createResponse(contentType, input,
                 ResponseEntity(500, createErrorBody(ApiError(ex.message.orEmpty(), "INTERNAL_SERVER_ERROR"))))
         }

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

@@ -180,6 +180,22 @@ class RequestHandlerTest {
         assert(response.statusCode).isEqualTo(422)
     }
 
+    @Test
+    fun `should handle deserialization error, when field has invalid format`() {
+
+        val response = testRequestHandler.handleRequest(
+            POST("/some")
+                .withHeaders(
+                    mapOf(
+                        "Accept" to "application/json",
+                        "Content-Type" to "application/json"
+                    )
+                )
+                .withBody("""{"greeting": "hello","age": "a"}"""), mockk()
+        )
+        assert(response.statusCode).isEqualTo(422)
+    }
+
     @Test
     fun `should handle api exception`() {
 
@@ -390,7 +406,7 @@ class RequestHandlerTest {
     class TestRequestHandler : RequestHandler() {
 
         data class TestResponse(val greeting: String)
-        data class TestRequest(val greeting: String)
+        data class TestRequest(val greeting: String, val age: Int = 0)
 
         override val router = router {
             GET("/some") { _: Request<Unit> ->