testing out rest services + fixing bugs

Author: Hattinger04

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

@@ -126,7 +126,7 @@ public ResponseEntity<?> deleteCourse(@RequestBody String json) {
 	 * @return
 	 */
 	@PreAuthorize("hasAuthority('TEACHER')")
-	@PostMapping("/addStudentCourse")
+	@PutMapping("/addStudentCourse")
 	@ResponseBody
 	public ResponseEntity<?> addStudentCourse(@RequestBody String json) {
 		Object[] objects = restServices.deserializeMany(new Class[] {Course.class, Student.class}, json); 

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

@@ -106,7 +106,7 @@ public boolean deleteCourseTeacher(Course course, Teacher teacher) {
 	public boolean addStudentToCourse(Course course, Student student) {
 		try {
 			studentRepository.save(student);
-			courseRepository.addUserToCourse(student.getId(), course.getId());
+			courseRepository.addUserToCourse(student.getUser().getId(), course.getId());
 			return true;
 		} catch (IllegalArgumentException e) {
 			return false;

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

@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
+import io.github.Hattinger04.user.model.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -47,6 +48,6 @@ public Course(String name) {
 
 	@ManyToMany(cascade = CascadeType.MERGE)
 	@JoinTable(name = "user_course", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "course_id"))
-	private Set<Course> courses;
+	private Set<User> users;
 
 }

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

@@ -25,7 +25,7 @@ public interface CourseRepository extends JpaRepository<Course, Long>{
 	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)
+	@Query(value = "insert into user_course (user_id, course_id) values (:user_id,:course_id)", nativeQuery = true)
 	@Transactional
 	public void addUserToCourse(@Param("user_id") int user_id, @Param("course_id") int course_id);
 

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

@@ -6,6 +6,8 @@
 
 public interface StudentRepository extends JpaRepository<Student, Long>{
 	Student findById(int id);
+	@Query(value = "SELECT * FROM STUDENT s JOIN user u USING (user_id) where u.user_id=:user_id", nativeQuery = true)
+	Student findByUserId(@Param("user_id") int user_id); 
 	@Query(value = "SELECT * FROM STUDENT s JOIN user u USING (user_id) where u.username=:username", nativeQuery = true)
 	Student findByName(@Param("username") String username); 
 }

src/main/java/io/github/Hattinger04/user/model/User.java

@@ -32,6 +32,12 @@
 @ToString
 public class User {
 
+	public User(int id) {
+		this.id = id; 
+	}
+	public User(String username) {
+		this.username = username; 
+	}
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "user_id")

src/main/resources/allLogs.log

@@ -300,3 +300,9 @@ Aug. 31, 2022 12:33:47 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
 Aug. 31, 2022 5:01:44 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Sep. 01, 2022 9:43:18 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Sep. 01, 2022 10:01:45 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Sep. 01, 2022 10:02:38 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]