add options to delay broadcast notifications

ice-blockchain · Jan 17, 2024 · b7e95b8 · b7e95b8
1 parent 2c60a49
commit b7e95b8
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 7 deletions.
diff --git a/notifications/push/contract.go b/notifications/push/contract.go
@@ -30,6 +30,8 @@ type (
 		Title    string `json:"title,omitempty"`
 		Body     string `json:"body,omitempty"`
 		ImageURL string `json:"imageUrl,omitempty"`
+		MinDelay uint   `json:"minDelay"`
+		MaxDelay uint   `json:"maxDelay"`
 	}
 	Client interface {
 		io.Closer
@@ -47,6 +49,15 @@ const (
 	requestDeadline                                  = 25 * stdlibtime.Second
 	fcmSendAllBufferingDeadline                      = 1 * stdlibtime.Second
 	fcmSendAllSlowProcessingMonitoringTickerDeadline = 3 * fcmSendAllBufferingDeadline
+
+	dataOnlyTitle    = "title"
+	dataOnlyBody     = "body"
+	dataOnlyImageURL = "imageURL"
+	dataOnlyMinDelay = "minDelaySec"
+	dataOnlyMaxDelay = "maxDelaySec"
+	dataOnlyType     = "type"
+
+	typeDelayedNotification = "delayed"
 )
 
 type (

diff --git a/notifications/push/push.go b/notifications/push/push.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"runtime"
+	"strconv"
 	"strings"
 	"sync"
 	stdlibtime "time"
@@ -124,19 +125,51 @@ func (p *push) Send(ctx context.Context, notif *Notification[DeviceToken], respo
 func (p *push) Broadcast(ctx context.Context, notification *Notification[SubscriptionTopic]) error {
 	return errors.Wrapf(retry(ctx, func() error {
 		_, err := p.client.Send(ctx, &fcm.Message{
-			Data: notification.Data,
-			Notification: &fcm.Notification{
-				Title:    notification.Title,
-				Body:     notification.Body,
-				ImageURL: notification.ImageURL,
-			},
-			Topic: string(notification.Target),
+			Data:    notification.Data,
+			Android: buildAndroidDataOnlyNotification(notification),
+			APNS:    buildAppleNotification(notification),
+			Topic:   string(notification.Target),
 		})
 
 		return err //nolint:wrapcheck // No need to do that, it's wrapped outside.
 	}), "[%v] permanently failed to broadcast %#v", p.applicationYAMLKey, notification)
 }
 
+func buildAndroidDataOnlyNotification(notification *Notification[SubscriptionTopic]) *fcm.AndroidConfig {
+	dataOnlyNotification := make(map[string]string, len(notification.Data)+3)
+	for k, v := range notification.Data {
+		dataOnlyNotification[k] = v
+	}
+	dataOnlyNotification[dataOnlyTitle] = notification.Title
+	dataOnlyNotification[dataOnlyBody] = notification.Body
+	dataOnlyNotification[dataOnlyImageURL] = notification.ImageURL
+	dataOnlyNotification[dataOnlyType] = typeDelayedNotification
+	dataOnlyNotification[dataOnlyMinDelay] = strconv.FormatUint(uint64(notification.MinDelay), 10)
+	dataOnlyNotification[dataOnlyMaxDelay] = strconv.FormatUint(uint64(notification.MaxDelay), 10)
+
+	return &fcm.AndroidConfig{
+		Data:     dataOnlyNotification,
+		Priority: "high",
+	}
+}
+
+func buildAppleNotification(notification *Notification[SubscriptionTopic]) *fcm.APNSConfig {
+	return &fcm.APNSConfig{
+		Payload: &fcm.APNSPayload{
+			Aps: &fcm.Aps{
+				AlertString: "",
+				Alert: &fcm.ApsAlert{
+					Title: notification.Title,
+					Body:  notification.Body,
+				},
+			},
+		},
+		FCMOptions: &fcm.APNSFCMOptions{
+			ImageURL: notification.ImageURL,
+		},
+	}
+}
+
 func retry(ctx context.Context, op func() error) error {
 	//nolint:wrapcheck // No need, its just a proxy.
 	return backoff.RetryNotify(