refactor: now validate request with middleware

internal/account/handler.go

@@ -8,7 +8,6 @@ import (
 	"nos-comptes/internal/storage/validators"
 	"nos-comptes/internal/user"
 	"nos-comptes/internal/utils"
-	utils2 "nos-comptes/internal/utils"
 
 	"github.com/gin-gonic/gin"
 )
@@ -22,22 +21,6 @@ type Context struct {
 
 func (c *Context) GetAllAccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
-	err := c.Validator.VarCtx(gc, userId, "uuid4")
-	if err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
-		return
-	}
-
-	_, err = c.userService.GetUserById(userId)
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
-		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
-	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-
 	accounts, err := c.service.GetAllAccountOfUser(userId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetAllAccounts: get accounts")
@@ -58,26 +41,11 @@ func (c *Context) GetAllAccountOfUser(gc *gin.Context) {
 
 func (c *Context) CreateAccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
-	err := c.Validator.VarCtx(gc, userId, "uuid4")
-	if err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
-		return
-	}
-	_, err = c.userService.GetUserById(userId)
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLogger().Info(err)
-		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
-		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
-		return
-	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
+
 	var account Account
 	var accountEditable AccountEditable
 	if err := gc.BindJSON(&accountEditable); err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
+		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	account = Account{AccountEditable: accountEditable, UserId: userId}
@@ -112,122 +80,16 @@ func (c *Context) CreateAccountOfUser(gc *gin.Context) {
 
 func (c *Context) DeleteAccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
-	err := c.Validator.VarCtx(gc, userId, "uuid4")
-	if err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
-		return
-	}
-
 	accountId := gc.Param("accountId")
-	err = c.Validator.VarCtx(gc, userId, "uuid4")
-	if err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
-		return
-	}
-	usrParam, err := c.userService.GetUserById(userId)
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLogger().Info(err)
-		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
-		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
-		return
-	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-
-	googleUserId, exists := gc.Get("googleUserId")
-	if exists == false {
-		utils.GetLoggerFromCtx(gc).Error("error while getting google user id")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-
-	usr, err := c.userService.GetUserFromGoogleID(googleUserId.(string))
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLogger().Info(err)
-		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUserFromGoogleID: get user from google user id")
-		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
-		return
-	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user from google user id")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-	if usr == nil || usr.ID != usrParam.ID {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("User in path doesn't match authenticated user")
-		utils.JSONError(gc.Writer, model.ErrBadRequestFormat)
-		return
-	}
-
 	c.service.DeleteAccountOfUser(userId, accountId)
 
 }
 
 func (c *Context) GetSpecificAccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
-	err := c.Validator.VarCtx(gc, userId, "uuid4")
-	if err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
-		return
-	}
-
 	accountId := gc.Param("accountId")
-	err = c.Validator.VarCtx(gc, userId, "uuid4")
-	if err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
-		return
-	}
-
-	usrParam, err := c.userService.GetUserById(userId)
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLogger().Info(err)
-		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
-		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
-		return
-	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-
-	googleUserId, exists := gc.Get("googleUserId")
-	if exists == false {
-		utils.GetLoggerFromCtx(gc).Error("error while getting google user id")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-
-	usr, err := c.userService.GetUserFromGoogleID(googleUserId.(string))
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLogger().Info(err)
-		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUserFromGoogleID: get user from google user id")
-		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
-		return
-	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user from google user id")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-	if usr == nil || usr.ID != usrParam.ID {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("User in path doesn't match authenticated user")
-		utils.JSONError(gc.Writer, model.ErrBadRequestFormat)
-		return
-	}
-
-	account, err := c.service.GetASpecificAccountForUser(usr.ID, accountId)
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLogger().Info(err)
-		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUserFromGoogleID: get user from google user id")
-		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
-		return
-	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user from google user id")
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
-		return
-	}
-
-	utils.JSON(gc.Writer, http.StatusCreated, account)
+	account, _ := c.service.GetASpecificAccountForUser(userId, accountId)
+	utils.JSON(gc.Writer, http.StatusOK, account)
 }
 
 func NewHandler(ctx *handler.Context, db *postgresql.DatabasePostgreSQL) *Context {

internal/user/handler.go

@@ -6,7 +6,6 @@ import (
 	"nos-comptes/handler"
 	"nos-comptes/internal/storage/dao/postgresql"
 	"nos-comptes/internal/storage/model"
-	"nos-comptes/internal/storage/validators"
 	"nos-comptes/internal/utils"
 	"strings"
 
@@ -78,8 +77,6 @@ func (hc *Context) ConnectUser(c *gin.Context) {
 		utils.JSONError(c.Writer, model.ErrInternalServer)
 		return
 	}
-	fmt.Println("Found the user " + user.Email)
-	fmt.Println("Return 200")
 	utils.JSON(c.Writer, 200, user)
 }
 
@@ -130,27 +127,6 @@ func (hc *Context) CreateUser(c *gin.Context) {
 
 func (hc *Context) GetUser(c *gin.Context) {
 	userID := c.Param("userId")
-
-	err := hc.Validator.VarCtx(c, userID, "uuid4")
-	if err != nil {
-		utils.JSONError(c.Writer, validators.NewDataValidationAPIError(err))
-		return
-	}
-
-	user, err := hc.service.GetUserById(userID)
-	if e, ok := err.(*model.APIError); ok {
-		utils.GetLoggerFromCtx(c).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
-		utils.JSONErrorWithMessage(c.Writer, *e, e.Description)
-	} else if err != nil {
-		utils.GetLoggerFromCtx(c).WithError(err).Error("error while get user")
-		utils.JSONError(c.Writer, model.ErrInternalServer)
-		return
-	}
-
-	if user == nil {
-		utils.JSONErrorWithMessage(c.Writer, model.ErrNotFound, "User not found")
-		return
-	}
-
+	user, _ := hc.service.GetUserById(userID)
 	utils.JSON(c.Writer, http.StatusOK, user)
 }