Merge pull request #1 from laironacosta/feature/handler-errors

adding custom errors in responses

Author: engineerit2014

controllers/dto/create_user_request.go

@@ -1,6 +1,18 @@
 package dto
 
+import (
+	"github.com/go-playground/validator/v10"
+)
+
 type CreateUserRequest struct {
-	Name  string `json:"name" binding:"required"`
-	Email string `json:"email" binding:"required,email"`
+	Name  string `json:"name" validate:"required"`
+	Email string `json:"email" validate:"required,email"`
+}
+
+func (cu *CreateUserRequest) Validate() error {
+	if err := validator.New().Struct(cu); err != nil {
+		return err
+	}
+
+	return nil
 }

controllers/dto/update_user_request.go

@@ -1,5 +1,17 @@
 package dto
 
+import (
+	"github.com/go-playground/validator/v10"
+)
+
 type UpdateUserRequest struct {
-	Name string `json:"name" binding:"required"`
+	Name string `json:"name" validate:"required"`
+}
+
+func (uu *UpdateUserRequest) Validate() error {
+	if err := validator.New().Struct(uu); err != nil {
+		return err
+	}
+
+	return nil
 }

controllers/dto/user_dto.go

@@ -1,6 +1,6 @@
 package dto
 
 type User struct {
-	Name  string `json:"name" binding:"required"`
-	Email string `json:"email" binding:"required,email"`
+	Name  string `json:"name"`
+	Email string `json:"email"`
 }

controllers/health_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"github.com/laironacosta/ms-echo-go/controllers/dto"
 	"net/http"
 )

controllers/users_controller.go

@@ -3,8 +3,11 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/gommon/log"
+	respKit "github.com/laironacosta/kit-go/middleware/responses"
 	"github.com/laironacosta/ms-echo-go/controllers/dto"
+	"github.com/laironacosta/ms-echo-go/enums"
 	"github.com/laironacosta/ms-echo-go/services"
 	"net/http"
 )
@@ -29,14 +32,18 @@ func NewUserController(userService services.UserServiceInterface) UserController
 func (ctr *UserController) Create(c echo.Context) error {
 	u := dto.CreateUserRequest{}
 	if err := c.Bind(&u); err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+		return respKit.GenericBadRequestError(enums.ErrorRequestBodyCode, err.Error())
+	}
+
+	if err := u.Validate(); err != nil {
+		return respKit.GenericBadRequestError(enums.ErrorRequestBodyCode, err.Error())
 	}
 
 	if err := ctr.userService.Create(context.Background(), u); err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+		return err
 	}
 
-	fmt.Printf("Request received: %+v \n", u)
+	log.Infof("Request received: %+v \n", u)
 	return c.JSON(http.StatusOK, dto.Response{
 		Message: "created",
 	})
@@ -47,16 +54,23 @@ func (ctr *UserController) GetByEmail(c echo.Context) error {
 	fmt.Printf("Path param received: %+v \n", e)
 
 	u, err := ctr.userService.GetByEmail(context.Background(), e)
+	fmt.Printf("Service finished, controller\n")
 	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+		fmt.Printf("err %v\n", err)
+		return err
 	}
+
 	return c.JSON(http.StatusOK, u)
 }
 
 func (ctr *UserController) UpdateByEmail(c echo.Context) error {
 	u := dto.UpdateUserRequest{}
 	if err := c.Bind(&u); err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+		return respKit.GenericBadRequestError(enums.ErrorRequestBodyCode, err.Error())
+	}
+
+	if err := u.Validate(); err != nil {
+		return respKit.GenericBadRequestError(enums.ErrorRequestBodyCode, err.Error())
 	}
 
 	e := c.Param("email")
@@ -65,8 +79,9 @@ func (ctr *UserController) UpdateByEmail(c echo.Context) error {
 	fmt.Printf("Path param received: %+v \n", e)
 
 	if err := ctr.userService.UpdateByEmail(context.Background(), u, e); err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+		return err
 	}
+
 	return c.JSON(http.StatusOK, dto.Response{
 		Message: "updated",
 	})
@@ -78,8 +93,9 @@ func (ctr *UserController) DeleteByEmail(c echo.Context) error {
 	fmt.Printf("Path param received: %+v \n", e)
 
 	if err := ctr.userService.DeleteByEmail(context.Background(), e); err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+		return err
 	}
+
 	return c.JSON(http.StatusOK, dto.Response{
 		Message: "deleted",
 	})

enums/errors_enum.go

@@ -0,0 +1,16 @@
+package enums
+
+const (
+	ErrorDBDuplicatedKeyMsg = "duplicate key"
+	ErrorRequestBodyCode    = "ms_echo_go_error_request_body"
+	ErrorEmailNotEmptyMsg   = "email could not be empty"
+	ErrorEmailNotEmptyCode  = "ms_echo_go_error_email_not_empty"
+	ErrorEmailExistsMsg     = "error email %s already exists"
+	ErrorEmailExistsCode    = "ms_echo_go_error_email_exists"
+	ErrorEmailNotFoundMsg   = "error email %s not found"
+	ErrorEmailNotFoundCode  = "ms_echo_go_error_email_not_found"
+	ErrorInsertCode         = "ms_echo_go_error_inserting_user"
+	ErrorGetByEmailCode     = "ms_echo_go_error_getting_user_by_email"
+	ErrorUpdateCode         = "ms_echo_go_error_updating_user"
+	ErrorDeleteCode         = "ms_echo_go_error_deleting_user"
+)

go.mod

@@ -3,16 +3,12 @@ module github.com/laironacosta/ms-echo-go
 go 1.16
 
 require (
-	github.com/dropbox/godropbox v0.0.0-20200228041828-52ad444d3502 // indirect
-	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
-	github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 // indirect
 	github.com/go-pg/migrations/v8 v8.1.0
 	github.com/go-pg/pg/v10 v10.9.0
-	github.com/juju/errors v0.0.0-20200330140219-3fe23663418f // indirect
+	github.com/go-playground/validator/v10 v10.5.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/labstack/echo v3.3.10+incompatible
-	github.com/labstack/gommon v0.3.0 // indirect
-	github.com/laironacosta/kit-go v1.0.0
-	github.com/signalfx/golib v2.5.1+incompatible
-	github.com/smartystreets/goconvey v1.6.4 // indirect
+	github.com/labstack/echo/v4 v4.2.2
+	github.com/labstack/gommon v0.3.0
+	github.com/laironacosta/kit-go v1.1.3
+	github.com/pkg/errors v0.9.1
 )