135 user accept api

src/main/kotlin/com/msg/gauth/domain/user/User.kt

@@ -4,6 +4,7 @@ import com.msg.gauth.domain.user.enums.Gender
 import com.msg.gauth.domain.user.enums.UserRole
 import com.msg.gauth.domain.user.enums.UserState
 import com.msg.gauth.domain.user.presentation.dto.request.AcceptStudentReqDto
+import com.msg.gauth.domain.user.presentation.dto.request.AcceptUserReqDto
 import com.msg.gauth.global.entity.BaseIdEntity
 import javax.persistence.*
 import javax.validation.constraints.Size
@@ -110,6 +111,23 @@ class User(
         return user
     }
 
+    fun update(acceptUserReqDto: AcceptUserReqDto): User{
+        val user = User(
+            name = acceptUserReqDto.name,
+            email = this.email,
+            grade = acceptUserReqDto.grade,
+            classNum = acceptUserReqDto.classNum,
+            num = acceptUserReqDto.num,
+            gender = acceptUserReqDto.gender,
+            password = this.password,
+            roles = this.roles,
+            state = UserState.CREATED,
+            profileUrl = this.profileUrl
+        )
+        user.id = this.id
+        return user
+    }
+
     fun updateProfile(profileUrl: String): User{
         val user = User(
             name = this.name,

src/main/kotlin/com/msg/gauth/domain/user/presentation/UserController.kt

@@ -3,6 +3,7 @@ package com.msg.gauth.domain.user.presentation
 import com.msg.gauth.domain.user.presentation.dto.response.GetMyRolesResDto
 import com.msg.gauth.domain.user.presentation.dto.request.AcceptStudentReqDto
 import com.msg.gauth.domain.user.presentation.dto.request.AcceptTeacherReqDto
+import com.msg.gauth.domain.user.presentation.dto.request.AcceptUserReqDto
 import com.msg.gauth.domain.user.presentation.dto.request.PasswordChangeReqDto
 import com.msg.gauth.domain.user.presentation.dto.response.MyProfileResDto
 import com.msg.gauth.domain.user.presentation.dto.response.SingleAcceptedUserResDto
@@ -24,7 +25,8 @@ class UserController(
     private val acceptTeacherSignUpService: AcceptTeacherSignUpService,
     private val getPendingUsersService: GetPendingUsersService,
     private val acceptStudentSignUpService: AcceptStudentSignUpService,
-    private val getMyRolesService: GetMyRolesService
+    private val getMyRolesService: GetMyRolesService,
+    private val acceptUserSignUpService: AcceptUserSignUpService
 ) {
     @GetMapping("/role")
     fun getMyRoles(): ResponseEntity<GetMyRolesResDto> {
@@ -66,6 +68,12 @@ class UserController(
         return ResponseEntity.ok(result)
     }
 
+    @PatchMapping("/accept-user")
+    fun acceptUser(@RequestBody @Valid acceptUserReqDto: AcceptUserReqDto): ResponseEntity<Void>{
+        acceptUserSignUpService.execute(acceptUserReqDto)
+        return ResponseEntity.noContent().build()
+    }
+
     @Deprecated("This api is deprecated. Use acceptUser instead")
     @PatchMapping("/accept-teacher")
     fun acceptTeacher(@RequestBody @Valid acceptTeacherReqDto: AcceptTeacherReqDto): ResponseEntity<Void>{

src/main/kotlin/com/msg/gauth/domain/user/presentation/dto/request/AcceptTeacherReqDto.kt

@@ -1,9 +1,11 @@
 package com.msg.gauth.domain.user.presentation.dto.request
 
 import com.msg.gauth.domain.user.enums.Gender
+import javax.validation.constraints.NotBlank
 
 data class AcceptTeacherReqDto(
     val id: Long,
+    @field:NotBlank
     val name: String,
     val gender: Gender
 )

src/main/kotlin/com/msg/gauth/domain/user/presentation/dto/request/AcceptUserReqDto.kt

@@ -0,0 +1,14 @@
+package com.msg.gauth.domain.user.presentation.dto.request
+
+import com.msg.gauth.domain.user.enums.Gender
+import com.msg.gauth.domain.user.enums.UserRole
+
+data class AcceptUserReqDto(
+    val id: Long,
+    val userRole: UserRole,
+    val name: String,
+    val gender: Gender,
+    val grade: Int?,
+    val classNum: Int?,
+    val num: Int?
+)

src/main/kotlin/com/msg/gauth/domain/user/services/AcceptUserSignUpService.kt

@@ -0,0 +1,35 @@
+package com.msg.gauth.domain.user.services
+
+import com.msg.gauth.domain.user.enums.UserRole
+import com.msg.gauth.domain.user.enums.UserState
+import com.msg.gauth.domain.user.exception.UserNotFoundException
+import com.msg.gauth.domain.user.presentation.dto.request.AcceptUserReqDto
+import com.msg.gauth.domain.user.repository.UserRepository
+import com.msg.gauth.global.annotation.service.TransactionalService
+import com.msg.gauth.global.exception.exceptions.BadRequestException
+
+@TransactionalService
+class AcceptUserSignUpService(
+    private val userRepository: UserRepository
+) {
+
+    private fun getUser(id: Long) =
+        userRepository.findByIdAndStateAndRoles(id, UserState.PENDING, mutableListOf(UserRole.ROLE_STUDENT))
+            ?: throw UserNotFoundException()
+
+    private fun acceptStudent(acceptUserReqDto: AcceptUserReqDto) =
+        userRepository.save(getUser(acceptUserReqDto.id).update(acceptUserReqDto))
+
+
+    private fun acceptTeacher(acceptUserReqDto: AcceptUserReqDto) =
+        userRepository.save(getUser(acceptUserReqDto.id).update(acceptUserReqDto.name, acceptUserReqDto.gender))
+
+    fun execute(acceptUserReqDto: AcceptUserReqDto) =
+        when(acceptUserReqDto.userRole){
+            UserRole.ROLE_STUDENT -> acceptStudent(acceptUserReqDto)
+            UserRole.ROLE_TEACHER -> acceptTeacher(acceptUserReqDto)
+            else -> throw BadRequestException()
+        }
+
+
+}

src/main/kotlin/com/msg/gauth/global/exception/ErrorCode.kt

@@ -32,7 +32,5 @@ enum class ErrorCode(
     MANY_REQUEST_EMAIL_AUTH("15분에 최대 3번 이메일 인증을 요청할 수 있습니다.", 429),
 
     MAIL_SEND_FAIL("메일을 보내는데 실패했습니다.", 500),
-    INTERNAL_SERVER_ERROR("서버 내부 에러", 500)
-
-    ;
+    INTERNAL_SERVER_ERROR("서버 내부 에러", 500);
 }

src/main/kotlin/com/msg/gauth/global/exception/exceptions/BadRequestException.kt

@@ -0,0 +1,5 @@
+package com.msg.gauth.global.exception.exceptions
+
+import com.msg.gauth.global.exception.ErrorCode
+
+class BadRequestException : BasicException(ErrorCode.BAD_REQUEST)

src/main/kotlin/com/msg/gauth/global/security/SecurityConfig.kt

@@ -75,6 +75,7 @@ class SecurityConfig(
             .antMatchers(HttpMethod.PATCH, "/user/accept-teacher").hasRole("ADMIN")
             .antMatchers(HttpMethod.GET, "/user/pending").hasRole("ADMIN")
             .antMatchers(HttpMethod.PATCH, "/user/accept-student").hasRole("ADMIN")
+            .antMatchers(HttpMethod.PATCH, "/user/accept-user").hasRole("ADMIN")
 
             .anyRequest().denyAll()
             .and()