Merge pull request #155 from YAPP-Github/feature/#154-report_detail

[Feature/#154] 제보 상세조회 화면 구현

Author: l5x5l

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -14,6 +14,9 @@ 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.reportdetail.ReportDetailScreenContainer
+import com.threegap.bitnagil.presentation.reportdetail.ReportDetailViewModel
+import com.threegap.bitnagil.presentation.reportdetail.model.navarg.ReportDetailScreenArg
 import com.threegap.bitnagil.presentation.reporthistory.ReportHistoryScreenContainer
 import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
 import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
@@ -319,7 +322,27 @@ fun MainNavHost(
                         navigator.navController.popBackStack()
                     }
                 },
-                navigateToReportDetail = {
+                navigateToReportDetail = { reportId ->
+                    navigator.navController.navigate(Route.ReportDetail(reportId = reportId)) {
+                        launchSingleTop = true
+                    }
+                },
+            )
+        }
+
+        composable<Route.ReportDetail> { navBackStackEntry ->
+            val arg = navBackStackEntry.toRoute<Route.ReportDetail>()
+            val reportDetailScreenArg = ReportDetailScreenArg(reportId = arg.reportId)
+            val viewModel = hiltViewModel<ReportDetailViewModel, ReportDetailViewModel.Factory> { factory ->
+                factory.create(reportDetailScreenArg)
+            }
+
+            ReportDetailScreenContainer(
+                viewModel = viewModel,
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
                 },
             )
         }

app/src/main/java/com/threegap/bitnagil/Route.kt

@@ -54,4 +54,7 @@ sealed interface Route {
 
     @Serializable
     data object ReportHistory : Route
+
+    @Serializable
+    data class ReportDetail(val reportId: String) : Route
 }

data/src/main/java/com/threegap/bitnagil/data/address/model/response/Coord2AddressResponse.kt

