Merge branch 'refactor-of-32211' into limit-org-member-view-of-restricted-users

Author: 6543

models/organization/org.go

@@ -22,7 +22,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 
 	"xorm.io/builder"
-	"xorm.io/xorm"
 )
 
 // ________                            .__                __  .__
@@ -206,27 +205,12 @@ func (opts FindOrgMembersOpts) PublicOnly() bool {
 	return opts.Doer == nil || !opts.IsMember && !opts.Doer.IsAdmin
 }
 
-func (opts FindOrgMembersOpts) addTeamMatesOnlyFilter(ctx context.Context, sess *xorm.Session) error {
-	if opts.Doer != nil && opts.IsMember && opts.Doer.IsRestricted {
-		teamMates := builder.Select("DISTINCT team_user.uid").
-			From("team_user").
-			Where(builder.In("team_user.team_id", userTeamIDbuilder(opts.OrgID, opts.Doer.ID))).
-			And(builder.Eq{"team_user.org_id": opts.OrgID})
-
-		sess.In("org_user.uid", teamMates)
-	}
-	return nil
-}
-
 // CountOrgMembers counts the organization's members
 func CountOrgMembers(ctx context.Context, opts *FindOrgMembersOpts) (int64, error) {
 	sess := db.GetEngine(ctx).Where("org_id=?", opts.OrgID)
 	if opts.PublicOnly() {
 		sess.And("is_public = ?", true)
 	}
-	if err := opts.addTeamMatesOnlyFilter(ctx, sess); err != nil {
-		return 0, err
-	}
 
 	return sess.Count(new(OrgUser))
 }
@@ -551,9 +535,6 @@ func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUs
 	if opts.PublicOnly() {
 		sess.And("is_public = ?", true)
 	}
-	if err := opts.addTeamMatesOnlyFilter(ctx, sess); err != nil {
-		return nil, err
-	}
 
 	if opts.ListOptions.PageSize > 0 {
 		sess = db.SetSessionPagination(sess, opts)
@@ -677,7 +658,7 @@ func (org *Organization) getUserTeamIDs(ctx context.Context, userID int64) ([]in
 	return teamIDs, db.GetEngine(ctx).
 		Table("team").
 		Cols("team.id").
-		Where(userTeamIDbuilder(org.ID, userID)).
+		Where(builder.In("team.id", userTeamIDbuilder(org.ID, userID))).
 		Find(&teamIDs)
 }