refactor: GetLastTransportTimeUseCaseImpl 리턴 타입 수정

Author: DoTheBestMayB

domain/src/main/java/com/stop/domain/usecase/route/GetLastTransportTimeUseCase.kt

@@ -1,9 +1,8 @@
 package com.stop.domain.usecase.route
 
-import com.stop.domain.model.route.TransportLastTimeInfo
 import com.stop.domain.model.route.tmap.custom.Itinerary
 
 interface GetLastTransportTimeUseCase {
 
-    suspend fun invoke(itinerary: Itinerary): TransportLastTimeInfo?
+    suspend operator fun invoke(itinerary: Itinerary): List<String?>
 }

domain/src/main/java/com/stop/domain/usecase/route/GetLastTransportTimeUseCaseImpl.kt

@@ -3,7 +3,6 @@ package com.stop.domain.usecase.route
 import com.stop.domain.model.geoLocation.AddressType
 import com.stop.domain.model.route.Area
 import com.stop.domain.model.route.TransportIdRequest
-import com.stop.domain.model.route.TransportLastTimeInfo
 import com.stop.domain.model.route.TransportMoveType
 import com.stop.domain.model.route.gyeonggi.GyeonggiBusStation
 import com.stop.domain.model.route.seoul.bus.BusStationInfo
@@ -21,15 +20,12 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
 
     private val allowedSubwayLineForUse = (SUBWAY_LINE_ONE..SUBWAY_LINE_EIGHT)
 
-    override suspend fun invoke(itinerary: Itinerary): TransportLastTimeInfo {
+    override suspend fun invoke(itinerary: Itinerary): List<String?> {
         var transportIdRequests: List<TransportIdRequest?> = createTransportIdRequests(itinerary)
         transportIdRequests = convertStationId(transportIdRequests)
         transportIdRequests = convertRouteId(transportIdRequests)
 
-        val dataWithLastTime: List<String?> = getLastTransportTime(transportIdRequests)
-
-        // 막차 시간 중 가장 빠른 시간과 dataWithLastTime을 가지는 데이터 클래스 반환하기
-        return TransportLastTimeInfo(dataWithLastTime.sortedBy { it }.first() ?: "")
+        return getLastTransportTime(transportIdRequests)
     }
 
     private suspend fun getLastTransportTime(transportIdRequests: List<TransportIdRequest?>): List<String?> {
@@ -121,10 +117,10 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
     }
 
     // 승차지, 도착지, 고유 번호를 알아내는데 필요한 정보로만 구성된 데이터 클래스로 변환하기
-    private suspend fun createTransportIdRequests(itinerary: Itinerary): List<TransportIdRequest> {
-        return itinerary.routes.fold(listOf<TransportIdRequest>()) { transportIdRequests, route ->
+    private suspend fun createTransportIdRequests(itinerary: Itinerary): List<TransportIdRequest?> {
+        return itinerary.routes.fold(listOf()) { transportIdRequests, route ->
             when (route) {
-                is WalkRoute -> transportIdRequests
+                is WalkRoute -> transportIdRequests + null
                 is TransportRoute -> {
                     val startStation = route.stations.first()
                     val transportMoveType = TransportMoveType.getMoveTypeByName(route.mode.name)
@@ -144,7 +140,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
                         destinationStationId = UNKNOWN_ID,
                     )
                 }
-                else -> transportIdRequests
+                else -> transportIdRequests + null
             }
         }
     }

presentation/src/main/java/com/stop/ui/route/RouteViewModel.kt

@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.stop.domain.model.route.TransportLastTimeInfo
 import com.stop.domain.model.route.tmap.RouteRequest
 import com.stop.domain.model.route.tmap.custom.Itinerary
 import com.stop.domain.usecase.route.GetLastTransportTimeUseCase
@@ -35,8 +34,8 @@ class RouteViewModel @Inject constructor(
     val routeResponse: LiveData<List<Itinerary>>
         get() = _routeResponse
 
-    private val _lastTimeResponse = MutableLiveData<TransportLastTimeInfo>()
-    val lastTimeResponse: LiveData<TransportLastTimeInfo>
+    private val _lastTimeResponse = MutableLiveData<List<String?>>()
+    val lastTimeResponse: LiveData<List<String?>>
         get() = _lastTimeResponse
 
     private val _errorMessage = MutableLiveData<Event<ErrorType>>()
@@ -68,8 +67,7 @@ class RouteViewModel @Inject constructor(
 
     fun calculateLastTransportTime(itinerary: Itinerary) {
         viewModelScope.launch(Dispatchers.IO) {
-            val lastTimeInfo =
-                getLastTransportTimeUseCase.invoke(itinerary) ?: return@launch
+            val lastTimeInfo = getLastTransportTimeUseCase(itinerary)
 
             _lastTimeResponse.postValue(lastTimeInfo)
         }