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

Finished refactoring classes, DTOs, endpoints I guess ?

Browse Source
This commit is contained in:
Alexis Leboeuf
2026-01-07 17:40:41 +01:00
parent c8d1407bcc
commit 203d0fe157
12 changed files with 41 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -7,12 +7,12 @@ import java.util.List;
@Data @Data
public class AthleteDTO { public class AthleteDTO {
private Integer id; private String id_keycloak;
private String name; private String name;
private String prenom;
private String categorie; private String categorie;
private String niveau; private String niveau;
private List<String> groupes = new ArrayList<>(); private List<String> groupes = new ArrayList<>();
private List<Integer> sessionIds = new ArrayList<>(); private List<Integer> sessionIds = new ArrayList<>();
private Integer userId;
} }

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

@@ -1,10 +1,13 @@
package hackathon.FrisbYEE.jpa.dto; package hackathon.FrisbYEE.jpa.dto;
import java.util.List;
import lombok.Data; import lombok.Data;
@Data @Data
public class CoachDTO { public class CoachDTO {
private Integer id; private String id_keycloak;
private String name; private String name;
private String prenom;
private List<Integer> sessionIds;
} }

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

@@ -8,7 +8,6 @@ import java.util.List;
@Data @Data
public class SessionDTO { public class SessionDTO {
private Integer id;
private String name; private String name;
private Boolean isRecurrent; private Boolean isRecurrent;
private LocalDateTime creneau; private LocalDateTime creneau;

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

@@ -5,8 +5,9 @@ import lombok.Data;
@Data @Data
public class UserDTO { public class UserDTO {
private Integer id; private String id_keycloak;
private String name; private String name;
private String prenom;
private String email; private String email;
private Role role; private Role role;
} }

5
back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Admin.java
View File

@@ -16,9 +16,10 @@ import jakarta.persistence.Entity;
public class Admin extends User{ public class Admin extends User{
public Admin(String name){ public Admin(String id_keycloak, String name, String prenom){
super(name); super(name, id_keycloak, prenom, Role.ADMIN );
} }
@Override @Override
public String toString() { public String toString() {
return "Admin [id=" + super.getId() + " , name=" + super.getName() + "]"; return "Admin [id=" + super.getId() + " , name=" + super.getName() + "]";

11
back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Athlete.java
View File

@@ -28,15 +28,8 @@ public class Athlete extends User{
@ManyToMany(mappedBy = "athletes") @ManyToMany(mappedBy = "athletes")
private List<Session> sessions = new ArrayList<>(); // plusieurs sessions sont possibles private List<Session> sessions = new ArrayList<>(); // plusieurs sessions sont possibles
public Athlete(String name){ public Athlete(String name, String id_keycloak, String prenom){
super(name); super(name, id_keycloak, prenom, Role.ATHLETE);
}
public Athlete(String name, String categorie, String niveau, List<String> groupe){
super(name);
this.categorie = categorie;
this.niveau = niveau;
this.groupe = groupe;
} }
@Override @Override

5
back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Coach.java
View File

@@ -22,9 +22,10 @@ public class Coach extends User{
@OneToMany(mappedBy = "coach") @OneToMany(mappedBy = "coach")
private List<Session> sessions = new ArrayList<>(); // Un coach peut avoir plusieurs sessions private List<Session> sessions = new ArrayList<>(); // Un coach peut avoir plusieurs sessions
public Coach(String name){ public Coach(String name, String id_keycloak, String prenom){
super(name); super(name, id_keycloak, prenom, Role.COACH );
} }
@Override @Override
public String toString() { public String toString() {
return "Coach [id=" + super.getId() + " , name=" + super.getName() + "]"; return "Coach [id=" + super.getId() + " , name=" + super.getName() + "]";

25
back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/User.java
View File

@@ -30,33 +30,18 @@ public class User implements Serializable {
private Integer id; private Integer id;
@Column(nullable = false, unique = true) @Column(nullable = false, unique = true)
private String id_keycloak; private String id_keycloak;
private String name; private String name;
@Column(nullable = false) private String prenom;
private String motDePasse;
private String email;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(nullable = false) @Column(nullable = false)
private Role role; private Role role;
@OneToOne(cascade = CascadeType.ALL) public User(String name, String id_keycloak, String prenom, Role role) {
private Coach coach;
@OneToOne(cascade = CascadeType.ALL)
private Athlete athlete;
@OneToOne(cascade = CascadeType.ALL)
private Admin admin;
public User(String name) {
this.name = name; this.name = name;
} this.id_keycloak = id_keycloak;
this.prenom = prenom;
public User(String name, String motDePasse, String email, Role role) {
this.name = name;
this.motDePasse = motDePasse;
this.email = email;
this.role = role; this.role = role;
} }

12
back_end/src/main/java/hackathon/FrisbYEE/rest/AthleteResource.java
View File

@@ -47,7 +47,7 @@ public class AthleteResource {
@PostMapping("/create") @PostMapping("/create")
@PreAuthorize("hasRole('Admin')") // Only admin can create?? @PreAuthorize("hasRole('Admin')") // Only admin can create??
public ResponseEntity<AthleteDTO> create(@RequestBody AthleteDTO dto) { public ResponseEntity<AthleteDTO> create(@RequestBody AthleteDTO dto) {
User athlete = mapToEntity(dto); Athlete athlete = mapToEntity(dto);
athleteDAO.save(athlete); athleteDAO.save(athlete);
return ResponseEntity.status(HttpStatus.CREATED).body(mapToDTO(athlete)); return ResponseEntity.status(HttpStatus.CREATED).body(mapToDTO(athlete));
} }
@@ -126,7 +126,7 @@ public class AthleteResource {
private AthleteDTO mapToDTO(Athlete athlete) { private AthleteDTO mapToDTO(Athlete athlete) {
AthleteDTO dto = new AthleteDTO(); AthleteDTO dto = new AthleteDTO();
dto.setId(athlete.getId()); dto.setId_keycloak(athlete.getId_keycloak());
dto.setName(athlete.getName()); dto.setName(athlete.getName());
dto.setCategorie(athlete.getCategorie()); dto.setCategorie(athlete.getCategorie());
dto.setNiveau(athlete.getNiveau()); dto.setNiveau(athlete.getNiveau());
@@ -135,10 +135,6 @@ public class AthleteResource {
private Athlete mapToEntity(AthleteDTO dto) { private Athlete mapToEntity(AthleteDTO dto) {
Athlete athlete = new Athlete(); Athlete athlete = new Athlete();
athlete.setId(dto.getId());
athlete.setName(dto.getName());
athlete.setCategorie(dto.getCategorie());
athlete.setNiveau(dto.getNiveau());
return athlete; return athlete;
} }
@@ -156,7 +152,6 @@ public class AthleteResource {
for (Session s : sessions) { for (Session s : sessions) {
if (s.getAthletes().contains(j.get())) { if (s.getAthletes().contains(j.get())) {
SessionDTO dto = new SessionDTO(); SessionDTO dto = new SessionDTO();
dto.setId(s.getId());
dto.setName(s.getName()); dto.setName(s.getName());
// Map other fields as necessary // Map other fields as necessary
athleteSessions.add(dto); athleteSessions.add(dto);
@@ -177,7 +172,6 @@ public class AthleteResource {
List<SessionDTO> sessionDTOs = new ArrayList<>(); List<SessionDTO> sessionDTOs = new ArrayList<>();
for (Session session : sessions) { for (Session session : sessions) {
SessionDTO dto = new SessionDTO(); SessionDTO dto = new SessionDTO();
dto.setId(session.getId());
dto.setName(session.getName()); dto.setName(session.getName());
// Map other fields as necessary // Map other fields as necessary
sessionDTOs.add(dto); sessionDTOs.add(dto);
@@ -229,7 +223,6 @@ public class AthleteResource {
// sympa les // sympa les
// dates // dates
SessionDTO dto = new SessionDTO(); SessionDTO dto = new SessionDTO();
dto.setId(session.getId());
dto.setName(session.getName()); dto.setName(session.getName());
// Map other fields as necessary // Map other fields as necessary
filteredSessions.add(dto); filteredSessions.add(dto);
@@ -259,7 +252,6 @@ public class AthleteResource {
&& session.getCreneau().isAfter(ChronoLocalDateTime.from(LocalDate.parse(startDate))) && session.getCreneau().isAfter(ChronoLocalDateTime.from(LocalDate.parse(startDate)))
&& session.getCreneau().isBefore(ChronoLocalDateTime.from(LocalDate.parse(endDate)))) { && session.getCreneau().isBefore(ChronoLocalDateTime.from(LocalDate.parse(endDate)))) {
SessionDTO dto = new SessionDTO(); SessionDTO dto = new SessionDTO();
dto.setId(session.getId());
dto.setName(session.getName()); dto.setName(session.getName());
// Map other fields as necessary // Map other fields as necessary
filteredSessions.add(dto); filteredSessions.add(dto);

5
back_end/src/main/java/hackathon/FrisbYEE/rest/CoachResource.java
View File

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ResponseStatusException;
@@ -71,14 +70,14 @@ public class CoachResource {
private CoachDTO mapToDTO(Coach coach) { private CoachDTO mapToDTO(Coach coach) {
CoachDTO dto = new CoachDTO(); CoachDTO dto = new CoachDTO();
dto.setId(coach.getId()); dto.setId_keycloak(coach.getId_keycloak());
dto.setName(coach.getName()); dto.setName(coach.getName());
return dto; return dto;
} }
private Coach mapToEntity(CoachDTO dto) { private Coach mapToEntity(CoachDTO dto) {
Coach coach = new Coach(); Coach coach = new Coach();
coach.setId(dto.getId()); coach.setId_keycloak(dto.getId_keycloak());
coach.setName(dto.getName()); coach.setName(dto.getName());
return coach; return coach;
} }

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

@@ -3,11 +3,12 @@ package hackathon.FrisbYEE.rest;
import hackathon.FrisbYEE.jpa.dto.SessionDTO; import hackathon.FrisbYEE.jpa.dto.SessionDTO;
import hackathon.FrisbYEE.jpa.metier.Activite; import hackathon.FrisbYEE.jpa.metier.Activite;
import hackathon.FrisbYEE.jpa.metier.Athlete; import hackathon.FrisbYEE.jpa.metier.Athlete;
import hackathon.FrisbYEE.jpa.metier.Coach;
import hackathon.FrisbYEE.jpa.metier.Session; import hackathon.FrisbYEE.jpa.metier.Session;
import hackathon.FrisbYEE.jpa.metier.User;
import hackathon.FrisbYEE.jpa.service.ActiviteDAO; import hackathon.FrisbYEE.jpa.service.ActiviteDAO;
import hackathon.FrisbYEE.jpa.service.AthleteDAO;
import hackathon.FrisbYEE.jpa.service.CoachDAO;
import hackathon.FrisbYEE.jpa.service.SessionDAO; import hackathon.FrisbYEE.jpa.service.SessionDAO;
import hackathon.FrisbYEE.jpa.service.UserDAO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@@ -29,7 +30,10 @@ public class SessionResource {
private SessionDAO sessionDAO; private SessionDAO sessionDAO;
@Autowired @Autowired
private UserDAO userDAO; private CoachDAO coachDAO;
@Autowired
private AthleteDAO athleteDAO;
@Autowired @Autowired
private ActiviteDAO activiteDAO; private ActiviteDAO activiteDAO;
@@ -40,7 +44,7 @@ public class SessionResource {
public ResponseEntity<?> create(@RequestBody SessionDTO dto) { public ResponseEntity<?> create(@RequestBody SessionDTO dto) {
try { try {
Session session = maptoEntity(dto); Session session = maptoEntity(dto);
session.setCoach(userDAO.findById(dto.getCoachId()).orElse(null)); session.setCoach(coachDAO.findById(dto.getCoachId()).orElse(null));
sessionDAO.save(session); sessionDAO.save(session);
return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(session)); return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(session));
} catch (Exception ex) { } catch (Exception ex) {
@@ -93,7 +97,7 @@ public class SessionResource {
session.setDuree(dto.getDuree()); session.setDuree(dto.getDuree());
} }
if (dto.getAthleteIds() != null) { if (dto.getAthleteIds() != null) {
List<User> athletes = userDAO.findAllById(dto.getAthleteIds()); List<Athlete> athletes = athleteDAO.findAllById(dto.getAthleteIds());
session.setAthletes(athletes); session.setAthletes(athletes);
} }
if (dto.getActiviteIds() != null) { if (dto.getActiviteIds() != null) {
@@ -106,7 +110,6 @@ public class SessionResource {
private SessionDTO maptoDTO(Session s) { private SessionDTO maptoDTO(Session s) {
SessionDTO dto = new SessionDTO(); SessionDTO dto = new SessionDTO();
dto.setId(s.getId());
dto.setName(s.getName()); dto.setName(s.getName());
dto.setIsRecurrent(s.getIsRecurrent()); dto.setIsRecurrent(s.getIsRecurrent());
dto.setCreneau(s.getCreneau()); dto.setCreneau(s.getCreneau());
@@ -119,7 +122,7 @@ public class SessionResource {
// Athletes // Athletes
if (s.getAthletes() != null) { if (s.getAthletes() != null) {
List<Integer> athleteIds = new ArrayList<>(); List<Integer> athleteIds = new ArrayList<>();
for (User athlete : s.getAthletes()) { for (Athlete athlete : s.getAthletes()) {
athleteIds.add(athlete.getId()); athleteIds.add(athlete.getId());
} }
dto.setAthleteIds(athleteIds); dto.setAthleteIds(athleteIds);
@@ -137,7 +140,6 @@ public class SessionResource {
private Session maptoEntity(SessionDTO dto) { private Session maptoEntity(SessionDTO dto) {
Session session = new Session(); Session session = new Session();
session.setId(dto.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());
@@ -145,13 +147,13 @@ public class SessionResource {
session.setGroupe(dto.getGroupe()); session.setGroupe(dto.getGroupe());
// Coach // Coach
if (dto.getCoachId() != null) { if (dto.getCoachId() != null) {
User coach = new User(); Coach coach = new Coach();
coach.setId(dto.getCoachId()); coach.setId(dto.getCoachId());
session.setCoach(coach); session.setCoach(coach);
} }
// Athletes // Athletes
if (dto.getAthleteIds() != null) { if (dto.getAthleteIds() != null) {
List<Athlete> athletes = userDAO.findAllById(dto.getAthleteIds()); List<Athlete> athletes = athleteDAO.findAllById(dto.getAthleteIds());
session.setAthletes(athletes); session.setAthletes(athletes);
} }
// Activites // Activites