fixing the way missing parameter error goes

guimauvedigital · Feb 22, 2025 · b1f93b7 · b1f93b7
1 parent 0cd44be
commit b1f93b7
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 19 deletions.
diff --git a/routers-ktor/src/commonMain/kotlin/dev/kaccelero/routers/APIChildModelRouter.kt b/routers-ktor/src/commonMain/kotlin/dev/kaccelero/routers/APIChildModelRouter.kt
@@ -51,6 +51,13 @@ open class APIChildModelRouter<Model : IChildModel<Id, CreatePayload, UpdatePayl
                 call.respond(mapOf("error" to exception.key))
             }
 
+            is MissingParameterException -> handleExceptionAPI(
+                ControllerException(
+                    if (exception.type.isBadRequest) HttpStatusCode.BadRequest else HttpStatusCode.NotFound,
+                    "error_parameter_${exception.key}"
+                ), call
+            )
+
             is PropertyValidatorException -> handleExceptionAPI(
                 ControllerException(HttpStatusCode.BadRequest, "${route}_${exception.key}_${exception.reason}"), call
             )

diff --git a/routers-ktor/src/commonMain/kotlin/dev/kaccelero/routers/AbstractChildModelRouter.kt b/routers-ktor/src/commonMain/kotlin/dev/kaccelero/routers/AbstractChildModelRouter.kt
@@ -1,10 +1,6 @@
 package dev.kaccelero.routers
 
-import dev.kaccelero.annotations.ModelAnnotations
-import dev.kaccelero.annotations.PathParameter
-import dev.kaccelero.annotations.Payload
-import dev.kaccelero.annotations.QueryParameter
-import dev.kaccelero.commons.exceptions.ControllerException
+import dev.kaccelero.annotations.*
 import dev.kaccelero.controllers.IChildModelController
 import dev.kaccelero.models.IChildModel
 import io.ktor.http.*
@@ -116,9 +112,8 @@ abstract class AbstractChildModelRouter<Model : IChildModel<Id, CreatePayload, U
                         modelTypeInfo.type as KClass<Model>,
                         call.parameters[id]!!
                     ).let {
-                        if (it == null && !parameter.type.isMarkedNullable) throw ControllerException(
-                            HttpStatusCode.NotFound,
-                            "Missing parameter: ${parameter.name}"
+                        if (it == null && !parameter.type.isMarkedNullable) throw MissingParameterException(
+                            ParameterType.ID, parameter.name
                         )
                         it
                     }
@@ -128,9 +123,8 @@ abstract class AbstractChildModelRouter<Model : IChildModel<Id, CreatePayload, U
                         parameter.type,
                         parameter.name?.let { call.parameters[it] }
                     ).let {
-                        if (it == null && !parameter.type.isMarkedNullable) throw ControllerException(
-                            HttpStatusCode.NotFound,
-                            "Missing parameter: ${parameter.name}"
+                        if (it == null && !parameter.type.isMarkedNullable) throw MissingParameterException(
+                            ParameterType.PATH, parameter.name
                         )
                         it
                     }
@@ -140,9 +134,8 @@ abstract class AbstractChildModelRouter<Model : IChildModel<Id, CreatePayload, U
                         parameter.type,
                         parameter.name?.let { call.request.queryParameters[it] }
                     ).let {
-                        if (it == null && !parameter.type.isMarkedNullable) throw ControllerException(
-                            HttpStatusCode.NotFound,
-                            "Missing parameter: ${parameter.name}"
+                        if (it == null && !parameter.type.isMarkedNullable) throw MissingParameterException(
+                            ParameterType.QUERY, parameter.name
                         )
                         it
                     }

diff --git a/routers-ktor/src/commonMain/kotlin/dev/kaccelero/routers/TemplateChildModelRouter.kt b/routers-ktor/src/commonMain/kotlin/dev/kaccelero/routers/TemplateChildModelRouter.kt
@@ -1,9 +1,6 @@
 package dev.kaccelero.routers
 
-import dev.kaccelero.annotations.ModelAnnotations
-import dev.kaccelero.annotations.Payload
-import dev.kaccelero.annotations.PropertyValidatorException
-import dev.kaccelero.annotations.TemplateMapping
+import dev.kaccelero.annotations.*
 import dev.kaccelero.commons.exceptions.ControllerException
 import dev.kaccelero.commons.responses.ControllerResponse
 import dev.kaccelero.commons.responses.RedirectResponse
@@ -72,6 +69,13 @@ open class TemplateChildModelRouter<Model : IChildModel<Id, CreatePayload, Updat
                 )
             }
 
+            is MissingParameterException -> handleExceptionTemplate(
+                ControllerException(
+                    if (exception.type.isBadRequest) HttpStatusCode.BadRequest else HttpStatusCode.NotFound,
+                    "error_parameter_${exception.key}"
+                ), call, fromTemplate
+            )
+
             is PropertyValidatorException -> handleExceptionTemplate(
                 ControllerException(
                     HttpStatusCode.BadRequest, "${route}_${exception.key}_${exception.reason}"

diff --git a/routers-ktor/src/jvmTest/kotlin/dev/kaccelero/routers/APIUnitRouterTest.kt b/routers-ktor/src/jvmTest/kotlin/dev/kaccelero/routers/APIUnitRouterTest.kt
@@ -97,7 +97,7 @@ class APIUnitRouterTest {
             router.createRoutes(this)
         }
         val response = client.get("/api/hello/query")
-        assertEquals(HttpStatusCode.NotFound, response.status)
+        assertEquals(HttpStatusCode.BadRequest, response.status)
     }
 
     @Test

diff --git a/routers/src/commonMain/kotlin/dev/kaccelero/annotations/MissingParameterException.kt b/routers/src/commonMain/kotlin/dev/kaccelero/annotations/MissingParameterException.kt
@@ -0,0 +1,6 @@
+package dev.kaccelero.annotations
+
+data class MissingParameterException(
+    val type: ParameterType,
+    val key: String?,
+) : Exception()
diff --git a/routers/src/commonMain/kotlin/dev/kaccelero/annotations/ParameterType.kt b/routers/src/commonMain/kotlin/dev/kaccelero/annotations/ParameterType.kt
@@ -0,0 +1,9 @@
+package dev.kaccelero.annotations
+
+enum class ParameterType(
+    val isBadRequest: Boolean = false,
+) {
+
+    ID, PATH, QUERY(true)
+
+}