api/issue: minor code refactor (#3688)

2 files changed, 20 insertions, 18 deletions

diff --git a/models/issue.go b/models/issue.go
index a661ea4b..caaabe42 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -813,6 +813,7 @@ type IssuesOptions struct {
 	SortType    string
 }
 
+// buildIssuesQuery returns nil if it foresees there won't be any value returned.
 func buildIssuesQuery(opts *IssuesOptions) *xorm.Session {
 	sess := x.NewSession()
 
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index 059c6f74..7b823e9e 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -15,30 +15,13 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-func ListUserIssues(ctx *context.APIContext) {
-	opts := models.IssuesOptions{
-		AssigneeID: ctx.User.ID,
-		Page:       ctx.QueryInt("page"),
-	}
-
-	listIssues(ctx, &opts)
-}
-
-func ListIssues(ctx *context.APIContext) {
-	opts := models.IssuesOptions{
-		RepoID: ctx.Repo.Repository.ID,
-		Page:   ctx.QueryInt("page"),
-	}
-
-	listIssues(ctx, &opts)
-}
-
 func listIssues(ctx *context.APIContext, opts *models.IssuesOptions) {
 	issues, err := models.Issues(opts)
 	if err != nil {
 		ctx.Error(500, "Issues", err)
 		return
 	}
+
 	count, err := models.IssuesCount(opts)
 	if err != nil {
 		ctx.Error(500, "IssuesCount", err)
@@ -59,6 +42,24 @@ func listIssues(ctx *context.APIContext, opts *models.IssuesOptions) {
 	ctx.JSON(200, &apiIssues)
 }
 
+func ListUserIssues(ctx *context.APIContext) {
+	opts := models.IssuesOptions{
+		AssigneeID: ctx.User.ID,
+		Page:       ctx.QueryInt("page"),
+	}
+
+	listIssues(ctx, &opts)
+}
+
+func ListIssues(ctx *context.APIContext) {
+	opts := models.IssuesOptions{
+		RepoID: ctx.Repo.Repository.ID,
+		Page:   ctx.QueryInt("page"),
+	}
+
+	listIssues(ctx, &opts)
+}
+
 func GetIssue(ctx *context.APIContext) {
 	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
 	if err != nil {