Merge branch 'develop'

rudeh2926 · rudeh2926 · commit 729de1cdc53b · 2024-11-12T15:18:34.000+09:00
diff --git a/src/main/kotlin/dsm/pick2024/domain/application/service/QueryFloorApplicationService.kt b/src/main/kotlin/dsm/pick2024/domain/application/service/QueryFloorApplicationService.kt
@@ -7,7 +7,6 @@ import dsm.pick2024.domain.application.port.out.QueryAllApplicationPort
 import dsm.pick2024.domain.application.port.out.QueryApplicationPort
 import dsm.pick2024.domain.application.presentation.dto.response.QueryApplicationResponse
 import dsm.pick2024.domain.classroom.exception.FloorNotFoundException
-import org.joda.time.LocalDate
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -19,16 +18,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/enums/AttendanceStatus.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/enums/AttendanceStatus.kt
@@ -7,5 +7,6 @@ enum class AttendanceStatus {
     DISALLOWED, // 무단
     PICNIC, // 현체
     EMPLOYMENT, // 취업
-    GO_HOME //귀가
+    GO_HOME, //귀가
+    DROPOUT //자퇴
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt
@@ -3,6 +3,7 @@ package dsm.pick2024.domain.attendance.persistence
 import com.querydsl.jpa.impl.JPAQueryFactory
 import dsm.pick2024.domain.attendance.domain.Attendance
 import dsm.pick2024.domain.attendance.entity.QAttendanceJpaEntity
+import dsm.pick2024.domain.attendance.enums.AttendanceStatus
 import dsm.pick2024.domain.attendance.mapper.AttendanceMapper
 import dsm.pick2024.domain.attendance.persistence.repository.AttendanceRepository
 import dsm.pick2024.domain.attendance.port.out.AttendancePort
@@ -27,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,
@@ -40,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) }
@@ -49,7 +55,8 @@ class AttendancePersistenceAdapter(
         jpaQueryFactory
             .selectFrom(QAttendanceJpaEntity.attendanceJpaEntity)
             .where(
-                QAttendanceJpaEntity.attendanceJpaEntity.club.eq(club)
+                QAttendanceJpaEntity.attendanceJpaEntity.club.eq(club),
+                QAttendanceJpaEntity.attendanceJpaEntity.period6.ne(AttendanceStatus.DROPOUT)
             )
             .fetch()
             .map { attendanceMapper.toDomain(it) }
diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/service/QueryClubAttendanceService.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/service/QueryClubAttendanceService.kt
@@ -39,19 +39,19 @@ class QueryClubAttendanceService(
                 classNum = it.classNum,
                 num = it.num,
                 status = returnStatus,
-                classroomName = classroomName!!
+                classroomName = classroomName
             )
         }.sortedWith(
             compareBy({ it.grade }, { it.classNum }, { it.num })
         )
     }
     private fun returnStatus(period: Int, attendance: Attendance): AttendanceStatus {
         return when (period) {
-            6 -> attendance!!.period6
-            7 -> attendance!!.period7
-            8 -> attendance!!.period8
-            9 -> attendance!!.period9
-            10 -> attendance!!.period10
+            6 -> attendance.period6
+            7 -> attendance.period7
+            8 -> attendance.period8
+            9 -> attendance.period9
+            10 -> attendance.period10
             else -> throw InvalidPeriodException
         }
     }
diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/service/ResetAttendanceService.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/service/ResetAttendanceService.kt
@@ -35,7 +35,7 @@ class ResetAttendanceService(
 
     private fun getStatus(currentStatus: AttendanceStatus) =
         when (currentStatus) {
-            AttendanceStatus.PICNIC, AttendanceStatus.EMPLOYMENT -> currentStatus
+            AttendanceStatus.DROPOUT, AttendanceStatus.PICNIC, AttendanceStatus.EMPLOYMENT -> currentStatus
             else -> AttendanceStatus.ATTENDANCE
         }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/schedule/persistence/SchedulePersistenceAdapter.kt b/src/main/kotlin/dsm/pick2024/domain/schedule/persistence/SchedulePersistenceAdapter.kt
@@ -56,4 +56,8 @@ class SchedulePersistenceAdapter(
         val entities = schedule.map { scheduleMapper.toEntity(it) }
         scheduleRepository.saveAll(entities)
     }
+
+    override fun deleteAll() {
+        scheduleRepository.deleteAll()
+    }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/schedule/persistence/repository/ScheduleRepository.kt b/src/main/kotlin/dsm/pick2024/domain/schedule/persistence/repository/ScheduleRepository.kt
@@ -15,4 +15,6 @@ interface ScheduleRepository : Repository<ScheduleJpaEntity, UUID> {
     fun saveAll(entity: Iterable<ScheduleJpaEntity>)
 
     fun findAllByDate(date: LocalDate): List<ScheduleJpaEntity>?
+
+    fun deleteAll()
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/schedule/port/in/SaveScheduleUseCase.kt b/src/main/kotlin/dsm/pick2024/domain/schedule/port/in/SaveScheduleUseCase.kt
@@ -1,5 +1,5 @@
 package dsm.pick2024.domain.schedule.port.`in`
 
 interface SaveScheduleUseCase {
-    fun saveNeisInfoToDatabase(start: String, end: String)
+    fun saveNeisInfoToDatabase()
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/schedule/port/out/DeleteSchedulePort.kt b/src/main/kotlin/dsm/pick2024/domain/schedule/port/out/DeleteSchedulePort.kt
@@ -4,4 +4,6 @@ import java.util.UUID
 
 interface DeleteSchedulePort {
     fun deleteById(id: UUID)
+
+    fun deleteAll()
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/schedule/presentation/ScheduleController.kt b/src/main/kotlin/dsm/pick2024/domain/schedule/presentation/ScheduleController.kt
@@ -68,10 +68,7 @@ class ScheduleController(
 
     @Operation(summary = "나이스 학사일정 저장 api")
     @PostMapping("/save")
-    fun saveSchedule(
-        @RequestParam(name = "start") start: String,
-        @RequestParam(name = "end") end: String
-    ) = scheduleUseCase.saveNeisInfoToDatabase(start, end)
+    fun saveSchedule() = scheduleUseCase.saveNeisInfoToDatabase()
 
     @Operation(summary = "일 별 학사일정조회 api")
     @GetMapping("/date")
diff --git a/src/main/kotlin/dsm/pick2024/domain/schedule/service/SaveScheduleService.kt b/src/main/kotlin/dsm/pick2024/domain/schedule/service/SaveScheduleService.kt
@@ -1,22 +1,43 @@
 package dsm.pick2024.domain.schedule.service
 
 import dsm.pick2024.domain.schedule.port.`in`.SaveScheduleUseCase
+import dsm.pick2024.domain.schedule.port.out.DeleteSchedulePort
 import dsm.pick2024.domain.schedule.port.out.SaveSchedulePort
+import dsm.pick2024.global.config.cache.CacheName
 import dsm.pick2024.infrastructure.feign.NeisScheduleFeignClientService
+import org.springframework.cache.annotation.CacheEvict
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 
 @Service
 class SaveScheduleService(
     private val saveSchedulePort: SaveSchedulePort,
+    private val deleteSchedulePort: DeleteSchedulePort,
     private val neisScheduleFeignClientService: NeisScheduleFeignClientService
 ) : SaveScheduleUseCase {
 
+    @CacheEvict(value = [CacheName.SCHEDULES], allEntries = true)
     @Transactional
-    override fun saveNeisInfoToDatabase(start: String, end: String) {
+    override fun saveNeisInfoToDatabase() {
+        val (start, end) = formatDate()
+        deleteSchedulePort.deleteAll()
         val scheduleForSave =
             neisScheduleFeignClientService.getNeisInfoToEntity(start, end)
 
         scheduleForSave?.let { saveSchedulePort.saveFeignSchedule(it) }
     }
+
+    private fun formatDate(): Pair<String, String> {
+        val today = LocalDate.now()
+
+        val start = LocalDate.of(today.year - 1, 1, 1)
+
+        val end = LocalDate.of(today.year + 1, 3, 1)
+
+        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+
+        return start.format(formatter) to end.format(formatter)
+    }
 }
diff --git a/src/main/kotlin/dsm/pick2024/domain/status/service/ChangeStatusService.kt b/src/main/kotlin/dsm/pick2024/domain/status/service/ChangeStatusService.kt
@@ -35,7 +35,7 @@ class ChangeStatusService(
             )
             updateStatuses.add(updatedStatus)
 
-            if (requests.statusType in setOf(EMPLOYMENT, PICNIC, ATTENDANCE)) {
+            if (requests.statusType in setOf(EMPLOYMENT, PICNIC, ATTENDANCE, DROPOUT)) {
                 val attendance = queryAttendancePort.findByUserId(requests.userId)
                     ?: throw UserNotFoundException
 
@@ -56,6 +56,7 @@ class ChangeStatusService(
     private fun updatePeriodStatus(statusType: StatusType): AttendanceStatus {
         return when (statusType) {
             PICNIC -> AttendanceStatus.PICNIC
+            DROPOUT -> AttendanceStatus.DROPOUT
             EMPLOYMENT -> AttendanceStatus.EMPLOYMENT
             else -> AttendanceStatus.ATTENDANCE
         }
diff --git a/src/main/kotlin/dsm/pick2024/domain/status/service/ResetStatusService.kt b/src/main/kotlin/dsm/pick2024/domain/status/service/ResetStatusService.kt
@@ -10,13 +10,13 @@ import org.springframework.transaction.annotation.Transactional
 
 @Service
 class ResetStatusService(
-    private val querystatusPort: QueryStatusPort,
+    private val queryStatusPort: QueryStatusPort,
     private val saveStatusPort: SaveStatusPort
 ) : ResetStatusUseCase {
 
     @Transactional(readOnly = true)
     override fun reset() {
-        val allStudent = querystatusPort.findAll()
+        val allStudent = queryStatusPort.findAll()
         val update = mutableListOf<Status>()
 
         allStudent.map { it ->
diff --git a/src/main/kotlin/dsm/pick2024/infrastructure/schedule/ScheduleService.kt b/src/main/kotlin/dsm/pick2024/infrastructure/schedule/ScheduleService.kt
@@ -5,6 +5,7 @@ import dsm.pick2024.domain.application.port.out.DeleteApplicationPort
 import dsm.pick2024.domain.attendance.port.`in`.ResetAttendanceUseCase
 import dsm.pick2024.domain.classroom.port.out.DeleteClassRoomPort
 import dsm.pick2024.domain.meal.port.`in`.MealUseCase
+import dsm.pick2024.domain.schedule.port.`in`.SaveScheduleUseCase
 import dsm.pick2024.domain.status.port.`in`.ResetStatusUseCase
 import dsm.pick2024.domain.timetable.port.`in`.SaveTimetableUseCase
 import dsm.pick2024.domain.timetable.port.out.DeleteTimeTablePort
@@ -20,7 +21,8 @@ class ScheduleService(
     private val mealUseCase: MealUseCase,
     private val resetAttendanceUseCase: ResetAttendanceUseCase,
     private val resetStatusUseCase: ResetStatusUseCase,
-    private val saveTimetableUseCase: SaveTimetableUseCase
+    private val saveTimetableUseCase: SaveTimetableUseCase,
+    private val saveScheduleUseCase: SaveScheduleUseCase
 ) {
     @Scheduled(cron = "0 30 20 * * ?", zone = "Asia/Seoul")
     fun deleteTable() {
@@ -36,13 +38,18 @@ class ScheduleService(
 
     @Scheduled(cron = "0 00 21 * * ?", zone = "Asia/Seoul")
     fun resetTable() {
-        resetAttendanceUseCase.resetAttendance()
         resetStatusUseCase.reset()
+        resetAttendanceUseCase.resetAttendance()
     }
 
     @Scheduled(cron = "0 0 14 * * SUN")
     fun saveTimetable() {
         deleteTimetablePort.deleteAll()
         saveTimetableUseCase.saveTimetable()
     }
+
+    @Scheduled(cron = "0 0 8 * * ?")
+    fun saveSchedule() {
+        saveScheduleUseCase.saveNeisInfoToDatabase()
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ enum class AttendanceStatus {`
`7`	`7`	`DISALLOWED, // 무단`
`8`	`8`	`PICNIC, // 현체`
`9`	`9`	`EMPLOYMENT, // 취업`
`10`		`- GO_HOME //귀가`
	`10`	`+ GO_HOME, //귀가`
	`11`	`+ DROPOUT //자퇴`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,19 +39,19 @@ class QueryClubAttendanceService(`
`39`	`39`	`classNum = it.classNum,`
`40`	`40`	`num = it.num,`
`41`	`41`	`status = returnStatus,`
`42`		`- classroomName = classroomName!!`
	`42`	`+ classroomName = classroomName`
`43`	`43`	`)`
`44`	`44`	`}.sortedWith(`
`45`	`45`	`compareBy({ it.grade }, { it.classNum }, { it.num })`
`46`	`46`	`)`
`47`	`47`	`}`
`48`	`48`	`private fun returnStatus(period: Int, attendance: Attendance): AttendanceStatus {`
`49`	`49`	`return when (period) {`
`50`		`- 6 -> attendance!!.period6`
`51`		`- 7 -> attendance!!.period7`
`52`		`- 8 -> attendance!!.period8`
`53`		`- 9 -> attendance!!.period9`
`54`		`- 10 -> attendance!!.period10`
	`50`	`+ 6 -> attendance.period6`
	`51`	`+ 7 -> attendance.period7`
	`52`	`+ 8 -> attendance.period8`
	`53`	`+ 9 -> attendance.period9`
	`54`	`+ 10 -> attendance.period10`
`55`	`55`	`else -> throw InvalidPeriodException`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class ResetAttendanceService(`
`35`	`35`
`36`	`36`	`private fun getStatus(currentStatus: AttendanceStatus) =`
`37`	`37`	`when (currentStatus) {`
`38`		`- AttendanceStatus.PICNIC, AttendanceStatus.EMPLOYMENT -> currentStatus`
	`38`	`+ AttendanceStatus.DROPOUT, AttendanceStatus.PICNIC, AttendanceStatus.EMPLOYMENT -> currentStatus`
`39`	`39`	`else -> AttendanceStatus.ATTENDANCE`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,8 @@ class SchedulePersistenceAdapter(`
`56`	`56`	`val entities = schedule.map { scheduleMapper.toEntity(it) }`
`57`	`57`	`scheduleRepository.saveAll(entities)`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ override fun deleteAll() {`
	`61`	`+ scheduleRepository.deleteAll()`
	`62`	`+ }`
`59`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,6 @@ interface ScheduleRepository : Repository<ScheduleJpaEntity, UUID> {`
`15`	`15`	`fun saveAll(entity: Iterable<ScheduleJpaEntity>)`
`16`	`16`
`17`	`17`	`fun findAllByDate(date: LocalDate): List<ScheduleJpaEntity>?`
	`18`	`+`
	`19`	`+ fun deleteAll()`
`18`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	package dsm.pick2024.domain.schedule.port.`in`
`2`	`2`
`3`	`3`	`interface SaveScheduleUseCase {`
`4`		`- fun saveNeisInfoToDatabase(start: String, end: String)`
	`4`	`+ fun saveNeisInfoToDatabase()`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,6 @@ import java.util.UUID`
`4`	`4`
`5`	`5`	`interface DeleteSchedulePort {`
`6`	`6`	`fun deleteById(id: UUID)`
	`7`	`+`
	`8`	`+ fun deleteAll()`
`7`	`9`	`}`