Skip to content

Commit 77e9346

Browse files
authored
Fix duplicate entry error when add team member (#19702)
1 parent b135313 commit 77e9346

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

models/org_team.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,12 @@ func AddTeamMember(team *organization.Team, userID int64) error {
496496
}
497497
defer committer.Close()
498498

499+
// check in transaction
500+
isAlreadyMember, err = organization.IsTeamMember(ctx, team.OrgID, team.ID, userID)
501+
if err != nil || isAlreadyMember {
502+
return err
503+
}
504+
499505
sess := db.GetEngine(ctx)
500506

501507
if err := db.Insert(ctx, &organization.TeamUser{

models/organization/org.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,12 @@ func AddOrgUser(orgID, uid int64) error {
594594
}
595595
defer committer.Close()
596596

597+
// check in transaction
598+
isAlreadyMember, err = IsOrganizationMember(ctx, orgID, uid)
599+
if err != nil || isAlreadyMember {
600+
return err
601+
}
602+
597603
ou := &OrgUser{
598604
UID: uid,
599605
OrgID: orgID,

0 commit comments

Comments
 (0)