@@ -20,7 +20,7 @@ data class Meta(
 @Serializable
 data class Document(
     @SerialName("road_address")
-    val roadAddress: RoadAddress,
+    val roadAddress: RoadAddress?,
     @SerialName("address")
     val address: Address,
 )

data/src/main/java/com/threegap/bitnagil/data/report/datasource/ReportDataSource.kt

@@ -1,9 +1,11 @@
 package com.threegap.bitnagil.data.report.datasource
 
 import com.threegap.bitnagil.data.report.model.request.ReportRequestDto
+import com.threegap.bitnagil.data.report.model.response.ReportDetailDto
 import com.threegap.bitnagil.data.report.model.response.ReportHistoriesPerDateDto
 
 interface ReportDataSource {
     suspend fun submitReport(reportRequestDto: ReportRequestDto): Result<Long>
     suspend fun getReports(): Result<ReportHistoriesPerDateDto>
+    suspend fun getReport(reportId: String): Result<ReportDetailDto>
 }

data/src/main/java/com/threegap/bitnagil/data/report/datasourceImpl/ReportDataSourceImpl.kt

@@ -3,6 +3,7 @@ package com.threegap.bitnagil.data.report.datasourceImpl
 import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.report.datasource.ReportDataSource
 import com.threegap.bitnagil.data.report.model.request.ReportRequestDto
+import com.threegap.bitnagil.data.report.model.response.ReportDetailDto
 import com.threegap.bitnagil.data.report.model.response.ReportHistoriesPerDateDto
 import com.threegap.bitnagil.data.report.service.ReportService
 import javax.inject.Inject
@@ -17,4 +18,8 @@ class ReportDataSourceImpl @Inject constructor(
     override suspend fun getReports(): Result<ReportHistoriesPerDateDto> {
         return safeApiCall { reportService.getReports() }
     }
+
+    override suspend fun getReport(reportId: String): Result<ReportDetailDto> {
+        return safeApiCall { reportService.getReport(reportId = reportId) }
+    }
 }

data/src/main/java/com/threegap/bitnagil/data/report/model/response/ReportDetailDto.kt

@@ -0,0 +1,38 @@
+package com.threegap.bitnagil.data.report.model.response
+
+import com.threegap.bitnagil.domain.report.model.ReportCategory
+import com.threegap.bitnagil.domain.report.model.ReportDetail
+import com.threegap.bitnagil.domain.report.model.ReportStatus
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.time.LocalDate
+
+@Serializable
+class ReportDetailDto(
+    @SerialName("reportDate")
+    val reportDate: String,
+    @SerialName("reportStatus")
+    val reportStatus: String,
+    @SerialName("reportTitle")
+    val reportTitle: String,
+    @SerialName("reportContent")
+    val reportContent: String,
+    @SerialName("reportCategory")
+    val reportCategory: String,
+    @SerialName("reportLocation")
+    val reportLocation: String,
+    @SerialName("reportImageUrls")
+    val reportImageUrls: List<String>,
+)
+
+fun ReportDetailDto.toDomain(id: String?): ReportDetail =
+    ReportDetail(
+        id = id ?: "",
+        date = LocalDate.parse(this.reportDate),
+        status = ReportStatus.fromString(this.reportStatus),
+        title = this.reportTitle,
+        content = this.reportContent,
+        category = ReportCategory.fromString(this.reportCategory),
+        address = this.reportLocation,
+        imageUrls = this.reportImageUrls,
+    )

data/src/main/java/com/threegap/bitnagil/data/report/repositoryImpl/ReportRepositoryImpl.kt

@@ -2,8 +2,10 @@ package com.threegap.bitnagil.data.report.repositoryImpl
 
 import com.threegap.bitnagil.data.report.datasource.ReportDataSource
 import com.threegap.bitnagil.data.report.model.request.toDto
+import com.threegap.bitnagil.data.report.model.response.toDomain
 import com.threegap.bitnagil.data.report.model.response.toDomainMap
 import com.threegap.bitnagil.domain.report.model.Report
+import com.threegap.bitnagil.domain.report.model.ReportDetail
 import com.threegap.bitnagil.domain.report.model.ReportItem
 import com.threegap.bitnagil.domain.report.repository.ReportRepository
 import java.time.LocalDate
@@ -19,4 +21,8 @@ class ReportRepositoryImpl @Inject constructor(
     override suspend fun getReportHistories(): Result<Map<LocalDate, List<ReportItem>>> {
         return reportDataSource.getReports().map { it.toDomainMap() }
     }
+
+    override suspend fun getReport(reportId: String): Result<ReportDetail> {
+        return reportDataSource.getReport(reportId = reportId).map { it.toDomain(id = reportId) }
+    }
 }

data/src/main/java/com/threegap/bitnagil/data/report/service/ReportService.kt

@@ -1,11 +1,13 @@
 package com.threegap.bitnagil.data.report.service
 
 import com.threegap.bitnagil.data.report.model.request.ReportRequestDto
+import com.threegap.bitnagil.data.report.model.response.ReportDetailDto
 import com.threegap.bitnagil.data.report.model.response.ReportHistoriesPerDateDto
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.Path
 
 interface ReportService {
     @POST("/api/v2/reports")
@@ -15,4 +17,9 @@ interface ReportService {
 
     @GET("/api/v2/reports")
     suspend fun getReports(): BaseResponse<ReportHistoriesPerDateDto>
+
+    @GET("/api/v2/reports/{reportId}")
+    suspend fun getReport(
+        @Path("reportId") reportId: String,
+    ): BaseResponse<ReportDetailDto>
 }

domain/src/main/java/com/threegap/bitnagil/domain/report/model/ReportDetail.kt

@@ -0,0 +1,14 @@
+package com.threegap.bitnagil.domain.report.model
+
+import java.time.LocalDate
+
+data class ReportDetail(
+    val id: String,
+    val title: String,
+    val content: String,
+    val category: ReportCategory,
+    val status: ReportStatus,
+    val imageUrls: List<String>,
+    val address: String,
+    val date: LocalDate,
+)

domain/src/main/java/com/threegap/bitnagil/domain/report/repository/ReportRepository.kt

@@ -1,10 +1,12 @@
 package com.threegap.bitnagil.domain.report.repository
 
 import com.threegap.bitnagil.domain.report.model.Report
+import com.threegap.bitnagil.domain.report.model.ReportDetail
 import com.threegap.bitnagil.domain.report.model.ReportItem
 import java.time.LocalDate
 
 interface ReportRepository {
     suspend fun submitReport(report: Report): Result<Long>
     suspend fun getReportHistories(): Result<Map<LocalDate, List<ReportItem>>>
+    suspend fun getReport(reportId: String): Result<ReportDetail>
 }