Feat: 제보 목록 화면에 제보 목록 조회 UseCase 적용 및 마이페이지에서 제보 목록 화면 이동 로직 추가

l5x5l · l5x5l · commit 91f55d4cbe5b · 2025-11-22T15:32:26.000+09:00
diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
@@ -14,6 +14,7 @@ import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
 import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel
 import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg
 import com.threegap.bitnagil.presentation.report.ReportScreenContainer
+import com.threegap.bitnagil.presentation.reporthistory.ReportHistoryScreenContainer
 import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
 import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
 import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
@@ -140,6 +141,11 @@ fun MainNavHost(
                         launchSingleTop = true
                     }
                 },
+                navigateToReportHistory = {
+                    navigator.navController.navigate(Route.ReportHistory) {
+                        launchSingleTop = true
+                    }
+                },
             )
         }
 
@@ -305,5 +311,17 @@ fun MainNavHost(
                 },
             )
         }
+
+        composable<Route.ReportHistory> {
+            ReportHistoryScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+                navigateToReportDetail = {
+                },
+            )
+        }
     }
 }
diff --git a/app/src/main/java/com/threegap/bitnagil/Route.kt b/app/src/main/java/com/threegap/bitnagil/Route.kt
@@ -51,4 +51,7 @@ sealed interface Route {
 
     @Serializable
     data object Report : Route
+
+    @Serializable
+    data object ReportHistory : Route
 }
diff --git a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt
@@ -44,6 +44,7 @@ fun HomeNavHost(
     navigateToEmotion: () -> Unit,
     navigateToRoutineList: (String) -> Unit,
     navigateToReport: () -> Unit,
+    navigateToReportHistory: () -> Unit,
 ) {
     val navigator = rememberHomeNavigator()
     var showFloatingOverlay by remember { mutableStateOf(false) }
@@ -89,6 +90,7 @@ fun HomeNavHost(
                             navigateToOnBoarding = navigateToOnBoarding,
                             navigateToNotice = navigateToNotice,
                             navigateToQnA = navigateToQnA,
+                            navigateToReportHistory = navigateToReportHistory,
                         )
                     }
                 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageScreen.kt
@@ -38,6 +38,7 @@ fun MyPageScreenContainer(
     navigateToNotice: () -> Unit,
     navigateToQnA: () -> Unit,
     navigateToOnBoarding: () -> Unit,
+    navigateToReportHistory: () -> Unit,
 ) {
     val state by myPageViewModel.stateFlow.collectAsState()
 
@@ -47,6 +48,7 @@ fun MyPageScreenContainer(
         onClickNotice = navigateToNotice,
         onClickResetOnBoarding = navigateToOnBoarding,
         onClickQnA = navigateToQnA,
+        onClickReportHistory = navigateToReportHistory,
     )
 }
 
