Improve API

server/api/controller/category.go

@@ -13,15 +13,21 @@ import (
 
 // CreateCategory is the API handler to create a new category.
 func (c *Controller) CreateCategory(ctx *core.Context, request *core.Request, response *core.Response) {
+	userID := ctx.UserID()
 	category, err := payload.DecodeCategoryPayload(request.Body())
 	if err != nil {
 		response.JSON().BadRequest(err)
 		return
 	}
 
-	category.UserID = ctx.UserID()
+	category.UserID = userID
 	if err := category.ValidateCategoryCreation(); err != nil {
-		response.JSON().ServerError(err)
+		response.JSON().BadRequest(err)
+		return
+	}
+
+	if c, err := c.store.CategoryByTitle(userID, category.Title); err != nil || c != nil {
+		response.JSON().BadRequest(errors.New("This category already exists"))
 		return
 	}
 

server/api/controller/feed.go

@@ -20,6 +20,26 @@ func (c *Controller) CreateFeed(ctx *core.Context, request *core.Request, respon
 		return
 	}
 
+	if feedURL == "" {
+		response.JSON().BadRequest(errors.New("The feed_url is required"))
+		return
+	}
+
+	if categoryID <= 0 {
+		response.JSON().BadRequest(errors.New("The category_id is required"))
+		return
+	}
+
+	if c.store.FeedURLExists(userID, feedURL) {
+		response.JSON().BadRequest(errors.New("This feed_url already exists"))
+		return
+	}
+
+	if !c.store.CategoryExists(userID, categoryID) {
+		response.JSON().BadRequest(errors.New("This category_id doesn't exists or doesn't belongs to this user"))
+		return
+	}
+
 	feed, err := c.feedHandler.CreateFeed(userID, categoryID, feedURL, false)
 	if err != nil {
 		response.JSON().ServerError(errors.New("Unable to create this feed"))
@@ -42,6 +62,11 @@ func (c *Controller) RefreshFeed(ctx *core.Context, request *core.Request, respo
 		return
 	}
 
+	if !c.store.FeedExists(userID, feedID) {
+		response.JSON().NotFound(errors.New("Unable to find this feed"))
+		return
+	}
+
 	err = c.feedHandler.RefreshFeed(userID, feedID)
 	if err != nil {
 		response.JSON().ServerError(errors.New("Unable to refresh this feed"))
@@ -66,6 +91,11 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon
 		return
 	}
 
+	if newFeed.Category != nil && newFeed.Category.ID != 0 && !c.store.CategoryExists(userID, newFeed.Category.ID) {
+		response.JSON().BadRequest(errors.New("This category_id doesn't exists or doesn't belongs to this user"))
+		return
+	}
+
 	originalFeed, err := c.store.FeedByID(userID, feedID)
 	if err != nil {
 		response.JSON().NotFound(errors.New("Unable to find this feed"))
@@ -83,6 +113,12 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon
 		return
 	}
 
+	originalFeed, err = c.store.FeedByID(userID, feedID)
+	if err != nil {
+		response.JSON().ServerError(errors.New("Unable to fetch this feed"))
+		return
+	}
+
 	response.JSON().Created(originalFeed)
 }
 

server/template/common.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-22 20:01:12.434799064 -0800 PST m=+0.047000060
+// 2017-12-24 14:32:38.881953886 -0800 PST m=+0.038978781
 
 package template
 

server/template/html/feeds.html

@@ -27,7 +27,7 @@
         <article class="item">
             <div class="item-header">
                 <span class="item-title">
-                    {{ if ne .Icon.IconID 0 }}
+                    {{ if .Icon }}
                         <img src="{{ route "icon" "iconID" .Icon.IconID }}" width="16" height="16">
                     {{ end }}
                     <a href="{{ route "feedEntries" "feedID" .ID }}">{{ .Title }}</a>

server/template/views.go

@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-12-22 16:02:42.156291192 -0800 PST m=+0.011241908
+// 2017-12-24 14:32:38.873134292 -0800 PST m=+0.030159187
 
 package template
 
@@ -699,7 +699,7 @@ var templateViewsMap = map[string]string{
         <article class="item">
             <div class="item-header">
                 <span class="item-title">
-                    {{ if ne .Icon.IconID 0 }}
+                    {{ if .Icon }}
                         <img src="{{ route "icon" "iconID" .Icon.IconID }}" width="16" height="16">
                     {{ end }}
                     <a href="{{ route "feedEntries" "feedID" .ID }}">{{ .Title }}</a>
@@ -1332,7 +1332,7 @@ var templateViewsMapChecksums = map[string]string{
 	"edit_user":           "82d9749d76ddbd2352816d813c4b1f6d92f2222de678b4afe5821090246735c7",
 	"entry":               "6b4405e0c8e4a7d31874659f8835f4e43e01dc3c20686091517ac750196dd70f",
 	"feed_entries":        "ac93cb9a90f93ddd9dd8a67d7e160592ecb9f5e465ee9679bb14eecd8d4caf20",
-	"feeds":               "c22af39b42ba9ca69ea0914ca789303ec2c5b484abcd4eaa49016e365381257c",
+	"feeds":               "2f04664f9daf1ea0259bccd7d5ab4c0917d3208f1dcdc89620ffa9fa3094efd2",
 	"history":             "abc7ea29f7d54f28f73fe14979bbd03dbc41fa6a7c86f95f56d6e94f7b09b9ba",
 	"import":              "73b5112e20bfd232bf73334544186ea419505936bc237d481517a8622901878f",
 	"integrations":        "3c14d7de904911aad7f3ebec6d1a20b50843287f58125c526e167f429f3d455d",