feat: 버스의 현재 위치 추적 로직 구현

DoTheBestMayB · DoTheBestMayB · commit caa6ccf86a1c · 2022-12-05T16:28:16.000+09:00
diff --git a/data/src/main/java/com/stop/data/model/nowlocation/BusInfoRepositoryItem.kt b/data/src/main/java/com/stop/data/model/nowlocation/BusInfoRepositoryItem.kt
diff --git a/data/src/main/java/com/stop/data/remote/model/nowlocation/bus/BusBody.kt b/data/src/main/java/com/stop/data/remote/model/nowlocation/bus/BusBody.kt
@@ -1,8 +1,9 @@
 package com.stop.data.remote.model.nowlocation.bus
 
 import com.squareup.moshi.Json
+import com.stop.domain.model.nowlocation.BusCurrentInformation
 
 data class BusBody(
     @Json(name = "itemList")
-    val busInfo: List<BusInfo>
+    val busCurrentInformation: List<BusCurrentInformation>
 )
diff --git a/data/src/main/java/com/stop/data/remote/model/nowlocation/bus/BusInfo.kt b/data/src/main/java/com/stop/data/remote/model/nowlocation/bus/BusInfo.kt
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.domain.model.nowlocation.BusCurrentInformation
 import com.stop.data.remote.model.nowlocation.subway.TrainLocationInfo
 
 interface NowLocationRemoteDataSource {
 
-    suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoRepositoryItem
+    suspend fun getBusNowLocation(busRouteId: String): List<BusCurrentInformation>
 
     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,7 +1,7 @@
 package com.stop.data.remote.source.nowlocation
 
-import com.stop.data.model.nowlocation.BusInfoRepositoryItem
 import com.stop.data.remote.model.NetworkResult
+import com.stop.domain.model.nowlocation.BusCurrentInformation
 import com.stop.data.remote.model.nowlocation.subway.TrainLocationInfo
 import com.stop.data.remote.network.SwOpenApiSeoulService
 import com.stop.data.remote.network.WsBusApiService
@@ -12,10 +12,10 @@ internal class NowLocationRemoteDataSourceImpl @Inject constructor(
     private val swOpenApiSeoulService: SwOpenApiSeoulService
 ) : NowLocationRemoteDataSource {
 
-    override suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoRepositoryItem {
+    override suspend fun getBusNowLocation(busRouteId: String): List<BusCurrentInformation> {
         with(wsBusApiService.getBusNowLocation(busRouteId = busRouteId)) {
             return when (this) {
-                is NetworkResult.Success -> data.busBody.busInfo[order].toRepositoryModel()
+                is NetworkResult.Success -> data.busBody.busCurrentInformation
                 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/repository/NowLocationRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/NowLocationRepositoryImpl.kt
@@ -1,7 +1,7 @@
 package com.stop.data.repository
 
+import com.stop.domain.model.nowlocation.BusCurrentInformation
 import com.stop.data.remote.source.nowlocation.NowLocationRemoteDataSource
-import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
 import com.stop.domain.model.nowlocation.TrainLocationInfoDomain
 import com.stop.domain.repository.NowLocationRepository
 import javax.inject.Inject
@@ -10,8 +10,8 @@ class NowLocationRepositoryImpl @Inject constructor(
     private val nowLocationRemoteDataSource: NowLocationRemoteDataSource,
 ) : NowLocationRepository {
 
-    override suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoUseCaseItem {
-        return nowLocationRemoteDataSource.getBusNowLocation(busRouteId, order).toUseCaseModel()
+    override suspend fun getBusesOnRoute(busRouteId: String): List<BusCurrentInformation> {
+        return nowLocationRemoteDataSource.getBusNowLocation(busRouteId)
     }
 
     override suspend fun getSubwayTrains(subwayNumber: Int): List<TrainLocationInfoDomain> {
diff --git a/domain/src/main/java/com/stop/domain/di/UseCaseModule.kt b/domain/src/main/java/com/stop/domain/di/UseCaseModule.kt
@@ -66,4 +66,8 @@ internal interface UseCaseModule {
     @Singleton
     fun provideNowStationLocationUseCase(getNowStationLocationUseCaseImpl: GetNowStationLocationUseCaseImpl): GetNowStationLocationUseCase
 
+    @Binds
+    @Singleton
+    fun provideGetBusesOnRouteUseCase(getBusesOnRouteUseCaseImpl: GetBusesOnRouteUseCaseImpl): GetBusesOnRouteUseCase
+
 }
diff --git a/domain/src/main/java/com/stop/domain/model/nowlocation/BusCurrentInformation.kt b/domain/src/main/java/com/stop/domain/model/nowlocation/BusCurrentInformation.kt
@@ -0,0 +1,38 @@
+package com.stop.domain.model.nowlocation
+
+import com.squareup.moshi.Json
+
+data class BusCurrentInformation(
+    @Json(name = "plainNo")
+    val licensePlateNumber: String,
+    @Json(name = "vehId")
+    val vehicleId: String,
+    @Json(name = "sectOrd")
+    val currentStationOrder: String,
+    @Json(name = "stopFlag")
+    val isStoppedAtStation: String,
+    @Json(name = "gpsX")
+    val longitude: String,
+    @Json(name = "gpsY")
+    val latitude: String,
+    @Json(name = "isrunyn")
+    val isRun: String,
+    @Json(name = "islastyn")
+    val isLast: String,
+    @Json(name = "lastStnId")
+    val beforeNodeId: String,
+) {
+    fun toUseCaseModel(transportState: TransportState) = BusCurrentInformationUseCaseItem(
+        licensePlateNumber = licensePlateNumber,
+        vehicleId = vehicleId,
+        currentStationOrder = currentStationOrder,
+        isStoppedAtStation = isStoppedAtStation,
+        longitude = longitude,
+        latitude = latitude,
+        isRun = isRun,
+        isLast = isLast,
+        beforeNodeId = beforeNodeId,
+        transportState = transportState,
+    )
+}
+
diff --git a/domain/src/main/java/com/stop/domain/model/nowlocation/BusCurrentInformationUseCaseItem.kt b/domain/src/main/java/com/stop/domain/model/nowlocation/BusCurrentInformationUseCaseItem.kt
@@ -0,0 +1,31 @@
+package com.stop.domain.model.nowlocation
+
+data class BusCurrentInformationUseCaseItem(
+    val licensePlateNumber: String,
+    val vehicleId: String,
+    val currentStationOrder: String,
+    val isStoppedAtStation: String,
+    val longitude: String,
+    val latitude: String,
+    val isRun: String,
+    val isLast: String,
+    val beforeNodeId: String,
+    val transportState: TransportState,
+) {
+    companion object {
+        fun createDisappearItem(): BusCurrentInformationUseCaseItem {
+            return BusCurrentInformationUseCaseItem(
+                licensePlateNumber = "",
+                vehicleId = "",
+                currentStationOrder = "",
+                isStoppedAtStation = "",
+                longitude = "",
+                latitude = "",
+                isRun = "",
+                isLast = "",
+                beforeNodeId = "",
+                transportState = TransportState.DISAPPEAR,
+            )
+        }
+    }
+}
diff --git a/domain/src/main/java/com/stop/domain/model/nowlocation/BusInfoUseCaseItem.kt b/domain/src/main/java/com/stop/domain/model/nowlocation/BusInfoUseCaseItem.kt
diff --git a/domain/src/main/java/com/stop/domain/model/nowlocation/TransportState.kt b/domain/src/main/java/com/stop/domain/model/nowlocation/TransportState.kt
@@ -0,0 +1,5 @@
+package com.stop.domain.model.nowlocation
+
+enum class TransportState {
+    DISAPPEAR, ARRIVE, RUN
+}
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
@@ -10,4 +10,5 @@ data class TransportLastTime(
     val stationsUntilStart: List<TransportStation>,
     val enableDestinationStation: List<TransportStation>,
     val transportDirectionType: TransportDirectionType,
+    val routeId: String,
 )
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,11 +1,11 @@
 package com.stop.domain.repository
 
-import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
+import com.stop.domain.model.nowlocation.BusCurrentInformation
 import com.stop.domain.model.nowlocation.TrainLocationInfoDomain
 
 interface NowLocationRepository {
 
-    suspend fun getBusNowLocation(busRouteId: String, order: Int): BusInfoUseCaseItem
+    suspend fun getBusesOnRoute(busRouteId: String): List<BusCurrentInformation>
 
     suspend fun getSubwayTrains(subwayNumber: Int): List<TrainLocationInfoDomain>
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusNowLocationUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusNowLocationUseCase.kt
@@ -1,9 +1,13 @@
 package com.stop.domain.usecase.nowlocation
 
-import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
+import com.stop.domain.model.nowlocation.BusCurrentInformationUseCaseItem
+import com.stop.domain.model.route.TransportLastTime
 
 interface GetBusNowLocationUseCase {
 
-    suspend operator fun invoke(busRouteId: String): BusInfoUseCaseItem
+    suspend operator fun invoke(
+        transportLastTime: TransportLastTime,
+        busVehicleIds: List<String>,
+    ): List<BusCurrentInformationUseCaseItem>
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusNowLocationUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusNowLocationUseCaseImpl.kt
@@ -1,19 +1,32 @@
 package com.stop.domain.usecase.nowlocation
 
-import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
+import com.stop.domain.model.nowlocation.BusCurrentInformationUseCaseItem
+import com.stop.domain.model.nowlocation.TransportState
+import com.stop.domain.model.route.TransportLastTime
 import com.stop.domain.repository.NowLocationRepository
 import javax.inject.Inject
 
 class GetBusNowLocationUseCaseImpl @Inject constructor(
     private val nowLocationRepository: NowLocationRepository
 ) : GetBusNowLocationUseCase {
 
-    override suspend operator fun invoke(busRouteId: String): BusInfoUseCaseItem {
-        return nowLocationRepository.getBusNowLocation(busRouteId, TEST_ORDER)
-    }
+    override suspend operator fun invoke(
+        transportLastTime: TransportLastTime,
+        busVehicleIds: List<String>
+    ): List<BusCurrentInformationUseCaseItem> {
+        val busCurrentInformation = nowLocationRepository.getBusesOnRoute(transportLastTime.routeId)
 
-    companion object {
-        private const val TEST_ORDER = 1
-    }
+        val stationsUntilStart = transportLastTime.stationsUntilStart.map { it.stationId }
 
+        return busVehicleIds.map { busVehicleId ->
+            val newCurrentInformation = busCurrentInformation.firstOrNull {
+                it.vehicleId == busVehicleId
+            } ?: return@map BusCurrentInformationUseCaseItem.createDisappearItem()
+
+            if (stationsUntilStart.contains(newCurrentInformation.beforeNodeId)) {
+                return@map newCurrentInformation.toUseCaseModel(TransportState.RUN)
+            }
+            return@map newCurrentInformation.toUseCaseModel(TransportState.ARRIVE)
+        }
+    }
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusesOnRouteUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusesOnRouteUseCase.kt
@@ -0,0 +1,8 @@
+package com.stop.domain.usecase.nowlocation
+
+import com.stop.domain.model.route.TransportLastTime
+
+interface GetBusesOnRouteUseCase {
+
+    suspend operator fun invoke(transportLastTime: TransportLastTime): List<String>
+}
diff --git a/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusesOnRouteUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nowlocation/GetBusesOnRouteUseCaseImpl.kt
@@ -0,0 +1,20 @@
+package com.stop.domain.usecase.nowlocation
+
+import com.stop.domain.model.route.TransportLastTime
+import com.stop.domain.repository.NowLocationRepository
+import javax.inject.Inject
+
+class GetBusesOnRouteUseCaseImpl @Inject constructor(
+    private val nowLocationRepository: NowLocationRepository
+) : GetBusesOnRouteUseCase {
+
+    override suspend fun invoke(transportLastTime: TransportLastTime): List<String> {
+        val busCurrentInformation = nowLocationRepository.getBusesOnRoute(transportLastTime.routeId)
+
+        val stationsUntilStart = transportLastTime.stationsUntilStart.map { it.stationId }
+
+        return busCurrentInformation.dropLastWhile {
+            stationsUntilStart.contains(it.beforeNodeId).not()
+        }.map { it.vehicleId }
+    }
+}
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
@@ -193,7 +193,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             stationsUntilStart = stationsOfLine.subList(0, startStationIndex + 1)
             enableDestinationStation = stationsOfLine.subList(startStationIndex, endStationIndex)
         } else {
-            stationsUntilStart = stationsOfLine.subList(startStationIndex + 1, stationsOfLine.size)
+            stationsUntilStart = stationsOfLine.subList(startStationIndex, stationsOfLine.size)
             enableDestinationStation =
                 stationsOfLine.subList(endStationIndex + 1, startStationIndex + 1)
         }
@@ -246,6 +246,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
                 )
             },
             transportDirectionType = subwayCircleType,
+            routeId = transportIdRequest.routeId,
         )
     }
 
@@ -342,6 +343,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             stationsUntilStart = listOf(),
             enableDestinationStation = listOf(),
             transportDirectionType = TransportDirectionType.UNKNOWN, // TODO: 서울 버스의 상행, 하행 구현
+            routeId = transportIdRequest.routeId,
         )
     }
 
@@ -390,6 +392,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             destinationStationName = newTransportIdRequest.destinationStation.name,
             stationsUntilStart = stationsUntilStart,
             enableDestinationStation = listOf(),
+            routeId = newTransportIdRequest.routeId,
         )
     }
 
@@ -435,6 +438,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             destinationStationName = transportIdRequest.destinationStation.name,
             stationsUntilStart = stationsUntilStart,
             enableDestinationStation = listOf(),
+            routeId = transportIdRequest.routeId,
         )
     }
 
@@ -463,6 +467,7 @@ internal class GetLastTransportTimeUseCaseImpl @Inject constructor(
             stationsUntilStart = listOf(),
             enableDestinationStation = listOf(),
             transportDirectionType = TransportDirectionType.UNKNOWN,
+            routeId = transportIdRequest.routeId,
         )
     }
 
