강의 수강 신청

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/exception/AlreadySignedUpLectureException.kt

@@ -0,0 +1,8 @@
+package team.msg.domain.lecture.exception
+
+import team.msg.domain.lecture.exception.constant.LectureErrorCode
+import team.msg.global.error.exception.BitgouelException
+
+class AlreadySignedUpLectureException (
+    message: String
+) : BitgouelException(message, LectureErrorCode.ALREADY_SIGNED_UP_LECTURE.status)

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/exception/NotAvailableSignUpDateException.kt

@@ -0,0 +1,8 @@
+package team.msg.domain.lecture.exception
+
+import team.msg.domain.lecture.exception.constant.LectureErrorCode
+import team.msg.global.error.exception.BitgouelException
+
+class NotAvailableSignUpDateException (
+    message: String
+) : BitgouelException(message, LectureErrorCode.NOT_AVAILABLE_SIGN_UP_DATE.status)

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/exception/OverMaxRegisteredUserException.kt

@@ -0,0 +1,8 @@
+package team.msg.domain.lecture.exception
+
+import team.msg.domain.lecture.exception.constant.LectureErrorCode
+import team.msg.global.error.exception.BitgouelException
+
+class OverMaxRegisteredUserException(
+    message: String
+) : BitgouelException(message, LectureErrorCode.OVER_MAX_REGISTERED_USER.status)

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/exception/UnApprovedLectureException.kt

@@ -0,0 +1,8 @@
+package team.msg.domain.lecture.exception
+
+import team.msg.domain.lecture.exception.constant.LectureErrorCode
+import team.msg.global.error.exception.BitgouelException
+
+class UnApprovedLectureException(
+    message: String
+) : BitgouelException(message, LectureErrorCode.UNAPPROVED_LECTURE.status)

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/exception/constant/LectureErrorCode.kt

@@ -4,6 +4,12 @@ enum class LectureErrorCode(
     val status: Int
 ){
     INVALID_LECTURE_TYPE(400),
+
     LECTURE_NOT_FOUND(404),
-    ALREADY_APPROVED_LECTURE(409)
-}
+
+    ALREADY_APPROVED_LECTURE(409),
+    ALREADY_SIGNED_UP_LECTURE(409),
+    UNAPPROVED_LECTURE(409),
+    OVER_MAX_REGISTERED_USER(409),
+    NOT_AVAILABLE_SIGN_UP_DATE(409)
+}

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/presentation/LectureController.kt

@@ -28,6 +28,12 @@ class LectureController(
         return ResponseEntity.status(HttpStatus.CREATED).build()
     }
 
