feat/qg-290: добавлены топики веб-пушей

Author: d-r-q

app/src/main/kotlin/pro/qyoga/app/therapist/appointments/notifications/SendFillScheduleNotificationsOp.kt

@@ -14,9 +14,10 @@ import java.time.ZoneOffset
 
 
 val fillScheduleWebPush = WebPush(
-    "Не забудьте заполнить расписание",
-    "Открыть приложение",
-    URI.create(GetCalendarAppointmentsOp.PATH)
+    title = "Не забудьте заполнить расписание",
+    body = "Открыть приложение",
+    deepLink = URI.create(GetCalendarAppointmentsOp.PATH),
+    topic = "fill-schedule"
 )
 
 @Component

app/src/main/kotlin/pro/qyoga/i9ns/pushes/web/WebPushServiceClient.kt

@@ -1,15 +1,16 @@
 package pro.qyoga.i9ns.pushes.web
 
-import nl.martijndwars.webpush.Encoding
-import nl.martijndwars.webpush.Notification
-import nl.martijndwars.webpush.PushService
+import nl.martijndwars.webpush.*
+import org.bouncycastle.jce.interfaces.ECPublicKey
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
 import pro.qyoga.i9ns.pushes.web.model.WebPush
 import pro.qyoga.i9ns.pushes.web.model.WebPushSubscription
 import java.security.Security
+import java.time.Duration
+import java.util.*
 
 
 @Component
@@ -31,12 +32,7 @@ class WebPushServiceClient(
     )
 
     fun sendPush(subscription: WebPushSubscription, push: WebPush) {
-        val notification = Notification(
-            subscription.endpoint,
-            subscription.keys.p256dh,
-            subscription.keys.auth,
-            push.toPayloadJson()
-        )
+        val notification = createNotification(subscription, push)
 
         val resp = pushService.send(notification, Encoding.AES128GCM)
         if (resp.statusLine.statusCode != 201) {
@@ -50,6 +46,19 @@ class WebPushServiceClient(
 
 }
 
+private fun createNotification(
+    subscription: WebPushSubscription,
+    push: WebPush
+): Notification = Notification(
+    /* endpoint = */ subscription.endpoint,
+    /* userPublicKey = */ Utils.loadPublicKey(subscription.keys.p256dh) as ECPublicKey,
+    /* userAuth = */ Base64.getUrlDecoder().decode(subscription.keys.auth),
+    /* payload = */ push.toPayloadJson().toByteArray(),
+    /* ttl = */ Duration.ofDays(7).toSeconds().toInt(),
+    /* urgency = */ Urgency.NORMAL,
+    /* topic = */ push.topic
+)
+
 private fun WebPush.toPayloadJson() =
     """
         {

app/src/main/kotlin/pro/qyoga/i9ns/pushes/web/model/WebPush.kt

@@ -6,5 +6,6 @@ import java.net.URI
 data class WebPush(
     val title: String,
     val body: String,
-    val deepLink: URI
+    val deepLink: URI,
+    val topic: String
 )