feat : getSubwayTrainNowLocation() 함수 결과와 getNowStationLocation() 연결

jeeminimini · jeeminimini · commit fd3adbfb8dd2 · 2022-11-30T16:20:16.000+09:00
diff --git a/data/src/main/java/com/stop/data/di/NetworkModule.kt b/data/src/main/java/com/stop/data/di/NetworkModule.kt
@@ -25,6 +25,7 @@ internal object NetworkModule {
 
     private const val T_MAP_APP_KEY_NAME = "appKey"
     private const val OPEN_API_SEOUL_KEY_NAME = "KEY"
+    private const val SW_OPEN_API_SEOUL_KEY_NAME = "KEY"
     private const val APIS_KEY_NAME = "ServiceKey"
     private const val WS_KEY_NAME = "ServiceKey"
 
@@ -154,6 +155,10 @@ internal object NetworkModule {
                     OPEN_API_SEOUL_KEY_NAME,
                     BuildConfig.BUS_KEY
                 )
+                url.contains(BuildConfig.SW_OPEN_API_SEOUL_URL) -> Pair(
+                    SW_OPEN_API_SEOUL_KEY_NAME,
+                    BuildConfig.SUBWAY_KEY
+                )
                 url.contains(BuildConfig.T_MAP_URL) -> Pair(
                     T_MAP_APP_KEY_NAME,
                     BuildConfig.T_MAP_APP_KEY
diff --git a/data/src/main/java/com/stop/data/remote/model/nowlocation/subway/SubwayTrainNowLocationResponse.kt b/data/src/main/java/com/stop/data/remote/model/nowlocation/subway/SubwayTrainNowLocationResponse.kt
@@ -1,5 +1,6 @@
 package com.stop.data.remote.model.nowlocation.subway
 
+import android.util.Log
 import com.squareup.moshi.JsonClass
 import com.stop.data.model.nowlocation.SubwayTrainRealTimePositionRepositoryItem
 
@@ -8,18 +9,21 @@ data class SubwayTrainNowLocationResponse(
     val realtimePositionList: List<TrainLocationInfo>
 ) {
     fun toRepositoryModel(trainNumber: String): SubwayTrainRealTimePositionRepositoryItem {
+        Log.d("MissionFragment","mission ${realtimePositionList.first { it.trainNumber == trainNumber }}")
+
         return realtimePositionList.first { it.trainNumber == trainNumber }.run {
              SubwayTrainRealTimePositionRepositoryItem(
                 subwayId = subwayId,
                 subwayName = stationName,
                 stationId = stationId,
-                stationName = stationName,
+                stationName = stationName + STATION,
                 trainNumber = this.trainNumber,
                 trainStatus = trainStatus
             )
         }
     }
 
-
-
+    companion object {
+        private const val STATION = "역"
+    }
 }
diff --git a/data/src/main/java/com/stop/data/remote/network/SwOpenApiSeoulService.kt b/data/src/main/java/com/stop/data/remote/network/SwOpenApiSeoulService.kt
@@ -9,7 +9,7 @@ import retrofit2.http.Path
 internal interface SwOpenApiSeoulService {
 
     @GET("{KEY}/{TYPE}/{SERVICE}/{START_INDEX}/{END_INDEX}/{STATION_NM}/")
-    suspend fun getSubwayTrainNowLocationInfo(
+    suspend fun getSubwayTrainNowStationInfo(
         @Path("KEY") key: String = BuildConfig.SUBWAY_KEY,
         @Path("SERVICE") serviceName: String = REAL_TIME_POSITION,
         @Path("TYPE") type: String = JSON,
diff --git a/data/src/main/java/com/stop/data/remote/source/nowlocation/NowLocationRemoteDataSource.kt b/data/src/main/java/com/stop/data/remote/source/nowlocation/NowLocationRemoteDataSource.kt
@@ -7,5 +7,5 @@ interface NowLocationRemoteDataSource {
 
     suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoRepositoryItem
 
-    suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem
+    suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem
 }
diff --git a/data/src/main/java/com/stop/data/remote/source/nowlocation/NowLocationRemoteDataSourceImpl.kt b/data/src/main/java/com/stop/data/remote/source/nowlocation/NowLocationRemoteDataSourceImpl.kt
@@ -23,8 +23,8 @@ internal class NowLocationRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem {
-        with(swOpenApiSeoulService.getSubwayTrainNowLocationInfo(stationName = subwayNumber.toString() + LINE)) {
+    override suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem {
+        with(swOpenApiSeoulService.getSubwayTrainNowStationInfo(stationName = subwayNumber.toString() + LINE)) {
             return when (this) {
                 is NetworkResult.Success -> data.toRepositoryModel(trainNumber)
                 is NetworkResult.Failure -> throw IllegalArgumentException(message)
diff --git a/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt
@@ -24,7 +24,7 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
             centerLat,
             appKey
         ).onSuccess { places ->
-            places.map {
+            return places.map {
                 it.toUseCaseModel()
             }
         }.onFailure {
@@ -46,7 +46,7 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
             centerLat,
             appKey
         ).onSuccess { places ->
-            places.first().toNowStationLocationUseCaseModel()
+            return places.first().toNowStationLocationUseCaseModel()
         }.onFailure {
             throw it
         }.getOrDefault(NowStationLocationUseCaseItem("", 0.0, 0.0)) as NowStationLocationUseCaseItem
diff --git a/data/src/main/java/com/stop/data/repository/NowLocationRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/NowLocationRepositoryImpl.kt
@@ -14,8 +14,8 @@ class NowLocationRepositoryImpl @Inject constructor(
         return nowLocationRemoteDataSource.getBusNowLocation(busRouteId, order).toUseCaseModel()
     }
 
-    override suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem {
-        return nowLocationRemoteDataSource.getSubwayTrainNowLocation(trainNumber, subwayNumber).toUseCaseModel()
+    override suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem {
+        return nowLocationRemoteDataSource.getSubwayTrainNowStation(trainNumber, subwayNumber).toUseCaseModel()
     }
 
 }
diff --git a/domain/src/main/java/com/stop/domain/di/UseCaseModule.kt b/domain/src/main/java/com/stop/domain/di/UseCaseModule.kt
@@ -56,7 +56,7 @@ internal interface UseCaseModule {
 
     @Binds
     @Singleton
-    fun provideSubwayTrainNowLocationUseCase(getSubwayTrainNowLocationUseCaseImpl: GetSubwayTrainNowLocationUseCaseImpl): GetSubwayTrainNowLocationUseCase
+    fun provideSubwayTrainNowLocationUseCase(getSubwayTrainNowLocationUseCaseImpl: GetSubwayTrainNowStationUseCaseImpl): GetSubwayTrainNowStationUseCase
 
     @Binds
     @Singleton
diff --git a/domain/src/main/java/com/stop/domain/repository/NowLocationRepository.kt b/domain/src/main/java/com/stop/domain/repository/NowLocationRepository.kt
@@ -7,6 +7,6 @@ interface NowLocationRepository {
 
     suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoUseCaseItem
 
-    suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem
+    suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayTrainNowStationUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayTrainNowStationUseCase.kt
@@ -2,7 +2,7 @@ package com.stop.domain.usecase.nowlocation
 
 import com.stop.domain.model.nowlocation.SubwayTrainRealTimePositionUseCaseItem
 
-interface GetSubwayTrainNowLocationUseCase {
+interface GetSubwayTrainNowStationUseCase {
 
     suspend operator fun invoke(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem
 
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayTrainNowStationUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetSubwayTrainNowStationUseCaseImpl.kt
@@ -4,12 +4,12 @@ import com.stop.domain.model.nowlocation.SubwayTrainRealTimePositionUseCaseItem
 import com.stop.domain.repository.NowLocationRepository
 import javax.inject.Inject
 
-class GetSubwayTrainNowLocationUseCaseImpl @Inject constructor(
+class GetSubwayTrainNowStationUseCaseImpl @Inject constructor(
     private val nowLocationRepository: NowLocationRepository
-) : GetSubwayTrainNowLocationUseCase {
+) : GetSubwayTrainNowStationUseCase {
 
     override suspend operator fun invoke(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem {
-        return nowLocationRepository.getSubwayTrainNowLocation(trainNumber, subwayNumber)
+        return nowLocationRepository.getSubwayTrainNowStation(trainNumber, subwayNumber)
     }
 
 }
diff --git a/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt b/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt
@@ -2,25 +2,26 @@ 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.SubwayTrainRealTimePositionUseCaseItem
-import com.stop.domain.model.route.tmap.RouteRequest
+import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
 import com.stop.domain.usecase.nowlocation.GetBusNowLocationUseCase
+import com.stop.domain.usecase.nowlocation.GetNowStationLocationUseCase
 import com.stop.domain.usecase.nowlocation.GetSubwayRouteUseCase
-import com.stop.domain.usecase.nowlocation.GetSubwayTrainNowLocationUseCase
+import com.stop.domain.usecase.nowlocation.GetSubwayTrainNowStationUseCase
 import com.stop.model.Location
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import javax.inject.Inject
 import kotlin.random.Random
 
 @HiltViewModel
 class MissionViewModel @Inject constructor(
     private val getBusNowLocationUseCase: GetBusNowLocationUseCase,
-    private val getSubwayTrainNowLocationUseCase: GetSubwayTrainNowLocationUseCase,
+    private val getSubwayTrainNowStationUseCase: GetSubwayTrainNowStationUseCase,
+    private val getNowStationLocationUseCase: GetNowStationLocationUseCase,
     private val getSubwayRouteUseCase: GetSubwayRouteUseCase
-): ViewModel() {
+) : ViewModel() {
 
     private val random = Random(System.currentTimeMillis())
 
@@ -51,14 +52,15 @@ class MissionViewModel @Inject constructor(
     private val _busNowLocationInfo = MutableLiveData<BusInfoUseCaseItem>()
     val busNowLocationInfo: LiveData<BusInfoUseCaseItem> = _busNowLocationInfo
 
-    private val _subwayTrainNowLocationInfo = MutableLiveData<SubwayTrainRealTimePositionUseCaseItem>()
-    val subwayTrainNowLocationInfo: LiveData<SubwayTrainRealTimePositionUseCaseItem> = _subwayTrainNowLocationInfo
+    private val _nowStationLocationInfo = MutableLiveData<NowStationLocationUseCaseItem>()
+    val nowStationLocationInfo: LiveData<NowStationLocationUseCaseItem> = _nowStationLocationInfo
 
-    var personCurrentLocation = Location(0.0, 0.0)
-    var busCurrentLocation = Location(0.0, 0.0)
+    var personCurrentLocation = Location(37.553836, 126.969652)
+    var busCurrentLocation = Location(37.553836, 126.969652)
 
     init {
         getBusNowLocation()
+        getNowStationLocation()
     }
 
     fun setDestination(inputDestination: String) {
@@ -104,28 +106,36 @@ class MissionViewModel @Inject constructor(
                 getBusNowLocationUseCase(TEST_BUS_540_ID).apply {
                     _busNowLocationInfo.value = this
                 }
-                Log.d("MissionViewModel","busNowLocationInfo ${_busNowLocationInfo.value}")
+                Log.d("MissionViewModel", "busNowLocationInfo ${_busNowLocationInfo.value}")
                 delay(5000)
                 TIME_TEST += 1
             }
 
         }
     }
 
-    private fun getSubwayTrainNowLocation() {
-        viewModelScope.launch {
-            getSubwayTrainNowLocationUseCase(TEST_TRAIN_NUMBER, TEST_SUBWAY_NUMER).apply {
-                _subwayTrainNowLocationInfo.value = this
-            }
-        }
+    private suspend fun getSubwayTrainNowLocation() = withContext(Dispatchers.Main) {
+        getSubwayTrainNowStationUseCase(TEST_TRAIN_NUMBER, TEST_SUBWAY_NUMER)
     }
 
-    private fun getSubwayRoute() {
-        viewModelScope.launch {
-            getSubwayRouteUseCase(RouteRequest())
-        }
+
+    suspend fun getNowStationLocation() = withContext(Dispatchers.Main) {
+        val searchKeyword = getSubwayTrainNowLocation().stationName
+        getNowStationLocationUseCase(
+            TMAP_VERSION,
+            searchKeyword,
+            personCurrentLocation.longitude,
+            personCurrentLocation.latitude,
+            BuildConfig.T_MAP_APP_KEY
+        )
     }
 
+//    private fun getSubwayRoute() {
+//        viewModelScope.launch {
+//            getSubwayRouteUseCase(RouteRequest())
+//        }
+//    }
+
     companion object {
         private const val DELAY_TIME = 1000L
         private const val TIME_ZERO = 0
@@ -139,6 +149,9 @@ class MissionViewModel @Inject constructor(
         private var TIME_TEST = 0
 
         private const val TEST_SUBWAY_NUMER = 4
-        private const val TEST_TRAIN_NUMBER = "4327"
+        private const val TEST_TRAIN_NUMBER = "4615"
+
+        private const val TMAP_VERSION = 1
     }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ interface NowLocationRemoteDataSource {`
`7`	`7`
`8`	`8`	`suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoRepositoryItem`
`9`	`9`
`10`		`- suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem`
	`10`	`+ suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ internal class NowLocationRemoteDataSourceImpl @Inject constructor(`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- override suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem {`
`27`		`- with(swOpenApiSeoulService.getSubwayTrainNowLocationInfo(stationName = subwayNumber.toString() + LINE)) {`
	`26`	`+ override suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem {`
	`27`	`+ with(swOpenApiSeoulService.getSubwayTrainNowStationInfo(stationName = subwayNumber.toString() + LINE)) {`
`28`	`28`	`return when (this) {`
`29`	`29`	`is NetworkResult.Success -> data.toRepositoryModel(trainNumber)`
`30`	`30`	`is NetworkResult.Failure -> throw IllegalArgumentException(message)`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ class NowLocationRepositoryImpl @Inject constructor(`
`14`	`14`	`return nowLocationRemoteDataSource.getBusNowLocation(busRouteId, order).toUseCaseModel()`
`15`	`15`	`}`
`16`	`16`
`17`		`- override suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem {`
`18`		`- return nowLocationRemoteDataSource.getSubwayTrainNowLocation(trainNumber, subwayNumber).toUseCaseModel()`
	`17`	`+ override suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem {`
	`18`	`+ return nowLocationRemoteDataSource.getSubwayTrainNowStation(trainNumber, subwayNumber).toUseCaseModel()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ interface NowLocationRepository {`
`7`	`7`
`8`	`8`	`suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoUseCaseItem`
`9`	`9`
`10`		`- suspend fun getSubwayTrainNowLocation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem`
	`10`	`+ suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem`
`11`	`11`
`12`	`12`	`}`