Development: Add Atlas Profile with optionally autowired Atlas Java API

.github/workflows/test-android.yml

@@ -69,7 +69,7 @@ jobs:
         # Run artemis server in a detached mode, and store the pid in variable steps.run-artemis.outputs.pid
       - name: Run Artemis Server
         id: run-artemis
-        run: ./main-repo/gradlew bootRun --args='--spring.profiles.active=dev,artemis,scheduling --artemis.user-management.use-external=false --artemis.user-management.internal-admin.username=artemis_admin --artemis.user-management.internal-admin.password=artemis_admin --artemis.user-management.registration.enabled=true --artemis.user-management.registration.allowed-email-pattern=.*' & echo "pid=$!" >> "$GITHUB_OUTPUT"
+        run: ./main-repo/gradlew bootRun --args='--spring.profiles.active=dev,artemis,scheduling,atlas --artemis.user-management.use-external=false --artemis.user-management.internal-admin.username=artemis_admin --artemis.user-management.internal-admin.password=artemis_admin --artemis.user-management.registration.enabled=true --artemis.user-management.registration.allowed-email-pattern=.*' & echo "pid=$!" >> "$GITHUB_OUTPUT"
 
         # For debug purposes or if anything goes wrong, and we have to manually kill the process on the VM
       - name: Print Pid

README.md

