feat: 경로 사이의 이동 거리를 고려한 탑승 시간 구현

Author: DoTheBestMayB

domain/src/main/java/com/stop/domain/model/route/TransportIdRequest.kt

@@ -15,6 +15,8 @@ data class TransportIdRequest(
     val term: Int, // 배차 간격, 서울 버스는 노선을 구하는 과정에서 얻을 수 있기 때문에 넣음
     val destinationStation: Place,
     val destinationStationId: String,
+    val sectionTime: Int,
+    val cumulativeSectionTime: Int,
 ) {
     fun changeStartStationId(newStationId: String): TransportIdRequest {
         return TransportIdRequest(
@@ -29,6 +31,8 @@ data class TransportIdRequest(
             term = term,
             destinationStation = destinationStation,
             destinationStationId = destinationStationId,
+            sectionTime = sectionTime,
+            cumulativeSectionTime = cumulativeSectionTime,
         )
     }
 
@@ -45,6 +49,8 @@ data class TransportIdRequest(
             term = term,
             destinationStation = destinationStation,
             destinationStationId = newDestinationStationId,
+            sectionTime = sectionTime,
+            cumulativeSectionTime = cumulativeSectionTime,
         )
     }
 
@@ -61,6 +67,8 @@ data class TransportIdRequest(
             term = newTerm ?: term,
             destinationStation = destinationStation,
             destinationStationId = destinationStationId,
+            sectionTime = sectionTime,
+            cumulativeSectionTime = cumulativeSectionTime,
         )
     }
 }

domain/src/main/java/com/stop/domain/model/route/TransportLastTime.kt

