[CHORE] #93 : 설문 (Survey) Entity 수정 / + SurveyFormId

pknu-wap · Jan 8, 2024 · 407dcdd · 407dcdd
1 parent 3c9b0c1
commit 407dcdd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/PostSurveyUseCase.kt b/core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/PostSurveyUseCase.kt
@@ -11,6 +11,7 @@ class PostSurveyUseCase @Inject constructor(
     private val surveyRepository: SurveyRepository,
 ) {
     suspend operator fun invoke(
+        surveyFormId: String,
         eventId: String,
         title: String,
         content: String,
@@ -19,6 +20,7 @@ class PostSurveyUseCase @Inject constructor(
         val userId = userRepository.getUserId().getOrThrow()
 
         surveyRepository.postSurvey(
+            surveyFormId = surveyFormId,
             userId = userId,
             eventId = eventId,
             title = title,

diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyScreen.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyScreen.kt
@@ -61,7 +61,7 @@ internal fun SurveyScreen(
                 }
 
                 is SurveyViewModel.SurveyUiEvent.NotSubmitted -> {
-                    navigateToSurveyAnswer(it.eventId)
+                    navigateToSurveyAnswer(it.surveyFormId)
                 }
             }
         }
@@ -132,10 +132,12 @@ private fun SurveyContent(
             .padding(horizontal = 16.dp),
     ) {
         items(surveyFormList) { surveyForm ->
-            SurveyFormItemCard(
-                surveyForm = surveyForm,
-                selectedSurveyForm = selectedSurveyForm,
-            )
+            if (surveyForm.isAfterDeadline()) {
+                SurveyFormItemCard(
+                    surveyForm = surveyForm,
+                    selectedSurveyForm = selectedSurveyForm,
+                )
+            }
         }
     }
 }
@@ -151,7 +153,7 @@ private fun SurveyFormItemCard(
         ),
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { selectedSurveyForm(surveyForm.eventId) },
+            .clickable { selectedSurveyForm(surveyForm.surveyFormId) },
     ) {
         Column(
             verticalArrangement = Arrangement.spacedBy(16.dp),