PGL/Clyde
3
2
Fork 3
Code Issues 13 Pull Requests Actions Projects 3 Releases 2 Wiki Activity

Requests Functionnal

Browse Source
This commit is contained in:
Wawilski
2024-04-19 23:59:30 +02:00
parent bd1c236635
commit 0ffc8077db
8 changed files with 85 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/main/java/ovh/herisson/Clyde/EndPoints/LessonRequestsController.java
View File

@ -59,10 +59,13 @@ public class LessonRequestsController {
}
@PostMapping("/requests/lessonRequest")
public ResponseEntity<Map<String, Object>> makeRequest(@RequestBody LessonChangesRequest lessonRequest){
System.out.println(lessonRequest.getLesson());
System.out.println(lessonRequest.getLessonEnd());
LessonChangesRequest lessonChangesRequest = lessonRequestServ.save(lessonRequest);
public ResponseEntity<Map<String, Object>> makeRequest(@RequestHeader("Authorization") String token, @RequestBody Map<String,Object> lessonRequestInfos){
if(authServ.isNotIn(new Role[]{Role.Admin,Role.Teacher},token))
return new UnauthorizedResponse<>(null);
LessonChangesRequest lessonChangesRequest = lessonRequestServ.createLessonRequest(lessonRequestInfos);
LessonChangesRequest createdRequest = lessonRequestServ.save(lessonChangesRequest);
if(createdRequest == null)
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
return new ResponseEntity<>(ProtectionService.lessonRequestWithoutPassword(lessonChangesRequest),HttpStatus.OK);
}
@ -98,13 +101,13 @@ public class LessonRequestsController {
infos.put("lessonStart", lessonRequest.getLessonStart());
infos.put("lessonEnd", lessonRequest.getLessonEnd());
infos.put("lessonType",lessonRequest.getLessonType());
if(!lessonRequestServ.modifyChangeRequestState(infos,lessonRequest.getLesson(),state))
if(!lessonRequestServ.modifyChangeRequestState(infos,lessonRequest.getLessonId(),state))
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
lessonRequest.setState(state);
}
else{
lessonRequestServ.modifyDeleleRequest(lessonRequest, state);
lessonRequestServ.modifyDeleteRequest(lessonRequest, state);
}
lessonRequestServ.save(lessonRequest);
return new ResponseEntity<>(HttpStatus.OK);