Refactor: Report 관련 Presentation 모델을 Domain 모델로 대체

- Presentation 레이어에서 사용하던 ReportCategory, ReportProcess enum 클래스를 삭제하고, Domain 레이어의 모델을 직접 사용하도록 변경합니다.

Author: wjdrjs00

…/report/model/ReportCategoryExtension.kt …on/common/extension/ReportCategoryEtx.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/report/model/ReportCategoryExtension.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportCategoryEtx.kt presentation/src/main/java/com/threegap/bitnagil/presentation/report/model/ReportCategoryExtension.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportCategoryEtx.kt

@@ -1,17 +1,18 @@
-package com.threegap.bitnagil.presentation.report.model
+package com.threegap.bitnagil.presentation.common.extension
 
+import androidx.annotation.DrawableRes
 import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.domain.report.model.ReportCategory
 
-val ReportCategory.uiTitle: String
+val ReportCategory.displayTitle: String
     get() = when (this) {
         ReportCategory.TRANSPORTATION -> "교통 시설"
         ReportCategory.LIGHTING -> "조명 시설"
         ReportCategory.WATERFACILITY -> "상하수도 시설"
         ReportCategory.AMENITY -> "편의 시설"
     }
 
-val ReportCategory.uiDescription: String
+val ReportCategory.displayExamples: String
     get() = when (this) {
         ReportCategory.TRANSPORTATION -> "신호등 고장, 표지판 파손, 횡단보도 등"
         ReportCategory.LIGHTING -> "가로등, 보안등 파손 등"
@@ -20,7 +21,7 @@ val ReportCategory.uiDescription: String
     }
 
 val ReportCategory.iconRes: Int
