Create AddFeed dto, add validation and sqlx

api/cmd/feed.go

@@ -1,21 +0,0 @@
-package main
-
-import (
-	"github.com/labstack/echo/v4"
-	"github.com/zoriya/vex"
-)
-
-func (h *Handler) AddFeed(c echo.Context) error {
-	var feed vex.Feed
-	err := c.Bind(&feed)
-	if err != nil {
-		return err
-	}
-
-	ret := make([]interface{}, 0)
-	return c.JSON(201, ret)
-}
-
-func (h *Handler) RegisterFeedsRoutes(e *echo.Echo) {
-	e.POST("/feed", h.AddFeed)
-}

api/cmd/feeds.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"log"
+	"net/http"
+
+	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
+)
+
+
+type AddFeedDto struct {
+	Link string   `json:"link" validate:"required,url"`
+	Tags []string `json:"tags" validate:"required"`
+}
+
+func (h *Handler) AddFeed(c echo.Context) error {
+	user := uuid.New()
+
+	var req AddFeedDto
+	err := c.Bind(&req)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+	if err = c.Validate(&req); err != nil {
+		return err
+	}
+	log.Printf("%v", req)
+
+	feed, err := h.feeds.AddFeed(req.Link, req.Tags, user)
+	if err != nil {
+		log.Printf("Add feed error: %v", err)
+		return echo.NewHTTPError(500, "internal server error")
+	}
+	return c.JSON(201, feed)
+}
+
+func (h *Handler) RegisterFeedsRoutes(e *echo.Echo) {
+	e.POST("/feeds", h.AddFeed)
+}

api/cmd/main.go

@@ -1,18 +1,21 @@
 package main
 
 import (
-	"database/sql"
 	"fmt"
 	"log"
+	"net/http"
 	"os"
 
+	"github.com/go-playground/validator/v10"
+	"github.com/jmoiron/sqlx"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	_ "github.com/lib/pq"
+	"github.com/zoriya/vex"
 )
 
 type Handler struct {
-	database *sql.DB
+	feeds vex.FeedService
 }
 
 func (h *Handler) GetEntries(c echo.Context) error {
@@ -20,6 +23,18 @@ func (h *Handler) GetEntries(c echo.Context) error {
 	return c.JSON(200, ret)
 }
 
+type Validator struct {
+	validator *validator.Validate
+}
+
+func (cv *Validator) Validate(i interface{}) error {
+	if err := cv.validator.Struct(i); err != nil {
+		// Optionally, you could return the error to give each route more control over the status code
+		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+	return nil
+}
+
 func main() {
 	con := fmt.Sprintf(
 		"postgresql://%v:%v@%v:%v/%v?sslmode=disable",
@@ -29,15 +44,16 @@ func main() {
 		os.Getenv("POSTGRES_PORT"),
 		os.Getenv("POSTGRES_DB"),
 	)
-	db, err := sql.Open("postgres", con)
+	db, err := sqlx.Open("postgres", con)
 	if err != nil {
 		log.Fatal(err)
 	}
 	h := Handler{
-		database: db,
+		feeds: vex.NewFeedService(db),
 	}
 
 	e := echo.New()
+	e.Validator = &Validator{validator: validator.New()}
 	e.Use(middleware.Logger())
 	e.GET("/entries", h.GetEntries)
 	h.RegisterFeedsRoutes(e)