Skip to content

Commit 1159888

Browse files
authored
Use RepositoryList instead of []*Repository (#25074)
1 parent ca35dec commit 1159888

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

models/issues/issue_list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (issues IssueList) getRepoIDs() []int64 {
3434
}
3535

3636
// LoadRepositories loads issues' all repositories
37-
func (issues IssueList) LoadRepositories(ctx context.Context) ([]*repo_model.Repository, error) {
37+
func (issues IssueList) LoadRepositories(ctx context.Context) (repo_model.RepositoryList, error) {
3838
if len(issues) == 0 {
3939
return nil, nil
4040
}

models/organization/org.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -710,8 +710,8 @@ func (org *Organization) GetUserTeams(userID int64) ([]*Team, error) {
710710
type AccessibleReposEnvironment interface {
711711
CountRepos() (int64, error)
712712
RepoIDs(page, pageSize int) ([]int64, error)
713-
Repos(page, pageSize int) ([]*repo_model.Repository, error)
714-
MirrorRepos() ([]*repo_model.Repository, error)
713+
Repos(page, pageSize int) (repo_model.RepositoryList, error)
714+
MirrorRepos() (repo_model.RepositoryList, error)
715715
AddKeyword(keyword string)
716716
SetSort(db.SearchOrderBy)
717717
}
@@ -813,7 +813,7 @@ func (env *accessibleReposEnv) RepoIDs(page, pageSize int) ([]int64, error) {
813813
Find(&repoIDs)
814814
}
815815

816-
func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*repo_model.Repository, error) {
816+
func (env *accessibleReposEnv) Repos(page, pageSize int) (repo_model.RepositoryList, error) {
817817
repoIDs, err := env.RepoIDs(page, pageSize)
818818
if err != nil {
819819
return nil, fmt.Errorf("GetUserRepositoryIDs: %w", err)
@@ -842,7 +842,7 @@ func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
842842
Find(&repoIDs)
843843
}
844844

845-
func (env *accessibleReposEnv) MirrorRepos() ([]*repo_model.Repository, error) {
845+
func (env *accessibleReposEnv) MirrorRepos() (repo_model.RepositoryList, error) {
846846
repoIDs, err := env.MirrorRepoIDs()
847847
if err != nil {
848848
return nil, fmt.Errorf("MirrorRepoIDs: %w", err)

models/organization/org_repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
// GetOrgRepositories get repos belonging to the given organization
14-
func GetOrgRepositories(ctx context.Context, orgID int64) ([]*repo_model.Repository, error) {
14+
func GetOrgRepositories(ctx context.Context, orgID int64) (repo_model.RepositoryList, error) {
1515
var orgRepos []*repo_model.Repository
1616
return orgRepos, db.GetEngine(ctx).Where("owner_id = ?", orgID).Find(&orgRepos)
1717
}

models/organization/org_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ func TestAccessibleReposEnv_Repos(t *testing.T) {
346346
assert.NoError(t, err)
347347
repos, err := env.Repos(1, 100)
348348
assert.NoError(t, err)
349-
expectedRepos := make([]*repo_model.Repository, len(expectedRepoIDs))
349+
expectedRepos := make(repo_model.RepositoryList, len(expectedRepoIDs))
350350
for i, repoID := range expectedRepoIDs {
351351
expectedRepos[i] = unittest.AssertExistsAndLoadBean(t,
352352
&repo_model.Repository{ID: repoID})
@@ -365,7 +365,7 @@ func TestAccessibleReposEnv_MirrorRepos(t *testing.T) {
365365
assert.NoError(t, err)
366366
repos, err := env.MirrorRepos()
367367
assert.NoError(t, err)
368-
expectedRepos := make([]*repo_model.Repository, len(expectedRepoIDs))
368+
expectedRepos := make(repo_model.RepositoryList, len(expectedRepoIDs))
369369
for i, repoID := range expectedRepoIDs {
370370
expectedRepos[i] = unittest.AssertExistsAndLoadBean(t,
371371
&repo_model.Repository{ID: repoID})

models/organization/team_repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type SearchTeamRepoOptions struct {
3737
}
3838

3939
// GetRepositories returns paginated repositories in team of organization.
40-
func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) ([]*repo_model.Repository, error) {
40+
func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) (repo_model.RepositoryList, error) {
4141
sess := db.GetEngine(ctx)
4242
if opts.TeamID > 0 {
4343
sess = sess.In("id",

services/repository/check.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func GitGcRepo(ctx context.Context, repo *repo_model.Repository, timeout time.Du
115115
return nil
116116
}
117117

118-
func gatherMissingRepoRecords(ctx context.Context) ([]*repo_model.Repository, error) {
118+
func gatherMissingRepoRecords(ctx context.Context) (repo_model.RepositoryList, error) {
119119
repos := make([]*repo_model.Repository, 0, 10)
120120
if err := db.Iterate(
121121
ctx,

0 commit comments

Comments
 (0)