aboutsummaryrefslogtreecommitdiffstats
path: root/models/organization
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2023-06-05 15:25:47 +0800
committerGitHub <noreply@github.com>2023-06-05 15:25:47 +0800
commit11598885b36871ba19e961fa59efecd38c17e01e (patch)
tree7c17b4c258e1cd2f457a44f09ed15317b01b9e24 /models/organization
parentca35dec18b3d3d7dd5cde4c69a10ae830961faf7 (diff)
downloadgitea-11598885b36871ba19e961fa59efecd38c17e01e.tar.gz
gitea-11598885b36871ba19e961fa59efecd38c17e01e.zip
Use RepositoryList instead of []*Repository (#25074)
Diffstat (limited to 'models/organization')
-rw-r--r--models/organization/org.go8
-rw-r--r--models/organization/org_repo.go2
-rw-r--r--models/organization/org_test.go4
-rw-r--r--models/organization/team_repo.go2
4 files changed, 8 insertions, 8 deletions
diff --git a/models/organization/org.go b/models/organization/org.go
index 30b76fb1a0..05db6ba15f 100644
--- a/models/organization/org.go
+++ b/models/organization/org.go
@@ -710,8 +710,8 @@ func (org *Organization) GetUserTeams(userID int64) ([]*Team, error) {
type AccessibleReposEnvironment interface {
CountRepos() (int64, error)
RepoIDs(page, pageSize int) ([]int64, error)
- Repos(page, pageSize int) ([]*repo_model.Repository, error)
- MirrorRepos() ([]*repo_model.Repository, error)
+ Repos(page, pageSize int) (repo_model.RepositoryList, error)
+ MirrorRepos() (repo_model.RepositoryList, error)
AddKeyword(keyword string)
SetSort(db.SearchOrderBy)
}
@@ -813,7 +813,7 @@ func (env *accessibleReposEnv) RepoIDs(page, pageSize int) ([]int64, error) {
Find(&repoIDs)
}
-func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*repo_model.Repository, error) {
+func (env *accessibleReposEnv) Repos(page, pageSize int) (repo_model.RepositoryList, error) {
repoIDs, err := env.RepoIDs(page, pageSize)
if err != nil {
return nil, fmt.Errorf("GetUserRepositoryIDs: %w", err)
@@ -842,7 +842,7 @@ func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
Find(&repoIDs)
}
-func (env *accessibleReposEnv) MirrorRepos() ([]*repo_model.Repository, error) {
+func (env *accessibleReposEnv) MirrorRepos() (repo_model.RepositoryList, error) {
repoIDs, err := env.MirrorRepoIDs()
if err != nil {
return nil, fmt.Errorf("MirrorRepoIDs: %w", err)
diff --git a/models/organization/org_repo.go b/models/organization/org_repo.go
index 99638916b0..f7e59928f4 100644
--- a/models/organization/org_repo.go
+++ b/models/organization/org_repo.go
@@ -11,7 +11,7 @@ import (
)
// GetOrgRepositories get repos belonging to the given organization
-func GetOrgRepositories(ctx context.Context, orgID int64) ([]*repo_model.Repository, error) {
+func GetOrgRepositories(ctx context.Context, orgID int64) (repo_model.RepositoryList, error) {
var orgRepos []*repo_model.Repository
return orgRepos, db.GetEngine(ctx).Where("owner_id = ?", orgID).Find(&orgRepos)
}
diff --git a/models/organization/org_test.go b/models/organization/org_test.go
index 27e124a62b..27a173d497 100644
--- a/models/organization/org_test.go
+++ b/models/organization/org_test.go
@@ -346,7 +346,7 @@ func TestAccessibleReposEnv_Repos(t *testing.T) {
assert.NoError(t, err)
repos, err := env.Repos(1, 100)
assert.NoError(t, err)
- expectedRepos := make([]*repo_model.Repository, len(expectedRepoIDs))
+ expectedRepos := make(repo_model.RepositoryList, len(expectedRepoIDs))
for i, repoID := range expectedRepoIDs {
expectedRepos[i] = unittest.AssertExistsAndLoadBean(t,
&repo_model.Repository{ID: repoID})
@@ -365,7 +365,7 @@ func TestAccessibleReposEnv_MirrorRepos(t *testing.T) {
assert.NoError(t, err)
repos, err := env.MirrorRepos()
assert.NoError(t, err)
- expectedRepos := make([]*repo_model.Repository, len(expectedRepoIDs))
+ expectedRepos := make(repo_model.RepositoryList, len(expectedRepoIDs))
for i, repoID := range expectedRepoIDs {
expectedRepos[i] = unittest.AssertExistsAndLoadBean(t,
&repo_model.Repository{ID: repoID})
diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go
index e6b50ecff7..1184e39263 100644
--- a/models/organization/team_repo.go
+++ b/models/organization/team_repo.go
@@ -37,7 +37,7 @@ type SearchTeamRepoOptions struct {
}
// GetRepositories returns paginated repositories in team of organization.
-func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) ([]*repo_model.Repository, error) {
+func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) (repo_model.RepositoryList, error) {
sess := db.GetEngine(ctx)
if opts.TeamID > 0 {
sess = sess.In("id",