Make updateProgressForCourses ignore module not present

ls1intum · Oct 22, 2024 · 763afc1 · 763afc1
1 parent 23f7a0d
commit 763afc1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyProgressApi.java b/src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyProgressApi.java
@@ -61,6 +61,10 @@ public void updateProgressByLearningObjectSync(LearningObject learningObject, Se
      * @param activeCourses the active courses
      */
     public void updateProgressForCourses(List<Course> activeCourses) {
+        if (!isActive()) {
+            return;
+        }
+
         CompetencyProgressService competencyProgressService = getOrThrow(this.competencyProgressService);
         CompetencyRepository competencyRepository = getOrThrow(this.competencyRepository);
 

diff --git a/src/main/java/de/tum/cit/aet/artemis/core/api/AbstractApi.java b/src/main/java/de/tum/cit/aet/artemis/core/api/AbstractApi.java
@@ -20,7 +20,12 @@ public AbstractApi(Environment environment, String profileName) {
         this.profileName = profileName;
     }
 
-    public boolean isActive(String profileName) {
+    public boolean isActive() {
+        return isActive(profileName);
+    }
+
+    // This method will be removed once we switch to using the profileName
+    private boolean isActive(String profileName) {
         return environment.acceptsProfiles(Profiles.of(profileName));
     }
 

diff --git a/...a/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java b/...a/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java
@@ -9,6 +9,7 @@
 import de.tum.cit.aet.artemis.atlas.api.CompetencyProgressApi;
 import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry;
 import de.tum.cit.aet.artemis.core.domain.Course;
+import de.tum.cit.aet.artemis.core.exception.ModuleNotPresentException;
 import de.tum.cit.aet.artemis.core.repository.CourseRepository;
 
 public class MigrationEntry20240614_140000 extends MigrationEntry {
@@ -30,6 +31,9 @@ public void execute() {
 
         log.info("Updating competency progress for {} active courses", activeCourses.size());
 
+        if (!competencyProgressApi.isActive()) {
+            throw new ModuleNotPresentException("CompetencyProgressApi is not active");
+        }
         competencyProgressApi.updateProgressForCourses(activeCourses);
     }