diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java
index a494fe7..9c4cd6f 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java
@@ -20,14 +20,14 @@ class AssignmentServiceImpl implements AssignmentService {
 
     private final GitLabApi gitLabApi;
 
-    private final ClassroomRepository classroomRepository;
+    private final ClassroomService classroomService;
 
     private final AssignmentRepository assignmentRepository;
 
-    AssignmentServiceImpl(QuizRepository quizRepository, GitLabApi gitLabApi, ClassroomRepository classroomRepository, AssignmentRepository assignmentRepository) {
+    AssignmentServiceImpl(QuizRepository quizRepository, GitLabApi gitLabApi, ClassroomService classroomService, AssignmentRepository assignmentRepository) {
         this.quizRepository = quizRepository;
         this.gitLabApi = gitLabApi;
-        this.classroomRepository = classroomRepository;
+        this.classroomService = classroomService;
         this.assignmentRepository = assignmentRepository;
     }
 
@@ -56,7 +56,7 @@ class AssignmentServiceImpl implements AssignmentService {
         classroom.addAssignment(quizAssignment);
 
         this.assignmentRepository.save(quizAssignment);
-        this.classroomRepository.save(classroom);
+        this.classroomService.saveClassroom(classroom);
 
         return quizAssignment;
     }
@@ -80,7 +80,7 @@ class AssignmentServiceImpl implements AssignmentService {
         classroom.addAssignment(exerciseAssignment);
 
         this.assignmentRepository.save(exerciseAssignment);
-        this.classroomRepository.save(classroom);
+        this.classroomService.saveClassroom(classroom);
 
         return exerciseAssignment;
     }
diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomRepository.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomRepository.java
index 115ebd5..821a666 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomRepository.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomRepository.java
@@ -6,5 +6,5 @@ import org.springframework.stereotype.Repository;
 import java.util.UUID;
 
 @Repository
-public interface ClassroomRepository extends JpaRepository<Classroom, UUID> {
+interface ClassroomRepository extends JpaRepository<Classroom, UUID> {
 }
diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java
index 497ede7..2ce4fd3 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java
@@ -15,4 +15,6 @@ public interface ClassroomService {
     void joinClassroom(Classroom classroom, ClassroomUser student);
 
     void createClassroom(String classroomName, Long parentGitlabGroupId, ClassroomUser teacher) throws GitLabApiException;
+
+    void saveClassroom(Classroom classroom);
 }
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 a238333..dcb47c0 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
@@ -62,4 +62,9 @@ class ClassroomServiceImpl implements ClassroomService {
 
         this.classroomRepository.save(classroom);
     }
+
+    @Override
+    public void saveClassroom(Classroom classroom) {
+        this.classroomRepository.save(classroom);
+    }
 }