[MERGE] #117 -> develop

[HOTFIX/#117] 공고 뷰 / 공고 상세 페이지 API 수정
teamterning · Jul 17, 2024 · 146b756 · 146b756
2 parents 473f11e + ccd3083
commit 146b756
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 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
@@ -34,8 +34,8 @@ data class InternResponseDto(
     val detail: String,
     @SerialName("url")
     val url: String,
-    @SerialName("isScrapped")
-    val isScrapped: Boolean,
+    @SerialName("scrapId")
+    val scrapId: Long? = null,
 ) {
     fun toInternEntity(): InternInfoModel {
         return InternInfoModel(
@@ -53,7 +53,7 @@ data class InternResponseDto(
             jobType = jobType,
             detail = detail,
             url = url,
-            isScrapped = isScrapped
+            scrapId = scrapId
         )
     }
 }
diff --git a/domain/src/main/java/com/terning/domain/entity/response/InternInfoModel.kt b/domain/src/main/java/com/terning/domain/entity/response/InternInfoModel.kt
@@ -15,5 +15,5 @@ data class InternInfoModel(
     val jobType: String,
     val detail: String,
     val url: String,
-    val isScrapped: Boolean,
+    val scrapId: Long? = 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
@@ -137,8 +137,7 @@ fun InternScreen(
             InternBottomBar(
                 modifier = modifier,
                 scrapCount = decimal.format(internInfoModel.scrapCount),
-                url = internInfoModel.url,
-                isScrappedState = state.isScrappedState,
+                scrapId = internInfoModel.scrapId,
                 onScrapClick = {
                     viewModel.updateScrapDialogVisible(true)
                 }
@@ -369,7 +368,7 @@ fun InternScreen(
                     viewModel.updateScrapDialogVisible(false)
                 },
                 content = {
-                    when (state.isScrappedState) {
+                    when (internInfoModel.scrapId != null) {
                         true -> ScrapCancelDialogContent()
                         else -> ScrapDialogContent(
                             internInfoList = internInfoList

diff --git a/feature/src/main/java/com/terning/feature/intern/InternViewState.kt b/feature/src/main/java/com/terning/feature/intern/InternViewState.kt
@@ -7,7 +7,6 @@ import com.terning.domain.entity.response.InternInfoModel
 
 data class InternViewState(
     var internInfo: UiState<InternInfoModel> = UiState.Loading,
-    val isScrap: Boolean = false,
     val isColorChange: Boolean = false,
     val selectedColor: Color = CalRed,
     val isScrapDialogVisible: Boolean = false,

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
@@ -33,8 +33,7 @@ import com.terning.feature.intern.InternViewModel
 fun InternBottomBar(
     modifier: Modifier,
     scrapCount: String,
-    url: String,
-    isScrappedState: Boolean,
+    scrapId: Long? = null,
     onScrapClick: () -> Unit,
     viewModel: InternViewModel = hiltViewModel(),
 ) {
@@ -68,7 +67,7 @@ fun InternBottomBar(
                     Icon(
                         painter = painterResource(
                             id =
-                            if (isScrappedState) R.drawable.ic_scrap_true_24
+                            if (scrapId != null) R.drawable.ic_scrap_true_24
                             else R.drawable.ic_scrap_false_24,
                         ),
                         contentDescription = null,
@@ -79,7 +78,7 @@ fun InternBottomBar(
                             .noRippleClickable {
                                 onScrapClick()
                             },
-                        tint = if (state.isScrappedState) TerningMain
+                        tint = if (scrapId != null) TerningMain
                         else Grey350
                     )
                     Text(

diff --git a/feature/src/main/java/com/terning/feature/intern/component/ScrapCancelDialog.kt b/feature/src/main/java/com/terning/feature/intern/component/ScrapCancelDialog.kt
@@ -96,7 +96,6 @@ fun ScrapCancelDialogContent(
                 cornerRadius = 8.dp,
                 text = R.string.dialog_scrap_cancel_button,
                 onButtonClick = {
-                    viewModel.updateScrapped(!state.isScrappedState)
                     viewModel.updateScrapDialogVisible(false)
                 },
                 modifier = Modifier.padding(bottom = 8.dp)