Skip to content

Commit 5d7256e

Browse files
author
Hattinger04
committed
fixing more bugs
1 parent 1228c53 commit 5d7256e

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
@Service
2323
public class CourseService {
2424

25-
// TODO: Nothing(!) tested yet
26-
// TODO: making void - boolean
27-
2825
private CourseRepository courseRepository;
2926
private ExerciseRepository exerciseRepository;
3027
private SolutionRepository solutionRepository;
@@ -48,9 +45,20 @@ public Course createCourse(Course course) {
4845

4946
public boolean deleteCourse(Course course) {
5047
try {
48+
List<User> students = getAllStudents(course);
49+
Student s;
50+
for(User user : students) {
51+
if ((s = studentRepository.findByUserId(user.getId()).get(0)) != null) {
52+
removeStudentFromCourse(course, s);
53+
}
54+
}
55+
User teacher = getCourseTeachers(course).get(0);
56+
if(teacher != null) {
57+
deleteCourseTeacher(course, teacherRepository.findByUserId(teacher.getId()));
58+
}
5159
courseRepository.delete(course);
5260
return true;
53-
} catch (IllegalArgumentException e) {
61+
} catch (IllegalArgumentException | IndexOutOfBoundsException e) {
5462
return false;
5563
}
5664
}
@@ -130,7 +138,6 @@ private User getUserByTeacherUsername(Teacher teacher) {
130138
return null;
131139
}
132140
}
133-
134141
public boolean setCourseTeacher(Course course, Teacher teacher) {
135142
try {
136143
// check if course is exisiting

src/main/resources/allLogs.log

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,3 +350,7 @@ Sep. 02, 2022 9:16:39 PM io.github.Hattinger04.aop.LogAspect loginLog
350350
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
351351
Sep. 02, 2022 9:17:26 PM io.github.Hattinger04.aop.LogAspect loginLog
352352
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
353+
Sep. 03, 2022 11:39:22 AM io.github.Hattinger04.aop.LogAspect loginLog
354+
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
355+
Sep. 03, 2022 11:39:57 AM io.github.Hattinger04.aop.LogAspect loginLog
356+
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]

0 commit comments

Comments
 (0)