[FIX/#239] 공고 상세 페이지 데이터 구조 수정

teamterning · Sep 14, 2024 · 404568d · 404568d
1 parent 6f1ddc2
commit 404568d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/data/src/main/java/com/terning/data/dto/response/InternResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/InternResponseDto.kt
@@ -13,8 +13,8 @@ data class InternResponseDto(
     val deadline: String,
     @SerialName("workingPeriod")
     val workingPeriod: String,
-    @SerialName("startDate")
-    val startDate: String,
+    @SerialName("startYearMonth")
+    val startYearMonth: String,
     @SerialName("scrapCount")
     val scrapCount: Int,
     @SerialName("viewCount")
@@ -33,6 +33,8 @@ data class InternResponseDto(
     val detail: String,
     @SerialName("url")
     val url: String,
-    @SerialName("scrapId")
-    val scrapId: Long? = null,
+    @SerialName("isScrapped")
+    val isScrapped: Boolean,
+    @SerialName("color")
+    val color: String? = null,
 )
diff --git a/data/src/main/java/com/terning/data/mapper/intern/InternInfoMapper.kt b/data/src/main/java/com/terning/data/mapper/intern/InternInfoMapper.kt
@@ -9,7 +9,7 @@ fun InternResponseDto.toInternInfo(): InternInfo =
         title = title,
         deadline = deadline,
         workingPeriod = workingPeriod,
-        startDate = startDate,
+        startYearMonth = startYearMonth,
         scrapCount = scrapCount,
         viewCount = viewCount,
         company = company,
@@ -19,5 +19,6 @@ fun InternResponseDto.toInternInfo(): InternInfo =
         jobType = jobType,
         detail = detail,
         url = url,
-        scrapId = scrapId
+        isScrapped = isScrapped,
+        color = color,
     )
diff --git a/domain/src/main/java/com/terning/domain/entity/intern/InternInfo.kt b/domain/src/main/java/com/terning/domain/entity/intern/InternInfo.kt
@@ -5,7 +5,7 @@ data class InternInfo(
     val title: String,
     val deadline: String,
     val workingPeriod: String,
-    val startDate: String,
+    val startYearMonth: String,
     val scrapCount: Int,
     val viewCount: Int,
     val company: String,
@@ -15,5 +15,6 @@ data class InternInfo(
     val jobType: String,
     val detail: String,
     val url: String,
-    val scrapId: Long? = null,
+    val isScrapped: Boolean,
+    val color: String? = null,
 )
diff --git a/feature/src/main/java/com/terning/feature/intern/InternRoute.kt b/feature/src/main/java/com/terning/feature/intern/InternRoute.kt
@@ -52,10 +52,9 @@ fun InternRoute(
     viewModel: InternViewModel = hiltViewModel(),
     navController: NavHostController,
 ) {
-    val internState by viewModel.internUiState.collectAsStateWithLifecycle()
-
     val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
+    val internState by viewModel.internUiState.collectAsStateWithLifecycle(lifecycleOwner)
 
     LaunchedEffect(key1 = true) {
         viewModel.getInternInfo(announcementId)
@@ -124,7 +123,7 @@ fun InternScreen(
     val internInfoList = listOf(
         stringResource(id = R.string.intern_info_d_day) to internInfo.deadline,
         stringResource(id = R.string.intern_info_working) to internInfo.workingPeriod,
-        stringResource(id = R.string.intern_info_start_date) to internInfo.startDate,
+        stringResource(id = R.string.intern_info_start_date) to internInfo.startYearMonth,
     )
 
     val qualificationList = listOf(
@@ -286,7 +285,7 @@ fun InternScreen(
                 title = internInfo.title,
                 scrapColor = CalRed,
                 deadline = internInfo.deadline,
-                startYearMonth = internInfo.startDate,
+                startYearMonth = internInfo.startYearMonth,
                 workingPeriod = internInfo.workingPeriod,
                 internshipAnnouncementId = announcementId,
                 companyImage = internInfo.companyImage,

diff --git a/feature/src/main/java/com/terning/feature/intern/InternViewModel.kt b/feature/src/main/java/com/terning/feature/intern/InternViewModel.kt
@@ -31,14 +31,14 @@ class InternViewModel @Inject constructor(
         viewModelScope.launch {
             internRepository.getInternInfo(id)
                 .onSuccess { internInfoModel ->
-                    _internUiState.update { currentState ->
-                        currentState.copy(
-                            loadState = UiState.Success(internInfoModel),
-                            isScrappedState = internInfoModel.scrapId != null,
-                        )
-                    }
+                    _internUiState.value = _internUiState.value.copy(
+                        loadState = UiState.Success(internInfoModel)
+                    )
                 }
-                .onFailure {
+                .onFailure { exception: Throwable ->
+                    _internUiState.value = _internUiState.value.copy(
+                        loadState = UiState.Failure(exception.toString())
+                    )
                     _sideEffect.emit(InternViewSideEffect.Toast(R.string.server_failure))
                 }
         }

diff --git a/feature/src/main/java/com/terning/feature/intern/component/InternBottomBar.kt b/feature/src/main/java/com/terning/feature/intern/component/InternBottomBar.kt
@@ -76,7 +76,7 @@ fun InternBottomBar(
                             .noRippleClickable {
                                 onScrapClick(internInfo)
                             },
-                        tint = if (internInfo.scrapId != null) TerningMain else Grey350
+                        tint = if (internInfo.isScrapped) TerningMain else Grey350
                     )
                     Text(
                         text = stringResource(