MM-36687 Fix CRT Notifications (#85)

* Added ios grouping and is_crt_enabled

* rootId is added to base push notification

* is_crt_enabled is passed as boolean instead of string

* Add rootId only when available

Author: anurag6713

server/android_notification_server.go

@@ -38,11 +38,16 @@ func (me *AndroidNotificationServer) Initialize() bool {
 func (me *AndroidNotificationServer) SendNotification(msg *PushNotification) PushResponse {
 	pushType := msg.Type
 	data := map[string]interface{}{
-		"ack_id":     msg.AckID,
-		"type":       pushType,
-		"badge":      msg.Badge,
-		"version":    msg.Version,
-		"channel_id": msg.ChannelID,
+		"ack_id":         msg.AckID,
+		"type":           pushType,
+		"badge":          msg.Badge,
+		"version":        msg.Version,
+		"channel_id":     msg.ChannelID,
+		"is_crt_enabled": msg.IsCRTEnabled,
+	}
+
+	if msg.RootID != "" {
+		data["root_id"] = msg.RootID
 	}
 
 	if msg.IsIDLoaded {
@@ -58,7 +63,6 @@ func (me *AndroidNotificationServer) SendNotification(msg *PushNotification) Pus
 		data["message"] = emoji.Sprint(msg.Message)
 		data["channel_name"] = msg.ChannelName
 		data["post_id"] = msg.PostID
-		data["root_id"] = msg.RootID
 		data["override_username"] = msg.OverrideUsername
 		data["override_icon_url"] = msg.OverrideIconURL
 		data["from_webhook"] = msg.FromWebhook

server/apple_notification_server.go

@@ -129,9 +129,16 @@ func (me *AppleNotificationServer) SendNotification(msg *PushNotification) PushR
 		data.Custom("ack_id", msg.AckID)
 	}
 
+	data.Custom("is_crt_enabled", msg.IsCRTEnabled)
+
 	if msg.ChannelID != "" {
 		data.Custom("channel_id", msg.ChannelID)
-		data.ThreadID(msg.ChannelID)
+
+		if msg.IsCRTEnabled && msg.RootID != "" {
+			data.ThreadID(msg.RootID)
+		} else {
+			data.ThreadID(msg.ChannelID)
+		}
 	}
 
 	if msg.TeamID != "" {

server/push_notification.go

@@ -51,6 +51,7 @@ type PushNotification struct {
 	OverrideIconURL  string `json:"override_icon_url"`
 	FromWebhook      string `json:"from_webhook"`
 	Version          string `json:"version"`
+	IsCRTEnabled     bool   `json:"is_crt_enabled"`
 	IsIDLoaded       bool   `json:"is_id_loaded"`
 }