review comment fixes

espoon-voltti · Nov 22, 2024 · 5db7d19 · 5db7d19
1 parent f80084e
commit 5db7d19
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/service/src/main/kotlin/fi/espoo/evaka/calendarevent/CalendarEventController.kt b/service/src/main/kotlin/fi/espoo/evaka/calendarevent/CalendarEventController.kt
@@ -822,7 +822,6 @@ class CalendarEventController(
                             } +
                                 groupDevices.map {
                                     AsyncJob.SendCalendarEventReservationPushNotification(
-                                        user = user,
                                         device = it.device,
                                         groupId = it.groupId,
                                         type =
@@ -887,7 +886,6 @@ class CalendarEventController(
                         } +
                             groupDevices.map {
                                 AsyncJob.SendCalendarEventReservationPushNotification(
-                                    user = user,
                                     device = it.device,
                                     groupId = it.groupId,
                                     type =

diff --git a/service/src/main/kotlin/fi/espoo/evaka/calendarevent/CalendarEventPushNotifications.kt b/service/src/main/kotlin/fi/espoo/evaka/calendarevent/CalendarEventPushNotifications.kt
@@ -14,6 +14,7 @@ import fi.espoo.evaka.shared.async.AsyncJobRunner
 import fi.espoo.evaka.shared.auth.AuthenticatedUser
 import fi.espoo.evaka.shared.db.Database
 import fi.espoo.evaka.shared.domain.EvakaClock
+import fi.espoo.evaka.shared.domain.HelsinkiDateTime
 import fi.espoo.evaka.shared.security.AccessControl
 import fi.espoo.evaka.shared.security.Action
 import fi.espoo.evaka.webpush.WebPush
@@ -84,6 +85,17 @@ AND 'CALENDAR_EVENT_RESERVATION' = ANY(md.push_notification_categories)
     ) {
         if (webPush == null) return
 
+        val untilReservationEnd =
+            Duration.between(
+                clock.now().toInstant(),
+                HelsinkiDateTime.of(job.date, job.endTime).toInstant(),
+            )
+
+        if (untilReservationEnd.isNegative) {
+            // reservation is in the past, no need to send notification
+            return
+        }
+
         val device = job.device
 
         val (vapidJwt, notification) =
@@ -113,7 +125,7 @@ AND 'CALENDAR_EVENT_RESERVATION' = ANY(md.push_notification_categories)
                 vapidJwt,
                 WebPushNotification(
                     notification.endpoint,
-                    ttl = Duration.ofDays(1),
+                    ttl = untilReservationEnd.coerceIn(Duration.ofMinutes(15), Duration.ofDays(5)),
                     payloads =
                         listOf(
                             WebPushPayload.NotificationV1(

diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/async/AsyncJob.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/async/AsyncJob.kt
@@ -126,14 +126,15 @@ sealed interface AsyncJob : AsyncJobPayload {
     }
 
     data class SendCalendarEventReservationPushNotification(
-        override val user: AuthenticatedUser,
         val device: MobileDeviceId,
         val groupId: GroupId,
         val type: CalendarEventReservationNotificationType,
         val date: LocalDate,
         val startTime: LocalTime,
         val endTime: LocalTime,
-    ) : AsyncJob
+    ) : AsyncJob {
+        override val user: AuthenticatedUser? = null
+    }
 
     data class UploadToKoski(val key: KoskiStudyRightKey) : AsyncJob {
         override val user: AuthenticatedUser? = null