2026 Fixes n°12

.github/workflows/ci.yaml

@@ -3,12 +3,13 @@ name: CI
 on:
   push:
     branches:
-      - prod
       - dev
+    tags:
+      - 'v*'
   pull_request:
     branches:
-      - prod
       - dev
+      - prod
 
 env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
@@ -68,7 +69,7 @@ jobs:
 
   build-api:
     runs-on: self-hosted
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' || github.event_name == 'push'
     needs:
       - lint-api
     steps:
@@ -97,7 +98,7 @@ jobs:
 
   build-front:
     runs-on: self-hosted
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' || github.event_name == 'push'
     needs:
       - lint-front
     steps:
@@ -126,10 +127,11 @@ jobs:
 
   deploy-api:
     runs-on: self-hosted
-    if : github.event_name == 'push'
-    environment: ${{ github.ref == 'refs/heads/dev' && 'development' || 'production' }}
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || startswith(github.ref, 'refs/tags/v'))
+    environment: ${{ startswith(github.ref, 'refs/tags/') && 'production' || 'development' }}
     needs:
       - lint-api
+      - build-api
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
@@ -150,14 +152,16 @@ jobs:
           context: ./backend
           push: true
           tags: |
-            ${{ secrets.REGISTRY_URL }}/integration/api:${{ github.ref == 'refs/heads/prod' && 'prod' || 'dev' }}
+            ${{ secrets.REGISTRY_URL }}/integration/api:${{ startswith(github.ref, 'refs/tags/') && github.ref_name || 'dev' }}
+            ${{ startswith(github.ref, 'refs/tags/') && format('{0}/integration/api:prod', secrets.REGISTRY_URL) || '' }}
 
   deploy-front:
     runs-on: self-hosted
-    if : github.event_name == 'push'
-    environment: ${{ github.ref == 'refs/heads/dev' && 'development' || 'production' }}
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || startswith(github.ref, 'refs/tags/v'))
+    environment: ${{ startswith(github.ref, 'refs/tags/') && 'production' || 'development' }}
     needs:
       - lint-front
+      - build-front
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
@@ -172,7 +176,7 @@ jobs:
       - name: Install docker
         uses: docker/setup-buildx-action@v3
 
-      - name: Front- Build and push
+      - name: Front - Build and push
         uses: docker/build-push-action@v6
         with:
           context: ./frontend
@@ -199,5 +203,8 @@ jobs:
             VITE_BDE_SIREN=${{ vars.BDE_SIREN }}
             VITE_DPO_EMAIL=${{ vars.DPO_EMAIL }}
             VITE_DPO_NAME=${{ vars.DPO_NAME }}
+            VITE_APP_VERSION=${{ startswith(github.ref, 'refs/tags/') && github.ref_name || 'dev' }}
+            VITE_RELEASE_URL=${{ startswith(github.ref, 'refs/tags/') && format('https://github.com/{0}/releases/tag/{1}', github.repository, github.ref_name) || '' }}
           tags: |
-            ${{ secrets.REGISTRY_URL }}/integration/front:${{ github.ref == 'refs/heads/prod' && 'prod' || 'dev' }}
+            ${{ secrets.REGISTRY_URL }}/integration/front:${{ startswith(github.ref, 'refs/tags/') && github.ref_name || 'dev' }}
+            ${{ startswith(github.ref, 'refs/tags/') && format('{0}/integration/front:prod', secrets.REGISTRY_URL) || '' }}

backend/server.ts

@@ -18,7 +18,7 @@ import challengeRoutes from './src/routes/challenge.routes';
 import defaultRoute from './src/routes/default.routes';
 import discordRoutes from './src/routes/discord.routes';
 import emailRoutes from './src/routes/email.routes';
-import eventRoutes from './src/routes/event.routes';
+import settingsRoutes from './src/routes/settings.routes';
 import factionRoutes from './src/routes/faction.routes';
 import imexportRouter from './src/routes/im_export.routes';
 import newsRoutes from './src/routes/news.routes';
@@ -27,6 +27,7 @@ import roleRoutes from './src/routes/role.routes';
 import teamRoutes from './src/routes/team.routes';
 import tentRoutes from './src/routes/tent.routes';
 import userRoutes from './src/routes/user.routes';
