refactor: move initAlbumForUser from service to dao

ShiinaKin · Sep 24, 2024 · 2928733 · 2928733
1 parent 92e028b
commit 2928733
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/app/src/main/kotlin/io/sakurasou/model/dao/album/AlbumDao.kt b/app/src/main/kotlin/io/sakurasou/model/dao/album/AlbumDao.kt
@@ -11,4 +11,5 @@ interface AlbumDao {
     fun listAlbumByUserId(userId: Long): List<Album>
     fun getAlbumById(albumId: Long): Album?
     fun saveAlbum(insertDTO: AlbumInsertDTO): Long
+    fun initAlbumForUser(userId: Long): Long
 }
diff --git a/app/src/main/kotlin/io/sakurasou/model/dao/album/AlbumDaoImpl.kt b/app/src/main/kotlin/io/sakurasou/model/dao/album/AlbumDaoImpl.kt
@@ -2,6 +2,9 @@ package io.sakurasou.model.dao.album
 
 import io.sakurasou.model.dto.AlbumInsertDTO
 import io.sakurasou.model.entity.Album
+import kotlinx.datetime.Clock
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.selectAll
 
@@ -54,4 +57,17 @@ class AlbumDaoImpl : AlbumDao {
         }
         return entityID.value
     }
+
+    override fun initAlbumForUser(userId: Long): Long {
+        val now = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
+        val uncategorizedAlbum = AlbumInsertDTO(
+            userId = userId,
+            name = "uncategorized",
+            description = "default, cannot delete",
+            imageCount = 0,
+            isUncategorized = true,
+            createTime = now
+        )
+        return saveAlbum(uncategorizedAlbum)
+    }
 }
diff --git a/app/src/main/kotlin/io/sakurasou/service/album/AlbumService.kt b/app/src/main/kotlin/io/sakurasou/service/album/AlbumService.kt
@@ -5,6 +5,5 @@ package io.sakurasou.service.album
  * 2024/9/13 14:48
  */
 interface AlbumService {
-    suspend fun initAlbumForUser(userId: Long): Long
     suspend fun saveAlbum(): Long
 }
diff --git a/app/src/main/kotlin/io/sakurasou/service/album/AlbumServiceImpl.kt b/app/src/main/kotlin/io/sakurasou/service/album/AlbumServiceImpl.kt
@@ -1,11 +1,6 @@
 package io.sakurasou.service.album
 
-import io.sakurasou.model.DatabaseSingleton.dbQuery
 import io.sakurasou.model.dao.album.AlbumDao
-import io.sakurasou.model.dto.AlbumInsertDTO
-import kotlinx.datetime.Clock
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 
 /**
  * @author Shiina Kin
@@ -14,21 +9,6 @@ import kotlinx.datetime.toLocalDateTime
 class AlbumServiceImpl(
     private val albumDao: AlbumDao
 ) : AlbumService {
-    override suspend fun initAlbumForUser(userId: Long): Long {
-        val now = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
-        val uncategorizedAlbum = AlbumInsertDTO(
-            userId = userId,
-            name = "uncategorized",
-            description = "default, cannot delete",
-            imageCount = 0,
-            isUncategorized = true,
-            createTime = now
-        )
-        return dbQuery {
-            albumDao.saveAlbum(uncategorizedAlbum)
-        }
-    }
-
     override suspend fun saveAlbum(): Long {
         TODO("Not yet implemented")
     }