session/id/activites
This commit is contained in:
@@ -130,37 +130,20 @@ public class SessionResource {
|
|||||||
return ResponseEntity.ok(activiteDTOs);
|
return ResponseEntity.ok(activiteDTOs);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
|
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
|
||||||
//Commented because not finished
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/{id_session}/activities/add/{id_act}")
|
@GetMapping("/{id_session}/activities/add/{id_act}")
|
||||||
@PreAuthorize("hasRole('coach') or hasRole('admin')")
|
@PreAuthorize("hasRole('coach') or hasRole('admin')")
|
||||||
public ResponseEntity<?> addActivity(@PathVariable Integer id_sess, @PathVariable Integer id_act) {
|
public ResponseEntity<?> addActivity(@PathVariable Integer id_sess, @PathVariable Integer id_act) {
|
||||||
Session s = sessionDAO.findById(id_sess).get();
|
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");
|
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Session not found");
|
||||||
}
|
}
|
||||||
Activite a = activiteDAO.findById(id_act).get();
|
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");
|
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<Activite> l = s.getActivites();
|
List<Activite> l = s.getActivites();
|
||||||
l.add(a);
|
l.add(a);
|
||||||
s.setActivites(l);
|
s.setActivites(l);
|
||||||
@@ -201,13 +184,13 @@ public class SessionResource {
|
|||||||
|
|
||||||
private Session maptoEntity(SessionDTO dto) {
|
private Session maptoEntity(SessionDTO dto) {
|
||||||
Session session = new Session();
|
Session session = new Session();
|
||||||
System.out.println("ID "+ session.getId());
|
System.out.println("ID " + session.getId());
|
||||||
session.setName(dto.getName());
|
session.setName(dto.getName());
|
||||||
session.setIsRecurrent(dto.getIsRecurrent());
|
session.setIsRecurrent(dto.getIsRecurrent());
|
||||||
session.setCreneau(dto.getCreneau());
|
session.setCreneau(dto.getCreneau());
|
||||||
session.setDuree(dto.getDuree());
|
session.setDuree(dto.getDuree());
|
||||||
session.setGroupe(dto.getGroupe());
|
session.setGroupe(dto.getGroupe());
|
||||||
|
|
||||||
return session;
|
return session;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user