Refactor: API 서비스 및 데이터 소스 레이어 내 BaseResponse 제거 및 Result 타입 적용

Author: wjdrjs00

core/network/src/main/java/com/threegap/bitnagil/network/auth/TokenAuthenticator.kt

@@ -43,20 +43,10 @@ class TokenAuthenticator(
             return null
         }
 
-        return runCatching {
-            reissueService.reissueToken(refreshToken)
-        }.fold(
-            onSuccess = { baseResponse ->
-                if (baseResponse.data != null && baseResponse.code == SUCCESS_CODE) {
-                    tokenProvider.saveTokens(
-                        accessToken = baseResponse.data.accessToken,
-                        refreshToken = baseResponse.data.refreshToken,
-                    )
-                    buildRequestWithToken(response.request, baseResponse.data.accessToken)
-                } else {
-                    handleTokenExpiration()
-                    null
-                }
+        return reissueService.reissueToken(refreshToken).fold(
+            onSuccess = { authToken ->
+                tokenProvider.saveTokens(accessToken = authToken.accessToken, refreshToken = authToken.refreshToken)
+                buildRequestWithToken(response.request, authToken.accessToken)
             },
             onFailure = {
                 handleTokenExpiration()
@@ -95,6 +85,5 @@ class TokenAuthenticator(
         private const val MAX_RETRY = 2
         private const val AUTHORIZATION = "Authorization"
         private const val TOKEN_PREFIX = "Bearer"
-        private const val SUCCESS_CODE = "CO000"
     }
 }

core/network/src/main/java/com/threegap/bitnagil/network/token/ReissueService.kt

@@ -1,13 +1,12 @@
 package com.threegap.bitnagil.network.token
 
 import com.threegap.bitnagil.network.model.AuthToken
-import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Header
 import retrofit2.http.POST
 
 interface ReissueService {
     @POST("/api/v1/auth/token/reissue")
     suspend fun reissueToken(
         @Header("Refresh-Token") refreshToken: String,
-    ): BaseResponse<AuthToken>
+    ): Result<AuthToken>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -7,36 +7,25 @@ import com.threegap.bitnagil.data.auth.model.request.WithdrawalReasonRequest
 import com.threegap.bitnagil.data.auth.model.response.LoginResponse
 import com.threegap.bitnagil.data.auth.service.AuthService
 import com.threegap.bitnagil.data.auth.service.LoginService
-import com.threegap.bitnagil.data.common.safeApiCall
-import com.threegap.bitnagil.data.common.safeUnitApiCall
 import javax.inject.Inject
 
 class AuthRemoteDataSourceImpl @Inject constructor(
     private val authService: AuthService,
     private val loginService: LoginService,
 ) : AuthRemoteDataSource {
+
     override suspend fun login(socialAccessToken: String, loginRequest: LoginRequest): Result<LoginResponse> =
-        safeApiCall {
-            loginService.postLogin(socialAccessToken, loginRequest)
-        }
+        loginService.postLogin(socialAccessToken, loginRequest)
 
     override suspend fun submitAgreement(termsAgreementRequest: TermsAgreementRequest): Result<Unit> =
-        safeUnitApiCall {
-            authService.submitAgreement(termsAgreementRequest)
-        }
+        authService.submitAgreement(termsAgreementRequest)
 
     override suspend fun logout(): Result<Unit> =
-        safeUnitApiCall {
-            authService.postLogout()
-        }
+        authService.postLogout()
 
     override suspend fun withdrawal(reason: String): Result<Unit> =
-        safeUnitApiCall {
-            authService.postWithdrawal(WithdrawalReasonRequest(reason))
-        }
+        authService.postWithdrawal(WithdrawalReasonRequest(reason))
 
     override suspend fun reissueToken(refreshToken: String): Result<LoginResponse> =
-        safeApiCall {
-            loginService.postReissueToken(refreshToken)
-        }
+        loginService.postReissueToken(refreshToken)
 }

data/src/main/java/com/threegap/bitnagil/data/auth/repositoryimpl/AuthRepositoryImpl.kt

@@ -14,29 +14,25 @@ class AuthRepositoryImpl @Inject constructor(
     private val authRemoteDataSource: AuthRemoteDataSource,
     private val authLocalDataSource: AuthLocalDataSource,
 ) : AuthRepository {
+
     override suspend fun login(socialAccessToken: String, socialType: String): Result<AuthSession> =
         authRemoteDataSource.login(socialAccessToken, LoginRequest(socialType))
             .map { it.toDomain() }
 
     override suspend fun submitAgreement(termsAgreement: TermsAgreement): Result<Unit> =
-        authRemoteDataSource.submitAgreement(
-            termsAgreement.toDto(),
-        )
-
-    override suspend fun logout(): Result<Unit> {
-        return authRemoteDataSource.logout().also {
-            if (it.isSuccess) authLocalDataSource.clearAuthToken()
-        }
-    }
-
-    override suspend fun withdrawal(reason: String): Result<Unit> {
-        return authRemoteDataSource.withdrawal(reason).also {
-            if (it.isSuccess) authLocalDataSource.clearAuthToken()
-        }
-    }
+        authRemoteDataSource.submitAgreement(termsAgreement.toDto())
+
+    override suspend fun logout(): Result<Unit> =
+        authRemoteDataSource.logout()
+            .onSuccess { authLocalDataSource.clearAuthToken() }
+
+    override suspend fun withdrawal(reason: String): Result<Unit> =
+        authRemoteDataSource.withdrawal(reason)
+            .onSuccess { authLocalDataSource.clearAuthToken() }
 
     override suspend fun reissueToken(refreshToken: String): Result<AuthSession> =
-        authRemoteDataSource.reissueToken(refreshToken).map { it.toDomain() }
+        authRemoteDataSource.reissueToken(refreshToken)
+            .map { it.toDomain() }
 
     override suspend fun getRefreshToken(): String? =
         authLocalDataSource.getRefreshToken()

data/src/main/java/com/threegap/bitnagil/data/auth/service/AuthService.kt

@@ -2,19 +2,18 @@ package com.threegap.bitnagil.data.auth.service
 
 import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequest
 import com.threegap.bitnagil.data.auth.model.request.WithdrawalReasonRequest
-import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("/api/v1/auth/agreements")
     suspend fun submitAgreement(
         @Body termsAgreementRequest: TermsAgreementRequest,
-    ): BaseResponse<Unit>
+    ): Result<Unit>
 
     @POST("/api/v1/auth/withdrawal")
-    suspend fun postWithdrawal(@Body request: WithdrawalReasonRequest): BaseResponse<Unit>
+    suspend fun postWithdrawal(@Body request: WithdrawalReasonRequest): Result<Unit>
 
     @POST("/api/v1/auth/logout")
-    suspend fun postLogout(): BaseResponse<Unit>
+    suspend fun postLogout(): Result<Unit>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/service/LoginService.kt

@@ -2,7 +2,6 @@ package com.threegap.bitnagil.data.auth.service
 
 import com.threegap.bitnagil.data.auth.model.request.LoginRequest
 import com.threegap.bitnagil.data.auth.model.response.LoginResponse
-import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.Header
 import retrofit2.http.POST
@@ -12,10 +11,10 @@ interface LoginService {
     suspend fun postLogin(
         @Header("SocialAccessToken") socialAccessToken: String,
         @Body loginRequest: LoginRequest,
-    ): BaseResponse<LoginResponse>
+    ): Result<LoginResponse>
 
     @POST("/api/v1/auth/token/reissue")
     suspend fun postReissueToken(
         @Header("Refresh-Token") refreshToken: String,
-    ): BaseResponse<LoginResponse>
+    ): Result<LoginResponse>
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/datasourceImpl/EmotionRemoteDataSourceImpl.kt

@@ -1,6 +1,5 @@
 package com.threegap.bitnagil.data.emotion.datasourceImpl
 
-import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.emotion.datasource.EmotionRemoteDataSource
 import com.threegap.bitnagil.data.emotion.model.dto.EmotionDto
 import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
@@ -12,21 +11,13 @@ import javax.inject.Inject
 class EmotionRemoteDataSourceImpl @Inject constructor(
     private val emotionService: EmotionService,
 ) : EmotionRemoteDataSource {
-    override suspend fun getEmotions(): Result<List<EmotionDto>> {
-        return safeApiCall {
-            emotionService.getEmotions()
-        }
-    }
+    override suspend fun getEmotions(): Result<List<EmotionDto>> = emotionService.getEmotions()
 
     override suspend fun registerEmotion(emotion: String): Result<RegisterEmotionResponse> {
         val registerEmotionRequest = RegisterEmotionRequest(emotionMarbleType = emotion)
-        return safeApiCall {
-            emotionService.postEmotions(registerEmotionRequest)
-        }
+        return emotionService.postEmotions(registerEmotionRequest)
     }
 
     override suspend fun fetchDailyEmotion(currentDate: String): Result<DailyEmotionResponse> =
-        safeApiCall {
-            emotionService.fetchDailyEmotion(currentDate)
-        }
+        emotionService.fetchDailyEmotion(currentDate)
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt

@@ -4,23 +4,22 @@ import com.threegap.bitnagil.data.emotion.model.dto.EmotionDto
 import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
 import com.threegap.bitnagil.data.emotion.model.response.DailyEmotionResponse
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
-import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface EmotionService {
     @GET("/api/v1/emotion-marbles")
-    suspend fun getEmotions(): BaseResponse<List<EmotionDto>>
+    suspend fun getEmotions(): Result<List<EmotionDto>>
 
     @POST("/api/v1/emotion-marbles")
     suspend fun postEmotions(
         @Body request: RegisterEmotionRequest,
-    ): BaseResponse<RegisterEmotionResponse>
+    ): Result<RegisterEmotionResponse>
 
     @GET("/api/v2/emotion-marbles/{searchDate}")
     suspend fun fetchDailyEmotion(
         @Path("searchDate") date: String,
-    ): BaseResponse<DailyEmotionResponse>
+    ): Result<DailyEmotionResponse>
 }

data/src/main/java/com/threegap/bitnagil/data/file/datasourceImpl/FileDataSourceImpl.kt

@@ -1,6 +1,5 @@
 package com.threegap.bitnagil.data.file.datasourceImpl
 
-import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.file.datasource.FileDataSource
 import com.threegap.bitnagil.data.file.model.request.FileInfoRequest
 import com.threegap.bitnagil.data.file.service.FileService
@@ -9,7 +8,6 @@ import javax.inject.Inject
 class FileDataSourceImpl @Inject constructor(
     private val fileService: FileService,
 ) : FileDataSource {
-    override suspend fun fetchPresignedUrls(fileInfos: List<FileInfoRequest>): Result<Map<String, String>> {
-        return safeApiCall { fileService.fetchPresignedUrls(fileInfos) }
-    }
+    override suspend fun fetchPresignedUrls(fileInfos: List<FileInfoRequest>): Result<Map<String, String>> =
+        fileService.fetchPresignedUrls(fileInfos)
 }

data/src/main/java/com/threegap/bitnagil/data/file/service/FileService.kt

@@ -1,13 +1,12 @@
 package com.threegap.bitnagil.data.file.service
 
 import com.threegap.bitnagil.data.file.model.request.FileInfoRequest
-import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface FileService {
     @POST("/api/v2/files/presigned-urls")
     suspend fun fetchPresignedUrls(
         @Body fileInfos: List<FileInfoRequest>,
-    ): BaseResponse<Map<String, String>>
+    ): Result<Map<String, String>>
 }