continuing on new design

Author: Hattinger04

src/main/java/io/github/Hattinger04/course/CourseController.java

@@ -21,8 +21,6 @@
 @RequestMapping("/USER")
 public class CourseController {
 
-	@Autowired
-	private UserService userService;
 	@Autowired
 	private CourseService courseService;
 	@Autowired
@@ -33,21 +31,22 @@ public class CourseController {
 
 	/**
 	 * Get all students in Course from database
-	 * Needs Course name 
+	 * Needs course object 
 	 * 
 	 * @param json
 	 * @return
 	 */
 	@PreAuthorize("hasAuthority('USER')")
 	@PostMapping("/getAllStudents")
 	@ResponseBody
-	public ResponseEntity<?> getAllStudents() {
-		return new ResponseEntity<>(courseService.getAllStudents(), HttpStatus.OK); 
+	public ResponseEntity<?> getAllStudents(@RequestBody String json) {
+		Course course = (Course) restServices.deserialize(Course.class, json);
+		return new ResponseEntity<>(courseService.getAllStudents(course), HttpStatus.OK); 
 	}
 
 	/**
 	 * Create a new Course
-	 * Needs Course name
+	 * Needs course object
 	 * 
 	 * @param json
 	 * @return
@@ -56,13 +55,13 @@ public ResponseEntity<?> getAllStudents() {
 	@PutMapping("/createCourse")
 	@ResponseBody
 	public ResponseEntity<?> createCourse(@RequestBody String json) {
-//		courseService.createCourse((Course) restServices.deserialize(Course.class, json););
+//		courseService.createCourse((Course) restServices.deserialize(Course.class, json));
 		return new ResponseEntity<>(HttpStatus.OK);
 	}
 
 	/**
 	 * Deletes a existing Course
-	 * Needs Course name
+	 * Needs course object
 	 * 
 	 * @param json
 	 * @return
@@ -77,7 +76,7 @@ public ResponseEntity<?> deleteCourse(@RequestBody String json) {
 
 	/**
 	 * Adds student to existing Course
-	 * Needs Course name + student name
+	 * Needs course object + student object
 	 * 
 	 * @param json
 	 * @return
@@ -92,7 +91,7 @@ public ResponseEntity<?> addStudentCourse(@RequestBody String json) {
 
 	/**
 	 * Removes student from Course
-	 * Needs Course name + student name 
+	 * Needs course object + student object 
 	 * 
 	 * @param json
 	 * @return
@@ -107,7 +106,7 @@ public ResponseEntity<?> removeStudentCourse(@RequestBody String json) {
 
 	/**
 	 * Creates a new exercise in a existing Course 
-	 * Needs Course name + exercise object 
+	 * Needs course object + exercise object 
 	 * 
 	 * @param json
 	 * @return
@@ -122,7 +121,7 @@ public ResponseEntity<?> createExercise(@RequestBody String json) {
 
 	/**
 	 * Changes already existing (and published) exercises
-	 * Needs Course name + exercise object
+	 * Needs course object + exercise object
 	 * 
 	 * @param json
 	 * @return
@@ -137,7 +136,7 @@ public ResponseEntity<?> patchExercise(@RequestBody String json) {
 
 	/**
 	 * Deletes existing exercise 
-	 * Needs Course name + exercise name
+	 * Needs course object + exercise object
 	 * 
 	 * @param json
 	 * @return
@@ -152,7 +151,7 @@ public ResponseEntity<?> deleteExercise(@RequestBody String json) {
 
 	/**
 	 * Gives a rating to an exercise for one student
-	 * Needs Course name + exercise name + student name 
+	 * Needs course object + exercise object + student object 
 	 * 
 	 * @param json
 	 * @return

src/main/java/io/github/Hattinger04/course/model/CourseService.java

@@ -12,6 +12,8 @@
 import io.github.Hattinger04.course.model.exercise.ExerciseRepository;
 import io.github.Hattinger04.course.model.solution.Solution;
 import io.github.Hattinger04.course.model.solution.SolutionRepository;
+import io.github.Hattinger04.course.model.student.Student;
+import io.github.Hattinger04.course.model.teacher.Teacher;
 import io.github.Hattinger04.user.model.User;
 
 @Service
@@ -45,28 +47,48 @@ public Course getCourseByName(String name) {
 		return courseRepository.findByName(name); 
 	}
 
-	public List<Student> getAllStudents() {
-		// TODO: Get all students
-		return null;
+	public List<Student> getAllStudents(Course course) {
+		return courseRepository.getAllStudents(course.getId());
+	}
+	
+	public Teacher getCourseTeacher(Course course) {
+		// TODO
+		return null; 
+	}
+	
+	public void setCourseTeacher(Course course, Teacher teacher) {
+		
 	}
 
 	// TODO: working with student / teacher table 
-	public void addStudentToCourse(Course course, User student) {
+	public void addStudentToCourse(Course course, Student student) {
 
 	}
 
-	public void addStudentsToCourse(Course course, Set<User> student) {
+	public void addStudentsToCourse(Course course, Set<Student> student) {
 
 	}
 
-	public void removeStudentFromCourse(Course course, User student) {
+	public void removeStudentFromCourse(Course course, Student student) {
 
 	}
 
-	public void removeStudentsFromCourse(Course course, Set<User> student) {
+	public void removeStudentsFromCourse(Course course, Set<Student> student) {
 
 	}
 
+	public boolean isUserTeacher(Course course, User user) {
+		if(isUserInCourse(course, user)) {
+			// TODO
+			return true; 
+		}
+		return false; 
+	}
+	
+	public boolean isUserInCourse(Course course, User user) {
+		// TODO
+		return false; 
+	}
 
 	public Exercise createExercise(Exercise exercise) {
 		return exerciseRepository.save(exercise); 

src/main/java/io/github/Hattinger04/course/model/course/CourseRepository.java

@@ -1,10 +1,18 @@
 package io.github.Hattinger04.course.model.course;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import io.github.Hattinger04.course.model.student.Student;
+
 @Repository
 public interface CourseRepository extends JpaRepository<Course, Long>{
 	Course findById(int id);
-	Course findByName(String name); 
+	Course findByName(String name);
+	// TODO: SQL not tested yet!
+	@Query(value = "SELECT * FROM STUDENTS s JOIN USER u using(user_id) JOIN course c using(course_id, user_id) where c.course_id=:course_id", nativeQuery = true)
+	List<Student> getAllStudents(int course_id); 
 }

…ub/Hattinger04/course/model/Student.java …nger04/course/model/student/Student.javasrc/main/java/io/github/Hattinger04/course/model/Student.java renamed to src/main/java/io/github/Hattinger04/course/model/student/Student.java src/main/java/io/github/Hattinger04/course/model/Student.java renamed to src/main/java/io/github/Hattinger04/course/model/student/Student.java

@@ -1,4 +1,4 @@
-package io.github.Hattinger04.course.model;
+package io.github.Hattinger04.course.model.student;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/io/github/Hattinger04/course/model/student/StudentRepository.java

@@ -0,0 +1,7 @@
+package io.github.Hattinger04.course.model.student;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface StudentRepository extends JpaRepository<Student, Long>{
+	Student findById(int id);
+}

…ub/Hattinger04/course/model/Teacher.java …nger04/course/model/teacher/Teacher.javasrc/main/java/io/github/Hattinger04/course/model/Teacher.java renamed to src/main/java/io/github/Hattinger04/course/model/teacher/Teacher.java src/main/java/io/github/Hattinger04/course/model/Teacher.java renamed to src/main/java/io/github/Hattinger04/course/model/teacher/Teacher.java

@@ -1,4 +1,4 @@
-package io.github.Hattinger04.course.model;
+package io.github.Hattinger04.course.model.teacher;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/io/github/Hattinger04/course/model/teacher/TeacherRepository.java

@@ -0,0 +1,7 @@
+package io.github.Hattinger04.course.model.teacher;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TeacherRepository extends JpaRepository<Teacher, Long>{
+	Teacher findById(int id); 
+}