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

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java
This commit is contained in:
tuanvu
2026-01-09 18:48:54 +01:00
parent aa877339fa 536f2a7162
commit 29d483a2a6
3 changed files with 45 additions and 17 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

@@ -130,6 +130,18 @@ 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)){
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Session not found");
}
Activite a = activiteDAO.findById(id_act).get();
if(a.equals(null)){
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Activite not found");
}
}
@@ -137,7 +149,7 @@ public class SessionResource {
/*
* @GetMapping("/activities/add")
*
*
* @PreAuthorize("hasRole('coach') or hasRole('admin')")
* public ResponseEntity<?> addActivity(@RequestBody ActiviteDTO dto) {
* try {
@@ -149,6 +161,12 @@ public class SessionResource {
* }
* }
*/
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) {
SessionDTO dto = new SessionDTO();
@@ -183,13 +201,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;
}
}