chat/v2: add chat_id to push header, debug logs

Author: mfycheng

pkg/code/push/notifications.go

@@ -16,6 +16,7 @@ import (
 	"github.com/code-payments/code-server/pkg/code/common"
 	code_data "github.com/code-payments/code-server/pkg/code/data"
 	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
+	chat_v2 "github.com/code-payments/code-server/pkg/code/data/chat/v2"
 	"github.com/code-payments/code-server/pkg/code/localization"
 	"github.com/code-payments/code-server/pkg/code/thirdparty"
 	currency_lib "github.com/code-payments/code-server/pkg/currency"
@@ -418,6 +419,7 @@ func SendChatMessagePushNotificationV2(
 	ctx context.Context,
 	data code_data.Provider,
 	pusher push_lib.Provider,
+	chatId chat_v2.ChatId,
 	chatTitle string,
 	owner *common.Account,
 	chatMessage *chatv2pb.ChatMessage,
@@ -533,6 +535,7 @@ func SendChatMessagePushNotificationV2(
 
 		kvs := map[string]string{
 			"chat_title":      localizedPushTitle,
+			"chat_id":         chatId.String(),
 			"message_content": base64.StdEncoding.EncodeToString(marshalledContent),
 		}
 

pkg/code/server/grpc/chat/v2/server.go

@@ -1412,10 +1412,11 @@ func (s *Server) onPersistChatMessage(log *logrus.Entry, chatId chat.ChatId, cha
 func (s *Server) sendPushNotifications(chatId chat.ChatId, chatTitle string, sender chat.MemberId, message *chatpb.ChatMessage) {
 	log := s.log.WithFields(logrus.Fields{
 		"method":  "sendPushNotifications",
+		"sender":  sender.String(),
 		"chat_id": chatId.String(),
 	})
 
-	// todo: err group
+	// TODO: Callers might already have this loaded.
 	members, err := s.data.GetAllChatMembersV2(context.Background(), chatId)
 	if err != nil {
 		log.WithError(err).Warn("failure getting chat members")
@@ -1438,10 +1439,12 @@ func (s *Server) sendPushNotifications(chatId chat.ChatId, chatTitle string, sen
 
 		m := m
 		eg.Go(func() error {
+			log.WithField("member", m.MemberId.String()).Info("sending push notification")
 			err = push_util.SendChatMessagePushNotificationV2(
 				context.Background(),
 				s.data,
 				s.push,
+				chatId,
 				chatTitle,
 				owner,
 				message,