Skip to content

Commit 596dcc0

Browse files
committed
refactor: return ApiError instead of Error from projects methods
1 parent 68ea867 commit 596dcc0

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

routers/api/v1/projects/project.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ func innerCreateProject(ctx *context.APIContext, projectType project_model.Type)
3636
}
3737

3838
if err := project_model.NewProject(ctx, project); err != nil {
39-
ctx.Error(http.StatusInternalServerError, "NewProject", err)
39+
ctx.APIErrorInternal(err)
4040
return
4141
}
4242

4343
project, err := project_model.GetProjectByID(ctx, project.ID)
4444
if err != nil {
45-
ctx.Error(http.StatusInternalServerError, "NewProject", err)
45+
ctx.APIErrorInternal(err)
4646
return
4747
}
4848

4949
projectResponse, err := convert.ToAPIProject(ctx, project)
5050
if err != nil {
51-
ctx.Error(http.StatusInternalServerError, "NewProject", err)
51+
ctx.APIErrorInternal(err)
5252
return
5353
}
5454

@@ -161,16 +161,16 @@ func GetProject(ctx *context.APIContext) {
161161
project, err := project_model.GetProjectByID(ctx, ctx.FormInt64(":id"))
162162
if err != nil {
163163
if project_model.IsErrProjectNotExist(err) {
164-
ctx.NotFound()
164+
ctx.APIError(http.StatusNotFound, err)
165165
} else {
166-
ctx.Error(http.StatusInternalServerError, "GetProjectByID", err)
166+
ctx.APIErrorInternal(err)
167167
}
168168
return
169169
}
170170

171171
projectResponse, err := convert.ToAPIProject(ctx, project)
172172
if err != nil {
173-
ctx.Error(http.StatusInternalServerError, "GetProjectByID", err)
173+
ctx.APIErrorInternal(err)
174174
return
175175
}
176176
ctx.JSON(http.StatusOK, projectResponse)
@@ -205,9 +205,9 @@ func UpdateProject(ctx *context.APIContext) {
205205
project, err := project_model.GetProjectByID(ctx, ctx.FormInt64("id"))
206206
if err != nil {
207207
if project_model.IsErrProjectNotExist(err) {
208-
ctx.NotFound()
208+
ctx.APIError(http.StatusNotFound, err)
209209
} else {
210-
ctx.Error(http.StatusInternalServerError, "UpdateProject", err)
210+
ctx.APIErrorInternal(err)
211211
}
212212
return
213213
}
@@ -220,12 +220,12 @@ func UpdateProject(ctx *context.APIContext) {
220220

221221
err = project_model.UpdateProject(ctx, project)
222222
if err != nil {
223-
ctx.Error(http.StatusInternalServerError, "UpdateProject", err)
223+
ctx.APIErrorInternal(err)
224224
return
225225
}
226226
projectResponse, err := convert.ToAPIProject(ctx, project)
227227
if err != nil {
228-
ctx.Error(http.StatusInternalServerError, "UpdateProject", err)
228+
ctx.APIErrorInternal(err)
229229
return
230230
}
231231
ctx.JSON(http.StatusOK, projectResponse)
@@ -250,7 +250,7 @@ func DeleteProject(ctx *context.APIContext) {
250250
// "$ref": "#/responses/notFound"
251251

252252
if err := project_model.DeleteProjectByID(ctx, ctx.FormInt64(":id")); err != nil {
253-
ctx.Error(http.StatusInternalServerError, "DeleteProjectByID", err)
253+
ctx.APIErrorInternal(err)
254254
return
255255
}
256256

@@ -290,7 +290,7 @@ func ListUserProjects(ctx *context.APIContext) {
290290
ListOptions: db.ListOptions{Page: ctx.FormInt("page")},
291291
})
292292
if err != nil {
293-
ctx.Error(http.StatusInternalServerError, "ListUserProjets", err)
293+
ctx.APIErrorInternal(err)
294294
return
295295
}
296296

@@ -299,7 +299,7 @@ func ListUserProjects(ctx *context.APIContext) {
299299

300300
apiProjects, err := convert.ToAPIProjectList(ctx, projects)
301301
if err != nil {
302-
ctx.Error(http.StatusInternalServerError, "ListUserProjects", err)
302+
ctx.APIErrorInternal(err)
303303
return
304304
}
305305

@@ -344,7 +344,7 @@ func ListOrgProjects(ctx *context.APIContext) {
344344
Type: project_model.TypeOrganization,
345345
})
346346
if err != nil {
347-
ctx.Error(http.StatusInternalServerError, "ListOrgProjects", err)
347+
ctx.APIErrorInternal(err)
348348
return
349349
}
350350

@@ -353,7 +353,7 @@ func ListOrgProjects(ctx *context.APIContext) {
353353

354354
apiProjects, err := convert.ToAPIProjectList(ctx, projects)
355355
if err != nil {
356-
ctx.Error(http.StatusInternalServerError, "ListOrgProjects", err)
356+
ctx.APIErrorInternal(err)
357357
return
358358
}
359359

@@ -405,7 +405,7 @@ func ListRepoProjects(ctx *context.APIContext) {
405405
ListOptions: db.ListOptions{Page: page},
406406
})
407407
if err != nil {
408-
ctx.Error(http.StatusInternalServerError, "ListRepoProjects", err)
408+
ctx.APIErrorInternal(err)
409409
return
410410
}
411411

@@ -414,7 +414,7 @@ func ListRepoProjects(ctx *context.APIContext) {
414414

415415
apiProjects, err := convert.ToAPIProjectList(ctx, projects)
416416
if err != nil {
417-
ctx.Error(http.StatusInternalServerError, "ListRepoProjects", err)
417+
ctx.APIErrorInternal(err)
418418
return
419419
}
420420

0 commit comments

Comments
 (0)