경북대 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/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
 
-@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
-}
+}

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.ItemDao
+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): ItemDao {
+        return database.itemDao()
+    }
+
+    @Provides
+    @Singleton
+    fun provideKeywordRepository(keywordDao: KeywordDao): KeywordRepository {
+        return KeywordRepository(keywordDao)
+    }
+
+    @Provides
+    @Singleton
+    fun provideLocationSearcher(itemDao: ItemDao): LocationSearcher {
+        return LocationSearcher(itemDao)
+    }
+}

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/Item.kt

@@ -1,11 +1,6 @@
 package campus.tech.kakao.map.model
 
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "location")
 data class Item(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0, // 기본값 추가
     val place: String,
     val address: String,
     val category: String,

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))
     }
-}
+}

app/src/main/java/campus/tech/kakao/map/repository/location/ItemDao.kt

@@ -1,19 +1,11 @@
 package campus.tech.kakao.map.repository.location
 
 import androidx.room.Dao
-import androidx.room.Insert
 import androidx.room.Query
-import androidx.room.Delete
-import campus.tech.kakao.map.model.Item
+import campus.tech.kakao.map.entity.LocationEntity
 
 @Dao
 interface ItemDao {
-    @Query("SELECT * FROM location WHERE category LIKE :keyword")
-    suspend fun search(keyword: String): List<Item>
-
-    @Insert
-    suspend fun insert(item: Item)
-
-    @Delete
-    suspend fun delete(item: Item)
+    @Query("SELECT * FROM location WHERE category_group_name = :category")
+    suspend fun searchByCategory(category: String): List<LocationEntity>
 }

app/src/main/java/campus/tech/kakao/map/repository/location/LocationSearcher.kt

@@ -1,19 +1,22 @@
 package campus.tech.kakao.map.repository.location
 
-import android.content.Context
-import androidx.room.Room
-import campus.tech.kakao.map.database.AppDatabase
 import campus.tech.kakao.map.model.Item
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class LocationSearcher(context: Context) {
-    private val db = Room.databaseBuilder(
-        context.applicationContext,
-        AppDatabase::class.java, "app-database"
-    ).build()
-    private val itemDao = db.itemDao()
+@Singleton
+class LocationSearcher @Inject constructor(private val itemDao: ItemDao) {
 
     suspend fun search(keyword: String): List<Item> {
-        return itemDao.search("%$keyword%")
-
+        val locationEntities = itemDao.searchByCategory(keyword)
+        return locationEntities.map {
+            Item(
+                place = it.placeName,
+                address = it.addressName,
+                category = it.categoryGroupName,
+                latitude = it.latitude,
+                longitude = it.longitude
+            )
+        }
     }
-}
+}

app/src/main/java/campus/tech/kakao/map/view/MainActivity.kt

@@ -254,4 +254,4 @@ class MainActivity : AppCompatActivity(), OnSearchItemClickListener, OnKeywordIt
         private const val DEFAULT_ZOOM_LEVEL = 1
         private const val CAMERA_ANIMATION_DURATION = 10
     }
-}
+}

app/src/main/java/campus/tech/kakao/map/view/SearchActivity.kt

@@ -24,6 +24,10 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class SearchActivity : AppCompatActivity(), OnSearchItemClickListener, OnKeywordItemClickListener {
     private lateinit var binding: ActivitySearchBinding
+
+    @Inject
+    lateinit var api: KakaoLocalApi
+
     private lateinit var searchViewModel: SearchViewModel
     private lateinit var keywordViewModel: KeywordViewModel
     private lateinit var searchAdapter: SearchAdapter

app/src/main/java/campus/tech/kakao/map/viewmodel/OnSearchItemClickListener.kt

@@ -4,4 +4,4 @@ import campus.tech.kakao.map.model.Item
 
 interface OnSearchItemClickListener {
     fun onSearchItemClick(item: Item)
-}
+}

app/src/main/java/campus/tech/kakao/map/viewmodel/main/MainViewmodel.kt

@@ -58,4 +58,4 @@ class MainViewModel @Inject constructor(
         private const val PREF_PLACE_NAME = "lastPlaceName"
         private const val PREF_ROAD_ADDRESS_NAME = "lastRoadAddressName"
     }
-}
+}