[Refactor] API 호출 오류 핸들링 개선

app/src/main/AndroidManifest.xml

@@ -186,6 +186,9 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
+        <activity
+                android:name=".presentation.error.ServerErrorActivity"
+                android:exported="false" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">

app/src/main/java/com/eatssu/android/data/dto/response/MealResponse.kt

@@ -8,7 +8,7 @@ data class GetMealResponse(
     @SerializedName("mealId") var mealId: Long? = null,
     @SerializedName("price") var price: Int? = null,
     @SerializedName("rating") var rating: Double? = null,
-    @SerializedName("briefMenus") var briefMenus: ArrayList<MenusInformationList> = arrayListOf(),
+    @SerializedName("briefMenus") var briefMenus: List<MenusInformationList> = emptyList(),
 )
 
 data class MenusInformationList(
@@ -18,7 +18,7 @@ data class MenusInformationList(
 
     )
 
-fun ArrayList<GetMealResponse>.mapTodayMenuResponseToMenu(): List<Menu> {
+fun List<GetMealResponse>.mapTodayMenuResponseToMenu(): List<Menu> {
     val menuList = mutableListOf<Menu>()
 
     this.forEach { mealResponse ->
@@ -37,7 +37,7 @@ fun ArrayList<GetMealResponse>.mapTodayMenuResponseToMenu(): List<Menu> {
 }
 
 
-fun ArrayList<GetMealResponse>.toDomain(): List<List<String>> {
+fun List<GetMealResponse>.toDomain(): List<List<String>> {
     return this.map { meal ->
         meal.briefMenus.mapNotNull { it.name }
     }

app/src/main/java/com/eatssu/android/data/dto/response/MenuResponse.kt

@@ -7,14 +7,14 @@ import timber.log.Timber
 
 data class GetFixedMenuResponse(
 
-    @SerializedName("categoryMenuListCollection") var categoryMenuListCollection: ArrayList<CategoryMenuListCollection> = arrayListOf(),
+    @SerializedName("categoryMenuListCollection") var categoryMenuListCollection: List<CategoryMenuListCollection> = emptyList(),
 
     )
 
 data class CategoryMenuListCollection(
 
     @SerializedName("category") var category: String? = null,
-    @SerializedName("menus") var menus: ArrayList<MenuInformationList> = arrayListOf(),
+    @SerializedName("menus") var menus: List<MenuInformationList> = emptyList(),
 
     )
 

app/src/main/java/com/eatssu/android/data/model/ApiResult.kt

@@ -0,0 +1,58 @@
+package com.eatssu.android.data.model
+
+import com.eatssu.android.data.model.ApiResult.Failure
+import com.eatssu.android.data.model.ApiResult.NetworkError
+import com.eatssu.android.data.model.ApiResult.Success
+import com.eatssu.android.data.model.ApiResult.UnknownError
+import java.io.IOException
+
+sealed interface ApiResult<out T> {
+    // API가 성공했을 때
+    data class Success<T>(val data: T) : ApiResult<T>
+
+    // 서버에서 에러 반환
+    data class Failure(
+        val responseCode: Int,
+        val message: String?
+    ) : ApiResult<Nothing>
+
+    // 소켓 연결 끊김, 타임아웃 등 네트워크 예외인 IOException 처리
+    data class NetworkError(
+        val exception: IOException
+    ) : ApiResult<Nothing>
+
+    // IOException을 제외한 예외 처리
+    data class UnknownError(
+        val exception: Throwable
+    ) : ApiResult<Nothing>
+}
+
+// ApiResult가 성공인지 아닌지 여부 확인
+fun ApiResult<Unit>.isSuccess(): Boolean = this is Success
+
+// 성공한 경우 데이터 반환, 실패한 경우 빈 리스트 반환
+fun <TElement, TList : List<TElement>> ApiResult<TList>.orEmptyList(): List<TElement> =
+    when (this) {
+        is Success -> data
+        else -> emptyList()
+    }
+
+// 성공한 경우 데이터 반환, 실패한 경우 기본값 반환
+fun <T> ApiResult<T>.orElse(default: T): T = when (this) {
+    is Success -> data
+    else -> default
+}
+
+// 성공한 경우 데이터 반환, 실패한 경우 null 반환
+fun <T> ApiResult<T>.orNull(): T? = when (this) {
+    is Success -> data
+    else -> null
+}
+
+// ApiResult가 Success일 때 데이터를 변환
+fun <T, R> ApiResult<T>.map(transform: (T) -> R): ApiResult<R> = when (this) {
+    is Success<T> -> Success(transform(data))
+    is Failure -> Failure(responseCode, message)
+    is NetworkError -> NetworkError(exception)
+    is UnknownError -> UnknownError(exception)
+}

app/src/main/java/com/eatssu/android/data/repository/HealthCheckRepositoryImpl.kt

@@ -0,0 +1,14 @@
+package com.eatssu.android.data.repository
+
+import com.eatssu.android.data.model.isSuccess
+import com.eatssu.android.data.service.HealthCheckService
+import com.eatssu.android.domain.repository.HealthCheckRepository
+import javax.inject.Inject
+
+class HealthCheckRepositoryImpl @Inject constructor(
+    private val healthCheckService: HealthCheckService
+) : HealthCheckRepository {
+    override suspend fun checkHealth(): Boolean {
+        return healthCheckService.checkHealth().isSuccess()
+    }
+}

app/src/main/java/com/eatssu/android/data/repository/MealRepositoryImpl.kt

@@ -1,43 +1,39 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.data.dto.response.BaseResponse
-import com.eatssu.android.data.dto.response.MenuOfMealResponse
+import com.eatssu.android.data.dto.response.MenusInformation
+import com.eatssu.android.data.dto.response.mapTodayMenuResponseToMenu
 import com.eatssu.android.data.dto.response.toDomain
+import com.eatssu.android.data.model.map
+import com.eatssu.android.data.model.orEmptyList
 import com.eatssu.android.data.service.MealService
+import com.eatssu.android.domain.model.Menu
 import com.eatssu.android.domain.repository.MealRepository
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
+import com.eatssu.common.enums.Restaurant
+import com.eatssu.common.enums.Time
 import javax.inject.Inject
 
 class MealRepositoryImpl @Inject constructor(
     private val mealService: MealService,
 ) : MealRepository {
 
-    override suspend fun getTodayMeal( //todo 분기처리 어떻게 할지?
+    override suspend fun getTodayMeal(
         date: String,
         restaurant: String,
         time: String
-    ): Flow<List<List<String>>> {
-        return flow {
-            try {
-                val response = mealService.getTodayMeal2(date, restaurant, time)
+    ): List<List<String>> {
+        return mealService.getTodayMeal(date, restaurant, time).orEmptyList().toDomain()
+    }
 
-                // 응답이 성공적이라면 Result.success()로 감싸서 Flow로 반환
-                if (response.isSuccess == true) {
-                    response.result?.let { emit(it.toDomain()) } // 성공시 데이터를 반환
-                } else {
-                    // 실패한 경우에는 Result.failure()로 실패 정보 반환
-                    emit(emptyList())
-                }
-            } catch (e: Exception) {
-                // 네트워크 오류 또는 예외가 발생한 경우에는 Result.failure()로 반환
-//                emit(ApiResult.Failure(e))
-            }
-        }
+    override suspend fun getTodayMenuList(
+        date: String,
+        restaurant: Restaurant,
+        time: Time
+    ): List<Menu> {
+        return mealService.getTodayMeal(date, restaurant.toString(), time.toString())
+            .map { it.mapTodayMenuResponseToMenu() }
+            .orEmptyList()
     }
 
-    override suspend fun getMenuInfoByMealId(mealId: Long): Flow<BaseResponse<MenuOfMealResponse>> =
-        flow {
-            emit(mealService.getMenuInfoByMealId(mealId))
-        }
+    override suspend fun getMenuInfoByMealId(mealId: Long): List<MenusInformation> =
+        mealService.getMenuInfoByMealId(mealId).map { it.briefMenus }.orEmptyList()
 }

app/src/main/java/com/eatssu/android/data/repository/MenuRepositoryImpl.kt

@@ -0,0 +1,20 @@
+package com.eatssu.android.data.repository
+
+import com.eatssu.android.data.dto.response.mapFixedMenuResponseToMenu
+import com.eatssu.android.data.model.map
+import com.eatssu.android.data.model.orEmptyList
+import com.eatssu.android.data.service.MenuService
+import com.eatssu.android.domain.model.Menu
+import com.eatssu.android.domain.repository.MenuRepository
+import com.eatssu.common.enums.Restaurant
+import javax.inject.Inject
+
+class MenuRepositoryImpl @Inject constructor(
+    private val menuService: MenuService
+) : MenuRepository {
+    override suspend fun getFixedMenuList(restaurant: Restaurant): List<Menu> {
+        return menuService.getFixMenu(restaurant.toString())
+            .map { it.mapFixedMenuResponseToMenu() }
+            .orEmptyList()
+    }
+}

app/src/main/java/com/eatssu/android/data/repository/OauthRepositoryImpl.kt

@@ -3,21 +3,22 @@ package com.eatssu.android.data.repository
 import com.eatssu.android.data.dto.request.CheckValidTokenRequest
 import com.eatssu.android.data.dto.request.LoginWithKakaoRequest
 import com.eatssu.android.data.dto.response.toDomain
+import com.eatssu.android.data.model.map
+import com.eatssu.android.data.model.orElse
+import com.eatssu.android.data.model.orNull
 import com.eatssu.android.data.service.OauthService
 import com.eatssu.android.domain.model.Token
 import com.eatssu.android.domain.repository.OauthRepository
 import javax.inject.Inject
 
 class OauthRepositoryImpl @Inject constructor(private val oauthService: OauthService) :
     OauthRepository {
-    override suspend fun reissueToken(refreshToken: String): Token =
-        oauthService.getNewToken(refreshToken).result?.toDomain()
-            ?: throw IllegalStateException("Failed to get a new token.")
+    override suspend fun reissueToken(refreshToken: String): Token? =
+        oauthService.getNewToken(refreshToken).map { it.toDomain() }.orNull()
 
-    override suspend fun login(body: LoginWithKakaoRequest): Token =
-        oauthService.loginWithKakao(body).result?.toDomain()
-            ?: throw IllegalStateException("Failed to login.")
+    override suspend fun login(body: LoginWithKakaoRequest): Token? =
+        oauthService.loginWithKakao(body).map { it.toDomain() }.orNull()
 
     override suspend fun checkValidToken(body: CheckValidTokenRequest): Boolean =
-        oauthService.checkValidToken(body).result ?: false
+        oauthService.checkValidToken(body).orElse(false)
 }

app/src/main/java/com/eatssu/android/data/repository/PartnershipRepositoryImpl.kt

@@ -1,6 +1,9 @@
 package com.eatssu.android.data.repository
 
 import com.eatssu.android.data.dto.response.toDomain
+import com.eatssu.android.data.model.map
+import com.eatssu.android.data.model.orEmptyList
+import com.eatssu.android.data.model.orNull
 import com.eatssu.android.data.service.PartnershipService
 import com.eatssu.android.data.service.UserService
 import com.eatssu.android.domain.model.Partnership
@@ -14,23 +17,17 @@ class PartnershipRepositoryImpl @Inject constructor(
 ) : PartnershipRepository {
 
     // 유저의 학과 상관없이 모든 제휴 정보 조회
-    override suspend fun getAllPartnerships(): List<Partnership> {
-        return partnershipService.getAllPartnerships()
-            .result
-            ?.map { it.toDomain() } ?: emptyList()
-    }
+    override suspend fun getAllPartnerships(): List<Partnership> =
+        partnershipService.getAllPartnerships()
+            .map { list -> list.map { it.toDomain() } }
+            .orEmptyList()
 
     // 특정 식당 클릭 시 제휴 정보 조회
-    override suspend fun getPartnershipById(partnershipId: Int): PartnershipRestaurant? {
-        return partnershipService.getPartnershipById(partnershipId)
-            .result
-            ?.toDomain()
-    }
+    override suspend fun getPartnershipById(partnershipId: Int): PartnershipRestaurant? =
+        partnershipService.getPartnershipById(partnershipId).map { it.toDomain() }.orNull()
 
     // 유저의 학과에 해당하는 제휴 정보 조회
-    override suspend fun getUserCollegePartnerships(): List<Partnership> {
-        return userService.getUserDepartmentPartnerships()
-            .result
-            ?.map { it.toDomain() } ?: emptyList()
-    }
+    override suspend fun getUserCollegePartnerships(): List<Partnership> =
+        userService.getUserDepartmentPartnerships().map { list -> list.map { it.toDomain() } }
+            .orEmptyList()
 }

app/src/main/java/com/eatssu/android/data/repository/ReportRepositoryImpl.kt

@@ -1,19 +1,15 @@
 package com.eatssu.android.data.repository
 
 import com.eatssu.android.data.dto.request.ReportRequest
-import com.eatssu.android.data.dto.response.BaseResponse
+import com.eatssu.android.data.model.isSuccess
 import com.eatssu.android.data.service.ReportService
 import com.eatssu.android.domain.repository.ReportRepository
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
 class ReportRepositoryImpl @Inject constructor(private val reportService: ReportService) :
     ReportRepository {
 
-    override suspend fun reportReview(body: ReportRequest): Flow<BaseResponse<Void>> =
-        flow {
-            emit(reportService.reportReview(body))
-        }
+    override suspend fun reportReview(body: ReportRequest): Boolean =
+        reportService.reportReview(body).isSuccess()
 
 }

app/src/main/java/com/eatssu/android/data/repository/ReviewRepositoryImpl.kt

@@ -2,15 +2,17 @@ package com.eatssu.android.data.repository
 
 import com.eatssu.android.data.dto.request.ModifyReviewRequest
 import com.eatssu.android.data.dto.request.WriteReviewRequest
-import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.GetMealReviewInfoResponse
 import com.eatssu.android.data.dto.response.GetMenuReviewInfoResponse
-import com.eatssu.android.data.dto.response.GetReviewListResponse
 import com.eatssu.android.data.dto.response.ImageResponse
+import com.eatssu.android.data.dto.response.toReviewList
+import com.eatssu.android.data.model.isSuccess
+import com.eatssu.android.data.model.map
+import com.eatssu.android.data.model.orEmptyList
+import com.eatssu.android.data.model.orNull
 import com.eatssu.android.data.service.ReviewService
+import com.eatssu.android.domain.model.Review
 import com.eatssu.android.domain.repository.ReviewRepository
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.asRequestBody
@@ -23,46 +25,37 @@ class ReviewRepositoryImpl @Inject constructor(private val reviewService: Review
     override suspend fun writeReview(
         menuId: Long,
         body: WriteReviewRequest,
-    ): Flow<BaseResponse<Void>> =
-        flow {
-            emit(reviewService.writeReview(menuId, body))
-        }
+    ): Boolean =
+        reviewService.writeReview(menuId, body).isSuccess()
 
-    override suspend fun deleteReview(reviewId: Long): Flow<BaseResponse<Void>> =
-        flow {
-            emit(reviewService.deleteReview(reviewId))
-        }
+
+    override suspend fun deleteReview(reviewId: Long): Boolean =
+        reviewService.deleteReview(reviewId).isSuccess()
 
     override suspend fun modifyReview(
         reviewId: Long,
         body: ModifyReviewRequest,
-    ): Flow<BaseResponse<Void>> =
-        flow {
-            emit(reviewService.modifyReview(reviewId, body))
-        }
+    ): Boolean =
+        reviewService.modifyReview(reviewId, body).isSuccess()
 
     override suspend fun getReviewList(
         menuType: String,
         mealId: Long?,
         menuId: Long?,
-    ): Flow<BaseResponse<GetReviewListResponse>> = flow {
-        emit(reviewService.getReviewList(menuType, mealId, menuId))
-    }
+    ): List<Review> =
+        reviewService.getReviewList(menuType, mealId, menuId).map { it.toReviewList() }
+            .orEmptyList()
+
+    override suspend fun getMenuReviewInfo(menuId: Long): GetMenuReviewInfoResponse? =
+        reviewService.getMenuReviewInfo(menuId).orNull()
 
-    override suspend fun getMenuReviewInfo(menuId: Long): Flow<BaseResponse<GetMenuReviewInfoResponse>> =
-        flow {
-            emit(reviewService.getMenuReviewInfo(menuId))
-        }
+    override suspend fun getMealReviewInfo(mealId: Long): GetMealReviewInfoResponse? =
+        reviewService.getMealReviewInfo(mealId).orNull()
 
-    override suspend fun getMealReviewInfo(mealId: Long): Flow<BaseResponse<GetMealReviewInfoResponse>> =
-        flow {
-            emit(reviewService.getMealReviewInfo(mealId))
-        }
-    override suspend fun getImageString(file: File): Flow<BaseResponse<ImageResponse>> = flow {
+    override suspend fun getImageString(file: File): ImageResponse? {
         val requestFile = file.asRequestBody("image/*".toMediaTypeOrNull())
         val multipart = MultipartBody.Part.createFormData("image", file.name, requestFile)
-        val response = reviewService.uploadImage(multipart)
-        emit(response)
-    }
 
+        return reviewService.uploadImage(multipart).orNull()
+    }
 }