Matte23/circolapp
1
0
Fork 0
mirror of https://github.com/Matte23/circolapp.git synced 2025-12-06 07:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sent all the data required to create a notification within the message

Browse Source
This commit is contained in:
Matte23
2020-12-30 18:10:07 +01:00
parent c4e2c1950a
commit ceed971618
9 changed files with 199 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/build.gradle.kts
View File

@@ -1,6 +1,6 @@
plugins {
id("kotlin-platform-jvm")
id("application")
kotlin("jvm")
application
id("com.github.johnrengelman.shadow")
}

0
backend/src/main/java/net/underdesk/circolapp/backend/JavaDatabase.kt → backend/src/main/kotlin/net/underdesk/circolapp/backend/JavaDatabase.kt
View File

22
backend/src/main/java/net/underdesk/circolapp/backend/PushNotificationUtils.kt → backend/src/main/kotlin/net/underdesk/circolapp/backend/PushNotificationUtils.kt
View File

@@ -21,32 +21,36 @@ package net.underdesk.circolapp.backend
import com.google.firebase.messaging.FirebaseMessaging
import com.google.firebase.messaging.Message
import com.google.firebase.messaging.Notification
import net.underdesk.circolapp.shared.data.Circular
import java.time.LocalDateTime
object PushNotificationUtils {
fun createPushNotification(topic: String) {
fun createPushNotification(circular: Circular, topic: String) {
val message = Message.builder()
.putData("fetchCircular", "true")
.putData("newCircular", true.toString())
.putData("id", circular.id.toString())
.putData("name", circular.name)
.putData("url", circular.url)
.setTopic(topic)
.build()
val response = FirebaseMessaging.getInstance().send(message)
val response = FirebaseMessaging.getInstance().send(message.build())
val current = LocalDateTime.now()
print("Sent data push notification for topic $topic with response $response at time $current \n")
print("Sent data push notification with circular ${circular.id} for topic $topic with response $response at time $current \n")
}
fun createPushNotificationiOS(topic: String) {
fun createPushNotificationiOS(circular: Circular, topic: String) {
val realTopic = topic + "IOS"
val message = Message.builder()
.setNotification(
Notification.builder()
.setTitle("Nuove circolari")
.setBody("La tua scuola ha pubblicato nuove circolari")
.setTitle("Circolare numero " + circular.id)
.setBody(circular.name)
.build()
)
.putData("url", circular.url)
.setTopic(realTopic)
.build()
@@ -54,6 +58,6 @@ object PushNotificationUtils {
val current = LocalDateTime.now()
print("Sent managed push notification for topic $realTopic with response $response at time $current \n")
print("Sent managed push notification with circular ${circular.id} for topic $realTopic with response $response at time $current \n")
}
}

0
backend/src/main/java/net/underdesk/circolapp/backend/Server.kt → backend/src/main/kotlin/net/underdesk/circolapp/backend/Server.kt
View File

12
backend/src/main/java/net/underdesk/circolapp/backend/ServerUtils.kt → backend/src/main/kotlin/net/underdesk/circolapp/backend/ServerUtils.kt
View File

@@ -72,8 +72,16 @@ class ServerUtils {
val newCirculars = updateCirculars(server)
if (newCirculars.second != -1 && newCirculars.first.isNotEmpty()) {
PushNotificationUtils.createPushNotification(ServerAPI.getServerTopic(server.serverID))
PushNotificationUtils.createPushNotificationiOS(ServerAPI.getServerTopic(server.serverID))
for (circular in newCirculars.first) {
PushNotificationUtils.createPushNotification(
circular,
ServerAPI.getServerTopic(server.serverID)
)
PushNotificationUtils.createPushNotificationiOS(
circular,
ServerAPI.getServerTopic(server.serverID)
)
}
}
}
}