feat: 경로 상에 있는 열차 중 탑승해야 하는 지하철 판별 로직 구현

DoTheBestMayB · DoTheBestMayB · commit b6b9304b4fb2 · 2022-12-04T14:10:01.000+09:00
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
@@ -2,27 +2,9 @@ package com.stop.data.remote.model.nowlocation.subway
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import com.stop.data.model.nowlocation.SubwayTrainRealTimePositionRepositoryItem
 
 @JsonClass(generateAdapter = true)
 data class SubwayTrainNowLocationResponse(
     @Json(name = "realtimePositionList")
     val realtimePositions: List<TrainLocationInfo>
-) {
-    fun toRepositoryModel(trainNumber: String): SubwayTrainRealTimePositionRepositoryItem {
-        return realtimePositions.first { it.trainNumber == trainNumber }.run {
-             SubwayTrainRealTimePositionRepositoryItem(
-                subwayId = subwayId,
-                subwayName = stationName,
-                stationId = stationId,
-                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/model/nowlocation/subway/TrainLocationInfo.kt b/data/src/main/java/com/stop/data/remote/model/nowlocation/subway/TrainLocationInfo.kt
@@ -2,6 +2,9 @@ package com.stop.data.remote.model.nowlocation.subway
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.stop.domain.model.ApiChangedException
+import com.stop.domain.model.nowlocation.TrainLocationInfoDomain
+import com.stop.domain.model.route.seoul.subway.TransportDirectionType
 
 @JsonClass(generateAdapter = true)
 data class TrainLocationInfo(
@@ -11,9 +14,35 @@ data class TrainLocationInfo(
     @Json(name = "statnId")
     val stationId: String,
     @Json(name = "statnNm")
-    val stationName: String,
+    val currentStationName: String,
     @Json(name = "trainNo")
     val trainNumber: String,
     @Json(name = "trainSttus")
-    val trainStatus: String // 0:진입 1:도착, 0,1외 나머지는:출발
-)
+    val trainStatus: String, // 0:진입 1:도착, 0,1외 나머지는:출발
+    @Json(name = "statnTnm")
+    val destinationStationName: String,
+    @Json(name = "updnLine")
+    val subwayDirection: String,
+    @Json(name = "lstcarAt")
+    val isLastTrain: String, // (1:막차, 0:아님)
+) {
+    fun toDomain() = TrainLocationInfoDomain(
+        subwayId = subwayId,
+        subwayName = subwayName,
+        stationId = stationId,
+        currentStationName = currentStationName,
+        trainNumber = trainNumber,
+        trainStatus = trainStatus,
+        destinationStationName = destinationStationName,
+        subwayDirection = when (subwayDirection) {
+            "1" -> TransportDirectionType.INNER
+            "0" -> TransportDirectionType.OUTER
+            else -> throw ApiChangedException()
+        },
+        isLastTrain = when (isLastTrain) {
+            "1" -> true
+            "0" -> false
+            else -> throw ApiChangedException()
+        },
+    )
+}
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
@@ -1,11 +1,11 @@
 package com.stop.data.remote.source.nowlocation
 
 import com.stop.data.model.nowlocation.BusInfoRepositoryItem
-import com.stop.data.model.nowlocation.SubwayTrainRealTimePositionRepositoryItem
+import com.stop.data.remote.model.nowlocation.subway.TrainLocationInfo
 
 interface NowLocationRemoteDataSource {
 
     suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoRepositoryItem
 
-    suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem
+    suspend fun getSubwayTrainNowStation(subwayNumber: Int): List<TrainLocationInfo>
 }
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
@@ -1,8 +1,8 @@
 package com.stop.data.remote.source.nowlocation
 
 import com.stop.data.model.nowlocation.BusInfoRepositoryItem
-import com.stop.data.model.nowlocation.SubwayTrainRealTimePositionRepositoryItem
 import com.stop.data.remote.model.NetworkResult
+import com.stop.data.remote.model.nowlocation.subway.TrainLocationInfo
 import com.stop.data.remote.network.SwOpenApiSeoulService
 import com.stop.data.remote.network.WsBusApiService
 import javax.inject.Inject
@@ -23,10 +23,10 @@ internal class NowLocationRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionRepositoryItem {
+    override suspend fun getSubwayTrainNowStation(subwayNumber: Int): List<TrainLocationInfo> {
         with(swOpenApiSeoulService.getSubwayTrainNowStationInfo(stationName = subwayNumber.toString() + LINE)) {
             return when (this) {
-                is NetworkResult.Success -> data.toRepositoryModel(trainNumber)
+                is NetworkResult.Success -> data.realtimePositions
                 is NetworkResult.Failure -> throw IllegalArgumentException(message)
                 is NetworkResult.NetworkError -> throw exception
                 is NetworkResult.Unexpected -> throw  exception
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
@@ -7,7 +7,7 @@ import com.stop.domain.model.route.seoul.bus.BusStationInfo
 import com.stop.domain.model.route.seoul.bus.LastTimeInfo
 import com.stop.domain.model.route.seoul.subway.Station
 import com.stop.domain.model.route.seoul.subway.StationLastTime
-import com.stop.domain.model.route.seoul.subway.SubwayCircleType
+import com.stop.domain.model.route.seoul.subway.TransportDirectionType
 import com.stop.domain.model.route.seoul.subway.WeekType
 import com.stop.domain.model.route.tmap.RouteRequest
 import com.stop.domain.model.route.tmap.custom.Coordinate
@@ -23,7 +23,7 @@ internal interface RouteRemoteDataSource {
     suspend fun getSubwayStations(lineName: String): List<Station>
     suspend fun getSubwayStationLastTime(
         stationId: String,
-        subwayCircleType: SubwayCircleType,
+        transportDirectionType: TransportDirectionType,
         weekType: WeekType,
     ): List<StationLastTime>
 
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
@@ -100,15 +100,15 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
 
     override suspend fun getSubwayStationLastTime(
         stationId: String,
-        subwayCircleType: SubwayCircleType,
+        transportDirectionType: TransportDirectionType,
         weekType: WeekType,
     ): List<StationLastTime> {
         with(
             openApiSeoulService.getSubwayLastTime(
                 serviceName = "SearchLastTrainTimeByIDService",
                 stationId = stationId,
                 weekTag = weekType.divisionValue,
-                inOutTag = subwayCircleType.divisionValue,
+                inOutTag = transportDirectionType.divisionValue,
             )
         ) {
             return when (this) {
diff --git a/data/src/main/java/com/stop/data/repository/NowLocationRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/NowLocationRepositoryImpl.kt
@@ -2,20 +2,20 @@ package com.stop.data.repository
 
 import com.stop.data.remote.source.nowlocation.NowLocationRemoteDataSource
 import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
-import com.stop.domain.model.nowlocation.SubwayTrainRealTimePositionUseCaseItem
+import com.stop.domain.model.nowlocation.TrainLocationInfoDomain
 import com.stop.domain.repository.NowLocationRepository
 import javax.inject.Inject
 
 class NowLocationRepositoryImpl @Inject constructor(
     private val nowLocationRemoteDataSource: NowLocationRemoteDataSource,
-) : NowLocationRepository{
+) : NowLocationRepository {
 
     override suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoUseCaseItem {
         return nowLocationRemoteDataSource.getBusNowLocation(busRouteId, order).toUseCaseModel()
     }
 
-    override suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem {
-        return nowLocationRemoteDataSource.getSubwayTrainNowStation(trainNumber, subwayNumber).toUseCaseModel()
+    override suspend fun getSubwayTrains(subwayNumber: Int): List<TrainLocationInfoDomain> {
+        return nowLocationRemoteDataSource.getSubwayTrainNowStation(subwayNumber)
+            .map { it.toDomain() }
     }
-
 }
diff --git a/data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt
@@ -8,7 +8,7 @@ import com.stop.domain.model.route.gyeonggi.*
 import com.stop.domain.model.route.seoul.bus.*
 import com.stop.domain.model.route.seoul.subway.Station
 import com.stop.domain.model.route.seoul.subway.StationLastTime
-import com.stop.domain.model.route.seoul.subway.SubwayCircleType
+import com.stop.domain.model.route.seoul.subway.TransportDirectionType
 import com.stop.domain.model.route.seoul.subway.WeekType
 import com.stop.domain.model.route.tmap.RouteRequest
 import com.stop.domain.model.route.tmap.custom.Coordinate
@@ -46,10 +46,10 @@ internal class RouteRepositoryImpl @Inject constructor(
 
     override suspend fun getSubwayStationLastTime(
         stationId: String,
-        subwayCircleType: SubwayCircleType,
+        transportDirectionType: TransportDirectionType,
         weekType: WeekType,
     ): List<StationLastTime> {
-        return remoteDataSource.getSubwayStationLastTime(stationId, subwayCircleType, weekType)
+        return remoteDataSource.getSubwayStationLastTime(stationId, transportDirectionType, weekType)
     }
 
     override suspend fun getSubwayRoute(
diff --git a/domain/src/main/java/com/stop/domain/model/CustomException.kt b/domain/src/main/java/com/stop/domain/model/CustomException.kt
@@ -0,0 +1,4 @@
+package com.stop.domain.model
+
+class AvailableTrainNoExistException: Exception()
+class ApiChangedException: Exception()
diff --git a/domain/src/main/java/com/stop/domain/model/nowlocation/TrainLocationInfoDomain.kt b/domain/src/main/java/com/stop/domain/model/nowlocation/TrainLocationInfoDomain.kt
@@ -0,0 +1,15 @@
+package com.stop.domain.model.nowlocation
+
+import com.stop.domain.model.route.seoul.subway.TransportDirectionType
+
+data class TrainLocationInfoDomain(
+    val subwayId: String,
+    val subwayName: String,
+    val stationId: String,
+    val currentStationName: String,
+    val trainNumber: String,
+    val trainStatus: String,
+    val destinationStationName: String,
+    val subwayDirection: TransportDirectionType,
+    val isLastTrain: Boolean,
+)
diff --git a/domain/src/main/java/com/stop/domain/model/route/TransportLastTime.kt b/domain/src/main/java/com/stop/domain/model/route/TransportLastTime.kt
@@ -0,0 +1,13 @@
+package com.stop.domain.model.route
+
+import com.stop.domain.model.route.seoul.subway.TransportDirectionType
+
+data class TransportLastTime(
+    val transportMoveType : TransportMoveType,
+    val area : Area,
+    val lastTime: String,
+    val destinationStationName: String,
+    val stationsUntilStart: List<TransportStation>,
+    val enableDestinationStation: List<TransportStation>,
+    val transportDirectionType: TransportDirectionType,
+)
diff --git a/domain/src/main/java/com/stop/domain/model/route/TransportStation.kt b/domain/src/main/java/com/stop/domain/model/route/TransportStation.kt
@@ -0,0 +1,6 @@
+package com.stop.domain.model.route
+
+data class TransportStation(
+    val stationName: String,
+    val stationId: String,
+)
diff --git a/domain/src/main/java/com/stop/domain/model/route/seoul/subway/SubwayCircleType.kt b/domain/src/main/java/com/stop/domain/model/route/seoul/subway/SubwayCircleType.kt
diff --git a/domain/src/main/java/com/stop/domain/model/route/seoul/subway/TransportDirectionType.kt b/domain/src/main/java/com/stop/domain/model/route/seoul/subway/TransportDirectionType.kt
@@ -0,0 +1,7 @@
+package com.stop.domain.model.route.seoul.subway
+
+enum class TransportDirectionType(val divisionValue: String) {
+    INNER("1"), // 내선, 상행, 기점 출발
+    OUTER("2"), // 외선, 하행, 종점 출발
+    UNKNOWN("-1") // 계산하지 않은 경우
+}
diff --git a/domain/src/main/java/com/stop/domain/model/route/tmap/custom/Itinerary.kt b/domain/src/main/java/com/stop/domain/model/route/tmap/custom/Itinerary.kt
@@ -7,4 +7,4 @@ data class Itinerary(
     val totalTime: Int,
     val transferCount: Int, // 환승 횟수
     val walkTime: Int, // 걷는 시간
-)
+)
diff --git a/domain/src/main/java/com/stop/domain/repository/NowLocationRepository.kt b/domain/src/main/java/com/stop/domain/repository/NowLocationRepository.kt
@@ -1,12 +1,11 @@
 package com.stop.domain.repository
 
 import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
-import com.stop.domain.model.nowlocation.SubwayTrainRealTimePositionUseCaseItem
+import com.stop.domain.model.nowlocation.TrainLocationInfoDomain
 
 interface NowLocationRepository {
 
     suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoUseCaseItem
 
-    suspend fun getSubwayTrainNowStation(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem
-
+    suspend fun getSubwayTrains(subwayNumber: Int): List<TrainLocationInfoDomain>
 }
diff --git a/domain/src/main/java/com/stop/domain/repository/RouteRepository.kt b/domain/src/main/java/com/stop/domain/repository/RouteRepository.kt
@@ -8,7 +8,7 @@ import com.stop.domain.model.route.gyeonggi.GyeonggiBusStation
 import com.stop.domain.model.route.seoul.bus.*
 import com.stop.domain.model.route.seoul.subway.Station
 import com.stop.domain.model.route.seoul.subway.StationLastTime
-import com.stop.domain.model.route.seoul.subway.SubwayCircleType
+import com.stop.domain.model.route.seoul.subway.TransportDirectionType
 import com.stop.domain.model.route.seoul.subway.WeekType
 import com.stop.domain.model.route.tmap.RouteRequest
 import com.stop.domain.model.route.tmap.custom.Coordinate
@@ -24,7 +24,7 @@ interface RouteRepository {
     suspend fun getSubwayStations(lineName: String): List<Station>
     suspend fun getSubwayStationLastTime(
         stationId: String,
-        subwayCircleType: SubwayCircleType,
+        transportDirectionType: TransportDirectionType,
         weekType: WeekType,
     ): List<StationLastTime>
 
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
@@ -1,9 +1,10 @@
 package com.stop.domain.usecase.nowlocation
 
-import com.stop.domain.model.nowlocation.SubwayTrainRealTimePositionUseCaseItem
+import com.stop.domain.model.nowlocation.TrainLocationInfoDomain
+import com.stop.domain.model.route.TransportLastTime
 
 interface GetSubwayTrainNowStationUseCase {
 
-    suspend operator fun invoke(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem
+    suspend operator fun invoke(transportLastTime: TransportLastTime, subwayNumber: Int): TrainLocationInfoDomain
 
 }
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
@@ -1,15 +1,44 @@
 package com.stop.domain.usecase.nowlocation
 
-import com.stop.domain.model.nowlocation.SubwayTrainRealTimePositionUseCaseItem
+import com.stop.domain.model.ApiChangedException
+import com.stop.domain.model.AvailableTrainNoExistException
+import com.stop.domain.model.nowlocation.TrainLocationInfoDomain
+import com.stop.domain.model.route.TransportLastTime
+import com.stop.domain.model.route.seoul.subway.TransportDirectionType
 import com.stop.domain.repository.NowLocationRepository
 import javax.inject.Inject
 
 class GetSubwayTrainNowStationUseCaseImpl @Inject constructor(
     private val nowLocationRepository: NowLocationRepository
 ) : GetSubwayTrainNowStationUseCase {
 
-    override suspend operator fun invoke(trainNumber: String, subwayNumber: Int): SubwayTrainRealTimePositionUseCaseItem {
-        return nowLocationRepository.getSubwayTrainNowStation(trainNumber, subwayNumber)
+    override suspend operator fun invoke(
+        transportLastTime: TransportLastTime,
+        subwayNumber: Int
+    ): TrainLocationInfoDomain {
+        val trains = nowLocationRepository.getSubwayTrains(subwayNumber)
+
+        val enableDestinations =
+            transportLastTime.enableDestinationStation.map { it.stationName }
+        val enableCurrentStations = transportLastTime.stationsUntilStart.map { it.stationName }
+
+        val possibleTrains = trains.filter {
+            enableDestinations.contains(it.destinationStationName)
+                    && enableCurrentStations.contains(it.currentStationName)
+                    && it.subwayDirection == transportLastTime.transportDirectionType
+        }.sortedBy {
+            enableCurrentStations.indexOf(it.currentStationName)
+        }
+
+        if (possibleTrains.isEmpty()) {
+            throw AvailableTrainNoExistException()
+        }
+
+        return when (transportLastTime.transportDirectionType) {
+            TransportDirectionType.OUTER -> possibleTrains.first()
+            TransportDirectionType.INNER -> possibleTrains.last()
+            TransportDirectionType.UNKNOWN -> throw ApiChangedException()
+        }
     }
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/route/GetLastTransportTimeUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/route/GetLastTransportTimeUseCase.kt
@@ -1,8 +1,9 @@
 package com.stop.domain.usecase.route
 
+import com.stop.domain.model.route.TransportLastTime
 import com.stop.domain.model.route.tmap.custom.Itinerary
 
 interface GetLastTransportTimeUseCase {
 
-    suspend operator fun invoke(itinerary: Itinerary): List<String?>
+    suspend operator fun invoke(itinerary: Itinerary): List<TransportLastTime?>
 }
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
diff --git a/presentation/src/main/java/com/stop/model/ErrorType.kt b/presentation/src/main/java/com/stop/model/ErrorType.kt
diff --git a/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt b/presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt
diff --git a/presentation/src/main/java/com/stop/ui/route/RouteViewModel.kt b/presentation/src/main/java/com/stop/ui/route/RouteViewModel.kt
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
