TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server](StorageExceedingAlerts) struct to loop through slices of set of users depending on storage consumed

Browse Source
This commit is contained in:
mngshm
2025-03-11 17:10:03 +05:30
parent a72694116a
commit ba2ae29e3a
3 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/cmd/museum/main.go
View File

@@ -980,9 +980,8 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, publicCollectionR
_ = castDb.DeleteUnclaimedCodes(context.Background(), timeUtil.MicrosecondsBeforeMinutes(60))
dataCleanupCtrl.DeleteDataCron()
})
schedule(c, "@every 24h", func() {
emailNotificationCtrl.SendStorageLimitExceededMails()
emailNotificationCtrl.SendStorageAlerts()
})
schedule(c, "@every 1m", func() {
@@ -1003,6 +1002,7 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, publicCollectionR
})
c.Start()
log.Infoln(c.Entry(17).Next)
}
func cors() gin.HandlerFunc {

75
server/pkg/controller/email/email_notification.go
View File

@@ -166,7 +166,7 @@ func (c *EmailNotificationController) OnSubscriptionCancelled(userID int64) {
}
}
func (c *EmailNotificationController) SendStorageLimitExceededMails() {
func (c *EmailNotificationController) SendStorageAlerts() {
if c.isSendingStorageLimitExceededMails {
log.Info("Skipping sending storage limit exceeded mails as another instance is still running")
return
@@ -179,30 +179,59 @@ func (c *EmailNotificationController) SendStorageLimitExceededMails() {
return
}
defer c.LockController.ReleaseLock(StorageLimitExceededMailLock)
users, err := c.UserRepo.GetUsersWithIndividualPlanWhoHaveExceededStorageQuota()
if err != nil {
log.Error("Error while fetching user list", err)
return
// Notifs struct gets the list of both the users who have consumed
// 90% storage and 100% of their subcriptions. Then, it ranges through
// the slices of the both the users and inside this for loop, users from
// both the slices are separately looped. This was done to avoid
// duplication of a lot of code if both the users were ranged inside a loop
// separately.
notifs := []struct {
getListofSubscribers func() ([]ente.User, error)
template string
subject string
}{
{
getListofSubscribers: func() ([]ente.User, error) {
return c.UserRepo.GetUsersWithExceedingStorages(90)
},
template: StorageLimitExceededTemplate,
subject: StorageLimitExceededTemplate,
},
{
getListofSubscribers: func() ([]ente.User, error) {
return c.UserRepo.GetUsersWithExceedingStorages(100)
},
template: StorageLimitExceededTemplate,
subject: StorageLimitExceededSubject,
},
}
for _, u := range users {
lastNotificationTime, err := c.NotificationHistoryRepo.GetLastNotificationTime(u.ID, StorageLimitExceededTemplateID)
logger := log.WithFields(log.Fields{
"user_id": u.ID,
})
for _, notification := range notifs {
users, err := notification.getListofSubscribers()
if err != nil {
logger.Error("Could not fetch last notification time", err)
log.WithError(err).Error("Failed to get list of users")
continue
}
if lastNotificationTime > 0 {
continue
for _, u := range users {
lastNotificationTime, err := c.NotificationHistoryRepo.GetLastNotificationTime(u.ID, StorageLimitExceededTemplateID)
logger := log.WithFields(log.Fields{
"user_id": u.ID,
})
if err != nil {
logger.Error("Could not fetch last notification time", err)
continue
}
if lastNotificationTime > 0 {
continue
}
logger.Info("Alerting about storage limit exceeded")
err = email.SendTemplatedEmail([]string{u.Email}, "team@ente.io", "team@ente.io", notification.subject, notification.template, nil, nil)
if err != nil {
logger.Info("Error notifying", err)
continue
}
c.NotificationHistoryRepo.SetLastNotificationTimeToNow(u.ID, StorageLimitExceededTemplateID)
}
logger.Info("Alerting about storage limit exceeded")
err = email.SendTemplatedEmail([]string{u.Email}, "team@ente.io", "team@ente.io", StorageLimitExceededSubject, StorageLimitExceededTemplate, nil, nil)
if err != nil {
logger.Info("Error notifying", err)
continue
}
c.NotificationHistoryRepo.SetLastNotificationTimeToNow(u.ID, StorageLimitExceededTemplateID)
}
}
@@ -213,14 +242,14 @@ func (c *EmailNotificationController) setStorageLimitExceededMailerJobStatus(isS
func (c *EmailNotificationController) SendFamilyNudgeEmail() error {
subscribedUsers, subUsersErr := c.UserRepo.GetSubscribedUsersWithoutFamily()
if subUsersErr != nil {
stacktrace.Propagate(subUsersErr, "Failed to get subscribers")
return stacktrace.Propagate(subUsersErr, "Failed to get subscribers")
}
batchSize := 100
totalSubUsers := len(subscribedUsers)
logrus.Println(totalSubUsers)
for i := 0; i < totalSubUsers; i++ {
for i := range totalSubUsers {
end := i + batchSize
if end > totalSubUsers {
end = totalSubUsers
@@ -236,7 +265,7 @@ func (c *EmailNotificationController) SendFamilyNudgeEmail() error {
break
}
thirtyDays := 30 * t.Second
thirtyDays := 30 * 24 * t.Hour
creationTime := t.Unix(0, user.CreationTime)
timeSinceCreation := t.Since(creationTime)

4
server/pkg/repo/user.go
View File

@@ -319,8 +319,8 @@ func (repo *UserRepository) GetUsersWithExceedingStorages(percentageThreshold in
INNER JOIN usage
ON users.user_id = usage.user_id
INNER JOIN subscriptions
ON users.user_id = subscriptions.user_id AND usage.storage_consumed >= (subscriptions.storage * $1 / 100.0) AND users.encrypted_email IS NOT NULL AND users.family_admin_id IS NULL;
}`, percentageThreshold)
ON users.user_id = subscriptions.user_id AND usage.storage_consumed >= (subscriptions.storage * $1 / 100.0) AND users.encrypted_email is not null AND users.family_admin_id is NULL;
`, percentageThreshold)
if err != nil {
return nil, stacktrace.Propagate(err, "")
}