71 feat/student activity list

bitgouel-api/src/main/kotlin/team/msg/domain/student/presentation/StudentActivityController.kt

@@ -1,20 +1,23 @@
 package team.msg.domain.student.presentation
 
 import javax.validation.Valid
+import org.springframework.data.domain.Pageable
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PatchMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import team.msg.domain.student.mapper.StudentActivityMapper
+import team.msg.domain.student.presentation.data.response.AllStudentActivityResponse
 import team.msg.domain.student.presentation.data.web.CreateStudentActivityWebRequest
 import team.msg.domain.student.presentation.data.web.UpdateStudentActivityWebRequest
 import team.msg.domain.student.service.StudentActivityService
-import java.util.UUID
+import java.util.*
 
 @RestController
 @RequestMapping("/activity")
@@ -53,4 +56,10 @@ class StudentActivityController(
         studentActivityService.rejectStudentActivity(id)
         return ResponseEntity.status(HttpStatus.NO_CONTENT).build()
     }
+
+    @GetMapping
+    fun queryAllStudentActivity(pageable: Pageable): ResponseEntity<AllStudentActivityResponse> {
+        val response = studentActivityService.queryAllStudentActivity(pageable)
+        return ResponseEntity.status(HttpStatus.OK).body(response)
+    }
 }

bitgouel-api/src/main/kotlin/team/msg/domain/student/presentation/data/response/StudentActivityResponse.kt

@@ -0,0 +1,30 @@
+package team.msg.domain.student.presentation.data.response
+
+import org.springframework.data.domain.Page
+import team.msg.common.enum.ApproveStatus
+import team.msg.domain.student.model.StudentActivity
+import team.msg.domain.user.model.User
+import java.util.*
+
+data class StudentActivityResponse(
+    val activityId: UUID,
+    val title: String,
+    val userId: UUID,
+    val username: String,
+    val approveStatus: ApproveStatus
+) {
+    companion object {
+        fun of(studentActivity: StudentActivity, user: User) =
+            StudentActivityResponse(
+                activityId = studentActivity.id,
+                title = studentActivity.title,
+                userId = user.id,
+                username = user.name,
+                approveStatus = user.approveStatus
+            )
+    }
+}
+
+data class AllStudentActivityResponse(
+    val activities: Page<StudentActivityResponse>
+)

bitgouel-api/src/main/kotlin/team/msg/domain/student/presentation/data/web/CreateStudentActivityWebRequest.kt

@@ -1,22 +1,24 @@
 package team.msg.domain.student.presentation.data.web
 
-import javax.validation.constraints.Max
+import com.fasterxml.jackson.annotation.JsonFormat
 import javax.validation.constraints.NotBlank
 import javax.validation.constraints.NotNull
+import javax.validation.constraints.Size
 import java.time.LocalDateTime
 
 data class CreateStudentActivityWebRequest(
     @field:NotBlank
-    @field:Max(100)
+    @field:Size(max = 100)
     val title: String,
 
     @field:NotBlank
-    @field:Max(1000)
+    @field:Size(max = 1000)
     val content: String,
 
     @field:NotNull
     val credit: Int,
 
     @field:NotNull
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
     val activityDate: LocalDateTime
 )

bitgouel-api/src/main/kotlin/team/msg/domain/student/service/StudentActivityService.kt

@@ -1,13 +1,16 @@
 package team.msg.domain.student.service
 
+import org.springframework.data.domain.Pageable
 import team.msg.domain.student.presentation.data.request.CreateStudentActivityRequest
 import team.msg.domain.student.presentation.data.request.UpdateStudentActivityRequest
-import java.util.UUID
+import team.msg.domain.student.presentation.data.response.AllStudentActivityResponse
+import java.util.*
 
 interface StudentActivityService {
     fun createStudentActivity(request: CreateStudentActivityRequest)
     fun updateStudentActivity(id: UUID, request: UpdateStudentActivityRequest)
     fun deleteStudentActivity(id: UUID)
     fun rejectStudentActivity(id: UUID)
     fun approveStudentActivity(id: UUID)
+    fun queryAllStudentActivity(pageable: Pageable): AllStudentActivityResponse
 }

bitgouel-api/src/main/kotlin/team/msg/domain/student/service/StudentActivityServiceImpl.kt

@@ -1,6 +1,7 @@
 package team.msg.domain.student.service
 
 import org.springframework.context.ApplicationEventPublisher
+import org.springframework.data.domain.Pageable
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -13,11 +14,12 @@ import team.msg.domain.student.exception.StudentNotFoundException
 import team.msg.domain.student.model.StudentActivity
 import team.msg.domain.student.presentation.data.request.CreateStudentActivityRequest
 import team.msg.domain.student.presentation.data.request.UpdateStudentActivityRequest
+import team.msg.domain.student.presentation.data.response.AllStudentActivityResponse
+import team.msg.domain.student.presentation.data.response.StudentActivityResponse
 import team.msg.domain.student.repository.StudentActivityRepository
 import team.msg.domain.student.repository.StudentRepository
 import team.msg.domain.teacher.exception.TeacherNotFoundException
 import team.msg.domain.teacher.repository.TeacherRepository
-import team.msg.domain.user.enums.Authority
 import java.util.*
 
 @Service
@@ -160,4 +162,23 @@ class StudentActivityServiceImpl(
 
         studentActivityRepository.save(updatedStudentActivity)
     }
+
+    /**
+     * 학생활동을 전체 조회하는 비즈니스 로직
+     * @param 학생활동을 페이징 처리하기 위한 pageable
+     */
+    @Transactional(readOnly = true)
+    override fun queryAllStudentActivity(pageable: Pageable): AllStudentActivityResponse {
+        val user = userUtil.queryCurrentUser()
+
+        val studentActivities = studentActivityRepository.findAll(pageable)
+
+        val response = AllStudentActivityResponse(
+            studentActivities.map {
+                StudentActivityResponse.of(it, user)
+            }
+        )
+        return response
+    }
+
 }

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

@@ -61,6 +61,7 @@ class SecurityConfig(
             .mvcMatchers(HttpMethod.PATCH, "/activity/{id}/approve").hasRole(TEACHER)
             .mvcMatchers(HttpMethod.DELETE, "/activity/{id}").hasRole(STUDENT)
             .mvcMatchers(HttpMethod.DELETE, "/activity/{id}/reject").hasRole(TEACHER)
+            .mvcMatchers(HttpMethod.GET, "/activity").hasRole(ADMIN)
 
             // lecture
             .mvcMatchers(HttpMethod.POST, "/lecture").hasAnyRole(PROFESSOR, COMPANY_INSTRUCTOR, GOVERNMENT)

bitgouel-domain/src/main/kotlin/team/msg/domain/student/repository/StudentActivityRepository.kt

@@ -1,11 +1,15 @@
 package team.msg.domain.student.repository
 
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.data.jpa.repository.EntityGraph
 import org.springframework.data.jpa.repository.JpaRepository
 import team.msg.domain.student.model.Student
 import team.msg.domain.student.model.StudentActivity
-import team.msg.domain.teacher.model.Teacher
 import java.util.*
 
 interface StudentActivityRepository : JpaRepository<StudentActivity, UUID> {
     fun findAllByStudent(student: Student): List<StudentActivity>
+    @EntityGraph(attributePaths = ["student"])
+    override fun findAll(pageable: Pageable): Page<StudentActivity>
 }