refactor: feature/#558-apply-calldapter 테스트용 PR

android/Staccato_AN/app/build.gradle.kts

@@ -20,6 +20,7 @@ plugins {
     alias(libs.plugins.firebaseCrashlytics)
     alias(libs.plugins.mapsplatformSecretsGradlePlugin)
     alias(libs.plugins.hiltAndroid)
+    alias(libs.plugins.androidJunit5)
 }
 
 android {
@@ -34,6 +35,8 @@ android {
         versionName = "1.2.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments["runnerBuilder"] =
+            "de.mannodermaus.junit5.AndroidJUnit5Builder"
 
         buildConfigField("String", "TOKEN", "${localProperties["token"]}")
     }
@@ -101,6 +104,10 @@ dependencies {
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 
+    // JUnit5
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+
     // Glide
     implementation(libs.glide)
 
@@ -117,6 +124,7 @@ dependencies {
 
     // OkHttp
     implementation(libs.okhttp.logging.interceptor)
+    testImplementation(libs.okhttp.mockwebserver)
 
     // Lifecycle
     implementation(libs.lifecycle.viewmodel)
@@ -139,6 +147,9 @@ dependencies {
     // Fragment
     implementation(libs.androidx.fragment.ktx)
 
+    // Coroutines Test
+    testImplementation(libs.kotlinx.coroutines.test)
+
     // Mockk
     testImplementation(libs.mockk.android)
     testImplementation(libs.mockk.agent)

android/Staccato_AN/app/src/main/java/com/on/staccato/data/ApiResult.kt

@@ -0,0 +1,21 @@
+package com.on.staccato.data
+
+import com.on.staccato.data.dto.Status
+
+private const val EXCEPTION_NETWORK_ERROR_MESSAGE = "네트워크 연결이 불안정합니다.\n연결을 재설정한 후 다시 시도해 주세요."
+
+sealed interface ApiResult<T : Any>
+
+class Success<T : Any>(val data: T) : ApiResult<T>
+
+class ServerError<T : Any>(val status: Status, val message: String) : ApiResult<T>
+
+class Exception<T : Any>(val e: Throwable, val message: String = EXCEPTION_NETWORK_ERROR_MESSAGE) : ApiResult<T>
+
+inline fun <T : Any, R : Any> ApiResult<T>.handle(convert: (T) -> R): ApiResult<R> {
+    return when (this) {
+        is Exception -> Exception(e)
+        is ServerError -> ServerError(status, message)
+        is Success -> Success(convert(data))
+    }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/data/ApiResultCall.kt

@@ -0,0 +1,81 @@
+package com.on.staccato.data
+
+import com.on.staccato.data.dto.ErrorResponse
+import com.on.staccato.data.dto.Status
+import okhttp3.Request
+import okhttp3.ResponseBody
+import okio.Timeout
+import retrofit2.Call
+import retrofit2.HttpException
+import retrofit2.Response
+
+class ApiResultCall<T : Any>(
+    private val proxy: Call<T>,
+) : Call<ApiResult<T>> {
+    override fun enqueue(callback: retrofit2.Callback<ApiResult<T>>) {
+        proxy.enqueue(
+            object : retrofit2.Callback<T> {
+                override fun onResponse(
+                    call: Call<T>,
+                    response: Response<T>,
+                ) {
+                    val networkResult = handleApiResponse { response }
+                    callback.onResponse(this@ApiResultCall, Response.success(networkResult))
+                }
+
+                override fun onFailure(
+                    call: Call<T>,
+                    t: Throwable,
+                ) {
+                    val networkResult = Exception<T>(t)
+                    callback.onResponse(this@ApiResultCall, Response.success(networkResult))
+                }
+            },
+        )
+    }
+
+    override fun execute(): Response<ApiResult<T>> = throw NotImplementedError()
+
+    override fun clone(): Call<ApiResult<T>> = ApiResultCall(proxy.clone())
+
+    override fun isExecuted(): Boolean = proxy.isExecuted
+
+    override fun cancel() {
+        proxy.cancel()
+    }
+
+    override fun isCanceled(): Boolean = proxy.isCanceled
+
+    override fun request(): Request = proxy.request()
+
+    override fun timeout(): Timeout = proxy.timeout()
+}
+
+private const val CREATED = 201
+private const val NOT_FOUND_ERROR_BODY = "errorBody를 찾을 수 없습니다."
+
+private fun <T : Any> handleApiResponse(execute: () -> Response<T>): ApiResult<T> {
+    return try {
+        val response: Response<T> = execute()
+        val body: T? = response.body()
+
+        when {
+            response.isSuccessful && response.code() == CREATED -> Success(body as T)
+            response.isSuccessful && body != null -> Success(body)
+            else -> {
+                val errorBody: ResponseBody =
+                    response.errorBody()
+                        ?: throw IllegalArgumentException(NOT_FOUND_ERROR_BODY)
+                val errorResponse: ErrorResponse = StaccatoClient.getErrorResponse(errorBody)
+                ServerError(
+                    status = Status.Message(errorResponse.status),
+                    message = errorResponse.message,
+                )
+            }
+        }
+    } catch (e: HttpException) {
+        ServerError(status = Status.Code(e.code()), message = e.message())
+    } catch (e: Throwable) {
+        Exception(e, message = e.message.toString())
+    }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/data/ApiResultCallAdapter.kt

@@ -0,0 +1,13 @@
+package com.on.staccato.data
+
+import retrofit2.Call
+import retrofit2.CallAdapter
+import java.lang.reflect.Type
+
+class ApiResultCallAdapter(
+    private val resultType: Type,
+) : CallAdapter<Type, Call<ApiResult<Type>>> {
+    override fun responseType(): Type = resultType
+
+    override fun adapt(call: Call<Type>): Call<ApiResult<Type>> = ApiResultCall(call)
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/data/ApiResultCallAdapterFactory.kt

@@ -0,0 +1,31 @@
+package com.on.staccato.data
+
+import retrofit2.Call
+import retrofit2.CallAdapter
+import retrofit2.Retrofit
+import java.lang.reflect.ParameterizedType
+import java.lang.reflect.Type
+
+class ApiResultCallAdapterFactory : CallAdapter.Factory() {
+    override fun get(
+        returnType: Type,
+        annotations: Array<out Annotation>,
+        retrofit: Retrofit,
+    ): CallAdapter<*, *>? {
+        if (getRawType(returnType) != Call::class.java) {
+            return null
+        }
+
+        val callType = getParameterUpperBound(0, returnType as ParameterizedType)
+        if (getRawType(callType) != ApiResult::class.java) {
+            return null
+        }
+
+        val resultType = getParameterUpperBound(0, callType as ParameterizedType)
+        return ApiResultCallAdapter(resultType)
+    }
+
+    companion object {
+        fun create(): ApiResultCallAdapterFactory = ApiResultCallAdapterFactory()
+    }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/data/ApiResultHandler.kt

@@ -0,0 +1,24 @@
+package com.on.staccato.data
+
+import com.on.staccato.data.dto.Status
+
+suspend fun <T : Any> ApiResult<T>.onSuccess(executable: suspend (T) -> Unit): ApiResult<T> =
+    apply {
+        if (this is Success<T>) {
+            executable(data)
+        }
+    }
+
+suspend fun <T : Any> ApiResult<T>.onServerError(executable: suspend (status: Status, message: String) -> Unit): ApiResult<T> =
+    apply {
+        if (this is ServerError<T>) {
+            executable(status, message)
+        }
+    }
+
+suspend fun <T : Any> ApiResult<T>.onException(executable: suspend (e: Throwable, message: String) -> Unit): ApiResult<T> =
+    apply {
+        if (this is Exception<T>) {
+            executable(e, message)
+        }
+    }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/StaccatoClient.kt

@@ -34,6 +34,7 @@ object StaccatoClient {
             .addConverterFactory(
                 jsonBuilder.asConverterFactory("application/json".toMediaType()),
             )
+            .addCallAdapterFactory(ApiResultCallAdapterFactory.create())
             .build()
 
     fun getErrorResponse(errorBody: ResponseBody): ErrorResponse {

android/Staccato_AN/app/src/main/java/com/on/staccato/data/comment/CommentApiService.kt

@@ -1,9 +1,9 @@
 package com.on.staccato.data.comment
 
+import com.on.staccato.data.ApiResult
 import com.on.staccato.data.dto.comment.CommentRequest
 import com.on.staccato.data.dto.comment.CommentUpdateRequest
 import com.on.staccato.data.dto.comment.CommentsResponse
-import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -16,23 +16,23 @@ interface CommentApiService {
     @GET(COMMENTS_URI)
     suspend fun getComments(
         @Query(STACCATO_ID) staccatoId: Long,
-    ): Response<CommentsResponse>
+    ): ApiResult<CommentsResponse>
 
     @POST(COMMENTS_URI)
     suspend fun postComment(
         @Body commentRequest: CommentRequest,
-    ): Response<Unit>
+    ): ApiResult<Unit>
 
     @PUT(COMMENTS_URI_WITH_COMMENT_ID)
     suspend fun putComment(
         @Path(COMMENT_ID) commentId: Long,
         @Body commentUpdateRequest: CommentUpdateRequest,
-    ): Response<Unit>
+    ): ApiResult<Unit>
 
     @DELETE(COMMENTS_URI_WITH_COMMENT_ID)
     suspend fun deleteComment(
         @Path(COMMENT_ID) commentId: Long,
-    ): Response<Unit>
+    ): ApiResult<Unit>
 
     companion object {
         private const val COMMENTS_URI = "/comments"

android/Staccato_AN/app/src/main/java/com/on/staccato/data/comment/CommentDataSource.kt

@@ -1,19 +1,19 @@
 package com.on.staccato.data.comment
 
-import com.on.staccato.data.ResponseResult
+import com.on.staccato.data.ApiResult
 import com.on.staccato.data.dto.comment.CommentRequest
 import com.on.staccato.data.dto.comment.CommentUpdateRequest
 import com.on.staccato.data.dto.comment.CommentsResponse
 
 interface CommentDataSource {
-    suspend fun getComments(staccatoId: Long): ResponseResult<CommentsResponse>
+    suspend fun getComments(staccatoId: Long): ApiResult<CommentsResponse>
 
-    suspend fun createComment(commentRequest: CommentRequest): ResponseResult<Unit>
+    suspend fun createComment(commentRequest: CommentRequest): ApiResult<Unit>
 
     suspend fun updateComment(
         commentId: Long,
         commentUpdateRequest: CommentUpdateRequest,
-    ): ResponseResult<Unit>
+    ): ApiResult<Unit>
 
-    suspend fun deleteComment(commentId: Long): ResponseResult<Unit>
+    suspend fun deleteComment(commentId: Long): ApiResult<Unit>
 }