aboutsummaryrefslogtreecommitdiff
path: root/server/api/controller
diff options
context:
space:
mode:
Diffstat (limited to 'server/api/controller')
-rw-r--r--server/api/controller/category.go30
-rw-r--r--server/api/controller/entry.go42
-rw-r--r--server/api/controller/feed.go44
-rw-r--r--server/api/controller/subscription.go8
-rw-r--r--server/api/controller/user.go56
5 files changed, 90 insertions, 90 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()
}
diff --git a/server/api/controller/entry.go b/server/api/controller/entry.go
index 2a5f0bd0..d5f5b186 100644
--- a/server/api/controller/entry.go
+++ b/server/api/controller/entry.go
@@ -16,13 +16,13 @@ func (c *Controller) GetEntry(ctx *core.Context, request *core.Request, response
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
entryID, err := request.IntegerParam("entryID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
@@ -32,16 +32,16 @@ func (c *Controller) GetEntry(ctx *core.Context, request *core.Request, response
entry, err := builder.GetEntry()
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch this entry from the database"))
+ response.JSON().ServerError(errors.New("Unable to fetch this entry from the database"))
return
}
if entry == nil {
- response.Json().NotFound(errors.New("Entry not found"))
+ response.JSON().NotFound(errors.New("Entry not found"))
return
}
- response.Json().Standard(entry)
+ response.JSON().Standard(entry)
}
// GetFeedEntries is the API handler to get all feed entries.
@@ -49,27 +49,27 @@ func (c *Controller) GetFeedEntries(ctx *core.Context, request *core.Request, re
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
status := request.QueryStringParam("status", "")
if status != "" {
if err := model.ValidateEntryStatus(status); err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
}
order := request.QueryStringParam("order", "id")
if err := model.ValidateEntryOrder(order); err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
direction := request.QueryStringParam("direction", "desc")
if err := model.ValidateDirection(direction); err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
@@ -86,17 +86,17 @@ func (c *Controller) GetFeedEntries(ctx *core.Context, request *core.Request, re
entries, err := builder.GetEntries()
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch the list of entries"))
+ response.JSON().ServerError(errors.New("Unable to fetch the list of entries"))
return
}
count, err := builder.CountEntries()
if err != nil {
- response.Json().ServerError(errors.New("Unable to count the number of entries"))
+ response.JSON().ServerError(errors.New("Unable to count the number of entries"))
return
}
- response.Json().Standard(&payload.EntriesResponse{Total: count, Entries: entries})
+ response.JSON().Standard(&payload.EntriesResponse{Total: count, Entries: entries})
}
// SetEntryStatus is the API handler to change the status of an entry.
@@ -105,24 +105,24 @@ func (c *Controller) SetEntryStatus(ctx *core.Context, request *core.Request, re
feedID, err := request.IntegerParam("feedID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
entryID, err := request.IntegerParam("entryID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
status, err := payload.DecodeEntryStatusPayload(request.Body())
if err != nil {
- response.Json().BadRequest(errors.New("Invalid JSON payload"))
+ response.JSON().BadRequest(errors.New("Invalid JSON payload"))
return
}
if err := model.ValidateEntryStatus(status); err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
@@ -132,25 +132,25 @@ func (c *Controller) SetEntryStatus(ctx *core.Context, request *core.Request, re
entry, err := builder.GetEntry()
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch this entry from the database"))
+ response.JSON().ServerError(errors.New("Unable to fetch this entry from the database"))
return
}
if entry == nil {
- response.Json().NotFound(errors.New("Entry not found"))
+ response.JSON().NotFound(errors.New("Entry not found"))
return
}
if err := c.store.SetEntriesStatus(userID, []int64{entry.ID}, status); err != nil {
- response.Json().ServerError(errors.New("Unable to change entry status"))
+ response.JSON().ServerError(errors.New("Unable to change entry status"))
return
}
entry, err = builder.GetEntry()
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch this entry from the database"))
+ response.JSON().ServerError(errors.New("Unable to fetch this entry from the database"))
return
}
- response.Json().Standard(entry)
+ response.JSON().Standard(entry)
}
diff --git a/server/api/controller/feed.go b/server/api/controller/feed.go
index c9dc9e21..8ec0e046 100644
--- a/server/api/controller/feed.go
+++ b/server/api/controller/feed.go
@@ -15,17 +15,17 @@ func (c *Controller) CreateFeed(ctx *core.Context, request *core.Request, respon
userID := ctx.GetUserID()
feedURL, categoryID, err := payload.DecodeFeedCreationPayload(request.Body())
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
feed, err := c.feedHandler.CreateFeed(userID, categoryID, feedURL)
if err != nil {
- response.Json().ServerError(errors.New("Unable to create this feed"))
+ response.JSON().ServerError(errors.New("Unable to create this feed"))
return
}
- response.Json().Created(feed)
+ response.JSON().Created(feed)
}
// RefreshFeed is the API handler to refresh a feed.
@@ -33,17 +33,17 @@ func (c *Controller) RefreshFeed(ctx *core.Context, request *core.Request, respo
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
err = c.feedHandler.RefreshFeed(userID, feedID)
if err != nil {
- response.Json().ServerError(errors.New("Unable to refresh this feed"))
+ response.JSON().ServerError(errors.New("Unable to refresh this feed"))
return
}
- response.Json().NoContent()
+ response.JSON().NoContent()
}
// UpdateFeed is the API handler that is used to update a feed.
@@ -51,45 +51,45 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
newFeed, err := payload.DecodeFeedModificationPayload(request.Body())
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
originalFeed, err := c.store.GetFeedById(userID, feedID)
if err != nil {
- response.Json().NotFound(errors.New("Unable to find this feed"))
+ response.JSON().NotFound(errors.New("Unable to find this feed"))
return
}
if originalFeed == nil {
- response.Json().NotFound(errors.New("Feed not found"))
+ response.JSON().NotFound(errors.New("Feed not found"))
return
}
originalFeed.Merge(newFeed)
if err := c.store.UpdateFeed(originalFeed); err != nil {
- response.Json().ServerError(errors.New("Unable to update this feed"))
+ response.JSON().ServerError(errors.New("Unable to update this feed"))
return
}
- response.Json().Created(originalFeed)
+ response.JSON().Created(originalFeed)
}
// GetFeeds is the API handler that get all feeds that belongs to the given user.
func (c *Controller) GetFeeds(ctx *core.Context, request *core.Request, response *core.Response) {
feeds, err := c.store.GetFeeds(ctx.GetUserID())
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch feeds from the database"))
+ response.JSON().ServerError(errors.New("Unable to fetch feeds from the database"))
return
}
- response.Json().Standard(feeds)
+ response.JSON().Standard(feeds)
}
// GetFeed is the API handler to get a feed.
@@ -97,22 +97,22 @@ func (c *Controller) GetFeed(ctx *core.Context, request *core.Request, response
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
feed, err := c.store.GetFeedById(userID, feedID)
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch this feed"))
+ response.JSON().ServerError(errors.New("Unable to fetch this feed"))
return
}
if feed == nil {
- response.Json().NotFound(errors.New("Feed not found"))
+ response.JSON().NotFound(errors.New("Feed not found"))
return
}
- response.Json().Standard(feed)
+ response.JSON().Standard(feed)
}
// RemoveFeed is the API handler to remove a feed.
@@ -120,19 +120,19 @@ func (c *Controller) RemoveFeed(ctx *core.Context, request *core.Request, respon
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
if !c.store.FeedExists(userID, feedID) {
- response.Json().NotFound(errors.New("Feed not found"))
+ response.JSON().NotFound(errors.New("Feed not found"))
return
}
if err := c.store.RemoveFeed(userID, feedID); err != nil {
- response.Json().ServerError(errors.New("Unable to remove this feed"))
+ response.JSON().ServerError(errors.New("Unable to remove this feed"))
return
}
- response.Json().NoContent()
+ response.JSON().NoContent()
}
diff --git a/server/api/controller/subscription.go b/server/api/controller/subscription.go
index 700b39c2..b3d62726 100644
--- a/server/api/controller/subscription.go
+++ b/server/api/controller/subscription.go
@@ -16,20 +16,20 @@ import (
func (c *Controller) GetSubscriptions(ctx *core.Context, request *core.Request, response *core.Response) {
websiteURL, err := payload.DecodeURLPayload(request.Body())
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
subscriptions, err := subscription.FindSubscriptions(websiteURL)
if err != nil {
- response.Json().ServerError(errors.New("Unable to discover subscriptions"))
+ response.JSON().ServerError(errors.New("Unable to discover subscriptions"))
return
}
if subscriptions == nil {
- response.Json().NotFound(fmt.Errorf("No subscription found"))
+ response.JSON().NotFound(fmt.Errorf("No subscription found"))
return
}
- response.Json().Standard(subscriptions)
+ response.JSON().Standard(subscriptions)
}
diff --git a/server/api/controller/user.go b/server/api/controller/user.go
index 62c8a49f..3ea66508 100644
--- a/server/api/controller/user.go
+++ b/server/api/controller/user.go
@@ -13,151 +13,151 @@ import (
// CreateUser is the API handler to create a new user.
func (c *Controller) CreateUser(ctx *core.Context, request *core.Request, response *core.Response) {
if !ctx.IsAdminUser() {
- response.Json().Forbidden()
+ response.JSON().Forbidden()
return
}
user, err := payload.DecodeUserPayload(request.Body())
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
if err := user.ValidateUserCreation(); err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
if c.store.UserExists(user.Username) {
- response.Json().BadRequest(errors.New("This user already exists"))
+ response.JSON().BadRequest(errors.New("This user already exists"))
return
}
err = c.store.CreateUser(user)
if err != nil {
- response.Json().ServerError(errors.New("Unable to create this user"))
+ response.JSON().ServerError(errors.New("Unable to create this user"))
return
}
user.Password = ""
- response.Json().Created(user)
+ response.JSON().Created(user)
}
// UpdateUser is the API handler to update the given user.
func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, response *core.Response) {
if !ctx.IsAdminUser() {
- response.Json().Forbidden()
+ response.JSON().Forbidden()
return
}
userID, err := request.IntegerParam("userID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
user, err := payload.DecodeUserPayload(request.Body())
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
if err := user.ValidateUserModification(); err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
originalUser, err := c.store.GetUserById(userID)
if err != nil {
- response.Json().BadRequest(errors.New("Unable to fetch this user from the database"))
+ response.JSON().BadRequest(errors.New("Unable to fetch this user from the database"))
return
}
if originalUser == nil {
- response.Json().NotFound(errors.New("User not found"))
+ response.JSON().NotFound(errors.New("User not found"))
return
}
originalUser.Merge(user)
if err = c.store.UpdateUser(originalUser); err != nil {
- response.Json().ServerError(errors.New("Unable to update this user"))
+ response.JSON().ServerError(errors.New("Unable to update this user"))
return
}
- response.Json().Created(originalUser)
+ response.JSON().Created(originalUser)
}
// GetUsers is the API handler to get the list of users.
func (c *Controller) GetUsers(ctx *core.Context, request *core.Request, response *core.Response) {
if !ctx.IsAdminUser() {
- response.Json().Forbidden()
+ response.JSON().Forbidden()
return
}
users, err := c.store.GetUsers()
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch the list of users"))
+ response.JSON().ServerError(errors.New("Unable to fetch the list of users"))
return
}
- response.Json().Standard(users)
+ response.JSON().Standard(users)
}
// GetUser is the API handler to fetch the given user.
func (c *Controller) GetUser(ctx *core.Context, request *core.Request, response *core.Response) {
if !ctx.IsAdminUser() {
- response.Json().Forbidden()
+ response.JSON().Forbidden()
return
}
userID, err := request.IntegerParam("userID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
user, err := c.store.GetUserById(userID)
if err != nil {
- response.Json().BadRequest(errors.New("Unable to fetch this user from the database"))
+ response.JSON().BadRequest(errors.New("Unable to fetch this user from the database"))
return
}
if user == nil {
- response.Json().NotFound(errors.New("User not found"))
+ response.JSON().NotFound(errors.New("User not found"))
return
}
- response.Json().Standard(user)
+ response.JSON().Standard(user)
}
// RemoveUser is the API handler to remove an existing user.
func (c *Controller) RemoveUser(ctx *core.Context, request *core.Request, response *core.Response) {
if !ctx.IsAdminUser() {
- response.Json().Forbidden()
+ response.JSON().Forbidden()
return
}
userID, err := request.IntegerParam("userID")
if err != nil {
- response.Json().BadRequest(err)
+ response.JSON().BadRequest(err)
return
}
user, err := c.store.GetUserById(userID)
if err != nil {
- response.Json().ServerError(errors.New("Unable to fetch this user from the database"))
+ response.JSON().ServerError(errors.New("Unable to fetch this user from the database"))
return
}
if user == nil {
- response.Json().NotFound(errors.New("User not found"))
+ response.JSON().NotFound(errors.New("User not found"))
return
}
if err := c.store.RemoveUser(user.ID); err != nil {
- response.Json().BadRequest(errors.New("Unable to remove this user from the database"))
+ response.JSON().BadRequest(errors.New("Unable to remove this user from the database"))
return
}
- response.Json().NoContent()
+ response.JSON().NoContent()
}