feat: unified management of service instantiation

ShiinaKin · Sep 13, 2024 · 7752189 · 7752189
1 parent a1432fd
commit 7752189
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 9 deletions.
diff --git a/app/src/main/kotlin/io/sakurasou/Application.kt b/app/src/main/kotlin/io/sakurasou/Application.kt
@@ -1,6 +1,7 @@
 package io.sakurasou
 
 import io.ktor.server.application.*
+import io.sakurasou.config.InstanceCenter
 import io.sakurasou.config.configureDatabase
 import io.sakurasou.config.configureJwt
 import io.sakurasou.plugins.*
@@ -17,6 +18,7 @@ fun Application.module() {
     val redisPort = environment.config.property("ktor.application.cache.redis.port").getString()
 
     configureDatabase()
+    InstanceCenter.initService()
     configureCache(redisHost, redisPort)
     configureJwt()
     configureSecurity()

diff --git a/app/src/main/kotlin/io/sakurasou/config/InstanceCenter.kt b/app/src/main/kotlin/io/sakurasou/config/InstanceCenter.kt
@@ -18,6 +18,17 @@ import io.sakurasou.model.dao.strategy.StrategyDao
 import io.sakurasou.model.dao.strategy.StrategyDaoImpl
 import io.sakurasou.model.dao.user.UserDao
 import io.sakurasou.model.dao.user.UserDaoImpl
+import io.sakurasou.service.album.AlbumService
+import io.sakurasou.service.album.AlbumServiceImpl
+import io.sakurasou.service.auth.AuthService
+import io.sakurasou.service.auth.AuthServiceImpl
+import io.sakurasou.service.common.CommonService
+import io.sakurasou.service.common.CommonServiceImpl
+import io.sakurasou.service.image.ImageService
+import io.sakurasou.service.setting.SettingService
+import io.sakurasou.service.setting.SettingServiceImpl
+import io.sakurasou.service.user.UserService
+import io.sakurasou.service.user.UserServiceImpl
 
 /**
  * @author Shiina Kin
@@ -34,6 +45,18 @@ object InstanceCenter {
     lateinit var permissionDao: PermissionDao
     lateinit var relationDao: RelationDao
 
+    lateinit var authService: AuthService
+    lateinit var userService: UserService
+    lateinit var imageService: ImageService
+    lateinit var albumService: AlbumService
+    // lateinit var strategyService: UserService
+    lateinit var settingService: SettingService
+    lateinit var commonService: CommonService
+    // lateinit var roleService: UserService
+    // lateinit var permissionService: UserService
+    // lateinit var relationService: UserService
+
+
     fun initDao() {
         userDao = UserDaoImpl()
         imageDao = ImageDaoImpl()
@@ -45,4 +68,13 @@ object InstanceCenter {
         permissionDao = PermissionDaoImpl()
         relationDao = RelationDaoImpl()
     }
+
+    fun initService() {
+        albumService = AlbumServiceImpl(albumDao)
+        settingService = SettingServiceImpl(settingDao)
+        authService = AuthServiceImpl(userDao, relationDao)
+
+        userService = UserServiceImpl(userDao, albumService, settingService)
+        commonService = CommonServiceImpl(userDao, albumService, settingService)
+    }
 }
diff --git a/app/src/main/kotlin/io/sakurasou/controller/AuthController.kt b/app/src/main/kotlin/io/sakurasou/controller/AuthController.kt
@@ -8,18 +8,17 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.sakurasou.controller.request.UserInsertRequest
 import io.sakurasou.controller.request.UserLoginRequest
-import io.sakurasou.model.dao.relation.RelationDao
-import io.sakurasou.model.dao.user.UserDao
 import io.sakurasou.service.auth.AuthService
-import io.sakurasou.service.auth.AuthServiceImpl
+import io.sakurasou.service.user.UserService
 
 /**
  * @author Shiina Kin
  * 2024/9/12 10:14
  */
 fun Route.authRoute(userDao: UserDao, relationDao: RelationDao) {
     val authService = AuthServiceImpl(userDao, relationDao)
-    val authController = AuthController(authService)
+fun Route.authRoute(authService: AuthService, userService: UserService) {
+    val authController = AuthController(authService, userService)
     route("user", {
         protected = false
     }) {

diff --git a/app/src/main/kotlin/io/sakurasou/controller/UserController.kt b/app/src/main/kotlin/io/sakurasou/controller/UserController.kt
@@ -24,8 +24,7 @@ import io.sakurasou.service.user.UserServiceImpl
  * 2024/9/5 15:35
  */
 
-fun Route.userRoute(userDao: UserDao) {
-    val userService = UserServiceImpl(userDao)
+fun Route.userRoute(userService: UserService) {
     val userController = UserController(userService)
     route("user", {
         protected = true

diff --git a/app/src/main/kotlin/io/sakurasou/plugins/Routing.kt b/app/src/main/kotlin/io/sakurasou/plugins/Routing.kt
@@ -13,8 +13,10 @@ import io.ktor.server.resources.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.util.*
+import io.sakurasou.config.InstanceCenter.authService
 import io.sakurasou.config.InstanceCenter.relationDao
 import io.sakurasou.config.InstanceCenter.userDao
+import io.sakurasou.config.InstanceCenter.userService
 import io.sakurasou.controller.*
 import io.sakurasou.exception.FileSizeException
 import io.sakurasou.exception.UnauthorizedAccessException
@@ -45,8 +47,7 @@ fun Application.configureRouting() {
     install(DoubleReceive)
     routing {
         route("api") {
-            authRoute(userDao, relationDao)
-            cacheOutput { commonRoute() }
+            authRoute(authService, userService)
             authenticate("auth-jwt") {
                 intercept(ApplicationCallPipeline.Call) {
                     val principal = call.principal<JWTPrincipal>()
@@ -62,7 +63,7 @@ fun Application.configureRouting() {
                 albumRoute()
                 strategyRoute()
                 settingRoute()
-                userRoute(userDao)
+                userRoute(userService)
                 groupRoute()
                 roleRoute()
             }

diff --git a/app/src/main/kotlin/io/sakurasou/service/album/AlbumService.kt b/app/src/main/kotlin/io/sakurasou/service/album/AlbumService.kt
@@ -0,0 +1,10 @@
+package io.sakurasou.service.album
+
+/**
+ * @author Shiina Kin
+ * 2024/9/13 14:48
+ */
+interface AlbumService {
+    suspend fun initAlbumForUser(userId: Long)
+    suspend fun saveAlbum()
+}