경북대 Android 남지연 5주차 과제 Step2

README.md

@@ -1,7 +1,5 @@
 # android-map-refactoring
 ## 기능 요구 사항
-- 데이터베이스를 Room으로 변경한다.
-- 가능한 모든 부분에 대해서 의존성 주입을 적용한다.
-## 프로그래밍 요구 사항
-- 의존성 주입을 위해서 Hilt를 사용한다.
-- 코드 컨벤션을 준수하며 프로그래밍한다.
+- MVVM 아키텍처 패턴을 적용한다.
+- DataBinding, LiveData를 사용한다.
+- 비동기 처리를 Coroutine으로 변경한다.

app/src/main/java/campus/tech/kakao/MyApplication.kt

@@ -2,7 +2,6 @@ package campus.tech.kakao
 
 import android.app.Application
 import com.kakao.vectormap.KakaoMapSdk
-import campus.tech.kakao.map.BuildConfig
 import campus.tech.kakao.map.R
 import dagger.hilt.android.HiltAndroidApp
 

app/src/main/java/campus/tech/kakao/map/adapter/keyword/KeywordAdapter.kt

@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import campus.tech.kakao.map.R
-import campus.tech.kakao.map.viewmodel.OnKeywordItemClickListener
+import campus.tech.kakao.map.view.OnKeywordItemClickListener
 
 class KeywordAdapter(private val onKeywordItemClickListener: OnKeywordItemClickListener) :
     ListAdapter<String, KeywordAdapter.KeywordViewHolder>(

app/src/main/java/campus/tech/kakao/map/adapter/search/SearchAdapter.kt

@@ -9,17 +9,17 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import campus.tech.kakao.map.R
-import campus.tech.kakao.map.model.Item
-import campus.tech.kakao.map.viewmodel.OnSearchItemClickListener
+import campus.tech.kakao.map.model.Location
+import campus.tech.kakao.map.view.OnSearchItemClickListener
 
 class SearchAdapter(
     private val onSearchItemClickListener: OnSearchItemClickListener
-) : ListAdapter<Item, SearchAdapter.SearchViewHolder>(
-    object : DiffUtil.ItemCallback<Item>() {
-        override fun areItemsTheSame(oldItem: Item, newItem: Item) =
+) : ListAdapter<Location, SearchAdapter.SearchViewHolder>(
+    object : DiffUtil.ItemCallback<Location>() {
+        override fun areItemsTheSame(oldItem: Location, newItem: Location) =
             oldItem.place == newItem.place
 
-        override fun areContentsTheSame(oldItem: Item, newItem: Item) =
+        override fun areContentsTheSame(oldItem: Location, newItem: Location) =
             oldItem == newItem
     }
 ) {
@@ -39,13 +39,13 @@ class SearchAdapter(
         private val address: TextView = view.findViewById(R.id.address)
         private val category: TextView = view.findViewById(R.id.category)
 
-        fun bindViewHolder(item: Item, onSearchItemClickListener: OnSearchItemClickListener) {
-            place.text = item.place
-            address.text = item.address
-            category.text = item.category
+        fun bindViewHolder(location: Location, onSearchItemClickListener: OnSearchItemClickListener) {
+            place.text = location.place
+            address.text = location.address
+            category.text = location.category
 
             itemList.setOnClickListener {
-                onSearchItemClickListener.onSearchItemClick(item)
+                onSearchItemClickListener.onSearchItemClick(location)
             }
         }
     }

app/src/main/java/campus/tech/kakao/map/api/KakaoLocalApi.kt

@@ -51,4 +51,4 @@ data class Meta(
 
     @SerializedName("is_end")
     val isEnd: Boolean
-)
+)

app/src/main/java/campus/tech/kakao/map/database/AppDatabase.kt

@@ -2,13 +2,13 @@ package campus.tech.kakao.map.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import campus.tech.kakao.map.model.Keyword
-import campus.tech.kakao.map.model.Item
+import campus.tech.kakao.map.entity.KeywordEntity
+import campus.tech.kakao.map.entity.LocationEntity
 import campus.tech.kakao.map.repository.keyword.KeywordDao
-import campus.tech.kakao.map.repository.location.ItemDao
+import campus.tech.kakao.map.repository.location.LocationDao
 
-@Database(entities = [Keyword::class, Item::class], version = 1)
+@Database(entities = [KeywordEntity::class, LocationEntity::class], version = 2)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun keywordDao(): KeywordDao
-    abstract fun itemDao(): ItemDao
-}
+    abstract fun locationDao(): LocationDao
+}

app/src/main/java/campus/tech/kakao/map/di/AppModule.kt

@@ -1,13 +1,9 @@
-package campus.tech.kakao.di
+package campus.tech.kakao.map.di
 
-import android.content.Context
 import campus.tech.kakao.map.api.KakaoLocalApi
-import campus.tech.kakao.map.repository.keyword.KeywordRepository
-import campus.tech.kakao.map.repository.location.LocationSearcher
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -31,16 +27,4 @@ object AppModule {
     fun provideKakaoLocalApi(retrofit: Retrofit): KakaoLocalApi {
         return retrofit.create(KakaoLocalApi::class.java)
     }
-
-    @Provides
-    @Singleton
-    fun provideKeywordRepository(@ApplicationContext context: Context): KeywordRepository {
-        return KeywordRepository(context)
-    }
-
-    @Provides
-    @Singleton
-    fun provideLocationSearcher(@ApplicationContext context: Context): LocationSearcher {
-        return LocationSearcher(context)
-    }
 }

app/src/main/java/campus/tech/kakao/map/di/DatabaseModule.kt

@@ -0,0 +1,56 @@
+package campus.tech.kakao.map.di
+
+import android.content.Context
+import androidx.room.Room
+import campus.tech.kakao.map.database.AppDatabase
+import campus.tech.kakao.map.repository.keyword.KeywordDao
+import campus.tech.kakao.map.repository.location.LocationDao
+import campus.tech.kakao.map.repository.keyword.KeywordRepository
+import campus.tech.kakao.map.repository.location.LocationSearcher
+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 DatabaseModule {
+
+    @Provides
+    @Singleton
+    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+        return Room.databaseBuilder(
+            context.applicationContext,
+            AppDatabase::class.java,
+            "app_database"
+        )
+            .fallbackToDestructiveMigration() // 필요시 마이그레이션 재생성
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideKeywordDao(database: AppDatabase): KeywordDao {
+        return database.keywordDao()
+    }
+
+    @Provides
+    @Singleton
+    fun provideItemDao(database: AppDatabase): LocationDao {
+        return database.locationDao()
+    }
+
+    @Provides
+    @Singleton
+    fun provideKeywordRepository(keywordDao: KeywordDao): KeywordRepository {
+        return KeywordRepository(keywordDao)
+    }
+
+    @Provides
+    @Singleton
+    fun provideLocationSearcher(locationDao: LocationDao): LocationSearcher {
+        return LocationSearcher(locationDao)
+    }
+}

app/src/main/java/campus/tech/kakao/map/entity/KeywordEntity.kt

@@ -0,0 +1,11 @@
+package campus.tech.kakao.map.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "keywords")
+data class KeywordEntity(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "keyword") val keyword: String
+)

