Skip to content

Commit 883e2e3

Browse files
author
Hattinger04
committed
working on functions
1 parent 5436ca2 commit 883e2e3

File tree

4 files changed

+78
-20
lines changed

4 files changed

+78
-20
lines changed

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

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
import io.github.Hattinger04.RestServices;
1616
import io.github.Hattinger04.course.model.CourseService;
1717
import io.github.Hattinger04.course.model.course.Course;
18+
import io.github.Hattinger04.course.model.exercise.Exercise;
19+
import io.github.Hattinger04.course.model.student.Student;
1820

1921
@RestController
20-
@RequestMapping("/USER")
22+
@RequestMapping("/TEACHER")
2123
public class CourseController {
2224

2325
@Autowired
@@ -26,7 +28,22 @@ public class CourseController {
2628
private RestServices restServices;
2729

2830

29-
// TODO: change hasAuthority('USER') to smth with teacher / student check
31+
/**
32+
* Get student by id in Course from database
33+
* Needs course object
34+
*
35+
* @param json
36+
* @return
37+
*/
38+
@PreAuthorize("hasAuthority('TEACHER')")
39+
@PostMapping("/getStudentByID")
40+
@ResponseBody
41+
public ResponseEntity<?> getStudentByID(@RequestBody String json) {
42+
// TODO: not sure if that will work - probably not
43+
Course course = (Course) restServices.deserialize(Course.class, json);
44+
Student student = (Student) restServices.deserialize(Student.class, json);
45+
return new ResponseEntity<>(courseService.getStudent(course, student), HttpStatus.OK);
46+
}
3047

3148
/**
3249
* Get all students in Course from database
@@ -35,26 +52,41 @@ public class CourseController {
3552
* @param json
3653
* @return
3754
*/
38-
@PreAuthorize("hasAuthority('USER')")
55+
@PreAuthorize("hasAuthority('TEACHER')")
3956
@PostMapping("/getAllStudents")
4057
@ResponseBody
4158
public ResponseEntity<?> getAllStudents(@RequestBody String json) {
4259
Course course = (Course) restServices.deserialize(Course.class, json);
4360
return new ResponseEntity<>(courseService.getAllStudents(course), HttpStatus.OK);
4461
}
4562

63+
/**
64+
* Get all students in Course from database
65+
* Needs course object
66+
*
67+
* @param json
68+
* @return
69+
*/
70+
@PreAuthorize("hasAuthority('TEACHER')")
71+
@PostMapping("/getAllStudents")
72+
@ResponseBody
73+
public ResponseEntity<?> getCourseTeacher(@RequestBody String json) {
74+
Course course = (Course) restServices.deserialize(Course.class, json);
75+
return new ResponseEntity<>(courseService.getCourseTeacher(course), HttpStatus.OK);
76+
}
77+
4678
/**
4779
* Create a new Course
4880
* Needs course object
4981
*
5082
* @param json
5183
* @return
5284
*/
53-
@PreAuthorize("hasAuthority('USER')")
85+
@PreAuthorize("hasAuthority('TEACHER')")
5486
@PutMapping("/createCourse")
5587
@ResponseBody
5688
public ResponseEntity<?> createCourse(@RequestBody String json) {
57-
// courseService.createCourse((Course) restServices.deserialize(Course.class, json));
89+
courseService.createCourse((Course) restServices.deserialize(Course.class, json));
5890
return new ResponseEntity<>(HttpStatus.OK);
5991
}
6092

@@ -65,11 +97,11 @@ public ResponseEntity<?> createCourse(@RequestBody String json) {
6597
* @param json
6698
* @return
6799
*/
68-
@PreAuthorize("hasAuthority('USER')")
100+
@PreAuthorize("hasAuthority('TEACHER')")
69101
@DeleteMapping("/deleteCourse")
70102
@ResponseBody
71103
public ResponseEntity<?> deleteCourse(@RequestBody String json) {
72-
// courseService.deleteCourse((Course) restServices.deserialize(Course.class, json););
104+
courseService.deleteCourse((Course) restServices.deserialize(Course.class, json));
73105
return new ResponseEntity<>(HttpStatus.OK);
74106
}
75107

@@ -80,11 +112,14 @@ public ResponseEntity<?> deleteCourse(@RequestBody String json) {
80112
* @param json
81113
* @return
82114
*/
83-
@PreAuthorize("hasAuthority('USER')")
115+
@PreAuthorize("hasAuthority('TEACHER')")
84116
@PostMapping("/addStudentCourse")
85117
@ResponseBody
86118
public ResponseEntity<?> addStudentCourse(@RequestBody String json) {
87-
// TODO: adding students to Course
119+
// TODO: not sure if that will work - probably not
120+
Course course = (Course) restServices.deserialize(Course.class, json);
121+
Student student = (Student) restServices.deserialize(Student.class, json);
122+
courseService.addStudentToCourse(course, student);
88123
return new ResponseEntity<>(HttpStatus.OK);
89124
}
90125

@@ -95,11 +130,14 @@ public ResponseEntity<?> addStudentCourse(@RequestBody String json) {
95130
* @param json
96131
* @return
97132
*/
98-
@PreAuthorize("hasAuthority('USER')")
133+
@PreAuthorize("hasAuthority('TEACHER')")
99134
@DeleteMapping("/removeStudentCourse")
100135
@ResponseBody
101136
public ResponseEntity<?> removeStudentCourse(@RequestBody String json) {
102-
// TODO: removing students from Course
137+
// TODO: not sure if that will work - probably not
138+
Course course = (Course) restServices.deserialize(Course.class, json);
139+
Student student = (Student) restServices.deserialize(Student.class, json);
140+
courseService.removeStudentFromCourse(course, student);
103141
return new ResponseEntity<>(HttpStatus.OK);
104142
}
105143

@@ -110,11 +148,11 @@ public ResponseEntity<?> removeStudentCourse(@RequestBody String json) {
110148
* @param json
111149
* @return
112150
*/
113-
@PreAuthorize("hasAuthority('USER')")
151+
@PreAuthorize("hasAuthority('TEACHER')")
114152
@PutMapping("/createExercise")
115153
@ResponseBody
116154
public ResponseEntity<?> createExercise(@RequestBody String json) {
117-
// courseService.createExercise((Exercise) restServices.deserialize(Exercise.class, json););
155+
courseService.createExercise((Exercise) restServices.deserialize(Exercise.class, json));
118156
return new ResponseEntity<>(HttpStatus.OK);
119157
}
120158

@@ -125,11 +163,11 @@ public ResponseEntity<?> createExercise(@RequestBody String json) {
125163
* @param json
126164
* @return
127165
*/
128-
@PreAuthorize("hasAuthority('USER')")
166+
@PreAuthorize("hasAuthority('TEACHER')")
129167
@PostMapping("/patchExercise")
130168
@ResponseBody
131169
public ResponseEntity<?> patchExercise(@RequestBody String json) {
132-
// courseService.createExercise((Exercise) restServices.deserialize(Exercise.class, json););
170+
courseService.createExercise((Exercise) restServices.deserialize(Exercise.class, json));
133171
return new ResponseEntity<>(HttpStatus.OK);
134172
}
135173

@@ -140,11 +178,11 @@ public ResponseEntity<?> patchExercise(@RequestBody String json) {
140178
* @param json
141179
* @return
142180
*/
143-
@PreAuthorize("hasAuthority('USER')")
181+
@PreAuthorize("hasAuthority('TEACHER')")
144182
@PutMapping("/deleteExercise")
145183
@ResponseBody
146184
public ResponseEntity<?> deleteExercise(@RequestBody String json) {
147-
// courseService.deleteExercise((Exercise) restServices.deserialize(Exercise.class, json););
185+
courseService.deleteExercise((Exercise) restServices.deserialize(Exercise.class, json));
148186
return new ResponseEntity<>(HttpStatus.OK);
149187
}
150188

@@ -155,7 +193,7 @@ public ResponseEntity<?> deleteExercise(@RequestBody String json) {
155193
* @param json
156194
* @return
157195
*/
158-
@PreAuthorize("hasAuthority('USER')")
196+
@PreAuthorize("hasAuthority('TEACHER')")
159197
@PostMapping("/rateExercise")
160198
@ResponseBody
161199
public ResponseEntity<?> rateExercise(@RequestBody String json) {

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,32 @@ public Course getCourseByName(String name) {
5454
return courseRepository.findByName(name);
5555
}
5656

57+
public Student getStudent(Course course, Student student) {
58+
Student s;
59+
if((s = studentRepository.findById(student.getId())) == null) { // TODO: if not tested!
60+
s = studentRepository.findByName(student.getUser().getUsername());
61+
}
62+
return s;
63+
}
64+
5765
public List<Student> getAllStudents(Course course) {
5866
return courseRepository.getAllStudents(course.getId());
5967
}
6068

6169
public Teacher getCourseTeacher(Course course) {
62-
// TODO
63-
return null;
70+
return courseRepository.getCourseTeacher(course.getId());
6471
}
6572

6673
public void setCourseTeacher(Course course, Teacher teacher) {
6774
teacherRepository.save(teacher);
6875
courseRepository.addUserToCourse(teacher.getId(), course.getId());
6976
}
7077

78+
public void deleteCourseTeacher(Course course, Teacher teacher) {
79+
teacherRepository.delete(teacher);
80+
courseRepository.removeUserFromCourse(teacher.getId(), course.getId());
81+
}
82+
7183
// TODO: working with student / teacher table
7284
public void addStudentToCourse(Course course, Student student) {
7385
studentRepository.save(student);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@
1111
import org.springframework.stereotype.Repository;
1212

1313
import io.github.Hattinger04.course.model.student.Student;
14+
import io.github.Hattinger04.course.model.teacher.Teacher;
1415

1516
@Repository
1617
public interface CourseRepository extends JpaRepository<Course, Long>{
1718
Course findById(int id);
1819
Course findByName(String name);
1920
// TODO: SQL not tested yet!
2021

22+
@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)
23+
Teacher getCourseTeacher(int course_id);
24+
2125
@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)
2226
List<Student> getAllStudents(int course_id);
2327

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package io.github.Hattinger04.course.model.student;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
4+
import org.springframework.data.jpa.repository.Query;
5+
import org.springframework.data.repository.query.Param;
46

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

0 commit comments

Comments
 (0)