refactor : NearPlaceApiService 없애고, TMap으로 통일 & getNearPlaces() 함수 Query 기본 값 미리 넣어주기

jeeminimini · jeeminimini · commit 22a51e7b774c · 2022-11-30T22:35:17.000+09:00
diff --git a/data/src/main/java/com/stop/data/di/ApiModule.kt b/data/src/main/java/com/stop/data/di/ApiModule.kt
@@ -43,12 +43,6 @@ internal object ApiModule {
         return retrofit.create(ApisDataService::class.java)
     }
 
-    @Provides
-    @Singleton
-    fun providePlaceApiService(@Named("Tmap") retrofit: Retrofit): NearPlaceApiService {
-        return retrofit.create(NearPlaceApiService::class.java)
-    }
-
     @Provides
     @Singleton
     fun provideSwOpenApiSeoulService(@Named("SwOpenApiSeoul") retrofit: Retrofit): SwOpenApiSeoulService {
diff --git a/data/src/main/java/com/stop/data/remote/network/NearPlaceApiService.kt b/data/src/main/java/com/stop/data/remote/network/NearPlaceApiService.kt
diff --git a/data/src/main/java/com/stop/data/remote/network/TmapApiService.kt b/data/src/main/java/com/stop/data/remote/network/TmapApiService.kt
@@ -1,6 +1,7 @@
 package com.stop.data.remote.network
 
 import com.stop.data.remote.model.NetworkResult
+import com.stop.data.remote.model.nearplace.NearPlaceResponse
 import com.stop.domain.model.route.tmap.origin.ReverseGeocodingResponse
 import com.stop.domain.model.route.tmap.origin.RouteResponse
 import retrofit2.http.Body
@@ -24,12 +25,23 @@ internal interface TmapApiService {
         @Query("addressType") addressType: String = REVERSE_GEOCODING_ADDRESS_TYPE,
     ) : NetworkResult<ReverseGeocodingResponse>
 
+    @GET(PLACE_SEARCH_URL)
+    suspend fun getNearPlaces(
+        @Query("version") version: Int = VERSION,
+        @Query("searchKeyword") searchKeyword: String,
+        @Query("centerLon") centerLon: Double,
+        @Query("centerLat") centerLat: Double,
+    ): NetworkResult<NearPlaceResponse>
+
     companion object {
         private const val TRANSPORT_URL = "transit/routes"
 
         private const val REVERSE_GEOCODING_URL = "tmap/geo/reversegeocoding"
         private const val REVERSE_GEOCODING_VERSION = 1
         private const val REVERSE_GEOCODING_COORDINATION_TYPE = "WGS84GEO"
         private const val REVERSE_GEOCODING_ADDRESS_TYPE = "A02"
+
+        private const val PLACE_SEARCH_URL = "/tmap/pois"
+        private const val VERSION = 1
     }
 }
diff --git a/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSource.kt b/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSource.kt
@@ -5,11 +5,9 @@ import com.stop.data.model.nearplace.Place
 interface NearPlaceRemoteDataSource {
 
     suspend fun getNearPlaces(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): Result<List<Place>>
 
 }
diff --git a/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSourceImpl.kt b/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSourceImpl.kt
@@ -2,26 +2,22 @@ package com.stop.data.remote.source.nearplace
 
 import com.stop.data.model.nearplace.Place
 import com.stop.data.remote.model.NetworkResult
