From ccfd7abf83df5a50ca1f79cdc3cebac6e1116334 Mon Sep 17 00:00:00 2001 From: mngshm Date: Thu, 24 Apr 2025 15:27:58 +0530 Subject: [PATCH] remove batching --- .../controller/email/email_notification.go | 46 ++++++------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/server/pkg/controller/email/email_notification.go b/server/pkg/controller/email/email_notification.go index 8a5e7ef8a8..fe5b7b6180 100644 --- a/server/pkg/controller/email/email_notification.go +++ b/server/pkg/controller/email/email_notification.go @@ -253,41 +253,25 @@ func (c *EmailNotificationController) SendFamilyNudgeEmail() error { if subUsersErr != nil { return stacktrace.Propagate(subUsersErr, "Failed to get subscribers") } - batchSize := 100 - totalSubUsers := len(subscribedUsers) - for i := range totalSubUsers { - end := i + batchSize - if end > totalSubUsers { - end = totalSubUsers - } - batchUsers := subscribedUsers[i:end] - for _, user := range batchUsers { - isFamilyAdmin, err := c.UserRepo.GetFamilyAdminID(user.ID) + for _, user := range subscribedUsers { + + creationTime := t.Unix(0, user.CreationTime) + timeSinceCreation := t.Since(creationTime) + if timeSinceCreation >= thirtyDaysDuration { + lastNudgeSent, err := c.NotificationHistoryRepo.GetLastNotificationTime(user.ID, FilesCollectedTemplateID) if err != nil { - return stacktrace.Propagate(err, "User is a family admin") - } - if isFamilyAdmin != nil { - break + log.Error("Failed to set Notification History") } - creationTime := t.Unix(0, user.CreationTime) - timeSinceCreation := t.Since(creationTime) - if timeSinceCreation >= thirtyDaysDuration { - lastNudgeSent, err := c.NotificationHistoryRepo.GetLastNotificationTime(user.ID, FilesCollectedTemplateID) - if err != nil { - log.Error("Failed to set Notification History") - } - - if lastNudgeSent == 0 { - go func(userEmails []string) { - err := email.SendTemplatedEmail(userEmails, "team@ente.io", "team@ente.io", FamilyNudgeSubject, FamilyNudgeEmailTemplate, nil, nil) - if err != nil { - log.Error("Failed to send family nudge email: ", err) - } - }([]string{user.Email}) - c.NotificationHistoryRepo.SetLastNotificationTimeToNow(user.ID, FamilyNudgeTemplateID) - } + if lastNudgeSent == 0 { + go func(userEmails []string) { + err := email.SendTemplatedEmail(userEmails, "team@ente.io", "team@ente.io", FamilyNudgeSubject, FamilyNudgeEmailTemplate, nil, nil) + if err != nil { + log.Error("Failed to send family nudge email: ", err) + } + }([]string{user.Email}) + c.NotificationHistoryRepo.SetLastNotificationTimeToNow(user.ID, FamilyNudgeTemplateID) } } }