Security added on delete service and list all node + cleaning some code

backend/handlers/service_handler.go

@@ -2,132 +2,67 @@ package handlers
 
 import (
 	"backend/models"
-	"encoding/json"
 	"log"
 	"net/http"
+
+	"github.com/gin-gonic/gin"
 )
 
-/*func retrieveServicesFromNode(node *models.NodeInfo) map[string]models.Service {
-
-	apiURL := node.Address + "/list"
-
-	resp, err := http.Get(apiURL)
-
-	log.Printf("retrieving node %s on address %s", node.Name, apiURL)
-
-	if err != nil {
-		log.Fatalf("Erreur lors de la requête : %v", err)
-	}
-
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		log.Fatalf("Requête échouée avec le statut : %s", resp.Status)
-	}
-
-	bodyBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		log.Fatalf("Erreur lors de la lecture du corps de la réponse : %v", err)
-	}
-
-	var services []models.Service
-
-	err = json.Unmarshal(bodyBytes, &services)
-	if err != nil {
-		log.Fatalf("Erreur lors du décodage JSON : %v", err)
-	}
-
-	var result map[string]models.Service
-
-	for _, service := range services {
-		result[service.Name] = service
-	}
-
-	return result
-}*/
-
-func (h *NodeHandler) HandleRegisterService(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "POST requested", http.StatusMethodNotAllowed)
-		return
-	}
-
+func (h *NodeHandler) HandleRegisterService(c *gin.Context) {
 	var serviceRegister models.ServiceRegister
-	err := json.NewDecoder(r.Body).Decode(&serviceRegister)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+
+	if err := c.ShouldBindJSON(&serviceRegister); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	var serviceID int
-	serviceID, err = h.Repo.RegisterService(serviceRegister.Service, serviceRegister.NodeId)
-
+	serviceID, err := h.Repo.RegisterService(serviceRegister.Service, serviceRegister.NodeId)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(map[string]int{"id": serviceID})
+	c.JSON(http.StatusOK, gin.H{"id": serviceID})
 }
 
-func (h *NodeHandler) HandleUpdateServiceStatus(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "POST requested", http.StatusMethodNotAllowed)
-		return
-	}
-
+func (h *NodeHandler) HandleUpdateServiceStatus(c *gin.Context) {
 	var serviceUpdate models.ServiceUpdateRequest
-	err := json.NewDecoder(r.Body).Decode(&serviceUpdate)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+
+	if err := c.ShouldBindJSON(&serviceUpdate); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	err = h.Repo.UpdateServiceStatus(serviceUpdate)
-
+	err := h.Repo.UpdateServiceStatus(serviceUpdate)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
+	c.JSON(http.StatusOK, gin.H{"status": "updated"})
 }
 
-/*func updateServicesFromNode(node *models.NodeInfo) {
-	node.Services = retrieveServicesFromNode(node)
-}*/
-
-func (h *NodeHandler) HandleDeleteService(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "DELETE" {
-		http.Error(w, "DELETE requested", http.StatusMethodNotAllowed)
-		return
-	}
+func (h *NodeHandler) HandleDeleteService(c *gin.Context) {
 
 	var serviceDelete models.ServiceMinimal
-	err := json.NewDecoder(r.Body).Decode(&serviceDelete)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+	if err := c.ShouldBindJSON(&serviceDelete); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	var node models.NodeInfo
-
-	node, err = h.Repo.RetriveNode(serviceDelete.NodeId)
-
-	if err == nil {
-		err = h.Repo.DeleteService(node, serviceDelete.ServiceId)
-		if err != nil {
-
-			log.Fatalf("error on deleteing service from node %v error : %v", serviceDelete.NodeId, err.Error())
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		w.Header().Set("Content-Type", "application/json")
-	} else {
-		log.Fatalf("Node not found %v error : %v", serviceDelete.NodeId, err.Error())
+	node, err := h.Repo.RetriveNode(serviceDelete.NodeId)
+	if err != nil {
+		log.Printf("Node not found %v error : %v", serviceDelete.NodeId, err)
+		c.JSON(http.StatusNotFound, gin.H{"error": "Node not found"})
+		return
 	}
+
+	err = h.Repo.DeleteService(node, serviceDelete.ServiceId)
+	if err != nil {
+		log.Printf("Error deleting service: %v", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete service"})
+		return
+	}
+
+	c.Status(http.StatusNoContent)
 }