Feature/jaino/#93

app/src/main/java/com/wap/wapp/MainActivity.kt

@@ -26,7 +26,7 @@ import com.wap.wapp.core.domain.usecase.auth.SignInUseCase
 import com.wap.wapp.feature.auth.signin.navigation.signInNavigationRoute
 import com.wap.wapp.feature.auth.signup.navigation.signUpNavigationRoute
 import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationNavigationRoute
-import com.wap.wapp.feature.management.survey.registration.navigation.surveyRegistrationNavigationRoute
+import com.wap.wapp.feature.management.survey.navigation.ManagementSurveyRoute
 import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavigationRoute
 import com.wap.wapp.feature.splash.navigation.splashNavigationRoute
 import com.wap.wapp.navigation.TopLevelDestination
@@ -105,7 +105,7 @@ private fun handleBottomBarState(
     signUpNavigationRoute -> setBottomBarState(false)
     splashNavigationRoute -> setBottomBarState(false)
     profileSettingNavigationRoute -> setBottomBarState(false)
-    surveyRegistrationNavigationRoute -> setBottomBarState(false)
+    ManagementSurveyRoute.surveyFormRegistrationRoute -> setBottomBarState(false)
     eventRegistrationNavigationRoute -> setBottomBarState(false)
     else -> setBottomBarState(true)
 }

app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt

@@ -18,8 +18,9 @@ import com.wap.wapp.feature.management.navigation.managementScreen
 import com.wap.wapp.feature.management.navigation.navigateToManagement
 import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationScreen
 import com.wap.wapp.feature.management.registration.event.navigation.navigateToEventRegistration
-import com.wap.wapp.feature.management.survey.registration.navigation.navigateToSurveyRegistration
-import com.wap.wapp.feature.management.survey.registration.navigation.surveyRegistrationScreen
+import com.wap.wapp.feature.management.survey.navigation.navigateToSurveyFormEdit
+import com.wap.wapp.feature.management.survey.navigation.navigateToSurveyFormRegistration
+import com.wap.wapp.feature.management.survey.navigation.managementSurveyNavGraph
 import com.wap.wapp.feature.notice.navigation.navigateToNotice
 import com.wap.wapp.feature.notice.navigation.noticeScreen
 import com.wap.wapp.feature.profile.navigation.navigateToProfile
@@ -30,7 +31,6 @@ import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavi
 import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingScreen
 import com.wap.wapp.feature.splash.navigation.splashNavigationRoute
 import com.wap.wapp.feature.splash.navigation.splashScreen
-import com.wap.wapp.feature.survey.check.navigation.navigateToSurveyCheck
 import com.wap.wapp.feature.survey.check.navigation.surveyCheckScreen
 import com.wap.wapp.feature.survey.navigation.navigateToSurvey
 import com.wap.wapp.feature.survey.navigation.navigateToSurveyAnswer
