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

Merge remote-tracking branch 'refs/remotes/origin/jpa' into jpa

Browse Source
This commit is contained in:
Alexis Leboeuf
2026-01-06 10:50:37 +01:00
parent c9891ae7e8 5e5661635e
commit 8b240b8b60
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,8 @@
package hackathon.FrisbYEE.jpa.dto; package hackathon.FrisbYEE.jpa.dto;
import lombok.Data; import lombok.Data;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Data @Data

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

@@ -5,9 +5,7 @@ import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToMany;
import jakarta.persistence.OneToOne; import jakarta.persistence.OneToOne;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.persistence.Access; import jakarta.persistence.Access;

3
back_end/src/main/java/hackathon/FrisbYEE/jpa/service/ActiviteDAO.java
View File

@@ -3,8 +3,11 @@ package hackathon.FrisbYEE.jpa.service;
import hackathon.FrisbYEE.jpa.metier.Activite; import hackathon.FrisbYEE.jpa.metier.Activite;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
@Repository @Repository
public interface ActiviteDAO extends JpaRepository<Activite, Integer> { public interface ActiviteDAO extends JpaRepository<Activite, Integer> {
List<Activite> findByTheme(String theme);
} }

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

@@ -84,7 +84,8 @@ public class ActiviteResource {
} }
@GetMapping("/read/{id}") @GetMapping("/{id}")
@PreAuthorize("hasRole('Coach') or hasRole('Athlete')")
@ResponseBody @ResponseBody
public ResponseEntity<ActiviteDTO> getActivityById(@PathVariable("id") int id) { public ResponseEntity<ActiviteDTO> getActivityById(@PathVariable("id") int id) {
try { try {
@@ -104,6 +105,7 @@ public class ActiviteResource {
} }
@GetMapping("/all") @GetMapping("/all")
@PreAuthorize("hasRole('Coach') or hasRole('Athlete')")
@ResponseBody @ResponseBody
public ResponseEntity<List<ActiviteDTO>> getAllActivity() { public ResponseEntity<List<ActiviteDTO>> getAllActivity() {
try { try {
@@ -124,4 +126,28 @@ public class ActiviteResource {
} }
} }
@GetMapping("/theme/{theme}")
@PreAuthorize("hasRole('Coach') or hasRole('Athlete')")
@ResponseBody
public ResponseEntity<List<ActiviteDTO>> getActivityByTheme(@PathVariable("theme") String theme) {
try {
List<Activite> activites = activiteDAO.findByTheme(theme);
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);
}
}
} }