Max/Backend/CoursesEndpoints (#129)
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Build and test backend / Build-backend (push) Successful in 2m16s
				
			
		
			
				
	
				Build and test backend / Test-backend (push) Successful in 1m24s
				
			
		
			
				
	
				deploy to production / deploy-frontend (push) Successful in 26s
				
			
		
			
				
	
				deploy to production / deploy-backend (push) Successful in 2m22s
				
			
		
			
				
	
				Build and test FrontEnd / Build-frontend (push) Successful in 26s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Build and test backend / Build-backend (push) Successful in 2m16s
				
			Build and test backend / Test-backend (push) Successful in 1m24s
				
			deploy to production / deploy-frontend (push) Successful in 26s
				
			deploy to production / deploy-backend (push) Successful in 2m22s
				
			Build and test FrontEnd / Build-frontend (push) Successful in 26s
				
			PLZ FIX Reviewed-on: #129 Reviewed-by: Wal <karpinskiwal@gmail.com> Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com> Co-authored-by: Bartha Maxime <231026@umons.ac.be> Co-committed-by: Bartha Maxime <231026@umons.ac.be>
This commit is contained in:
		| @ -0,0 +1,80 @@ | ||||
| package ovh.herisson.Clyde.EndPoints; | ||||
|  | ||||
| import org.springframework.http.HttpStatus; | ||||
| import org.springframework.http.ResponseEntity; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import ovh.herisson.Clyde.Responses.UnauthorizedResponse; | ||||
| import ovh.herisson.Clyde.Services.AuthenticatorService; | ||||
| import ovh.herisson.Clyde.Services.CourseService; | ||||
| import ovh.herisson.Clyde.Services.TeacherCourseService; | ||||
| import ovh.herisson.Clyde.Tables.Course; | ||||
| import ovh.herisson.Clyde.Tables.Role; | ||||
| import ovh.herisson.Clyde.Tables.TeacherCourse; | ||||
| import ovh.herisson.Clyde.Tables.User; | ||||
|  | ||||
| import java.util.ArrayList; | ||||
| import java.util.Map; | ||||
|  | ||||
| @RestController | ||||
| @CrossOrigin(originPatterns = "*", allowCredentials = "true") | ||||
| public class CourseController { | ||||
|  | ||||
|     private final CourseService courseServ; | ||||
|  | ||||
|     private final TeacherCourseService teacherCourseServ; | ||||
|  | ||||
|     private final AuthenticatorService authServ; | ||||
|  | ||||
|     public CourseController(CourseService courseServ, TeacherCourseService teacherCourseServ, AuthenticatorService authServ) { | ||||
|         this.courseServ = courseServ; | ||||
|         this.teacherCourseServ = teacherCourseServ; | ||||
|         this.authServ = authServ; | ||||
|     } | ||||
|  | ||||
|     @GetMapping("/course/{id}") | ||||
|     public ResponseEntity<Course> getCourse(@RequestHeader("Authorization") String token, @PathVariable long id){ | ||||
|         if (authServ.getUserFromToken(token) == null) | ||||
|             return new UnauthorizedResponse<>(null); | ||||
|  | ||||
|         return new ResponseEntity<>(courseServ.findById(id), HttpStatus.OK); | ||||
|     } | ||||
|  | ||||
|  | ||||
|     @PostMapping("/course") | ||||
|     public ResponseEntity<Course> postCourse(@RequestHeader("Authorization") String token, @RequestBody Course course){ | ||||
|         if (authServ.isNotSecretaryOrAdmin(token)) | ||||
|             return new UnauthorizedResponse<>(null); | ||||
|  | ||||
|         return new ResponseEntity<>(courseServ.save(course), HttpStatus.CREATED); | ||||
|     } | ||||
|  | ||||
|  | ||||
|     @PatchMapping("/course/{id}") | ||||
|     public ResponseEntity<Course> patchCourse(@RequestHeader("Authorization") String token, | ||||
|                                               @RequestBody Map<String,Object> updates, | ||||
|                                               @PathVariable long id) | ||||
|     { | ||||
|  | ||||
|         if (authServ.IsNotIn(new Role[]{Role.Admin,Role.Teacher,Role.Secretary}, token)){ | ||||
|             return new UnauthorizedResponse<>(null); | ||||
|         } | ||||
|  | ||||
|         return new ResponseEntity<>(courseServ.modifyData(id, updates, authServ.getUserFromToken(token).getRole()), HttpStatus.OK); | ||||
|     } | ||||
|  | ||||
|     @PostMapping("/course/{id}") | ||||
|     public ResponseEntity<String> postTeachers(@RequestHeader("Authorization") String token, | ||||
|                                                @RequestBody Iterable<Long> teacherIds, | ||||
|                                                @PathVariable Long id) | ||||
|     { | ||||
|         if (authServ.IsNotIn(new Role[]{Role.Admin,Role.Secretary}, token)) | ||||
|             return new UnauthorizedResponse<>(null); | ||||
|  | ||||
|  | ||||
|  | ||||
|         teacherCourseServ.saveAll(teacherIds,courseServ.findById(id)); | ||||
|         return new ResponseEntity<>(HttpStatus.OK); | ||||
|  | ||||
|     } | ||||
|  | ||||
| } | ||||
| @ -15,6 +15,7 @@ import ovh.herisson.Clyde.Tables.User; | ||||
| import java.util.Map; | ||||
|  | ||||
| @RestController | ||||
| @CrossOrigin(originPatterns = "*", allowCredentials = "true") | ||||
| public class CurriculumController { | ||||
|  | ||||
|  | ||||
| @ -43,4 +44,17 @@ public class CurriculumController { | ||||
|     public ResponseEntity<Iterable<CurriculumCourse>> findAll(){ | ||||
|         return new ResponseEntity<>(curriculumCourseServ.findAll(),HttpStatus.OK); | ||||
|     } | ||||
|  | ||||
|     /**@PostMapping("/curriculum") //todo now | ||||
|     public ResponseEntity<String> postCurriculum(@RequestHeader("Authorization") String token,@RequestBody Curriculum curriculum){ | ||||
|  | ||||
|         if (!isSecretaryOrAdmin(token)){ | ||||
|             return new UnauthorizedResponse<>("you're not allowed to post a Curriculum"); | ||||
|         } | ||||
|  | ||||
|         CurriculumServ.save(Curriculum); | ||||
|  | ||||
|         return new ResponseEntity<>("created !",HttpStatus.CREATED); | ||||
|     }**/ | ||||
|  | ||||
| } | ||||
|  | ||||
| @ -47,6 +47,6 @@ public class LoginController { | ||||
|     @PostMapping("/request/register") | ||||
|     public ResponseEntity<String> register(@RequestBody InscriptionRequest inscriptionRequest){ | ||||
|         authServ.register(inscriptionRequest); | ||||
|         return new ResponseEntity<>("Is OK", HttpStatus.OK); | ||||
|         return new ResponseEntity<>("Is OK", HttpStatus.CREATED); | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -68,10 +68,10 @@ public class MockController { | ||||
|         curriculumService.save(psychologyBab1); | ||||
|  | ||||
|  | ||||
|         Course progra1 = new Course(5,"Programmation et algorithimque 1","TODO DELETE"); | ||||
|         Course chemistry1 = new Course(12, "Thermochimie","TODO DELETE"); | ||||
|         Course psycho1 = new Course(21, "rien faire t'as cru c'est psycho", "TODO DELETE"); | ||||
|         Course commun = new Course(2, "cours commun","TODO DELETE"); | ||||
|         Course progra1 = new Course(5,"Programmation et algorithimque 1",joke); | ||||
|         Course chemistry1 = new Course(12, "Thermochimie",joke); | ||||
|         Course psycho1 = new Course(21, "rien faire t'as cru c'est psycho",joke); | ||||
|         Course commun = new Course(2, "cours commun",joke); | ||||
|  | ||||
|         courseService.save(progra1); | ||||
|         courseService.save(chemistry1); | ||||
|  | ||||
| @ -0,0 +1,8 @@ | ||||
| package ovh.herisson.Clyde.Repositories; | ||||
|  | ||||
|  | ||||
| import org.springframework.data.repository.CrudRepository; | ||||
| import ovh.herisson.Clyde.Tables.TeacherCourse; | ||||
|  | ||||
| public interface TeacherCourseRepository extends CrudRepository<TeacherCourse, Long> { | ||||
| } | ||||
| @ -50,5 +50,18 @@ public class AuthenticatorService { | ||||
|         return poster.getRole() != Role.Secretary || poster.getRole() != Role.Admin; | ||||
|     } | ||||
|  | ||||
|     public boolean IsNotIn(Role[] roles, String token){ | ||||
|         if (token == null) | ||||
|             return true; | ||||
|  | ||||
|         User poster = getUserFromToken(token); | ||||
|         if (poster == null) return true; | ||||
|  | ||||
|         for (Role r:roles){ | ||||
|             if (poster.getRole() == r) | ||||
|                 return false; | ||||
|         } | ||||
|         return true; | ||||
|     } | ||||
| } | ||||
|  | ||||
|  | ||||
| @ -3,6 +3,10 @@ package ovh.herisson.Clyde.Services; | ||||
| import org.springframework.stereotype.Service; | ||||
| import ovh.herisson.Clyde.Repositories.CourseRepository; | ||||
| import ovh.herisson.Clyde.Tables.Course; | ||||
| import ovh.herisson.Clyde.Tables.Role; | ||||
| import ovh.herisson.Clyde.Tables.User; | ||||
|  | ||||
| import java.util.Map; | ||||
|  | ||||
| @Service | ||||
| public class CourseService { | ||||
| @ -13,11 +17,39 @@ public class CourseService { | ||||
|         this.courseRepo = courseRepo; | ||||
|     } | ||||
|  | ||||
|     public void save(Course course){ | ||||
|         courseRepo.save(course); | ||||
|     public Course save(Course course){ | ||||
|         return courseRepo.save(course); | ||||
|     } | ||||
|  | ||||
|     public Course findById(long id){ | ||||
|         return courseRepo.findById(id); | ||||
|     } | ||||
|  | ||||
|     public Course modifyData(long id, Map<String, Object> updates, Role role) { | ||||
|         Course target = courseRepo.findById(id); | ||||
|  | ||||
|         if (role == Role.Teacher){ | ||||
|             for (Map.Entry<String, Object> entry : updates.entrySet()){ | ||||
|                 if (entry.getKey().equals("title")){ | ||||
|                     target.setTitle((String) entry.getValue()); | ||||
|                     return courseRepo.save(target); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         for (Map.Entry<String ,Object> entry: updates.entrySet()){ | ||||
|             switch (entry.getKey()){ | ||||
|                 case "title": | ||||
|                     target.setTitle((String) entry.getValue()); | ||||
|                     break; | ||||
|                 case "credits": | ||||
|                     target.setCredits((Integer) entry.getValue()); | ||||
|                     break; | ||||
|                 case "owner": | ||||
|                     target.setOwner((User) entry.getValue()); //todo check if is a teacher ! | ||||
|                     break; | ||||
|             } | ||||
|         } | ||||
|         return courseRepo.save(target); | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -0,0 +1,39 @@ | ||||
| package ovh.herisson.Clyde.Services; | ||||
|  | ||||
| import org.springframework.stereotype.Controller; | ||||
| import ovh.herisson.Clyde.Repositories.TeacherCourseRepository; | ||||
| import ovh.herisson.Clyde.Repositories.UserRepository; | ||||
| import ovh.herisson.Clyde.Tables.Course; | ||||
| import ovh.herisson.Clyde.Tables.TeacherCourse; | ||||
| import ovh.herisson.Clyde.Tables.User; | ||||
|  | ||||
| import java.util.ArrayList; | ||||
|  | ||||
| @Controller | ||||
| public class TeacherCourseService { | ||||
|     private final TeacherCourseRepository teacherCourseRepo; | ||||
|  | ||||
|     private final UserRepository userRepo; | ||||
|  | ||||
|     public TeacherCourseService(TeacherCourseRepository teacherCourseRepo, UserRepository userRepo) { | ||||
|         this.teacherCourseRepo = teacherCourseRepo; | ||||
|         this.userRepo = userRepo; | ||||
|     } | ||||
|  | ||||
|     public boolean saveAll(Iterable<Long> teacherIds, Course course){ | ||||
|  | ||||
|         ArrayList<Long> addedIds = new ArrayList<>(); | ||||
|         for (Long teacherId : teacherIds){ | ||||
|             User teacher = userRepo.findById((long) teacherId); | ||||
|             if ( teacher== null){ | ||||
|                 return false; | ||||
|             } | ||||
|             if (!addedIds.contains(teacherId)) | ||||
|             { | ||||
|                 teacherCourseRepo.save(new TeacherCourse(teacher,course)); | ||||
|                 addedIds.add(teacherId); | ||||
|             } | ||||
|         } | ||||
|         return true; | ||||
|     } | ||||
| } | ||||
| @ -1,9 +1,6 @@ | ||||
| package ovh.herisson.Clyde.Tables; | ||||
|  | ||||
| import jakarta.persistence.Entity; | ||||
| import jakarta.persistence.GeneratedValue; | ||||
| import jakarta.persistence.GenerationType; | ||||
| import jakarta.persistence.Id; | ||||
| import jakarta.persistence.*; | ||||
|  | ||||
| @Entity | ||||
| public class Course { | ||||
| @ -12,12 +9,15 @@ public class Course { | ||||
|     private int courseID; | ||||
|     private int credits; | ||||
|     private String title; | ||||
|     private String faculty; | ||||
|  | ||||
|     public Course(int credits, String title, String faculty){ | ||||
|     @ManyToOne(fetch = FetchType.EAGER) | ||||
|     @JoinColumn(name = "Users") | ||||
|     private User owner; | ||||
|  | ||||
|     public Course(int credits, String title, User owner){ | ||||
|         this.credits = credits; | ||||
|         this.title = title; | ||||
|         this.faculty = faculty; | ||||
|         this.owner = owner; | ||||
|     } | ||||
|  | ||||
|     public Course() {} | ||||
| @ -34,14 +34,6 @@ public class Course { | ||||
|         this.credits = credits; | ||||
|     } | ||||
|  | ||||
|     public String getFaculty() { | ||||
|         return faculty; | ||||
|     } | ||||
|  | ||||
|     public void setFaculty(String faculty){ | ||||
|         this.faculty = faculty; | ||||
|     } | ||||
|  | ||||
|     public String getTitle() { | ||||
|         return title; | ||||
|     } | ||||
| @ -49,4 +41,12 @@ public class Course { | ||||
|     public void setTitle(String title){ | ||||
|         this.title = title; | ||||
|     } | ||||
|  | ||||
|     public User getOwner() { | ||||
|         return owner; | ||||
|     } | ||||
|  | ||||
|     public void setOwner(User owner) { | ||||
|         this.owner = owner; | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -3,30 +3,26 @@ package ovh.herisson.Clyde.Tables; | ||||
| import jakarta.persistence.*; | ||||
| 
 | ||||
| @Entity | ||||
| public class TeacherGivenCourse { | ||||
| public class TeacherCourse { | ||||
|     @Id | ||||
|     @GeneratedValue(strategy = GenerationType.AUTO) | ||||
|     private int id; | ||||
| 
 | ||||
|     @ManyToOne(fetch = FetchType.LAZY) | ||||
|     @ManyToOne(fetch = FetchType.EAGER) | ||||
|     @JoinColumn(name = "Users") | ||||
|     private User user; | ||||
| 
 | ||||
| 
 | ||||
|     @ManyToOne(fetch = FetchType.LAZY) | ||||
|     @ManyToOne(fetch = FetchType.EAGER) | ||||
|     @JoinColumn(name = "Course") | ||||
|     private Course course; | ||||
| 
 | ||||
|     //This flag helps make the difference between an assistant or a Teacher (who owns the course) | ||||
|     private boolean owned; | ||||
| 
 | ||||
|     public TeacherGivenCourse(User user, Course course, boolean owned){ | ||||
|     public TeacherCourse(User user, Course course){ | ||||
|         this.user = user; | ||||
|         this.course = course; | ||||
|         this.owned = owned; | ||||
|     } | ||||
| 
 | ||||
|     public TeacherGivenCourse() {} | ||||
|     public TeacherCourse() {} | ||||
| 
 | ||||
|     public int getId() { | ||||
|         return id; | ||||
| @ -48,11 +44,4 @@ public class TeacherGivenCourse { | ||||
|         this.course = course; | ||||
|     } | ||||
| 
 | ||||
|     public boolean isOwned() { | ||||
|         return owned; | ||||
|     } | ||||
| 
 | ||||
|     public void setOwned(boolean owned) { | ||||
|         this.owned = owned; | ||||
|     } | ||||
| } | ||||
		Reference in New Issue
	
	Block a user