Merge pull request #396 from GSM-MSG/feature/395-submit-form-active

학생 폼 제출할 때 재 활용성을 올립니다.
GSM-MSG · Jul 9, 2024 · 538ca1d · 538ca1d
2 parents ca298f7 + 7338056
commit 538ca1d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...e/src/main/kotlin/team/msg/sms/domain/authentication/usecase/SubmitUserFormDataUseCase.kt b/...e/src/main/kotlin/team/msg/sms/domain/authentication/usecase/SubmitUserFormDataUseCase.kt
@@ -6,6 +6,7 @@ import team.msg.sms.domain.authentication.model.FieldType
 import team.msg.sms.domain.authentication.model.MarkingBoard
 import team.msg.sms.domain.authentication.model.MarkingBoardType
 import team.msg.sms.domain.authentication.model.UserFormValue
+import team.msg.sms.domain.authentication.service.AuthenticationFormService
 import team.msg.sms.domain.authentication.service.AuthenticationSectionService
 import team.msg.sms.domain.authentication.service.MarkingBoardService
 import team.msg.sms.domain.authentication.service.UserFormValueService
@@ -15,11 +16,16 @@ import java.util.*
 
 @UseCase
 class SubmitUserFormDataUseCase(
+    private val authenticationFormService: AuthenticationFormService,
     private val userFormValueService: UserFormValueService,
     private val markingBoardService: MarkingBoardService,
     private val studentService: StudentService
 ) {
-    fun execute(submitDataList: List<SubmitUserFormRequestData>, authenticationFormId: UUID) {
+    fun execute(submitDataList: List<SubmitUserFormRequestData>, uuid: String?) {
+        val authenticationFormId =
+            if (uuid.equals(null)) authenticationFormService.getActiveAuthenticationFormId()
+            else UUID.fromString(uuid)
+
         val student = studentService.currentStudent()
         val userFormValues = submitDataList.flatMap { submitData ->
 

diff --git a/sms-infrastructure/src/main/kotlin/team/msg/sms/global/security/SecurityConfig.kt b/sms-infrastructure/src/main/kotlin/team/msg/sms/global/security/SecurityConfig.kt
@@ -100,7 +100,7 @@ class SecurityConfig(
             .antMatchers(HttpMethod.GET, "/authentication").hasAuthority(TEACHER)
             .antMatchers(HttpMethod.PUT, "/authentication/{uuid}").hasAuthority(STUDENT)
             .antMatchers(HttpMethod.POST, "/authentication").hasAuthority(STUDENT)
-            .antMatchers(HttpMethod.POST, "/authentication/submit/{uuid}").hasAuthority(STUDENT)
+            .antMatchers(HttpMethod.POST, "/authentication/submit").hasAuthority(STUDENT)
             .antMatchers(HttpMethod.POST, "/authentication/create").hasAuthority(TEACHER)
             .antMatchers(HttpMethod.POST, "/authentication/grading/{markingBoardId}").hasAuthority(TEACHER)
             .antMatchers(HttpMethod.PATCH, "/authentication/teacher/{uuid}/approve").hasAuthority(TEACHER)

diff --git a/...esentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt b/...esentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt
@@ -64,12 +64,12 @@ class AuthenticationWebAdapter(
         queryStudentAuthenticationFormDetailUseCase.execute(UUID.fromString(uuid))
             .let { ResponseEntity.ok(it.toResponse()) }
 
-    @PostMapping("/submit/{uuid}")
+    @PostMapping("/submit")
     fun submitUserFormValue(
         @RequestBody request: SubmitUserFormDataWebRequest,
-        @PathVariable uuid: String
+        @RequestParam(name = "uuid", required = false) uuid: String?
     ): ResponseEntity<Unit> =
-        submitUserFormDataUseCase.execute(request.contents, UUID.fromString(uuid))
+        submitUserFormDataUseCase.execute(request.contents, uuid)
             .let { ResponseEntity.ok().build() }
 
     @PostMapping("/create")