From 3683c9a8fef096104d67a4311262cbcd182e75cd Mon Sep 17 00:00:00 2001
From: icey-yu <1186114839@qq.com>
Date: Wed, 12 Jun 2024 15:59:26 +0800
Subject: [PATCH] fix:FCM push failed will return error

---
 internal/push/offlinepush/fcm/push.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/internal/push/offlinepush/fcm/push.go b/internal/push/offlinepush/fcm/push.go
index ec973008e..7f04c1cfd 100644
--- a/internal/push/offlinepush/fcm/push.go
+++ b/internal/push/offlinepush/fcm/push.go
@@ -16,8 +16,10 @@ package fcm
 
 import (
 	"context"
+	"fmt"
 	"github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/options"
 	"path/filepath"
+	"strings"
 
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/messaging"
@@ -79,6 +81,8 @@ func (f *Fcm) Push(ctx context.Context, userIDs []string, title, content string,
 	notification.Body = content
 	notification.Title = title
 	var messages []*messaging.Message
+	var sendErrBuilder strings.Builder
+	var msgErrBuilder strings.Builder
 	for userID, personTokens := range allTokens {
 		apns := &messaging.APNSConfig{Payload: &messaging.APNSPayload{Aps: &messaging.Aps{Sound: opts.IOSPushSound}}}
 		messageCount := len(messages)
@@ -86,9 +90,21 @@ func (f *Fcm) Push(ctx context.Context, userIDs []string, title, content string,
 			response, err := f.fcmMsgCli.SendAll(ctx, messages)
 			if err != nil {
 				Fail = Fail + messageCount
+				// Record push error
+				sendErrBuilder.WriteString(err.Error())
+				sendErrBuilder.WriteByte('\n')
 			} else {
 				Success = Success + response.SuccessCount
 				Fail = Fail + response.FailureCount
+				if response.FailureCount != 0 {
+					// Record message error
+					for i := range response.Responses {
+						if !response.Responses[i].Success {
+							msgErrBuilder.WriteString(response.Responses[i].Error.Error())
+							msgErrBuilder.WriteByte('\n')
+						}
+					}
+				}
 			}
 			messages = messages[0:0]
 		}
@@ -134,5 +150,9 @@ func (f *Fcm) Push(ctx context.Context, userIDs []string, title, content string,
 			Fail = Fail + response.FailureCount
 		}
 	}
+	if Fail != 0 {
+		return errs.New(fmt.Sprintf("%d message send failed\nsend err:%s\n,message err:%s",
+			Fail, sendErrBuilder.String(), msgErrBuilder.String())).Wrap()
+	}
 	return nil
 }