app/src/main/java/campus/tech/kakao/map/entity/LocationEntity.kt

@@ -0,0 +1,15 @@
+package campus.tech.kakao.map.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "location")
+data class LocationEntity(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "place_name") val placeName: String,
+    @ColumnInfo(name = "address_name") val addressName: String,
+    @ColumnInfo(name = "category_group_name") val categoryGroupName: String,
+    @ColumnInfo(name = "latitude") val latitude: Double,
+    @ColumnInfo(name = "longitude") val longitude: Double
+)

app/src/main/java/campus/tech/kakao/map/model/Keyword.kt

@@ -7,4 +7,4 @@ import androidx.room.PrimaryKey
 data class Keyword(
     @PrimaryKey(autoGenerate = true) val id: Int = 0,
     val recentKeyword: String
-)
+)

app/src/main/java/campus/tech/kakao/map/model/item.kt → app/src/main/java/campus/tech/kakao/map/model/Location.kt

@@ -1,9 +1,9 @@
 package campus.tech.kakao.map.model
 
-data class Item(
+data class Location(
     val place: String,
     val address: String,
     val category: String,
     val latitude: Double,
-    val longitude:Double
-)
+    val longitude: Double
+)

app/src/main/java/campus/tech/kakao/map/repository/keyword/KeywordDao.kt

@@ -1,19 +1,20 @@
 package campus.tech.kakao.map.repository.keyword
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Delete
-import campus.tech.kakao.map.model.Keyword
+import campus.tech.kakao.map.entity.KeywordEntity
 
 @Dao
 interface KeywordDao {
-    @Insert
-    suspend fun insert(keyword: Keyword)
+    @Query("SELECT * FROM keywords")
+    suspend fun getAllKeywords(): List<KeywordEntity>
 
-    @Query("SELECT * FROM keyword")
-    suspend fun getAllKeywords(): List<Keyword>
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertKeyword(keyword: KeywordEntity)
 
     @Delete
-    suspend fun delete(keyword: Keyword)
-}
+    suspend fun deleteKeyword(keyword: KeywordEntity)
+}

app/src/main/java/campus/tech/kakao/map/repository/keyword/KeywordRepository.kt

@@ -1,27 +1,21 @@
 package campus.tech.kakao.map.repository.keyword
 
-import android.content.Context
-import androidx.room.Room
-import campus.tech.kakao.map.database.AppDatabase
-import campus.tech.kakao.map.model.Keyword
+import campus.tech.kakao.map.entity.KeywordEntity
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class KeywordRepository(context: Context) {
-    private val db = Room.databaseBuilder(
-        context.applicationContext,
-        AppDatabase::class.java, "app-database"
-    ).build()
-    private val keywordDao = db.keywordDao()
+@Singleton
+class KeywordRepository @Inject constructor(private val keywordDao: KeywordDao) {
 
-    suspend fun update(keyword: String) {
-        keywordDao.insert(Keyword(recentKeyword = keyword))
+    suspend fun read(): List<String> {
+        return keywordDao.getAllKeywords().map { it.keyword }
     }
 
-    suspend fun read(): List<String> {
-        return keywordDao.getAllKeywords().map { it.recentKeyword }
+    suspend fun update(keyword: String) {
+        keywordDao.insertKeyword(KeywordEntity(keyword = keyword))
     }
 
     suspend fun delete(keyword: String) {
-        val keywordEntity = keywordDao.getAllKeywords().find { it.recentKeyword == keyword }
-        keywordEntity?.let { keywordDao.delete(it) }
+        keywordDao.deleteKeyword(KeywordEntity(keyword = keyword))
     }
-}
+}