Merge pull request #79 from boostcampwm-2022/77-fix-api-logic

정류소 이름 전처리 로직 변경, API 요청 데이터가 없을 때 대응처리

Author: DoTheBestMayB

data/src/main/java/com/stop/data/di/ApiModule.kt

@@ -19,12 +19,6 @@ internal object ApiModule {
         return retrofit.create(TmapApiService::class.java)
     }
 
-    @Provides
-    @Singleton
-    fun provideFakeTmapApiService(@Named("Tmap") retrofit: Retrofit): FakeTmapApiService {
-        return retrofit.create(FakeTmapApiService::class.java)
-    }
-
     @Provides
     @Singleton
     fun provideOpenApiSeoulService(@Named("OpenApiSeoul") retrofit: Retrofit): OpenApiSeoulService {

data/src/main/java/com/stop/data/remote/model/nowlocation/bus/BusBody.kt

@@ -5,5 +5,5 @@ import com.stop.domain.model.nowlocation.BusCurrentInformation
 
 data class BusBody(
     @Json(name = "itemList")
-    val busCurrentInformation: List<BusCurrentInformation>
+    val busCurrentInformation: List<BusCurrentInformation>?
 )

data/src/main/java/com/stop/data/remote/model/nowlocation/subway/SubwayTrainNowLocationResponse.kt

@@ -6,5 +6,5 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class SubwayTrainNowLocationResponse(
     @Json(name = "realtimePositionList")
-    val realtimePositions: List<TrainLocationInfo>
+    val realtimePositions: List<TrainLocationInfo>?
 )

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>
 )

data/src/main/java/com/stop/data/remote/network/FakeTmapApiService.kt

@@ -1,5 +1,6 @@
 package com.stop.data.remote.source.nowlocation
 
+import com.squareup.moshi.JsonDataException
 import com.stop.data.remote.model.NetworkResult
 import com.stop.domain.model.nowlocation.BusCurrentInformation
 import com.stop.data.remote.model.nowlocation.subway.TrainLocationInfo