@@ -57,6 +59,7 @@ private fun MyPageScreen(
     onClickNotice: () -> Unit,
     onClickResetOnBoarding: () -> Unit,
     onClickQnA: () -> Unit,
+    onClickReportHistory: () -> Unit,
 ) {
     Column(
         modifier = Modifier
@@ -100,6 +103,11 @@ private fun MyPageScreen(
 
         Spacer(modifier = Modifier.height(16.dp))
 
+        BitnagilOptionButton(
+            title = "내 제보 기록",
+            onClick = onClickReportHistory,
+        )
+
         BitnagilOptionButton(
             title = "내 목표 재설정",
             onClick = onClickResetOnBoarding,
@@ -127,6 +135,7 @@ fun MyPageScreenPreview() {
             onClickNotice = { },
             onClickResetOnBoarding = { },
             onClickQnA = { },
+            onClickReportHistory = { },
         )
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryScreen.kt
@@ -49,19 +49,20 @@ fun ReportHistoryScreenContainer(
 ) {
     val state by viewModel.collectAsState()
 
-    if (state.showSelectReportCategoryBottomSheet)
+    if (state.showSelectReportCategoryBottomSheet) {
         ReportCategoryBottomSheet(
             selectedCategory = state.selectedReportCategory,
             onDismiss = viewModel::hideReportCategoryBottomSheet,
-            onSelected = viewModel::selectReportCategory
+            onSelected = viewModel::selectReportCategory,
         )
+    }
 
     ReportHistoryScreen(
         state = state,
         onClickPreviousButton = navigateToBack,
         onClickReportProcessChip = viewModel::selectReportProcess,
         onClickReportCategoryButton = viewModel::showReportCategoryBottomSheet,
-        onClickReportItem = navigateToReportDetail
+        onClickReportItem = navigateToReportDetail,
     )
 }
 
@@ -117,7 +118,7 @@ private fun ReportHistoryScreen(
                 .fillMaxWidth()
                 .weight(1f),
         ) {
-            if (state.filteredReportHistoriesPerDays.isNotEmpty())
+            if (state.filteredReportHistoriesPerDays.isNotEmpty()) {
                 LazyColumn(
                     modifier = Modifier.fillMaxSize(),
                     contentPadding = PaddingValues(horizontal = 16.dp),
@@ -149,17 +150,18 @@ private fun ReportHistoryScreen(
                         }
                     }
                 }
-            else
+            } else {
                 Column(
                     modifier = Modifier.align(Alignment.Center),
                     verticalArrangement = Arrangement.spacedBy(2.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally
+                    horizontalAlignment = Alignment.CenterHorizontally,
                 ) {
                     Text(text = "제보한 내역이 없어요.", style = BitnagilTheme.typography.subtitle1SemiBold)
                     Text(text = "원하는 카테고리로 제보를 시작해 보세요.", style = BitnagilTheme.typography.body2Regular, color = BitnagilTheme.colors.coolGray70)
                 }
+            }
 
-            if (state.showCategorySelectButton)
+            if (state.showCategorySelectButton) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.spacedBy(5.dp),
@@ -183,6 +185,7 @@ private fun ReportHistoryScreen(
                             .size(16.dp),
                     )
                 }
+            }
         }
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/ReportHistoryViewModel.kt
@@ -1,6 +1,7 @@
 package com.threegap.bitnagil.presentation.reporthistory
 
 import androidx.lifecycle.ViewModel
+import com.threegap.bitnagil.domain.report.usecase.GetReportHistoriesUseCase
 import com.threegap.bitnagil.presentation.reporthistory.model.ReportCategory
 import com.threegap.bitnagil.presentation.reporthistory.model.ReportHistoriesPerDayUiModel
 import com.threegap.bitnagil.presentation.reporthistory.model.ReportHistorySideEffect
@@ -14,73 +15,72 @@ import org.orbitmvi.orbit.viewmodel.container
 import javax.inject.Inject
 
 @HiltViewModel
-class ReportHistoryViewModel @Inject constructor() : ContainerHost<ReportHistoryState, ReportHistorySideEffect>, ViewModel() {
+class ReportHistoryViewModel @Inject constructor(
+    private val getReportHistoriesUseCase: GetReportHistoriesUseCase,
+) : ContainerHost<ReportHistoryState, ReportHistorySideEffect>, ViewModel() {
     override val container: Container<ReportHistoryState, ReportHistorySideEffect> = container(initialState = ReportHistoryState.Init)
 
     init {
         loadReportHistories()
     }
 
     private fun loadReportHistories() = intent {
-        reduce {
-            state.copy(
-                reportHistoriesPerDays = List(10) {
-                    ReportHistoriesPerDayUiModel(
-                        date = java.time.LocalDate.now(),
-                        reports = listOf(
-                            ReportHistoryUiModel(
-                                id = "1",
-                                title = "제보 1",
-                                imageUrl = "-",
-                                location = "서울특별시 성북구 안암로 106",
-                                process = ReportProcess.Reported,
-                                category = ReportCategory.Amenities,
-                            ),
-                            ReportHistoryUiModel(
-                                id = "1",
-                                title = "제보 1",
-                                imageUrl = "-",
-                                location = "서울특별시 성북구 안암로 106",
-                                process = ReportProcess.Progress,
-                                category = ReportCategory.Amenities,
-                            ),
-                        ),
+        getReportHistoriesUseCase.invoke().fold(
+            onSuccess = { reportHistoriesPerDate ->
+                val reportHistoriesPerDays = reportHistoriesPerDate
+                    .map { reportHistoryPerDateMap ->
+                        ReportHistoriesPerDayUiModel(
+                            date = reportHistoryPerDateMap.key,
+                            reports = reportHistoryPerDateMap.value.map {
+                                ReportHistoryUiModel.fromDomain(it)
+                            },
+                        )
+                    }
+                    .sortedByDescending { reportHistoryPerDate ->
+                        reportHistoryPerDate.date
+                    }
+
+                reduce {
+                    state.copy(
+                        reportHistoriesPerDays = reportHistoriesPerDays,
                     )
-                },
-            )
-        }
+                }
+            },
+            onFailure = {
+            },
+        )
     }
 
     fun selectReportCategory(reportCategory: ReportCategory) = intent {
         val currentSelectedReportCategory = state.selectedReportCategory
 
         reduce {
             state.copy(
-                selectedReportCategory = if (currentSelectedReportCategory == reportCategory) null else reportCategory
+                selectedReportCategory = if (currentSelectedReportCategory == reportCategory) null else reportCategory,
             )
         }
     }
 
     fun selectReportProcess(reportProcess: ReportProcess) = intent {
         reduce {
             state.copy(
-                selectedReportProcess = reportProcess
+                selectedReportProcess = reportProcess,
             )
         }
     }
 
     fun showReportCategoryBottomSheet() = intent {
         reduce {
             state.copy(
-                showSelectReportCategoryBottomSheet = true
+                showSelectReportCategoryBottomSheet = true,
             )
         }
     }
 
     fun hideReportCategoryBottomSheet() = intent {
         reduce {
             state.copy(
-                showSelectReportCategoryBottomSheet = false
+                showSelectReportCategoryBottomSheet = false,
             )
         }
     }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportCategory.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportCategory.kt
@@ -1,6 +1,7 @@
 package com.threegap.bitnagil.presentation.reporthistory.model
 
 import com.threegap.bitnagil.designsystem.R
+import com.threegap.bitnagil.domain.report.model.ReportCategory as DomainReportCategory
 
 enum class ReportCategory(
     val title: String,
@@ -10,21 +11,33 @@ enum class ReportCategory(
     TrafficFacilities(
         title = "교통 시설",
         description = "신호등 고장, 표지판 파손, 횡단보도 등",
-        iconResourceId = R.drawable.ic_check_md,
+        iconResourceId = R.drawable.ic_car,
     ),
     LightingFacilities(
         title = "조명 시설",
         description = "가로등, 보안등 파손 등",
-        iconResourceId = R.drawable.ic_check_md,
+        iconResourceId = R.drawable.ic_light,
     ),
     WaterFacilities(
         title = "상하수도 시설",
         description = "맨홀 뚜껑 손상 등",
-        iconResourceId = R.drawable.ic_check_md,
+        iconResourceId = R.drawable.ic_water,
     ),
     Amenities(
         title = "편의 시설",
         description = "벤치 파손, 휴지통 넘침 등",
-        iconResourceId = R.drawable.ic_check_md,
+        iconResourceId = R.drawable.ic_hammer,
     ),
+    ;
+
+    companion object {
+        fun fromDomain(domainReportCategory: DomainReportCategory): ReportCategory {
+            return when (domainReportCategory) {
+                DomainReportCategory.TRANSPORTATION -> TrafficFacilities
+                DomainReportCategory.LIGHTING -> LightingFacilities
+                DomainReportCategory.WATERFACILITY -> WaterFacilities
+                DomainReportCategory.AMENITY -> Amenities
+            }
+        }
+    }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoryState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoryState.kt
@@ -17,7 +17,7 @@ data class ReportHistoryState(
                         ReportProcess.Complete -> it.process == ReportProcess.Complete
                     }
 
-                    val categoryMatched = when(selectedReportCategory) {
+                    val categoryMatched = when (selectedReportCategory) {
                         ReportCategory.TrafficFacilities -> it.category == ReportCategory.TrafficFacilities
                         ReportCategory.LightingFacilities -> it.category == ReportCategory.LightingFacilities
                         ReportCategory.WaterFacilities -> it.category == ReportCategory.WaterFacilities
@@ -56,7 +56,7 @@ data class ReportHistoryState(
             selectedReportCategory = null,
             selectedReportProcess = ReportProcess.Total,
             reportHistoriesPerDays = listOf(),
-            showSelectReportCategoryBottomSheet = false
+            showSelectReportCategoryBottomSheet = false,
         )
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoryUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportHistoryUiModel.kt
@@ -1,10 +1,25 @@
 package com.threegap.bitnagil.presentation.reporthistory.model
 
+import com.threegap.bitnagil.domain.report.model.ReportItem
+
 data class ReportHistoryUiModel(
     val id: String,
     val title: String,
     val imageUrl: String,
     val location: String,
     val process: ReportProcess,
     val category: ReportCategory,
-)
+) {
+    companion object {
+        fun fromDomain(reportItem: ReportItem): ReportHistoryUiModel {
+            return ReportHistoryUiModel(
+                id = "${reportItem.id}",
+                title = reportItem.title,
+                imageUrl = reportItem.imageUrl,
+                location = reportItem.address,
+                process = ReportProcess.fromDomain(reportItem.status),
+                category = ReportCategory.fromDomain(reportItem.category),
+            )
+        }
+    }
+}
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportProcess.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportProcess.kt
@@ -1,10 +1,23 @@
 package com.threegap.bitnagil.presentation.reporthistory.model
 
+import com.threegap.bitnagil.domain.report.model.ReportStatus
+
 enum class ReportProcess(
     val title: String,
 ) {
     Total(title = "전체"),
     Reported(title = "제보 완료"),
     Progress(title = "처리 중"),
     Complete(title = "처리 완료"),
+    ;
+
+    companion object {
+        fun fromDomain(status: ReportStatus): ReportProcess {
+            return when (status) {
+                ReportStatus.Pending -> Reported
+                ReportStatus.InProgress -> Progress
+                ReportStatus.Completed -> Complete
+            }
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer`
`14`	`14`	`import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel`
`15`	`15`	`import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg`
`16`	`16`	`import com.threegap.bitnagil.presentation.report.ReportScreenContainer`
	`17`	`+import com.threegap.bitnagil.presentation.reporthistory.ReportHistoryScreenContainer`
`17`	`18`	`import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer`
`18`	`19`	`import com.threegap.bitnagil.presentation.setting.SettingScreenContainer`
`19`	`20`	`import com.threegap.bitnagil.presentation.splash.SplashScreenContainer`
`@@ -140,6 +141,11 @@ fun MainNavHost(`
`140`	`141`	`launchSingleTop = true`
`141`	`142`	`}`
`142`	`143`	`},`
	`144`	`+ navigateToReportHistory = {`
	`145`	`+ navigator.navController.navigate(Route.ReportHistory) {`
	`146`	`+ launchSingleTop = true`
	`147`	`+ }`
	`148`	`+ },`
`143`	`149`	`)`
`144`	`150`	`}`
`145`	`151`
`@@ -305,5 +311,17 @@ fun MainNavHost(`
`305`	`311`	`},`
`306`	`312`	`)`
`307`	`313`	`}`
	`314`	`+`
	`315`	`+ composable<Route.ReportHistory> {`
	`316`	`+ ReportHistoryScreenContainer(`
	`317`	`+ navigateToBack = {`
	`318`	`+ if (navigator.navController.previousBackStackEntry != null) {`
	`319`	`+ navigator.navController.popBackStack()`
	`320`	`+ }`
	`321`	`+ },`
	`322`	`+ navigateToReportDetail = {`
	`323`	`+ },`
	`324`	`+ )`
	`325`	`+ }`
`308`	`326`	`}`
`309`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,7 @@ sealed interface Route {`
`51`	`51`
`52`	`52`	`@Serializable`
`53`	`53`	`data object Report : Route`
	`54`	`+`
	`55`	`+ @Serializable`
	`56`	`+ data object ReportHistory : Route`
`54`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ fun HomeNavHost(`
`44`	`44`	`navigateToEmotion: () -> Unit,`
`45`	`45`	`navigateToRoutineList: (String) -> Unit,`
`46`	`46`	`navigateToReport: () -> Unit,`
	`47`	`+ navigateToReportHistory: () -> Unit,`
`47`	`48`	`) {`
`48`	`49`	`val navigator = rememberHomeNavigator()`
`49`	`50`	`var showFloatingOverlay by remember { mutableStateOf(false) }`
`@@ -89,6 +90,7 @@ fun HomeNavHost(`
`89`	`90`	`navigateToOnBoarding = navigateToOnBoarding,`
`90`	`91`	`navigateToNotice = navigateToNotice,`
`91`	`92`	`navigateToQnA = navigateToQnA,`
	`93`	`+ navigateToReportHistory = navigateToReportHistory,`
`92`	`94`	`)`
`93`	`95`	`}`
`94`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,19 +49,20 @@ fun ReportHistoryScreenContainer(`
`49`	`49`	`) {`
`50`	`50`	`val state by viewModel.collectAsState()`
`51`	`51`
`52`		`- if (state.showSelectReportCategoryBottomSheet)`
	`52`	`+ if (state.showSelectReportCategoryBottomSheet) {`
`53`	`53`	`ReportCategoryBottomSheet(`
`54`	`54`	`selectedCategory = state.selectedReportCategory,`
`55`	`55`	`onDismiss = viewModel::hideReportCategoryBottomSheet,`
`56`		`- onSelected = viewModel::selectReportCategory`
	`56`	`+ onSelected = viewModel::selectReportCategory,`
`57`	`57`	`)`
	`58`	`+ }`
`58`	`59`
`59`	`60`	`ReportHistoryScreen(`
`60`	`61`	`state = state,`
`61`	`62`	`onClickPreviousButton = navigateToBack,`
`62`	`63`	`onClickReportProcessChip = viewModel::selectReportProcess,`
`63`	`64`	`onClickReportCategoryButton = viewModel::showReportCategoryBottomSheet,`
`64`		`- onClickReportItem = navigateToReportDetail`
	`65`	`+ onClickReportItem = navigateToReportDetail,`
`65`	`66`	`)`
`66`	`67`	`}`
`67`	`68`
`@@ -117,7 +118,7 @@ private fun ReportHistoryScreen(`
`117`	`118`	`.fillMaxWidth()`
`118`	`119`	`.weight(1f),`
`119`	`120`	`) {`
`120`		`- if (state.filteredReportHistoriesPerDays.isNotEmpty())`
	`121`	`+ if (state.filteredReportHistoriesPerDays.isNotEmpty()) {`
`121`	`122`	`LazyColumn(`
`122`	`123`	`modifier = Modifier.fillMaxSize(),`
`123`	`124`	`contentPadding = PaddingValues(horizontal = 16.dp),`
`@@ -149,17 +150,18 @@ private fun ReportHistoryScreen(`
`149`	`150`	`}`
`150`	`151`	`}`
`151`	`152`	`}`
`152`		`- else`
	`153`	`+ } else {`
`153`	`154`	`Column(`
`154`	`155`	`modifier = Modifier.align(Alignment.Center),`
`155`	`156`	`verticalArrangement = Arrangement.spacedBy(2.dp),`
`156`		`- horizontalAlignment = Alignment.CenterHorizontally`
	`157`	`+ horizontalAlignment = Alignment.CenterHorizontally,`
`157`	`158`	`) {`
`158`	`159`	`Text(text = "제보한 내역이 없어요.", style = BitnagilTheme.typography.subtitle1SemiBold)`
`159`	`160`	`Text(text = "원하는 카테고리로 제보를 시작해 보세요.", style = BitnagilTheme.typography.body2Regular, color = BitnagilTheme.colors.coolGray70)`
`160`	`161`	`}`
	`162`	`+ }`
`161`	`163`
`162`		`- if (state.showCategorySelectButton)`
	`164`	`+ if (state.showCategorySelectButton) {`
`163`	`165`	`Row(`
`164`	`166`	`verticalAlignment = Alignment.CenterVertically,`
`165`	`167`	`horizontalArrangement = Arrangement.spacedBy(5.dp),`
`@@ -183,6 +185,7 @@ private fun ReportHistoryScreen(`
`183`	`185`	`.size(16.dp),`
`184`	`186`	`)`
`185`	`187`	`}`
	`188`	`+ }`
`186`	`189`	`}`
`187`	`190`	`}`
`188`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ data class ReportHistoryState(`
`17`	`17`	`ReportProcess.Complete -> it.process == ReportProcess.Complete`
`18`	`18`	`}`
`19`	`19`
`20`		`- val categoryMatched = when(selectedReportCategory) {`
	`20`	`+ val categoryMatched = when (selectedReportCategory) {`
`21`	`21`	`ReportCategory.TrafficFacilities -> it.category == ReportCategory.TrafficFacilities`
`22`	`22`	`ReportCategory.LightingFacilities -> it.category == ReportCategory.LightingFacilities`
`23`	`23`	`ReportCategory.WaterFacilities -> it.category == ReportCategory.WaterFacilities`
`@@ -56,7 +56,7 @@ data class ReportHistoryState(`
`56`	`56`	`selectedReportCategory = null,`
`57`	`57`	`selectedReportProcess = ReportProcess.Total,`
`58`	`58`	`reportHistoriesPerDays = listOf(),`
`59`		`- showSelectReportCategoryBottomSheet = false`
	`59`	`+ showSelectReportCategoryBottomSheet = false,`
`60`	`60`	`)`
`61`	`61`	`}`
`62`	`62`	`}`