Feature/jaino/#67

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

@@ -12,6 +12,7 @@ import com.wap.wapp.feature.auth.signin.navigation.navigateToSignIn
 import com.wap.wapp.feature.auth.signin.navigation.signInScreen
 import com.wap.wapp.feature.auth.signup.navigation.navigateToSignUp
 import com.wap.wapp.feature.auth.signup.navigation.signUpScreen
+import com.wap.wapp.feature.management.check.navigation.navigateToSurveyCheck
 import com.wap.wapp.feature.management.check.navigation.surveyCheckScreen
 import com.wap.wapp.feature.management.navigation.managementScreen
 import com.wap.wapp.feature.management.navigation.navigateToManagement
@@ -61,7 +62,7 @@ fun WappNavHost(
         )
         noticeScreen()
         surveyNavGraph(
-            navigateToSurvey = navController::navigateToSurvey ,
+            navigateToSurvey = navController::navigateToSurvey,
             navigateToSurveyAnswer = navController::navigateToSurveyAnswer,
         )
         surveyCheckScreen(
@@ -77,8 +78,9 @@ fun WappNavHost(
             navigateToProfileSetting = { navController.navigateToProfileSetting() },
         )
         managementScreen(
-            navigateToSurveyRegistration = { navController.navigateToSurveyRegistration() },
-            navigateToEventRegistration = { navController.navigateToEventRegistration() },
+            navigateToSurveyRegistration = navController::navigateToSurveyRegistration,
+            navigateToEventRegistration = navController::navigateToEventRegistration,
+            navigateToSurveyCheck = navController::navigateToSurveyCheck,
         )
     }
 }

core/data/src/main/java/com/wap/wapp/core/data/di/DataModule.kt

@@ -4,6 +4,8 @@ import com.wap.wapp.core.data.repository.event.EventRepository
 import com.wap.wapp.core.data.repository.event.EventRepositoryImpl
 import com.wap.wapp.core.data.repository.management.ManagementRepository
 import com.wap.wapp.core.data.repository.management.ManagementRepositoryImpl
+import com.wap.wapp.core.data.repository.survey.SurveyFormRepository
+import com.wap.wapp.core.data.repository.survey.SurveyFormRepositoryImpl
 import com.wap.wapp.core.data.repository.survey.SurveyRepository
 import com.wap.wapp.core.data.repository.survey.SurveyRepositoryImpl
 import com.wap.wapp.core.data.repository.user.UserRepository
