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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
tuanvu
2026-01-09 13:51:13 +01:00
parent 95933b62df 1ec1f318f6
commit 3ec62df156
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
back_end/src/main/java/hackathon/FrisbYEE/rest/AdminResource.java
View File

@@ -6,12 +6,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import hackathon.FrisbYEE.jpa.dto.AdminDTO; import hackathon.FrisbYEE.jpa.dto.AdminDTO;
import hackathon.FrisbYEE.jpa.dto.CoachDTO;
import hackathon.FrisbYEE.jpa.metier.Admin; import hackathon.FrisbYEE.jpa.metier.Admin;
import hackathon.FrisbYEE.jpa.metier.Coach;
import hackathon.FrisbYEE.jpa.service.AdminDAO; import hackathon.FrisbYEE.jpa.service.AdminDAO;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
@RestController @RestController
@RequestMapping("/admin") @RequestMapping("/admin")
@@ -21,6 +25,18 @@ public class AdminResource {
@Autowired @Autowired
private AdminDAO adminDAO; private AdminDAO adminDAO;
@PostMapping("/create")
@PreAuthorize("hasRole('Admin')") // Only admin can create
public ResponseEntity<AdminDTO> create(@RequestBody AdminDTO dto) {
Admin admin = mapToEntity(dto);
if(adminDAO.findByKeycloakId(admin.getKeycloakId()).isPresent()) {
return ResponseEntity.status(200).body(mapToDTO(adminDAO.findByKeycloakId(admin.getKeycloakId()).get()));
}
adminDAO.save(admin);
return ResponseEntity.status(201).body(mapToDTO(admin));
}
@GetMapping("/{id}") @GetMapping("/{id}")
@PreAuthorize("hasRole('admin')") @PreAuthorize("hasRole('admin')")
public ResponseEntity<AdminDTO> getAdmin(@PathVariable Integer id) { public ResponseEntity<AdminDTO> getAdmin(@PathVariable Integer id) {
@@ -45,4 +61,15 @@ public class AdminResource {
return dto; return dto;
} }
private Admin mapToEntity(AdminDTO dto) {
Admin admin = new Admin();
admin.setId(dto.getId());
admin.setKeycloakId(dto.getId_keycloak());
admin.setName(dto.getName());
admin.setPrenom(dto.getPrenom());
admin.setRole(dto.getRole());
return admin;
}
} }

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

@@ -93,15 +93,16 @@ public class CoachResource {
dto.setId(coach.getId()); dto.setId(coach.getId());
dto.setId_keycloak(coach.getKeycloakId()); dto.setId_keycloak(coach.getKeycloakId());
dto.setName(coach.getName()); dto.setName(coach.getName());
dto.setPrenom(coach.getPrenom());
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.setKeycloakId(dto.getId_keycloak()); coach.setKeycloakId(dto.getId_keycloak());
coach.setName(dto.getName()); coach.setName(dto.getName());
coach.setRole(hackathon.FrisbYEE.jpa.metier.Role.coach); coach.setRole(hackathon.FrisbYEE.jpa.metier.Role.coach);
coach.setPrenom(dto.getPrenom());
return coach; return coach;
} }
} }