Fix duplicate entry error when add team member (go-gitea#19702)

kitspace · Aug 23, 2022 · 1bb6688 · 1bb6688
1 parent 4cfa11c
commit 1bb6688
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/models/org_team.go b/models/org_team.go
@@ -496,6 +496,12 @@ func AddTeamMember(team *organization.Team, userID int64) error {
 	}
 	defer committer.Close()
 
+	// check in transaction
+	isAlreadyMember, err = organization.IsTeamMember(ctx, team.OrgID, team.ID, userID)
+	if err != nil || isAlreadyMember {
+		return err
+	}
+
 	sess := db.GetEngine(ctx)
 
 	if err := db.Insert(ctx, &organization.TeamUser{

diff --git a/models/organization/org.go b/models/organization/org.go
@@ -594,6 +594,12 @@ func AddOrgUser(orgID, uid int64) error {
 	}
 	defer committer.Close()
 
+	// check in transaction
+	isAlreadyMember, err = IsOrganizationMember(ctx, orgID, uid)
+	if err != nil || isAlreadyMember {
+		return err
+	}
+
 	ou := &OrgUser{
 		UID:      uid,
 		OrgID:    orgID,