강원대_Android_이아림_5주차과제_STEP2

app/build.gradle.kts

@@ -94,12 +94,11 @@ dependencies {
     kapt("androidx.room:room-compiler:2.6.1")
     kapt("com.google.dagger:hilt-compiler:2.51.1")
     kapt("com.google.dagger:hilt-android-compiler:2.51.1")
-    kapt("org.xerial:sqlite-jdbc:3.41.2.2")
     kapt("androidx.lifecycle:lifecycle-compiler:$lifecycle_version")
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("io.mockk:mockk-android:1.13.11")
-    testImplementation("io.mockk:mockk-agent:1.13.11")
+    testImplementation("io.mockk:mockk-android:1.13.12")
+    testImplementation("io.mockk:mockk-agent:1.13.12")
     testImplementation("androidx.arch.core:core-testing:2.2.0")
     testImplementation("org.robolectric:robolectric:4.13")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1")

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

@@ -0,0 +1,26 @@
+package campus.tech.kakao.map.data.di
+
+import android.content.Context
+import campus.tech.kakao.map.data.db.AppDatabase
+import campus.tech.kakao.map.data.db.PlaceDao
+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 AppDatabase.getDatabase(context)
+    }
+
+    @Provides
+    fun providePlaceDao(database: AppDatabase): PlaceDao {
+        return database.placeDao()
+    }
+}

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

@@ -0,0 +1,32 @@
+package campus.tech.kakao.map.data.di
+
+import campus.tech.kakao.map.data.remote.api.KakaoApiService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+
+    private const val BASE_URL = "https://dapi.kakao.com/"
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideKakaoApiService(retrofit: Retrofit): KakaoApiService {
+        return retrofit.create(KakaoApiService::class.java)
+    }
+}

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

@@ -0,0 +1,21 @@
+package campus.tech.kakao.map.data.di
+
+import android.content.Context
+import android.content.SharedPreferences
+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 PreferencesModule {
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
+        return context.getSharedPreferences("LastLocation", Context.MODE_PRIVATE)
+    }
+}

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

@@ -0,0 +1,49 @@
+package campus.tech.kakao.map.data.di
+
+import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
+import campus.tech.kakao.map.base.MyApplication
+import campus.tech.kakao.map.data.db.PlaceDao
+import campus.tech.kakao.map.data.remote.api.KakaoApiService
+import campus.tech.kakao.map.repository.LogRepository
+import campus.tech.kakao.map.repository.LogRepositoryInterface
+import campus.tech.kakao.map.repository.MapRepository
+import campus.tech.kakao.map.repository.MapRepositoryInterface
+import campus.tech.kakao.map.repository.PlaceRepository
+import campus.tech.kakao.map.repository.PlaceRepositoryInterface
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RepositoryModule {
+
+    @Provides
+    @Singleton
+    fun provideContext(application: Application): Context {
+        return application.applicationContext
+    }
+
+
+    @Provides
+    @Singleton
+    fun providePlaceRepository(sharedPreferences: SharedPreferences, kakaoApiService: KakaoApiService): PlaceRepositoryInterface {
+        return PlaceRepository(sharedPreferences, kakaoApiService)
+    }
+
+    @Provides
+    @Singleton
+    fun provideLogRepository(context: Context, placeDao: PlaceDao): LogRepositoryInterface {
+        return LogRepository(context.applicationContext as MyApplication, placeDao)
+    }
+
+    @Provides
+    @Singleton
+    fun provideMapRepository(context: Context): MapRepositoryInterface {
+        return MapRepository(context.applicationContext as MyApplication)
+    }
+}

app/src/main/java/campus/tech/kakao/map/data/remote/api/KakaoApiService.kt

@@ -8,8 +8,8 @@ import retrofit2.http.Query
 
 interface KakaoApiService {
     @GET("v2/local/search/keyword")
-    fun getPlace(
+    suspend fun getPlace(
         @Header("Authorization") apiKey: String,
         @Query("query") query: String,
-    ): Call<KakaoResponse>
+    ): KakaoResponse
 }

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