+import makerBattleRoutes from './src/routes/maker_battle.routes';
 import bannedRoutes from './src/routes/banned.routes';
 import { server_port } from './src/shared/secrets/secrets';
 import { initQcmvss } from './src/database/initdb/initQcmvss';
@@ -59,7 +60,7 @@ async function startServer() {
         app.use('/api/role', authenticateUser, roleRoutes);
         app.use('/api/user', authenticateUser, userRoutes);
         app.use('/api/team', authenticateUser, teamRoutes);
-        app.use('/api/event', authenticateUser, eventRoutes);
+        app.use('/api/settings', authenticateUser, settingsRoutes);
         app.use('/api/faction', authenticateUser, factionRoutes);
         app.use('/api/imexport', authenticateUser, imexportRouter);
         app.use('/api/permanence', authenticateUser, permanenceRoutes);
@@ -69,6 +70,7 @@ async function startServer() {
         app.use('/api/discord', authenticateUser, discordRoutes);
         app.use('/api/tent', authenticateUser, tentRoutes);
         app.use('/api/bus', authenticateUser, busRoutes);
+        app.use('/api/maker-battle', authenticateUser, makerBattleRoutes);
         app.use('/api/uploads/news', express.static(path.join(__dirname, '/uploads/news')));
         app.use('/api/uploads/notebooks', express.static(path.join(__dirname, '/uploads/notebooks')));
         app.use('/api/uploads/foodmenu', express.static(path.join(__dirname, '/uploads/foodmenu')));

backend/src/controllers/im_export.controller.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import * as event_service from '../services/event.service';
+import * as settings_service from '../services/settings.service';
 import * as export_service from '../services/im_export.service';
 import * as permanence_service from '../services/permanence.service';
 import * as team_service from '../services/team.service';
@@ -22,7 +22,7 @@ export const exportAllDataToSheets: AppRequestHandler = async (_req, res) => {
         const userList = await user_service.getUsersAll();
         const teamList = await team_service.getTeamsAll();
         const permanenceList = await permanence_service.getAllPermanencesWithUsers();
-        const shotgunList = await event_service.getAllTeamShotguns();
+        const shotgunList = await settings_service.getAllTeamShotguns();
 
         // 2. Mapping -> format pour Google Sheets (array de array)
         const usersValues = [
@@ -162,23 +162,29 @@ export const updatePlannings: AppRequestHandler = async (_req, res) => {
     }
 };
 
-export const exportUsersCSV: AppRequestHandler = async (_req, res) => {
+export const exportBus: AppRequestHandler = async (_req, res) => {
     try {
-        await export_service.exportUsersToCSV();
-        Ok(res, { msg: 'CSV des bus généré' });
+        const exportData = await export_service.exportBus();
+        res.setHeader('Content-Type', 'application/json');
+        res.setHeader('Content-Disposition', `attachment; filename="bus_${Date.now()}.json"`);
+
+        return res.status(200).json(exportData);
     } catch (error) {
         console.error(error);
-        Error(res, { msg: "Erreur lors de l'export CSV" });
+        return Error(res, { msg: "Erreur lors de l'exportation des memsbres des équipes : " + error });
     }
 };
 
-export const exportTeamMembersCSV: AppRequestHandler = async (_req, res) => {
+export const exportTeamMembers: AppRequestHandler = async (_req, res) => {
     try {
-        await export_service.exportTeamMembersToCSV();
-        Ok(res, { msg: "CSV des membres de l'équipe généré" });
+        const exportData = await export_service.exportTeamMembers();
+        res.setHeader('Content-Type', 'application/json');
+        res.setHeader('Content-Disposition', `attachment; filename="team_members_${Date.now()}.json"`);
+
+        return res.status(200).json(exportData);
     } catch (error) {
         console.error(error);
-        Error(res, { msg: "Erreur lors de l'export CSV" });
+        return Error(res, { msg: "Erreur lors de l'exportation des memsbres des équipes : " + error });
     }
 };
 export const getUploadedDocumentStatus: AppRequestHandler<unknown, unknown, UploadedDocumentParams> = async (