Skip to content
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

fix(queries.Register): reward inviter after checking email availability #36

Merged
merged 1 commit into from
Jun 7, 2024
Merged

fix(queries.Register): reward inviter after checking email availability #36

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: 17 additions & 16 deletions pkg/queries/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,22 +117,6 @@ func Register(db *gorm.DB, u *models.User, invitation_code string) error {
return errors.New(errors.InvalidArgument)
}

// check if the invitation code is valid
if invitation_code != "" {
inviter, err := GetUserByInvitationCode(db, invitation_code)
if err != nil {
if errors.Is(err, errors.UserNotExists) {
return errors.New(errors.InvitationCodeInvalid)
}
return err
}

u.InvitedByUserID = inviter.ID
// TODO: only once for the inviter?
inviter.Reward += 100
db.Save(inviter)
}

// 检查邮箱是否已存在
user := &models.User{}
result := db.Where("email = ?", u.Email).Take(user)
Expand Down Expand Up @@ -160,6 +144,23 @@ func Register(db *gorm.DB, u *models.User, invitation_code string) error {
}
u.InvitationCode = code

// check if the invitation code is valid
if invitation_code != "" {
inviter, err := GetUserByInvitationCode(db, invitation_code)
if err != nil {
if errors.Is(err, errors.UserNotExists) {
return errors.New(errors.InvitationCodeInvalid)
}
return err
}

u.InvitedByUserID = inviter.ID
inviter.Reward += 100
if err = db.Select("reward").Save(inviter).Error; err != nil {
return errors.Wrap(err, errors.DatabaseError)
}
}

if err = db.Create(u).Error; err != nil {
return errors.Wrap(err, errors.DatabaseError)
}
Expand Down
Loading