chore: build

2026-08-06 12:06:05 +02:00
parent c034088bee
commit 22a8d5026c
174 changed files with 30315 additions and 16120 deletions
@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"gestion/db"
+	"gestion/models"
 	"gestion/services"
 	"gestion/utils"
 	"log"
 	"net/http"
 	"slices"
 	"strconv"
-	"time"

 	"github.com/gin-gonic/gin"
 )
@@ -40,14 +40,27 @@ func GetMyDeliveries(c *gin.Context) {
 		return
 	}

+	// Collecter tous les IDs et usernames en une passe pour éviter les N+1
+	commandIDs := make([]int, 0, len(commands))
+	clientUsernames := make([]string, 0, len(commands))
+	for _, cmd := range commands {
+		if cid, _ := strconv.Atoi(fmt.Sprintf("%v", cmd["id"])); cid > 0 {
+			commandIDs = append(commandIDs, cid)
+		}
+		if u, _ := cmd["username"].(string); u != "" {
+			clientUsernames = append(clientUsernames, u)
+		}
+	}
+	allItems, _ := database.GetCommandItemsBatch(commandIDs)
+	allClients, _ := database.GetClientsByUsernames(clientUsernames)
+
 	filteredCommands := make([]gin.H, len(commands))
 	for i, cmd := range commands {
 		commandID, _ := strconv.Atoi(fmt.Sprintf("%v", cmd["id"]))
-		items, _ := database.GetCommandItems(commandID)
+		items := allItems[commandID]

-		// Client info SANS téléphone
 		clientUsername, _ := cmd["username"].(string)
-		client, _ := database.GetClientByUsername(clientUsername)
+		client := allClients[clientUsername]

 		clientInfo := gin.H{"nom": "Client", "prenom": ""}
 		if client != nil {
@@ -244,7 +257,7 @@ func UpdateDeliveryStatus(c *gin.Context) {
 			distance := utils.CalculateDistance(req.Latitude, req.Longitude, destLat, destLon)
 			log.Printf("📍 [GPS] Distance: %.2f m", distance)

-			if distance > 100 {
+			if distance > 350 {
 				c.JSON(http.StatusBadRequest, gin.H{
 					"error":            "Vous êtes trop loin de la destination",
 					"current_distance": fmt.Sprintf("%.2f", distance),
@@ -259,22 +272,34 @@ func UpdateDeliveryStatus(c *gin.Context) {
 		}
 	}

-	// Mettre à jour le statut
-	if err := database.UpdateCommandStatus(commandID, req.Status); err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"error": "Erreur mise à jour",
-		})
-		return
-	}
-
+	// Mettre à jour le statut.
+	// Le cas "cancelled" passe par une transaction atomique dédiée (transition +
+	// remboursement stock), pour empêcher tout double remboursement en cas de
+	// double appel (double-tap, retry réseau, commande déjà annulée ailleurs).
 	if req.Status == "cancelled" {
+		alreadyCancelled, prevStatus, cancelErr := database.CancelDeliveryByLivreurAtomic(commandID)
+		if cancelErr != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{
+				"error": "Erreur mise à jour",
+			})
+			return
+		}
+		if alreadyCancelled {
+			c.JSON(http.StatusOK, gin.H{
+				"success":    true,
+				"message":    "Commande déjà annulée",
+				"command_id": commandID,
+				"status":     "cancelled",
+			})
+			return
+		}
+
 		cancelMsg := req.Notes
 		if cancelMsg == "" {
 			cancelMsg = "Annulé par le livreur"
 		}
 		database.SetCommandCancelReason(commandID, fmt.Sprintf("[Livreur: %s] %s", usernameStr, cancelMsg))

-		prevStatus, _ := command["status"].(string)
 		if prevStatus == "arrived" || prevStatus == "livre" {
 			clientUsername, _ := command["username"].(string)
 			if clientUsername != "" {
@@ -285,6 +310,11 @@ func UpdateDeliveryStatus(c *gin.Context) {
 				}
 			}
 		}
+	} else if err := database.UpdateCommandStatus(commandID, req.Status); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{
+			"error": "Erreur mise à jour",
+		})
+		return
 	}

 	// ✅ SI PASSAGE EN "EN_ROUTE" → CALCULER ET DÉFINIR L'ETA