@@ -16,6 +17,7 @@ internal class NowLocationRemoteDataSourceImpl @Inject constructor(
         with(wsBusApiService.getBusNowLocation(busRouteId = busRouteId)) {
             return when (this) {
                 is NetworkResult.Success -> data.busBody.busCurrentInformation
+                    ?: throw JsonDataException(NO_RESULT)
                 is NetworkResult.Failure -> throw IllegalArgumentException(message)
                 is NetworkResult.NetworkError -> throw exception
                 is NetworkResult.Unexpected -> throw  exception
@@ -27,6 +29,7 @@ internal class NowLocationRemoteDataSourceImpl @Inject constructor(
         with(swOpenApiSeoulService.getSubwayTrainNowStationInfo(stationName = subwayNumber.toString() + LINE)) {
             return when (this) {
                 is NetworkResult.Success -> data.realtimePositions
+                    ?: throw JsonDataException(NO_RESULT)
                 is NetworkResult.Failure -> throw IllegalArgumentException(message)
                 is NetworkResult.NetworkError -> throw exception
                 is NetworkResult.Unexpected -> throw  exception
@@ -36,6 +39,7 @@ internal class NowLocationRemoteDataSourceImpl @Inject constructor(
 
     companion object {
         private const val LINE = "호선"
+        private const val NO_RESULT = "검색 결과가 없습니다."
     }
 
 }

data/src/main/java/com/stop/data/remote/source/nowlocation/NowLocationRemoteDataSourceImpl.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>
 }

data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSource.kt

@@ -20,7 +20,6 @@ import javax.inject.Inject
 
 internal class RouteRemoteDataSourceImpl @Inject constructor(
     private val tMapApiService: TmapApiService,
-//    private val fakeTmapApiService: FakeTmapApiService,
     private val openApiSeoulService: OpenApiSeoulService,
     private val wsBusApiService: WsBusApiService,
     private val apisDataService: ApisDataService,
@@ -33,7 +32,7 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
             return when (this) {
                 is NetworkResult.Success -> {
                     val itineraries = this.data.metaData?.plan?.itineraries
-                        ?: throw JsonDataException(NO_ROUTE_RESULT)
+                        ?: throw JsonDataException(NO_RESULT)
                     eraseDuplicateLeg(itineraries)
                 }
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
@@ -90,7 +89,8 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
             )
         ) {
             return when (this) {
-                is NetworkResult.Success -> this.data.searchStationNameBySubwayLineInfo.stations
+                is NetworkResult.Success -> this.data.searchStationNameBySubwayLineInfo?.stations
+                    ?: throw JsonDataException(NO_RESULT)
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
                 is NetworkResult.NetworkError -> throw this.exception
                 is NetworkResult.Unexpected -> throw this.exception
@@ -116,7 +116,8 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
             )
         ) {
             return when (this) {
-                is NetworkResult.Success -> this.data.searchLastTrainTimeByIDService.stationLastTimes
+                is NetworkResult.Success -> this.data.searchLastTrainTimeByIDService?.stationLastTimes
+                    ?: throw JsonDataException(NO_RESULT)
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
                 is NetworkResult.NetworkError -> throw this.exception
                 is NetworkResult.Unexpected -> throw this.exception
@@ -128,6 +129,7 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
         with(wsBusApiService.getBusArsId(stationName)) {
             return when (this) {
                 is NetworkResult.Success -> this.data.arsIdMsgBody.busStations
+                    ?: throw JsonDataException(NO_RESULT)
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
                 is NetworkResult.NetworkError -> throw this.exception
                 is NetworkResult.Unexpected -> throw this.exception
@@ -139,6 +141,7 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
         with(wsBusApiService.getBusRoute(stationId)) {
             return when (this) {
                 is NetworkResult.Success -> this.data.routeIdMsgBody.busRoutes
+                    ?: throw JsonDataException(NO_RESULT)
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
                 is NetworkResult.NetworkError -> throw this.exception
                 is NetworkResult.Unexpected -> throw this.exception
@@ -149,10 +152,11 @@ 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
+                    ?: throw JsonDataException(NO_RESULT)
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
                 is NetworkResult.NetworkError -> throw this.exception
                 is NetworkResult.Unexpected -> throw this.exception
@@ -182,10 +186,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
@@ -244,13 +248,15 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
     }
 
     private fun findStationCd(stationId: String, data: SubwayStationResponse): String {
-        return data.searchInfoBySubwayNameService.row.firstOrNull {
+        val searchInfoBySubwayNameService = data.searchInfoBySubwayNameService
+            ?: throw JsonDataException(NO_RESULT)
+        return searchInfoBySubwayNameService.row.firstOrNull {
             it.frCode == stationId
         }?.stationCd ?: throw IllegalArgumentException(NO_SUBWAY_STATION)
     }
 
     companion object {
         private const val NO_SUBWAY_STATION = "해당하는 지하철역이 없습니다."
-        private const val NO_ROUTE_RESULT = "경로 검색 결과가 없습니다."
+        private const val NO_RESULT = "검색 결과가 없습니다."
     }
 }

data/src/main/java/com/stop/data/remote/source/route/RouteRemoteDataSourceImpl.kt

@@ -37,19 +37,31 @@ internal class RouteRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getSubwayStationCd(stationId: String, stationName: String): String {
-        return remoteDataSource.getSubwayStationCd(stationId, stationName)
+        return try {
+            remoteDataSource.getSubwayStationCd(stationId, stationName)
+        } catch (exception: JsonDataException) {
+            ""
+        }
     }
 
     override suspend fun getSubwayStations(lineName: String): List<Station> {
-        return remoteDataSource.getSubwayStations(lineName)
+        return try {
+            remoteDataSource.getSubwayStations(lineName)
+        } catch (exception: JsonDataException) {
+            listOf()
+        }
     }
 
     override suspend fun getSubwayStationLastTime(
         stationId: String,
         transportDirectionType: TransportDirectionType,
         weekType: WeekType,
     ): List<StationLastTime> {
-        return remoteDataSource.getSubwayStationLastTime(stationId, transportDirectionType, weekType)
+        return try {
+            remoteDataSource.getSubwayStationLastTime(stationId, transportDirectionType, weekType)
+        } catch (exception: JsonDataException) {
+            listOf()
+        }
     }
 
     override suspend fun getSubwayRoute(
@@ -78,30 +90,58 @@ internal class RouteRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getSeoulBusStationArsId(stationName: String): List<BusStationInfo> {
-        return remoteDataSource.getSeoulBusStationArsId(stationName)
+        return  try {
+            remoteDataSource.getSeoulBusStationArsId(stationName)
+        } catch (exception: JsonDataException) {
+            listOf()
+        }
     }
 
     override suspend fun getSeoulBusRoute(stationId: String): List<BusRouteInfo> {
-        return remoteDataSource.getSeoulBusRoute(stationId)
+        return try {
+            remoteDataSource.getSeoulBusRoute(stationId)
+        } catch (exception: JsonDataException) {
+            listOf()
+        }
     }
 
-    override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo>? {
-        return remoteDataSource.getSeoulBusLastTime(stationId, lineId)
+    override suspend fun getSeoulBusLastTime(stationId: String, lineId: String): List<LastTimeInfo> {
+        return try{
+            remoteDataSource.getSeoulBusLastTime(stationId, lineId)
+        } catch (exception: JsonDataException) {
+            listOf()
+        }
     }
 
     override suspend fun getGyeonggiBusStationId(stationName: String): List<GyeonggiBusStation> {
-        return remoteDataSource.getGyeonggiBusStationId(stationName)
+        return try {
+            remoteDataSource.getGyeonggiBusStationId(stationName)
+        } catch (exception: NullPointerException) {
+            listOf()
+        }
     }
 
     override suspend fun getGyeonggiBusRoute(stationId: String): List<GyeonggiBusRoute> {
-        return remoteDataSource.getGyeonggiBusRoute(stationId)
+        return try {
+            remoteDataSource.getGyeonggiBusRoute(stationId)
+        } catch (exception: NullPointerException) {
+            listOf()
+        }
     }
 
-    override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime>? {
-        return remoteDataSource.getGyeonggiBusLastTime(lineId)
+    override suspend fun getGyeonggiBusLastTime(lineId: String): List<GyeonggiBusLastTime> {
+        return try {
+            remoteDataSource.getGyeonggiBusLastTime(lineId)
+        } catch (exception: NullPointerException) {
+            listOf()
+        }
     }
 
     override suspend fun getGyeonggiBusRouteStations(lineId: String): List<GyeonggiBusStation> {
-        return remoteDataSource.getGyeonggiBusRouteStations(lineId)
+        return try {
+            remoteDataSource.getGyeonggiBusRouteStations(lineId)
+        } catch (exception: NullPointerException) {
+            listOf()
+        }
     }
 }

data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt

@@ -6,5 +6,5 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class ArsIdMsgBody(
     @Json(name = "itemList")
-    val busStations: List<BusStationInfo>
+    val busStations: List<BusStationInfo>?
 )