Merge pull request #57 from SSUDevelog/feature/#56-recent-search

Feature/#56 recent search

Author: lsakee

app/build.gradle.kts

@@ -82,6 +82,8 @@ dependencies {
     implementation(AndroidX.NAVIGATION_CONPONENT_FRAGMENT)
     implementation(AndroidX.NAVIGATION_CONPONENT_UI)
     implementation(AndroidX.CONSTRAINT_LAYOUT)
+    implementation(AndroidX.ROOM_RUNTIME)
+    kapt(AndroidX.ROOM_COMPILER)
 
     // Matrial Design
     implementation(Google.MATERIAL)

app/src/main/java/com/velogandroid/di/DataSourceModule.kt

@@ -1,11 +1,15 @@
 package com.velogandroid.di
 
-import com.data_remote.datasource.TagDataSourceImpl
 import com.data_remote.datasource.SignDataSourceImpl
 import com.data_remote.datasource.SubscribeDataSourceImpl
-import com.velogm.data.datasource.TagDataSource
+import com.data_remote.datasource.TagDataSourceImpl
+import com.velogm.data.datasource.SearchDataSource
+import com.velogm.data.datasource.SharedPreferencesDataSource
 import com.velogm.data.datasource.SignDataSource
 import com.velogm.data.datasource.SubscribeDataSource
+import com.velogm.data.datasource.TagDataSource
+import com.velogm.data_local.datasource.SearchDataSourceImpl
+import com.velogm.data_local.datasource.SharedPreferencesDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -28,4 +32,11 @@ abstract class DataSourceModule {
     @Binds
     abstract fun providesSubscribeDataSource(DataSourceImpl: SubscribeDataSourceImpl): SubscribeDataSource
 
+    @Singleton
+    @Binds
+    abstract fun providesSearchDataSource(DataSourceImpl: SearchDataSourceImpl): SearchDataSource
+
+    @Singleton
+    @Binds
+    abstract fun providesSharedPreferencesDataSource(DataSourceImpl: SharedPreferencesDataSourceImpl): SharedPreferencesDataSource
 }

app/src/main/java/com/velogandroid/di/Qualifier.kt

@@ -7,4 +7,5 @@ import javax.inject.Qualifier
 annotation class VelogRetrofit
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
-annotation class Token
+annotation class Token
+

app/src/main/java/com/velogandroid/di/RepoModule.kt

@@ -1,13 +1,15 @@
 package com.velogandroid.di
 
 import com.velogm.data.repositoryimpl.AuthRepositoryImpl
-import com.velogm.data.repositoryimpl.TagRepositoryImpl
+import com.velogm.data.repositoryimpl.SearchRepositoryImpl
 import com.velogm.data.repositoryimpl.SignRepositoryImpl
 import com.velogm.data.repositoryimpl.SubscribeRepositoryImpl
+import com.velogm.data.repositoryimpl.TagRepositoryImpl
 import com.velogm.domain.repository.AuthRepository
-import com.velogm.domain.repository.TagRepository
+import com.velogm.domain.repository.SearchRepository
 import com.velogm.domain.repository.SignRepository
 import com.velogm.domain.repository.SubscribeRepository
+import com.velogm.domain.repository.TagRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -42,4 +44,9 @@ abstract class RepositoryModule {
         RepositoryImpl: SubscribeRepositoryImpl,
     ): SubscribeRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindsSearchRepository(
+        RepositoryImpl: SearchRepositoryImpl,
+    ): SearchRepository
 }

app/src/main/java/com/velogandroid/di/RoomModule.kt

@@ -0,0 +1,29 @@
+package com.velogandroid.di
+
+import android.content.Context
+import androidx.room.Room
+import com.velogm.data_local.datasource.AppDatabase
+import com.velogm.data_local.datasource.dao.RecentSearchWordDao
+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)
+object RoomModule {
+    @Singleton
+    @Provides
+    fun provideDataBase(
+        @ApplicationContext context: Context
+    ): AppDatabase =
+        Room.databaseBuilder(context, AppDatabase::class.java, "velog_search.db").build()
+
+    @Provides
+    @Singleton
+    fun providesRoomDao(appDatabase: AppDatabase): RecentSearchWordDao =
+        appDatabase.recentSearchWordDao()
+
+}

app/src/main/java/com/velogandroid/di/UseCaseModule.kt

@@ -1,5 +1,6 @@
 package com.velogandroid.di
 
+import com.velogm.domain.repository.SearchRepository
 import com.velogm.domain.repository.SignRepository
 import com.velogm.domain.repository.SubscribeRepository
 import com.velogm.domain.repository.TagRepository
