Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon

back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java

@@ -44,7 +44,8 @@ public class SessionResource {
     public ResponseEntity<?> create(@RequestBody SessionDTO dto) {
         try {
             Session session = maptoEntity(dto);
-            session.setCoach(coachDAO.findById(dto.getCoachId()).orElse(null));
+            Coach c = coachDAO.findById(dto.getCoachId()).orElse(null);
+            session.setCoach(c);
             sessionDAO.save(session);
             return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(session));
         } catch (Exception ex) {

docker-compose.yml

@@ -9,6 +9,7 @@ services:
       - "8080:8080"
     volumes:
       - ./keycloak/:/opt/keycloak/data/import/
+      - keycloak_data:/opt/keycloak/data
     environment:
       KEYCLOAK_ADMIN: admin
       KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
@@ -37,5 +38,6 @@ services:
 
 volumes:
   postgres_data:
+  keycloak_data:
 
 version: "3.9"

front_end/src/components/ressourcePanel.tsx

@@ -4,6 +4,7 @@ import { Activite, Athlete, Coach , Session, Ligne, Admin } from "../classes";
 import {calculTempsDeJeuParLigne} from "../utils/ligneUtils";
 import { keyboard } from "@testing-library/user-event/dist/keyboard";
 import ObjectSession from "./object/session";
+import ObjectActivite from "./object/activite";
 import ObjectUser from "./object/user";
 import { getAllSessionsAPI } from "../requetes";
 import { useKeycloak } from "@react-keycloak/web";
@@ -84,8 +85,8 @@ import { useKeycloak } from "@react-keycloak/web";
 						))
 					)}
 					{value==="activites" && (
-						allSessions.map((session) => ( //TODO
-							<ObjectSession session={session}/>
+						allActivites.map((activite) => ( 
+							<ObjectActivite activite={activite}/>
 						))
 					)}
 					{value==="coachs" && (

front_end/src/requetes.tsx

@@ -135,10 +135,9 @@ export async function postActivityAPI(session: Session, activity: Activite){
 
 export async function postAthlete(athlete: Athlete):Promise<Athlete>{
    try {
-        //const response = await api.post<Athlete>("/athlete/create/",athlete.toDTO);
-        const response = await athleteService.create(athlete.toDTO());
+        const response = await api.post<Athlete>("/athlete/create/",athlete.toDTO);
         console.log(response);
-        return new Athlete(response.data);
+        return response.data;
     } catch (error) {
         console.error("Error fetching coachs:", error);
         throw error;