Merge pull request #1206 from guardian/LIVE-6160-upgrade-firebase-v9_2_0

LIVE-6160 Upgrade firebase to v9.2.0
guardian · Feb 29, 2024 · dac5a7d · dac5a7d
2 parents 9894b5f + 73ba5e7
commit dac5a7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -410,7 +410,7 @@ lazy val notificationworkerlambda = lambda("notificationworkerlambda", "notifica
     dockerAlias := DockerAlias(registryHost = dockerRepository.value, username = None, name = (Docker / packageName).value, tag = buildNumber),
     libraryDependencies ++= Seq(
       "com.turo" % "pushy" % "0.13.10",
-      "com.google.firebase" % "firebase-admin" % "9.1.1",
+      "com.google.firebase" % "firebase-admin" % "9.2.0",
       "com.google.protobuf" % "protobuf-java" % "3.25.3",
       "com.amazonaws" % "aws-lambda-java-events" % "2.2.9",
       "com.amazonaws" % "aws-java-sdk-sqs" % awsSdkVersion,

diff --git a/...ationworkerlambda/src/main/scala/com/gu/notifications/worker/delivery/fcm/FcmClient.scala b/...ationworkerlambda/src/main/scala/com/gu/notifications/worker/delivery/fcm/FcmClient.scala
@@ -99,7 +99,7 @@ class FcmClient (firebaseMessaging: FirebaseMessaging, firebaseApp: FirebaseApp,
       import FirebaseHelpers._
       val start = Instant.now
       firebaseMessaging
-        .sendMulticastAsync(message)
+        .sendEachForMulticastAsync(message)
         .asScala
         .onComplete { response =>
           val requestCompletionTime = Instant.now

diff --git a/...ficationworkerlambda/src/main/scala/com/gu/notifications/worker/tokens/TokenService.scala b/...ficationworkerlambda/src/main/scala/com/gu/notifications/worker/tokens/TokenService.scala
@@ -17,6 +17,9 @@ case class BatchNotification(notification: Notification, token: List[String])
 
 case class ChunkedTokens(notification: Notification, tokens: List[String], range: ShardRange, metadata: NotificationMetadata) {
   def toNotificationToSends: List[IndividualNotification] = tokens.map(IndividualNotification(notification, _))
+
+  // the Firebase sendEachForMulticast API has a maximum limit of 500 tokens for each request
+  // so this grouping of 500 tokens must not be increased further
   def toBatchNotificationToSends: List[BatchNotification] = tokens.grouped(500).map(BatchNotification(notification, _)).toList
 }