From 2971cabae143ed23c1acc4dba6c039291fb08f29 Mon Sep 17 00:00:00 2001 From: Joe Chen Date: Sat, 4 Nov 2023 21:39:35 -0400 Subject: [PATCH] getOrgUsersByOrgID --- internal/db/issue.go | 5 +++-- internal/db/org.go | 11 ----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/internal/db/issue.go b/internal/db/issue.go index 53c8132de..869a57b56 100644 --- a/internal/db/issue.go +++ b/internal/db/issue.go @@ -1180,12 +1180,13 @@ func updateIssueMentions(e Engine, issueID int64, mentions []string) error { continue } - memberIDs := make([]int64, 0, user.NumMembers) - orgUsers, err := getOrgUsersByOrgID(e, user.ID, 0) + orgUsers := make([]*OrgUser, 0, 10) + err := e.Where("org_id=?", user.ID).Find(&orgUsers) if err != nil { return fmt.Errorf("getOrgUsersByOrgID [%d]: %v", user.ID, err) } + memberIDs := make([]int64, 0, user.NumMembers) for _, orgUser := range orgUsers { memberIDs = append(memberIDs, orgUser.ID) } diff --git a/internal/db/org.go b/internal/db/org.go index 320dce3ab..6c47a79f2 100644 --- a/internal/db/org.go +++ b/internal/db/org.go @@ -10,17 +10,6 @@ import ( "xorm.io/builder" ) -// getOrgUsersByOrgID returns all organization-user relations by organization ID. -func getOrgUsersByOrgID(e Engine, orgID int64, limit int) ([]*OrgUser, error) { - orgUsers := make([]*OrgUser, 0, 10) - - sess := e.Where("org_id=?", orgID) - if limit > 0 { - sess = sess.Limit(limit) - } - return orgUsers, sess.Find(&orgUsers) -} - // GetUserMirrorRepositories returns mirror repositories of the organization which the user has access to. func (u *User) GetUserMirrorRepositories(userID int64) ([]*Repository, error) { teamIDs, err := u.GetUserTeamIDs(userID)