@@ -75,7 +75,7 @@ fun WappNavHost(
         surveyCheckScreen(
             navigateToManagement = navController::navigateToManagement,
         )
-        surveyRegistrationScreen(
+        managementSurveyNavGraph(
             navigateToManagement = navController::navigateToManagement,
         )
         eventRegistrationScreen(
@@ -104,10 +104,10 @@ fun WappNavHost(
             },
         )
         managementScreen(
-            navigateToSurveyRegistration = navController::navigateToSurveyRegistration,
+            navigateToSurveyRegistration = navController::navigateToSurveyFormRegistration,
             navigateToEventRegistration = navController::navigateToEventRegistration,
             navigateToEventEdit = navController::navigateToEventEdit,
-            navigateToSurveyCheck = navController::navigateToSurveyCheck,
+            navigateToSurveyFormEdit = navController::navigateToSurveyFormEdit,
         )
     }
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/survey/SurveyFormRepository.kt

@@ -1,11 +1,21 @@
 package com.wap.wapp.core.data.repository.survey
 
 import com.wap.wapp.core.model.survey.SurveyForm
+import com.wap.wapp.core.model.survey.SurveyQuestion
+import java.time.LocalDateTime
 
 interface SurveyFormRepository {
-    suspend fun getSurveyForm(eventId: String): Result<SurveyForm>
+    suspend fun getSurveyForm(surveyFormId: String): Result<SurveyForm>
 
     suspend fun getSurveyFormList(): Result<List<SurveyForm>>
 
-    suspend fun postSurveyForm(surveyForm: SurveyForm): Result<Unit>
+    suspend fun postSurveyForm(
+        eventId: String,
+        title: String,
+        content: String,
+        surveyQuestionList: List<SurveyQuestion>,
+        deadline: LocalDateTime,
+    ): Result<Unit>
+
+    suspend fun updateSurveyForm(surveyForm: SurveyForm): Result<Unit>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/survey/SurveyFormRepositoryImpl.kt

@@ -2,15 +2,17 @@ package com.wap.wapp.core.data.repository.survey
 
 import com.wap.wapp.core.data.utils.toISOLocalDateTimeString
 import com.wap.wapp.core.model.survey.SurveyForm
+import com.wap.wapp.core.model.survey.SurveyQuestion
 import com.wap.wapp.core.network.model.survey.form.SurveyFormRequest
 import com.wap.wapp.core.network.source.survey.SurveyFormDataSource
+import java.time.LocalDateTime
 import javax.inject.Inject
 
 class SurveyFormRepositoryImpl @Inject constructor(
     private val surveyFormDataSource: SurveyFormDataSource,
 ) : SurveyFormRepository {
-    override suspend fun getSurveyForm(eventId: String): Result<SurveyForm> =
-        surveyFormDataSource.getSurveyForm(eventId).mapCatching { surveyFormResponse ->
+    override suspend fun getSurveyForm(surveyFormId: String): Result<SurveyForm> =
+        surveyFormDataSource.getSurveyForm(surveyFormId).mapCatching { surveyFormResponse ->
             surveyFormResponse.toDomain()
         }
 
@@ -21,9 +23,24 @@ class SurveyFormRepositoryImpl @Inject constructor(
             }
         }
 
-    override suspend fun postSurveyForm(surveyForm: SurveyForm): Result<Unit> =
-        surveyFormDataSource.postSurveyForm(
+    override suspend fun postSurveyForm(
+        eventId: String,
+        title: String,
+        content: String,
+        surveyQuestionList: List<SurveyQuestion>,
+        deadline: LocalDateTime,
+    ): Result<Unit> = surveyFormDataSource.postSurveyForm(
+        eventId = eventId,
+        title = title,
+        content = content,
+        surveyQuestionList = surveyQuestionList,
+        deadline = deadline.toISOLocalDateTimeString(),
+    )
+
+    override suspend fun updateSurveyForm(surveyForm: SurveyForm): Result<Unit> =
+        surveyFormDataSource.updateSurveyForm(
             surveyFormRequest = SurveyFormRequest(
+                surveyFormId = surveyForm.surveyFormId,
                 eventId = surveyForm.eventId,
                 title = surveyForm.title,
                 content = surveyForm.content,

core/data/src/main/java/com/wap/wapp/core/data/repository/survey/SurveyRepository.kt

@@ -10,6 +10,7 @@ interface SurveyRepository {
     suspend fun getSurvey(surveyId: String): Result<Survey>
 
     suspend fun postSurvey(
+        surveyFormId: String,
         eventId: String,
         userId: String,
         title: String,
@@ -18,5 +19,5 @@ interface SurveyRepository {
         surveyedAt: LocalDateTime,
     ): Result<Unit>
 
-    suspend fun isSubmittedSurvey(eventId: String, userId: String): Result<Boolean>
+    suspend fun isSubmittedSurvey(surveyFormId: String, userId: String): Result<Boolean>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/survey/SurveyRepositoryImpl.kt

@@ -43,13 +43,15 @@ class SurveyRepositoryImpl @Inject constructor(
         }
 
     override suspend fun postSurvey(
+        surveyFormId: String,
         eventId: String,
         userId: String,
         title: String,
         content: String,
         surveyAnswerList: List<SurveyAnswer>,
         surveyedAt: LocalDateTime,
     ): Result<Unit> = surveyDataSource.postSurvey(
+        surveyFormId = surveyFormId,
         eventId = eventId,
         userId = userId,
         title = title,
@@ -58,8 +60,8 @@ class SurveyRepositoryImpl @Inject constructor(
         surveyedAt = surveyedAt.toISOLocalDateTimeString(),
     )
 
-    override suspend fun isSubmittedSurvey(eventId: String, userId: String): Result<Boolean> =
-        surveyDataSource.isSubmittedSurvey(eventId, userId)
+    override suspend fun isSubmittedSurvey(surveyFormId: String, userId: String): Result<Boolean> =
+        surveyDataSource.isSubmittedSurvey(surveyFormId, userId)
 
     private val noticeNameResponse: Result<String> = Result.success("notice datasource dummy data")
 

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/GetSurveyFormUseCase.kt

@@ -6,5 +6,6 @@ import javax.inject.Inject
 class GetSurveyFormUseCase @Inject constructor(
     private val surveyFormRepository: SurveyFormRepository,
 ) {
-    suspend operator fun invoke(eventId: String) = surveyFormRepository.getSurveyForm(eventId)
+    suspend operator fun invoke(surveyFormId: String) =
+        surveyFormRepository.getSurveyForm(surveyFormId)
 }

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/IsSubmittedSurveyUseCase.kt

@@ -8,9 +8,12 @@ class IsSubmittedSurveyUseCase @Inject constructor(
     private val userRepository: UserRepository,
     private val surveyRepository: SurveyRepository,
 ) {
-    suspend operator fun invoke(eventId: String): Result<Boolean> = runCatching {
+    suspend operator fun invoke(surveyFormId: String): Result<Boolean> = runCatching {
         val userId = userRepository.getUserId().getOrThrow()
 
-        surveyRepository.isSubmittedSurvey(userId = userId, eventId = eventId).getOrThrow()
+        surveyRepository.isSubmittedSurvey(
+            userId = userId,
+            surveyFormId = surveyFormId,
+        ).getOrThrow()
     }
 }

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/RegisterSurveyUseCase.kt → core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/PostSurveyFormUseCase.kt

@@ -2,14 +2,13 @@ package com.wap.wapp.core.domain.usecase.survey
 
 import com.wap.wapp.core.data.repository.survey.SurveyFormRepository
 import com.wap.wapp.core.model.event.Event
-import com.wap.wapp.core.model.survey.SurveyForm
 import com.wap.wapp.core.model.survey.SurveyQuestion
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
 import javax.inject.Inject
 
-class RegisterSurveyUseCase @Inject constructor(
+class PostSurveyFormUseCase @Inject constructor(
     private val surveyFormRepository: SurveyFormRepository,
 ) {
     suspend operator fun invoke(
@@ -21,13 +20,11 @@ class RegisterSurveyUseCase @Inject constructor(
         deadlineTime: LocalTime,
     ): Result<Unit> = runCatching {
         surveyFormRepository.postSurveyForm(
-            SurveyForm(
-                eventId = event.eventId,
-                title = title,
-                content = content,
-                surveyQuestionList = surveyQuestionList,
-                deadline = LocalDateTime.of(deadlineDate, deadlineTime),
-            ),
+            eventId = event.eventId,
+            title = title,
+            content = content,
+            surveyQuestionList = surveyQuestionList,
+            deadline = LocalDateTime.of(deadlineDate, deadlineTime),
         )
     }
 }

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,

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/UpdateSurveyFormUseCase.kt

@@ -0,0 +1,13 @@
+package com.wap.wapp.core.domain.usecase.survey
+
+import com.wap.wapp.core.data.repository.survey.SurveyFormRepository
+import com.wap.wapp.core.model.survey.SurveyForm
+import javax.inject.Inject
+
+class UpdateSurveyFormUseCase @Inject constructor(
+    private val surveyFormRepository: SurveyFormRepository,
+) {
+    suspend operator fun invoke(surveyForm: SurveyForm): Result<Unit> = runCatching {
+        surveyFormRepository.updateSurveyForm(surveyForm)
+    }
+}

core/model/src/main/java/com/wap/wapp/core/model/survey/Survey.kt

@@ -8,6 +8,7 @@ import java.time.LocalDateTime
 
 data class Survey(
     val surveyId: String,
+    val surveyFormId: String,
     val eventName: String,
     val userName: String,
     val title: String,

core/model/src/main/java/com/wap/wapp/core/model/survey/SurveyForm.kt

@@ -7,6 +7,7 @@ import java.time.format.DateTimeFormatter
 
 // 운영진이 등록하는 설문 모델
 data class SurveyForm(
+    val surveyFormId: String,
     val eventId: String,
     val title: String,
     val content: String,
@@ -17,6 +18,7 @@ data class SurveyForm(
         "",
         "",
         "",
+        "",
         emptyList(),
         LocalDateTime.MIN,
     )

core/network/src/main/java/com/wap/wapp/core/network/model/survey/SurveyRequest.kt

@@ -4,6 +4,7 @@ import com.wap.wapp.core.model.survey.SurveyAnswer
 
 data class SurveyRequest(
     val surveyId: String,
+    val surveyFormId: String,
     val eventId: String,
     val userId: String,
     val title: String,

core/network/src/main/java/com/wap/wapp/core/network/model/survey/SurveyResponse.kt

@@ -5,6 +5,7 @@ import com.wap.wapp.core.network.utils.toISOLocalDateTime
 
 data class SurveyResponse(
     val surveyId: String,
+    val surveyFormId: String,
     val eventId: String,
     val userId: String,
     val title: String,
@@ -18,12 +19,14 @@ data class SurveyResponse(
         "",
         "",
         "",
+        "",
         emptyList<SurveyAnswerResponse>(),
         "",
     )
 
     fun toDomain(eventName: String, userName: String): Survey = Survey(
         surveyId = surveyId,
+        surveyFormId = surveyFormId,
         eventName = eventName,
         userName = userName,
         title = this.title,

core/network/src/main/java/com/wap/wapp/core/network/model/survey/form/SurveyFormRequest.kt

@@ -3,6 +3,7 @@ package com.wap.wapp.core.network.model.survey.form
 import com.wap.wapp.core.model.survey.SurveyQuestion
 
 data class SurveyFormRequest(
+    val surveyFormId: String,
     val eventId: String,
     val title: String,
     val content: String,
@@ -13,6 +14,7 @@ data class SurveyFormRequest(
         "",
         "",
         "",
+        "",
         emptyList(),
         "",
     )

core/network/src/main/java/com/wap/wapp/core/network/model/survey/form/SurveyFormResponse.kt

@@ -4,6 +4,7 @@ import com.wap.wapp.core.model.survey.SurveyForm
 import com.wap.wapp.core.network.utils.toISOLocalDateTime
 
 data class SurveyFormResponse(
+    val surveyFormId: String,
     val eventId: String,
     val userId: String,
     val title: String,
@@ -16,11 +17,13 @@ data class SurveyFormResponse(
         "",
         "",
         "",
+        "",
         emptyList<SurveyQuestionResponse>(),
         "",
     )
 
     fun toDomain(): SurveyForm = SurveyForm(
+        surveyFormId = surveyFormId,
         eventId = eventId,
         title = title,
         content = content,

core/network/src/main/java/com/wap/wapp/core/network/source/survey/SurveyDataSource.kt

@@ -5,7 +5,7 @@ import com.wap.wapp.core.network.model.survey.SurveyResponse
 
 interface SurveyDataSource {
     suspend fun isSubmittedSurvey(
-        eventId: String,
+        surveyFormId: String,
         userId: String,
     ): Result<Boolean>
 
@@ -14,6 +14,7 @@ interface SurveyDataSource {
     suspend fun getSurvey(surveyId: String): Result<SurveyResponse>
 
     suspend fun postSurvey(
+        surveyFormId: String,
         eventId: String,
         userId: String,
         title: String,