Skip to content

fix rollover error #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndmik-dev merged 1 commit into from
Mar 5, 2026
Merged

fix rollover error #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions src/main/java/ua/ndmik/bot/scheduler/MidnightRolloverScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ public void rolloverSchedulesAtMidnight() {
log.info("Running daily schedule rollover");
scheduleRepository.deleteByDay(TODAY.name());
List<Schedule> tomorrowSchedules = scheduleRepository.findByDay(TOMORROW.name());
scheduleRepository.deleteByDay(TOMORROW.name());
if (tomorrowSchedules.isEmpty()) {
log.info("No tomorrow schedules found, rollover finished");
return;
}
List<Schedule> rolledSchedules = tomorrowSchedules.stream()
.map(schedule -> Schedule.builder()
.area(schedule.getArea())
Expand All @@ -46,19 +49,14 @@ public void rolloverSchedulesAtMidnight() {
.needToNotify(Boolean.FALSE)
.build())
.toList();
List<Schedule> emptyTomorrowSchedules = tomorrowSchedules.stream()
.map(schedule -> Schedule.builder()
.area(schedule.getArea())
.groupId(schedule.getGroupId())
.scheduleDay(TOMORROW)
.schedule(buildAllYesScheduleJson())
.lastUpdate(schedule.getLastUpdate())
.needToNotify(Boolean.FALSE)
.build())
.toList();
List<Schedule> schedulesToSave = new ArrayList<>(rolledSchedules.size() + emptyTomorrowSchedules.size());
String allYesScheduleJson = buildAllYesScheduleJson();
tomorrowSchedules.forEach(schedule -> {
schedule.setSchedule(allYesScheduleJson);
schedule.setNeedToNotify(Boolean.FALSE);
});
List<Schedule> schedulesToSave = new ArrayList<>(rolledSchedules.size() + tomorrowSchedules.size());
schedulesToSave.addAll(rolledSchedules);
schedulesToSave.addAll(emptyTomorrowSchedules);
schedulesToSave.addAll(tomorrowSchedules);
scheduleRepository.saveAll(schedulesToSave);
log.info("Schedules were rolled over");
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ua/ndmik/bot/scheduler/ShutdownsScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@Service
@Slf4j
public class ShutdownsScheduler {
private static final String TOMORROW_SCHEDULE_APPEARED_MESSAGE = "📅 Графік на завтра зʼявився";
private static final String TOMORROW_SCHEDULE_APPEARED_MESSAGE = "🔔 Графік на завтра зʼявився";
private static final String SCHEDULE_CHANGED_MESSAGE = "🔄 Графік змінився";

private final DtekClient dtekClient;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/ua/ndmik/bot/service/TelegramService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ public String formatMessage(UserSettings user, String header) {
String template = """
%s
%s

⚙️ <b>Ваші налаштування</b>

🏙️ Регіон: <b>%s</b>
Expand Down
9 changes: 5 additions & 4 deletions src/test/java/ua/ndmik/bot/scheduler/MidnightRolloverSchedulerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,30 @@ void rolloverSchedulesAtMidnight_promotesTomorrowScheduleAndResetsNotifications(
new HourOverride(10, HourState.NO),
new HourOverride(11, HourState.NO)
));
String tomorrowScheduleJson = tomorrow.getSchedule();

given(scheduleRepository.findByDay(ScheduleDay.TOMORROW.name())).willReturn(List.of(tomorrow));

scheduler.rolloverSchedulesAtMidnight();

List<Schedule> savedSchedules = capturedSavedSchedules();
assertThat(find(savedSchedules, ScheduleDay.TODAY, "2.1").getSchedule()).isEqualTo(tomorrow.getSchedule());
assertThat(find(savedSchedules, ScheduleDay.TODAY, "2.1").getSchedule()).isEqualTo(tomorrowScheduleJson);
assertThat(find(savedSchedules, ScheduleDay.TOMORROW, "2.1").getSchedule()).isEqualTo(allDayWithPowerJson());
assertThat(find(savedSchedules, ScheduleDay.TODAY, "2.1").getNeedToNotify()).isFalse();
assertThat(find(savedSchedules, ScheduleDay.TOMORROW, "2.1").getNeedToNotify()).isFalse();
}

@Test
void rolloverSchedulesAtMidnight_deletesDaysAndSavesNothingWhenTomorrowIsMissing() {
void rolloverSchedulesAtMidnight_deletesTodayAndSavesNothingWhenTomorrowIsMissing() {
MidnightRolloverScheduler scheduler = new MidnightRolloverScheduler(scheduleRepository);

given(scheduleRepository.findByDay(ScheduleDay.TOMORROW.name())).willReturn(List.of());

scheduler.rolloverSchedulesAtMidnight();

then(scheduleRepository).should().deleteByDay(ScheduleDay.TODAY.name());
then(scheduleRepository).should().deleteByDay(ScheduleDay.TOMORROW.name());
assertThat(capturedSavedSchedules()).isEmpty();
then(scheduleRepository).should().findByDay(ScheduleDay.TOMORROW.name());
then(scheduleRepository).shouldHaveNoMoreInteractions();
}

private List<Schedule> capturedSavedSchedules() {
Expand Down