Skip to content

feat: add AddUsedQuota function and optimize quota logic #2320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
myml wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add AddUsedQuota function and optimize quota logic #2320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions model/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,17 @@ func decreaseTokenQuota(id int, quota int64) (err error) {
return err
}

// AddUsedQuota only increase used_quota, won't change remain_quota
func AddUsedQuota(id int, quota int64) (err error) {
err = DB.Model(&Token{}).Where("id = ?", id).Updates(
map[string]interface{}{
"used_quota": gorm.Expr("used_quota + ?", quota),
"accessed_time": helper.GetTimestamp(),
},
).Error
return fmt.Errorf("AddUserQuota failed: %w", err)
}

func PreConsumeTokenQuota(tokenId int, quota int64) (err error) {
if quota < 0 {
return errors.New("quota 不能为负数！")
Expand Down Expand Up @@ -289,15 +300,17 @@ func PostConsumeTokenQuota(tokenId int, quota int64) (err error) {
} else {
err = IncreaseUserQuota(token.UserId, -quota)
}
if !token.UnlimitedQuota {
if quota > 0 {
err = DecreaseTokenQuota(tokenId, quota)
} else {
err = IncreaseTokenQuota(tokenId, -quota)
}
if err != nil {
return err
}
if err != nil {
return err
}
// if the token has unlimited quota, we don't need to change its quota
if token.UnlimitedQuota {
return AddUsedQuota(tokenId, quota)
}
return nil
if quota > 0 {
err = DecreaseTokenQuota(tokenId, quota)
} else {
err = IncreaseTokenQuota(tokenId, -quota)
}
return err
}