🔀 :: (#241) 교실에 학생존재여부 Response 추가

DSM-PICK · Sep 13, 2023 · 005a5bc · 005a5bc
1 parent eacbe85
commit 005a5bc
Show file tree

Hide file tree

Showing 23 changed files with 89 additions and 35 deletions.
diff --git a/...pplication/src/main/kotlin/com/pickdsm/pickserverspring/domain/afterschool/AfterSchool.kt b/...pplication/src/main/kotlin/com/pickdsm/pickserverspring/domain/afterschool/AfterSchool.kt
@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.afterschool
 
 import com.pickdsm.pickserverspring.common.annotation.Aggregate
-import java.util.*
+import java.util.UUID
 
 @Aggregate
 data class AfterSchool(

diff --git a/...ckdsm/pickserverspring/domain/classroom/api/dto/response/QueryResponsibleClassroomList.kt b/...ckdsm/pickserverspring/domain/classroom/api/dto/response/QueryResponsibleClassroomList.kt
@@ -10,5 +10,6 @@ data class QueryResponsibleClassroomList(
         val id: UUID,
         val name: String,
         val description: String,
+        val isUserExist: Boolean,
     )
 }
diff --git a/...ain/kotlin/com/pickdsm/pickserverspring/domain/classroom/spi/QueryClassroomMovementSpi.kt b/...ain/kotlin/com/pickdsm/pickserverspring/domain/classroom/spi/QueryClassroomMovementSpi.kt
@@ -12,4 +12,6 @@ interface QueryClassroomMovementSpi {
     fun queryClassroomMovementByStudentIdAndToday(studentId: UUID): ClassroomMovement?
 
     fun queryClassroomMovementClassroomIdByStatusId(statusId: UUID): UUID?
+
+    fun queryClassroomMovementListByClassroomId(classroomId: UUID): List<ClassroomMovement>
 }
diff --git a/.../kotlin/com/pickdsm/pickserverspring/domain/classroom/usecase/ClassroomMovementUseCase.kt b/.../kotlin/com/pickdsm/pickserverspring/domain/classroom/usecase/ClassroomMovementUseCase.kt
@@ -1,7 +1,6 @@
 package com.pickdsm.pickserverspring.domain.classroom.usecase
 
 import com.pickdsm.pickserverspring.common.annotation.UseCase
-import com.pickdsm.pickserverspring.domain.admin.api.AdminApi
 import com.pickdsm.pickserverspring.domain.afterschool.exception.AfterSchoolNotFoundException
 import com.pickdsm.pickserverspring.domain.afterschool.spi.QueryAfterSchoolSpi
 import com.pickdsm.pickserverspring.domain.application.Status
@@ -51,7 +50,6 @@ class ClassroomMovementUseCase(
     private val queryStatusSpi: QueryStatusSpi,
     private val userQueryApplicationSpi: UserQueryApplicationSpi,
     private val queryClassroomMovementSpi: QueryClassroomMovementSpi,
-    private val adminApi: AdminApi,
     private val queryClubSpi: QueryClubSpi,
     private val queryAfterSchoolSpi: QueryAfterSchoolSpi,
     private val queryTypeSpi: QueryTypeSpi,

diff --git a/...src/main/kotlin/com/pickdsm/pickserverspring/domain/classroom/usecase/ClassroomUseCase.kt b/...src/main/kotlin/com/pickdsm/pickserverspring/domain/classroom/usecase/ClassroomUseCase.kt
@@ -8,13 +8,16 @@ import com.pickdsm.pickserverspring.domain.classroom.api.dto.response.QueryClass
 import com.pickdsm.pickserverspring.domain.classroom.api.dto.response.QueryClassroomList.ClassroomElement
 import com.pickdsm.pickserverspring.domain.classroom.api.dto.response.QueryResponsibleClassroomList
 import com.pickdsm.pickserverspring.domain.classroom.api.dto.response.QueryResponsibleClassroomList.ResponsibleClassroomElement
+import com.pickdsm.pickserverspring.domain.classroom.exception.ClassroomNotFoundException
 import com.pickdsm.pickserverspring.domain.classroom.exception.FloorNotFoundException
+import com.pickdsm.pickserverspring.domain.classroom.spi.QueryClassroomMovementSpi
 import com.pickdsm.pickserverspring.domain.classroom.spi.QueryClassroomSpi
 import com.pickdsm.pickserverspring.domain.club.spi.QueryClubSpi
 import com.pickdsm.pickserverspring.domain.selfstudydirector.DirectorType
 import com.pickdsm.pickserverspring.domain.selfstudydirector.exception.TypeNotFoundException
 import com.pickdsm.pickserverspring.domain.selfstudydirector.spi.QuerySelfStudyDirectorSpi
 import com.pickdsm.pickserverspring.domain.selfstudydirector.spi.QueryTypeSpi
+import com.pickdsm.pickserverspring.domain.user.dto.UserInfo
 import com.pickdsm.pickserverspring.domain.user.spi.UserSpi
 import java.time.DayOfWeek
 import java.time.LocalDate
@@ -27,6 +30,7 @@ class ClassroomUseCase(
     private val queryClubSpi: QueryClubSpi,
     private val queryAfterSchoolSpi: QueryAfterSchoolSpi,
     private val queryTypeSpi: QueryTypeSpi,
+    private val queryClassroomMovementSpi: QueryClassroomMovementSpi,
 ) : ClassroomApi {
 
     companion object {
@@ -51,23 +55,24 @@ class ClassroomUseCase(
                     else -> queryAfterSchoolSpi.queryAllAfterSchoolClassroom()
                 }
 
-                afterSchoolList.map { afterSchool ->
+                afterSchoolList.map {
                     val afterSchoolRoom = ClassroomElement(
-                        classroomId = afterSchool.classroomId,
-                        typeId = afterSchool.afterSchoolInfoId,
-                        name = afterSchool.name,
-                        description = afterSchool.description,
+                        classroomId = it.classroomId,
+                        typeId = it.afterSchoolInfoId,
+                        name = it.name,
+                        description = it.description,
                     )
                     classrooms.add(afterSchoolRoom)
                 }
             }
 
             ClassroomType.TUE_CLUB.name, ClassroomType.FRI_CLUB.name -> {
                 val clubRoomList = queryClubSpi.queryClubClassroomListByFloor(floor)
+
                 clubRoomList.map {
                     val clubRooms = ClassroomElement(
                         classroomId = it.classroomId,
-                        typeId = it.clubId,
+                        typeId = it.clubInfoId,
                         name = it.name,
                         description = it.description,
                     )
@@ -77,6 +82,7 @@ class ClassroomUseCase(
 
             ClassroomType.ALL.name, ClassroomType.SELF_STUDY.name -> {
                 val allClassroomList = queryClassroomSpi.queryClassroomListByFloorAndByType(floor, type.name)
+
                 allClassroomList.map {
                     val allRooms = ClassroomElement(
                         classroomId = it.id,
@@ -96,48 +102,81 @@ class ClassroomUseCase(
 
     override fun queryResponsibleClassroomList(): QueryResponsibleClassroomList {
         val teacherId = userSpi.getCurrentUserId()
-        val typeId = queryTypeSpi.queryTypeIdByDate(LocalDate.now())
-            ?: throw TypeNotFoundException
+        val typeId = queryTypeSpi.queryTypeIdByDate(LocalDate.now()) ?: throw TypeNotFoundException
         val floor = querySelfStudyDirectorSpi.queryResponsibleFloorByTeacherIdAndTypeId(
             teacherId = teacherId,
             typeId = typeId,
         ) ?: throw FloorNotFoundException
-        val todayType = queryTypeSpi.queryDirectorTypeByDate(LocalDate.now())
-            ?: DirectorType.SELF_STUDY
+        val todayType = queryTypeSpi.queryDirectorTypeByDate(LocalDate.now()) ?: DirectorType.SELF_STUDY
         val classrooms = mutableListOf<ResponsibleClassroomElement>()
+        var isUserExist: Boolean
 
         when (todayType.name) {
             ClassroomType.AFTER_SCHOOL.name -> {
                 val afterSchoolList = queryAfterSchoolSpi.queryAfterSchoolClassroomListByFloor(floor)
-                afterSchoolList.map {
+
+                afterSchoolList.map { afterSchool ->
+                    val afterSchoolUserList =
+                        queryAfterSchoolSpi.queryAfterSchoolListByClassroomId(afterSchool.afterSchoolInfoId)
+                    val afterSchoolMovementUserList =
+                        queryClassroomMovementSpi.queryClassroomMovementListByClassroomId(afterSchool.classroomId)
+
+                    isUserExist = !(afterSchoolUserList.isEmpty() && afterSchoolMovementUserList.isEmpty())
+
                     val afterSchoolRooms = ResponsibleClassroomElement(
-                        id = it.classroomId,
-                        name = it.name,
-                        description = it.description,
+                        id = afterSchool.classroomId,
+                        name = afterSchool.name,
+                        description = afterSchool.description,
+                        isUserExist = isUserExist,
                     )
                     classrooms.add(afterSchoolRooms)
                 }
             }
 
             ClassroomType.TUE_CLUB.name, ClassroomType.FRI_CLUB.name -> {
                 val clubRoomList = queryClubSpi.queryClubClassroomListByFloor(floor)
+
                 clubRoomList.map {
+                    val clubUserList = queryClubSpi.queryClubStudentIdListByClubInfoId(it.clubInfoId)
+                    val clubMovementUserList =
+                        queryClassroomMovementSpi.queryClassroomMovementListByClassroomId(it.classroomId)
+
+                    isUserExist = !(clubUserList.isEmpty() && clubMovementUserList.isEmpty())
+
                     val clubRooms = ResponsibleClassroomElement(
                         id = it.classroomId,
                         name = it.name,
                         description = it.description,
+                        isUserExist = isUserExist,
                     )
                     classrooms.add(clubRooms)
                 }
             }
 
             ClassroomType.SELF_STUDY.name -> {
                 val selfStudyClassroomList = queryClassroomSpi.queryClassroomListByFloorAndByType(floor, todayType.name)
+
                 selfStudyClassroomList.map {
+                    val classroom = queryClassroomSpi.queryClassroomById(it.id) ?: throw ClassroomNotFoundException
+                    val classroomMovementUsers =
+                        queryClassroomMovementSpi.queryClassroomMovementListByClassroomId(classroom.id)
+                    var classroomUserList = emptyList<UserInfo>()
+                    val isClassroom = !(classroom.grade == null && classroom.classNum == null)
+
+                    if (isClassroom) {
+                        classroomUserList = userSpi.queryUserInfoByGradeAndClassNum(
+                            grade = classroom.grade,
+                            classNum = classroom.classNum,
+                        )
+                    }
+
+                    isUserExist = !(classroomMovementUsers.isEmpty() && classroomUserList.isEmpty())
+
                     val selfStudyRooms = ResponsibleClassroomElement(
                         id = it.id,
                         name = it.name,
                         description = "",
+                        isUserExist = isUserExist,
                     )
                     classrooms.add(selfStudyRooms)
                 }

diff --git a/pick-application/src/main/kotlin/com/pickdsm/pickserverspring/domain/club/vo/ClubRoomVO.kt b/pick-application/src/main/kotlin/com/pickdsm/pickserverspring/domain/club/vo/ClubRoomVO.kt
@@ -4,7 +4,7 @@ import java.util.UUID
 
 open class ClubRoomVO(
     val classroomId: UUID,
-    val clubId: UUID,
+    val clubInfoId: UUID,
     val name: String,
     val description: String,
 )
diff --git a/...erspring/domain/selfstudydirector/api/dto/request/DomainDeleteSelfStudyDirectorRequest.kt b/...erspring/domain/selfstudydirector/api/dto/request/DomainDeleteSelfStudyDirectorRequest.kt
@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.selfstudydirector.api.dto.request
 
 import java.time.LocalDate
-import java.util.*
+import java.util.UUID
 
 data class DomainDeleteSelfStudyDirectorRequest(
     val teacherId: UUID,

diff --git a/...spring/domain/selfstudydirector/api/dto/request/DomainRegisterSelfStudyDirectorRequest.kt b/...spring/domain/selfstudydirector/api/dto/request/DomainRegisterSelfStudyDirectorRequest.kt
@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.selfstudydirector.api.dto.request
 
 import java.time.LocalDate
-import java.util.*
+import java.util.UUID
 
 data class DomainRegisterSelfStudyDirectorRequest(
     val teacherId: UUID,

diff --git a/...in/com/pickdsm/pickserverspring/domain/selfstudydirector/spi/QuerySelfStudyDirectorSpi.kt b/...in/com/pickdsm/pickserverspring/domain/selfstudydirector/spi/QuerySelfStudyDirectorSpi.kt
@@ -2,7 +2,7 @@ package com.pickdsm.pickserverspring.domain.selfstudydirector.spi
 
 import com.pickdsm.pickserverspring.domain.selfstudydirector.SelfStudyDirector
 import java.time.LocalDate
-import java.util.*
+import java.util.UUID
 
 interface QuerySelfStudyDirectorSpi {
 

diff --git a/...n/src/main/kotlin/com/pickdsm/pickserverspring/domain/user/dto/request/UserInfoRequest.kt b/...n/src/main/kotlin/com/pickdsm/pickserverspring/domain/user/dto/request/UserInfoRequest.kt
@@ -1,6 +1,6 @@
 package com.pickdsm.pickserverspring.domain.user.dto.request
 
-import java.util.*
+import java.util.UUID
 
 data class UserInfoRequest(
     val userIds: List<UUID>,

diff --git a/.../pickserverspring/domain/admin/presentation/dto/request/DeleteSelfStudyDirectorRequest.kt b/.../pickserverspring/domain/admin/presentation/dto/request/DeleteSelfStudyDirectorRequest.kt
@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.admin.presentation.dto.request
 
 import java.time.LocalDate
-import java.util.*
+import java.util.UUID
 
 data class DeleteSelfStudyDirectorRequest(
     val teacherId: UUID,

diff --git a/...ickserverspring/domain/admin/presentation/dto/request/RegisterSelfStudyDirectorRequest.kt b/...ickserverspring/domain/admin/presentation/dto/request/RegisterSelfStudyDirectorRequest.kt
@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.admin.presentation.dto.request
 
 import java.time.LocalDate
-import java.util.*
+import java.util.UUID
 
 data class RegisterSelfStudyDirectorRequest(
     val teacherId: UUID,

diff --git a/.../com/pickdsm/pickserverspring/domain/afterschool/persistence/AfterSchoolInfoRepository.kt b/.../com/pickdsm/pickserverspring/domain/afterschool/persistence/AfterSchoolInfoRepository.kt
@@ -3,7 +3,7 @@ package com.pickdsm.pickserverspring.domain.afterschool.persistence
 import com.pickdsm.pickserverspring.domain.afterschool.persistence.entity.AfterSchoolInfoEntity
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
-import java.util.*
+import java.util.UUID
 
 @Repository
 interface AfterSchoolInfoRepository : CrudRepository<AfterSchoolInfoEntity, UUID>
diff --git a/...n/com/pickdsm/pickserverspring/domain/afterschool/persistence/entity/AfterSchoolEntity.kt b/...n/com/pickdsm/pickserverspring/domain/afterschool/persistence/entity/AfterSchoolEntity.kt
@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.afterschool.persistence.entity
 
 import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
-import java.util.*
+import java.util.UUID
 import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.FetchType

diff --git a/.../com/pickdsm/pickserverspring/domain/afterschool/persistence/vo/QueryAfterSchoolRoomVO.kt b/.../com/pickdsm/pickserverspring/domain/afterschool/persistence/vo/QueryAfterSchoolRoomVO.kt
@@ -2,7 +2,7 @@ package com.pickdsm.pickserverspring.domain.afterschool.persistence.vo
 
 import com.pickdsm.pickserverspring.domain.afterschool.vo.AfterSchoolRoomVO
 import com.querydsl.core.annotations.QueryProjection
-import java.util.*
+import java.util.UUID
 
 class QueryAfterSchoolRoomVO @QueryProjection constructor(
     classroomId: UUID,

diff --git a/.../com/pickdsm/pickserverspring/domain/classroom/persistence/ClassroomMovementRepository.kt b/.../com/pickdsm/pickserverspring/domain/classroom/persistence/ClassroomMovementRepository.kt
@@ -4,7 +4,7 @@ import com.pickdsm.pickserverspring.domain.application.persistence.entity.Status
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.ClassroomMovementEntity
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
-import java.util.*
+import java.util.UUID
 
 @Repository
 interface ClassroomMovementRepository : CrudRepository<ClassroomMovementEntity, UUID> {

diff --git a/...kserverspring/domain/classroom/persistence/adapter/ClassroomMovementPersistenceAdapter.kt b/...kserverspring/domain/classroom/persistence/adapter/ClassroomMovementPersistenceAdapter.kt
@@ -1,6 +1,7 @@
 package com.pickdsm.pickserverspring.domain.classroom.persistence.adapter
 
 import com.pickdsm.pickserverspring.domain.application.Status
+import com.pickdsm.pickserverspring.domain.application.StatusType
 import com.pickdsm.pickserverspring.domain.application.persistence.entity.QStatusEntity.statusEntity
 import com.pickdsm.pickserverspring.domain.classroom.ClassroomMovement
 import com.pickdsm.pickserverspring.domain.classroom.mapper.ClassroomMovementMapper
@@ -71,4 +72,18 @@ class ClassroomMovementPersistenceAdapter(
             .from(classroomMovementEntity)
             .where(classroomMovementEntity.statusEntity.id.eq(statusId))
             .fetchOne()
+
+    override fun queryClassroomMovementListByClassroomId(classroomId: UUID): List<ClassroomMovement> =
+        jpaQueryFactory
+            .selectFrom(classroomMovementEntity)
+            .join(classroomEntity)
+            .on(classroomMovementEntity.classroomEntity.id.eq(classroomId))
+            .join(statusEntity)
+            .on(classroomMovementEntity.statusEntity.id.eq(statusEntity.id))
+            .where(
+                statusEntity.date.eq(LocalDate.now()),
+                statusEntity.type.eq(StatusType.MOVEMENT),
+            )
+            .fetch()
+            .map(classroomMovementMapper::entityToDomain)
 }
diff --git a/...rc/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/ClubInfoRepository.kt b/...rc/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/ClubInfoRepository.kt
@@ -3,7 +3,7 @@ package com.pickdsm.pickserverspring.domain.club.persistence
 import com.pickdsm.pickserverspring.domain.club.persistence.entity.ClubInfoEntity
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
-import java.util.*
+import java.util.UUID
 
 @Repository
 interface ClubInfoRepository : CrudRepository<ClubInfoEntity, UUID>
diff --git a/...src/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/entity/ClubEntity.kt b/...src/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/entity/ClubEntity.kt
@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.club.persistence.entity
 
 import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
-import java.util.*
+import java.util.UUID
 import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.FetchType

diff --git a/...main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/entity/ClubInfoEntity.kt b/...main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/entity/ClubInfoEntity.kt
@@ -3,7 +3,7 @@ package com.pickdsm.pickserverspring.domain.club.persistence.entity
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.ClassroomEntity
 import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
 import org.hibernate.annotations.ColumnDefault
-import java.util.*
+import java.util.UUID
 import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.FetchType

diff --git a/...rc/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/vo/QueryClubRoomVO.kt b/...rc/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/vo/QueryClubRoomVO.kt
@@ -6,12 +6,12 @@ import java.util.UUID
 
 class QueryClubRoomVO @QueryProjection constructor(
     classroomId: UUID,
-    clubId: UUID,
+    clubInfoId: UUID,
     name: String,
     description: String,
 ) : ClubRoomVO(
     classroomId = classroomId,
-    clubId = clubId,
+    clubInfoId = clubInfoId,
     name = name,
     description = description,
 )
diff --git a/...ain/kotlin/com/pickdsm/pickserverspring/domain/user/persistence/UserPersistenceAdapter.kt b/...ain/kotlin/com/pickdsm/pickserverspring/domain/user/persistence/UserPersistenceAdapter.kt
@@ -7,7 +7,7 @@ import com.pickdsm.pickserverspring.domain.user.dto.UserInfo
 import com.pickdsm.pickserverspring.domain.user.spi.UserSpi
 import com.pickdsm.pickserverspring.global.annotation.Adapter
 import org.springframework.security.core.context.SecurityContextHolder
-import java.util.*
+import java.util.UUID
 
 @Adapter
 class UserPersistenceAdapter(

diff --git a/...rastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/filter/ExceptionFilter.kt b/...rastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/filter/ExceptionFilter.kt
@@ -3,7 +3,6 @@ package com.pickdsm.pickserverspring.global.filter
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.pickdsm.pickserverspring.common.error.ErrorProperty
 import com.pickdsm.pickserverspring.common.error.PickException
-import com.pickdsm.pickserverspring.global.error.ErrorResponse
 import com.pickdsm.pickserverspring.global.error.of
 import com.pickdsm.pickserverspring.global.exception.InternalServerErrorException
 import io.sentry.Sentry