diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java index 036ff75..c46c724 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; import java.util.UUID; -import java.util.logging.Logger; @Controller @RequestMapping("/classrooms") diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java index 1c95a4b..68f28b6 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java @@ -1,11 +1,9 @@ package fr.univ_lille.gitlab.classrooms.domain; -import fr.univ_lille.gitlab.classrooms.gitlab.GitlabApiFactory; import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.transaction.Transactional; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; -import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.models.GroupParams; import org.springframework.stereotype.Service; @@ -20,12 +18,9 @@ class ClassroomServiceImpl implements ClassroomService { private final GitLabApi gitLabApi; - private final GitlabApiFactory gitlabApiFactory; - - ClassroomServiceImpl(ClassroomRepository classroomRepository, GitLabApi gitLabApi, GitlabApiFactory gitlabApiFactory) { + ClassroomServiceImpl(ClassroomRepository classroomRepository, GitLabApi gitLabApi) { this.classroomRepository = classroomRepository; this.gitLabApi = gitLabApi; - this.gitlabApiFactory = gitlabApiFactory; } @Override @@ -43,13 +38,6 @@ class ClassroomServiceImpl implements ClassroomService { public void joinClassroom(Classroom classroom, ClassroomUser student) throws GitLabApiException { classroom.join(student); - // make the student join the gitlab group - var teacher = classroom.getTeacher(); - var teacherGitlabApi = gitlabApiFactory.userGitlabApi(teacher); - - var user = teacherGitlabApi.getUserApi().getUser(student.getName()); - teacherGitlabApi.getGroupApi().addMember(classroom.getGitlabGroupId(), user.getId(), AccessLevel.DEVELOPER); - this.classroomRepository.save(classroom); } diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImplTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImplTest.java index 0187e09..82e9e04 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImplTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImplTest.java @@ -58,8 +58,6 @@ class ClassroomServiceImplTest { var classroom = new Classroom(); classroom.setGitlabGroupId(12L); - when(gitlabApiFactory.userGitlabApi(any())).thenReturn(gitLabApi); - classroomService.joinClassroom(classroom, student); assertThat(classroom.getStudents()).contains(student); @@ -67,26 +65,6 @@ class ClassroomServiceImplTest { verify(classroomRepository).save(classroom); } - @Test - void joinClassroom_shouldAddTheStudentToTheGitlabGroup() throws GitLabApiException { - var student = new ClassroomUser(); - student.setName("luke.skywalker"); - - var teacher = new ClassroomUser(); - teacher.setName("obiwan.kenobi"); - - var classroom = new Classroom(); - classroom.setTeacher(teacher); - classroom.setGitlabGroupId(12L); - - when(gitlabApiFactory.userGitlabApi(teacher)).thenReturn(gitLabApi); - when(gitLabApi.getUserApi().getUser("luke.skywalker")).thenReturn(new User().withId(5L)); - - classroomService.joinClassroom(classroom, student); - - verify(gitLabApi.getGroupApi()).addMember(12L, 5L, AccessLevel.DEVELOPER); - } - @Test void createClassroom_shouldCreateTheGitlabGroupAndSave() throws GitLabApiException { var teacher = new ClassroomUser();