Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed count of filtered issues when api request. #12275

Merged
merged 26 commits into from
Sep 24, 2020
Merged

Fixed count of filtered issues when api request. #12275

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
208cc08
Improved total count of issue when filtered.
hinoshiba Jul 19, 2020
19dd577
Fixed size of slice when selected 1 repository.
hinoshiba Jul 19, 2020
bd69a4b
Improved function of error check.
hinoshiba Jul 19, 2020
da583f7
improved comment
hinoshiba Jul 19, 2020
8d0a2de
Added parameter of return header.
hinoshiba Jul 20, 2020
3f09965
Updated corresponded to the current vendored of "xorm.io/xorm".
hinoshiba Jul 20, 2020
b4e1f3a
Merge branch 'fixed_count_of_filteredIssues' of github.com:hinoshiba/…
hinoshiba Jul 20, 2020
0211cb5
Dedublicated it by store the Options Struct into a variable.
hinoshiba Jul 20, 2020
bc8cc31
format code
6543 Jul 22, 2020
7a6de11
Merge pull request #1 from 6543-forks/fixed_count_of_filteredIssues_f…
hinoshiba Jul 23, 2020
1507022
Update routers/api/v1/repo/issue.go
hinoshiba Jul 23, 2020
bf89ea7
Update routers/api/v1/repo/issue.go
hinoshiba Jul 23, 2020
82d00de
Updated number of range.
hinoshiba Jul 23, 2020
2d36293
Updated number of range.
hinoshiba Jul 23, 2020
0c3a9d3
Removed total value.
hinoshiba Jul 23, 2020
07d0225
make fmt
hinoshiba Jul 23, 2020
fec7657
Merge branch 'master' into fixed_count_of_filteredIssues
hinoshiba Sep 1, 2020
8335b42
Improved value of sql.
hinoshiba Sep 16, 2020
07f1f8a
Improved value of sql.
hinoshiba Sep 16, 2020
15b7cb2
improved message
hinoshiba Sep 16, 2020
dfc545e
improved message
hinoshiba Sep 16, 2020
46c61e4
improved message
hinoshiba Sep 16, 2020
dc15e1f
fixed message
hinoshiba Sep 16, 2020
ad9cc37
Merge branch 'master' into fixed_count_of_filteredIssues
hinoshiba Sep 16, 2020
dcd08d0
Merge branch 'master' into fixed_count_of_filteredIssues
techknowlogick Sep 24, 2020
630f842
Merge branch 'master' into fixed_count_of_filteredIssues
techknowlogick Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion models/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
opts.setupSession(sess)
sortIssuesSession(sess, opts.SortType, opts.PriorityRepoID)

issues := make([]*Issue, 0, setting.UI.IssuePagingNum)
issues := make([]*Issue, 0, opts.ListOptions.PageSize)
if err := sess.Find(&issues); err != nil {
return nil, fmt.Errorf("Find: %v", err)
}
Expand All @@ -1240,6 +1240,16 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
return issues, nil
}

// CountIssues number return of issues by given conditions.
func CountIssues(opts *IssuesOptions) (int64, error) {
sess := x.NewSession()
defer sess.Close()

opts.setupSession(sess.Select("COUNT(*)").Table("issue"))

return sess.Count()
}

// GetParticipantsIDsByIssueID returns the IDs of all users who participated in comments of an issue,
// but skips joining with `user` for performance reasons.
// User permissions must be verified elsewhere if required.
Expand Down
67 changes: 56 additions & 11 deletions routers/api/v1/repo/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func SearchIssues(ctx *context.APIContext) {
}

var issues []*models.Issue
var filteredCount int64

keyword := strings.Trim(ctx.Query("q"), " ")
if strings.IndexByte(keyword, 0) >= 0 {
Expand All @@ -130,6 +131,10 @@ func SearchIssues(ctx *context.APIContext) {
var err error
if len(keyword) > 0 && len(repoIDs) > 0 {
issueIDs, err = issue_indexer.SearchIssuesByKeyword(repoIDs, keyword)
if err != nil {
ctx.Error(http.StatusInternalServerError, "SearchIssuesByKeyword", err)
return
}
}

var isPull util.OptionalBool
Expand Down Expand Up @@ -165,14 +170,32 @@ func SearchIssues(ctx *context.APIContext) {
PriorityRepoID: ctx.QueryInt64("priority_repo_id"),
IsPull: isPull,
})
}
if err != nil {
ctx.Error(http.StatusInternalServerError, "Issues", err)
return
}

if err != nil {
ctx.Error(http.StatusInternalServerError, "Issues", err)
return
filteredCount, err = models.CountIssues(&models.IssuesOptions{
ListOptions: models.ListOptions{
Page: ctx.QueryInt("page"),
PageSize: issueCount,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
PageSize: issueCount,
PageSize: setting.UI.IssuePagingNum,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☝️ if you dedub things this is not needed anyway ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for the purpose of getting the maximum value that matches the filter.
Therefore, the current maximum value is set as an option.

},

RepoIDs: repoIDs,
IsClosed: isClosed,
IssueIDs: issueIDs,
IncludedLabelNames: includedLabelNames,
SortType: "priorityrepo",
PriorityRepoID: ctx.QueryInt64("priority_repo_id"),
IsPull: isPull,
})
if err != nil {
ctx.Error(http.StatusInternalServerError, "CountIssues", err)
return
}
}

ctx.SetLinkHeader(issueCount, setting.UI.IssuePagingNum)
ctx.SetLinkHeader(int(filteredCount), setting.UI.IssuePagingNum)
hinoshiba marked this conversation as resolved.
Show resolved Hide resolved
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues))
}

Expand Down Expand Up @@ -239,6 +262,7 @@ func ListIssues(ctx *context.APIContext) {
}

var issues []*models.Issue
var filteredCount int64

keyword := strings.Trim(ctx.Query("q"), " ")
if strings.IndexByte(keyword, 0) >= 0 {
Expand All @@ -249,6 +273,10 @@ func ListIssues(ctx *context.APIContext) {
var err error
if len(keyword) > 0 {
issueIDs, err = issue_indexer.SearchIssuesByKeyword([]int64{ctx.Repo.Repository.ID}, keyword)
if err != nil {
ctx.Error(http.StatusInternalServerError, "SearchIssuesByKeyword", err)
return
}
}

if splitted := strings.Split(ctx.Query("labels"), ","); len(splitted) > 0 {
Expand Down Expand Up @@ -313,15 +341,32 @@ func ListIssues(ctx *context.APIContext) {
MilestoneIDs: mileIDs,
IsPull: isPull,
})
}
if err != nil {
ctx.Error(http.StatusInternalServerError, "Issues", err)
return
}

if err != nil {
ctx.Error(http.StatusInternalServerError, "Issues", err)
return
filteredCount, err = models.CountIssues(&models.IssuesOptions{
ListOptions: models.ListOptions{
Page: ctx.QueryInt("page"),
PageSize: ctx.Repo.Repository.NumIssues,
},

RepoIDs: []int64{ctx.Repo.Repository.ID},
IsClosed: isClosed,
IssueIDs: issueIDs,
LabelIDs: labelIDs,
MilestoneIDs: mileIDs,
IsPull: isPull,
})
if err != nil {
ctx.Error(http.StatusInternalServerError, "CountIssues", err)
return
}
}

ctx.SetLinkHeader(ctx.Repo.Repository.NumIssues, listOptions.PageSize)
ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", ctx.Repo.Repository.NumIssues))
ctx.SetLinkHeader(int(filteredCount), listOptions.PageSize)
ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", filteredCount))

ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues))
}
Expand Down