Merge pull request #420 from GSM-MSG/develop

🔁 Master로 병합

Author: enbraining

sms-core/src/main/kotlin/team/msg/sms/domain/authentication/usecase/QueryStudentFormListUseCase.kt

@@ -6,15 +6,25 @@ import team.msg.sms.domain.authentication.model.MarkingBoardType
 import team.msg.sms.domain.authentication.service.AuthenticationFormService
 import team.msg.sms.domain.authentication.service.MarkingBoardService
 import team.msg.sms.domain.student.service.StudentService
+import team.msg.sms.domain.teacher.service.HomeroomTeacherService
+import team.msg.sms.domain.teacher.service.TeacherService
+import team.msg.sms.domain.user.service.UserService
 
 @ReadOnlyUseCase
 class QueryStudentFormListUseCase(
     private val studentService: StudentService,
+    private val userService: UserService,
     private val markingBoardService: MarkingBoardService,
-    private val authenticationFormService: AuthenticationFormService
+    private val authenticationFormService: AuthenticationFormService,
+    private val homeroomTeacherService: HomeroomTeacherService
 ) {
     fun execute(page: Int, size: Int, type: List<MarkingBoardType>?): UserBoardPageResponseData {
-        val studentIds = studentService.getStudentIds()
+        val currentUser = userService.getCurrentUser()
+        val currentHomeroomTeacher = homeroomTeacherService.getHomeroomTeacherByUserId(currentUser.id)
+
+        val grade = currentHomeroomTeacher.grade
+        val classNum = currentHomeroomTeacher.classNum
+        val studentIds = studentService.getStudentIdsByGradeAndClassNum(grade, classNum)
 
         val authenticationFormId = authenticationFormService.getActiveAuthenticationFormId()
 

sms-core/src/main/kotlin/team/msg/sms/domain/student/service/GetStudentService.kt

@@ -27,4 +27,6 @@ interface GetStudentService {
     fun currentStudent(): Student.StudentWithUserInfo
 
     fun getStudentIds(): List<UUID>
+
+    fun getStudentIdsByGradeAndClassNum(grade: Int, classNum: Int): List<UUID>
 }

sms-core/src/main/kotlin/team/msg/sms/domain/student/service/impl/GetStudentServiceImpl.kt

@@ -63,4 +63,7 @@ class GetStudentServiceImpl(
 
     override fun getStudentIds(): List<UUID> =
         studentPort.queryStudentIds()
+
+    override fun getStudentIdsByGradeAndClassNum(grade: Int, classNum: Int): List<UUID> =
+        studentPort.queryStudentIdsByGradeAndClassNum(grade, classNum)
 }

sms-core/src/main/kotlin/team/msg/sms/domain/student/spi/QueryStudentPort.kt

@@ -9,6 +9,7 @@ interface QueryStudentPort {
     fun queryStudentById(uuid: UUID): Student?
     fun queryStudentsWithPage(page: Int, size: Int): Student.StudentWithPageInfo
     fun queryStudentIds(): List<UUID>
+    fun queryStudentIdsByGradeAndClassNum(grade: Int, classNum: Int): List<UUID>
     fun queryStudentByUserId(userId: UUID): Student
     fun queryStudentUserInfoByUserId(userId: UUID): Student.StudentWithUserInfo?
     fun queryStudentByUser(user: User): Student

sms-persistence/src/main/kotlin/team/msg/sms/persistence/student/StudentPersistenceAdapter.kt

@@ -53,6 +53,16 @@ class StudentPersistenceAdapter(
             .fetch()
     }
 
+    override fun queryStudentIdsByGradeAndClassNum(grade: Int, classNum: Int): List<UUID> {
+        val qStudent = QStudentJpaEntity.studentJpaEntity
+
+        return queryFactory
+            .select(qStudent.id)
+            .from(qStudent)
+            .where(qStudent.user.stuNum.startsWith("${grade}${classNum}"))
+            .fetch()
+    }
+
     override fun queryStudentByUserId(userId: UUID): Student =
         studentJpaRepository.findByUserId(userId)!!.toDomain()