@@ -35,6 +37,12 @@ abstract class DataModule {
         surveyRepositoryImpl: SurveyRepositoryImpl,
     ): SurveyRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindsSurveyFormRepository(
+        surveyFormRepositoryImpl: SurveyFormRepositoryImpl,
+    ): SurveyFormRepository
+
     @Binds
     @Singleton
     abstract fun bindsEventRepository(

core/data/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepository.kt

@@ -1,13 +1,9 @@
 package com.wap.wapp.core.data.repository.management
 
-import com.wap.wapp.core.model.survey.SurveyForm
-
 interface ManagementRepository {
     suspend fun getManager(userId: String): Result<Boolean>
 
     suspend fun postManager(userId: String): Result<Unit>
 
     suspend fun getManagementCode(code: String): Result<Boolean>
-
-    suspend fun postSurveyForm(surveyForm: SurveyForm): Result<Unit>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepositoryImpl.kt

@@ -1,9 +1,6 @@
 package com.wap.wapp.core.data.repository.management
 
-import com.wap.wapp.core.model.survey.SurveyForm
-import com.wap.wapp.core.network.model.management.SurveyFormRequest
 import com.wap.wapp.core.network.source.management.ManagementDataSource
-import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 
 class ManagementRepositoryImpl @Inject constructor(
@@ -20,17 +17,4 @@ class ManagementRepositoryImpl @Inject constructor(
     override suspend fun getManagementCode(code: String): Result<Boolean> {
         return managementDataSource.getManagementCode(code)
     }
-
-    override suspend fun postSurveyForm(surveyForm: SurveyForm): Result<Unit> {
-        return managementDataSource.postSurveyForm(
-            surveyFormRequest = SurveyFormRequest(
-                eventId = surveyForm.eventId,
-                title = surveyForm.title,
-                content = surveyForm.content,
-                surveyQuestionList = surveyForm.surveyQuestionList,
-                deadline = surveyForm.deadline.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
-            ),
-            eventId = surveyForm.eventId,
-        )
-    }
 }

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

@@ -0,0 +1,11 @@
+package com.wap.wapp.core.data.repository.survey
+
+import com.wap.wapp.core.model.survey.SurveyForm
+
+interface SurveyFormRepository {
+    suspend fun getSurveyForm(eventId: Int): Result<SurveyForm>
+
+    suspend fun getSurveyFormList(): Result<List<SurveyForm>>
+
+    suspend fun postSurveyForm(surveyForm: SurveyForm): Result<Unit>
+}

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

@@ -0,0 +1,37 @@
+package com.wap.wapp.core.data.repository.survey
+
+import com.wap.wapp.core.model.survey.SurveyForm
+import com.wap.wapp.core.network.model.survey.form.SurveyFormRequest
+import com.wap.wapp.core.network.source.survey.SurveyFormDataSource
+import java.time.format.DateTimeFormatter
+import javax.inject.Inject
+
+class SurveyFormRepositoryImpl @Inject constructor(
+    private val surveyFormDataSource: SurveyFormDataSource,
+) : SurveyFormRepository {
+    override suspend fun getSurveyForm(eventId: Int): Result<SurveyForm> {
+        return surveyFormDataSource.getSurveyForm(eventId).mapCatching { surveyFormResponse ->
+            surveyFormResponse.toDomain()
+        }
+    }
+
+    override suspend fun getSurveyFormList(): Result<List<SurveyForm>> {
+        return surveyFormDataSource.getSurveyFormList().mapCatching { surveyFormResponseList ->
+            surveyFormResponseList.map { surveyFormResponse ->
+                surveyFormResponse.toDomain()
+            }
+        }
+    }
+
+    override suspend fun postSurveyForm(surveyForm: SurveyForm): Result<Unit> {
+        return surveyFormDataSource.postSurveyForm(
+            surveyFormRequest = SurveyFormRequest(
+                eventId = surveyForm.eventId,
+                title = surveyForm.title,
+                content = surveyForm.content,
+                surveyQuestionList = surveyForm.surveyQuestionList,
+                deadline = surveyForm.deadline.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+            ),
+        )
+    }
+}

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

@@ -1,14 +1,22 @@
 package com.wap.wapp.core.data.repository.survey
 
 import com.wap.wapp.core.model.survey.Survey
-import com.wap.wapp.core.model.survey.SurveyForm
+import com.wap.wapp.core.model.survey.SurveyAnswer
+import java.time.LocalDateTime
 
 interface SurveyRepository {
     suspend fun getSurveyList(): Result<List<Survey>>
 
     suspend fun getSurvey(surveyId: String): Result<Survey>
 
-    suspend fun getSurveyFormList(): Result<List<SurveyForm>>
+    suspend fun postSurvey(
+        eventId: Int,
+        userId: String,
+        title: String,
+        content: String,
+        surveyAnswerList: List<SurveyAnswer>,
+        surveyedAt: LocalDateTime,
+    ): Result<Unit>
 
-    suspend fun getSurveyForm(eventId: Int): Result<SurveyForm>
+    suspend fun isSubmittedSurvey(eventId: Int, userId: String): Result<Boolean>
 }

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

@@ -1,9 +1,11 @@
 package com.wap.wapp.core.data.repository.survey
 
 import com.wap.wapp.core.model.survey.Survey
-import com.wap.wapp.core.model.survey.SurveyForm
+import com.wap.wapp.core.model.survey.SurveyAnswer
 import com.wap.wapp.core.network.source.survey.SurveyDataSource
 import com.wap.wapp.core.network.source.user.UserDataSource
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 
 class SurveyRepositoryImpl @Inject constructor(
@@ -42,22 +44,30 @@ class SurveyRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun postSurvey(
+        eventId: Int,
+        userId: String,
+        title: String,
+        content: String,
+        surveyAnswerList: List<SurveyAnswer>,
+        surveyedAt: LocalDateTime,
+    ): Result<Unit> {
+        return surveyDataSource.postSurvey(
+            eventId = eventId,
+            userId = userId,
+            title = title,
+            content = content,
+            surveyAnswerList = surveyAnswerList,
+            surveyedAt = surveyedAt.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+        )
+    }
+
+    override suspend fun isSubmittedSurvey(eventId: Int, userId: String): Result<Boolean> {
+        return surveyDataSource.isSubmittedSurvey(eventId, userId)
+    }
+
     private val noticeNameResponse: Result<String> = Result.success("notice datasource dummy data")
 
     // TODO 도메인 모델 구현을 위한 익스텐션, notice DataSource 구현 후 소거
     private fun String.toDomain(): String = this
-
-    override suspend fun getSurveyFormList(): Result<List<SurveyForm>> {
-        return surveyDataSource.getSurveyFormList().mapCatching { surveyFormResponseList ->
-            surveyFormResponseList.map { surveyFormResponse ->
-                surveyFormResponse.toDomain()
-            }
-        }
-    }
-
-    override suspend fun getSurveyForm(eventId: Int): Result<SurveyForm> {
-        return surveyDataSource.getSurveyForm(eventId).mapCatching { surveyFormResponse ->
-            surveyFormResponse.toDomain()
-        }
-    }
 }

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/management/RegisterSurveyUseCase.kt

@@ -1,6 +1,6 @@
 package com.wap.wapp.core.domain.usecase.management
 
-import com.wap.wapp.core.data.repository.management.ManagementRepository
+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
@@ -10,7 +10,7 @@ import java.time.LocalTime
 import javax.inject.Inject
 
 class RegisterSurveyUseCase @Inject constructor(
-    private val managementRepository: ManagementRepository,
+    private val surveyFormRepository: SurveyFormRepository,
 ) {
     suspend operator fun invoke(
         event: Event,
@@ -21,7 +21,7 @@ class RegisterSurveyUseCase @Inject constructor(
         deadlineTime: LocalTime,
     ): Result<Unit> {
         return runCatching {
-            managementRepository.postSurveyForm(
+            surveyFormRepository.postSurveyForm(
                 SurveyForm(
                     eventId = event.eventId,
                     title = title,

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

@@ -1,10 +1,10 @@
 package com.wap.wapp.core.domain.usecase.survey
 
-import com.wap.wapp.core.data.repository.survey.SurveyRepository
+import com.wap.wapp.core.data.repository.survey.SurveyFormRepository
 import javax.inject.Inject
 
 class GetSurveyFormListUseCase @Inject constructor(
-    private val surveyRepository: SurveyRepository,
+    private val surveyFormRepository: SurveyFormRepository,
 ) {
-    suspend operator fun invoke() = surveyRepository.getSurveyFormList()
+    suspend operator fun invoke() = surveyFormRepository.getSurveyFormList()
 }

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

@@ -1,10 +1,10 @@
 package com.wap.wapp.core.domain.usecase.survey
 
-import com.wap.wapp.core.data.repository.survey.SurveyRepository
+import com.wap.wapp.core.data.repository.survey.SurveyFormRepository
 import javax.inject.Inject
 
 class GetSurveyFormUseCase @Inject constructor(
-    private val surveyRepository: SurveyRepository,
+    private val surveyFormRepository: SurveyFormRepository,
 ) {
-    suspend operator fun invoke(eventId: Int) = surveyRepository.getSurveyForm(eventId)
+    suspend operator fun invoke(eventId: Int) = surveyFormRepository.getSurveyForm(eventId)
 }

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

@@ -0,0 +1,21 @@
+package com.wap.wapp.core.domain.usecase.survey
+
+import com.wap.wapp.core.data.repository.survey.SurveyRepository
+import com.wap.wapp.core.data.repository.user.UserRepository
+import javax.inject.Inject
+
+class IsSubmittedSurveyUseCase @Inject constructor(
+    private val userRepository: UserRepository,
+    private val surveyRepository: SurveyRepository,
+) {
+    suspend operator fun invoke(eventId: Int): Result<Boolean> {
+        return runCatching {
+            val userId = userRepository.getUserId().getOrThrow()
+
+            surveyRepository.isSubmittedSurvey(
+                userId = userId,
+                eventId = eventId,
+            ).getOrThrow()
+        }
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.wap.wapp.core.domain.usecase.survey
+
+import com.wap.wapp.core.data.repository.survey.SurveyRepository
+import com.wap.wapp.core.data.repository.user.UserRepository
+import com.wap.wapp.core.model.survey.SurveyAnswer
+import java.time.LocalDateTime
+import javax.inject.Inject
+
+class PostSurveyUseCase @Inject constructor(
+    private val userRepository: UserRepository,
+    private val surveyRepository: SurveyRepository,
+) {
+    suspend operator fun invoke(
+        eventId: Int,
+        title: String,
+        content: String,
+        surveyAnswerList: List<SurveyAnswer>,
+    ): Result<Unit> {
+        return runCatching {
+            val userId = userRepository.getUserId().getOrThrow()
+
+            surveyRepository.postSurvey(
+                userId = userId,
+                eventId = eventId,
+                title = title,
+                content = content,
+                surveyAnswerList = surveyAnswerList,
+                surveyedAt = LocalDateTime.now(),
+            )
+        }
+    }
+}

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

@@ -12,6 +12,6 @@ data class Survey(
     val userName: String,
     val title: String,
     val content: String,
-    val answerList: List<SurveyAnswer>,
+    val surveyAnswerList: List<SurveyAnswer>,
     val surveyedAt: LocalDateTime,
 )

core/network/src/main/java/com/wap/wapp/core/network/di/NetworkModule.kt

@@ -6,6 +6,8 @@ import com.wap.wapp.core.network.source.management.ManagementDataSource
 import com.wap.wapp.core.network.source.management.ManagementDataSourceImpl
 import com.wap.wapp.core.network.source.survey.SurveyDataSource
 import com.wap.wapp.core.network.source.survey.SurveyDataSourceImpl
+import com.wap.wapp.core.network.source.survey.SurveyFormDataSource
+import com.wap.wapp.core.network.source.survey.SurveyFormDataSourceImpl
 import com.wap.wapp.core.network.source.user.UserDataSource
 import com.wap.wapp.core.network.source.user.UserDataSourceImpl
 import dagger.Binds
@@ -36,6 +38,12 @@ abstract class NetworkModule {
         surveyDataSourceImpl: SurveyDataSourceImpl,
     ): SurveyDataSource
 
+    @Binds
+    @Singleton
+    abstract fun bindsSurveyFormDateSource(
+        surveyFormDataSourceImpl: SurveyFormDataSourceImpl,
+    ): SurveyFormDataSource
+
     @Binds
     @Singleton
     abstract fun bindsEventDataSource(

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

@@ -0,0 +1,13 @@
+package com.wap.wapp.core.network.model.survey
+
+import com.wap.wapp.core.model.survey.SurveyAnswer
+
+data class SurveyRequest(
+    val surveyId: String,
+    val eventId: Int,
+    val userId: String,
+    val title: String,
+    val content: String,
+    val surveyAnswerList: List<SurveyAnswer>,
+    val surveyedAt: String,
+)