Merge branch 'develop' into demo

DoTheBestMayB · DoTheBestMayB · commit db72f114d58d · 2022-12-01T22:35:21.000+09:00
# Conflicts:
#	presentation/src/main/java/com/stop/ui/route/RouteFragment.kt
diff --git a/data/src/main/java/com/stop/data/remote/model/route/gyeonggi/GyeonggiBusLastTimeResponse.kt b/data/src/main/java/com/stop/data/remote/model/route/gyeonggi/GyeonggiBusLastTimeResponse.kt
@@ -8,5 +8,5 @@ import com.tickaroo.tikxml.annotation.Xml
 internal data class GyeonggiBusLastTimeResponse(
     @Path("msgBody")
     @Element(name = "busRouteInfoItem")
-    val lastTimes: List<GyeonggiBusLastTime>
+    val lastTimes: List<GyeonggiBusLastTime>?
 )
diff --git a/data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSource.kt b/data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSource.kt
@@ -29,10 +29,10 @@ internal interface RouteRemoteDataSource {
 
     suspend fun getSeoulBusStationArsId(stationName: String): List<BusStationInfo>
     suspend fun getSeoulBusRoute(stationId: String): List<BusRouteInfo>
-    suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>
+    suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>?
 
     suspend fun getGyeonggiBusStationId(stationName: String): List<GyeonggiBusStation>
     suspend fun getGyeonggiBusRoute(stationId: String): List<GyeonggiBusRoute>
-    suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>
+    suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>?
     suspend fun getGyeonggiBusRouteStations(lineId: String): List<GyeonggiBusStation>
 }
