Merge pull request #49 from blyndusk/fix_middlewares-api

Fix user routes and clean middlewares
alexandre-delaloy · Mar 10, 2022 · 2a48c5b · 2a48c5b
2 parents c513150 + 1ce63da
commit 2a48c5b
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 114 deletions.
diff --git a/internal/controllers/activeServices.go b/internal/controllers/activeServices.go
@@ -9,12 +9,6 @@ import (
 	"github.com/blyndusk/flamingops/pkg/models"
 )
 
-func CreateActiveServices(c *gin.Context) {
-	var input models.ActiveServicesInput
-	middlewares.CreateActiveServices(c, &input)
-	c.JSON(http.StatusOK, input)
-}
-
 func GetActiveServices(c *gin.Context) {
 	var activeServices models.ActiveServices
 	middlewares.GetActiveServices(c, &activeServices)

diff --git a/internal/controllers/awsServicesData.go b/internal/controllers/awsServicesData.go
@@ -9,12 +9,6 @@ import (
 	"github.com/blyndusk/flamingops/pkg/models"
 )
 
-func CreateAwsServicesData(c *gin.Context) {
-	var input models.AwsServicesDataInput
-	middlewares.CreateAwsServicesData(c, &input)
-	c.JSON(http.StatusOK, input)
-}
-
 func GetAwsServicesData(c *gin.Context) {
 	var awsServicesData models.AwsServicesData
 	middlewares.GetAwsServicesData(c, &awsServicesData)

diff --git a/internal/controllers/requestedRegions.go b/internal/controllers/requestedRegions.go
@@ -9,12 +9,6 @@ import (
 	"github.com/blyndusk/flamingops/pkg/models"
 )
 
-func CreateRequestedRegions(c *gin.Context) {
-	var input models.RequestedRegionsInput
-	middlewares.CreateRequestedRegions(c, &input)
-	c.JSON(http.StatusOK, input)
-}
-
 func GetRequestedRegions(c *gin.Context) {
 	var preferences models.RequestedRegions
 	middlewares.GetRequestedRegions(c, &preferences)

diff --git a/internal/controllers/swServicesData.go b/internal/controllers/swServicesData.go
@@ -9,12 +9,6 @@ import (
 	"github.com/blyndusk/flamingops/pkg/models"
 )
 
-func CreateSwServicesData(c *gin.Context) {
-	var input models.SwServicesDataInput
-	middlewares.CreateSwServicesData(c, &input)
-	c.JSON(http.StatusOK, input)
-}
-
 func GetSwServicesData(c *gin.Context) {
 	var swServicesData models.SwServicesData
 	middlewares.GetSwServicesData(c, &swServicesData)

diff --git a/internal/controllers/users.go b/internal/controllers/users.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/blyndusk/flamingops/internal/middlewares"
 	"github.com/blyndusk/flamingops/pkg/helpers"
@@ -12,8 +13,49 @@ import (
 
 func CreateUser(c *gin.Context) {
 	var input models.UserInput
-	middlewares.CreateUser(c, &input)
-	c.JSON(http.StatusOK, input)
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	res, err := middlewares.CreateUser(c, &input)
+	if err != nil {
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	err = middlewares.CreateActiveServices(c, &models.ActiveServicesInput{UserId: res.Id})
+	if err != nil {
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	err = middlewares.CreateAwsServicesData(c, &models.AwsServicesDataInput{UserId: res.Id})
+	if err != nil {
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	err = middlewares.CreateSwServicesData(c, &models.SwServicesDataInput{UserId: res.Id})
+	if err != nil {
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	err = middlewares.CreateRequestedRegions(c, &models.RequestedRegionsInput{UserId: res.Id})
+	if err != nil {
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	c.JSON(http.StatusOK, &res)
 }
 
 func Login(c *gin.Context) {
@@ -42,13 +84,36 @@ func GetUserById(c *gin.Context) {
 func UpdateUser(c *gin.Context) {
 	var user models.User
 	var input models.UserInput
-	middlewares.UpdateUser(c, &user, &input)
-	c.JSON(http.StatusOK, user)
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		log.Error(err)
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	if err := middlewares.UpdateUser(c, &user, &input); err != nil {
+		log.Error(err)
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "User updated successfully",
+	})
 }
 
 func DeleteUser(c *gin.Context) {
 	var user models.User
-	middlewares.DeleteUser(c, &user)
+
+	if err := middlewares.DeleteUser(c, &user); err != nil {
+		log.Error(err)
+		httpStatus, response := helpers.GormErrorResponse(err)
+		c.JSON(httpStatus, response)
+		return
+	}
+
 	c.JSON(http.StatusOK, gin.H{
 		"message": "User deleted successfully",
 	})

diff --git a/internal/middlewares/activeServices.go b/internal/middlewares/activeServices.go
@@ -10,21 +10,13 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func CreateActiveServices(c *gin.Context, input *models.ActiveServicesInput) {
-	if err := c.ShouldBindJSON(&input); err != nil {
-		log.Error(err)
-		httpStatus, response := helpers.ErrorToJson(http.StatusBadRequest, err.Error())
-		c.JSON(httpStatus, response)
-		return
-	}
-
+func CreateActiveServices(c *gin.Context, input *models.ActiveServicesInput) error {
 	activeServices := hydrateActiveServices(input)
 	if err := database.Db.Create(&activeServices).Error; err != nil {
 		log.Error(err)
-		httpStatus, response := helpers.GormErrorResponse(err)
-		c.JSON(httpStatus, response)
-		return
+		return err
 	}
+	return nil
 }
 
 func GetActiveServices(c *gin.Context, activeServices *models.ActiveServices) {

diff --git a/internal/middlewares/awsServicesData.go b/internal/middlewares/awsServicesData.go
@@ -1,30 +1,20 @@
 package middlewares
 
 import (
-	"net/http"
-
 	"github.com/blyndusk/flamingops/internal/database"
 	"github.com/blyndusk/flamingops/pkg/helpers"
 	"github.com/blyndusk/flamingops/pkg/models"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 )
 
-func CreateAwsServicesData(c *gin.Context, input *models.AwsServicesDataInput) {
-	if err := c.ShouldBindJSON(&input); err != nil {
-		log.Error(err)
-		httpStatus, response := helpers.ErrorToJson(http.StatusBadRequest, err.Error())
-		c.JSON(httpStatus, response)
-		return
-	}
-
+func CreateAwsServicesData(c *gin.Context, input *models.AwsServicesDataInput) error {
 	awsServicesData := hydrateAwsServicesData(input)
 	if err := database.Db.Create(&awsServicesData).Error; err != nil {
 		log.Error(err)
-		httpStatus, response := helpers.GormErrorResponse(err)
-		c.JSON(httpStatus, response)
-		return
+		return err
 	}
+	return nil
 }
 
 func GetAwsServicesData(c *gin.Context, awsServicesData *models.AwsServicesData) {

diff --git a/internal/middlewares/requestedRegions.go b/internal/middlewares/requestedRegions.go
@@ -10,21 +10,13 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func CreateRequestedRegions(c *gin.Context, input *models.RequestedRegionsInput) {
-	if err := c.ShouldBindJSON(&input); err != nil {
-		log.Error(err)
-		httpStatus, response := helpers.ErrorToJson(http.StatusBadRequest, err.Error())
-		c.JSON(httpStatus, response)
-		return
-	}
-
+func CreateRequestedRegions(c *gin.Context, input *models.RequestedRegionsInput) (error) {
 	requestedRegions := hydrateRequestedRegions(input)
 	if err := database.Db.Create(&requestedRegions).Error; err != nil {
 		log.Error(err)
-		httpStatus, response := helpers.GormErrorResponse(err)
-		c.JSON(httpStatus, response)
-		return
+		return err
 	}
+	return nil
 }
 
 func GetRequestedRegions(c *gin.Context, requestedRegions *models.RequestedRegions) {

diff --git a/internal/middlewares/swServicesData.go b/internal/middlewares/swServicesData.go
@@ -1,7 +1,6 @@
 package middlewares
 
 import (
-	"net/http"
 
 	"github.com/blyndusk/flamingops/internal/database"
 	"github.com/blyndusk/flamingops/pkg/helpers"
@@ -10,21 +9,13 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func CreateSwServicesData(c *gin.Context, input *models.SwServicesDataInput) {
-	if err := c.ShouldBindJSON(&input); err != nil {
-		log.Error(err)
-		httpStatus, response := helpers.ErrorToJson(http.StatusBadRequest, err.Error())
-		c.JSON(httpStatus, response)
-		return
-	}
-
+func CreateSwServicesData(c *gin.Context, input *models.SwServicesDataInput) (error) {
 	swServicesData := hydrateSwServicesData(input)
 	if err := database.Db.Create(&swServicesData).Error; err != nil {
 		log.Error(err)
-		httpStatus, response := helpers.GormErrorResponse(err)
-		c.JSON(httpStatus, response)
-		return
+		return err
 	}
+	return nil
 }
 
 func GetSwServicesData(c *gin.Context, swServicesData *models.SwServicesData) {

diff --git a/internal/middlewares/users.go b/internal/middlewares/users.go
@@ -2,7 +2,6 @@ package middlewares
 
 import (
 	"errors"
-	"net/http"
 	"strconv"
 
 	"github.com/blyndusk/flamingops/internal/database"
@@ -13,26 +12,22 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func CreateUser(c *gin.Context, input *models.UserInput) {
-	if err := c.ShouldBindJSON(&input); err != nil {
-		log.Error(err)
-		httpStatus, response := helpers.ErrorToJson(http.StatusBadRequest, err.Error())
-		c.JSON(httpStatus, response)
-		return
+func CreateUser(c *gin.Context, input *models.UserInput) (*models.User, error) {
+	// Check if user already exists
+	var mailCheck models.User
+	database.Db.Where("Mail = ?", &input.Mail).First(&mailCheck)
+	if mailCheck.Id != 0 { 
+		log.Error("e-mail already used")
+		return nil, errors.New("e-mail already used")
 	}
 
 	user := hydrateUser(input)
 	if err := database.Db.Create(&user).Error; err != nil {
 		log.Error(err)
-		httpStatus, response := helpers.GormErrorResponse(err)
-		c.JSON(httpStatus, response)
-		return
+		return nil, err
 	}
 
-	CreateActiveServices(c, &models.ActiveServicesInput{UserId: user.Id}) //todo complete
-	CreateSwServicesData(c, &models.SwServicesDataInput{UserId: user.Id})
-	CreateAwsServicesData(c, &models.AwsServicesDataInput{UserId: user.Id})
-	CreateRequestedRegions(c, &models.RequestedRegionsInput{UserId: user.Id})
+	return &user, nil
 }
 
 func Login(c *gin.Context, input *models.Login) (string, error) {
@@ -43,8 +38,6 @@ func Login(c *gin.Context, input *models.Login) (string, error) {
 	}
 
 	var user models.User
-	// log.Error(c)
-
 	if err := database.Db.Where("Mail = ?", &input.Mail).First(&user).Error; err != nil {
 		log.Error(err)
 		return "", err
@@ -77,33 +70,28 @@ func GetUserById(c *gin.Context, user *models.User) {
 	}
 }
 
-func UpdateUser(c *gin.Context, user *models.User, input *models.UserInput) {
+func UpdateUser(c *gin.Context, user *models.User, input *models.UserInput) error {
 	GetUserById(c, user)
-	if err := c.ShouldBindJSON(&input); err != nil {
-		log.Error(err)
-		httpStatus, response := helpers.ErrorToJson(http.StatusBadRequest, err.Error())
-		c.JSON(httpStatus, response)
-		return
-	}
 
 	updatedUser := hydrateUser(input)
-	database.Db.Model(&user).Updates(updatedUser)
-}
-
-func DeleteUser(c *gin.Context, user *models.User) {
-	if err := database.Db.First(&user, c.Params.ByName("id")).Delete(&user).Error; err != nil {
+	if err := database.Db.Model(&user).Updates(updatedUser).Error; err != nil{
 		log.Error(err)
-		httpStatus, response := helpers.GormErrorResponse(err)
-		c.JSON(httpStatus, response)
-		return
+		return err
 	}
 
+	return nil
+}
+
+func DeleteUser(c *gin.Context, user *models.User) error {
 	i64, err := strconv.ParseUint(c.Params.ByName("id"), 10, 64)
 	if err != nil {
 		log.Error(err)
-		httpStatus, response := helpers.ErrorToJson(http.StatusBadRequest, err.Error())
-		c.JSON(httpStatus, response)
-		return
+		return err
+	}
+
+	if err := database.Db.First(&user, c.Params.ByName("id")).First(&user).Error; err != nil {
+		log.Error(err)
+		return err
 	}
 
 	i := uint(i64)
@@ -112,6 +100,13 @@ func DeleteUser(c *gin.Context, user *models.User) {
 	DeleteSwServicesData(c, &models.SwServicesData{UserId: i})
 	DeleteAwsServicesData(c, &models.AwsServicesData{UserId: i})
 	DeleteRequestedRegions(c, &models.RequestedRegions{UserId: i})
+
+	if err := database.Db.First(&user, c.Params.ByName("id")).Delete(&user).Error; err != nil {
+		log.Error(err)
+		return err
+	}
+
+	return nil
 }
 
 func hydrateUser(input *models.UserInput) models.User {