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

Feat: Fin de ActiviteResource + ajout id dans les DTO (erreur de ma part)

Browse Source
This commit is contained in:
Amaël Kesteman
2026-01-05 22:20:29 +01:00
parent 98bd9c636b
commit fad05e8bb1
6 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
back_end/src/main/java/hackathon/FrisbYEE/jpa/dto/ActiviteDTO.java
View File

@@ -6,6 +6,7 @@ import java.util.List;
@Data
public class ActiviteDTO {
private Integer id;
private String name;
private String theme;
private Long duree; // optional, can be null

1
back_end/src/main/java/hackathon/FrisbYEE/jpa/dto/AdminDTO.java
View File

@@ -3,5 +3,6 @@ import lombok.Data;
@Data
public class AdminDTO {
private Integer id;
private String name;
}

1
back_end/src/main/java/hackathon/FrisbYEE/jpa/dto/AthleteDTO.java
View File

@@ -7,6 +7,7 @@ import java.util.List;
@Data
public class AthleteDTO {
private Integer id;
private String nom;
private String niveau;
private String categorie;

1
back_end/src/main/java/hackathon/FrisbYEE/jpa/dto/CoachDTO.java
View File

@@ -4,6 +4,7 @@ import lombok.Data;
@Data
public class CoachDTO {
private Integer id;
private String name;
}

1
back_end/src/main/java/hackathon/FrisbYEE/jpa/dto/UserDTO.java
View File

@@ -5,6 +5,7 @@ import lombok.Data;
@Data
public class UserDTO {
private Integer id;
private String name;
private String email;
private Role role;

84
back_end/src/main/java/hackathon/FrisbYEE/rest/ActiviteResource.java
View File

@@ -6,9 +6,13 @@ import hackathon.FrisbYEE.jpa.metier.Session;
import hackathon.FrisbYEE.jpa.service.ActiviteDAO;
import hackathon.FrisbYEE.jpa.service.SessionDAO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
@Controller
@RequestMapping("/activite")
@@ -21,15 +25,15 @@ public class ActiviteResource {
private SessionDAO sessionDAO;
/*
POST /activite/create
DELETE /activite/delete/{id}
* POST /activite/create
* DELETE /activite/delete/{id}
*
*/
@PostMapping("/create")
@ResponseBody
@PreAuthorize("hasRole('Coach')")
public String create(@RequestBody ActiviteDTO dto) {
public ResponseEntity<String> create(@RequestBody ActiviteDTO dto) {
try {
Session session = sessionDAO.findById(dto.getSessionId()).get();
@@ -41,21 +45,83 @@ public class ActiviteResource {
activite.setSession(session);
activiteDAO.save(activite);
} catch (Exception ex) {
return ex.toString();
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error: " + ex.getMessage());
}
return "ok";
return ResponseEntity.status(HttpStatus.CREATED).body("Activity created");
}
@DeleteMapping("/delete/{id}")
@ResponseBody
@PreAuthorize("hasRole('Coach')")
public String delete(@PathVariable("id") int id) {
public ResponseEntity<String> delete(@PathVariable("id") int id) {
try {
Activite activite = activiteDAO.findById(id).get();
activiteDAO.delete(activite);
} catch (Exception ex) {
return ex.toString();
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error: " + ex.getMessage());
}
return "ok";
return ResponseEntity.ok("Activity deleted");
}
@PostMapping("/update/{id}")
@ResponseBody
@PreAuthorize("hasRole('Coach')")
public ResponseEntity<String> modifyById(@PathVariable("id") int id, @RequestBody ActiviteDTO dto) {
try {
Session session = sessionDAO.findById(dto.getSessionId()).get();
Activite activite = activiteDAO.findById(id).get();
activite.setName(dto.getName());
activite.setTheme(dto.getTheme());
activite.setDuree(dto.getDuree() != null ? dto.getDuree() : 0L);
activite.setDataActivite(dto.getDataActivite());
activite.setSession(session);
activiteDAO.save(activite);
} catch (Exception ex) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error: " + ex.getMessage());
}
return ResponseEntity.ok("Activity modified");
}
@GetMapping("/read/{id}")
@ResponseBody
public ResponseEntity<ActiviteDTO> getActivityById(@PathVariable("id") int id) {
try {
Activite activite = activiteDAO.findById(id).get();
ActiviteDTO dto = new ActiviteDTO();
dto.setName(activite.getName());
dto.setId(activite.getId());
dto.setTheme(activite.getTheme());
dto.setDuree(activite.getDuree());
dto.setDataActivite(activite.getDataActivite());
dto.setSessionId(activite.getSession() != null ? activite.getSession().getId() : null);
return ResponseEntity.ok(dto);
} catch (Exception ex) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
}
}
@GetMapping("/all")
@ResponseBody
public ResponseEntity<List<ActiviteDTO>> getAllActivity() {
try {
List<Activite> activites = activiteDAO.findAll();
List<ActiviteDTO> dtos = activites.stream().map(activite -> {
ActiviteDTO dto = new ActiviteDTO();
dto.setName(activite.getName());
dto.setId(activite.getId());
dto.setTheme(activite.getTheme());
dto.setDuree(activite.getDuree());
dto.setDataActivite(activite.getDataActivite());
dto.setSessionId(activite.getSession() != null ? activite.getSession().getId() : null);
return dto;
}).collect(Collectors.toList());
return ResponseEntity.ok(dtos);
} catch (Exception ex) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
}
}
}