feat: 서재UI/UX 개편 (10) - 계층 간 상태 동기화 및 코드 정리

app/src/main/java/com/into/websoso/ui/splash/SplashViewModel.kt

@@ -10,6 +10,7 @@ import com.into.websoso.ui.splash.UiEffect.NavigateToMain
 import com.into.websoso.ui.splash.UiEffect.ShowDialog
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
@@ -51,6 +52,8 @@ class SplashViewModel
             }
 
         private suspend fun handleAutoLogin() {
+            delay(1000)
+
             if (shouldRefresh()) {
                 _uiEffect.send(NavigateToLogin)
                 return

core/database/build.gradle.kts

@@ -9,18 +9,15 @@ android {
 }
 
 dependencies {
-    // 데이터베이스 관련 라이브러리
+    // 데이터 레이어 의존성
+    implementation(projects.data.library)
+
+    // 페이징 관련 의존성
+    implementation(libs.paging.runtime)
+
+    // 데이터베이스 관련 의존성
+    implementation(libs.room.paging)
     implementation(libs.room.ktx)
     implementation(libs.room.runtime)
     kapt(libs.room.compiler)
-
-    // 페이징3
-    val paging_version = "3.3.6"
-    implementation("androidx.room:room-paging:2.5.1")  // Room 최신 버전에 맞게 버전 확인
-
-
-    implementation("androidx.paging:paging-runtime:$paging_version")
-
-    // alternatively - without Android dependencies for tests
-    implementation("androidx.paging:paging-common:$paging_version")
 }

core/database/src/main/java/com/into/websoso/core/database/Converters.kt

@@ -2,7 +2,7 @@ package com.into.websoso.core.database
 
 import androidx.room.TypeConverter
 
-class Converters {
+internal class Converters {
     @TypeConverter
     fun fromString(value: String): List<String> = if (value.isEmpty()) emptyList() else value.split(",")
 

core/database/src/main/java/com/into/websoso/core/database/WebsosoDatabase.kt

@@ -1,45 +1,17 @@
 package com.into.websoso.core.database
 
-import android.content.Context
 import androidx.room.Database
-import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.into.websoso.core.database.dao.FilteredNovelDao
-import com.into.websoso.core.database.dao.NovelDao
-import com.into.websoso.core.database.entity.InDatabaseFilteredNovelEntity
-import com.into.websoso.core.database.entity.InDatabaseNovelEntity
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
+import com.into.websoso.core.database.datasource.library.dao.NovelDao
+import com.into.websoso.core.database.datasource.library.entity.InDatabaseNovelEntity
 
 @Database(
-    entities = [InDatabaseNovelEntity::class, InDatabaseFilteredNovelEntity::class],
-    version = 4,
+    entities = [InDatabaseNovelEntity::class],
+    version = 5,
     exportSchema = false,
 )
 @TypeConverters(Converters::class)
 internal abstract class WebsosoDatabase : RoomDatabase() {
     internal abstract fun novelDao(): NovelDao
-
-    internal abstract fun filteredNovelDao(): FilteredNovelDao
-}
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object DatabaseModule {
-    @Provides
-    @Singleton
-    internal fun provideDatabase(
-        @ApplicationContext context: Context,
-    ): WebsosoDatabase =
-        Room
-            .databaseBuilder(
-                context,
-                WebsosoDatabase::class.java,
-                "websoso.db",
-            ).build()
 }

core/database/src/main/java/com/into/websoso/core/database/datasource/library/DefaultLibraryLocalDataSource.kt

@@ -0,0 +1,45 @@
+package com.into.websoso.core.database.datasource.library
+
+import androidx.paging.PagingSource
+import com.into.websoso.core.database.datasource.library.dao.NovelDao
+import com.into.websoso.core.database.datasource.library.entity.InDatabaseNovelEntity
+import com.into.websoso.core.database.datasource.library.mapper.toData
+import com.into.websoso.core.database.datasource.library.mapper.toNovelDatabase
+import com.into.websoso.core.database.datasource.library.paging.mapValue
+import com.into.websoso.data.library.datasource.LibraryLocalDataSource
+import com.into.websoso.data.library.model.NovelEntity
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Inject
+import javax.inject.Singleton
+
+internal class DefaultLibraryLocalDataSource
+    @Inject
+    constructor(
+        private val novelDao: NovelDao,
+    ) : LibraryLocalDataSource {
+        override suspend fun insertNovels(novels: List<NovelEntity>) {
+            val offset = novelDao.selectNovelsCount()
+            novelDao.insertNovels(
+                novels.mapIndexed { index, novelEntity ->
+                    novelEntity.toNovelDatabase(offset + index)
+                },
+            )
+        }
+
+        override fun selectAllNovels(): PagingSource<Int, NovelEntity> = novelDao.selectAllNovels().mapValue(InDatabaseNovelEntity::toData)
+
+        override suspend fun deleteAllNovels() {
+            novelDao.deleteAllNovels()
+        }
+    }
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface LibraryDataSourceModule {
+    @Binds
+    @Singleton
+    fun bindLibraryDataSource(defaultLibraryLocalDataSource: DefaultLibraryLocalDataSource): LibraryLocalDataSource
+}

core/database/src/main/java/com/into/websoso/core/database/dao/NovelDao.kt → core/database/src/main/java/com/into/websoso/core/database/datasource/library/dao/NovelDao.kt

@@ -1,28 +1,31 @@
-package com.into.websoso.core.database.dao
+package com.into.websoso.core.database.datasource.library.dao
 
 import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.into.websoso.core.database.WebsosoDatabase
-import com.into.websoso.core.database.entity.InDatabaseNovelEntity
+import com.into.websoso.core.database.datasource.library.entity.InDatabaseNovelEntity
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
 @Dao
-interface NovelDao {
-    @Query("SELECT * FROM novels ORDER BY userNovelId DESC")
+internal interface NovelDao {
+    @Query("SELECT * FROM novels ORDER BY sortIndex ASC")
     fun selectAllNovels(): PagingSource<Int, InDatabaseNovelEntity>
 
+    @Query("SELECT COUNT(*) FROM novels")
+    suspend fun selectNovelsCount(): Int
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertNovels(novels: List<InDatabaseNovelEntity>)
 
     @Query("DELETE FROM novels")
-    suspend fun clearAll()
+    suspend fun deleteAllNovels()
 }
 
 @Module

core/database/src/main/java/com/into/websoso/core/database/entity/InDatabaseNovelEntity.kt → core/database/src/main/java/com/into/websoso/core/database/datasource/library/entity/InDatabaseNovelEntity.kt

@@ -1,13 +1,14 @@
-package com.into.websoso.core.database.entity
+package com.into.websoso.core.database.datasource.library.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "novels")
-data class InDatabaseNovelEntity(
+internal data class InDatabaseNovelEntity(
     @PrimaryKey val userNovelId: Long,
     val novelId: Long,
     val title: String,
+    val sortIndex: Int,
     val novelImage: String,
     val novelRating: Float,
     val readStatus: String,
@@ -19,3 +20,4 @@ data class InDatabaseNovelEntity(
     val keywords: List<String>,
     val myFeeds: List<String>,
 )
+

core/database/src/main/java/com/into/websoso/core/database/datasource/library/mapper/NovelMapper.kt

@@ -0,0 +1,39 @@
+package com.into.websoso.core.database.datasource.library.mapper
+
+import com.into.websoso.core.database.datasource.library.entity.InDatabaseNovelEntity
+import com.into.websoso.data.library.model.NovelEntity
+
+internal fun NovelEntity.toNovelDatabase(index: Int): InDatabaseNovelEntity =
+    InDatabaseNovelEntity(
+        userNovelId = userNovelId,
+        novelId = novelId,
+        title = title,
+        novelImage = novelImage,
+        novelRating = novelRating,
+        readStatus = readStatus,
+        isInterest = isInterest,
+        userNovelRating = userNovelRating,
+        attractivePoints = attractivePoints,
+        startDate = startDate,
+        endDate = endDate,
+        keywords = keywords,
+        myFeeds = myFeeds,
+        sortIndex = index,
+    )
+
+internal fun InDatabaseNovelEntity.toData(): NovelEntity =
+    NovelEntity(
+        userNovelId = userNovelId,
+        novelId = novelId,
+        title = title,
+        novelImage = novelImage,
+        novelRating = novelRating,
+        readStatus = readStatus,
+        isInterest = isInterest,
+        userNovelRating = userNovelRating,
+        attractivePoints = attractivePoints,
+        startDate = startDate,
+        endDate = endDate,
+        keywords = keywords,
+        myFeeds = myFeeds,
+    )

core/database/src/main/java/com/into/websoso/core/database/datasource/library/paging/MapValuePagingSource.kt

@@ -0,0 +1,30 @@
+package com.into.websoso.core.database.datasource.library.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+
+internal fun <K : Any, From : Any, To : Any> PagingSource<K, From>.mapValue(mapper: suspend (From) -> To): PagingSource<K, To> =
+    MapValuePagingSource(this, mapper)
+
+internal class MapValuePagingSource<Key : Any, From : Any, To : Any>(
+    private val targetSource: PagingSource<Key, From>,
+    private val mapper: suspend (From) -> To,
+) : PagingSource<Key, To>() {
+    override suspend fun load(params: LoadParams<Key>): LoadResult<Key, To> =
+        when (val result = targetSource.load(params)) {
+            is LoadResult.Page -> LoadResult.Page(
+                data = result.data.map { mapper(it) },
+                prevKey = result.prevKey,
+                nextKey = result.nextKey,
+                itemsBefore = result.itemsBefore,
+                itemsAfter = result.itemsAfter,
+            )
+
+            is LoadResult.Error -> LoadResult.Error(result.throwable)
+            is LoadResult.Invalid -> LoadResult.Invalid()
+        }
+
+    override val jumpingSupported: Boolean get() = targetSource.jumpingSupported
+
+    override fun getRefreshKey(state: PagingState<Key, To>): Key? = null
+}

core/database/src/main/java/com/into/websoso/core/database/di/DatabaseModule.kt

@@ -0,0 +1,28 @@
+package com.into.websoso.core.database.di
+
+import android.content.Context
+import androidx.room.Room
+import com.into.websoso.core.database.WebsosoDatabase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object DatabaseModule {
+    @Provides
+    @Singleton
+    internal fun provideDatabase(
+        @ApplicationContext context: Context,
+    ): WebsosoDatabase =
+        Room
+            .databaseBuilder(
+                context,
+                WebsosoDatabase::class.java,
+                "websoso.db",
+            ).fallbackToDestructiveMigration()
+            .build()
+}

core/datastore/src/main/java/com/into/websoso/core/datastore/datasource/library/DefaultLibraryFilterDataSource.kt

@@ -42,10 +42,10 @@ internal class DefaultLibraryFilterDataSource
                     }
                 }.distinctUntilChanged()
 
-        override suspend fun updateLibraryFilter(params: LibraryFilter) {
+        override suspend fun updateLibraryFilter(libraryFilter: LibraryFilter) {
             val encodedJsonString = withContext(dispatcher) {
                 Json.encodeToString(
-                    params.toPreferences(),
+                    libraryFilter.toPreferences(),
                 )
             }
 

core/datastore/src/main/java/com/into/websoso/core/datastore/datasource/library/model/LibraryFilterPreferences.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 internal data class LibraryFilterPreferences(
     val sortCriteria: String,
     val isInterested: Boolean,
-    val readStatuses: Map<String, Boolean>,
-    val attractivePoints: Map<String, Boolean>,
+    val readStatuses: List<String>,
+    val attractivePoints: List<String>,
     val novelRating: Float,
 )