chore: build

backend/gestion/handlers/deleviry.go

@@ -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"
 )
@@ -552,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é"})
@@ -566,80 +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)
-
-	type TodayRow struct {
-		Count   int     `gorm:"column:count"`
-		Revenue float64 `gorm:"column:revenue"`
+	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
 	}
-	var todayRow TodayRow
-	gdb.Raw(`
-		SELECT 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 DATE(updated_at) = CURRENT_DATE
-	`, usernameStr).Scan(&todayRow)
 
 	monthNames := [13]string{"", "Jan", "Fév", "Mar", "Avr", "Mai", "Jun", "Jul", "Aoû", "Sep", "Oct", "Nov", "Déc"}