🔀 :: 자습감독선생님 리스트 조회 API 에러 해결

DSM-PICK · Mar 23, 2023 · 1e7e294 · 1e7e294
1 parent 3ea1d3a
commit 1e7e294
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/...src/main/kotlin/com/pickdsm/pickserverspring/domain/selfstudydirector/spi/QueryTypeSpi.kt b/...src/main/kotlin/com/pickdsm/pickserverspring/domain/selfstudydirector/spi/QueryTypeSpi.kt
@@ -7,7 +7,7 @@ import java.util.UUID
 
 interface QueryTypeSpi {
 
-    fun queryTypeListByToday(): List<Type>
+    fun queryTypeListByDate(startDate: LocalDate): List<Type>
 
     fun queryTypeById(typeId: UUID): Type
 

diff --git a/...com/pickdsm/pickserverspring/domain/selfstudydirector/usecase/SelfStudyDirectorUseCase.kt b/...com/pickdsm/pickserverspring/domain/selfstudydirector/usecase/SelfStudyDirectorUseCase.kt
@@ -1,11 +1,8 @@
 package com.pickdsm.pickserverspring.domain.selfstudydirector.usecase
 
 import com.pickdsm.pickserverspring.common.annotation.ReadOnlyUseCase
-import com.pickdsm.pickserverspring.domain.application.spi.CommandStatusSpi
-import com.pickdsm.pickserverspring.domain.application.spi.QueryStatusSpi
 import com.pickdsm.pickserverspring.domain.selfstudydirector.DirectorType
 import com.pickdsm.pickserverspring.domain.selfstudydirector.SelfStudyDirector
-import com.pickdsm.pickserverspring.domain.selfstudydirector.Type
 import com.pickdsm.pickserverspring.domain.selfstudydirector.api.SelfStudyDirectorApi
 import com.pickdsm.pickserverspring.domain.selfstudydirector.api.dto.requst.DomainChangeSelfStudyDirectorRequest
 import com.pickdsm.pickserverspring.domain.selfstudydirector.api.dto.response.SelfStudyElement
@@ -36,23 +33,17 @@ class SelfStudyDirectorUseCase(
         val selfStudyDirectorList = querySelfStudyDirectorSpi.querySelfStudyDirectorByDate(startDate)
         val teacherIdList = selfStudyDirectorList.map { it.teacherId }
         val userInfoList = userQuerySelfStudyDirectorSpi.queryUserInfo(teacherIdList)
-        val typeList = queryTypeSpi.queryTypeListByToday()
+        val typeList = queryTypeSpi.queryTypeListByDate(startDate)
 
         // 해당 달의 1일부터 마지막일까지 반복문을 돌면서 값 가공
         val selfStudyDirectorResponseList = (1..startDate.lengthOfMonth())
-            .filter { i ->
-                selfStudyDirectorList.find {
-                    val type = typeList.find { type -> type.id == it.typeId } ?: throw TypeNotFoundException
-                    type.date != LocalDate.of(startDate.year, startDate.month, i)
-                } == null
-            }
             .map { i ->
                 val date = LocalDate.of(startDate.year, startDate.month, i)
-                val directorType: DirectorType = typeList.find { it.date == date }?.type ?: DirectorType.SELF_STUDY
+                val directorType = typeList.find { it.date == date }?.type ?: DirectorType.SELF_STUDY
                 val teacher = MutableList(5) { "" }
 
                 selfStudyDirectorList.filter {
-                    val type: Type = typeList.find { type -> type.id == it.typeId } ?: throw TypeNotFoundException
+                    val type = typeList.find { type -> type.id == it.typeId } ?: throw TypeNotFoundException
                     type.date == date
                 }.map { selfStudy ->
                     teacher[selfStudy.floor - 1] = userInfoList.find { it.id == selfStudy.teacherId }?.name ?: ""
@@ -102,8 +93,9 @@ class SelfStudyDirectorUseCase(
     }
 
     override fun changeSelfStudyDirector(request: DomainChangeSelfStudyDirectorRequest) {
-        val selfStudyDirector = querySelfStudyDirectorSpi.querySelfStudyDirectorByDateAndFloor(request.date, request.floor)
-            ?: throw SelfStudyDirectorNotFoundException
+        val selfStudyDirector =
+            querySelfStudyDirectorSpi.querySelfStudyDirectorByDateAndFloor(request.date, request.floor)
+                ?: throw SelfStudyDirectorNotFoundException
 
         commandSelfStudyDirectorSpi.updateSelfStudyDirector(
             selfStudyDirector.changeSelfStudyDirector(teacherId = request.teacherId),

diff --git a/...pring/domain/selfstudydirector/persistence/adapter/SelfStudyDirectorPersistenceAdapter.kt b/...pring/domain/selfstudydirector/persistence/adapter/SelfStudyDirectorPersistenceAdapter.kt
@@ -26,7 +26,7 @@ class SelfStudyDirectorPersistenceAdapter(
     override fun querySelfStudyDirectorByDate(date: LocalDate): List<SelfStudyDirector> =
         jpaQueryFactory
             .selectFrom(selfStudyDirectorEntity)
-            .innerJoin(selfStudyDirectorEntity.typeEntity, typeEntity)
+            .join(typeEntity)
             .on(selfStudyDirectorEntity.typeEntity.id.eq(typeEntity.id))
             .where(typeEntity.date.between(date, date.plusMonths(1)))
             .fetch()

diff --git a/...m/pickserverspring/domain/selfstudydirector/persistence/adapter/TypePersistenceAdapter.kt b/...m/pickserverspring/domain/selfstudydirector/persistence/adapter/TypePersistenceAdapter.kt
@@ -19,10 +19,10 @@ class TypePersistenceAdapter(
     private val typeRepository: TypeRepository,
 ) : TypeSpi {
 
-    override fun queryTypeListByToday(): List<Type> =
+    override fun queryTypeListByDate(startDate: LocalDate): List<Type> =
         jpaQueryFactory
             .selectFrom(typeEntity)
-            .where(typeEntity.date.eq(LocalDate.now()))
+            .where(typeEntity.date.between(startDate, startDate.plusMonths(1)))
             .fetch()
             .map(typeMapper::entityToDomain)