[MERGE] #236 -> develop

[FIX/#236] 홈 뷰 / 1차 QA 반영
teamterning · Sep 13, 2024 · 5f590c8 · 5f590c8
2 parents 096461d + cbd87a2
commit 5f590c8
Show file tree

Hide file tree

Showing 18 changed files with 127 additions and 131 deletions.
diff --git a/core/src/main/java/com/terning/core/designsystem/component/item/InternItem.kt b/core/src/main/java/com/terning/core/designsystem/component/item/InternItem.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.terning.core.R
+import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.Grey400
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.TerningPointTheme
@@ -86,7 +87,7 @@ fun InternItem(
             Text(
                 text = dateDeadline,
                 style = TerningTheme.typography.detail0,
-                color = TerningMain,
+                color = if (dateDeadline == stringResource(id = R.string.intern_apply_closed)) Grey300 else TerningMain,
             )
             TwoLineHeightText(
                 text = title,

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -16,18 +16,19 @@
     <string name="intern_item_working_period_month">%s개월</string>
     <string name="intern_item_d_day">D-%s</string>
     <string name="intern_item_scrap">스크랩</string>
+    <string name="intern_apply_closed">지원마감</string>
 
     <!--Calendar-->
     <string name="calendar_button_description_previous">previous</string>
     <string name="calendar_button_description_next">next</string>
     <string name="calendar_button_description_list">list</string>
 
     <!--SortByBottom-->
-    <string name="sort_by_earliest">채용 마감 이른순</string>
-    <string name="sort_by_shortest">짧은 근무 기간순</string>
-    <string name="sort_by_longest">긴 근무 기간순</string>
-    <string name="sort_by_scrap">스크랩 많은순</string>
-    <string name="sort_by_view_count">조회수 많은순</string>
+    <string name="sort_by_earliest">채용 마감 이른 순</string>
+    <string name="sort_by_shortest">짧은 근무 기간 순</string>
+    <string name="sort_by_longest">긴 근무 기간 순</string>
+    <string name="sort_by_scrap">스크랩 많은 순</string>
+    <string name="sort_by_view_count">조회수 많은 순</string>
     <string name="sort_button_description">정렬 기준</string>
     <string name="sort_bottom_sheet_title">공고 정렬 순서</string>
 
@@ -76,8 +77,8 @@
     <string name="change_filter_grade_3">3학년</string>
     <string name="change_filter_grade_4">4학년</string>
     <string name="change_filter_period_title">희망 근무 기간</string>
-    <string name="change_filter_period_1">1개월 ~ 3개월</string>
-    <string name="change_filter_period_2">4개월 ~ 6개월</string>
+    <string name="change_filter_period_1">1 ~ 3개월</string>
+    <string name="change_filter_period_2">4 ~ 6개월</string>
     <string name="change_filter_period_3">7개월 이상</string>
     <string name="change_filter_start_work_title">근무 시작 시기</string>
 

diff --git a/data/src/main/java/com/terning/data/dto/request/ChangeFilterRequestDto.kt b/data/src/main/java/com/terning/data/dto/request/ChangeFilterRequestDto.kt
@@ -7,9 +7,9 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class ChangeFilterRequestDto(
     @SerialName("grade")
-    val grade: Int,
+    val grade: String,
     @SerialName("workingPeriod")
-    val workingPeriod: Int,
+    val workingPeriod: String,
     @SerialName("startYear")
     val startYear: Int,
     @SerialName("startMonth")

diff --git a/data/src/main/java/com/terning/data/dto/response/HomeFilteringInfoResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeFilteringInfoResponseDto.kt
@@ -6,9 +6,9 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class HomeFilteringInfoResponseDto(
     @SerialName("grade")
-    val grade: Int?,
+    val grade: String?,
     @SerialName("workingPeriod")
-    val workingPeriod: Int?,
+    val workingPeriod: String?,
     @SerialName("startYear")
     val startYear: Int?,
     @SerialName("startMonth")

diff --git a/data/src/main/java/com/terning/data/dto/response/HomeUpcomingInternResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeUpcomingInternResponseDto.kt
@@ -23,4 +23,6 @@ data class HomeUpcomingInternResponseDto(
     val color: String,
     @SerialName("startYearMonth")
     val startYearMonth: String,
-)
+    @SerialName("companyInfo")
+    val companyInfo: String,
+)
diff --git a/data/src/main/java/com/terning/data/mapper/home/HomeUpcomingInternMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeUpcomingInternMapper.kt
@@ -14,4 +14,5 @@ fun HomeUpcomingInternResponseDto.toHomeUpcomingInternList(): HomeUpcomingIntern
         isScrapped = this.isScrapped,
         startYearMonth = this.startYearMonth,
         color = this.color,
-    )
+        companyInfo = this.companyInfo,
+    )
diff --git a/domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt b/domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt
@@ -1,8 +1,8 @@
 package com.terning.domain.entity.home
 
 data class HomeFilteringInfo(
-    val grade: Int?,
-    val workingPeriod: Int?,
+    val grade: String?,
+    val workingPeriod: String?,
     val startYear: Int?,
     val startMonth: Int?,
 )
diff --git a/domain/src/main/java/com/terning/domain/entity/home/HomeUpcomingIntern.kt b/domain/src/main/java/com/terning/domain/entity/home/HomeUpcomingIntern.kt
@@ -10,4 +10,5 @@ data class HomeUpcomingIntern(
     val isScrapped: Boolean,
     val color: String,
     val startYearMonth: String,
+    val companyInfo: String,
 )
diff --git a/domain/src/main/java/com/terning/domain/entity/request/ChangeFilteringRequestModel.kt b/domain/src/main/java/com/terning/domain/entity/request/ChangeFilteringRequestModel.kt
@@ -1,8 +1,8 @@
 package com.terning.domain.entity.request
 
 data class ChangeFilteringRequestModel(
-    val grade: Int,
-    val workingPeriod: Int,
+    val grade: String,
+    val workingPeriod: String,
     val startYear: Int,
     val startMonth: Int,
 )
diff --git a/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt b/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt
@@ -86,6 +86,7 @@ fun HomeRoute(
     val context = LocalContext.current
 
     LaunchedEffect(key1 = true) {
+        viewModel.getProfile()
         viewModel.getFilteringInfo()
     }
 
@@ -158,9 +159,9 @@ fun HomeScreen(
 
     if (changeFilteringSheetState) {
         HomeFilteringBottomSheet(
-            defaultGrade = homeFilteringInfo.grade?.let { Grade.entries[it] },
+            defaultGrade = homeFilteringInfo.grade?.let { Grade.fromString(it) },
             defaultWorkingPeriod = homeFilteringInfo.workingPeriod?.let {
-                WorkingPeriod.entries[it]
+                WorkingPeriod.fromString(it)
             },
             defaultStartYear = homeFilteringInfo.startYear,
             defaultStartMonth = homeFilteringInfo.startMonth,
@@ -178,18 +179,48 @@ fun HomeScreen(
         }
     }
 
-    LaunchedEffect(
-        homeState.homeRecommendDialogVisibility,
-        homeState.homeUpcomingDialogVisibility
-    ) {
-        with(homeState) {
-            if (!homeRecommendDialogVisibility && !homeUpcomingDialogVisibility) {
-                viewModel.getRecommendInternsData(
-                    sortBy = sortBy.ordinal,
-                    startYear = homeFilteringInfo.startYear ?: Calendar.getInstance().currentYear,
-                    startMonth = homeFilteringInfo.startMonth
-                        ?: Calendar.getInstance().currentMonth,
-                )
+    if (homeState.homeRecommendDialogVisibility) {
+        with(homeState.homeInternModel) {
+            if (this != null) {
+                if (isScrapped) {
+                    ScrapCancelDialog(
+                        internshipAnnouncementId = internshipAnnouncementId,
+                        onDismissRequest = {
+                            viewModel.updateRecommendDialogVisibility(false)
+                            viewModel.getHomeUpcomingInternList()
+                            viewModel.getRecommendInternsData(
+                                sortBy = homeState.sortBy.ordinal,
+                                startYear = homeFilteringInfo.startYear ?: Calendar.getInstance().currentYear,
+                                startMonth = homeFilteringInfo.startMonth
+                                    ?: Calendar.getInstance().currentMonth,
+                            )
+                        }
+                    )
+                } else {
+                    ScrapDialog(
+                        title = title,
+                        scrapColor = CalRed,
+                        deadline = deadline,
+                        startYearMonth = startYearMonth,
+                        workingPeriod = workingPeriod,
+                        internshipAnnouncementId = internshipAnnouncementId,
+                        companyImage = companyImage,
+                        isScrapped = isScrapped,
+                        onDismissRequest = {
+                            viewModel.updateRecommendDialogVisibility(
+                                false
+                            )
+                            viewModel.getHomeUpcomingInternList()
+                            viewModel.getRecommendInternsData(
+                                sortBy = homeState.sortBy.ordinal,
+                                startYear = homeFilteringInfo.startYear ?: Calendar.getInstance().currentYear,
+                                startMonth = homeFilteringInfo.startMonth
+                                    ?: Calendar.getInstance().currentMonth,
+                            )
+                        },
+                        onClickNavigateButton = navigateToIntern
+                    )
+                }
             }
         }
     }
@@ -216,10 +247,7 @@ fun HomeScreen(
                 .fillMaxWidth(),
         ) {
             item {
-                Column(
-                    modifier = Modifier
-                        .padding(bottom = 16.dp)
-                ) {
+                Column {
                     ShowMainTitleWithName(homeUserName)
                     ShowUpcomingIntern(
                         homeUpcomingInternState = homeState.homeUpcomingInternState,
@@ -300,41 +328,6 @@ fun HomeScreen(
                             }
                         }
                     )
-
-                    if (homeState.homeRecommendDialogVisibility) {
-                        with(homeState.homeInternModel) {
-                            if (this != null) {
-                                if (isScrapped) {
-                                    ScrapCancelDialog(
-                                        internshipAnnouncementId = internshipAnnouncementId,
-                                        onDismissRequest = {
-                                            viewModel.updateRecommendDialogVisibility(false)
-                                            viewModel.getHomeUpcomingInternList()
-                                        }
-                                    )
-                                } else {
-                                    ScrapDialog(
-                                        title = title,
-                                        scrapColor = CalRed,
-                                        deadline = deadline,
-                                        startYearMonth = startYearMonth,
-                                        workingPeriod = workingPeriod,
-                                        internshipAnnouncementId = internshipAnnouncementId,
-                                        companyImage = companyImage,
-                                        isScrapped = isScrapped,
-                                        onDismissRequest = {
-                                            viewModel.updateRecommendDialogVisibility(
-                                                false
-                                            )
-                                            viewModel.getHomeUpcomingInternList()
-                                        },
-                                        onClickChangeColor = { /*TODO*/ },
-                                        onClickNavigateButton = navigateToIntern
-                                    )
-                                }
-                            }
-                        }
-                    }
                 }
             } else {
                 item {
@@ -382,8 +375,12 @@ private fun ShowMainTitleWithName(userName: String) {
             else userName
         ),
         modifier = Modifier
-            .padding(top = 11.dp, bottom = 19.dp)
-            .padding(horizontal = 24.dp),
+            .padding(
+                top = 2.dp,
+                bottom = 20.dp,
+                start = 24.dp,
+                end = 24.dp,
+            ),
         style = TerningTheme.typography.title1,
         color = Black,
     )
@@ -422,8 +419,11 @@ private fun ShowRecommendTitle() {
         style = TerningTheme.typography.title1,
         color = Black,
         modifier = Modifier
-            .padding(top = 5.dp)
-            .padding(horizontal = 24.dp),
+            .padding(
+                top = 22.dp,
+                start = 24.dp,
+                end = 24.dp,
+            ),
     )
 }
 

diff --git a/feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt b/feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt
@@ -32,11 +32,6 @@ class HomeViewModel @Inject constructor(
     private val _homeSideEffect = MutableSharedFlow<HomeSideEffect>()
     val homeSideEffect get() = _homeSideEffect.asSharedFlow()
 
-    init {
-        getProfile()
-        getFilteringInfo()
-    }
-
     fun getRecommendInternsData(sortBy: Int, startYear: Int?, startMonth: Int?) {
         viewModelScope.launch {
             homeRepository.getRecommendIntern(
@@ -94,15 +89,15 @@ class HomeViewModel @Inject constructor(
         }
     }
 
-    fun putFilteringInfo(grade: Int, workingPeriod: Int, year: Int, month: Int) {
+    fun putFilteringInfo(grade: String, workingPeriod: String, year: Int, month: Int) {
         viewModelScope.launch {
             homeRepository.putFilteringInfo(
                 ChangeFilteringRequestModel(grade, workingPeriod, year, month)
             )
         }
     }
 
-    private fun getProfile() {
+    fun getProfile() {
         viewModelScope.launch {
             myPageRepository.getProfile().onSuccess { response ->
                 _homeState.value = _homeState.value.copy(
@@ -138,6 +133,7 @@ class HomeViewModel @Inject constructor(
         isScrapped: Boolean,
         color: String?,
         startYearMonth: String,
+        companyInfo: String = "",
     ) {
         _homeState.update {
             it.copy(
@@ -152,6 +148,7 @@ class HomeViewModel @Inject constructor(
                     isScrapped = isScrapped,
                     color = color ?: "",
                     startYearMonth = startYearMonth,
+                    companyInfo = companyInfo,
                 )
             )
         }

diff --git a/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringBottomSheet.kt b/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringBottomSheet.kt
@@ -44,7 +44,7 @@ fun HomeFilteringBottomSheet(
     defaultStartYear: Int?,
     defaultStartMonth: Int?,
     onDismiss: () -> Unit,
-    onChangeButtonClick: (Int, Int, Int, Int) -> Unit,
+    onChangeButtonClick: (String, String, Int, Int) -> Unit,
 ) {
     val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
@@ -126,8 +126,8 @@ fun HomeFilteringBottomSheet(
 
                 YearMonthPicker(
                     chosenYear = defaultStartYear ?: Calendar.getInstance().currentYear,
-                    chosenMonth = defaultStartMonth?.minus(1)
-                        ?: Calendar.getInstance().currentMonth.minus(1),
+                    chosenMonth = defaultStartMonth
+                        ?: Calendar.getInstance().currentMonth,
                     onYearChosen = { currentStartYear = it },
                     onMonthChosen = { currentStartMonth = it }
                 )
@@ -142,8 +142,8 @@ fun HomeFilteringBottomSheet(
                         currentGrade?.let { grade ->
                             currentPeriod?.let { workingPeriod ->
                                 onChangeButtonClick(
-                                    grade.ordinal,
-                                    workingPeriod.ordinal,
+                                    grade.stringValue,
+                                    workingPeriod.stringValue,
                                     currentStartYear,
                                     currentStartMonth,
                                 )
@@ -184,7 +184,7 @@ fun ChangeFilteringRadioGroup(
 
     LazyVerticalGrid(
         columns = GridCells.Fixed(optionList.size),
-        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        horizontalArrangement = Arrangement.spacedBy(13.dp),
         modifier = modifier
             .fillMaxWidth()
             .wrapContentHeight()