+    @PostMapping("/{id}")
+    fun signUpLecture(@PathVariable id: UUID): ResponseEntity<Void> {
+        lectureService.signUpLecture(id)
+        return ResponseEntity.noContent().build()
+    }
+
     @PatchMapping("/{id}/approve")
     fun approveLecture(@PathVariable id: UUID): ResponseEntity<Void> {
         lectureService.approveLecture(id)

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/presentation/data/web/CreateLectureWebRequest.kt

@@ -20,17 +20,17 @@ data class CreateLectureWebRequest(
 
     @field:NotNull
     @FutureOrPresent
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:s")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
     val startDate: LocalDateTime,
 
     @field:NotNull
     @Future
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:s")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
     val endDate: LocalDateTime,
 
     @field:NotNull
     @Future
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:s")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
     val completeDate: LocalDateTime,
 
     @field:NotNull
@@ -44,4 +44,4 @@ data class CreateLectureWebRequest(
     @field:NotNull
     @field:Min(1)
     val maxRegisteredUser: Int
-)
+)

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/service/LectureService.kt

@@ -5,6 +5,7 @@ import java.util.UUID
 
 interface LectureService {
     fun createLecture(request: CreateLectureRequest)
+    fun signUpLecture(id: UUID)
     fun approveLecture(id: UUID)
     fun rejectLecture(id: UUID)
 }

bitgouel-api/src/main/kotlin/team/msg/domain/lecture/service/LectureServiceImpl.kt

@@ -7,16 +7,27 @@ import team.msg.common.enum.ApproveStatus
 import team.msg.common.util.UserUtil
 import team.msg.domain.lecture.enum.LectureType
 import team.msg.domain.lecture.exception.AlreadyApprovedLectureException
+import team.msg.domain.lecture.exception.AlreadySignedUpLectureException
 import team.msg.domain.lecture.exception.InvalidLectureTypeException
 import team.msg.domain.lecture.exception.LectureNotFoundException
+import team.msg.domain.lecture.exception.NotAvailableSignUpDateException
+import team.msg.domain.lecture.exception.OverMaxRegisteredUserException
+import team.msg.domain.lecture.exception.UnApprovedLectureException
 import team.msg.domain.lecture.model.Lecture
+import team.msg.domain.lecture.model.RegisteredLecture
 import team.msg.domain.lecture.presentation.data.request.CreateLectureRequest
 import team.msg.domain.lecture.repository.LectureRepository
+import team.msg.domain.lecture.repository.RegisteredLectureRepository
+import team.msg.domain.student.exception.StudentNotFoundException
+import team.msg.domain.student.repository.StudentRepository
+import java.time.LocalDateTime
 import java.util.*
 
 @Service
 class LectureServiceImpl(
     private val lectureRepository: LectureRepository,
+    private val registeredLectureRepository: RegisteredLectureRepository,
+    private val studentRepository: StudentRepository,
     private val userUtil: UserUtil
 ) : LectureService{
 
@@ -51,9 +62,50 @@ class LectureServiceImpl(
         lectureRepository.save(lecture)
     }
 
+    /**
+     * 강의에 대해 수강신청하는 비지니스 로직입니다.
+     * @param 수강신청을 하기 위한 강의 id
+     */
+    @Transactional(rollbackFor = [Exception::class])
+    override fun signUpLecture(id: UUID) {
+        val user = userUtil.queryCurrentUser()
+
+        val student = studentRepository.findByIdOrNull(user.id)
+            ?: throw StudentNotFoundException("학생을 찾을 수 없습니다. info : [ userId = ${user.id}, username = ${user.name} ]")
+
+        val lecture = queryLecture(id)
+
+        if(lecture.approveStatus == ApproveStatus.PENDING)
+            throw UnApprovedLectureException("아직 승인되지 않은 강의입니다. info : [ lectureId = ${lecture.id} ]")
+
+        if(lecture.startDate.isBefore(LocalDateTime.now()))
+            throw NotAvailableSignUpDateException("이른 강의 신청입니다. info : [ lectureStartDate = ${lecture.startDate}, currentDate = ${LocalDateTime.now()} ]")
+
+        if(lecture.endDate.isAfter(LocalDateTime.now()))
+            throw NotAvailableSignUpDateException("늦은 강의 신청입니다. info : [ lectureEndDate = ${lecture.endDate}, currentDate = ${LocalDateTime.now()} ]")
+
+        if(registeredLectureRepository.existsByStudentAndLecture(student, lecture))
+            throw AlreadySignedUpLectureException("이미 신청한 강의입니다. info : [ lectureId = ${lecture.id}, studentId = ${student.id} ]")
+
+        val currentSignUpLectureStudent = registeredLectureRepository.findAllByLecture(lecture).size
+
+        if(lecture.maxRegisteredUser == currentSignUpLectureStudent)
+            throw OverMaxRegisteredUserException("수강 인원이 가득 찼습니다. info : [ maxRegisteredUser = ${lecture.maxRegisteredUser}, currentSignUpLectureStudent = $currentSignUpLectureStudent ]")
+
+        val registeredLecture = RegisteredLecture(
+            id = UUID.randomUUID(),
+            student = student,
+            lecture = lecture,
+            completeDate = lecture.completeDate
+        )
+
+        registeredLectureRepository.save(registeredLecture)
+
+    }
+
     /**
      * 강의 개설 신청을 수락하는 비지니스 로직입니다.
-     * @param 승인할 강의의 id
+     * @param 개설을 수락할 대기 상태의 강의 id
      */
     @Transactional(rollbackFor = [Exception::class])
     override fun approveLecture(id: UUID) {
@@ -72,16 +124,17 @@ class LectureServiceImpl(
             content = lecture.content,
             lectureType = lecture.lectureType,
             credit = lecture.credit,
-            instructor = lecture.user.name,
-            maxRegisteredUser = lecture.maxRegisteredUser
+            instructor = lecture.instructor,
+            maxRegisteredUser = lecture.maxRegisteredUser,
+            approveStatus = ApproveStatus.APPROVED
         )
 
         lectureRepository.save(approveLecture)
     }
 
     /**
      * 강의 개설 신청을 거절하는 비지니스 로직입니다.
-     * @param 거절할 강의의 id
+     * @param 개설을 거절할 대기 상태의 강의 id
      */
     @Transactional(rollbackFor = [Exception::class])
     override fun rejectLecture(id: UUID) {

bitgouel-api/src/main/kotlin/team/msg/global/security/SecurityConfig.kt

@@ -64,8 +64,9 @@ class SecurityConfig(
 
             // lecture
             .mvcMatchers(HttpMethod.POST, "/lecture").hasAnyRole(PROFESSOR, COMPANY_INSTRUCTOR, GOVERNMENT)
-            .mvcMatchers(HttpMethod.PATCH, "/lecture/{id}/approve").hasAnyRole(ADMIN)
-            .mvcMatchers(HttpMethod.DELETE, "/lecture/{id}/reject").hasAnyRole(ADMIN)
+            .mvcMatchers(HttpMethod.POST, "/lecture/{id}").hasRole(STUDENT)
+            .mvcMatchers(HttpMethod.PATCH, "/lecture/{id}/approve").hasRole(ADMIN)
+            .mvcMatchers(HttpMethod.DELETE, "/lecture/{id}/reject").hasRole(ADMIN)
 
             // faq
             .mvcMatchers(HttpMethod.POST, "/faq").hasRole(ADMIN)

bitgouel-domain/src/main/kotlin/team/msg/domain/lecture/repository/RegisteredLectureRepository.kt

@@ -1,10 +1,13 @@
 package team.msg.domain.lecture.repository
 
 import org.springframework.data.repository.CrudRepository
+import team.msg.domain.lecture.model.Lecture
 import team.msg.domain.lecture.model.RegisteredLecture
 import team.msg.domain.student.model.Student
 import java.util.UUID
 
 interface RegisteredLectureRepository : CrudRepository<RegisteredLecture,UUID> {
     fun findAllByStudent(student: Student): List<RegisteredLecture>
+    fun findAllByLecture(lecture: Lecture): List<RegisteredLecture>
+    fun existsByStudentAndLecture(student: Student, lecture: Lecture): Boolean
 }