vuminh224/hackathon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
trochas
2026-01-09 18:45:22 +01:00
parent 8638e962c9 a4963aed6a
commit 536f2a7162
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java
View File

@@ -116,17 +116,23 @@ public class SessionResource {
//Commented because not finished //Commented because not finished
/*@GetMapping("/activities/add") @GetMapping("/{id_session}/activities/add/{id_act}")
@PreAuthorize("hasRole('coach') or hasRole('admin')") @PreAuthorize("hasRole('coach') or hasRole('admin')")
public ResponseEntity<?> addActivity(@RequestBody ActiviteDTO dto) { public ResponseEntity<?> addActivity(@PathVariable Integer id_sess, @PathVariable Integer id_act) {
try { Session s = sessionDAO.findById(id_sess).get();
Activite activite = maptoEntity(dto); if(s.equals(null)){
activiteDAO.save(activite); return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Session not found");
return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(activite));
} catch (Exception ex) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage());
} }
}*/ Activite a = activiteDAO.findById(id_act).get();
if(a.equals(null)){
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Activite not found");
}
List<Activite> l = s.getActivites();
l.add(a);
s.setActivites(l);
sessionDAO.save(s);
return ResponseEntity.status(200).body(maptoDTO(s));
}
private SessionDTO maptoDTO(Session s) { private SessionDTO maptoDTO(Session s) {
SessionDTO dto = new SessionDTO(); SessionDTO dto = new SessionDTO();

1
front_end/src/api.ts
View File

@@ -50,6 +50,7 @@ export const athleteService = {
getActivitiesForSession: (sessionId: number | string) => api.get(`/athletes/session/${sessionId}/activities`), getActivitiesForSession: (sessionId: number | string) => api.get(`/athletes/session/${sessionId}/activities`),
getSessionsAfterDate: (athleteId: number | string, date: string) => api.get(`/athletes/${athleteId}/session/after/${encodeURIComponent(date)}`), getSessionsAfterDate: (athleteId: number | string, date: string) => api.get(`/athletes/${athleteId}/session/after/${encodeURIComponent(date)}`),
getSessionsBetweenDates: (athleteId: number | string, startDate: string, endDate: string) => api.get(`/athletes/${athleteId}/session/between/${encodeURIComponent(startDate)}/${encodeURIComponent(endDate)}`), getSessionsBetweenDates: (athleteId: number | string, startDate: string, endDate: string) => api.get(`/athletes/${athleteId}/session/between/${encodeURIComponent(startDate)}/${encodeURIComponent(endDate)}`),
addActivity: (id_sess: number, id_act: number) => api.get(`/${id_sess}/activities/add/${id_act}`)
}; };
export const activiteService = { export const activiteService = {