Skip to content

Commit d0d38f0

Browse files
lunnylunny
committed
remove unnecessary code
1 parent f378426 commit d0d38f0

File tree

9 files changed

+15
-195
lines changed

9 files changed

+15
-195
lines changed

‎models/access.go

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -105,66 +105,6 @@ func accessLevel(e db.Engine, user *User, repo *Repository) (AccessMode, error)
105105
return a.Mode, nil
106106
}
107107

108-
type repoAccess struct {
109-
Access `xorm:"extends"`
110-
Repository `xorm:"extends"`
111-
}
112-
113-
func (repoAccess) TableName() string {
114-
return "access"
115-
}
116-
117-
// GetRepositoryAccesses finds all repositories with their access mode where a user has access but does not own.
118-
func (user *User) GetRepositoryAccesses() (map[*Repository]AccessMode, error) {
119-
rows, err := db.GetEngine(db.DefaultContext).
120-
Join("INNER", "repository", "repository.id = access.repo_id").
121-
Where("access.user_id = ?", user.ID).
122-
And("repository.owner_id <> ?", user.ID).
123-
Rows(new(repoAccess))
124-
if err != nil {
125-
return nil, err
126-
}
127-
defer rows.Close()
128-
129-
repos := make(map[*Repository]AccessMode, 10)
130-
ownerCache := make(map[int64]*User, 10)
131-
for rows.Next() {
132-
var repo repoAccess
133-
err = rows.Scan(&repo)
134-
if err != nil {
135-
return nil, err
136-
}
137-
138-
var ok bool
139-
if repo.Owner, ok = ownerCache[repo.OwnerID]; !ok {
140-
if err = repo.GetOwner(); err != nil {
141-
return nil, err
142-
}
143-
ownerCache[repo.OwnerID] = repo.Owner
144-
}
145-
146-
repos[&repo.Repository] = repo.Access.Mode
147-
}
148-
return repos, nil
149-
}
150-
151-
// GetAccessibleRepositories finds repositories which the user has access but does not own.
152-
// If limit is smaller than 1 means returns all found results.
153-
func (user *User) GetAccessibleRepositories(limit int) (repos []*Repository, _ error) {
154-
sess := db.GetEngine(db.DefaultContext).
155-
Where("owner_id !=? ", user.ID).
156-
Desc("updated_unix")
157-
if limit > 0 {
158-
sess.Limit(limit)
159-
repos = make([]*Repository, 0, limit)
160-
} else {
161-
repos = make([]*Repository, 0, 10)
162-
}
163-
return repos, sess.
164-
Join("INNER", "access", "access.user_id = ? AND access.repo_id = repository.id", user.ID).
165-
Find(&repos)
166-
}
167-
168108
func maxAccessMode(modes ...AccessMode) AccessMode {
169109
max := AccessModeNone
170110
for _, mode := range modes {

‎models/access_test.go

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -90,39 +90,6 @@ func TestHasAccess(t *testing.T) {
9090
assert.NoError(t, err)
9191
}
9292

93-
func TestUser_GetRepositoryAccesses(t *testing.T) {
94-
assert.NoError(t, unittest.PrepareTestDatabase())
95-
96-
user1 := unittest.AssertExistsAndLoadBean(t, &User{ID: 1}).(*User)
97-
accesses, err := user1.GetRepositoryAccesses()
98-
assert.NoError(t, err)
99-
assert.Len(t, accesses, 0)
100-
101-
user29 := unittest.AssertExistsAndLoadBean(t, &User{ID: 29}).(*User)
102-
accesses, err = user29.GetRepositoryAccesses()
103-
assert.NoError(t, err)
104-
assert.Len(t, accesses, 2)
105-
}
106-
107-
func TestUser_GetAccessibleRepositories(t *testing.T) {
108-
assert.NoError(t, unittest.PrepareTestDatabase())
109-
110-
user1 := unittest.AssertExistsAndLoadBean(t, &User{ID: 1}).(*User)
111-
repos, err := user1.GetAccessibleRepositories(0)
112-
assert.NoError(t, err)
113-
assert.Len(t, repos, 0)
114-
115-
user2 := unittest.AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
116-
repos, err = user2.GetAccessibleRepositories(0)
117-
assert.NoError(t, err)
118-
assert.Len(t, repos, 4)
119-
120-
user29 := unittest.AssertExistsAndLoadBean(t, &User{ID: 29}).(*User)
121-
repos, err = user29.GetAccessibleRepositories(0)
122-
assert.NoError(t, err)
123-
assert.Len(t, repos, 2)
124-
}
125-
12693
func TestRepository_RecalculateAccesses(t *testing.T) {
12794
// test with organization repo
12895
assert.NoError(t, unittest.PrepareTestDatabase())

‎models/star.go

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func isStaring(e db.Engine, userID, repoID int64) bool {
7474
}
7575

7676
// GetStargazers returns the users that starred the repo.
77-
func (repo *Repository) GetStargazers(opts db.ListOptions) ([]*User, error) {
77+
func GetStargazers(repo *Repository, opts db.ListOptions) ([]*User, error) {
7878
sess := db.GetEngine(db.DefaultContext).Where("star.repo_id = ?", repo.ID).
7979
Join("LEFT", "star", "`user`.id = star.uid")
8080
if opts.Page > 0 {
@@ -87,48 +87,3 @@ func (repo *Repository) GetStargazers(opts db.ListOptions) ([]*User, error) {
8787
users := make([]*User, 0, 8)
8888
return users, sess.Find(&users)
8989
}
90-
91-
// GetStarredRepos returns the repos the user starred.
92-
func (u *User) GetStarredRepos(private bool, page, pageSize int, orderBy string) (repos RepositoryList, err error) {
93-
if len(orderBy) == 0 {
94-
orderBy = "updated_unix DESC"
95-
}
96-
sess := db.GetEngine(db.DefaultContext).
97-
Join("INNER", "star", "star.repo_id = repository.id").
98-
Where("star.uid = ?", u.ID).
99-
OrderBy(orderBy)
100-
101-
if !private {
102-
sess = sess.And("is_private = ?", false)
103-
}
104-
105-
if page <= 0 {
106-
page = 1
107-
}
108-
sess.Limit(pageSize, (page-1)*pageSize)
109-
110-
repos = make([]*Repository, 0, pageSize)
111-
112-
if err = sess.Find(&repos); err != nil {
113-
return
114-
}
115-
116-
if err = repos.loadAttributes(db.GetEngine(db.DefaultContext)); err != nil {
117-
return
118-
}
119-
120-
return
121-
}
122-
123-
// GetStarredRepoCount returns the numbers of repo the user starred.
124-
func (u *User) GetStarredRepoCount(private bool) (int64, error) {
125-
sess := db.GetEngine(db.DefaultContext).
126-
Join("INNER", "star", "star.repo_id = repository.id").
127-
Where("star.uid = ?", u.ID)
128-
129-
if !private {
130-
sess = sess.And("is_private = ?", false)
131-
}
132-
133-
return sess.Count(&Repository{})
134-
}

‎models/star_test.go

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestRepository_GetStargazers(t *testing.T) {
3636
// repo with stargazers
3737
assert.NoError(t, unittest.PrepareTestDatabase())
3838
repo := unittest.AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository)
39-
gazers, err := repo.GetStargazers(db.ListOptions{Page: 0})
39+
gazers, err := GetStargazers(repo, db.ListOptions{Page: 0})
4040
assert.NoError(t, err)
4141
if assert.Len(t, gazers, 1) {
4242
assert.Equal(t, int64(2), gazers[0].ID)
@@ -47,53 +47,7 @@ func TestRepository_GetStargazers2(t *testing.T) {
4747
// repo with stargazers
4848
assert.NoError(t, unittest.PrepareTestDatabase())
4949
repo := unittest.AssertExistsAndLoadBean(t, &Repository{ID: 3}).(*Repository)
50-
gazers, err := repo.GetStargazers(db.ListOptions{Page: 0})
50+
gazers, err := GetStargazers(repo, db.ListOptions{Page: 0})
5151
assert.NoError(t, err)
5252
assert.Len(t, gazers, 0)
5353
}
54-
55-
func TestUser_GetStarredRepos(t *testing.T) {
56-
// user who has starred repos
57-
assert.NoError(t, unittest.PrepareTestDatabase())
58-
59-
user := unittest.AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
60-
starred, err := user.GetStarredRepos(false, 1, 10, "")
61-
assert.NoError(t, err)
62-
if assert.Len(t, starred, 1) {
63-
assert.Equal(t, int64(4), starred[0].ID)
64-
}
65-
66-
starred, err = user.GetStarredRepos(true, 1, 10, "")
67-
assert.NoError(t, err)
68-
if assert.Len(t, starred, 2) {
69-
assert.Equal(t, int64(2), starred[0].ID)
70-
assert.Equal(t, int64(4), starred[1].ID)
71-
}
72-
}
73-
74-
func TestUser_GetStarredRepos2(t *testing.T) {
75-
// user who has no starred repos
76-
assert.NoError(t, unittest.PrepareTestDatabase())
77-
78-
user := unittest.AssertExistsAndLoadBean(t, &User{ID: 1}).(*User)
79-
starred, err := user.GetStarredRepos(false, 1, 10, "")
80-
assert.NoError(t, err)
81-
assert.Len(t, starred, 0)
82-
83-
starred, err = user.GetStarredRepos(true, 1, 10, "")
84-
assert.NoError(t, err)
85-
assert.Len(t, starred, 0)
86-
}
87-
88-
func TestUserGetStarredRepoCount(t *testing.T) {
89-
assert.NoError(t, unittest.PrepareTestDatabase())
90-
91-
user := unittest.AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
92-
counts, err := user.GetStarredRepoCount(false)
93-
assert.NoError(t, err)
94-
assert.Equal(t, int64(1), counts)
95-
96-
counts, err = user.GetStarredRepoCount(true)
97-
assert.NoError(t, err)
98-
assert.Equal(t, int64(2), counts)
99-
}

‎models/user.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@ func (u *User) SetLastLogin() {
217217
u.LastLoginUnix = timeutil.TimeStampNow()
218218
}
219219

220-
// UpdateDiffViewStyle updates the users diff view style
221-
func (u *User) UpdateDiffViewStyle(style string) error {
220+
// UpdateUserDiffViewStyle updates the users diff view style
221+
func UpdateUserDiffViewStyle(u *User, style string) error {
222222
u.DiffViewStyle = style
223223
return UpdateUserCols(db.DefaultContext, u, "diff_view_style")
224224
}
225225

226-
// UpdateTheme updates a users' theme irrespective of the site wide theme
227-
func (u *User) UpdateTheme(themeName string) error {
226+
// UpdateUserTheme updates a users' theme irrespective of the site wide theme
227+
func UpdateUserTheme(u *User, themeName string) error {
228228
u.Theme = themeName
229229
return UpdateUserCols(db.DefaultContext, u, "theme")
230230
}

‎routers/api/v1/repo/star.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package repo
77
import (
88
"net/http"
99

10+
"code.gitea.io/gitea/models"
1011
"code.gitea.io/gitea/modules/context"
1112
"code.gitea.io/gitea/modules/convert"
1213
api "code.gitea.io/gitea/modules/structs"
@@ -43,7 +44,7 @@ func ListStargazers(ctx *context.APIContext) {
4344
// "200":
4445
// "$ref": "#/responses/UserList"
4546

46-
stargazers, err := ctx.Repo.Repository.GetStargazers(utils.GetListOptions(ctx))
47+
stargazers, err := models.GetStargazers(ctx.Repo.Repository, utils.GetListOptions(ctx))
4748
if err != nil {
4849
ctx.Error(http.StatusInternalServerError, "GetStargazers", err)
4950
return

‎routers/web/repo/middlewares.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package repo
77
import (
88
"fmt"
99

10+
"code.gitea.io/gitea/models"
1011
admin_model "code.gitea.io/gitea/models/admin"
1112
"code.gitea.io/gitea/modules/context"
1213
"code.gitea.io/gitea/modules/git"
@@ -55,7 +56,7 @@ func SetDiffViewStyle(ctx *context.Context) {
5556
}
5657

5758
ctx.Data["IsSplitStyle"] = style == "split"
58-
if err := ctx.User.UpdateDiffViewStyle(style); err != nil {
59+
if err := models.UpdateUserDiffViewStyle(ctx.User, style); err != nil {
5960
ctx.ServerError("ErrUpdateDiffViewStyle", err)
6061
}
6162
}

‎routers/web/repo/view.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,9 @@ func Stars(ctx *context.Context) {
928928
ctx.Data["Title"] = ctx.Tr("repo.stargazers")
929929
ctx.Data["CardsTitle"] = ctx.Tr("repo.stargazers")
930930
ctx.Data["PageIsStargazers"] = true
931-
RenderUserCards(ctx, ctx.Repo.Repository.NumStars, ctx.Repo.Repository.GetStargazers, tplWatchers)
931+
RenderUserCards(ctx, ctx.Repo.Repository.NumStars, func(opts db.ListOptions) ([]*models.User, error) {
932+
return models.GetStargazers(ctx.Repo.Repository, opts)
933+
}, tplWatchers)
932934
}
933935

934936
// Forks render repository's forked users

‎routers/web/user/setting/profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ func UpdateUIThemePost(ctx *context.Context) {
377377
return
378378
}
379379

380-
if err := ctx.User.UpdateTheme(form.Theme); err != nil {
380+
if err := models.UpdateUserTheme(ctx.User, form.Theme); err != nil {
381381
ctx.Flash.Error(ctx.Tr("settings.theme_update_error"))
382382
ctx.Redirect(setting.AppSubURL + "/user/settings/appearance")
383383
return

0 commit comments

Comments
 (0)