diff --git a/data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSourceImpl.kt b/data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSourceImpl.kt
@@ -140,7 +140,7 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
     override suspend fun getSeoulBusLastTime(
         stationId: String,
         lineId: String
-    ): List<LastTimeInfo> {
+    ): List<LastTimeInfo>? {
         with(wsBusApiService.getBusLastTime(stationId, lineId)) {
             return when (this) {
                 is NetworkResult.Success -> this.data.lastTimeMsgBody.lastTimes
@@ -173,10 +173,10 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime> {
+    override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>? {
         with(apisDataService.getBusLastTime(lineId)) {
             return when (this) {
-                is NetworkResult.Success -> this.data.lastTimes.map { it.toDomain() }
+                is NetworkResult.Success -> this.data.lastTimes?.map { it.toDomain() }
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
                 is NetworkResult.NetworkError -> throw this.exception
                 is NetworkResult.Unexpected -> throw this.exception
diff --git a/data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt
@@ -76,7 +76,7 @@ internal class RouteRepositoryImpl @Inject constructor(
         return remoteDataSource.getSeoulBusRoute(stationId)
     }
 
-    override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo> {
+    override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>? {
         return remoteDataSource.getSeoulBusLastTime(stationId, lineId)
     }
 
@@ -88,7 +88,7 @@ internal class RouteRepositoryImpl @Inject constructor(
         return remoteDataSource.getGyeonggiBusRoute(stationId)
     }
 
-    override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime> {
+    override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>? {
         return remoteDataSource.getGyeonggiBusLastTime(lineId)
     }
 
diff --git a/domain/src/main/java/com/stop/domain/model/route/seoul/bus/LastTimeMsgBody.kt b/domain/src/main/java/com/stop/domain/model/route/seoul/bus/LastTimeMsgBody.kt
@@ -6,5 +6,5 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class LastTimeMsgBody(
     @Json(name = "itemList")
-    val lastTimes: List<LastTimeInfo>
+    val lastTimes: List<LastTimeInfo>?
 )
diff --git a/domain/src/main/java/com/stop/domain/repository/RouteRepository.kt b/domain/src/main/java/com/stop/domain/repository/RouteRepository.kt
@@ -30,7 +30,7 @@ interface RouteRepository {
 
     suspend fun getSeoulBusStationArsId(stationName: String): List<BusStationInfo>
     suspend fun getSeoulBusRoute(stationId: String): List<BusRouteInfo>
-    suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>
+    suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>?
     suspend fun getSubwayRoute(
         routeRequest: RouteRequest,
         subwayLine: String,
@@ -40,6 +40,6 @@ interface RouteRepository {
 
     suspend fun getGyeonggiBusStationId(stationName: String): List<GyeonggiBusStation>
     suspend fun getGyeonggiBusRoute(stationId: String): List<GyeonggiBusRoute>
-    suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>
+    suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>?
     suspend fun getGyeonggiBusRouteStations(lineId: String): List<GyeonggiBusStation>
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/route/GetLastTransportTimeUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/route/GetLastTransportTimeUseCaseImpl.kt
@@ -299,23 +299,44 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
     private suspend fun getSeoulBusLastTransportTime(
         transportIdRequest: TransportIdRequest
     ): String {
-        var lastTime = routeRepository.getSeoulBusLastTime(
+        val lastTimes = routeRepository.getSeoulBusLastTime(
             transportIdRequest.stationId,
             transportIdRequest.routeId
-        ).first().lastTime?.toInt() ?: throw ApiServerDataException()
+        ) ?: return getRectifiedGyeonggiBusLastTransportTime(transportIdRequest)
+
+        var lastTime = lastTimes.first().lastTime?.toInt() ?: throw ApiServerDataException()
 
         if (lastTime < MID_NIGHT) {
             lastTime += TIME_CORRECTION_VALUE
         }
         return lastTime.toString().chunked(2).joinToString(":")
     }
 
+    private suspend fun getRectifiedGyeonggiBusLastTransportTime(
+        transportIdRequest: TransportIdRequest
+    ): String {
+        var newTransportIdRequest = convertGyeonggiBusStationId(transportIdRequest)
+        newTransportIdRequest = convertGyeonggiBusRouteId(newTransportIdRequest)
+
+        val lastTime = routeRepository.getGyeonggiBusLastTime(
+            newTransportIdRequest.routeId
+        )?.first() ?: throw ApiServerDataException()
+
+        val destinationIsLastStation = checkGyeonggiBusDestinationIsLastStation(newTransportIdRequest)
+
+        return if (destinationIsLastStation) {
+            addSecondsFormat(lastTime.upLastTime)
+        } else {
+            addSecondsFormat(lastTime.downLastTime)
+        }
+    }
+
     private suspend fun getGyeonggiBusLastTransportTime(
         transportIdRequest: TransportIdRequest
     ): String {
         val lastTime = routeRepository.getGyeonggiBusLastTime(
             transportIdRequest.routeId
-        ).first()
+        )?.first() ?: return getRectifiedSeoulBusLastTransportTime(transportIdRequest)
 
         val destinationIsLastStation = checkGyeonggiBusDestinationIsLastStation(transportIdRequest)
 
@@ -326,6 +347,25 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
         }
     }
 
+    private suspend fun getRectifiedSeoulBusLastTransportTime(
+        transportIdRequest: TransportIdRequest
+    ) : String {
+        var newTransportIdRequest = convertSeoulBusStationId(transportIdRequest)
+        newTransportIdRequest = convertSeoulBusRouteId(newTransportIdRequest)
+
+        val lastTimes = routeRepository.getSeoulBusLastTime(
+            newTransportIdRequest.stationId,
+            newTransportIdRequest.routeId
+        ) ?: throw ApiServerDataException()
+
+        var lastTime = lastTimes.first().lastTime?.toInt() ?: throw ApiServerDataException()
+
+        if (lastTime < MID_NIGHT) {
+            lastTime += TIME_CORRECTION_VALUE
+        }
+        return lastTime.toString().chunked(2).joinToString(":")
+    }
+
     private fun addSecondsFormat(time: String): String {
         return "$time:00"
     }
diff --git a/presentation/src/main/java/com/stop/ui/route/RouteFragment.kt b/presentation/src/main/java/com/stop/ui/route/RouteFragment.kt
@@ -95,8 +95,9 @@ class RouteFragment : Fragment() {
         }
 
         viewModel.lastTimeResponse.observe(viewLifecycleOwner) {
-            binding.root.findNavController()
-                .navigate(R.id.action_routeFragment_to_routeDetailFragment)
+            it.getContentIfNotHandled()?.let {
+                binding.root.findNavController().navigate(R.id.action_routeFragment_to_routeDetailFragment)
+            }
         }
     }
 
diff --git a/presentation/src/main/java/com/stop/ui/route/RouteViewModel.kt b/presentation/src/main/java/com/stop/ui/route/RouteViewModel.kt
@@ -35,8 +35,8 @@ class RouteViewModel @Inject constructor(
     val routeResponse: LiveData<List<Itinerary>>
         get() = _routeResponse
 
-    private val _lastTimeResponse = MutableLiveData<List<String?>>()
-    val lastTimeResponse: LiveData<List<String?>>
+    private val _lastTimeResponse = MutableLiveData<Event<List<String?>>>()
+    val lastTimeResponse: LiveData<Event<List<String?>>>
         get() = _lastTimeResponse
 
     private val _errorMessage = MutableLiveData<Event<ErrorType>>()
@@ -69,7 +69,7 @@ class RouteViewModel @Inject constructor(
     fun calculateLastTransportTime(itinerary: Itinerary) {
         checkClickedItinerary(itinerary)
         viewModelScope.launch {
-            this@RouteViewModel._lastTimeResponse.value = getLastTransportTimeUseCase(itinerary)
+            this@RouteViewModel._lastTimeResponse.value = Event(getLastTransportTimeUseCase(itinerary))
         }
     }
 
@@ -90,7 +90,7 @@ class RouteViewModel @Inject constructor(
         val lastTimes = _lastTimeResponse.value ?: return "이 함수를 호출한 시점에 막차 데이터가 null인 논리적 오류가 발생했습니다."
 
         return clickedItinerary.routes.mapIndexed { index, route ->
-            "${route.start.name}(${lastTimes[index]})"
+            "${route.start.name}(${lastTimes.peekContent()[index]})"
         }.joinToString(" -> ")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ import com.tickaroo.tikxml.annotation.Xml`
`8`	`8`	`internal data class GyeonggiBusLastTimeResponse(`
`9`	`9`	`@Path("msgBody")`
`10`	`10`	`@Element(name = "busRouteInfoItem")`
`11`		`- val lastTimes: List<GyeonggiBusLastTime>`
	`11`	`+ val lastTimes: List<GyeonggiBusLastTime>?`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ internal class RouteRepositoryImpl @Inject constructor(`
`76`	`76`	`return remoteDataSource.getSeoulBusRoute(stationId)`
`77`	`77`	`}`
`78`	`78`
`79`		`- override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo> {`
	`79`	`+ override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>? {`
`80`	`80`	`return remoteDataSource.getSeoulBusLastTime(stationId, lineId)`
`81`	`81`	`}`
`82`	`82`
`@@ -88,7 +88,7 @@ internal class RouteRepositoryImpl @Inject constructor(`
`88`	`88`	`return remoteDataSource.getGyeonggiBusRoute(stationId)`
`89`	`89`	`}`
`90`	`90`
`91`		`- override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime> {`
	`91`	`+ override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>? {`
`92`	`92`	`return remoteDataSource.getGyeonggiBusLastTime(lineId)`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ import com.squareup.moshi.JsonClass`
`6`	`6`	`@JsonClass(generateAdapter = true)`
`7`	`7`	`data class LastTimeMsgBody(`
`8`	`8`	`@Json(name = "itemList")`
`9`		`- val lastTimes: List<LastTimeInfo>`
	`9`	`+ val lastTimes: List<LastTimeInfo>?`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,9 @@ class RouteFragment : Fragment() {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`viewModel.lastTimeResponse.observe(viewLifecycleOwner) {`
`98`		`- binding.root.findNavController()`
`99`		`- .navigate(R.id.action_routeFragment_to_routeDetailFragment)`
	`98`	`+ it.getContentIfNotHandled()?.let {`
	`99`	`+ binding.root.findNavController().navigate(R.id.action_routeFragment_to_routeDetailFragment)`
	`100`	`+ }`
`100`	`101`	`}`
`101`	`102`	`}`
`102`	`103`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ class RouteViewModel @Inject constructor(`
`35`	`35`	`val routeResponse: LiveData<List<Itinerary>>`
`36`	`36`	`get() = _routeResponse`
`37`	`37`
`38`		`- private val _lastTimeResponse = MutableLiveData<List<String?>>()`
`39`		`- val lastTimeResponse: LiveData<List<String?>>`
	`38`	`+ private val _lastTimeResponse = MutableLiveData<Event<List<String?>>>()`
	`39`	`+ val lastTimeResponse: LiveData<Event<List<String?>>>`
`40`	`40`	`get() = _lastTimeResponse`
`41`	`41`
`42`	`42`	`private val _errorMessage = MutableLiveData<Event<ErrorType>>()`
`@@ -69,7 +69,7 @@ class RouteViewModel @Inject constructor(`
`69`	`69`	`fun calculateLastTransportTime(itinerary: Itinerary) {`
`70`	`70`	`checkClickedItinerary(itinerary)`
`71`	`71`	`viewModelScope.launch {`
`72`		`- this@RouteViewModel._lastTimeResponse.value = getLastTransportTimeUseCase(itinerary)`
	`72`	`+ this@RouteViewModel._lastTimeResponse.value = Event(getLastTransportTimeUseCase(itinerary))`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`@@ -90,7 +90,7 @@ class RouteViewModel @Inject constructor(`
`90`	`90`	`val lastTimes = _lastTimeResponse.value ?: return "이 함수를 호출한 시점에 막차 데이터가 null인 논리적 오류가 발생했습니다."`
`91`	`91`
`92`	`92`	`return clickedItinerary.routes.mapIndexed { index, route ->`
`93`		`- "${route.start.name}(${lastTimes[index]})"`
	`93`	`+ "${route.start.name}(${lastTimes.peekContent()[index]})"`
`94`	`94`	`}.joinToString(" -> ")`
`95`	`95`	`}`
`96`	`96`	`}`