@@ -9,9 +9,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class LogRepository @Inject constructor (private val application: MyApplication, private val placeDao: PlaceDao): LogRepositoryInterface {
 
-class LogRepository(private val application: MyApplication): LogRepositoryInterface {
-    private val placeDao: PlaceDao = AppDatabase.getDatabase(application).placeDao()
     private var logList = mutableListOf<Place>()
 
     override fun getAllLogs(): List<Place> {

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

@@ -1,54 +1,42 @@
 package campus.tech.kakao.map.repository
 
-import android.content.ContentValues
-import android.content.Context
+import android.content.SharedPreferences
 import android.util.Log
 import campus.tech.kakao.map.BuildConfig
 import campus.tech.kakao.map.R
-import campus.tech.kakao.map.base.MyApplication
 import campus.tech.kakao.map.data.db.entity.Place
+import campus.tech.kakao.map.data.remote.api.KakaoApiService
 import campus.tech.kakao.map.data.remote.model.KakaoResponse
-import campus.tech.kakao.map.data.remote.api.RetrofitClient
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import javax.inject.Inject
 
-class PlaceRepository(private val application: MyApplication): PlaceRepositoryInterface {
-    private val sharedPreferences = application.getSharedPreferences("LastLocation", Context.MODE_PRIVATE)
+class PlaceRepository @Inject constructor(
+    private val sharedPreferences: SharedPreferences,
+    private val kakaoApiService: KakaoApiService
+): PlaceRepositoryInterface {
 
-    override fun searchPlaces(query: String, callback: (List<Place>) -> Unit){
+    override suspend fun searchPlaces(query: String): List<Place>{
         val apiKey = "KakaoAK " + BuildConfig.KAKAO_REST_API_KEY
-        val retrofitService = RetrofitClient.retrofitService
 
-        retrofitService.getPlace(apiKey, query)
-            .enqueue(object : Callback<KakaoResponse> {
-                override fun onResponse(
-                    call: Call<KakaoResponse>,
-                    response: Response<KakaoResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        val documentList = response.body()?.documents ?: emptyList()
-                        val placeList = documentList.map {
-                            Place(
-                                img = R.drawable.location,
-                                name = it.placeName,
-                                location = it.addressName,
-                                category = it.categoryGroupName,
-                                x = it.x,
-                                y = it.y)
-                        }
-                        callback(placeList)
-                    } else {
-                        Log.d("KakaoAPI", response.errorBody()?.string().toString())
-                        callback(emptyList())
-                    }
-                }
-
-                override fun onFailure(call: Call<KakaoResponse>, t: Throwable) {
-                    Log.d("KakaoAPI", "Failure: ${t.message}")
-                    callback(emptyList())
-                }
-            })
+        return try {
+            val response = kakaoApiService.getPlace(apiKey, query)
+            val documentList = response.documents ?: emptyList()
+            documentList.map {
+                Place(
+                    img = R.drawable.location,
+                    name = it.placeName,
+                    location = it.addressName,
+                    category = it.categoryGroupName,
+                    x = it.x,
+                    y = it.y
+                )
+            }
+        } catch (e: Exception) {
+            Log.e("KakaoAPI", "Failure: ${e.message}")
+            emptyList()
+        }
     }
 
     override fun saveLastLocation(item: Place) {

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

@@ -3,6 +3,7 @@ package campus.tech.kakao.map.repository
 import campus.tech.kakao.map.data.db.entity.Place
 
 interface PlaceRepositoryInterface {
-    fun searchPlaces(query: String, callback: (List<Place>) -> Unit)
+    suspend fun searchPlaces(query: String): List<Place>
+
     fun saveLastLocation(item: Place)
 }

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

@@ -73,10 +73,8 @@ class MainActivity : AppCompatActivity() {
         }
     }
     private fun handleTextChanged(query: String){
-        // ViewModel에 콜백전달 -> 순서부여
-        placeViewModel.callResultList(query){
-            observePlaceListChanges()
-        }
+        placeViewModel.callResultList(query)
+        observePlaceListChanges()
     }
     private fun observePlaceListChanges(){
         updatePlaceList()