forks/forgejo
1
0
Fork 0
Code Releases Activity

Refactor the function RemoveOrgUser (#27582)

Browse source 
This PR is a small refactor to merge removeOrgUser into RemoveOrgUser.
This commit is contained in:
Lunny Xiao 2023-11-03 22:01:45 +08:00 • committed by GitHub
parent ae396ac7c0
commit d1dc9cb334
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
models/org.go
View file

@ -14,12 +14,11 @@ import (
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
) )
func removeOrgUser(ctx context.Context, orgID, userID int64) error { // RemoveOrgUser removes user from given organization.
func RemoveOrgUser(ctx context.Context, orgID, userID int64) error {
ou := new(organization.OrgUser) ou := new(organization.OrgUser)
sess := db.GetEngine(ctx) has, err := db.GetEngine(ctx).
has, err := sess.
Where("uid=?", userID). Where("uid=?", userID).
And("org_id=?", orgID). And("org_id=?", orgID).
Get(ou) Get(ou)
@ -52,7 +51,13 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error {
} }
} }
if _, err := sess.ID(ou.ID).Delete(ou); err != nil { ctx, committer, err := db.TxContext(ctx)
if err != nil {
return err
}
defer committer.Close()
if _, err := db.GetEngine(ctx).ID(ou.ID).Delete(ou); err != nil {
return err return err
} else if _, err = db.Exec(ctx, "UPDATE `user` SET num_members=num_members-1 WHERE id=?", orgID); err != nil { } else if _, err = db.Exec(ctx, "UPDATE `user` SET num_members=num_members-1 WHERE id=?", orgID); err != nil {
return err return err
@ -74,7 +79,7 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error {
} }
if len(repoIDs) > 0 { if len(repoIDs) > 0 {
if _, err = sess. if _, err = db.GetEngine(ctx).
Where("user_id = ?", userID). Where("user_id = ?", userID).
In("repo_id", repoIDs). In("repo_id", repoIDs).
Delete(new(access_model.Access)); err != nil { Delete(new(access_model.Access)); err != nil {
@ -93,18 +98,5 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error {
} }
} }
return nil
}
// RemoveOrgUser removes user from given organization.
func RemoveOrgUser(ctx context.Context, orgID, userID int64) error {
ctx, committer, err := db.TxContext(ctx)
if err != nil {
return err
}
defer committer.Close()
if err := removeOrgUser(ctx, orgID, userID); err != nil {
return err
}
return committer.Commit() return committer.Commit()
} }

2
models/org_team.go
View file

@ -502,7 +502,7 @@ func removeInvalidOrgUser(ctx context.Context, userID, orgID int64) error {
}); err != nil { }); err != nil {
return err return err
} else if count == 0 { } else if count == 0 {
return removeOrgUser(ctx, orgID, userID) return RemoveOrgUser(ctx, orgID, userID)
} }
return nil return nil
} }