fixing

Author: Hattinger04

src/main/java/io/github/Hattinger04/RestServices.java

@@ -31,7 +31,6 @@ public Object deserialize(Class<?> c, String json) {
 	 * Convert JSON-String with multiple different classes to multiple objects
 	 * Convention: list the classes in an alphabetic sequence 
 	 * 
-	 * @param <T>
 	 * @param c
 	 * @param json
 	 * @return

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

@@ -20,6 +20,7 @@
 import io.github.Hattinger04.course.model.exercise.Exercise;
 import io.github.Hattinger04.course.model.student.Student;
 import io.github.Hattinger04.course.model.teacher.Teacher;
+import io.github.Hattinger04.user.model.User;
 
 @RestController
 @RequestMapping("/course")
@@ -62,7 +63,7 @@ public ResponseEntity<?> getStudentByID(@RequestBody String json) {
 	@ResponseBody
 	public ResponseEntity<?> getAllStudents(@RequestBody String json) {
 		Course course = (Course) restServices.deserialize(Course.class, json);
-		List<Student> students; 
+		List<User> students; 
 		if((students = courseService.getAllStudents(course)) == null) {
 			return new ResponseEntity<>("Course not existing or no users in course!", HttpStatus.NOT_FOUND);
 		}
@@ -81,7 +82,7 @@ public ResponseEntity<?> getAllStudents(@RequestBody String json) {
 	@ResponseBody
 	public ResponseEntity<?> getCourseTeacher(@RequestBody String json) {
 		Course course = (Course) restServices.deserialize(Course.class, json);
-		Teacher teacher; 
+		User teacher; 
 		if((teacher = courseService.getCourseTeacher(course)) == null) {
 			return new ResponseEntity<>("Teacher is not in course!", HttpStatus.NOT_FOUND);
 		}

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

@@ -69,11 +69,11 @@ public Student getStudent(Course course, Student student) {
 		return s;
 	}
 
-	public List<Student> getAllStudents(Course course) {
+	public List<User> getAllStudents(Course course) {
 		return courseRepository.getAllStudents(course.getId());
 	}
 
-	public Teacher getCourseTeacher(Course course) {
+	public User getCourseTeacher(Course course) {
 		return courseRepository.getCourseTeacher(course.getId());
 	}
 

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

@@ -10,20 +10,19 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import io.github.Hattinger04.course.model.student.Student;
-import io.github.Hattinger04.course.model.teacher.Teacher;
+import io.github.Hattinger04.user.model.User;
 
 @Repository
 public interface CourseRepository extends JpaRepository<Course, Long>{
 	Course findById(int id);
 	Course findByName(String name);
 	// TODO: SQL not tested yet!
 
-	@Query(value = "SELECT * FROM TEACHER t JOIN USER u using(user_id) JOIN course c using(course_id, user_id) where c.course_id=:course_id", nativeQuery = true)
-	Teacher getCourseTeacher(int course_id); 
+	@Query(value = "SELECT user_id, username FROM USER u JOIN TEACHER t using(user_id) JOIN course c using(course_id, user_id) where c.course_id=:course_id", nativeQuery = true)
+	User getCourseTeacher(int course_id); 
 
-	@Query(value = "SELECT * FROM STUDENT 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); 
+	@Query(value = "SELECT user_id, username FROM USER u JOIN STUDENT s using(user_id) JOIN course c using(course_id, user_id) where c.course_id=:course_id", nativeQuery = true)
+	List<User> getAllStudents(int course_id); 
 
 	@Modifying
 	@Query(value = "insert into user_course where user_id = :user_id and course_id=:course_id", nativeQuery = true)

src/main/java/io/github/Hattinger04/course/model/exercise/Exercise.java

@@ -28,8 +28,7 @@
 @AllArgsConstructor
 @ToString
 @JsonTypeInfo(include=As.WRAPPER_OBJECT, use=com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property="type")
-@JsonTypeName("course") 
-
+@JsonTypeName("exercise") 
 public class Exercise {
 
 	public Exercise(Course course, String name) {

src/main/java/io/github/Hattinger04/course/model/solution/Solution.java

@@ -29,8 +29,7 @@
 @AllArgsConstructor
 @ToString
 @JsonTypeInfo(include=As.WRAPPER_OBJECT, use=com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property="type")
-@JsonTypeName("course") 
-
+@JsonTypeName("solution") 
 public class Solution {
 
 	public Solution(Exercise exercise, String text) {

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

@@ -28,7 +28,7 @@
 @AllArgsConstructor
 @ToString
 @JsonTypeInfo(include=As.WRAPPER_OBJECT, use=com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property="type")
-@JsonTypeName("course") 
+@JsonTypeName("teacher") 
 public class Teacher {
 
 	@Id