Skip to content

Commit 7693267

Browse files
wolfogrewolfogre
committed
chore: remove useless code
1 parent b40e298 commit 7693267

File tree

3 files changed

+2
-297
lines changed

3 files changed

+2
-297
lines changed

‎models/issues/issue_stats.go

Lines changed: 0 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package issues
55

66
import (
77
"context"
8-
"errors"
98
"fmt"
109

1110
"code.gitea.io/gitea/models/db"
@@ -180,167 +179,6 @@ func getIssueStatsChunk(opts *IssuesOptions, issueIDs []int64) (*IssueStats, err
180179
return stats, err
181180
}
182181

183-
// GetUserIssueStats returns issue statistic information for dashboard by given conditions.
184-
// TBC: remove it
185-
func GetUserIssueStats(filterMode int, opts IssuesOptions) (*IssueStats, error) {
186-
if opts.User == nil {
187-
return nil, errors.New("issue stats without user")
188-
}
189-
if opts.IsPull.IsNone() {
190-
return nil, errors.New("unaccepted ispull option")
191-
}
192-
193-
var err error
194-
stats := &IssueStats{}
195-
196-
cond := builder.NewCond()
197-
198-
cond = cond.And(builder.Eq{"issue.is_pull": opts.IsPull.IsTrue()})
199-
200-
if len(opts.RepoIDs) > 0 {
201-
cond = cond.And(builder.In("issue.repo_id", opts.RepoIDs))
202-
}
203-
if len(opts.IssueIDs) > 0 {
204-
cond = cond.And(builder.In("issue.id", opts.IssueIDs))
205-
}
206-
if opts.RepoCond != nil {
207-
cond = cond.And(opts.RepoCond)
208-
}
209-
210-
if opts.User != nil {
211-
cond = cond.And(issuePullAccessibleRepoCond("issue.repo_id", opts.User.ID, opts.Org, opts.Team, opts.IsPull.IsTrue()))
212-
}
213-
214-
sess := func(cond builder.Cond) *xorm.Session {
215-
s := db.GetEngine(db.DefaultContext).
216-
Join("INNER", "repository", "`issue`.repo_id = `repository`.id").
217-
Where(cond)
218-
if len(opts.LabelIDs) > 0 {
219-
s.Join("INNER", "issue_label", "issue_label.issue_id = issue.id").
220-
In("issue_label.label_id", opts.LabelIDs)
221-
}
222-
223-
if opts.IsArchived != util.OptionalBoolNone {
224-
s.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
225-
}
226-
return s
227-
}
228-
229-
switch filterMode {
230-
case FilterModeAll, FilterModeYourRepositories:
231-
stats.OpenCount, err = sess(cond).
232-
And("issue.is_closed = ?", false).
233-
Count(new(Issue))
234-
if err != nil {
235-
return nil, err
236-
}
237-
stats.ClosedCount, err = sess(cond).
238-
And("issue.is_closed = ?", true).
239-
Count(new(Issue))
240-
if err != nil {
241-
return nil, err
242-
}
243-
case FilterModeAssign:
244-
stats.OpenCount, err = applyAssigneeCondition(sess(cond), opts.User.ID).
245-
And("issue.is_closed = ?", false).
246-
Count(new(Issue))
247-
if err != nil {
248-
return nil, err
249-
}
250-
stats.ClosedCount, err = applyAssigneeCondition(sess(cond), opts.User.ID).
251-
And("issue.is_closed = ?", true).
252-
Count(new(Issue))
253-
if err != nil {
254-
return nil, err
255-
}
256-
case FilterModeCreate:
257-
stats.OpenCount, err = applyPosterCondition(sess(cond), opts.User.ID).
258-
And("issue.is_closed = ?", false).
259-
Count(new(Issue))
260-
if err != nil {
261-
return nil, err
262-
}
263-
stats.ClosedCount, err = applyPosterCondition(sess(cond), opts.User.ID).
264-
And("issue.is_closed = ?", true).
265-
Count(new(Issue))
266-
if err != nil {
267-
return nil, err
268-
}
269-
case FilterModeMention:
270-
stats.OpenCount, err = applyMentionedCondition(sess(cond), opts.User.ID).
271-
And("issue.is_closed = ?", false).
272-
Count(new(Issue))
273-
if err != nil {
274-
return nil, err
275-
}
276-
stats.ClosedCount, err = applyMentionedCondition(sess(cond), opts.User.ID).
277-
And("issue.is_closed = ?", true).
278-
Count(new(Issue))
279-
if err != nil {
280-
return nil, err
281-
}
282-
case FilterModeReviewRequested:
283-
stats.OpenCount, err = applyReviewRequestedCondition(sess(cond), opts.User.ID).
284-
And("issue.is_closed = ?", false).
285-
Count(new(Issue))
286-
if err != nil {
287-
return nil, err
288-
}
289-
stats.ClosedCount, err = applyReviewRequestedCondition(sess(cond), opts.User.ID).
290-
And("issue.is_closed = ?", true).
291-
Count(new(Issue))
292-
if err != nil {
293-
return nil, err
294-
}
295-
case FilterModeReviewed:
296-
stats.OpenCount, err = applyReviewedCondition(sess(cond), opts.User.ID).
297-
And("issue.is_closed = ?", false).
298-
Count(new(Issue))
299-
if err != nil {
300-
return nil, err
301-
}
302-
stats.ClosedCount, err = applyReviewedCondition(sess(cond), opts.User.ID).
303-
And("issue.is_closed = ?", true).
304-
Count(new(Issue))
305-
if err != nil {
306-
return nil, err
307-
}
308-
}
309-
310-
cond = cond.And(builder.Eq{"issue.is_closed": opts.IsClosed.IsTrue()})
311-
stats.AssignCount, err = applyAssigneeCondition(sess(cond), opts.User.ID).Count(new(Issue))
312-
if err != nil {
313-
return nil, err
314-
}
315-
316-
stats.CreateCount, err = applyPosterCondition(sess(cond), opts.User.ID).Count(new(Issue))
317-
if err != nil {
318-
return nil, err
319-
}
320-
321-
stats.MentionCount, err = applyMentionedCondition(sess(cond), opts.User.ID).Count(new(Issue))
322-
if err != nil {
323-
return nil, err
324-
}
325-
326-
stats.YourRepositoriesCount, err = sess(cond).Count(new(Issue))
327-
if err != nil {
328-
return nil, err
329-
}
330-
331-
stats.ReviewRequestedCount, err = applyReviewRequestedCondition(sess(cond), opts.User.ID).Count(new(Issue))
332-
if err != nil {
333-
return nil, err
334-
}
335-
336-
stats.ReviewedCount, err = applyReviewedCondition(sess(cond), opts.User.ID).Count(new(Issue))
337-
if err != nil {
338-
return nil, err
339-
}
340-
341-
return stats, nil
342-
}
343-
344182
// GetRepoIssueStats returns number of open and closed repository issues by given filter mode.
345183
func GetRepoIssueStats(repoID, uid int64, filterMode int, isPull bool) (numOpen, numClosed int64) {
346184
countSession := func(isClosed, isPull bool, repoID int64) *xorm.Session {

‎models/issues/issue_test.go

Lines changed: 0 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ import (
1313

1414
"code.gitea.io/gitea/models/db"
1515
issues_model "code.gitea.io/gitea/models/issues"
16-
"code.gitea.io/gitea/models/organization"
1716
repo_model "code.gitea.io/gitea/models/repo"
1817
"code.gitea.io/gitea/models/unittest"
1918
user_model "code.gitea.io/gitea/models/user"
2019
"code.gitea.io/gitea/modules/setting"
21-
"code.gitea.io/gitea/modules/util"
2220

2321
"github.com/stretchr/testify/assert"
2422
"xorm.io/builder"
@@ -204,128 +202,6 @@ func TestIssues(t *testing.T) {
204202
}
205203
}
206204

207-
func TestGetUserIssueStats(t *testing.T) {
208-
assert.NoError(t, unittest.PrepareTestDatabase())
209-
for _, test := range []struct {
210-
FilterMode int
211-
Opts issues_model.IssuesOptions
212-
ExpectedIssueStats issues_model.IssueStats
213-
}{
214-
{
215-
issues_model.FilterModeAll,
216-
issues_model.IssuesOptions{
217-
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
218-
RepoIDs: []int64{1},
219-
IsPull: util.OptionalBoolFalse,
220-
},
221-
issues_model.IssueStats{
222-
YourRepositoriesCount: 1, // 6
223-
AssignCount: 1, // 6
224-
CreateCount: 1, // 6
225-
OpenCount: 1, // 6
226-
ClosedCount: 1, // 1
227-
},
228-
},
229-
{
230-
issues_model.FilterModeAll,
231-
issues_model.IssuesOptions{
232-
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
233-
RepoIDs: []int64{1},
234-
IsPull: util.OptionalBoolFalse,
235-
IsClosed: util.OptionalBoolTrue,
236-
},
237-
issues_model.IssueStats{
238-
YourRepositoriesCount: 1, // 6
239-
AssignCount: 0,
240-
CreateCount: 0,
241-
OpenCount: 1, // 6
242-
ClosedCount: 1, // 1
243-
},
244-
},
245-
{
246-
issues_model.FilterModeAssign,
247-
issues_model.IssuesOptions{
248-
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
249-
IsPull: util.OptionalBoolFalse,
250-
},
251-
issues_model.IssueStats{
252-
YourRepositoriesCount: 1, // 6
253-
AssignCount: 1, // 6
254-
CreateCount: 1, // 6
255-
OpenCount: 1, // 6
256-
ClosedCount: 0,
257-
},
258-
},
259-
{
260-
issues_model.FilterModeCreate,
261-
issues_model.IssuesOptions{
262-
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
263-
IsPull: util.OptionalBoolFalse,
264-
},
265-
issues_model.IssueStats{
266-
YourRepositoriesCount: 1, // 6
267-
AssignCount: 1, // 6
268-
CreateCount: 1, // 6
269-
OpenCount: 1, // 6
270-
ClosedCount: 0,
271-
},
272-
},
273-
{
274-
issues_model.FilterModeMention,
275-
issues_model.IssuesOptions{
276-
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
277-
IsPull: util.OptionalBoolFalse,
278-
},
279-
issues_model.IssueStats{
280-
YourRepositoriesCount: 1, // 6
281-
AssignCount: 1, // 6
282-
CreateCount: 1, // 6
283-
MentionCount: 0,
284-
OpenCount: 0,
285-
ClosedCount: 0,
286-
},
287-
},
288-
{
289-
issues_model.FilterModeCreate,
290-
issues_model.IssuesOptions{
291-
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
292-
IssueIDs: []int64{1},
293-
IsPull: util.OptionalBoolFalse,
294-
},
295-
issues_model.IssueStats{
296-
YourRepositoriesCount: 1, // 1
297-
AssignCount: 1, // 1
298-
CreateCount: 1, // 1
299-
OpenCount: 1, // 1
300-
ClosedCount: 0,
301-
},
302-
},
303-
{
304-
issues_model.FilterModeAll,
305-
issues_model.IssuesOptions{
306-
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}),
307-
Org: unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3}),
308-
Team: unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 7}),
309-
IsPull: util.OptionalBoolFalse,
310-
},
311-
issues_model.IssueStats{
312-
YourRepositoriesCount: 2,
313-
AssignCount: 1,
314-
CreateCount: 1,
315-
OpenCount: 2,
316-
},
317-
},
318-
} {
319-
t.Run(fmt.Sprintf("%#v", test.Opts), func(t *testing.T) {
320-
stats, err := issues_model.GetUserIssueStats(test.FilterMode, test.Opts)
321-
if !assert.NoError(t, err) {
322-
return
323-
}
324-
assert.Equal(t, test.ExpectedIssueStats, *stats)
325-
})
326-
}
327-
}
328-
329205
func TestIssue_loadTotalTimes(t *testing.T) {
330206
assert.NoError(t, unittest.PrepareTestDatabase())
331207
ms, err := issues_model.GetIssueByID(db.DefaultContext, 2)

‎routers/web/user/home.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
556556
// USING FINAL STATE OF opts FOR A QUERY.
557557
var issues issues_model.IssueList
558558
{
559-
issueIDs, err := issueIDsFromSearch(ctx, keyword, opts)
559+
issueIDs, _, err := issue_indexer.SearchIssues(ctx, issue_indexer.ToSearchOptions(keyword, opts))
560560
if err != nil {
561-
ctx.ServerError("issueIDsFromSearch", err)
561+
ctx.ServerError("SearchIssues", err)
562562
return
563563
}
564564
issues, err = issues_model.GetIssuesByIDs(ctx, issueIDs, true)
@@ -731,15 +731,6 @@ func getRepoIDs(reposQuery string) []int64 {
731731
return repoIDs
732732
}
733733

734-
// TBC: remove it
735-
func issueIDsFromSearch(ctx *context.Context, keyword string, opts *issues_model.IssuesOptions) ([]int64, error) {
736-
ids, _, err := issue_indexer.SearchIssues(ctx, issue_indexer.ToSearchOptions(keyword, opts))
737-
if err != nil {
738-
return nil, fmt.Errorf("SearchIssues: %w", err)
739-
}
740-
return ids, nil
741-
}
742-
743734
func loadRepoByIDs(ctxUser *user_model.User, issueCountByRepo map[int64]int64, unitType unit.Type) (map[int64]*repo_model.Repository, error) {
744735
totalRes := make(map[int64]*repo_model.Repository, len(issueCountByRepo))
745736
repoIDs := make([]int64, 0, 500)

0 commit comments

Comments
 (0)