FINAL WITHOUT CLEAN
This commit is contained in:
		@ -108,6 +108,8 @@ public class LessonRequestsController {
 | 
			
		||||
 | 
			
		||||
        else{
 | 
			
		||||
            lessonRequestServ.modifyDeleteRequest(lessonRequest, state);
 | 
			
		||||
            lessonRequest.setState(state);
 | 
			
		||||
              
 | 
			
		||||
        }
 | 
			
		||||
        lessonRequestServ.save(lessonRequest);
 | 
			
		||||
        return new ResponseEntity<>(HttpStatus.OK);
 | 
			
		||||
 | 
			
		||||
@ -7,8 +7,11 @@ import ovh.herisson.Clyde.Tables.User;
 | 
			
		||||
 | 
			
		||||
public interface LessonChangesRequestRepository extends CrudRepository<LessonChangesRequest, Long> {
 | 
			
		||||
    LessonChangesRequest findById(long id);
 | 
			
		||||
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    @Query("select lr from LessonChangesRequest lr where lr.user = ?1")
 | 
			
		||||
    Iterable<LessonChangesRequest> findOwnRequests(User user);
 | 
			
		||||
 | 
			
		||||
    @Query("select lr from LessonChangesRequest lr where lr.lessonId = ?1")
 | 
			
		||||
    Iterable<LessonChangesRequest> findRequestByLessonId(long id);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -74,6 +74,17 @@ public class LessonRequestService {
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public Iterable<LessonChangesRequest> findRequestByLessonId(long id){
 | 
			
		||||
      return lessonChangesRepo.findRequestByLessonId(id);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void refuseAllByLessonId(long id){
 | 
			
		||||
      Iterable<LessonChangesRequest> toRefuse = findRequestByLessonId(id);
 | 
			
		||||
      for(LessonChangesRequest element : toRefuse)
 | 
			
		||||
        element.setState(RequestState.Refused);
 | 
			
		||||
        
 | 
			
		||||
  } 
 | 
			
		||||
 | 
			
		||||
    public boolean modifyChangeRequestState(Map<String, Object> updates, long lessonId,RequestState state){
 | 
			
		||||
        if(state == RequestState.Accepted){
 | 
			
		||||
 | 
			
		||||
@ -87,7 +98,8 @@ public class LessonRequestService {
 | 
			
		||||
    public void modifyDeleteRequest(LessonChangesRequest lessonChangesRequest, RequestState state){
 | 
			
		||||
        if(state == RequestState.Accepted){
 | 
			
		||||
            lessonServ.delete(lessonServ.findById(lessonChangesRequest.getLessonId()));
 | 
			
		||||
            lessonChangesRequest.setState(state);}
 | 
			
		||||
            refuseAllByLessonId(lessonChangesRequest.getLessonId());
 | 
			
		||||
            }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public LessonChangesRequest createLessonRequest(Map<String,Object> lessonInfos) {
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user