adding / correcting function

Author: Hattinger04

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

@@ -8,9 +8,9 @@
 import io.github.Hattinger04.course.model.course.CourseRepository;
 import io.github.Hattinger04.course.model.exercise.Exercise;
 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.user.model.User;
-import io.github.Hattinger04.user.model.UserRepository;
 
 public class CourseService {
 
@@ -30,8 +30,7 @@ public CourseService(CourseRepository courseRepository, ExerciseRepository exerc
 
 	public Course createCourse(String name) {
 		Course course = new Course(name); 
-		courseRepository.save(course); 
-		return course; 
+		return courseRepository.save(course); 
 	}
 
 	public void deleteCourse(String name) {
@@ -46,6 +45,7 @@ public Course getCourseByName(String name) {
 		return courseRepository.findByName(name); 
 	}
 
+	// TODO: working with student / teacher table 
 	public void addStudentToCourse(Course course, User student) {
 
 	}
@@ -62,21 +62,53 @@ public void removeStudentsFromCourse(Course course, Set<User> student) {
 
 	}
 
-	public Exercise getExerciseByID(int id) {
-		return exerciseRepository.findById(id); 
-	}
-		
+	
 	// wont work like that ofc
 	public Exercise createExercise(Integer course_id, String name) {
 		Exercise exercise = new Exercise(course_id, name);
-		exerciseRepository.save(exercise); 
-		return exercise; 
+		return exerciseRepository.save(exercise); 
+	}
+	
+	public Exercise getExerciseByID(int id) {
+		return exerciseRepository.findById(id); 
+	}
+	/**
+	 * Get exercise by course_id and course name 
+	 * 
+	 * @param course_id
+	 * @param name
+	 * @return
+	 */
+	public Exercise getExerciseByCourse(int course_id, String name) {
+		return exerciseRepository.findByCourse(course_id, name); 
 	}
 
 	public void deleteExercise(Integer course_id, String name) {
 		exerciseRepository.delete(exerciseRepository.findByCourse(course_id, name));
 	}
 
-	// TODO: students submitting solution
+	
+	public Solution createSolution(int exercise_id, String text) {
+		Solution solution = new Solution(exercise_id, text); 
+		return solutionRepository.save(solution); 
+	}
+	
+	public Solution getSolutionByID(int id) {
+		return solutionRepository.findById(id); 
+	}
+	/**
+	 * Get solution by exercise_id and exercise name 
+	 * 
+	 * @param exercise_id
+	 * @param name
+	 * @return
+	 */
+	public Solution getSolutionByExercise(int exercise_id, String name) {
+		return solutionRepository.findByExercise(exercise_id, name);
+	}
+	
+	public void deleteSolution(int id) {
+		solutionRepository.delete(solutionRepository.findById(id));
+	}
 	// TODO: teacher correcting students work 
 }

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

@@ -10,6 +10,6 @@ public interface ExerciseRepository extends JpaRepository<Exercise, Long>{
 
 	Exercise findById(int id); 
 	// TODO: SQL not tested yet!
-	@Query(value = "SELECT * FROM EXERCISE e JOIN course c USING (course_id) where course_id=:course_id and name=:name", nativeQuery = true)
+	@Query(value = "SELECT * FROM EXERCISE e JOIN course c USING (course_id) where course_id=:course_id and c.name=:name", nativeQuery = true)
 	Exercise findByCourse(@Param("course_id") int course_id, @Param("name")String name);
 }

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

@@ -1,10 +1,15 @@
 package io.github.Hattinger04.course.model.solution;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface SolutionRepository extends JpaRepository<Solution, Long>{
 
 	Solution findById(int id); 
+	// TODO: SQL not tested yet!
+	@Query(value = "SELECT * FROM SOLUTION s JOIN exercise e USING (exercise_id) where exercise_id=:exercise_id and e.name=:name", nativeQuery = true)
+	Solution findByExercise(@Param("exercise_id")int exercise_id, @Param("name")String name);
 }