feat : NetworkResult에 대하여 Repository에서는 모르게 하기 위해서 Result 래퍼로 감싸서 repository에서 에러처리 변경

Author: koreatlwls

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

@@ -1,18 +1,29 @@
 package com.stop.data.di
 
+import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSource
+import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSourceImpl
 import com.stop.data.remote.source.route.RouteRemoteDataSource
 import com.stop.data.remote.source.route.RouteRemoteDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
 @Module
 internal interface DataSourceModule {
 
     @Binds
+    @Singleton
     fun provideRouteRemoteDataSource(
         routeRemoteDataSourceImpl: RouteRemoteDataSourceImpl
     ): RouteRemoteDataSource
+
+    @Binds
+    @Singleton
+    fun provideNearPlaceDataSource(
+        nearPlaceRemoteDataSourceImpl: NearPlaceRemoteDataSourceImpl
+    ) : NearPlaceRemoteDataSource
+
 }

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

@@ -22,7 +22,8 @@ internal interface RepositoryModule {
 
     @Binds
     @Singleton
-    abstract fun provideNearPlaceRepository(
+    fun provideNearPlaceRepository(
         nearPlaceRepositoryImpl: NearPlaceRepositoryImpl
     ): NearPlaceRepository
+
 }

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

@@ -10,6 +10,6 @@ interface NearPlaceRemoteDataSource {
         centerLon: Double,
         centerLat: Double,
         appKey: String
-    ): List<Place>
+    ): Result<List<Place>>
 
 }

data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSource.kt

@@ -15,29 +15,30 @@ internal class NearPlaceRemoteDataSourceImpl @Inject constructor(
         centerLon: Double,
         centerLat: Double,
         appKey: String
-    ): List<Place> {
+    ): Result<List<Place>> {
         val result = nearPlaceApiService.getNearPlaces(
             version,
             searchKeyword,
             centerLon,
             centerLat,
             appKey
         )
-
-        when (result) {
-            is NetworkResult.Failure -> {
-                throw Exception(result.message)
-            }
-            is NetworkResult.Success -> {
-                return result.data.searchPoiInfo.pois.poi.map {
-                    it.toRepositoryModel()
+        return runCatching {
+            when (result) {
+                is NetworkResult.Failure -> {
+                    throw Exception(result.message)
+                }
+                is NetworkResult.Success -> {
+                    result.data.searchPoiInfo.pois.poi.map {
+                        it.toRepositoryModel()
+                    }
+                }
+                is NetworkResult.NetworkError -> {
+                    throw result.exception
+                }
+                is NetworkResult.Unexpected -> {
+                    throw result.exception
                 }
-            }
-            is NetworkResult.NetworkError -> {
-                throw result.exception
-            }
-            is NetworkResult.Unexpected -> {
-                throw result.exception
             }
         }
     }

data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSourceImpl.kt

@@ -15,14 +15,20 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
         centerLon: Double,
         centerLat: Double,
         appKey: String
-    ): List<Place> = nearPlaceRemoteDataSource.getNearPlaces(
-        version,
-        searchKeyword,
-        centerLon,
-        centerLat,
-        appKey
-    ).map {
-        it.toUseCaseModel()
+    ): List<Place> {
+        nearPlaceRemoteDataSource.getNearPlaces(
+            version,
+            searchKeyword,
+            centerLon,
+            centerLat,
+            appKey
+        ).onSuccess { places ->
+            return places.map {
+                it.toUseCaseModel()
+            }
+        }.onFailure {
+            throw it
+        }
+        return emptyList()
     }
-
 }