Skip to content

Commit 532ad16

Browse files
yp05327yp05327
committed
change GetOwner to LoadOwner
1 parent 007d181 commit 532ad16

33 files changed

+67
-67
lines changed

‎models/activities/action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
534534
repo = act.Repo
535535

536536
// check repo owner exist.
537-
if err := act.Repo.GetOwner(ctx); err != nil {
537+
if err := act.Repo.LoadOwner(ctx); err != nil {
538538
return fmt.Errorf("can't get repo owner: %w", err)
539539
}
540540
} else if act.Repo == nil {

‎models/git/protected_branch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ type WhitelistOptions struct {
314314
// This function also performs check if whitelist user and team's IDs have been changed
315315
// to avoid unnecessary whitelist delete and regenerate.
316316
func UpdateProtectBranch(ctx context.Context, repo *repo_model.Repository, protectBranch *ProtectedBranch, opts WhitelistOptions) (err error) {
317-
if err = repo.GetOwner(ctx); err != nil {
318-
return fmt.Errorf("GetOwner: %v", err)
317+
if err = repo.LoadOwner(ctx); err != nil {
318+
return fmt.Errorf("LoadOwner: %v", err)
319319
}
320320

321321
whitelist, err := updateUserWhitelist(ctx, repo, protectBranch.WhitelistUserIDs, opts.UserIDs)

‎models/issues/comment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ func (c *Comment) LoadAssigneeUserAndTeam() error {
620620
return err
621621
}
622622

623-
if err = c.Issue.Repo.GetOwner(db.DefaultContext); err != nil {
623+
if err = c.Issue.Repo.LoadOwner(db.DefaultContext); err != nil {
624624
return err
625625
}
626626

@@ -824,7 +824,7 @@ func CreateComment(ctx context.Context, opts *CreateCommentOptions) (_ *Comment,
824824
return nil, err
825825
}
826826

827-
if err = opts.Repo.GetOwner(ctx); err != nil {
827+
if err = opts.Repo.LoadOwner(ctx); err != nil {
828828
return nil, err
829829
}
830830

‎models/issues/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2099,7 +2099,7 @@ func ResolveIssueMentionsByVisibility(ctx context.Context, issue *Issue, doer *u
20992099
resolved := make(map[string]bool, 10)
21002100
var mentionTeams []string
21012101

2102-
if err := issue.Repo.GetOwner(ctx); err != nil {
2102+
if err := issue.Repo.LoadOwner(ctx); err != nil {
21032103
return nil, err
21042104
}
21052105

‎models/issues/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) {
498498
return false, err
499499
}
500500

501-
if err := pr.Issue.Repo.GetOwner(ctx); err != nil {
501+
if err := pr.Issue.Repo.LoadOwner(ctx); err != nil {
502502
return false, err
503503
}
504504

‎models/perm/access/access.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ func updateUserAccess(accessMap map[int64]*userAccess, user *user_model.User, mo
8585
// FIXME: do cross-comparison so reduce deletions and additions to the minimum?
8686
func refreshAccesses(ctx context.Context, repo *repo_model.Repository, accessMap map[int64]*userAccess) (err error) {
8787
minMode := perm.AccessModeRead
88-
if err := repo.GetOwner(ctx); err != nil {
89-
return fmt.Errorf("GetOwner: %w", err)
88+
if err := repo.LoadOwner(ctx); err != nil {
89+
return fmt.Errorf("LoadOwner: %w", err)
9090
}
9191

9292
// If the repo isn't private and isn't owned by a organization,
@@ -143,7 +143,7 @@ func refreshCollaboratorAccesses(ctx context.Context, repoID int64, accessMap ma
143143
func RecalculateTeamAccesses(ctx context.Context, repo *repo_model.Repository, ignTeamID int64) (err error) {
144144
accessMap := make(map[int64]*userAccess, 20)
145145

146-
if err = repo.GetOwner(ctx); err != nil {
146+
if err = repo.LoadOwner(ctx); err != nil {
147147
return err
148148
} else if !repo.Owner.IsOrganization() {
149149
return fmt.Errorf("owner is not an organization: %d", repo.OwnerID)
@@ -199,7 +199,7 @@ func RecalculateUserAccess(ctx context.Context, repo *repo_model.Repository, uid
199199
accessMode = collaborator.Mode
200200
}
201201

202-
if err = repo.GetOwner(ctx); err != nil {
202+
if err = repo.LoadOwner(ctx); err != nil {
203203
return err
204204
} else if repo.Owner.IsOrganization() {
205205
var teams []organization.Team

‎models/perm/access/access_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func TestRepository_RecalculateAccesses(t *testing.T) {
9797
// test with organization repo
9898
assert.NoError(t, unittest.PrepareTestDatabase())
9999
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
100-
assert.NoError(t, repo1.GetOwner(db.DefaultContext))
100+
assert.NoError(t, repo1.LoadOwner(db.DefaultContext))
101101

102102
_, err := db.GetEngine(db.DefaultContext).Delete(&repo_model.Collaboration{UserID: 2, RepoID: 3})
103103
assert.NoError(t, err)
@@ -114,7 +114,7 @@ func TestRepository_RecalculateAccesses2(t *testing.T) {
114114
// test with non-organization repo
115115
assert.NoError(t, unittest.PrepareTestDatabase())
116116
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
117-
assert.NoError(t, repo1.GetOwner(db.DefaultContext))
117+
assert.NoError(t, repo1.LoadOwner(db.DefaultContext))
118118

119119
_, err := db.GetEngine(db.DefaultContext).Delete(&repo_model.Collaboration{UserID: 4, RepoID: 4})
120120
assert.NoError(t, err)

‎models/perm/access/repo_permission.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func GetUserRepoPermission(ctx context.Context, repo *repo_model.Repository, use
175175
}
176176
}
177177

178-
if err = repo.GetOwner(ctx); err != nil {
178+
if err = repo.LoadOwner(ctx); err != nil {
179179
return
180180
}
181181

@@ -210,7 +210,7 @@ func GetUserRepoPermission(ctx context.Context, repo *repo_model.Repository, use
210210
return
211211
}
212212

213-
if err = repo.GetOwner(ctx); err != nil {
213+
if err = repo.LoadOwner(ctx); err != nil {
214214
return
215215
}
216216
if !repo.Owner.IsOrganization() {
@@ -281,7 +281,7 @@ func IsUserRealRepoAdmin(repo *repo_model.Repository, user *user_model.User) (bo
281281
return true, nil
282282
}
283283

284-
if err := repo.GetOwner(db.DefaultContext); err != nil {
284+
if err := repo.LoadOwner(db.DefaultContext); err != nil {
285285
return false, err
286286
}
287287

@@ -378,7 +378,7 @@ func HasAccess(ctx context.Context, userID int64, repo *repo_model.Repository) (
378378

379379
// getUsersWithAccessMode returns users that have at least given access mode to the repository.
380380
func getUsersWithAccessMode(ctx context.Context, repo *repo_model.Repository, mode perm_model.AccessMode) (_ []*user_model.User, err error) {
381-
if err = repo.GetOwner(ctx); err != nil {
381+
if err = repo.LoadOwner(ctx); err != nil {
382382
return nil, err
383383
}
384384

‎models/repo/repo.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func (repo *Repository) AfterLoad() {
237237
// LoadAttributes loads attributes of the repository.
238238
func (repo *Repository) LoadAttributes(ctx context.Context) error {
239239
// Load owner
240-
if err := repo.GetOwner(ctx); err != nil {
240+
if err := repo.LoadOwner(ctx); err != nil {
241241
return fmt.Errorf("load owner: %w", err)
242242
}
243243

@@ -373,8 +373,8 @@ func (repo *Repository) GetUnit(ctx context.Context, tp unit.Type) (*RepoUnit, e
373373
return nil, ErrUnitTypeNotExist{tp}
374374
}
375375

376-
// GetOwner returns the repository owner
377-
func (repo *Repository) GetOwner(ctx context.Context) (err error) {
376+
// LoadOwner returns the repository owner
377+
func (repo *Repository) LoadOwner(ctx context.Context) (err error) {
378378
if repo.Owner != nil {
379379
return nil
380380
}
@@ -388,7 +388,7 @@ func (repo *Repository) GetOwner(ctx context.Context) (err error) {
388388
// It creates a fake object that contains error details
389389
// when error occurs.
390390
func (repo *Repository) MustOwner(ctx context.Context) *user_model.User {
391-
if err := repo.GetOwner(ctx); err != nil {
391+
if err := repo.LoadOwner(ctx); err != nil {
392392
return &user_model.User{
393393
Name: "error",
394394
FullName: err.Error(),

‎models/repo/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func ChangeRepositoryName(doer *user_model.User, repo *Repository, newRepoName s
143143
return err
144144
}
145145

146-
if err := repo.GetOwner(db.DefaultContext); err != nil {
146+
if err := repo.LoadOwner(db.DefaultContext); err != nil {
147147
return err
148148
}
149149

0 commit comments

Comments
 (0)