Merge pull request #57 from ungdev/dev

Dev to prod

Author: tuturd

backend/src/controllers/event.controller.ts

@@ -55,6 +55,16 @@ export const checkFoodStatus = async (req: Request, res: Response) => {
     }
 };
 
+export const checkChallStatus = async (req: Request, res: Response) => {
+    try{
+        const status = await event_service.getEventsStatus();
+        Ok(res, ({data: status?.chall_open}));
+
+    }catch(error){
+        Error(res, {msg :"Error while catching Challenge status :" + error})
+    }
+};
+
 
 export const shotgunAttempt = async (req: Request, res: Response) => {
 
@@ -142,4 +152,15 @@ export const toggleFood = async (req: Request, res: Response) => {
     } catch (error) {
       Error(res,{ msg: "Erreur lors de la mise à jour." });
     }
+};
+
+export const toggleChall = async (req: Request, res: Response) => {
+    const { challOpen } = req.body;
+  
+    try {
+      const result = await event_service.updateChallStatus(challOpen);
+      Ok(res,{ msg: "Paramètres mis à jour.", data: result });
+    } catch (error) {
+      Error(res,{ msg: "Erreur lors de la mise à jour." });
+    }
 };

backend/src/controllers/user.controller.ts

@@ -5,6 +5,7 @@ import { Request, Response } from "express";
 import bcrypt from 'bcryptjs';
 import * as randomstring from 'randomstring';
 import * as auth_service from "../services/auth.service"
+import { noSyncEmails } from '../utils/no_sync_list';
 
 export const getUsersAdmin = async (req: Request, res: Response) => {
     try {
@@ -53,9 +54,9 @@ export const syncNewstudent = async (req: Request, res: Response) => {
 
       const token = await SIEP_Utils.getTokenUTTAPI();
       const newStudents = await SIEP_Utils.getNewStudentsFromUTTAPI_NOPAGE(token, date);
-      //const newStudentfiltered = newStudents.filter((student : any) => !noSyncEmails.includes(student.email));
+      const newStudentfiltered = newStudents.filter((student : any) => !noSyncEmails.includes(student.email));//Nouveau à ne pas sync (Démissionnaires, etc)
 
-      for (const element of newStudents) {
+      for (const element of newStudentfiltered) {
 
           let userInDb = await user_service.getUserByEmail(element.email.toLowerCase());
           if(userInDb === undefined){
@@ -129,6 +130,3 @@ export const adminDeleteUser = async (req: Request, res: Response) => {
     Error(res, { msg: "Erreur lors de la suppression de l'utilisateur." });
   }
 };
-
-
-

backend/src/database/initdb/initevent.ts

@@ -6,6 +6,12 @@ export const initEvent = async () => {
 
     // Si il n'y a pas de ligne existante, insérer une nouvelle ligne
     if (existingEvent.length === 0) {
-      await db.insert(eventSchema).values({ pre_registration_open: false, shotgun_open: false, sdi_open: false, wei_open: false, food_open : false }).onConflictDoNothing();
+      await db.insert(eventSchema).values({ 
+        pre_registration_open: false, 
+        shotgun_open: false, 
+        sdi_open: false, 
+        wei_open: false, 
+        food_open : false, 
+        chall_open : false }).onConflictDoNothing();
     }
   };

backend/src/database/migrations/0018_puzzling_arachne.sql

@@ -0,0 +1 @@
+ALTER TABLE "events" ADD COLUMN "chall_open" boolean DEFAULT false;