From aa877339fac938ddf12d213c1cd3dc55c2601a46 Mon Sep 17 00:00:00 2001 From: tuanvu Date: Fri, 9 Jan 2026 18:46:39 +0100 Subject: [PATCH 1/2] session/id/activites --- .../FrisbYEE/rest/SessionResource.java | 48 ++++++++++++++----- front_end/src/components/ressourceList.tsx | 5 -- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java b/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java index e25b2d5..172d108 100644 --- a/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java +++ b/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java @@ -44,7 +44,7 @@ public class SessionResource { @PreAuthorize("hasRole('coach')") public ResponseEntity create(@RequestBody SessionDTO dto) { try { - if(sessionDAO.findById(dto.getId()).isPresent()) { + if (sessionDAO.findById(dto.getId()).isPresent()) { return ResponseEntity.status(HttpStatus.OK).body("Session with ID " + dto.getId() + " already exists."); } @@ -114,19 +114,41 @@ public class SessionResource { return ResponseEntity.noContent().build(); } - //Commented because not finished - - /*@GetMapping("/activities/add") - @PreAuthorize("hasRole('coach') or hasRole('admin')") - public ResponseEntity addActivity(@RequestBody ActiviteDTO dto) { + @GetMapping("/{id}/activities") + @PreAuthorize("hasRole('coach') or hasRole('athlete')") + public ResponseEntity getActivitiesBySessionId(@PathVariable Integer id) { try { - Activite activite = maptoEntity(dto); - activiteDAO.save(activite); - return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(activite)); + Session session = sessionDAO.findById(id).orElseThrow(); + List activites = session.getActivites(); + List activiteDTOs = new ArrayList<>(); + for (Activite activite : activites) { + ActiviteDTO dto = new ActiviteDTO(); + dto.setId(activite.getId()); + dto.setName(activite.getName()); + activiteDTOs.add(dto); + } + return ResponseEntity.ok(activiteDTOs); } catch (Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage()); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage()); } - }*/ + } + + // Commented because not finished + + /* + * @GetMapping("/activities/add") + * + * @PreAuthorize("hasRole('coach') or hasRole('admin')") + * public ResponseEntity addActivity(@RequestBody ActiviteDTO dto) { + * try { + * Activite activite = maptoEntity(dto); + * activiteDAO.save(activite); + * return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(activite)); + * } catch (Exception ex) { + * return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage()); + * } + * } + */ private SessionDTO maptoDTO(Session s) { SessionDTO dto = new SessionDTO(); @@ -161,13 +183,13 @@ public class SessionResource { private Session maptoEntity(SessionDTO dto) { Session session = new Session(); - System.out.println("ID "+ session.getId()); + System.out.println("ID " + session.getId()); session.setName(dto.getName()); session.setIsRecurrent(dto.getIsRecurrent()); session.setCreneau(dto.getCreneau()); session.setDuree(dto.getDuree()); session.setGroupe(dto.getGroupe()); - + return session; } } diff --git a/front_end/src/components/ressourceList.tsx b/front_end/src/components/ressourceList.tsx index a11730f..29a33d7 100644 --- a/front_end/src/components/ressourceList.tsx +++ b/front_end/src/components/ressourceList.tsx @@ -4,17 +4,12 @@ import ObjectSession from "./object/session"; import {calculStatsAthlete, niveauAlerte} from "../utils/athleteUtils"; import {calculTempsDeJeuParLigne} from "../utils/ligneUtils"; import ObjectActivite from "./object/activite"; - - type AthleteListProps = { athletes: Athlete[], sessions: Session[]}; type ActiviteListProps = { activites: Activite[] }; type CoachListProps = { coachs: Coach[] }; type SessionListProps = { sessions: Session[]}; type LigneListProps = { lignes: Ligne[], tempsDeJeuParLigne: Map }; - - - function AthleteList({ athletes, sessions }: AthleteListProps) { const [dateDebut, setDateDebut] = React.useState(new Date()); const [dateFin, setDateFin] = React.useState(new Date()); From c234dd3f4834517038ecdd9c8a5f605fe9434eb1 Mon Sep 17 00:00:00 2001 From: tuanvu Date: Fri, 9 Jan 2026 18:54:07 +0100 Subject: [PATCH 2/2] session/id/activites --- .../FrisbYEE/rest/SessionResource.java | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java b/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java index da1f786..a2f7fa0 100644 --- a/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java +++ b/back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java @@ -130,37 +130,20 @@ public class SessionResource { return ResponseEntity.ok(activiteDTOs); } catch (Exception ex) { return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage()); - //Commented because not finished + } + } @GetMapping("/{id_session}/activities/add/{id_act}") @PreAuthorize("hasRole('coach') or hasRole('admin')") public ResponseEntity addActivity(@PathVariable Integer id_sess, @PathVariable Integer id_act) { Session s = sessionDAO.findById(id_sess).get(); - if(s.equals(null)){ + if (s.equals(null)) { return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Session not found"); } Activite a = activiteDAO.findById(id_act).get(); - if(a.equals(null)){ + if (a.equals(null)) { return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Activite not found"); } - } - - // Commented because not finished - - /* - * @GetMapping("/activities/add") - * - * @PreAuthorize("hasRole('coach') or hasRole('admin')") - * public ResponseEntity addActivity(@RequestBody ActiviteDTO dto) { - * try { - * Activite activite = maptoEntity(dto); - * activiteDAO.save(activite); - * return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(activite)); - * } catch (Exception ex) { - * return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage()); - * } - * } - */ List l = s.getActivites(); l.add(a); s.setActivites(l); @@ -201,13 +184,13 @@ public class SessionResource { private Session maptoEntity(SessionDTO dto) { Session session = new Session(); - System.out.println("ID "+ session.getId()); + System.out.println("ID " + session.getId()); session.setName(dto.getName()); session.setIsRecurrent(dto.getIsRecurrent()); session.setCreneau(dto.getCreneau()); session.setDuree(dto.getDuree()); session.setGroupe(dto.getGroupe()); - + return session; } }