Development: Add simple repository service

src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java

@@ -56,14 +56,6 @@ public interface CompetencyRepository extends ArtemisJpaRepository<Competency, L
             """)
     Optional<Competency> findByIdWithLectureUnitsAndExercises(@Param("competencyId") long competencyId);
 
-    default Competency findByIdWithLectureUnitsAndExercisesElseThrow(long competencyId) {
-        return getValueElseThrow(findByIdWithLectureUnitsAndExercises(competencyId), competencyId);
-    }
-
-    default Competency findByIdWithLectureUnitsElseThrow(long competencyId) {
-        return getValueElseThrow(findByIdWithLectureUnits(competencyId), competencyId);
-    }
-
     long countByCourse(Course course);
 
     List<Competency> findByCourseIdOrderById(long courseId);

src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencySimpleRepository.java

@@ -0,0 +1,26 @@
+package de.tum.cit.aet.artemis.atlas.repository;
+
+import org.springframework.stereotype.Service;
+
+import de.tum.cit.aet.artemis.atlas.domain.competency.Competency;
+import de.tum.cit.aet.artemis.core.repository.base.AbstractSimpleRepositoryService;
+
+@Service
+public class CompetencySimpleRepository extends AbstractSimpleRepositoryService {
+
+    private final static String ENTITY_NAME = "Competency";
+
+    private final CompetencyRepository competencyRepository;
+
+    public CompetencySimpleRepository(CompetencyRepository competencyRepository) {
+        this.competencyRepository = competencyRepository;
+    }
+
+    public Competency findByIdWithLectureUnitsAndExercisesElseThrow(long competencyId) {
+        return getValueElseThrow(competencyRepository.findByIdWithLectureUnitsAndExercises(competencyId), ENTITY_NAME);
+    }
+
+    public Competency findByIdWithLectureUnitsElseThrow(long competencyId) {
+        return getValueElseThrow(competencyRepository.findByIdWithLectureUnitsAndExercises(competencyId), ENTITY_NAME);
+    }
+}

src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java

@@ -20,6 +20,7 @@
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository;
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository;
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository;
+import de.tum.cit.aet.artemis.atlas.repository.CompetencySimpleRepository;
 import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository;
 import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository;
 import de.tum.cit.aet.artemis.atlas.service.LearningObjectImportService;
@@ -42,17 +43,20 @@ public class CompetencyService extends CourseCompetencyService {
 
     private final CompetencyRepository competencyRepository;
 
+    private final CompetencySimpleRepository competencySimpleRepository;
+
     private final CompetencyExerciseLinkRepository competencyExerciseLinkRepository;
 
     public CompetencyService(CompetencyRepository competencyRepository, AuthorizationCheckService authCheckService, CompetencyRelationRepository competencyRelationRepository,
             LearningPathService learningPathService, CompetencyProgressService competencyProgressService, LectureUnitService lectureUnitService,
             CompetencyProgressRepository competencyProgressRepository, LectureUnitCompletionRepository lectureUnitCompletionRepository,
             StandardizedCompetencyRepository standardizedCompetencyRepository, CourseCompetencyRepository courseCompetencyRepository, ExerciseService exerciseService,
             LearningObjectImportService learningObjectImportService, CompetencyLectureUnitLinkRepository competencyLectureUnitLinkRepository, CourseRepository courseRepository,
-            CompetencyExerciseLinkRepository competencyExerciseLinkRepository) {
+            CompetencySimpleRepository competencySimpleRepository, CompetencyExerciseLinkRepository competencyExerciseLinkRepository) {
         super(competencyProgressRepository, courseCompetencyRepository, competencyRelationRepository, competencyProgressService, exerciseService, lectureUnitService,
                 learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository, learningObjectImportService, courseRepository);
         this.competencyRepository = competencyRepository;
+        this.competencySimpleRepository = competencySimpleRepository;
         this.competencyExerciseLinkRepository = competencyExerciseLinkRepository;
     }
 
@@ -100,7 +104,7 @@ public List<Competency> createCompetencies(List<Competency> competencies, Course
      * @return The found competency
      */
     public Competency findCompetencyWithExercisesAndLectureUnitsAndProgressForUser(Long competencyId, Long userId) {
-        Competency competency = competencyRepository.findByIdWithLectureUnitsAndExercisesElseThrow(competencyId);
+        Competency competency = competencySimpleRepository.findByIdWithLectureUnitsAndExercisesElseThrow(competencyId);
         return findProgressAndLectureUnitCompletionsForUser(competency, userId);
     }
 

src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java

@@ -29,6 +29,7 @@
 import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO;
 import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO;
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository;
+import de.tum.cit.aet.artemis.atlas.repository.CompetencySimpleRepository;
 import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository;
 import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyService;
 import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService;
@@ -64,19 +65,22 @@ public class CompetencyResource {
 
     private final CompetencyRepository competencyRepository;
 
+    private final CompetencySimpleRepository competencySimpleRepository;
+
     private final CompetencyService competencyService;
 
     private final CourseCompetencyRepository courseCompetencyRepository;
 
     private final CourseCompetencyService courseCompetencyService;
 
     public CompetencyResource(CourseRepository courseRepository, AuthorizationCheckService authorizationCheckService, UserRepository userRepository,
-            CompetencyRepository competencyRepository, CompetencyService competencyService, CourseCompetencyRepository courseCompetencyRepository,
-            CourseCompetencyService courseCompetencyService) {
+            CompetencyRepository competencyRepository, CompetencySimpleRepository competencySimpleRepository, CompetencyService competencyService,
+            CourseCompetencyRepository courseCompetencyRepository, CourseCompetencyService courseCompetencyService) {
         this.courseRepository = courseRepository;
         this.authorizationCheckService = authorizationCheckService;
         this.userRepository = userRepository;
         this.competencyRepository = competencyRepository;
+        this.competencySimpleRepository = competencySimpleRepository;
         this.competencyService = competencyService;
         this.courseCompetencyRepository = courseCompetencyRepository;
         this.courseCompetencyService = courseCompetencyService;
@@ -293,7 +297,7 @@ public ResponseEntity<Competency> updateCompetency(@PathVariable long courseId,
         checkCompetencyAttributesForUpdate(competency);
 
         var course = courseRepository.findByIdElseThrow(courseId);
-        var existingCompetency = competencyRepository.findByIdWithLectureUnitsElseThrow(competency.getId());
+        var existingCompetency = competencySimpleRepository.findByIdWithLectureUnitsElseThrow(competency.getId());
         checkCourseForCompetency(course, existingCompetency);
 
         var persistedCompetency = competencyService.updateCourseCompetency(existingCompetency, competency);

src/main/java/de/tum/cit/aet/artemis/core/repository/base/AbstractSimpleRepositoryService.java

@@ -0,0 +1,12 @@
+package de.tum.cit.aet.artemis.core.repository.base;
+
+import java.util.Optional;
+
+import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException;
+
+public abstract class AbstractSimpleRepositoryService {
+
+    protected <U> U getValueElseThrow(Optional<U> optional, String entityName) {
+        return optional.orElseThrow(() -> new EntityNotFoundException(entityName));
+    }
+}