Code migration

DSM-PICK · Nov 12, 2024 · fa893fa · fa893fa
1 parent 73fa7d4
commit fa893fa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/service/QueryFloorApplicationService.kt b/src/main/kotlin/dsm/pick2024/domain/application/service/QueryFloorApplicationService.kt
@@ -19,16 +19,11 @@ class QueryFloorApplicationService(
 
     @Transactional(readOnly = true)
     override fun queryFloorAndStatusApplication(floor: Int, status: Status): List<QueryApplicationResponse> {
-        val today = LocalDate.now().dayOfWeek
-
         val applications = when (floor) {
             2, 3, 4 -> {
-                val filteredClassrooms = if (today == 2 || today == 5) {
-                    queryApplicationPort.queryApplicationWithAttendance(floor)
-                } else {
+                val filterClassroomList =
                     queryApplicationPort.findByFloorAndApplicationKind(floor, ApplicationKind.APPLICATION)
-                }
-                filteredClassrooms.filter { it.status == status }
+                filterClassroomList.filter { it.status == status }
             }
             5 -> {
                 queryAllApplicationPort.findAllByStatusAndApplicationKind(status, ApplicationKind.APPLICATION)

diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt
@@ -28,11 +28,15 @@ class AttendancePersistenceAdapter(
 
     override fun findAll() = attendanceJpaRepository.findAll().map { attendanceMapper.toDomain(it) }
 
-    override fun findByFloor(floor: Int): List<Attendance>? = attendanceJpaRepository.findByFloor(floor).map {
-        attendanceMapper.toDomain(
-            it
-        )
-    }
+    override fun findByFloor(floor: Int): List<Attendance>? =
+        jpaQueryFactory
+            .selectFrom(QAttendanceJpaEntity.attendanceJpaEntity)
+            .where(
+                QAttendanceJpaEntity.attendanceJpaEntity.floor.eq(floor),
+                QAttendanceJpaEntity.attendanceJpaEntity.period6.ne(AttendanceStatus.DROPOUT)
+            )
+            .fetch()
+            .map { attendanceMapper.toDomain(it) }
 
     override fun findByGradeAndClassNum(
         grade: Int,
@@ -41,7 +45,8 @@ class AttendancePersistenceAdapter(
         .selectFrom(QAttendanceJpaEntity.attendanceJpaEntity)
         .where(
             QAttendanceJpaEntity.attendanceJpaEntity.grade.eq(grade),
-            QAttendanceJpaEntity.attendanceJpaEntity.classNum.eq(classNum)
+            QAttendanceJpaEntity.attendanceJpaEntity.classNum.eq(classNum),
+            QAttendanceJpaEntity.attendanceJpaEntity.period6.ne(AttendanceStatus.DROPOUT)
         )
         .fetch()
         .map { attendanceMapper.toDomain(it) }