From d834b8d0d3df5ebc5a0a9767d25a0dfbbe61bcb7 Mon Sep 17 00:00:00 2001
From: Youssef <youssef.kaouachi@gmail.com>
Date: Mon, 29 Jun 2026 09:14:18 +0200
Subject: [PATCH] fix: ajout du script de migration Flyway pour les nouveaux
 champs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Script V30__add_ancienne_categorie_and_sexe.sql pour ajouter les champs en DB.

- Mise à jour des colonnes telephone, ancienne_categorie et sexe.
---
 .vscode/settings.json                             |  3 +++
 .../java/com/astalange/core/entity/Categorie.java |  6 ++++++
 .../V30__add_ancienne_categorie_and_sexe.sql      | 10 ++++++++++
 .../templates/parametrage/categories_form.html    | 15 ++++++++++++---
 .../templates/parametrage/categories_list.html    |  5 ++++-
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 as-talange-core/src/main/resources/db/migration/V30__add_ancienne_categorie_and_sexe.sql

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..7b016a8
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}
\ No newline at end of file
diff --git a/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java b/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java
index 43e3c5d..02f56ed 100644
--- a/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java
+++ b/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java
@@ -18,6 +18,9 @@ public class Categorie {
     @Column(nullable = false, length = 20)
     private String nom;
 
+    @Column(nullable = false, length = 10)
+    private String sexe = "MASCULIN";
+
     @Column(name = "annee_min")
     private Integer anneeMin;
 
@@ -45,6 +48,9 @@ public class Categorie {
     public String getNom() { return nom; }
     public void setNom(String nom) { this.nom = nom; }
 
+    public String getSexe() { return sexe; }
+    public void setSexe(String sexe) { this.sexe = sexe; }
+
     public Integer getAnneeMin() { return anneeMin; }
     public void setAnneeMin(Integer anneeMin) { this.anneeMin = anneeMin; }
 
diff --git a/as-talange-core/src/main/resources/db/migration/V30__add_ancienne_categorie_and_sexe.sql b/as-talange-core/src/main/resources/db/migration/V30__add_ancienne_categorie_and_sexe.sql
new file mode 100644
index 0000000..a6ddf0e
--- /dev/null
+++ b/as-talange-core/src/main/resources/db/migration/V30__add_ancienne_categorie_and_sexe.sql
@@ -0,0 +1,10 @@
+ALTER TABLE adherent ADD COLUMN ancienne_categorie VARCHAR(50);
+ALTER TABLE pre_inscription ADD COLUMN ancienne_categorie VARCHAR(50) DEFAULT 'NA';
+
+ALTER TABLE categorie ADD COLUMN sexe VARCHAR(10) DEFAULT 'MASCULIN' NOT NULL;
+
+UPDATE adherent SET telephone = '0000000000' WHERE telephone IS NULL;
+ALTER TABLE adherent ALTER COLUMN telephone SET NOT NULL;
+
+UPDATE pre_inscription SET telephone = '0000000000' WHERE telephone IS NULL;
+ALTER TABLE pre_inscription ALTER COLUMN telephone SET NOT NULL;
diff --git a/as-talange-web/src/main/resources/templates/parametrage/categories_form.html b/as-talange-web/src/main/resources/templates/parametrage/categories_form.html
index 6419461..a63ad2b 100644
--- a/as-talange-web/src/main/resources/templates/parametrage/categories_form.html
+++ b/as-talange-web/src/main/resources/templates/parametrage/categories_form.html
@@ -22,9 +22,18 @@
                 <form th:action="@{/categories}" th:object="${categorie}" method="post" class="space-y-6">
                     <input type="hidden" th:field="*{id}" />
 
-                    <div>
-                        <label class="block text-sm font-medium text-gray-700 mb-1">Nom (ex: U15)</label>
-                        <input type="text" th:field="*{nom}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                    <div class="grid grid-cols-2 gap-4">
+                        <div>
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Nom (ex: U15)</label>
+                            <input type="text" th:field="*{nom}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Catégorie</label>
+                            <select th:field="*{sexe}" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                                <option value="MASCULIN">Masculine</option>
+                                <option value="FEMININ">Féminine</option>
+                            </select>
+                        </div>
                     </div>
 
                     <div class="grid grid-cols-2 gap-4">
diff --git a/as-talange-web/src/main/resources/templates/parametrage/categories_list.html b/as-talange-web/src/main/resources/templates/parametrage/categories_list.html
index 24755a2..ce7c7b5 100644
--- a/as-talange-web/src/main/resources/templates/parametrage/categories_list.html
+++ b/as-talange-web/src/main/resources/templates/parametrage/categories_list.html
@@ -43,7 +43,10 @@
                             <td colspan="6" class="py-8 text-center text-gray-500">Aucune catégorie n'est paramétrée.</td>
                         </tr>
                         <tr th:each="cat : ${categories}" class="hover:bg-gray-50 transition-colors">
-                            <td class="py-4 px-6 font-medium text-gray-900" th:text="${cat.nom}">U15</td>
+                            <td class="py-4 px-6">
+                                <div class="font-medium text-gray-900" th:text="${cat.nom}">U15</div>
+                                <div class="text-xs text-gray-500" th:text="${cat.sexe == 'FEMININ' ? 'Féminine' : 'Masculine'}">Masculine</div>
+                            </td>
                             <td class="py-4 px-6 text-center text-gray-600" th:text="${cat.anneeMin}">2010</td>
                             <td class="py-4 px-6 text-center text-gray-600" th:text="${cat.anneeMax}">2011</td>
                             <td class="py-4 px-6 text-right font-medium text-blue-600" th:text="${cat.tarifBase + ' €'}">100.00 €</td>