aboutsummaryrefslogtreecommitdiff
path: root/server/api/controller/category.go
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net> 2017-11-21 18:30:16 -0800
committerGravatar Frédéric Guillot <fred@miniflux.net> 2017-11-21 18:30:16 -0800
commit02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e (patch)
tree236d95c147453fcdeacd92cdc17fd886d664c1b0 /server/api/controller/category.go
parent25cbd657771a67ef41abac4089a231369b96276e (diff)
downloadv2-02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e.tar.gz
v2-02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e.tar.zst
v2-02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e.zip
Improve Response to be more idiomatic
Diffstat (limited to 'server/api/controller/category.go')
-rw-r--r--server/api/controller/category.go30
1 files changed, 15 insertions, 15 deletions
diff --git a/server/api/controller/category.go b/server/api/controller/category.go
index 3de03217..deaa273d 100644
--- a/server/api/controller/category.go
+++ b/server/api/controller/category.go
@@ -14,64 +14,64 @@ import (
func (c *Controller) CreateCategory(ctx *core.Context, request *core.Request, response *core.Response) {
category, err := payload.DecodeCategoryPayload(request.Body())
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
category.UserID = ctx.GetUserID()
if err := category.ValidateCategoryCreation(); err != nil {
- response.Json().ServerError(err)
+ response.JSON().ServerError(err)
return
}
err = c.store.CreateCategory(category)
if err != nil {
- response.Json().ServerError(errors.New("Unable to create this category"))
+ response.JSON().ServerError(errors.New("Unable to create this category"))
return
}
- response.Json().Created(category)
+ response.JSON().Created(category)
}
// UpdateCategory is the API handler to update a category.
func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, response *core.Response) {
categoryID, err := request.IntegerParam("categoryID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
category, err := payload.DecodeCategoryPayload(request.Body())
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
category.UserID = ctx.GetUserID()
category.ID = categoryID
if err := category.ValidateCategoryModification(); err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
err = c.store.UpdateCategory(category)
if err != nil {
- response.Json().ServerError(errors.New("Unable to update this category"))
+ response.JSON().ServerError(errors.New("Unable to update this category"))
return
}
- response.Json().Created(category)
+ response.JSON().Created(category)
}
// GetCategories is the API handler to get a list of categories for a given user.
func (c *Controller) GetCategories(ctx *core.Context, request *core.Request, response *core.Response) {
categories, err := c.store.GetCategories(ctx.GetUserID())
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch categories"))
+ response.JSON().ServerError(errors.New("Unable to fetch categories"))
return
}
- response.Json().Standard(categories)
+ response.JSON().Standard(categories)
}
// RemoveCategory is the API handler to remove a category.
@@ -79,19 +79,19 @@ func (c *Controller) RemoveCategory(ctx *core.Context, request *core.Request, re
userID := ctx.GetUserID()
categoryID, err := request.IntegerParam("categoryID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
if !c.store.CategoryExists(userID, categoryID) {
- response.Json().NotFound(errors.New("Category not found"))
+ response.JSON().NotFound(errors.New("Category not found"))
return
}
if err := c.store.RemoveCategory(userID, categoryID); err != nil {
- response.Json().ServerError(errors.New("Unable to remove this category"))
+ response.JSON().ServerError(errors.New("Unable to remove this category"))
return
}
- response.Json().NoContent()
+ response.JSON().NoContent()
}