Merge remote-tracking branch 'origin/develop' into develop

Author: ByunDohwi

src/main/kotlin/dsm/pick2024/domain/timetable/port/in/SaveTimetableUseCase.kt

@@ -1,5 +1,5 @@
 package dsm.pick2024.domain.timetable.port.`in`
 
 interface SaveTimetableUseCase {
-    fun saveTimetable()
+    fun saveTimetable(baseTime: Long)
 }

src/main/kotlin/dsm/pick2024/domain/timetable/service/SaveTimetableService.kt

@@ -14,8 +14,8 @@ class SaveTimetableService(
 ) : SaveTimetableUseCase {
 
     @Transactional
-    override fun saveTimetable() {
-        val timetableEntities = neisTimetableFeignClientService.getNeisInfoToEntity()
+    override fun saveTimetable(baseTime: Long) {
+        val timetableEntities = neisTimetableFeignClientService.getNeisInfoToEntity(baseTime)
 
         val updatedTimetableEntities = timetableEntities?.mapNotNull { timetable ->
             val subject = updatedSubjectName(timetable.subjectName)

src/main/kotlin/dsm/pick2024/infrastructure/feign/NeisTimetableFeignClientService.kt

@@ -16,9 +16,8 @@ class NeisTimetableFeignClientService(
     private val neisKey: String,
     private val neisFeignClient: NeisFeignClient
 ) {
-    fun getNeisInfoToEntity(): MutableList<Timetable>? {
-        val runDay = LocalDate.now()
-
+    fun getNeisInfoToEntity(baseDay: Long): MutableList<Timetable>? {
+        val runDay = LocalDate.now().plusDays(baseDay)
         val neisTimetableServiceInfoString =
             neisFeignClient.hisTimetable(
                 key = neisKey,
@@ -27,8 +26,9 @@ class NeisTimetableFeignClientService(
                 pageSize = NeisFeignClientRequestProperty.PAGE_SIZE,
                 schoolCode = NeisFeignClientRequestProperty.SD_SCHUL_CODE,
                 atptCode = NeisFeignClientRequestProperty.ATPT_OFCDC_CODE,
-                startedYmd = runDay.withDayOfMonth(runDay.dayOfMonth).toString().replace("-", ""),
-                endedYmd = runDay.withDayOfMonth(runDay.dayOfMonth).plusDays(7).toString().replace("-", "")
+                //runDay + baseDay 날짜의 전주 일요일 ~ 이번주 일요일의 시간표를 변경한다.
+                startedYmd = runDay.with(java.time.DayOfWeek.SUNDAY).minusDays(7).toString().replace("-", ""),
+                endedYmd = runDay.with(java.time.DayOfWeek.SUNDAY).toString().replace("-", "")
             )
         val timetableJson =
             Gson().fromJson(

src/main/kotlin/dsm/pick2024/infrastructure/schedule/ScheduleService.kt

@@ -45,7 +45,13 @@ class ScheduleService(
     @Scheduled(cron = "0 0 6-23 * * 1-5", zone = "Asia/Seoul")
     fun saveTimetable() {
         deleteTimetablePort.deleteAll()
-        saveTimetableUseCase.saveTimetable()
+        saveTimetableUseCase.saveTimetable(0)
+    }
+
+    @Scheduled(cron = "0 0 2 * * 6", zone = "Asia/Seoul")
+    fun saveNextWeekTimeTable() {
+        deleteTimetablePort.deleteAll()
+        saveTimetableUseCase.saveTimetable(4)
     }
 
     @Scheduled(cron = "0 0 8 * * ?")