🔀 :: (#760) 투표 리스트 비활성화 여부 적용

🔀 :: (#760) 투표 리스트 비활성화 여부 적용

Author: uson1004

data/src/main/java/team/aliens/dms/android/data/voting/mapper/VotingMapper.kt

@@ -21,6 +21,7 @@ private fun FetchAllVoteSearchResponse.VoteSearchResponse.toModel(): AllVoteSear
         startTime = this.startTime.toLocalDateTime(),
         endTime = this.endTime.toLocalDateTime(),
         voteType = Vote.valueOf(this.voteType),
+        isVoted = this.isVoted,
     )
 
 internal fun FetchCheckVotingItemResponse.toModel(): List<VotingItem> =

data/src/main/java/team/aliens/dms/android/data/voting/model/AllVoteSearch.kt

@@ -10,4 +10,5 @@ data class AllVoteSearch(
     val startTime: LocalDateTime,
     val endTime: LocalDateTime,
     val voteType: Vote,
+    val isVoted: Boolean,
 )

data/src/main/java/team/aliens/dms/android/data/voting/repository/VotingRepositoryImpl.kt

@@ -3,8 +3,8 @@ package team.aliens.dms.android.data.voting.repository
 import org.threeten.bp.LocalDate
 import team.aliens.dms.android.data.voting.mapper.toModel
 import team.aliens.dms.android.data.voting.model.AllVoteSearch
-import team.aliens.dms.android.data.voting.model.VotingItem
 import team.aliens.dms.android.data.voting.model.ModelStudentCandidates
+import team.aliens.dms.android.data.voting.model.VotingItem
 import team.aliens.dms.android.network.voting.datasource.NetworkVotingDataSource
 import java.util.UUID
 import javax.inject.Inject

feature/src/main/java/team/aliens/dms/android/feature/main/Main.kt

@@ -122,7 +122,6 @@ internal fun Main(
                 },
             ) {
                 ApplicationScreen(
-                    onNavigateToStudyRoomList = mainNavigator::openStudyRoomList,
                     onNavigateToRemains = mainNavigator::openRemainsApplication,
                     onNavigateToOuting = mainNavigator::openOutingNav,
                     onNavigateToModelStudent = mainNavigator::openVotingModelStudent,

feature/src/main/java/team/aliens/dms/android/feature/main/application/ApplicationScreen.kt

@@ -4,7 +4,6 @@ import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box

feature/src/main/java/team/aliens/dms/android/feature/voting/VotingModelStudentScreen.kt

@@ -61,6 +61,7 @@ class VotingViewModel @Inject constructor(
             runCatching {
                 votingRepository.fetchAllVoteSearch()
             }.onSuccess { fetchedVoteSearch ->
+                // TODO : 2번 실행되는 이유 확인
                 reduce(
                     newState = stateFlow.value.copy(
                         modelStudentVoteList = fetchedVoteSearch.filter { it.voteType == Vote.MODEL_STUDENT_VOTE },

feature/src/main/java/team/aliens/dms/android/feature/voting/VotingViewModel.kt

@@ -398,4 +398,5 @@
     <string name="second_grade">2학년</string>
     <string name="senior_grade">3학년</string>
     <string name="make_vote">투표하기</string>
+    <string name="not_vote_time">투표 기간이 아닙니다.</string>
 </resources>

feature/src/main/res/values/strings.xml

@@ -12,5 +12,6 @@ data class FetchAllVoteSearchResponse(
         @SerializedName("start_time") val startTime: String,
         @SerializedName("end_time") val endTime: String,
         @SerializedName("vote_type") val voteType: String,
+        @SerializedName("is_voted") val isVoted: Boolean,
     )
 }