Yimaru/Yimaru-BackEnd
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize FCM client lazily during push send.

Browse Source 
Add ensureFCMClient() so push APIs retry FCM initialization at request time and return actionable initialization errors when the service account key is empty or invalid.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Yared Yemane 2026-05-11 10:58:42 -07:00
parent 23322c69cc
commit 4509fe2dc0
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/services/notification/service.go
View File

@ -15,6 +15,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"strconv" "strconv"
"strings"
// "errors" // "errors"
"log/slog" "log/slog"
@ -22,11 +23,11 @@ import (
"time" "time"
// "github.com/segmentio/kafka-go" // "github.com/segmentio/kafka-go"
"go.uber.org/zap"
firebase "firebase.google.com/go/v4" firebase "firebase.google.com/go/v4"
"firebase.google.com/go/v4/messaging" "firebase.google.com/go/v4/messaging"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/resend/resend-go/v2" "github.com/resend/resend-go/v2"
"go.uber.org/zap"
"google.golang.org/api/option" "google.golang.org/api/option"
// "github.com/redis/go-redis/v9" // "github.com/redis/go-redis/v9"
) )
@ -114,6 +115,19 @@ func (s *Service) initFCMClient() error {
return nil return nil
} }
func (s *Service) ensureFCMClient() error {
if s.fcmClient != nil {
return nil
}
if strings.TrimSpace(s.config.FCMServiceAccountKey) == "" {
return fmt.Errorf("FCM_SERVICE_ACCOUNT_KEY is empty")
}
if err := s.initFCMClient(); err != nil {
return fmt.Errorf("failed to initialize FCM client: %w", err)
}
return nil
}
func (s *Service) SendAfroMessageSMSTemp( func (s *Service) SendAfroMessageSMSTemp(
ctx context.Context, ctx context.Context,
receiverPhone string, receiverPhone string,
@ -539,8 +553,8 @@ func (s *Service) SendNotificationEmail(ctx context.Context, recipientID int64,
} }
func (s *Service) SendPushNotification(ctx context.Context, notification *domain.Notification) error { func (s *Service) SendPushNotification(ctx context.Context, notification *domain.Notification) error {
if s.fcmClient == nil { if err := s.ensureFCMClient(); err != nil {
return fmt.Errorf("FCM client not initialized") return err
} }
// Get user device tokens // Get user device tokens
@ -622,8 +636,8 @@ func (s *Service) MessengerSvc() *messenger.Service {
} }
func (s *Service) SendBulkPushNotification(ctx context.Context, userIDs []int64, notification *domain.Notification) (sent int, failed int, err error) { func (s *Service) SendBulkPushNotification(ctx context.Context, userIDs []int64, notification *domain.Notification) (sent int, failed int, err error) {
if s.fcmClient == nil { if err := s.ensureFCMClient(); err != nil {
return 0, 0, fmt.Errorf("FCM client not initialized") return 0, 0, err
} }
// Collect all device tokens for the given users // Collect all device tokens for the given users