@@ -181,7 +181,7 @@ To build and optimize the Artemis application for production, run:
 This will create a Artemis-<version>.war file in the folder `build/libs`. The build command compiles the TypeScript into JavaScript files, concatenates and minifies the created files (including HTML and CSS files). It will also modify `index.html` so it references these new files. To ensure everything worked, run the following command to start the application on your local computer:
 
 ```shell
-java -jar build/libs/*.war --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local
+java -jar build/libs/*.war --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,atlas
 ```
 
 (You might need to copy a yml file into the folder build/libs before, also see [development setup](https://docs.artemis.cit.tum.de/dev/setup/))

docs/admin/setup/aeolus.rst

@@ -18,7 +18,7 @@ Enable the ``aeolus`` Spring profile
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,aeolus
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,aeolus
 
 Configure the Aeolus Endpoint
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/apollon.rst

@@ -9,7 +9,7 @@ Enable the ``apollon`` Spring profile:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,apollon
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,apollon
 
 Configure API Endpoints:
 ^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/athena.rst

@@ -11,7 +11,7 @@ Enable the ``athena`` Spring profile:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,athena
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,athena
 
 Configure API Endpoints:
 ^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/distributed.rst

@@ -528,7 +528,7 @@ For ICL, the run configuration for core nodes need to include the additional pro
 
 ::
 
-        --spring.profiles.active=prod,core,ldap-only,localvc,localci,athena,scheduling,iris,lti
+        --spring.profiles.active=prod,core,atlas,ldap-only,localvc,localci,athena,scheduling,iris,lti
 
 Core nodes do not require further adjustments to the ``application-prod.yml``, as long as you have added the necessary variables as described in the :ref:`Integrated Code Lifecycle Setup <Integrated Code Lifecycle Setup>`.
 

docs/admin/setup/iris.rst

@@ -20,7 +20,7 @@ Enable the ``iris`` Spring profile:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,iris
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,iris
 
 Configure Pyris API Endpoints:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/production-setup-tips.rst

@@ -73,7 +73,7 @@ permissions in the ``/opt/artemis/`` directory that contains the ``Artemis.war``
      --add-opens java.management/sun.management=ALL-UNNAMED \
      --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED \
      -jar Artemis.war \
-     --spring.profiles.active=prod,localci,localvc,artemis,scheduling,buildagent,core,local,openapi
+     --spring.profiles.active=prod,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,openapi
    SuccessExitStatus=143
    StandardOutput=/opt/artemis/artemis.log  # remove to use default journald logging/cleanup mechanisms
    StandardError=inherit

docs/dev/setup/aeolus.rst

@@ -24,7 +24,7 @@ Start Aeolus with the following docker compose command:
    docker compose -f docker/aeolus.yml up -d
 
 
-Check if Aeolus is running by visiting the following URL in your browser: http://localhost:8090/docs 
+Check if Aeolus is running by visiting the following URL in your browser: http://localhost:8090/docs
 It should display the Aeolus API documentation.
 
 .. _configure artemis for aeolus:
@@ -77,7 +77,7 @@ e.g.:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,aeolus,artemis,scheduling,local
+   --spring.profiles.active=dev,localci,localvc,aeolus,artemis,scheduling,atlas,local
 
 
 More information on how Aeolus works can be found on `GitHub <https://github.com/ls1intum/Aeolus>`_ or in the `Aeolus documentation <https://ls1intum.github.io/Aeolus/>`_.

docs/dev/setup/integrated-code-lifecycle.rst

@@ -89,7 +89,7 @@ e.g.:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local
 
 All of these profiles are enabled by default when using the ``Artemis (Server, LocalVC & LocalCI)`` run configuration in IntelliJ.
 Please read :ref:`Server Setup` for more details.

docs/dev/setup/jenkins-gitlab.rst

@@ -90,7 +90,7 @@ In addition, you have to start Artemis with the profiles ``gitlab`` and
 
 ::
 
-   --spring.profiles.active=dev,jenkins,gitlab,artemis,scheduling
+   --spring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling
 
 Please read :ref:`Server Setup` for more details.
 

docs/dev/setup/jenkins-localvc.rst

@@ -86,7 +86,7 @@ In addition, you have to start Artemis with the profiles ``localvc`` and
 
 ::
 
-   --spring.profiles.active=dev,jenkins,localvc,artemis,scheduling
+   --spring.profiles.active=dev,jenkins,localvc,artemis,atlas,scheduling
 
 Please read :ref:`Server Setup` for more details.
 

docs/dev/setup/server.rst

@@ -215,15 +215,15 @@ The Artemis server should startup by running the main class
 
 ::
 
-   --spring.profiles.active=dev,jenkins,gitlab,artemis,scheduling
+   --spring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling
 
 If you use IntelliJ (Community or Ultimate) you can set the active
 profiles by
 
 * Choosing ``Run | Edit Configurations...``
 * Going to the ``Configuration Tab``
 * Expanding the ``Environment`` section to reveal ``VM Options`` and setting them to
-  ``-Dspring.profiles.active=dev,jenkins,gitlab,artemis,scheduling``
+  ``-Dspring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling``
 
 Set Spring profiles with IntelliJ Ultimate
 """"""""""""""""""""""""""""""""""""""""""
@@ -244,4 +244,4 @@ sure to pass the active profiles to the ``gradlew`` command like this:
 
 .. code:: bash
 
-   ./gradlew bootRun --args='--spring.profiles.active=dev,jenkins,gitlab,artemis,scheduling'
+   ./gradlew bootRun --args='--spring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling'

src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java

@@ -74,7 +74,7 @@ public class ParticipantScoreScheduleService {
 
     private Optional<Instant> lastScheduledRun = Optional.empty();
 
-    private final CompetencyProgressApi competencyProgressApi;
+    private final Optional<CompetencyProgressApi> competencyProgressApi;
 
     private final ParticipantScoreRepository participantScoreRepository;
 
@@ -96,7 +96,7 @@ public class ParticipantScoreScheduleService {
      */
     private final AtomicBoolean isRunning = new AtomicBoolean(false);
 
-    public ParticipantScoreScheduleService(@Qualifier("taskScheduler") TaskScheduler scheduler, CompetencyProgressApi competencyProgressApi,
+    public ParticipantScoreScheduleService(@Qualifier("taskScheduler") TaskScheduler scheduler, Optional<CompetencyProgressApi> competencyProgressApi,
             ParticipantScoreRepository participantScoreRepository, StudentScoreRepository studentScoreRepository, TeamScoreRepository teamScoreRepository,
             ExerciseRepository exerciseRepository, ResultRepository resultRepository, UserRepository userRepository, TeamRepository teamRepository) {
         this.scheduler = scheduler;
@@ -336,7 +336,8 @@ private void executeTask(Long exerciseId, Long participantId, Instant resultLast
             if (scoreParticipant instanceof Team team && !Hibernate.isInitialized(team.getStudents())) {
                 scoreParticipant = teamRepository.findWithStudentsByIdElseThrow(team.getId());
             }
-            competencyProgressApi.updateProgressByLearningObjectSync(score.getExercise(), scoreParticipant.getParticipants());
+            Participant finalScoreParticipant = scoreParticipant;
+            competencyProgressApi.ifPresent(api -> api.updateProgressByLearningObjectSync(score.getExercise(), finalScoreParticipant.getParticipants()));
         }
         catch (Exception e) {
             log.error("Exception while processing participant score for exercise {} and participant {} for participant scores:", exerciseId, participantId, e);

src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Controller;
@@ -9,7 +9,7 @@
 import de.tum.cit.aet.artemis.lecture.domain.Lecture;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class CompetencyApi extends AbstractAtlasApi {
 
     private final CompetencyService competencyService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyProgressApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import java.util.List;
 import java.util.Optional;
@@ -19,7 +19,7 @@
 import de.tum.cit.aet.artemis.exercise.domain.participation.Participant;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class CompetencyProgressApi extends AbstractAtlasApi {
 
     private final CompetencyProgressService competencyProgressService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyRelationApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class CompetencyRelationApi extends AbstractAtlasApi {
 
     private final CompetencyRelationRepository competencyRelationRepository;

src/main/java/de/tum/cit/aet/artemis/atlas/api/CourseCompetencyApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Controller;
@@ -9,7 +9,7 @@
 import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class CourseCompetencyApi extends AbstractAtlasApi {
 
     private final CourseCompetencyRepository courseCompetencyRepository;

src/main/java/de/tum/cit/aet/artemis/atlas/api/LearnerProfileApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import java.util.Set;
 
@@ -13,7 +13,7 @@
 import de.tum.cit.aet.artemis.core.domain.User;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class LearnerProfileApi extends AbstractAtlasApi {
 
     private final LearnerProfileService learnerProfileService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/LearningMetricsApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Controller;
@@ -9,7 +9,7 @@
 import de.tum.cit.aet.artemis.atlas.service.LearningMetricsService;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class LearningMetricsApi extends AbstractAtlasApi {
 
     private final LearningMetricsService metricsService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/LearningPathApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import jakarta.validation.constraints.NotNull;
 
@@ -12,7 +12,7 @@
 import de.tum.cit.aet.artemis.core.domain.User;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class LearningPathApi extends AbstractAtlasApi {
 
     private final LearningPathService learningPathService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/PrerequisitesApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Controller;
@@ -10,7 +10,7 @@
 import de.tum.cit.aet.artemis.core.domain.Course;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class PrerequisitesApi extends AbstractAtlasApi {
 
     private final PrerequisiteRepository prerequisiteRepository;

src/main/java/de/tum/cit/aet/artemis/atlas/api/ScienceEventApi.java

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import java.util.Set;
 
@@ -11,7 +11,7 @@
 import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository;
 
 @Controller
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 public class ScienceEventApi extends AbstractAtlasApi {
 
     private final ScienceEventRepository scienceEventRepository;

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

@@ -1,6 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.repository;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyExerciseLink;
 import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository;
 
-@Profile(PROFILE_CORE)
+@Profile(PROFILE_ATLAS)
 @Repository
 public interface CompetencyExerciseLinkRepository extends ArtemisJpaRepository<CompetencyExerciseLink, Long> {