@@ -441,12 +471,8 @@ func UpdateDeliveryStatus(c *gin.Context) {
 		database.CompleteDeliveryAndProcessNext(usernameStr, commandID)

 	case "cancelled":
+		// Transition + remboursement stock déjà effectués atomiquement plus haut.
 		log.Printf("🚫 Livraison annulée par livreur - Nettoyage queue cmd %d", commandID)
-		if err := database.RestoreCommandStock(commandID); err != nil {
-			log.Printf("⚠️ [STATUS_LIVREUR] Erreur restauration stock cmd %d: %v", commandID, err)
-		} else {
-			log.Printf("✅ [STATUS_LIVREUR] Stock restauré pour cmd %d", commandID)
-		}
 		database.CompleteDeliveryAndProcessNext(usernameStr, commandID)

 	case "arrived":
@@ -526,10 +552,8 @@ func ReportDeliveryIssue(c *gin.Context) {
 	c.JSON(http.StatusCreated, gin.H{"success": true, "issue": issue})
 }

-// GET /api/v1/livreur/stats
 func GetMyDeliveryStats(c *gin.Context) {
 	database := c.MustGet("database").(*db.Database)
-
 	username, exists := c.Get("username")
 	if !exists {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "Non authentifié"})
@@ -540,66 +564,30 @@ func GetMyDeliveryStats(c *gin.Context) {
 		return
 	}
 	usernameStr := username.(string)
-	gdb := database.GDB

-	type DayRow struct {
-		Day     time.Time `gorm:"column:day"`
-		Count   int       `gorm:"column:count"`
-		Revenue float64   `gorm:"column:revenue"`
-	}
-	type WeekRow struct {
-		WeekNum int     `gorm:"column:week_num"`
-		Year    int     `gorm:"column:year"`
-		Count   int     `gorm:"column:count"`
-		Revenue float64 `gorm:"column:revenue"`
-	}
-	type MonthRow struct {
-		MonthNum int     `gorm:"column:month_num"`
-		Year     int     `gorm:"column:year"`
-		Count    int     `gorm:"column:count"`
-		Revenue  float64 `gorm:"column:revenue"`
+	var dayRows []models.DayRowWithResult
+	if err := database.GetMyDeliveryStatsPerDay(&dayRows, usernameStr); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Erreur récupération stats jour"})
+		return
 	}

-	var dayRows []DayRow
-	gdb.Raw(`
-		SELECT DATE(updated_at) AS day,
-		       COUNT(*) AS count,
-		       COALESCE(SUM(total_prix - COALESCE(referral_used, 0)), 0) AS revenue
-		FROM commandes
-		WHERE livreur_assign = ?
-		  AND status IN ('livre', 'approved')
-		  AND updated_at >= NOW() - INTERVAL '30 days'
-		GROUP BY DATE(updated_at)
-		ORDER BY day
-	`, usernameStr).Scan(&dayRows)
+	var weekRows []models.WeekRow
+	if err := database.GetMyDeliveryStatsPerWeek(&weekRows, usernameStr); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Erreur récupération stats semaine"})
+		return
+	}

-	var weekRows []WeekRow
-	gdb.Raw(`
-		SELECT EXTRACT(WEEK FROM updated_at)::int AS week_num,
-		       EXTRACT(YEAR FROM updated_at)::int AS year,
-		       COUNT(*) AS count,
-		       COALESCE(SUM(total_prix - COALESCE(referral_used, 0)), 0) AS revenue
-		FROM commandes
-		WHERE livreur_assign = ?
-		  AND status IN ('livre', 'approved')
-		  AND updated_at >= NOW() - INTERVAL '12 weeks'
-		GROUP BY week_num, year
-		ORDER BY year, week_num
-	`, usernameStr).Scan(&weekRows)
+	var monthRows []models.MonthRow
+	if err := database.GetMyDeliveryStatsPerMonth(&monthRows, usernameStr); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Erreur récupération stats mois"})
+		return
+	}

-	var monthRows []MonthRow
-	gdb.Raw(`
-		SELECT EXTRACT(MONTH FROM updated_at)::int AS month_num,
-		       EXTRACT(YEAR FROM updated_at)::int AS year,
-		       COUNT(*) AS count,
-		       COALESCE(SUM(total_prix - COALESCE(referral_used, 0)), 0) AS revenue
-		FROM commandes
-		WHERE livreur_assign = ?
-		  AND status IN ('livre', 'approved')
-		  AND updated_at >= NOW() - INTERVAL '12 months'
-		GROUP BY month_num, year
-		ORDER BY year, month_num
-	`, usernameStr).Scan(&monthRows)
+	var todayRow models.TodayRow
+	if err := database.GetMyDeliveryStatsToday(&todayRow, usernameStr); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Erreur récupération stats du jour"})
+		return
+	}

 	monthNames := [13]string{"", "Jan", "Fév", "Mar", "Avr", "Mai", "Jun", "Jul", "Aoû", "Sep", "Oct", "Nov", "Déc"}

@@ -635,9 +623,11 @@ func GetMyDeliveryStats(c *gin.Context) {
 	}

 	c.JSON(http.StatusOK, gin.H{
-		"success":  true,
-		"by_day":   byDay,
-		"by_week":  byWeek,
-		"by_month": byMonth,
+		"success":       true,
+		"by_day":        byDay,
+		"by_week":       byWeek,
+		"by_month":      byMonth,
+		"today_count":   todayRow.Count,
+		"today_revenue": todayRow.Revenue,
 	})
 }