session/id/activites

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

@@ -114,19 +114,41 @@ public class SessionResource {
         return ResponseEntity.noContent().build();
     }
 
+    @GetMapping("/{id}/activities")
+    @PreAuthorize("hasRole('coach') or hasRole('athlete')")
+    public ResponseEntity<?> getActivitiesBySessionId(@PathVariable Integer id) {
+        try {
+            Session session = sessionDAO.findById(id).orElseThrow();
+            List<Activite> activites = session.getActivites();
+            List<ActiviteDTO> 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.NOT_FOUND).body(ex.getMessage());
+        }
+    }
+
     // Commented because not finished
 
-    /*@GetMapping("/activities/add")
+    /*
-    @PreAuthorize("hasRole('coach') or hasRole('admin')")
+     * @GetMapping("/activities/add")
-    public ResponseEntity<?> addActivity(@RequestBody ActiviteDTO dto) {
+     * 
-        try {
+     * @PreAuthorize("hasRole('coach') or hasRole('admin')")
-            Activite activite = maptoEntity(dto);
+     * public ResponseEntity<?> addActivity(@RequestBody ActiviteDTO dto) {
-            activiteDAO.save(activite);
+     * try {
-            return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(activite));
+     * Activite activite = maptoEntity(dto);
-        } catch (Exception ex) {
+     * activiteDAO.save(activite);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage());
+     * 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();

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<number, number> };
 
-
-
-
 function AthleteList({ athletes, sessions }: AthleteListProps) {
     const [dateDebut, setDateDebut] = React.useState(new Date());
     const [dateFin, setDateFin] = React.useState(new Date());