From 58e56cd0c67b9945194ffe338f8c7efeca2b205c Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 21 Jan 2024 15:39:55 +0100 Subject: [PATCH] more formatting fixes --- routers/api/v1/projects/project.go | 35 ++++++++++----------------- tests/integration/api_project_test.go | 4 +-- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/routers/api/v1/projects/project.go b/routers/api/v1/projects/project.go index 4aed86d7de4..4bcf2410828 100644 --- a/routers/api/v1/projects/project.go +++ b/routers/api/v1/projects/project.go @@ -15,10 +15,7 @@ import ( "code.gitea.io/gitea/services/convert" ) -func innerCreateProject( - ctx *context.APIContext, - projectType project_model.Type, -) { +func innerCreateProject(ctx *context.APIContext, projectType project_model.Type) { form := web.GetForm(ctx).(*api.NewProjectPayload) project := &project_model.Project{ RepoID: 0, @@ -287,12 +284,10 @@ func ListUserProjects(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" projects, count, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{ - Type: project_model.TypeIndividual, - IsClosed: ctx.FormOptionalBool("closed"), - OwnerID: ctx.Doer.ID, - ListOptions: db.ListOptions{ - Page: ctx.FormInt("page"), - }, + Type: project_model.TypeIndividual, + IsClosed: ctx.FormOptionalBool("closed"), + OwnerID: ctx.Doer.ID, + ListOptions: db.ListOptions{Page: ctx.FormInt("page")}, }) if err != nil { ctx.Error(http.StatusInternalServerError, "Projects", err) @@ -343,12 +338,10 @@ func ListOrgProjects(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" projects, count, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{ - OwnerID: ctx.Org.Organization.AsUser().ID, - ListOptions: db.ListOptions{ - Page: ctx.FormInt("page"), - }, - IsClosed: ctx.FormOptionalBool("closed"), - Type: project_model.TypeOrganization, + OwnerID: ctx.Org.Organization.AsUser().ID, + ListOptions: db.ListOptions{Page: ctx.FormInt("page")}, + IsClosed: ctx.FormOptionalBool("closed"), + Type: project_model.TypeOrganization, }) if err != nil { ctx.Error(http.StatusInternalServerError, "Projects", err) @@ -404,12 +397,10 @@ func ListRepoProjects(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" projects, count, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{ - RepoID: ctx.Repo.Repository.ID, - IsClosed: ctx.FormOptionalBool("closed"), - Type: project_model.TypeRepository, - ListOptions: db.ListOptions{ - Page: ctx.FormInt("page"), - }, + RepoID: ctx.Repo.Repository.ID, + IsClosed: ctx.FormOptionalBool("closed"), + Type: project_model.TypeRepository, + ListOptions: db.ListOptions{Page: ctx.FormInt("page")}, }) if err != nil { ctx.Error(http.StatusInternalServerError, "Projects", err) diff --git a/tests/integration/api_project_test.go b/tests/integration/api_project_test.go index 03ada633367..15f431683c5 100644 --- a/tests/integration/api_project_test.go +++ b/tests/integration/api_project_test.go @@ -149,9 +149,7 @@ func TestAPIUpdateProject(t *testing.T) { token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteUser, auth_model.AccessTokenScopeWriteIssue) link, _ := url.Parse(fmt.Sprintf("/api/v1/projects/%d", 1)) - req := NewRequestWithJSON(t, "PATCH", link.String(), &api.UpdateProjectPayload{ - Title: "First project updated", - }).AddTokenAuth(token) + req := NewRequestWithJSON(t, "PATCH", link.String(), &api.UpdateProjectPayload{Title: "First project updated"}).AddTokenAuth(token) var apiProject *api.Project