Merge branch 'refactor/post-responses' into main

handlers/insert.go

@@ -5,87 +5,111 @@ import (
 
 	"git.agecem.com/agecem/bottin/v5/data"
 	"git.agecem.com/agecem/bottin/v5/models"
+	"git.agecem.com/agecem/bottin/v5/responses"
 	"github.com/labstack/echo/v4"
 )
 
 func PostMembres(c echo.Context) error {
+	var response responses.PostMembresResponse
 	client, err := data.NewDataClientFromViper()
 	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{
+		response.StatusCode = http.StatusInternalServerError
-			"message": "Could not establish database connection",
+		response.Message = "Could not establish database connection"
-			"error":   err.Error(),
+		response.Error = err.Error()
-		})
+
+		return c.JSON(response.StatusCode, response)
 	}
 	defer client.DB.Close()
 
 	var membres []models.Membre
 
-	if err := c.Bind(&membres); err != nil {
+	switch c.Request().Header.Get("Content-Type") {
-		return c.JSON(http.StatusBadRequest, map[string]string{
+	case "application/json":
-			"message": "Could not bind membres",
+		if err := c.Bind(&membres); err != nil {
-			"error":   err.Error(),
+			response.StatusCode = http.StatusBadRequest
-		})
+			response.Message = "Could not bind membres"
+			response.Error = err.Error()
+			return c.JSON(response.StatusCode, response)
+		}
+	case "text/csv":
+		response.StatusCode = http.StatusNotImplemented
+		response.Message = "Not Implemented"
+		return c.JSON(response.StatusCode, response)
+	default:
+		response.StatusCode = http.StatusBadRequest
+		response.Message = "Invalid Content-Type"
+		return c.JSON(response.StatusCode, response)
 	}
 
 	if len(membres) == 0 {
-		return c.JSON(http.StatusOK, map[string]string{
+		response.StatusCode = http.StatusOK
-			"message": "Nothing to do",
+		response.Message = "Nothing to do"
-		})
+		return c.JSON(response.StatusCode, response)
 	}
 
 	newMembres, err := client.InsertMembres(membres)
 	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{
+		response.StatusCode = http.StatusInternalServerError
-			"message": "Could not insert membres",
+		response.Message = "Could not insert membres"
-			"error":   err.Error(),
+		response.Error = err.Error()
-		})
+		return c.JSON(response.StatusCode, response)
 	}
 
-	return c.JSON(http.StatusCreated, map[string]interface{}{
+	response.StatusCode = http.StatusCreated
-		"message": "Insert successful",
+	response.Message = "Insert successful"
-		"data": map[string]interface{}{
+	response.Data.MembresInserted = newMembres
-			"membres": newMembres,
+	return c.JSON(response.StatusCode, response)
-		},
-	})
 }
 
 func PostProgrammes(c echo.Context) error {
+	var response responses.PostProgrammesResponse
+
 	client, err := data.NewDataClientFromViper()
 	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{
+		response.StatusCode = http.StatusInternalServerError
-			"message": "Could not establish database connection",
+		response.Message = "Could not establish database connection"
-			"error":   err.Error(),
+		response.Error = err.Error()
-		})
+
+		return c.JSON(response.StatusCode, response)
 	}
 	defer client.DB.Close()
 
 	var programmes []models.Programme
 
-	if err := c.Bind(&programmes); err != nil {
+	switch c.Request().Header.Get("Content-Type") {
-		return c.JSON(http.StatusBadRequest, map[string]string{
+	case "application/json":
-			"message": "Could not bind programmes",
+		if err := c.Bind(&programmes); err != nil {
-			"error":   err.Error(),
+			response.StatusCode = http.StatusBadRequest
-		})
+			response.Message = "Could not bind programmes"
+			response.Error = err.Error()
+			return c.JSON(response.StatusCode, response)
+		}
+	case "text/csv":
+		response.StatusCode = http.StatusNotImplemented
+		response.Message = "Not Implemented"
+		return c.JSON(response.StatusCode, response)
+	default:
+		response.StatusCode = http.StatusBadRequest
+		response.Message = "Invalid Content-Type"
+		return c.JSON(response.StatusCode, response)
 	}
 
 	if len(programmes) == 0 {
-		return c.JSON(http.StatusOK, map[string]string{
+		response.StatusCode = http.StatusOK
-			"message": "Nothing to do",
+		response.Message = "Nothing to do"
-		})
+		return c.JSON(response.StatusCode, response)
 	}
 
 	newProgrammes, err := client.InsertProgrammes(programmes)
 	if err != nil {
-		return c.JSON(http.StatusInternalServerError, map[string]string{
+		response.StatusCode = http.StatusInternalServerError
-			"message": "Could not insert programmes",
+		response.Message = "Could not insert programmes"
-			"error":   err.Error(),
+		response.Error = err.Error()
-		})
+		return c.JSON(response.StatusCode, response)
 	}
 
-	return c.JSON(http.StatusCreated, map[string]interface{}{
+	response.StatusCode = http.StatusCreated
-		"message": "Insert successful",
+	response.Message = "Insert successful"
-		"data": map[string]interface{}{
+	response.Data.ProgrammesInserted = newProgrammes
-			"programmes": newProgrammes,
+	return c.JSON(response.StatusCode, response)
-		},
-	})
 }

responses/post.go

@@ -0,0 +1,15 @@
+package responses
+
+type PostMembresResponse struct {
+	Response
+	Data struct {
+		MembresInserted int64
+	}
+}
+
+type PostProgrammesResponse struct {
+	Response
+	Data struct {
+		ProgrammesInserted int64
+	}
+}

responses/root.go

@@ -0,0 +1,15 @@
+package responses
+
+type Response struct {
+	StatusCode int
+	Message    string
+	Error      string
+}
+
+type Responder interface {
+	Respond() Responder
+}
+
+func (r Response) Respond() Responder {
+	return r
+}