Skip to content

Commit d6ef69f

Browse files
authored
Merge pull request #438 from DSM-PICK/develop
Merge branch 'develop' to main
2 parents 5f06635 + 5422b30 commit d6ef69f

File tree

6 files changed

+46
-3
lines changed

6 files changed

+46
-3
lines changed

src/main/kotlin/dsm/pick2024/domain/weekendmeal/persistence/WeekendMealPersistenceAdapter.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,12 @@ class WeekendMealPersistenceAdapter(
7373
.let { result ->
7474
result?.map { weekendMealMapper.toDomain(it) } ?: emptyList()
7575
}
76+
77+
override fun resetStatus() {
78+
jpaQueryFactory
79+
.update(QWeekendMealJpaEntity.weekendMealJpaEntity)
80+
.set(QWeekendMealJpaEntity.weekendMealJpaEntity.status, Status.NO)
81+
.where(QWeekendMealJpaEntity.weekendMealJpaEntity.status.eq(Status.OK))
82+
.execute()
83+
}
7684
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package dsm.pick2024.domain.weekendmeal.port.`in`
2+
3+
interface UpdateWeekendMealUseCase {
4+
fun execute()
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package dsm.pick2024.domain.weekendmeal.port.out
2+
3+
interface UpdateWeekendMealPort {
4+
fun resetStatus()
5+
}

src/main/kotlin/dsm/pick2024/domain/weekendmeal/port/out/WeekendMealPort.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ package dsm.pick2024.domain.weekendmeal.port.out
33
interface WeekendMealPort :
44
SaveWeekendMealPort,
55
ExistsWeekendMealPort,
6-
QueryWeekendMealPort
6+
QueryWeekendMealPort,
7+
UpdateWeekendMealPort
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package dsm.pick2024.domain.weekendmeal.service
2+
3+
import dsm.pick2024.domain.weekendmeal.port.`in`.UpdateWeekendMealUseCase
4+
import dsm.pick2024.domain.weekendmeal.port.out.UpdateWeekendMealPort
5+
import org.springframework.stereotype.Service
6+
import javax.transaction.Transactional
7+
8+
@Service
9+
class UpdateWeekendMealService(
10+
private val updateWeekendMealPort: UpdateWeekendMealPort
11+
) : UpdateWeekendMealUseCase {
12+
13+
@Transactional
14+
override fun execute() {
15+
updateWeekendMealPort.resetStatus()
16+
}
17+
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import dsm.pick2024.domain.schedule.port.`in`.SaveScheduleUseCase
99
import dsm.pick2024.domain.status.port.`in`.ResetStatusUseCase
1010
import dsm.pick2024.domain.timetable.port.`in`.SaveTimetableUseCase
1111
import dsm.pick2024.domain.timetable.port.out.DeleteTimeTablePort
12+
import dsm.pick2024.domain.weekendmeal.port.`in`.UpdateWeekendMealUseCase
1213
import org.springframework.scheduling.annotation.Scheduled
1314
import org.springframework.stereotype.Component
1415

@@ -22,7 +23,8 @@ class ScheduleService(
2223
private val resetAttendanceUseCase: ResetAttendanceUseCase,
2324
private val resetStatusUseCase: ResetStatusUseCase,
2425
private val saveTimetableUseCase: SaveTimetableUseCase,
25-
private val saveScheduleUseCase: SaveScheduleUseCase
26+
private val saveScheduleUseCase: SaveScheduleUseCase,
27+
private val updateWeekendMealUseCase: UpdateWeekendMealUseCase
2628
) {
2729
@Scheduled(cron = "0 30 20 * * ?", zone = "Asia/Seoul")
2830
fun deleteTable() {
@@ -54,8 +56,13 @@ class ScheduleService(
5456
saveTimetableUseCase.saveTimetable(4)
5557
}
5658

57-
@Scheduled(cron = "0 0 8 * * ?")
59+
@Scheduled(cron = "0 0 8 * * ?", zone = "Asia/Seoul")
5860
fun saveSchedule() {
5961
saveScheduleUseCase.saveNeisInfoToDatabase()
6062
}
63+
64+
@Scheduled(cron = "0 0 23 L * ?", zone = "Asia/Seoul")
65+
fun weekendMealStatusReset() {
66+
updateWeekendMealUseCase.execute()
67+
}
6168
}

0 commit comments

Comments
 (0)