Merge branch 'develop' into feature/programming-exercises/choose-preliminary-feedback-model

Author: LeonWehrhahn

build.gradle

@@ -21,7 +21,7 @@ plugins {
     id "com.google.cloud.tools.jib" version "3.4.5"
     id "com.gorylenko.gradle-git-properties" version "2.5.0"
     id "io.spring.dependency-management" version "1.1.7"
-    id "nebula.lint" version "20.5.8"
+    id "nebula.lint" version "20.6.0"
     id "org.liquibase.gradle" version "${liquibase_plugin_version}"
     id "org.owasp.dependencycheck" version "12.1.1"
     id "org.springframework.boot" version "${spring_boot_version}"
@@ -269,7 +269,7 @@ dependencies {
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${fasterxml_version}"
 
     // Avoid outdated version of netty to prevent security issues
-    implementation("net.minidev:json-smart") { version { 				strictly "2.5.2" } }
+    implementation("net.minidev:json-smart") { version {strictly "2.5.2" } }
 
 
     // Required for synchronization between nodes and build agents (LocalCI)
@@ -316,7 +316,7 @@ dependencies {
     implementation "org.springframework.ldap:spring-ldap-core:3.3.0"
 
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${spring_cloud_version}"
-    implementation "org.springframework.cloud:spring-cloud-starter-config:4.2.2"
+    implementation "org.springframework.cloud:spring-cloud-starter-config:${spring_cloud_version}"
     implementation "org.springframework.cloud:spring-cloud-commons:${spring_cloud_version}"
 
     // required by the Websocket Broker Connection in WebsocketConfiguration (due to multi node setup support)
@@ -359,7 +359,7 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk18on:1.80"
 
     implementation "com.mysql:mysql-connector-j:${mysql_version}"
-    implementation "org.postgresql:postgresql:42.7.5"
+    implementation "org.postgresql:postgresql:42.7.6"
 
     implementation "org.zalando:problem-spring-web:0.29.1"
     implementation "org.zalando:jackson-datatype-problem:0.27.1"

gradle.properties

@@ -7,9 +7,9 @@ npm_version=10.9.2
 
 # Dependency versions
 jhipster_dependencies_version=8.11.0
-spring_boot_version=3.4.6
+spring_boot_version=3.5.0
 spring_framework_version=6.2.7
-spring_cloud_version=4.2.1
+spring_cloud_version=4.3.0
 spring_security_version=6.5.0
 # TODO: upgrading to 6.6.x currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code. See https://hibernate.atlassian.net/browse/HHH-19249
 hibernate_version=6.5.3.Final
@@ -26,7 +26,7 @@ jplag_version=6.1.0
 # NOTE: we cannot need to use the latest version 9.x or 10.x here as long as Stanford CoreNLP does not reference it
 lucene_version=8.11.4
 slf4j_version=2.0.17
-sentry_version=8.12.0
+sentry_version=8.13.2
 liquibase_version=4.32.0
 docker_java_version=3.5.1
 logback_version=1.5.18
@@ -38,8 +38,8 @@ micrometer_version=1.15.0
 
 # testing
 # make sure both versions are compatible
-junit_version=5.12.2
-junit_platform_version=1.12.2
+junit_version=5.13.0
+junit_platform_version=1.13.0
 mockito_version=5.18.0
 testcontainer_version=1.20.4
 
@@ -48,7 +48,7 @@ gradle_node_plugin_version=7.1.0
 apt_plugin_version=0.21
 liquibase_plugin_version=3.0.2
 modernizer_plugin_version=1.11.0
-spotless_plugin_version=7.0.3
+spotless_plugin_version=7.0.4
 
 org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \

jest.config.js

@@ -100,7 +100,8 @@ module.exports = {
             lines: 89.22,
         },
     },
-    coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
+    // 'json-summary' reporter is used by supporting_scripts/code-coverage/module-coverage-client/check-client-module-coverage.mjs
+    coverageReporters: ['clover', 'json', 'lcov', 'text-summary','json-summary'],
     setupFilesAfterEnv: ['<rootDir>/src/test/javascript/spec/jest-test-setup.ts', 'jest-extended/all'],
     moduleFileExtensions: ['ts', 'html', 'js', 'json', 'mjs'],
     transformIgnorePatterns: [`/node_modules/(?!${esModules})`],

package.json

@@ -184,6 +184,7 @@
         "clean-www": "rimraf build/resources/main/static/app/{src,build/}",
         "compile:ts": "npm run prebuild && tsc --project tsconfig.app.json",
         "compile:ts:tests": "npm run prebuild && tsc --project tsconfig.spec.json",
+        "check-module-coverage": "node supporting_scripts/code-coverage/module-coverage-client/check-client-module-coverage.mjs",
         "lint": "eslint",
         "lint:fix": "eslint --fix",
         "postinstall": "husky && patch-package && node src/main/webapp/app/lecture/manage/pdf-preview/pdfjs_copy_worker_script.mjs",
@@ -194,7 +195,7 @@
         "start": "npm run prebuild -- --develop && ng serve --hmr",
         "test-diff:ci": "git fetch origin develop && npm run prebuild && ng test --log-heap-usage -w=4 --ci --reporters=default --reporters=jest-junit --pass-with-no-tests --changed-since=origin/develop",
         "test-diff": "npm run prebuild && ng test --log-heap-usage -w=4 --pass-with-no-tests --changed-since=origin/develop --coverage",
-        "test:ci": "npm run prebuild && ng test --coverage --log-heap-usage -w=4 --ci --reporters=default --reporters=jest-junit",
+        "test:ci": "npm run prebuild && ng test --coverage --log-heap-usage -w=4 --ci --reporters=default --reporters=jest-junit && npm run check-module-coverage",
         "test:leaks": "npm run prebuild && ng test --log-heap-usage --detect-leaks",
         "test:open-handles": "npm run prebuild && ng test --detect-open-handles",
         "test": "npm run prebuild && ng test --coverage --log-heap-usage -w=4",

src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaHealthIndicator.java

@@ -13,8 +13,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth;
 
 /**
@@ -30,18 +28,8 @@ public class AthenaHealthIndicator implements HealthIndicator {
 
     private static final String ATHENA_URL_KEY = "url";
 
-    private static final String ATHENA_STATUS_KEY = "status";
-
-    private static final String ATHENA_MODULES_KEY = "modules";
-
     private static final String ATHENA_ASSESSMENT_MODULE_MANAGER_KEY = "assessment module manager";
 
-    private static final String ATHENA_MODULE_URL_KEY = "url";
-
-    private static final String ATHENA_MODULE_EXERCISE_TYPE_KEY = "type";
-
-    private static final String ATHENA_MODULE_HEALTHY_KEY = "healthy";
-
     private final RestTemplate shortTimeoutRestTemplate;
 
     @Value("${artemis.athena.url}")
@@ -69,12 +57,12 @@ public Health health() {
         additionalInfo.put(ATHENA_URL_KEY, athenaUrl);
         ConnectorHealth health;
         try {
-            final var response = shortTimeoutRestTemplate.getForObject(athenaUrl + "/health", JsonNode.class);
-            final var athenaStatus = response != null ? response.get(ATHENA_STATUS_KEY).asText() : null;
+            final var healthResponse = shortTimeoutRestTemplate.getForObject(athenaUrl + "/health", AthenaHealthResponse.class);
+            final var athenaStatus = healthResponse != null ? healthResponse.status() : null;
 
             if (athenaStatus != null) {
                 additionalInfo.put(ATHENA_ASSESSMENT_MODULE_MANAGER_KEY, athenaStatus);
-                additionalInfo.putAll(getAdditionalInfoForModules(response));
+                additionalInfo.putAll(getAdditionalInfoForModules(healthResponse));
             }
             else {
                 additionalInfo.put(ATHENA_ASSESSMENT_MODULE_MANAGER_KEY, "not available");
@@ -91,17 +79,13 @@ public Health health() {
     /**
      * Get additional information about the health of the assessment modules.
      */
-    private Map<String, Object> getAdditionalInfoForModules(JsonNode athenaHealthResponse) {
+    private Map<String, Object> getAdditionalInfoForModules(AthenaHealthResponse athenaHealthResponse) {
         var additionalModuleInfo = new HashMap<String, Object>();
-        if (athenaHealthResponse.has(ATHENA_MODULES_KEY)) {
-            JsonNode modules = athenaHealthResponse.get(ATHENA_MODULES_KEY);
-            // keys are module names, values are description maps
-            modules.fields().forEachRemaining(module -> {
-                var moduleHealth = new AthenaModuleHealth(module.getValue().get(ATHENA_MODULE_EXERCISE_TYPE_KEY).asText(),
-                        module.getValue().get(ATHENA_MODULE_HEALTHY_KEY).asBoolean(), module.getValue().get(ATHENA_MODULE_URL_KEY).asText());
-                additionalModuleInfo.put(module.getKey(), moduleHealthToString(moduleHealth));
-            });
-        }
+        var modules = athenaHealthResponse.modules();
+        modules.forEach((moduleName, descriptionMap) -> {
+            var moduleHealth = new AthenaModuleHealth(descriptionMap.type(), descriptionMap.healthy(), descriptionMap.url());
+            additionalModuleInfo.put(moduleName, moduleHealthToString(moduleHealth));
+        });
         return additionalModuleInfo;
     }
 }

src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaHealthResponse.java

@@ -0,0 +1,15 @@
+package de.tum.cit.aet.artemis.athena.config;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record AthenaHealthResponse(String status, Map<String, ModuleHealth> modules) {
+
+    public record ModuleHealth(String url, String type, boolean healthy, boolean supportsEvaluation, boolean supportsNonGradedFeedbackRequests,
+            boolean supportsGradedFeedbackRequests) {
+    }
+}

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

@@ -29,7 +29,7 @@
 import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
 import de.tum.cit.aet.artemis.core.repository.UserRepository;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent;
-import de.tum.cit.aet.artemis.core.service.CourseService;
+import de.tum.cit.aet.artemis.core.service.course.CourseAtlasService;
 
 @Conditional(AtlasEnabled.class)
 @RestController
@@ -42,15 +42,15 @@ public class LearnerProfileResource {
 
     private final CourseLearnerProfileRepository courseLearnerProfileRepository;
 
-    private final CourseService courseService;
+    private final CourseAtlasService courseAtlasService;
 
     private final CourseLearnerProfileService courseLearnerProfileService;
 
-    public LearnerProfileResource(UserRepository userRepository, CourseLearnerProfileRepository courseLearnerProfileRepository, CourseService courseService,
+    public LearnerProfileResource(UserRepository userRepository, CourseLearnerProfileRepository courseLearnerProfileRepository, CourseAtlasService courseAtlasService,
             CourseLearnerProfileService courseLearnerProfileService) {
         this.userRepository = userRepository;
         this.courseLearnerProfileRepository = courseLearnerProfileRepository;
-        this.courseService = courseService;
+        this.courseAtlasService = courseAtlasService;
         this.courseLearnerProfileService = courseLearnerProfileService;
     }
 
@@ -68,7 +68,7 @@ public ResponseEntity<Set<CourseLearnerProfileDTO>> getCourseLearnerProfiles() {
         Set<CourseLearnerProfile> courseLearnerProfiles = courseLearnerProfileRepository.findAllByLoginAndCourseActive(user.getLogin(), ZonedDateTime.now()).stream()
                 .filter(profile -> user.getGroups().contains(profile.getCourse().getStudentGroupName())).collect(Collectors.toSet());
 
-        Set<Course> coursesWithLearningPaths = courseService.findAllActiveForUserAndLearningPathsEnabled(user);
+        Set<Course> coursesWithLearningPaths = courseAtlasService.findAllActiveForUserAndLearningPathsEnabled(user);
 
         // This is needed, as there is no method that is executed everytime a user is added to a new course
         Set<CourseLearnerProfile> newProfiles = coursesWithLearningPaths.stream()

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

@@ -53,7 +53,7 @@
 import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse;
 import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse;
 import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService;
-import de.tum.cit.aet.artemis.core.service.CourseService;
+import de.tum.cit.aet.artemis.core.service.course.CourseService;
 import de.tum.cit.aet.artemis.core.service.feature.Feature;
 import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle;
 

src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java

@@ -70,7 +70,7 @@ private Specification<Post> configureSearchSpecification(Specification<Post> spe
      * @return returns a Page of Messages
      */
     default Page<Post> findMessages(PostContextFilterDTO postContextFilter, Pageable pageable, long userId) {
-        var specification = Specification.where(getConversationsSpecification(postContextFilter.conversationIds()));
+        var specification = getConversationsSpecification(postContextFilter.conversationIds());
         specification = configureSearchSpecification(specification, postContextFilter, userId);
         // Fetch all necessary attributes to avoid lazy loading (even though relations are defined as EAGER in the domain class, specification queries do not respect this)
         return findPostsWithSpecification(pageable, specification);

src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java

@@ -9,6 +9,7 @@
 import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.criteria.Order;
 import jakarta.persistence.criteria.Predicate;
+import jakarta.validation.constraints.NotNull;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.jpa.domain.Specification;
@@ -42,12 +43,15 @@ public static Specification<Post> getSearchTextAndAuthorSpecification(String sea
         return (root, query, criteriaBuilder) -> {
             boolean hasText = searchText != null && !searchText.isBlank();
             boolean hasAuthors = authorIds != null && authorIds.length > 0;
+            // no author ids and no search text means no filtering
             if (!hasText && !hasAuthors) {
                 return null;
             }
+            // if only a search text is given, use the search text specification
             if (hasText && !hasAuthors) {
                 return getSearchTextSpecification(searchText).toPredicate(root, query, criteriaBuilder);
             }
+            // if only author ids are given, use the author specification
             if (!hasText && hasAuthors) {
                 return getAuthorSpecification(authorIds).toPredicate(root, query, criteriaBuilder);
             }
@@ -74,6 +78,7 @@ public static Specification<Post> getSearchTextAndAuthorSpecification(String sea
      * @param searchText Text to be searched within messages
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getSearchTextSpecification(String searchText) {
         return ((root, query, criteriaBuilder) -> {
             if (searchText == null || searchText.isBlank()) {
@@ -103,6 +108,7 @@ else if (searchText.startsWith("#") && StringUtils.isNumeric(searchText.substrin
      * @param conversationIds ids of the conversation messages belong to
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getConversationsSpecification(long[] conversationIds) {
         return ((root, query, criteriaBuilder) -> {
             if (conversationIds == null || conversationIds.length == 0) {
@@ -121,6 +127,7 @@ public static Specification<Post> getConversationsSpecification(long[] conversat
      * @param courseId           id of course the posts belong to
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getCourseWideChannelsSpecification(boolean filterToCourseWide, Long courseId) {
         return (root, query, criteriaBuilder) -> {
             if (!filterToCourseWide) {
@@ -142,6 +149,7 @@ public static Specification<Post> getCourseWideChannelsSpecification(boolean fil
      * @param authorIds ids of the post authors
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getAuthorSpecification(long[] authorIds) {
         return ((root, query, criteriaBuilder) -> {
             if (authorIds == null || authorIds.length == 0) {
@@ -164,6 +172,7 @@ public static Specification<Post> getAuthorSpecification(long[] authorIds) {
      * @param userId            id of the calling user
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getAnsweredOrReactedSpecification(boolean answeredOrReacted, Long userId) {
         return ((root, query, criteriaBuilder) -> {
             if (!answeredOrReacted) {
@@ -190,6 +199,7 @@ public static Specification<Post> getAnsweredOrReactedSpecification(boolean answ
      * @param unresolved whether only the Posts without resolving answers should be fetched or not
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getUnresolvedSpecification(boolean unresolved) {
         return ((root, query, criteriaBuilder) -> {
             if (!unresolved) {
@@ -218,9 +228,10 @@ public static Specification<Post> getUnresolvedSpecification(boolean unresolved)
      * @param sortingOrder      direction of sorting (ASC, DESC)
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getSortSpecification(boolean pagingEnabled, PostSortCriterion postSortCriterion, SortingOrder sortingOrder) {
         return ((root, query, criteriaBuilder) -> {
-            if (pagingEnabled && postSortCriterion != null && sortingOrder != null) {
+            if (pagingEnabled && postSortCriterion != null && sortingOrder != null && query != null) {
 
                 List<Order> orderList = new ArrayList<>();
 
@@ -246,9 +257,12 @@ public static Specification<Post> getSortSpecification(boolean pagingEnabled, Po
      *         incompatible with each other at server tests
      *         <a href="https://github.com/h2database/h2database/issues/408">...</a>
      */
+    @NotNull
     public static Specification<Post> distinct() {
         return (root, query, criteriaBuilder) -> {
-            query.groupBy(root.get(Post_.ID));
+            if (query != null) {
+                query.groupBy(root.get(Post_.ID));
+            }
             return null;
         };
     }
@@ -259,6 +273,7 @@ public static Specification<Post> distinct() {
      * @param pinnedOnly whether only pinned posts should be fetched
      * @return specification used to chain DB operations
      */
+    @NotNull
     public static Specification<Post> getPinnedSpecification(boolean pinnedOnly) {
         return (root, query, criteriaBuilder) -> {
             if (!pinnedOnly) {

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

@@ -786,9 +786,9 @@ default Page<UserDTO> getAllManagedUsers(UserPageableSearchDTO userSearch) {
         var noRegistrationNumber = userSearch.getRegistrationNumbers().contains(FILTER_WITHOUT_REG_NO);
         var withRegistrationNumber = userSearch.getRegistrationNumbers().contains(FILTER_WITH_REG_NO);
 
-        Specification<User> specification = Specification.where(distinct()).and(notSoftDeleted()).and(getSearchTermSpecification(searchTerm))
-                .and(getInternalOrExternalSpecification(internal, external)).and(getActivatedOrDeactivatedSpecification(activated, deactivated))
-                .and(getAuthoritySpecification(modifiedAuthorities)).and(getWithOrWithoutRegistrationNumberSpecification(noRegistrationNumber, withRegistrationNumber));
+        Specification<User> specification = distinct().and(notSoftDeleted()).and(getSearchTermSpecification(searchTerm)).and(getInternalOrExternalSpecification(internal, external))
+                .and(getActivatedOrDeactivatedSpecification(activated, deactivated)).and(getAuthoritySpecification(modifiedAuthorities))
+                .and(getWithOrWithoutRegistrationNumberSpecification(noRegistrationNumber, withRegistrationNumber));
 
         if (userSearch.isFindWithoutUserGroups()) {
             specification = specification.and(getAllUsersWithoutUserGroups());