-    get() = when (this) {
+    @DrawableRes get() = when (this) {
         ReportCategory.TRANSPORTATION -> R.drawable.ic_car
         ReportCategory.LIGHTING -> R.drawable.ic_light
         ReportCategory.WATERFACILITY -> R.drawable.ic_water

presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/ReportStatusEtx.kt

@@ -0,0 +1,27 @@
+package com.threegap.bitnagil.presentation.common.extension
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.threegap.bitnagil.designsystem.BitnagilTheme
+import com.threegap.bitnagil.domain.report.model.ReportStatus
+
+val ReportStatus.displayTitle: String
+    get() = when (this) {
+        ReportStatus.PENDING -> "제보 완료"
+        ReportStatus.IN_PROGRESS -> "처리 중"
+        ReportStatus.COMPLETED -> "처리 완료"
+    }
+
+val ReportStatus.badgeBackgroundColor: Color
+    @Composable get() = when (this) {
+        ReportStatus.PENDING -> BitnagilTheme.colors.green10
+        ReportStatus.IN_PROGRESS -> BitnagilTheme.colors.skyBlue10
+        else -> BitnagilTheme.colors.coolGray95
+    }
+
+val ReportStatus.textColor: Color
+    @Composable get() = when (this) {
+        ReportStatus.PENDING -> BitnagilTheme.colors.green300
+        ReportStatus.IN_PROGRESS -> BitnagilTheme.colors.blue300
+        else -> BitnagilTheme.colors.coolGray40
+    }

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt

@@ -11,7 +11,6 @@ import com.threegap.bitnagil.domain.onboarding.usecase.RegisterRecommendOnBoardi
 import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase
 import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingSideEffect
 import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingState
-import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingAbstractTextItemUiModel
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingSetType

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingAbstractTextItemUiModel.kt

@@ -1,8 +1,8 @@
 package com.threegap.bitnagil.presentation.onboarding.model
 
 import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
 import com.threegap.bitnagil.domain.onboarding.model.OnBoardingAbstractTextItem
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class OnBoardingAbstractTextItemUiModel(

presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportScreen.kt

@@ -53,6 +53,7 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButtonColor
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextField
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
+import com.threegap.bitnagil.presentation.common.extension.displayTitle
 import com.threegap.bitnagil.presentation.common.file.createCameraImageUri
 import com.threegap.bitnagil.presentation.common.premission.rememberPermissionHandler
 import com.threegap.bitnagil.presentation.report.component.AddPhotoButton
@@ -68,7 +69,6 @@ import com.threegap.bitnagil.presentation.report.contract.ReportSideEffect
 import com.threegap.bitnagil.presentation.report.contract.ReportState
 import com.threegap.bitnagil.presentation.report.contract.ReportState.Companion.MAX_IMAGE_COUNT
 import com.threegap.bitnagil.presentation.report.model.SubmitState
-import com.threegap.bitnagil.presentation.report.model.uiTitle
 import kotlinx.coroutines.delay
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
@@ -284,7 +284,7 @@ private fun ReportScreen(
 
             ReportField(title = "카테고리") {
                 ReportCategorySelector(
-                    title = uiState.selectedCategory?.uiTitle,
+                    title = uiState.selectedCategory?.displayTitle,
                     onClick = {
                         focusManager.clearFocus()
                         onShowReportCategoryBottomSheet()

presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CompleteReportCard.kt

@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.domain.report.model.ReportCategory
-import com.threegap.bitnagil.presentation.report.model.uiTitle
+import com.threegap.bitnagil.presentation.common.extension.displayTitle
 
 @Composable
 fun CompleteReportCard(
@@ -66,7 +66,7 @@ fun CompleteReportCard(
             title = "카테고리",
         ) {
             Text(
-                text = category?.uiTitle ?: "카테고리 없음",
+                text = category?.displayTitle ?: "카테고리 없음",
                 color = BitnagilTheme.colors.coolGray10,
                 style = BitnagilTheme.typography.body1Medium,
             )

presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategoryBottomSheet.kt

@@ -24,9 +24,9 @@ import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
 import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
 import com.threegap.bitnagil.domain.report.model.ReportCategory
-import com.threegap.bitnagil.presentation.report.model.iconRes
-import com.threegap.bitnagil.presentation.report.model.uiDescription
-import com.threegap.bitnagil.presentation.report.model.uiTitle
+import com.threegap.bitnagil.presentation.common.extension.displayExamples
+import com.threegap.bitnagil.presentation.common.extension.displayTitle
+import com.threegap.bitnagil.presentation.common.extension.iconRes
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -54,8 +54,8 @@ fun ReportCategoryBottomSheet(
             categories.forEachIndexed { index, category ->
                 ReportCategoryItem(
                     icon = category.iconRes,
-                    title = category.uiTitle,
-                    description = category.uiDescription,
+                    title = category.displayTitle,
+                    description = category.displayExamples,
                     isSelected = selectedCategory == category,
                     onClick = {
                         onSelected(category)

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailScreen.kt

@@ -27,6 +27,7 @@ import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
+import com.threegap.bitnagil.presentation.common.extension.displayTitle
 import com.threegap.bitnagil.presentation.reportdetail.component.atom.ReportProcessBadge
 import com.threegap.bitnagil.presentation.reportdetail.component.block.ReportDetailLabeledContent
 import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailState
@@ -74,7 +75,7 @@ private fun ReportDetailScreen(
         ) {
             Spacer(modifier = Modifier.height(20.dp))
 
-            ReportProcessBadge(reportProcess = state.reportProcess)
+            ReportProcessBadge(reportStatus = state.reportProcess)
 
             Spacer(modifier = Modifier.height(6.dp))
 
@@ -116,7 +117,7 @@ private fun ReportDetailScreen(
 
                 ReportDetailLabeledContent(
                     label = "카테고리",
-                    content = state.reportCategory.title,
+                    content = state.reportCategory.displayTitle,
                 )
 
                 ReportDetailLabeledContent(

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/ReportDetailViewModel.kt

@@ -4,8 +4,6 @@ import androidx.lifecycle.ViewModel
 import com.threegap.bitnagil.domain.report.usecase.GetReportUseCase
 import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailSideEffect
 import com.threegap.bitnagil.presentation.reportdetail.contract.ReportDetailState
-import com.threegap.bitnagil.presentation.reportdetail.model.ReportCategory
-import com.threegap.bitnagil.presentation.reportdetail.model.ReportProcess
 import com.threegap.bitnagil.presentation.reportdetail.model.navarg.ReportDetailScreenArg
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -36,10 +34,10 @@ class ReportDetailViewModel @AssistedInject constructor(
             onSuccess = { reportDetail ->
                 reduce {
                     state.copy(
-                        reportProcess = ReportProcess.fromDomain(reportDetail.status),
+                        reportProcess = reportDetail.status,
                         reportTitle = reportDetail.title,
                         reportContent = reportDetail.content,
-                        reportCategory = ReportCategory.fromDomain(reportDetail.category),
+                        reportCategory = reportDetail.category,
                         imageUrls = reportDetail.imageUrls,
                         location = reportDetail.address,
                         date = reportDetail.date,

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/component/atom/ReportProcessBadge.kt

@@ -8,53 +8,42 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.threegap.bitnagil.designsystem.BitnagilTheme
-import com.threegap.bitnagil.presentation.reportdetail.model.ReportProcess
+import com.threegap.bitnagil.domain.report.model.ReportStatus
+import com.threegap.bitnagil.presentation.common.extension.badgeBackgroundColor
+import com.threegap.bitnagil.presentation.common.extension.displayTitle
+import com.threegap.bitnagil.presentation.common.extension.textColor
 
 @Composable
 fun ReportProcessBadge(
     modifier: Modifier = Modifier,
-    reportProcess: ReportProcess,
+    reportStatus: ReportStatus,
 ) {
     Text(
-        text = reportProcess.title,
+        text = reportStatus.displayTitle,
         style = BitnagilTheme.typography.caption1SemiBold,
-        color = reportProcess.getProcessBadgeTextColor(),
+        color = reportStatus.textColor,
         modifier = modifier
-            .background(color = reportProcess.getProcessBadgeBackgroundColor(), shape = RoundedCornerShape(6.dp))
+            .background(
+                color = reportStatus.badgeBackgroundColor,
+                shape = RoundedCornerShape(6.dp),
+            )
             .padding(horizontal = 10.dp, vertical = 4.dp),
     )
 }
 
-@Composable
-private fun ReportProcess.getProcessBadgeBackgroundColor(): Color =
-    when (this) {
-        ReportProcess.Reported -> BitnagilTheme.colors.green10
-        ReportProcess.Progress -> BitnagilTheme.colors.skyBlue10
-        else -> BitnagilTheme.colors.coolGray95
-    }
-
-@Composable
-private fun ReportProcess.getProcessBadgeTextColor(): Color =
-    when (this) {
-        ReportProcess.Reported -> BitnagilTheme.colors.green300
-        ReportProcess.Progress -> BitnagilTheme.colors.blue300
-        else -> BitnagilTheme.colors.coolGray40
-    }
-
 @Composable
 @Preview
 private fun ReportProcessBadgePreview() {
     BitnagilTheme {
         Column(
             verticalArrangement = Arrangement.spacedBy(4.dp),
         ) {
-            ReportProcessBadge(reportProcess = ReportProcess.Progress)
-            ReportProcessBadge(reportProcess = ReportProcess.Reported)
-            ReportProcessBadge(reportProcess = ReportProcess.Complete)
+            ReportProcessBadge(reportStatus = ReportStatus.PENDING)
+            ReportProcessBadge(reportStatus = ReportStatus.IN_PROGRESS)
+            ReportProcessBadge(reportStatus = ReportStatus.COMPLETED)
         }
     }
 }