[#3995] Use injections inside the routes (#3999)

Oztechan · Oct 3, 2024 · f3e2956 · f3e2956
1 parent 8c3364d
commit f3e2956
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 24 deletions.
diff --git a/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/module/APIModule.kt b/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/module/APIModule.kt
@@ -5,18 +5,11 @@ import com.oztechan.ccc.backend.app.routes.currency
 import com.oztechan.ccc.backend.app.routes.error
 import com.oztechan.ccc.backend.app.routes.root
 import com.oztechan.ccc.backend.app.routes.version
-import com.oztechan.ccc.backend.controller.api.APIController
-import com.oztechan.ccc.common.core.infrastructure.di.DISPATCHER_IO
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.application.Application
 import io.ktor.server.application.install
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.routing.routing
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import org.koin.core.qualifier.named
-import org.koin.ktor.ext.inject
 
 @Suppress("unused")
 internal fun Application.apiModule() {
@@ -26,16 +19,10 @@ internal fun Application.apiModule() {
  json()
  }
 
- val apiController: APIController by inject()
- val globalScope: CoroutineScope by inject()
- val ioDispatcher: CoroutineDispatcher by inject(named(DISPATCHER_IO))
-
  routing {
- globalScope.launch(ioDispatcher) {
- root(ioDispatcher)
- currency(apiController, ioDispatcher)
- version(ioDispatcher)
- error(ioDispatcher)
- }
+ root()
+ currency()
+ version()
+ error()
  }
 }
diff --git a/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/CurrencyRoute.kt b/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/CurrencyRoute.kt
@@ -6,21 +6,24 @@ package com.oztechan.ccc.backend.app.routes
 
 import co.touchlab.kermit.Logger
 import com.oztechan.ccc.backend.controller.api.APIController
+import com.oztechan.ccc.common.core.infrastructure.di.DISPATCHER_IO
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.call
 import io.ktor.server.response.respond
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.get
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
+import org.koin.core.qualifier.named
+import org.koin.ktor.ext.inject
 
 private const val PATH_BY_BASE = "/currency/byBase/"
 private const val PARAMETER_BASE = "base"
 
-internal fun Route.currency(
- apiController: APIController,
- ioDispatcher: CoroutineDispatcher
-) {
+internal fun Route.currency() {
+ val apiController: APIController by inject()
+ val ioDispatcher: CoroutineDispatcher by inject(named(DISPATCHER_IO))
+
  get(PATH_BY_BASE) {
  Logger.v { "GET Request $PATH_BY_BASE" }
 

diff --git a/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/ErrorRoute.kt b/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/ErrorRoute.kt
@@ -5,6 +5,7 @@
 package com.oztechan.ccc.backend.app.routes
 
 import co.touchlab.kermit.Logger
+import com.oztechan.ccc.common.core.infrastructure.di.DISPATCHER_IO
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.call
@@ -14,11 +15,15 @@ import io.ktor.server.routing.Route
 import io.ktor.server.routing.get
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
+import org.koin.core.qualifier.named
+import org.koin.ktor.ext.inject
 
 private const val PATH_ERROR = "/error"
 private const val ERROR_HTML = "error.html"
 
-internal fun Route.error(ioDispatcher: CoroutineDispatcher) {
+internal fun Route.error() {
+ val ioDispatcher: CoroutineDispatcher by inject(named(DISPATCHER_IO))
+
  get(PATH_ERROR) {
  Logger.v { "GET Request $PATH_ERROR" }
 

diff --git a/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/RootRoute.kt b/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/RootRoute.kt
@@ -5,6 +5,7 @@
 package com.oztechan.ccc.backend.app.routes
 
 import co.touchlab.kermit.Logger
+import com.oztechan.ccc.common.core.infrastructure.di.DISPATCHER_IO
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.call
@@ -14,11 +15,15 @@ import io.ktor.server.routing.Route
 import io.ktor.server.routing.get
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
+import org.koin.core.qualifier.named
+import org.koin.ktor.ext.inject
 
 private const val PATH_ROOT = "/"
 private const val INDEX_HTML = "index.html"
 
-internal fun Route.root(ioDispatcher: CoroutineDispatcher) {
+internal fun Route.root() {
+ val ioDispatcher: CoroutineDispatcher by inject(named(DISPATCHER_IO))
+
  get(PATH_ROOT) {
  Logger.v { "GET Request $PATH_ROOT" }
 

diff --git a/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/VersionRoute.kt b/backend/app/src/main/kotlin/com/oztechan/ccc/backend/app/routes/VersionRoute.kt
@@ -1,6 +1,7 @@
 package com.oztechan.ccc.backend.app.routes
 
 import co.touchlab.kermit.Logger
+import com.oztechan.ccc.common.core.infrastructure.di.DISPATCHER_IO
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.call
@@ -10,10 +11,14 @@ import io.ktor.server.routing.Route
 import io.ktor.server.routing.get
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
+import org.koin.core.qualifier.named
+import org.koin.ktor.ext.inject
 
 private const val PATH_VERSION = "/version"
 
-internal fun Route.version(ioDispatcher: CoroutineDispatcher) {
+internal fun Route.version() {
+ val ioDispatcher: CoroutineDispatcher by inject(named(DISPATCHER_IO))
+
  get(PATH_VERSION) {
  Logger.v { "GET Request $PATH_VERSION" }