🔗 :: (#496) 면접 후기 중복 선택 구현

uson1004 · web-flow · commit fcf5a1a7f17d · 2025-12-18T20:15:33.000+09:00
diff --git a/app/src/main/java/team/retum/jobisandroidv2/MainActivity.kt b/app/src/main/java/team/retum/jobisandroidv2/MainActivity.kt
@@ -4,10 +4,12 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.WindowCompat
 import androidx.lifecycle.lifecycleScope
 import com.github.anrwatchdog.ANRWatchDog
 import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.appupdate.AppUpdateOptions
 import com.google.android.play.core.install.model.AppUpdateType
 import com.google.android.play.core.install.model.UpdateAvailability
 import dagger.hilt.android.AndroidEntryPoint
@@ -28,6 +30,14 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var deviceTokenManager: DeviceTokenManager
 
+    private val updateLauncher = registerForActivityResult(
+        ActivityResultContracts.StartIntentSenderForResult(),
+    ) { result ->
+        if (result.resultCode != RESULT_OK) {
+//      TODO :: 업데이트 실패 시 모달 호출
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         /**
@@ -68,17 +78,21 @@ class MainActivity : ComponentActivity() {
         val appUpdateManager = AppUpdateManagerFactory.create(this)
         val appUpdateInfoTask = appUpdateManager.appUpdateInfo
 
-        appUpdateInfoTask.addOnSuccessListener {
-            val isUpdateAvailable = it.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE
-
-            if (isUpdateAvailable && it.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE)) {
-                appUpdateManager.startUpdateFlowForResult(
-                    it,
-                    AppUpdateType.IMMEDIATE,
-                    this,
-                    0,
-                )
+        appUpdateInfoTask.addOnSuccessListener { appUpdateInfo ->
+            if (appUpdateInfo.updateAvailability() != UpdateAvailability.UPDATE_AVAILABLE) {
+                return@addOnSuccessListener
             }
+
+            val updateOptions = AppUpdateOptions
+                .newBuilder(AppUpdateType.IMMEDIATE)
+                .setAllowAssetPackDeletion(true)
+                .build()
+
+            appUpdateManager.startUpdateFlowForResult(
+                appUpdateInfo,
+                updateLauncher,
+                updateOptions,
+            )
         }
     }
 }
diff --git a/core/common/src/main/java/team/retum/common/enums/InterviewLocation.kt b/core/common/src/main/java/team/retum/common/enums/InterviewLocation.kt
@@ -1,8 +1,10 @@
 package team.retum.common.enums
 
-enum class InterviewLocation {
-    DAEJEON,
-    SEOUL,
-    GYEONGGI,
-    OTHER,
+enum class InterviewLocation(
+    val value: String,
+) {
+    DAEJEON("대전"),
+    SEOUL("서울"),
+    GYEONGGI("경기"),
+    OTHER("기타"),
 }
diff --git a/core/common/src/main/java/team/retum/common/enums/InterviewType.kt b/core/common/src/main/java/team/retum/common/enums/InterviewType.kt
@@ -1,7 +1,9 @@
 package team.retum.common.enums
 
-enum class InterviewType {
-    INDIVIDUAL,
-    GROUP,
-    OTHER,
+enum class InterviewType(
+    val value: String,
+) {
+    INDIVIDUAL("개인 면접"),
+    GROUP("단체 면접"),
+    OTHER("기타 면접"),
 }
diff --git a/core/data/src/main/java/team/retum/data/repository/review/ReviewRepository.kt b/core/data/src/main/java/team/retum/data/repository/review/ReviewRepository.kt
@@ -18,7 +18,7 @@ interface ReviewRepository {
         interviewType: InterviewType?,
         companyId: Long?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsResponse
 
@@ -30,7 +30,7 @@ interface ReviewRepository {
         location: InterviewLocation?,
         interviewType: InterviewType?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsCountResponse
 
diff --git a/core/data/src/main/java/team/retum/data/repository/review/ReviewRepositoryImpl.kt b/core/data/src/main/java/team/retum/data/repository/review/ReviewRepositoryImpl.kt
@@ -23,7 +23,7 @@ class ReviewRepositoryImpl @Inject constructor(
         interviewType: InterviewType?,
         companyId: Long?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsResponse =
         reviewDataSource.fetchReviews(
@@ -46,7 +46,7 @@ class ReviewRepositoryImpl @Inject constructor(
         location: InterviewLocation?,
         interviewType: InterviewType?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsCountResponse =
         reviewDataSource.fetchReviewsCount(
diff --git a/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/chip/JobisChip.kt b/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/chip/JobisChip.kt
@@ -0,0 +1,64 @@
+package team.retum.jobisdesignsystemv2.chip
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import team.retum.jobisdesignsystemv2.foundation.JobisTheme
+import team.retum.jobisdesignsystemv2.foundation.JobisTypography
+import team.retum.jobisdesignsystemv2.text.JobisText
+import team.retum.jobisdesignsystemv2.utils.clickable
+
+/**
+ * This composable function creates a JobisChip element for use in Jobis.
+ *
+ * @param text Text to be displayed on the chip
+ * @param selected Whether the chip is selected
+ * @param onClick Called when this chip is clicked
+ * @param modifier The modifier to be applied to the JobisChip
+ */
+@Composable
+fun JobisChip(
+    modifier: Modifier = Modifier,
+    text: String,
+    selected: Boolean,
+    onClick: () -> Unit,
+) {
+    val background by animateColorAsState(
+        targetValue = if (selected) JobisTheme.colors.onPrimary else JobisTheme.colors.inverseSurface,
+        label = "",
+    )
+    val textColor by animateColorAsState(
+        targetValue = if (selected) JobisTheme.colors.background else JobisTheme.colors.onPrimaryContainer,
+        label = "",
+    )
+
+    Box(
+        modifier = modifier
+            .clickable(
+                enabled = true,
+                onClick = onClick,
+                onPressed = {},
+            )
+            .clip(RoundedCornerShape(30.dp))
+            .background(background),
+        contentAlignment = Alignment.Center,
+    ) {
+        JobisText(
+            modifier = Modifier.padding(
+                horizontal = 12.dp,
+                vertical = 4.dp,
+            ),
+            text = text,
+            style = JobisTypography.Body,
+            color = textColor,
+        )
+    }
+}
diff --git a/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/chip/JobisChipGroup.kt b/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/chip/JobisChipGroup.kt
@@ -0,0 +1,51 @@
+package team.retum.jobisdesignsystemv2.chip
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import kotlinx.collections.immutable.ImmutableList
+import team.retum.jobisdesignsystemv2.foundation.JobisTheme
+import team.retum.jobisdesignsystemv2.foundation.JobisTypography
+import team.retum.jobisdesignsystemv2.text.JobisText
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun <T> JobisChipGroup(
+    title: String,
+    items: ImmutableList<T>,
+    itemText: (T) -> String,
+    selectedItem: T?,
+    onItemClick: (T) -> Unit,
+    maxItemsInEachRow: Int = 5,
+) {
+    Column(
+        modifier = Modifier.padding(horizontal = 24.dp),
+    ) {
+        if (title.isNotBlank()) {
+            JobisText(
+                modifier = Modifier.padding(vertical = 8.dp),
+                text = title,
+                style = JobisTypography.SubHeadLine,
+                color = JobisTheme.colors.inverseOnSurface,
+            )
+        }
+        FlowRow(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+            maxItemsInEachRow = maxItemsInEachRow,
+        ) {
+            items.forEach { item ->
+                JobisChip(
+                    text = itemText(item),
+                    selected = selectedItem == item,
+                    onClick = { onItemClick(item) },
+                )
+            }
+        }
+    }
+}
diff --git a/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/skills/Skills.kt b/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/skills/Skills.kt
@@ -19,12 +19,15 @@ import team.retum.jobisdesignsystemv2.utils.clickable
 
 @Composable
 fun Skills(
+    modifier: Modifier = Modifier,
     skills: SnapshotStateList<String>,
     checkSkillsId: ImmutableList<Long>? = null,
     checkedSkills: ImmutableList<String>,
     onCheckedChange: (String, Boolean, Long) -> Unit,
 ) {
-    LazyColumn {
+    LazyColumn(
+        modifier = modifier,
+    ) {
         items(skills.size) { skill ->
             val checked = checkedSkills.contains(skills[skill])
             SkillContent(
diff --git a/core/domain/src/main/java/team/retum/usecase/usecase/review/FetchReviewsCountUseCase.kt b/core/domain/src/main/java/team/retum/usecase/usecase/review/FetchReviewsCountUseCase.kt
@@ -13,7 +13,7 @@ class FetchReviewsCountUseCase @Inject constructor(
         location: InterviewLocation?,
         interviewType: InterviewType?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ) = runCatching {
         reviewRepository.fetchReviewsCount(
diff --git a/core/domain/src/main/java/team/retum/usecase/usecase/review/FetchReviewsUseCase.kt b/core/domain/src/main/java/team/retum/usecase/usecase/review/FetchReviewsUseCase.kt
@@ -9,7 +9,15 @@ import javax.inject.Inject
 class FetchReviewsUseCase @Inject constructor(
     private val reviewRepository: ReviewRepository,
 ) {
-    suspend operator fun invoke(page: Int?, location: InterviewLocation?, interviewType: InterviewType?, keyword: String?, year: Int?, companyId: Long?, code: Long?) = runCatching {
+    suspend operator fun invoke(
+        page: Int?,
+        location: InterviewLocation?,
+        interviewType: InterviewType?,
+        keyword: String?,
+        year: List<Int>?,
+        companyId: Long?,
+        code: Long?,
+    ) = runCatching {
         reviewRepository.fetchReviews(page, location, interviewType, companyId, keyword, year, code).toEntity()
     }
 }
diff --git a/core/network/src/main/java/team/retum/network/api/ReviewApi.kt b/core/network/src/main/java/team/retum/network/api/ReviewApi.kt
@@ -28,7 +28,7 @@ interface ReviewApi {
         @Query("type") interviewType: InterviewType?,
         @Query("company_id") companyId: Long?,
         @Query("keyword") keyword: String?,
-        @Query("year") year: Int?,
+        @Query("years") year: List<Int>?,
         @Query("code") code: Long?,
     ): FetchReviewsResponse
 
@@ -45,7 +45,7 @@ interface ReviewApi {
         @Query("location") location: InterviewLocation?,
         @Query("type") interviewType: InterviewType?,
         @Query("keyword") keyword: String?,
-        @Query("year") year: Int?,
+        @Query("years") year: List<Int>?,
         @Query("code") code: Long?,
     ): FetchReviewsCountResponse
 
diff --git a/core/network/src/main/java/team/retum/network/datasource/review/ReviewDataSource.kt b/core/network/src/main/java/team/retum/network/datasource/review/ReviewDataSource.kt
@@ -18,7 +18,7 @@ interface ReviewDataSource {
         interviewType: InterviewType?,
         companyId: Long?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsResponse
 
@@ -30,7 +30,7 @@ interface ReviewDataSource {
         location: InterviewLocation?,
         interviewType: InterviewType?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsCountResponse
 
diff --git a/core/network/src/main/java/team/retum/network/datasource/review/ReviewDataSourceImpl.kt b/core/network/src/main/java/team/retum/network/datasource/review/ReviewDataSourceImpl.kt
@@ -24,7 +24,7 @@ class ReviewDataSourceImpl @Inject constructor(
         interviewType: InterviewType?,
         companyId: Long?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsResponse = RequestHandler<FetchReviewsResponse>().request {
         reviewApi.fetchReviews(
@@ -48,7 +48,7 @@ class ReviewDataSourceImpl @Inject constructor(
         location: InterviewLocation?,
         interviewType: InterviewType?,
         keyword: String?,
-        year: Int?,
+        year: List<Int>?,
         code: Long?,
     ): FetchReviewsCountResponse =
         RequestHandler<FetchReviewsCountResponse>().request {
diff --git a/feature/recruitment/src/main/java/team/retum/jobis/recruitment/ui/RecruitmentFilterScreen.kt b/feature/recruitment/src/main/java/team/retum/jobis/recruitment/ui/RecruitmentFilterScreen.kt
diff --git a/feature/review/src/main/java/team/retum/review/ui/ReviewDetailsScreen.kt b/feature/review/src/main/java/team/retum/review/ui/ReviewDetailsScreen.kt
diff --git a/feature/review/src/main/java/team/retum/review/ui/ReviewFilterScreen.kt b/feature/review/src/main/java/team/retum/review/ui/ReviewFilterScreen.kt
diff --git a/feature/review/src/main/java/team/retum/review/viewmodel/ReviewFilterViewModel.kt b/feature/review/src/main/java/team/retum/review/viewmodel/ReviewFilterViewModel.kt
diff --git a/feature/review/src/main/java/team/retum/review/viewmodel/ReviewViewModel.kt b/feature/review/src/main/java/team/retum/review/viewmodel/ReviewViewModel.kt
diff --git a/feature/review/src/main/res/values/strings.xml b/feature/review/src/main/res/values/strings.xml
