Skip to content

Commit c150e12

Browse files
committed
refactor: T MAP 관련 remote Data Source 함수에서 Response 대신 데이터 리스트 반환
1 parent 3eb7d9d commit c150e12

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import com.stop.domain.model.route.seoul.subway.SubwayCircleType
1111
import com.stop.domain.model.route.seoul.subway.WeekType
1212
import com.stop.domain.model.route.tmap.RouteRequest
1313
import com.stop.domain.model.route.tmap.custom.Coordinate
14+
import com.stop.domain.model.route.tmap.origin.Itinerary
1415
import com.stop.domain.model.route.tmap.origin.ReverseGeocodingResponse
15-
import com.stop.domain.model.route.tmap.origin.RouteResponse
1616

1717
internal interface RouteRemoteDataSource {
1818

19-
suspend fun getRoute(routeRequest: RouteRequest): RouteResponse
19+
suspend fun getRoute(routeRequest: RouteRequest): List<Itinerary>
2020
suspend fun reverseGeocoding(coordinate: Coordinate, addressType: AddressType): ReverseGeocodingResponse
2121

2222
suspend fun getSubwayStationCd(stationId: String, stationName: String): String

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
2525
private val apisDataService: ApisDataService,
2626
) : RouteRemoteDataSource {
2727

28-
override suspend fun getRoute(routeRequest: RouteRequest): RouteResponse {
28+
override suspend fun getRoute(routeRequest: RouteRequest): List<Itinerary> {
2929
with(
3030
tmapApiService.getRoutes(routeRequest.toMap())
3131
) {
3232
return when (this) {
33-
is NetworkResult.Success -> this.data
33+
is NetworkResult.Success -> eraseDuplicateLeg(this.data.metaData.plan.itineraries)
3434
is NetworkResult.Failure -> throw IllegalArgumentException(this.message)
3535
is NetworkResult.NetworkError -> throw this.exception
3636
is NetworkResult.Unexpected -> throw this.exception

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import com.stop.domain.model.route.seoul.subway.SubwayCircleType
1010
import com.stop.domain.model.route.seoul.subway.WeekType
1111
import com.stop.domain.model.route.tmap.RouteRequest
1212
import com.stop.domain.model.route.tmap.custom.Coordinate
13+
import com.stop.domain.model.route.tmap.origin.Itinerary
1314
import com.stop.domain.model.route.tmap.origin.ReverseGeocodingResponse
14-
import com.stop.domain.model.route.tmap.origin.RouteResponse
1515
import com.stop.domain.repository.RouteRepository
1616
import javax.inject.Inject
1717

1818
internal class RouteRepositoryImpl @Inject constructor(
1919
private val remoteDataSource: RouteRemoteDataSource
2020
) : RouteRepository {
2121

22-
override suspend fun getRoute(routeRequest: RouteRequest): RouteResponse {
22+
override suspend fun getRoute(routeRequest: RouteRequest): List<Itinerary> {
2323
return remoteDataSource.getRoute(routeRequest)
2424
}
2525

domain/src/main/java/com/stop/domain/repository/RouteRepository.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import com.stop.domain.model.route.seoul.subway.SubwayCircleType
1111
import com.stop.domain.model.route.seoul.subway.WeekType
1212
import com.stop.domain.model.route.tmap.RouteRequest
1313
import com.stop.domain.model.route.tmap.custom.Coordinate
14+
import com.stop.domain.model.route.tmap.origin.Itinerary
1415
import com.stop.domain.model.route.tmap.origin.ReverseGeocodingResponse
15-
import com.stop.domain.model.route.tmap.origin.RouteResponse
1616

1717
interface RouteRepository {
1818

19-
suspend fun getRoute(routeRequest: RouteRequest): RouteResponse
19+
suspend fun getRoute(routeRequest: RouteRequest): List<Itinerary>
2020
suspend fun reverseGeocoding(coordinate: Coordinate, addressType: AddressType): ReverseGeocodingResponse
2121

2222
suspend fun getSubwayStationCd(stationId: String, stationName: String): String

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ internal class GetRouteUseCaseImpl @Inject constructor(
1111
) : GetRouteUseCase {
1212

1313
override suspend fun invoke(routeRequest: RouteRequest): List<Itinerary> {
14-
val originRouteData = routeRepository.getRoute(routeRequest)
14+
val originItineraries = routeRepository.getRoute(routeRequest)
1515

16-
return originRouteData.metaData.plan.itineraries.fold(listOf()) itinerary@{ itineraries, itinerary ->
16+
return originItineraries.fold(listOf()) itinerary@{ itineraries, itinerary ->
1717
val result = itinerary.legs.fold(listOf<Route>()) { routes, leg ->
1818
try {
1919
val moveType = MoveType.getMoveTypeByName(leg.mode)

0 commit comments

Comments
 (0)