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

chore: wrap everything inside nil check for storageLimit

Browse Source
This commit is contained in:
mngshm
2025-02-13 14:59:52 +05:30
parent a407b1baad
commit 7aa8f6f00f
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/pkg/controller/family/admin.go
View File

@@ -198,11 +198,11 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,
}
if member.AdminUserID != actorUserID {
return stacktrace.Propagate(ente.ErrBadRequest, "you do not have sufficient permission")
return stacktrace.Propagate(ente.ErrPermissionDenied, "you do not have sufficient permission")
}
if member.IsAdmin {
return stacktrace.Propagate(ente.NewBadRequestWithMessage("failed to modify storage"), "cannot modify admin storage limit")
return stacktrace.Propagate(ente.NewBadRequestWithMessage("can not limit admin storage"), "cannot modify admin storage limit")
}
if member.Status != ente.ACCEPTED && member.Status != ente.INVITED {
@@ -219,23 +219,24 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,
if *storageLimit > totalFamilyStorage {
return stacktrace.Propagate(ente.ErrStorageLimitExceeded, "potential storage limit is more than subscription storage")
}
// Handle if the admin user tries reducing the storage Limit
// and the members Usage is more than the potential storage Limit
memberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)
if memUsageErr != nil {
return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
}
if memberUsage > *storageLimit {
return stacktrace.Propagate(ente.NewBadRequestWithMessage("Failed to reduce storage"), "User's current usage is more")
}
modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, actorUserID, member.ID, storageLimit)
if modifyStorageErr != nil {
return stacktrace.Propagate(modifyStorageErr, "Failed to modify members storage")
}
}
// Handle if the admin user tries reducing the storage Limit
// and the members Usage is more than the potential storage Limit
memberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)
if memUsageErr != nil {
return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
}
if memberUsage > *storageLimit {
return stacktrace.Propagate(ente.NewBadRequestWithMessage("Failed to reduce storage"), "User's current usage is more")
}
modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, actorUserID, member.ID, storageLimit)
if modifyStorageErr != nil {
return stacktrace.Propagate(modifyStorageErr, "Failed to modify members storage")
}
return nil
}