From 1386556629ee49401ea0039604485785a88d4733 Mon Sep 17 00:00:00 2001 From: huuuunee Date: Tue, 9 Jul 2024 23:18:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=ED=95=99=EC=83=9D=20=ED=8F=BC=20?= =?UTF-8?q?=EC=A0=9C=EC=B6=9C=EC=9D=84=20=ED=95=A0=EB=95=8C=20uuid?= =?UTF-8?q?=EA=B0=80=20=EC=A1=B4=EC=9E=AC=ED=95=A0=EC=8B=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=8F=BC=EC=9C=BC=EB=A1=9C=20=EC=A0=9C=EC=B6=9C?= =?UTF-8?q?=EC=9D=84=20=ED=95=98=EA=B3=A0=20=EC=97=86=EC=9D=84=EC=8B=9C=20?= =?UTF-8?q?active=EB=90=9C=20=ED=8F=BC=EC=9D=84=20=EC=A0=9C=EC=B6=9C?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=ED=95=A9=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authentication/usecase/SubmitUserFormDataUseCase.kt | 8 +++++++- .../kotlin/team/msg/sms/global/security/SecurityConfig.kt | 2 +- .../sms/domain/authentication/AuthenticationWebAdapter.kt | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sms-core/src/main/kotlin/team/msg/sms/domain/authentication/usecase/SubmitUserFormDataUseCase.kt b/sms-core/src/main/kotlin/team/msg/sms/domain/authentication/usecase/SubmitUserFormDataUseCase.kt index 14f07704..09df7b37 100644 --- a/sms-core/src/main/kotlin/team/msg/sms/domain/authentication/usecase/SubmitUserFormDataUseCase.kt +++ b/sms-core/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, authenticationFormId: UUID) { + fun execute(submitDataList: List, 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 index e3b479ff..c4f8a781 100644 --- 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/sms-presentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt b/sms-presentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt index 21ce1130..d804494c 100644 --- a/sms-presentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt +++ b/sms-presentation/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 uuid: String? ): ResponseEntity = - submitUserFormDataUseCase.execute(request.contents, UUID.fromString(uuid)) + submitUserFormDataUseCase.execute(request.contents, uuid) .let { ResponseEntity.ok().build() } @PostMapping("/create") From 7338056fe109d0fdfa74a81332e95486b0452716 Mon Sep 17 00:00:00 2001 From: huuuunee Date: Tue, 9 Jul 2024 23:52:39 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20uuid=20name=20=EC=A7=80=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20null=EB=A1=9C=20=EB=B0=9B=EC=9D=84=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=EA=B2=8C=20=ED=95=A9=EB=8B=88=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msg/sms/domain/authentication/AuthenticationWebAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sms-presentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt b/sms-presentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt index d804494c..0671b476 100644 --- a/sms-presentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt +++ b/sms-presentation/src/main/kotlin/team/msg/sms/domain/authentication/AuthenticationWebAdapter.kt @@ -67,7 +67,7 @@ class AuthenticationWebAdapter( @PostMapping("/submit") fun submitUserFormValue( @RequestBody request: SubmitUserFormDataWebRequest, - @RequestParam uuid: String? + @RequestParam(name = "uuid", required = false) uuid: String? ): ResponseEntity = submitUserFormDataUseCase.execute(request.contents, uuid) .let { ResponseEntity.ok().build() }