chore: update id order

2026-03-28 17:00:00 +01:00
parent 5380abe8ed
commit 3bf3f5e605
48 changed files with 2347 additions and 3693 deletions
@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"gestion/models"
+
+	"gorm.io/gorm"
 )

 // DefaultDeliverySchedule retourne un planning de livraison par défaut (tous les jours, 9h-20h)
@@ -84,66 +86,64 @@ func DefaultSettings() models.AppSettings {
 func (d *Database) GetSettings() (models.AppSettings, error) {
 	settings := DefaultSettings()

-	rows, err := d.Query(`SELECT key, value FROM app_settings`)
-	if err != nil {
+	var rows []struct {
+		Key   string `gorm:"column:key"`
+		Value string `gorm:"column:value"`
+	}
+	if err := d.GDB.Raw(`SELECT key, value FROM app_settings`).Scan(&rows).Error; err != nil {
 		return settings, fmt.Errorf("erreur lecture settings: %w", err)
 	}
-	defer rows.Close()

-	for rows.Next() {
-		var key, value string
-		if err := rows.Scan(&key, &value); err != nil {
-			continue
-		}
-		switch key {
+	for _, row := range rows {
+		switch row.Key {
 		case "penalties_enabled":
-			settings.PenaltiesEnabled = value == "true"
+			settings.PenaltiesEnabled = row.Value == "true"
 		case "show_amende_score":
-			settings.ShowAmendeScore = value == "true"
+			settings.ShowAmendeScore = row.Value == "true"
 		case "points_enabled":
-			settings.PointsEnabled = value == "true"
+			settings.PointsEnabled = row.Value == "true"
 		case "points_pools":
 			var pools []models.PointsPool
-			if err := json.Unmarshal([]byte(value), &pools); err == nil {
+			if err := json.Unmarshal([]byte(row.Value), &pools); err == nil {
 				settings.PointsPools = pools
 			}
 		case "referral_enabled":
-			settings.ReferralEnabled = value == "true"
+			settings.ReferralEnabled = row.Value == "true"
 		case "crypto_payment_enabled":
-			settings.CryptoPaymentEnabled = value == "true"
+			settings.CryptoPaymentEnabled = row.Value == "true"
 		case "crypto_only":
-			settings.CryptoOnly = value == "true"
+			settings.CryptoOnly = row.Value == "true"
 		case "nowpayments_api_key":
-			settings.NowPaymentsAPIKey = value
+			settings.NowPaymentsAPIKey = row.Value
 		case "nowpayments_ipn_secret":
-			settings.NowPaymentsIPNSecret = value
+			settings.NowPaymentsIPNSecret = row.Value
 		case "nowpayments_currencies":
 			var currencies []string
-			if err := json.Unmarshal([]byte(value), &currencies); err == nil {
+			if err := json.Unmarshal([]byte(row.Value), &currencies); err == nil {
 				settings.NowPaymentsCurrencies = currencies
 			}
 		case "delivery_schedule":
 			var sched models.DeliverySchedule
-			if err := json.Unmarshal([]byte(value), &sched); err == nil {
+			if err := json.Unmarshal([]byte(row.Value), &sched); err == nil {
 				settings.DeliverySchedule = sched
 			}
 		case "postal_zones":
 			var zones []models.PostalZone
-			if err := json.Unmarshal([]byte(value), &zones); err == nil {
+			if err := json.Unmarshal([]byte(row.Value), &zones); err == nil {
 				settings.PostalZones = zones
 			}
 		case "telegram_bot_token":
-			settings.TelegramBotToken = value
+			settings.TelegramBotToken = row.Value
 		case "telegram_bot_username":
-			settings.TelegramBotUsername = value
+			settings.TelegramBotUsername = row.Value
 		case "delivery_mode":
 			var mode models.DeliveryModeConfig
-			if err := json.Unmarshal([]byte(value), &mode); err == nil {
+			if err := json.Unmarshal([]byte(row.Value), &mode); err == nil {
 				settings.DeliveryMode = mode
 			}
 		}
 	}
-	return settings, rows.Err()
+	return settings, nil
 }

 // UpdateSettings sauvegarde les paramètres dans la DB
@@ -158,7 +158,6 @@ func (d *Database) UpdateSettings(s models.AppSettings) error {
 	if s.PointsPools == nil {
 		s.PointsPools = []models.PointsPool{}
 	}
-	// S'assurer que chaque pool a des slices non-nil
 	for i := range s.PointsPools {
 		if s.PointsPools[i].Categories == nil {
 			s.PointsPools[i].Categories = []string{}
@@ -173,15 +172,6 @@ func (d *Database) UpdateSettings(s models.AppSettings) error {
 		return fmt.Errorf("erreur sérialisation pools: %w", err)
 	}

-	tx, err := d.Begin()
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	upsert := `INSERT INTO app_settings (key, value) VALUES ($1, $2)
-	           ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value`
-
 	if s.NowPaymentsCurrencies == nil {
 		s.NowPaymentsCurrencies = []string{}
 	}
@@ -190,6 +180,27 @@ func (d *Database) UpdateSettings(s models.AppSettings) error {
 		return fmt.Errorf("erreur sérialisation nowpayments_currencies: %w", err)
 	}

+	schedJSON, err := json.Marshal(s.DeliverySchedule)
+	if err != nil {
+		return fmt.Errorf("erreur sérialisation delivery_schedule: %w", err)
+	}
+
+	if s.PostalZones == nil {
+		s.PostalZones = []models.PostalZone{}
+	}
+	zonesJSON, err := json.Marshal(s.PostalZones)
+	if err != nil {
+		return fmt.Errorf("erreur sérialisation postal_zones: %w", err)
+	}
+
+	if s.DeliveryMode.CategoryRoutes == nil {
+		s.DeliveryMode.CategoryRoutes = []models.CategoryRoute{}
+	}
+	deliveryModeJSON, err := json.Marshal(s.DeliveryMode)
+	if err != nil {
+		return fmt.Errorf("erreur sérialisation delivery_mode: %w", err)
+	}
+
 	pairs := [][2]string{
 		{"penalties_enabled", boolStr(s.PenaltiesEnabled)},
 		{"show_amende_score", boolStr(s.ShowAmendeScore)},
@@ -201,39 +212,22 @@ func (d *Database) UpdateSettings(s models.AppSettings) error {
 		{"nowpayments_api_key", s.NowPaymentsAPIKey},
 		{"nowpayments_ipn_secret", s.NowPaymentsIPNSecret},
 		{"nowpayments_currencies", string(currenciesJSON)},
+		{"delivery_schedule", string(schedJSON)},
+		{"postal_zones", string(zonesJSON)},
+		{"telegram_bot_token", s.TelegramBotToken},
+		{"telegram_bot_username", s.TelegramBotUsername},
+		{"delivery_mode", string(deliveryModeJSON)},
 	}

-	schedJSON, err := json.Marshal(s.DeliverySchedule)
-	if err != nil {
-		return fmt.Errorf("erreur sérialisation delivery_schedule: %w", err)
-	}
-	pairs = append(pairs, [2]string{"delivery_schedule", string(schedJSON)})
+	upsert := `INSERT INTO app_settings (key, value) VALUES (?, ?)
+	           ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value`

-	if s.PostalZones == nil {
-		s.PostalZones = []models.PostalZone{}
-	}
-	zonesJSON, err := json.Marshal(s.PostalZones)
-	if err != nil {
-		return fmt.Errorf("erreur sérialisation postal_zones: %w", err)
-	}
-	pairs = append(pairs, [2]string{"postal_zones", string(zonesJSON)})
-	pairs = append(pairs, [2]string{"telegram_bot_token", s.TelegramBotToken})
-	pairs = append(pairs, [2]string{"telegram_bot_username", s.TelegramBotUsername})
-
-	if s.DeliveryMode.CategoryRoutes == nil {
-		s.DeliveryMode.CategoryRoutes = []models.CategoryRoute{}
-	}
-	deliveryModeJSON, err := json.Marshal(s.DeliveryMode)
-	if err != nil {
-		return fmt.Errorf("erreur sérialisation delivery_mode: %w", err)
-	}
-	pairs = append(pairs, [2]string{"delivery_mode", string(deliveryModeJSON)})
-
-	for _, p := range pairs {
-		if _, err = tx.Exec(upsert, p[0], p[1]); err != nil {
-			return fmt.Errorf("erreur upsert %s: %w", p[0], err)
+	return d.GDB.Transaction(func(tx *gorm.DB) error {
+		for _, p := range pairs {
+			if err := tx.Exec(upsert, p[0], p[1]).Error; err != nil {
+				return fmt.Errorf("erreur upsert %s: %w", p[0], err)
+			}
 		}
-	}
-
-	return tx.Commit()
+		return nil
+	})
 }