extend notifications response

SwimResults · Dec 4, 2024 · aebe143 · aebe143
1 parent 4ac7451
commit aebe143
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/controller/notification_controller.go b/controller/notification_controller.go
@@ -78,7 +78,7 @@ func sendNotificationForMeeting(c *gin.Context) {
 		return
 	}
 
-	users, notificationUsers, err := service.SendPushNotificationForMeeting(meeting, request.Title, request.Subtitle, request.Message)
+	users, notificationUsers, success, err := service.SendPushNotificationForMeeting(meeting, request.Title, request.Subtitle, request.Message)
 	if err != nil {
 		c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
 		return
@@ -87,6 +87,7 @@ func sendNotificationForMeeting(c *gin.Context) {
 	c.IndentedJSON(http.StatusOK, dto.NotificationsResponseDto{
 		UserCount:             users,
 		NotificationUserCount: notificationUsers,
+		SuccessCount:          success,
 	})
 }
 

diff --git a/dto/notification_request.go b/dto/notification_request.go
@@ -14,4 +14,5 @@ type NotificationResponseDto struct {
 type NotificationsResponseDto struct {
 	UserCount             int `json:"user_count"`
 	NotificationUserCount int `json:"notification_user_count"`
+	SuccessCount          int `json:"success_count"`
 }
diff --git a/service/notification_service.go b/service/notification_service.go
@@ -63,10 +63,10 @@ func SendTestPushNotification(receiver string) error {
 	return nil
 }
 
-func SendPushNotificationForMeeting(meeting string, title string, subtitle string, message string) (int, int, error) {
+func SendPushNotificationForMeeting(meeting string, title string, subtitle string, message string) (int, int, int, error) {
 	athletes, err := ac.GetAthletesByMeeting(meeting)
 	if err != nil {
-		return 0, 0, err
+		return 0, 0, 0, err
 	}
 
 	var athleteIds []primitive.ObjectID
@@ -76,7 +76,7 @@ func SendPushNotificationForMeeting(meeting string, title string, subtitle strin
 
 	users, err := GetUsersByIsFollowerOrMe(athleteIds)
 	if err != nil {
-		return 0, 0, err
+		return 0, 0, 0, err
 	}
 
 	var userIds []primitive.ObjectID
@@ -86,7 +86,7 @@ func SendPushNotificationForMeeting(meeting string, title string, subtitle strin
 
 	notificationUsers, err := GetNotificationUsersByUserIds(userIds)
 	if err != nil {
-		return 0, 0, err
+		return 0, 0, 0, err
 	}
 
 	var wg sync.WaitGroup
@@ -106,7 +106,7 @@ func SendPushNotificationForMeeting(meeting string, title string, subtitle strin
 	wg.Wait() // Wait for all goroutines to finish
 
 	fmt.Printf("notified %d users with %d/%d devices", len(users), success, len(notificationUsers))
-	return len(users), success, nil
+	return len(users), len(notificationUsers), success, nil
 }
 
 func SendPushNotification(receiver string, title string, subtitle string, message string) (string, string, int, error) {