patch: fix build error && deletion bug

OpenSrcerer · Apr 7, 2024 · f1bb9fa · f1bb9fa
1 parent cc85b72
commit f1bb9fa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/main/kotlin/online/danielstefani/paddy/cron/CronController.kt b/src/main/kotlin/online/danielstefani/paddy/cron/CronController.kt
@@ -7,6 +7,7 @@ import io.quarkus.scheduler.Scheduled
 import jakarta.enterprise.context.ApplicationScoped
 import jakarta.enterprise.event.Observes
 import online.danielstefani.paddy.schedule.ScheduleRepository
+import reactor.core.publisher.Mono
 import java.util.concurrent.TimeUnit
 
 @ApplicationScoped
@@ -35,7 +36,7 @@ class CronController(
     // Load schedules at startup
     fun loadSchedules(@Observes event: StartupEvent) {
         val schedules = scheduleRepository.getAll()
-            .onEach { cronService.reloadSchedule(it.id!!) }
+            .onEach { cronService.reloadSchedule(it) }
             .size
 
         Log.info("[cron] Loaded <$schedules> schedule(s) to execute.")
@@ -46,6 +47,8 @@ class CronController(
         val scheduleId = mqtt5Publish.topic.levels.last().toLong()
         Log.debug("[cron] Received an update for schedule <$scheduleId>.")
 
-        cronService.reloadSchedule(scheduleId)
+        Mono.fromCallable { scheduleRepository.get(scheduleId) }
+            .map { cronService.reloadSchedule(it) }
+            .subscribe()
     }
 }
diff --git a/src/main/kotlin/online/danielstefani/paddy/cron/CronService.kt b/src/main/kotlin/online/danielstefani/paddy/cron/CronService.kt
@@ -45,14 +45,14 @@ class CronService(
             .log()
     }
 
+    /*
+    Effectively removes the schedule only if it is null.
+     */
     fun reloadSchedule(schedule: Schedule?) {
-        if (schedule == null) {
-            Log.error("[cron->service] Could not reload schedule, it was null after updater!")
-            return
-        }
+        scheduledCrons.removeIf { it.id == schedule?.id }
 
-        scheduledCrons.removeIf { it.id == schedule.id }
-        scheduledCrons.add(schedule)
+        if (schedule != null)
+            scheduledCrons.add(schedule)
     }
 
     /*

diff --git a/src/main/kotlin/online/danielstefani/paddy/schedule/Schedule.kt b/src/main/kotlin/online/danielstefani/paddy/schedule/Schedule.kt
@@ -96,7 +96,7 @@ open class Schedule {
 
         val isReady = nextExec < timeNowAdjusted
 
-        Log.trace("""[cron->service] Schedule <${id!!}> status:
+        Log.info("""[cron->service] Schedule <${id!!}> status:
             [Single]:     ${isSingle()}
             [Ready]:      $isReady
             [Cron]:       ${periodic ?: "N/A"}

diff --git a/src/main/kotlin/online/danielstefani/paddy/schedule/ScheduleRepository.kt b/src/main/kotlin/online/danielstefani/paddy/schedule/ScheduleRepository.kt
@@ -17,7 +17,7 @@ class ScheduleRepository(
     fun get(id: Long): Schedule? {
         return with(factory.openSession()) {
             this.load(Schedule::class.java, id, SCHEDULE_LOAD_DEPTH)
-        }
+        }?.also { it.load() }
     }
 
     fun getAll(): Collection<Schedule> {