feat : conflict 해결

Author: jeeminimini

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

@@ -5,6 +5,7 @@ import com.stop.data.remote.network.ApisDataService
 import com.stop.data.remote.network.FakeTmapApiService
 import com.stop.data.remote.network.OpenApiSeoulService
 import com.stop.data.remote.network.WsBusApiService
+import com.stop.domain.model.geoLocation.AddressType
 import com.stop.domain.model.route.gyeonggi.GetGyeonggiBusStationIdResponse
 import com.stop.domain.model.route.seoul.bus.GetBusStationArsIdResponse
 import com.stop.domain.model.route.seoul.subway.SubwayStationResponse
@@ -43,8 +44,8 @@ internal class RouteRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun reverseGeocoding(coordinate: Coordinate): ReverseGeocodingResponse {
-        with(fakeTmapApiService.getReverseGeocoding(coordinate.latitude, coordinate.longitude)) {
+    override suspend fun reverseGeocoding(coordinate: Coordinate, addressType: AddressType): ReverseGeocodingResponse {
+        with(fakeTmapApiService.getReverseGeocoding(coordinate.latitude, coordinate.longitude, addressType = addressType.type)) {
             return when (this) {
                 is NetworkResult.Success -> this.data
                 is NetworkResult.Failure -> throw IllegalArgumentException(this.message)

domain/src/main/java/com/stop/domain/di/UseCaseModule.kt

@@ -1,7 +1,9 @@
 package com.stop.domain.di
 
-import com.stop.domain.usecase.GetRouteUseCase
-import com.stop.domain.usecase.GetRouteUseCaseImpl
+import com.stop.domain.usecase.route.GetRouteUseCase
+import com.stop.domain.usecase.route.GetRouteUseCaseImpl
+import com.stop.domain.usecase.geoLocation.GeoLocationUseCase
+import com.stop.domain.usecase.geoLocation.GeoLocationUseCaseImpl
 import dagger.Module
 import dagger.Binds
 import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
@@ -25,4 +27,7 @@ internal interface UseCaseModule {
         getNearPlacesUseCaseImpl: GetNearPlacesUseCaseImpl
     ): GetNearPlacesUseCase
 
+    @Binds
+    @Singleton
+    fun provideGeoLocationUseCase(geoLocationUseCaseImpl: GeoLocationUseCaseImpl): GeoLocationUseCase
 }

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

@@ -1,4 +1,4 @@
-package com.stop.domain.usecase
+package com.stop.domain.usecase.route
 
 import com.stop.domain.model.route.tmap.custom.Itinerary
 import com.stop.domain.model.route.tmap.RouteRequest