diff options
| author | 6543 <6543@obermui.de> | 2020-02-29 03:49:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 23:49:50 -0300 |
| commit | 7e8cdba18120c4588d1921f07593a9a66eaa1411 (patch) | |
| tree | d7782277bb558c9cea1ccb262b81298330bb35ba /routers/api/v1/repo/issue.go | |
| parent | c32f3da33c38e18a7ed4a8c49de27898c2aa07f8 (diff) | |
| download | gitea-7e8cdba18120c4588d1921f07593a9a66eaa1411.tar.gz gitea-7e8cdba18120c4588d1921f07593a9a66eaa1411.zip | |
[Refactor] move APIFormat() of Issue and Label to convert package (#10423)
* Label: delete .APIFormat() and use convert.ToLabel()
* move issue APIFormat too
* add missing one
* move TEST too
* handle error -> return empty APIIssue
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'routers/api/v1/repo/issue.go')
| -rw-r--r-- | routers/api/v1/repo/issue.go | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index c400ec6f3c..2f08ba6ea6 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/convert" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" @@ -168,13 +169,8 @@ func SearchIssues(ctx *context.APIContext) { return } - apiIssues := make([]*api.Issue, len(issues)) - for i := range issues { - apiIssues[i] = issues[i].APIFormat() - } - ctx.SetLinkHeader(issueCount, setting.UI.IssuePagingNum) - ctx.JSON(http.StatusOK, &apiIssues) + ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues)) } // ListIssues list the issues of a repository @@ -287,13 +283,8 @@ func ListIssues(ctx *context.APIContext) { return } - apiIssues := make([]*api.Issue, len(issues)) - for i := range issues { - apiIssues[i] = issues[i].APIFormat() - } - ctx.SetLinkHeader(ctx.Repo.Repository.NumIssues, listOptions.PageSize) - ctx.JSON(http.StatusOK, &apiIssues) + ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues)) } // GetIssue get an issue of a repository @@ -335,7 +326,7 @@ func GetIssue(ctx *context.APIContext) { } return } - ctx.JSON(http.StatusOK, issue.APIFormat()) + ctx.JSON(http.StatusOK, convert.ToAPIIssue(issue)) } // CreateIssue create an issue of a repository @@ -450,7 +441,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { ctx.Error(http.StatusInternalServerError, "GetIssueByID", err) return } - ctx.JSON(http.StatusCreated, issue.APIFormat()) + ctx.JSON(http.StatusCreated, convert.ToAPIIssue(issue)) } // EditIssue modify an issue of a repository @@ -596,7 +587,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { ctx.InternalServerError(err) return } - ctx.JSON(http.StatusCreated, issue.APIFormat()) + ctx.JSON(http.StatusCreated, convert.ToAPIIssue(issue)) } // UpdateIssueDeadline updates an issue deadline |