diff --git a/presentation/src/main/java/com/stop/model/ErrorType.kt b/presentation/src/main/java/com/stop/model/ErrorType.kt
@@ -9,4 +9,7 @@ enum class ErrorType(val stringResourcesId: Int) {
     TRANSPORT_LAST_TIME_IS_NOT_RECEIVED_YET(R.string.transport_last_time_is_not_received_yet),
     AVAILABLE_TRAIN_NO_EXIST_YET(R.string.available_train_no_exist_yet),
     API_CHANGED(R.string.api_changed),
+    AVAILABLE_BUS_NO_EXIST_YET(R.string.available_bus_no_exist_yet),
+    BUS_DISAPPEAR_SUDDENLY(R.string.bus_disappear_suddenly),
+    MISSION_SOMETHING_WRONG(R.string.mission_something_wrong),
 }
diff --git a/presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt b/presentation/src/main/java/com/stop/ui/mission/MissionFragment.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/res/values/strings.xml b/presentation/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package com.stop.data.remote.model.nowlocation.bus`
`2`	`2`
`3`	`3`	`import com.squareup.moshi.Json`
	`4`	`+import com.stop.domain.model.nowlocation.BusCurrentInformation`
`4`	`5`
`5`	`6`	`data class BusBody(`
`6`	`7`	`@Json(name = "itemList")`
`7`		`- val busInfo: List<BusInfo>`
	`8`	`+ val busCurrentInformation: List<BusCurrentInformation>`
`8`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,8 @@ internal interface UseCaseModule {`
`66`	`66`	`@Singleton`
`67`	`67`	`fun provideNowStationLocationUseCase(getNowStationLocationUseCaseImpl: GetNowStationLocationUseCaseImpl): GetNowStationLocationUseCase`
`68`	`68`
	`69`	`+ @Binds`
	`70`	`+ @Singleton`
	`71`	`+ fun provideGetBusesOnRouteUseCase(getBusesOnRouteUseCaseImpl: GetBusesOnRouteUseCaseImpl): GetBusesOnRouteUseCase`
	`72`	`+`
`69`	`73`	`}`