From e9b17707ab6dc4afcc0a4e9e48cecf39b0737e90 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sun, 8 Oct 2023 12:36:57 +0200
Subject: [PATCH] Added logging

---
 .../bahnApi/tasks/DeleteScheduledTask.kt      | 11 +++++++++++
 .../bahnApi/tasks/FetchTimetableTask.kt       | 19 ++++++++++++++-----
 .../bahnApi/tasks/StoreTimetableTask.kt       |  6 ++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/DeleteScheduledTask.kt b/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/DeleteScheduledTask.kt
index be3b8ed..9c91985 100644
--- a/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/DeleteScheduledTask.kt
+++ b/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/DeleteScheduledTask.kt
@@ -2,6 +2,7 @@ package de.twomartens.timetable.bahnApi.tasks
 
 import de.twomartens.timetable.bahnApi.model.db.ScheduledFetchTask
 import de.twomartens.timetable.bahnApi.repository.ScheduledFetchTaskRepository
+import mu.KotlinLogging
 import org.springframework.scheduling.annotation.Async
 
 @Async
@@ -10,6 +11,16 @@ open class DeleteScheduledTask(
         private val scheduledFetchTask: ScheduledFetchTask
 ) : Runnable {
     override fun run() {
+        log.info {
+            "Delete scheduled fetch task after the fetch occurred: " +
+                    "[eva: ${scheduledFetchTask.eva}], " +
+                    "[date: ${scheduledFetchTask.fetchedDate}], " +
+                    "[time: ${scheduledFetchTask.fetchedTime}]"
+        }
         scheduledFetchTaskRepository.delete(scheduledFetchTask)
     }
+
+    companion object {
+        private val log = KotlinLogging.logger {}
+    }
 }
\ No newline at end of file
diff --git a/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/FetchTimetableTask.kt b/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/FetchTimetableTask.kt
index 3183f9d..9351d48 100644
--- a/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/FetchTimetableTask.kt
+++ b/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/FetchTimetableTask.kt
@@ -1,24 +1,33 @@
 package de.twomartens.timetable.bahnApi.tasks
 
-import de.twomartens.timetable.bahnApi.repository.ScheduledFetchTaskRepository
 import de.twomartens.timetable.bahnApi.service.BahnApiService
 import de.twomartens.timetable.bahnApi.service.BahnDatabaseService
+import de.twomartens.timetable.model.Eva
+import de.twomartens.timetable.model.Hour
+import mu.KotlinLogging
 import org.springframework.scheduling.annotation.Async
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
 import java.time.LocalDate
-import java.time.LocalTime
 
 @Async
 open class FetchTimetableTask(
-        private val eva: Int,
+        private val eva: Eva,
         private val date: LocalDate,
-        private val hour: LocalTime,
+        private val hour: Hour,
         private val bahnApiService: BahnApiService,
         private val bahnDatabaseService: BahnDatabaseService,
         private val executor: ThreadPoolTaskExecutor) : Runnable {
     override fun run() {
+        log.info {
+            "Fetch timetable: [eva: $eva], [date: $date], [hour: $hour]"
+        }
         val timetable = bahnApiService.fetchTimetable(eva, date, hour)
-        val storeTask = StoreTimetableTask(timetable, date.atTime(hour), bahnDatabaseService)
+        val storeTask = StoreTimetableTask(timetable, date.atTime(hour.value, 0),
+                bahnDatabaseService)
         executor.execute(storeTask)
     }
+
+    companion object {
+        private val log = KotlinLogging.logger {}
+    }
 }
\ No newline at end of file
diff --git a/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/StoreTimetableTask.kt b/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/StoreTimetableTask.kt
index e3074d5..b2c153a 100644
--- a/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/StoreTimetableTask.kt
+++ b/module-server/src/main/kotlin/de/twomartens/timetable/bahnApi/tasks/StoreTimetableTask.kt
@@ -2,6 +2,7 @@ package de.twomartens.timetable.bahnApi.tasks
 
 import de.twomartens.timetable.bahnApi.model.dto.BahnTimetable
 import de.twomartens.timetable.bahnApi.service.BahnDatabaseService
+import mu.KotlinLogging
 import org.springframework.scheduling.annotation.Async
 import java.time.LocalDateTime
 
@@ -12,6 +13,11 @@ open class StoreTimetableTask(
         private val bahnDatabaseService: BahnDatabaseService
 ) : Runnable {
     override fun run() {
+        log.info { "Store timetable: [eva: ${timetable.eva}], station: ${timetable.station}]" }
         bahnDatabaseService.storeTimetable(timetable, dateTime)
     }
+
+    companion object {
+        private val log = KotlinLogging.logger {}
+    }
 }
\ No newline at end of file