@@ -85,4 +86,22 @@ class UseCaseModule {
     fun provideAddFollowerUseCase(repository: SubscribeRepository): AddFollowerUseCase {
         return AddFollowerUseCase(repository)
     }
+
+    @Singleton
+    @Provides
+    fun provideGetRecentSearchWordUseCase(repository: SearchRepository): GetRecentSearchWordUseCase {
+        return GetRecentSearchWordUseCase(repository)
+    }
+
+    @Singleton
+    @Provides
+    fun provideAddRecentWordUseCase(repository: SearchRepository): AddRecentSearchWordUseCase {
+        return AddRecentSearchWordUseCase(repository)
+    }
+
+    @Singleton
+    @Provides
+    fun provideDeleteRecentWordUseCase(repository: SearchRepository): DeleteRecentSearchWordUseCase {
+        return DeleteRecentSearchWordUseCase(repository)
+    }
 }

buildSrc/src/main/java/Dependencies.kt

@@ -17,7 +17,12 @@ object AndroidX {
     const val NAVIGATION_CONPONENT_UI =
         "androidx.navigation:navigation-ui-ktx:${Versions.NAV_VERSION}"
 
-    const val CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:${Versions.CONSTRAINT_VERSION}"
+    const val CONSTRAINT_LAYOUT =
+        "androidx.constraintlayout:constraintlayout:${Versions.CONSTRAINT_VERSION}"
+
+    const val ROOM_RUNTIME = "androidx.room:room-runtime:${Versions.ROOM_VERSION}"
+    const val ROOM_COMPILER = "androidx.room:room-compiler:${Versions.ROOM_VERSION}"
+    const val ROOM_KTX = "androidx.room:room-ktx:${Versions.ROOM_VERSION}"
 }
 
 object TestDependencies {
@@ -33,7 +38,8 @@ object Google {
     const val HILT_ANDROID_COMPILER = "com.google.dagger:hilt-android-compiler:${Versions.HILT}"
     const val GOOGLE_PLAY =
         "com.google.android.gms:play-services-auth:${Versions.GOOGLE_PLAY_VERSION}"
-    const val GOOGLE_FIREBASE_BOM = "com.google.firebase:firebase-bom:${Versions.GOOGLE_FIREBASE_BOM}"
+    const val GOOGLE_FIREBASE_BOM =
+        "com.google.firebase:firebase-bom:${Versions.GOOGLE_FIREBASE_BOM}"
     const val GOOGLE_FIREBASE_ANALYTICS = "com.google.firebase:firebase-analytics-ktx"
     const val GOOGLE_FIREBASE_MESSAGING = "com.google.firebase:firebase-messaging"
 }

buildSrc/src/main/java/Versions.kt

@@ -38,9 +38,11 @@ object Versions {
     const val ZXING_VERSION = "4.3.0"
 
     const val CONSTRAINT_VERSION = "2.0.0-beta1"
-  
+
     const val GOOGLE_PLAY_VERSION = "20.6.0"
     const val GOOGLE_SERVICE_VERSION = "4.4.0"
     const val GOOGLE_FIREBASE_BOM = "32.1.1"
 
+    const val ROOM_VERSION = "2.5.0"
+
 }

data-local/build.gradle.kts

@@ -39,9 +39,13 @@ android {
 dependencies {
 
     implementation(project(":domain"))
+    implementation(project(":data"))
     // AndroidX
     implementation(AndroidX.APP_COMPAT)
     implementation(AndroidX.CORE_KTX)
+    implementation(AndroidX.ROOM_RUNTIME)
+    implementation(AndroidX.ROOM_KTX)
+    kapt(AndroidX.ROOM_COMPILER)
     // Matrial Design
     implementation(Google.MATERIAL)
     // Test Dependency

data-local/src/main/java/com/velogm/data_local/datasource/AppDatabase.kt

@@ -0,0 +1,12 @@
+package com.velogm.data_local.datasource
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.velogm.data.dto.response.RecentSearchWordDto
+import com.velogm.data_local.datasource.dao.RecentSearchWordDao
+
+@Database(entities = [RecentSearchWordDto::class], version = 1)
+
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun recentSearchWordDao(): RecentSearchWordDao
+}

data-local/src/main/java/com/velogm/data_local/datasource/SearchDataSourceImpl.kt

@@ -0,0 +1,27 @@
+package com.velogm.data_local.datasource
+
+import android.content.SharedPreferences
+import com.velogm.data.datasource.SearchDataSource
+import com.velogm.data.dto.response.RecentSearchWordDto
+import com.velogm.data_local.datasource.dao.RecentSearchWordDao
+import javax.inject.Inject
+
+class SearchDataSourceImpl @Inject constructor(
+    private val dao: RecentSearchWordDao, private val prefs: SharedPreferences
+) : SearchDataSource {
+    override suspend fun getRecentSearchWord(): List<RecentSearchWordDto> {
+        return dao.load(prefs.getString("AccessToken", "") ?: "")
+    }
+
+    override suspend fun addRecentSearchWord(word: String) {
+        dao.insert(
+            RecentSearchWordDto(
+                prefs.getString("AccessToken", "") ?: "", recentSearchWord = word
+            )
+        )
+    }
+
+    override suspend fun deleteRecentSearchWord() {
+        dao.deleteByToken(prefs.getString("AccessToken", "") ?: "")
+    }
+}

data-local/src/main/java/com/velogm/data_local/datasource/SharedPreferencesDataSource.kt renamed to data-local/src/main/java/com/velogm/data_local/datasource/SharedPreferencesDataSourceImpl.kt

@@ -2,26 +2,27 @@ package com.velogm.data_local.datasource
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
+import com.velogm.data.datasource.SharedPreferencesDataSource
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SharedPreferencesDataSource @Inject constructor(
+class SharedPreferencesDataSourceImpl @Inject constructor(
     private val prefs: SharedPreferences,
-) {
-    var accessToken: String?
+) : SharedPreferencesDataSource {
+    override var accessToken: String?
         get() = prefs.getString("AccessToken", null)
         set(value) = prefs.edit { putString("AccessToken", value) }
 
-    var refreshToken: String?
+    override var refreshToken: String?
         get() = prefs.getString("RefreshToken", null)
         set(value) = prefs.edit { putString("RefreshToken", value) }
 
-    var checkLogin: Boolean
+    override var checkLogin: Boolean
         get() = prefs.getBoolean("CheckLogin", false)
         set(value) = prefs.edit { putBoolean("CheckLogin", value) }
 
-    var withdrawal: Boolean
+    override var withdrawal: Boolean
         get() = prefs.getBoolean("CheckWithdrawal", false)
         set(value) = prefs.edit { putBoolean("CheckWithdrawal", value) }
 

data-local/src/main/java/com/velogm/data_local/datasource/dao/RecentSearchWordDao.kt

@@ -0,0 +1,20 @@
+package com.velogm.data_local.datasource.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.velogm.data.dto.response.RecentSearchWordDto
+
+@Dao
+interface RecentSearchWordDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(recentSearchWordDto: RecentSearchWordDto)
+
+    @Query("SELECT * FROM recent_search_word Where access_token = (:token)")
+    suspend fun load(token: String): List<RecentSearchWordDto>
+
+    @Query("DELETE FROM recent_search_word WHERE access_token = :token")
+    suspend fun deleteByToken(token: String)
+}

data/build.gradle.kts

@@ -38,10 +38,12 @@ android {
 
 dependencies {
     implementation(project(":domain"))
-    implementation(project(":data-local"))
     // AndroidX
     implementation(AndroidX.APP_COMPAT)
     implementation(AndroidX.CORE_KTX)
+    implementation(AndroidX.ROOM_RUNTIME)
+    implementation(AndroidX.ROOM_KTX)
+    kapt(AndroidX.ROOM_COMPILER)
     // Matrial Design
     implementation(Google.MATERIAL)
     // Test Dependency

data/src/main/java/com/velogm/data/datasource/SearchDataSource.kt

@@ -0,0 +1,10 @@
+package com.velogm.data.datasource
+
+import com.velogm.data.dto.response.RecentSearchWordDto
+
+interface SearchDataSource {
+    suspend fun getRecentSearchWord(): List<RecentSearchWordDto>
+    suspend fun addRecentSearchWord(word: String)
+
+    suspend fun deleteRecentSearchWord()
+}

data/src/main/java/com/velogm/data/datasource/SharedPreferencesDataSource.kt

@@ -0,0 +1,8 @@
+package com.velogm.data.datasource
+
+interface SharedPreferencesDataSource {
+    var accessToken: String?
+    var refreshToken: String?
+    var checkLogin: Boolean
+    var withdrawal: Boolean
+}

data/src/main/java/com/velogm/data/dto/response/RecentSearchWordDto.kt

@@ -0,0 +1,18 @@
+package com.velogm.data.dto.response
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.velogm.domain.model.RecentSearchWord
+
+@Entity(
+    tableName = "recent_search_word"
+)
+data class RecentSearchWordDto(
+    @ColumnInfo(name = "access_token") val accessToken: String,
+    @PrimaryKey @ColumnInfo(name = "word") val recentSearchWord: String
+) {
+    fun toRecentSearchWordEntity() = RecentSearchWord(
+        recentSearchWord
+    )
+}

data/src/main/java/com/velogm/data/repositoryimpl/AuthRepositoryImpl.kt

@@ -1,11 +1,11 @@
 package com.velogm.data.repositoryimpl
 
-import com.velogm.data_local.datasource.SharedPreferencesDataSource
+import com.velogm.data.datasource.SharedPreferencesDataSource
 import com.velogm.domain.repository.AuthRepository
 import javax.inject.Inject
 
 class AuthRepositoryImpl @Inject constructor(
-    private val sharedPrefDataSource: SharedPreferencesDataSource,
+    private val sharedPrefDataSource: SharedPreferencesDataSource
 ) : AuthRepository {
     override fun saveAccessToken(a: String) {
         sharedPrefDataSource.accessToken = a