Merge branch 'refs/heads/develop' into feature/communication/implemen…

…t-faq-search

.github/workflows/check-translation-keys.yml

@@ -18,7 +18,4 @@ jobs:
         with:
           python-version: "3.12"
       - name: Check if translation keys match
-        run: >
-          python .ci/translation-file-checker/translation_file_checker.py
-            --german-files src/main/webapp/i18n/de/
-            --english-files src/main/webapp/i18n/en/
+        run: python .ci/translation-file-checker/translation_file_checker.py --german-files src/main/webapp/i18n/de/ --english-files src/main/webapp/i18n/en/

README.md

@@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
 The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):
 
 ```shell
-./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.5.6.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.6.0.war
 ```
 
 ## Architecture

build.gradle

@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.5.6"
+version = "7.6.0"
 description = "Interactive Learning with Individual Feedback"
 
 java {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "artemis",
-    "version": "7.5.6",
+    "version": "7.6.0",
     "description": "Interactive Learning with Individual Feedback",
     "private": true,
     "license": "MIT",
@@ -88,18 +88,20 @@
             "d3-transition": "^3.0.1"
         },
         "@typescript-eslint/utils": {
-            "eslint": "^9.11.0"
+            "eslint": "^9.12.0"
         },
         "braces": "3.0.3",
+        "cookie": "0.7.1",
         "critters": "0.0.24",
         "debug": "4.3.7",
         "eslint-plugin-deprecation": {
-            "eslint": "^9.11.0"
+            "eslint": "^9.12.0"
         },
         "eslint-plugin-jest": {
-            "@typescript-eslint/eslint-plugin": "^8.6.0"
+            "@typescript-eslint/eslint-plugin": "^8.8.0"
         },
-        "jsdom": "25.0.0",
+        "express": "4.21.0",
+        "jsdom": "25.0.1",
         "katex": "0.16.11",
         "postcss": "8.4.47",
         "rimraf": "6.0.1",
@@ -110,6 +112,7 @@
         "tough-cookie": "5.0.0",
         "vite": "5.4.8",
         "webpack-dev-middleware": "7.4.2",
+        "webpack-dev-server": "5.1.0",
         "word-wrap": "1.2.5",
         "ws": "8.18.0",
         "yargs-parser": "21.1.1"
@@ -139,7 +142,7 @@
         "@types/uuid": "10.0.0",
         "@typescript-eslint/eslint-plugin": "8.8.0",
         "@typescript-eslint/parser": "8.8.0",
-        "eslint": "9.11.1",
+        "eslint": "9.12.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-deprecation": "3.0.0",
         "eslint-plugin-jest": "28.8.3",

src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyImportOptionsDTO.java

@@ -0,0 +1,12 @@
+package de.tum.cit.aet.artemis.atlas.dto;
+
+import java.time.ZonedDateTime;
+import java.util.Optional;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record CompetencyImportOptionsDTO(Set<Long> competencyIds, Optional<Long> sourceCourseId, boolean importRelations, boolean importExercises, boolean importLectures,
+        Optional<ZonedDateTime> referenceDate, boolean isReleaseDate) {
+}

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

@@ -26,9 +26,13 @@ public interface CompetencyRepository extends ArtemisJpaRepository<Competency, L
     @Query("""
             SELECT c
             FROM Competency c
+                LEFT JOIN FETCH c.exercises
+                LEFT JOIN FETCH c.lectureUnits lu
+                LEFT JOIN FETCH lu.lecture l
+                LEFT JOIN FETCH l.attachments
             WHERE c.course.id = :courseId
             """)
-    Set<Competency> findAllForCourse(@Param("courseId") long courseId);
+    Set<Competency> findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(@Param("courseId") long courseId);
 
     @Query("""
             SELECT c