-import com.stop.data.remote.network.NearPlaceApiService
+import com.stop.data.remote.network.TmapApiService
 import javax.inject.Inject
 
 internal class NearPlaceRemoteDataSourceImpl @Inject constructor(
-    private val nearPlaceApiService: NearPlaceApiService
+    private val tmapApiService: TmapApiService
 ) : NearPlaceRemoteDataSource {
 
     override suspend fun getNearPlaces(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): Result<List<Place>> {
-        val result = nearPlaceApiService.getNearPlaces(
-            version,
-            searchKeyword,
-            centerLon,
-            centerLat,
-            appKey
+        val result = tmapApiService.getNearPlaces(
+            searchKeyword = searchKeyword,
+            centerLon = centerLon,
+            centerLat = centerLat
         )
         return runCatching {
             when (result) {
diff --git a/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt
@@ -11,18 +11,14 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
 ) : NearPlaceRepository {
 
     override suspend fun getNearPlaces(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): List<Place> {
         return nearPlaceRemoteDataSource.getNearPlaces(
-            version,
-            searchKeyword,
-            centerLon,
-            centerLat,
-            appKey
+            searchKeyword = searchKeyword,
+            centerLon = centerLon,
+            centerLat = centerLat
         ).onSuccess { places ->
             return places.map {
                 it.toUseCaseModel()
@@ -33,18 +29,14 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getNowStationLocationInfo(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): NowStationLocationUseCaseItem {
         return nearPlaceRemoteDataSource.getNearPlaces(
-            version,
-            searchKeyword,
-            centerLon,
-            centerLat,
-            appKey
+            searchKeyword = searchKeyword,
+            centerLon = centerLon,
+            centerLat = centerLat
         ).onSuccess { places ->
             return places.first().toNowStationLocationUseCaseModel()
         }.onFailure {
diff --git a/domain/src/main/java/com/stop/domain/repository/NearPlaceRepository.kt b/domain/src/main/java/com/stop/domain/repository/NearPlaceRepository.kt
@@ -6,19 +6,15 @@ import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
 interface NearPlaceRepository {
 
     suspend fun getNearPlaces(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): List<Place>
 
     suspend fun getNowStationLocationInfo(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): NowStationLocationUseCaseItem
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCase.kt
@@ -5,11 +5,9 @@ import com.stop.domain.model.nearplace.Place
 interface GetNearPlacesUseCase {
 
     suspend fun getNearPlaces(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): List<Place>
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCaseImpl.kt
@@ -9,18 +9,14 @@ internal class GetNearPlacesUseCaseImpl @Inject constructor(
 ) : GetNearPlacesUseCase {
 
     override suspend fun getNearPlaces(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
         centerLat: Double,
-        appKey: String
     ): List<Place> =
         nearPlaceRepository.getNearPlaces(
-            version,
             searchKeyword,
             centerLon,
-            centerLat,
-            appKey
+            centerLat
         )
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetNowStationLocationUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetNowStationLocationUseCase.kt
@@ -5,11 +5,9 @@ import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
 interface GetNowStationLocationUseCase {
 
     suspend operator fun invoke(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): NowStationLocationUseCaseItem
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetNowStationLocationUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetNowStationLocationUseCaseImpl.kt
@@ -9,18 +9,14 @@ class GetNowStationLocationUseCaseImpl @Inject constructor(
 ) : GetNowStationLocationUseCase {
 
     override suspend fun invoke(
-        version: Int,
         searchKeyword: String,
         centerLon: Double,
-        centerLat: Double,
-        appKey: String
+        centerLat: Double
     ): NowStationLocationUseCaseItem {
         return nearPlaceRepository.getNowStationLocationInfo(
-            version = version,
             searchKeyword = searchKeyword,
             centerLon = centerLon,
-            centerLat = centerLat,
-            appKey = appKey
+            centerLat = centerLat
         )
     }
 
diff --git a/presentation/src/main/java/com/stop/AlarmWorker.kt b/presentation/src/main/java/com/stop/AlarmWorker.kt
@@ -7,12 +7,10 @@ import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
-import com.stop.domain.model.nearplace.Place
 import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.withContext
 
 // 일단은 NearPlaceUseCase 이용하여서 데이터 가져오기 구현
@@ -38,11 +36,9 @@ class AlarmWorker @AssistedInject constructor(
     private suspend fun callApi() {
         withContext(Dispatchers.IO) {
             val list = getNearPlacesUseCase.getNearPlaces(
-                1,
                 "아남타워",
                 126.969652,
-                37.553836,
-                BuildConfig.TMAP_APP_KEY
+                37.553836
             )
             Log.e("ABC", list.toString())
         }
diff --git a/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt b/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt
@@ -1,8 +1,6 @@
 package com.stop.ui.mission
 
-import android.util.Log
 import androidx.lifecycle.*
-import com.stop.data.BuildConfig
 import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
 import com.stop.domain.model.nowlocation.SubwayRouteLocationUseCaseItem
 import com.stop.domain.model.route.tmap.RouteRequest
@@ -112,7 +110,6 @@ class MissionViewModel @Inject constructor(
                 getBusNowLocationUseCase(TEST_BUS_540_ID).apply {
                     _busNowLocationInfo.value = this
                 }
-                Log.d("MissionViewModel", "busNowLocationInfo ${_busNowLocationInfo.value}")
                 delay(5000)
                 TIME_TEST += 1
             }
@@ -128,11 +125,9 @@ class MissionViewModel @Inject constructor(
     private suspend fun getNowStationLocation() = withContext(Dispatchers.Main) {
         startSubwayStation = getSubwayTrainNowLocation().stationName
         getNowStationLocationUseCase(
-            TMAP_VERSION,
             startSubwayStation,
             personCurrentLocation.longitude,
-            personCurrentLocation.latitude,
-            BuildConfig.T_MAP_APP_KEY
+            personCurrentLocation.latitude
         )
     }
 
@@ -152,7 +147,6 @@ class MissionViewModel @Inject constructor(
             ).apply {
                 _subwayRoute.value = this
             }
-            Log.d("MissionFragment", "subwayRoute ${_subwayRoute.value}")
         }
     }
 
@@ -170,9 +164,7 @@ class MissionViewModel @Inject constructor(
 
         private const val TEST_SUBWAY_NUMER = 4
         private const val LINE = "호선" //임시로.. 종성님이 어떻게 넘겨주시느냐에 따라 달림
-        private const val TEST_TRAIN_NUMBER = "4680"
-
-        private const val TMAP_VERSION = 1
+        private const val TEST_TRAIN_NUMBER = "4713"
 
         private const val TEST_SUBWAY_LAT = "37.30973177"
         private const val TEST_SUBWAY_LONG = "126.85359515"
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt b/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt
@@ -1,14 +1,11 @@
 package com.stop.ui.placesearch
 
-import android.location.LocationManager
 import android.text.Editable
-import android.util.Log
 import android.view.View
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.stop.BuildConfig
 import com.stop.domain.model.geoLocation.GeoLocationInfo
 import com.stop.domain.model.nearplace.Place
 import com.stop.domain.usecase.geoLocation.GeoLocationUseCase
@@ -22,9 +19,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
-import kotlin.math.pow
 import kotlin.math.round
-import kotlin.math.sqrt
 
 @HiltViewModel
 class PlaceSearchViewModel @Inject constructor(
@@ -71,17 +66,14 @@ class PlaceSearchViewModel @Inject constructor(
             try {
                 _nearPlaceList.emit(
                     getNearPlacesUseCase.getNearPlaces(
-                        TMAP_VERSION,
                         searchKeyword,
                         currentLocation.longitude,
-                        currentLocation.latitude,
-                        BuildConfig.TMAP_APP_KEY
+                        currentLocation.latitude
                     )
                 )
             } catch (e: Exception) {
                 setNearPlaceListEmpty()
                 errorMessageChannel.send(e.message ?: "something is wrong")
-                Log.d("PlaceSearchViewModel", "getNearPlace 실패~ ${e.toString()}")
             }
         }
     }
@@ -120,7 +112,6 @@ class PlaceSearchViewModel @Inject constructor(
     }
 
     companion object {
-        private const val TMAP_VERSION = 1
         private val EXAMPLE_BOOKMARK_1 = Location(37.3931010, 126.9781449)
         private val EXAMPLE_BOOKMARK_2 = Location(37.55063543842469, 127.07369927986392)
         private val EXAMPLE_BOOKMARK_3 = Location(37.48450549635376, 126.89324337770405)