@@ -6,6 +6,7 @@ data class TransportLastTime(
     val transportMoveType : TransportMoveType,
     val area : Area,
     val lastTime: String,
+    val timeToBoard: String,
     val destinationStationName: String,
     val stationsUntilStart: List<TransportStation>,
     val enableDestinationStation: List<TransportStation>,

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

@@ -116,6 +116,8 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
 
     // 승차지, 도착지, 고유 번호를 알아내는데 필요한 정보로만 구성된 데이터 클래스로 변환하기
     private suspend fun createTransportIdRequests(itinerary: Itinerary): List<TransportIdRequest?> {
+        var cumulativeSectionTime = 0
+
         return itinerary.routes.fold(listOf()) { transportIdRequests, route ->
             when (route) {
                 is WalkRoute -> transportIdRequests + null
@@ -124,6 +126,9 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
                     val transportMoveType = TransportMoveType.getMoveTypeByName(route.mode.name)
                         ?: return@fold transportIdRequests
 
+                    val sectionTime = route.sectionTime.toInt()
+                    cumulativeSectionTime += sectionTime
+
                     transportIdRequests + TransportIdRequest(
                         transportMoveType = transportMoveType,
                         stationId = startStation.stationId,
@@ -136,6 +141,8 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
                         term = NOT_YET_CALCULATED,
                         destinationStation = route.end,
                         destinationStationId = UNKNOWN_ID,
+                        sectionTime = sectionTime,
+                        cumulativeSectionTime = cumulativeSectionTime,
                     )
                 }
                 else -> transportIdRequests + null
@@ -232,6 +239,10 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             transportMoveType = transportIdRequest.transportMoveType,
             area = transportIdRequest.area,
             lastTime = result,
+            timeToBoard = subtractSectionTimeFromLastTime(
+                transportIdRequest.cumulativeSectionTime,
+                result
+            ),
             destinationStationName = transportIdRequest.destinationStation.name,
             stationsUntilStart = stationsUntilStart.map {
                 TransportStation(
@@ -250,6 +261,19 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
         )
     }
 
+    private fun subtractSectionTimeFromLastTime(sectionTime: Int, lastTime: String): String {
+        val (hour, minute, second) = lastTime.split(":").map { it.toInt() }
+        val lastTimeSecond = hour * 60 * 60 + minute * 60 + second
+
+        val realLastTimeSecond = lastTimeSecond - sectionTime
+
+        val realHour = realLastTimeSecond / 60 / 60
+        val realMinute = ((realLastTimeSecond / 60) % 60).toString().padStart(TIME_DIGIT, '0')
+        val realSeconds = (realLastTimeSecond % 60).toString().padStart(TIME_DIGIT, '0')
+
+        return "$realHour:$realMinute:$realSeconds"
+    }
+
     private fun checkInnerOrOuter(
         stationType: Int,
         startStationIndex: Int,
@@ -335,10 +359,16 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             lastTime += TIME_CORRECTION_VALUE
         }
 
+        val lastTimeString = lastTime.toString().chunked(2).joinToString(":")
+
         return TransportLastTime(
             transportMoveType = TransportMoveType.BUS,
             area = Area.SEOUL,
-            lastTime = lastTime.toString().chunked(2).joinToString(":"),
+            lastTime = lastTimeString,
+            timeToBoard = subtractSectionTimeFromLastTime(
+                transportIdRequest.cumulativeSectionTime,
+                lastTimeString
+            ),
             destinationStationName = transportIdRequest.destinationStation.name,
             stationsUntilStart = listOf(),
             enableDestinationStation = listOf(),
@@ -389,6 +419,10 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             area = newTransportIdRequest.area,
             transportDirectionType = directionType,
             lastTime = time,
+            timeToBoard = subtractSectionTimeFromLastTime(
+                newTransportIdRequest.cumulativeSectionTime,
+                time
+            ),
             destinationStationName = newTransportIdRequest.destinationStation.name,
             stationsUntilStart = stationsUntilStart,
             enableDestinationStation = listOf(),
@@ -435,6 +469,10 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             area = transportIdRequest.area,
             transportDirectionType = directionType,
             lastTime = time,
+            timeToBoard = subtractSectionTimeFromLastTime(
+                transportIdRequest.cumulativeSectionTime,
+                time
+            ),
             destinationStationName = transportIdRequest.destinationStation.name,
             stationsUntilStart = stationsUntilStart,
             enableDestinationStation = listOf(),
@@ -459,10 +497,16 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             lastTime += TIME_CORRECTION_VALUE
         }
 
+        val lastTimeString = lastTime.toString().chunked(2).joinToString(":")
+
         return TransportLastTime(
             transportMoveType = TransportMoveType.BUS,
             area = Area.SEOUL,
-            lastTime = lastTime.toString().chunked(2).joinToString(":"),
+            lastTime = lastTimeString,
+            timeToBoard = subtractSectionTimeFromLastTime(
+                newTransportIdRequest.cumulativeSectionTime,
+                lastTimeString
+            ),
             destinationStationName = transportIdRequest.destinationStation.name,
             stationsUntilStart = listOf(),
             enableDestinationStation = listOf(),
@@ -683,6 +727,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
         private const val KOREA_LONGITUDE = 127
         private const val KOREA_LATITUDE = 37
         private const val CORRECTION_VALUE = 100_000
+        private const val TIME_DIGIT = 2
 
         private const val EMPIRICAL_DISTINCTION = 20
 

presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt

@@ -109,7 +109,8 @@ class MissionViewModel @Inject constructor(
             ),
             enableDestinationStation = listOf(),
             transportDirectionType = TransportDirectionType.TO_END,
-            routeId = "118900001"
+            routeId = "118900001",
+            timeToBoard = "23:40:50",
         )
         startMission()
     }

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

@@ -40,7 +40,7 @@ class RouteViewModel @Inject constructor(
     val lastTimeResponse: LiveData<Event<List<TransportLastTime?>>>
         get() = _lastTimeResponse
 
-    var lastTimes = mutableListOf<String?>()
+    var lastTimes: List<TransportLastTime?>? = null
 
     private val _errorMessage = MutableLiveData<Event<ErrorType>>()
     val errorMessage: LiveData<Event<ErrorType>>
@@ -77,7 +77,7 @@ class RouteViewModel @Inject constructor(
     fun calculateLastTransportTime(itinerary: Itinerary) {
         checkClickedItinerary(itinerary)
         viewModelScope.launch {
-            this@RouteViewModel._lastTimeResponse.value = Event(getLastTransportTimeUseCase(itinerary))
+            this@RouteViewModel._lastTimeResponse.value = Event(getLastTransportTimeUseCase(itinerary) )
         }
     }