diff --git a/.github/workflows/check-translation-keys.yml b/.github/workflows/check-translation-keys.yml index a14ed3f43b9a..02dbe17f2955 100644 --- a/.github/workflows/check-translation-keys.yml +++ b/.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/ diff --git a/.github/workflows/validate-pr-title.yml b/.github/workflows/validate-pr-title.yml new file mode 100644 index 000000000000..37e280ee2017 --- /dev/null +++ b/.github/workflows/validate-pr-title.yml @@ -0,0 +1,14 @@ +name: Validate PR Title + +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review, edited] + +jobs: + validate-pr-title: + runs-on: ubuntu-latest + timeout-minutes: 1 + steps: + - uses: Slashgear/action-check-pr-title@v4.3.0 + with: + regexp: '^`(Programming exercises|Integrated code lifecycle|Quiz exercises|Modeling exercises|Text exercises|File upload exercises|Exam mode|Grading|Assessment|Communication|Notifications|Team exercises|Lectures|Integrated markdown editor|Plagiarism checks|Learning analytics|Adaptive learning|Learning path|Tutorial groups|Iris|Scalability|Usability|Performance|Infrastructure|Mobile apps|Development|General)`:\s[A-Z].*$' \ No newline at end of file diff --git a/.idea/runConfigurations/_template__of_Gradle.xml b/.idea/runConfigurations/_template__of_Gradle.xml index 0d7f0a89449e..7c6cecee1dad 100644 --- a/.idea/runConfigurations/_template__of_Gradle.xml +++ b/.idea/runConfigurations/_template__of_Gradle.xml @@ -4,7 +4,7 @@ diff --git a/README.md b/README.md index 9b6118e0fe28..08742f5d89b5 100644 --- a/README.md +++ b/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 username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.5.6.war +./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.6.0.war ``` ## Architecture diff --git a/angular.json b/angular.json index e5543ff2ce60..008ac75d13bf 100644 --- a/angular.json +++ b/angular.json @@ -113,7 +113,7 @@ }, { "glob": "**/*", - "input": "./node_modules/monaco-editor/min/vs", + "input": "./node_modules/monaco-editor/bundles/vs", "output": "vs" } ], diff --git a/build.gradle b/build.gradle index 1375d3298583..163b2517748f 100644 --- a/build.gradle +++ b/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 { @@ -246,12 +246,15 @@ dependencies { implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.5" implementation "de.jplag:jplag:${jplag_version}" - implementation "de.jplag:java:${jplag_version}" - implementation "de.jplag:kotlin:${jplag_version}" + implementation "de.jplag:c:${jplag_version}" - implementation "de.jplag:swift:${jplag_version}" implementation "de.jplag:java:${jplag_version}" + implementation "de.jplag:javascript:${jplag_version}" + implementation "de.jplag:kotlin:${jplag_version}" implementation "de.jplag:python-3:${jplag_version}" + implementation "de.jplag:rlang:${jplag_version}" + implementation "de.jplag:rust:${jplag_version}" + implementation "de.jplag:swift:${jplag_version}" implementation "de.jplag:text:${jplag_version}" // those are transitive dependencies of JPlag Text --> Stanford NLP @@ -270,7 +273,7 @@ dependencies { } } - implementation "org.apache.logging.log4j:log4j-to-slf4j:2.24.0" + implementation "org.apache.logging.log4j:log4j-to-slf4j:2.24.1" // Note: spring-security-lti13 does not work with jakarta yet, so we built our own custom version and declare its transitive dependencies below // implementation "uk.ac.ox.ctl:spring-security-lti13:0.1.11" @@ -342,7 +345,7 @@ dependencies { implementation "tech.jhipster:jhipster-framework:${jhipster_dependencies_version}" implementation "org.springframework.boot:spring-boot-starter-cache:${spring_boot_version}" - implementation "io.micrometer:micrometer-registry-prometheus:1.13.4" + implementation "io.micrometer:micrometer-registry-prometheus:1.13.5" implementation "net.logstash.logback:logstash-logback-encoder:8.0" // Defines low-level streaming API, and includes JSON-specific implementations @@ -405,7 +408,7 @@ dependencies { implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.3" implementation "org.springframework.cloud:spring-cloud-commons:4.1.4" - implementation "io.netty:netty-all:4.1.113.Final" + implementation "io.netty:netty-all:4.1.114.Final" implementation "io.projectreactor.netty:reactor-netty:1.1.22" implementation "org.springframework:spring-messaging:6.1.13" implementation "org.springframework.retry:spring-retry:2.0.9" @@ -416,7 +419,7 @@ dependencies { implementation "org.springframework.security:spring-security-oauth2-core:${spring_security_version}" implementation "org.springframework.security:spring-security-oauth2-client:${spring_security_version}" // use newest version of nimbus-jose-jwt to avoid security issues through outdated dependencies - implementation "com.nimbusds:nimbus-jose-jwt:9.41.1" + implementation "com.nimbusds:nimbus-jose-jwt:9.41.2" implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}" implementation "org.springframework.security:spring-security-crypto:${spring_security_version}" @@ -464,7 +467,7 @@ dependencies { implementation "com.google.code.gson:gson:2.11.0" - implementation "com.google.errorprone:error_prone_annotations:2.32.0" + implementation "com.google.errorprone:error_prone_annotations:2.33.0" // NOTE: we want to keep the same unique version for all configurations, implementation and annotationProcessor implementation("net.bytebuddy:byte-buddy") { @@ -528,11 +531,11 @@ dependencies { testImplementation "org.mockito:mockito-core:${mockito_version}" testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}" - testImplementation "io.github.classgraph:classgraph:4.8.176" + testImplementation "io.github.classgraph:classgraph:4.8.177" testImplementation "org.awaitility:awaitility:4.2.2" testImplementation "org.apache.maven.shared:maven-invoker:3.3.0" testImplementation "org.gradle:gradle-tooling-api:8.10.2" - testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.0" + testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.1" testImplementation "com.opencsv:opencsv:5.9" testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") { exclude group: "org.testcontainers", module: "mariadb" diff --git a/docs/dev/guidelines/database.rst b/docs/dev/guidelines/database.rst index 65365549f10a..ea4e436b53d4 100644 --- a/docs/dev/guidelines/database.rst +++ b/docs/dev/guidelines/database.rst @@ -295,7 +295,7 @@ Best Practices // IrisSubSettings.java @Column(name = "allowed_models") @Convert(converter = IrisModelListConverter.class) - private TreeSet allowedModels = new TreeSet<>(); + private TreeSet allowedVariants = new TreeSet<>(); * **Ordered Collection with duplicates**: When you want to order the collection of (potentially duplicated) objects of the relationship, then always use a ``List``. It is important to note here that there is no inherent order in a database table. One could argue that you can use the ``id`` field for the ordering, but there are edge cases where this can lead to problems. Therefore, for an ordered collection with duplicates, **always** annotate it with ``@OrderColumn``. An order column indicates to Hibernate that we want to order our collection based on a specific column of our data table. By default, the column name it expects is *tablenameS\_order*. For ordered collections, we also recommend that you annotate them with ``cascade = CascadeType.ALL`` and ``orphanRemoval = true``. E.g.: diff --git a/docs/index.rst b/docs/index.rst index 32c130434e4f..f4a7bc4cf449 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -37,6 +37,7 @@ All these exercises are supposed to be run either live in the lecture with insta user/grading user/courses/customizable user/markdown-support + user/integrated-code-lifecycle user/exports user/mobile-applications user/lti diff --git a/docs/user/exercises/programming-exercise-features.inc b/docs/user/exercises/programming-exercise-features.inc index 6d0b257dd96e..660e2bd4bf02 100644 --- a/docs/user/exercises/programming-exercise-features.inc +++ b/docs/user/exercises/programming-exercise-features.inc @@ -37,6 +37,8 @@ Instructors can still use those templates to generate programming exercises and +----------------------+----------+---------+ | JavaScript | yes | yes | +----------------------+----------+---------+ + | R | yes | yes | + +----------------------+----------+---------+ - Not all ``templates`` support the same feature set and supported features can also change depending on the continuous integration system setup. Depending on the feature set, some options might not be available during the creation of the programming exercise. @@ -67,9 +69,11 @@ Instructors can still use those templates to generate programming exercises and +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+ | OCaml | no | no | no | no | n/a | yes | no | L: yes, J: no | +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+ - | Rust | no | no | no | no | n/a | no | no | L: yes, J: no | + | Rust | no | no | yes | no | n/a | no | no | L: yes, J: no | + +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+ + | JavaScript | no | no | yes | no | n/a | no | no | L: yes, J: no | +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+ - | JavaScript | no | no | no | no | n/a | no | no | L: yes, J: no | + | R | no | no | yes | no | n/a | no | no | L: yes, J: no | +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+ - *Sequential Test Runs*: ``Artemis`` can generate a build plan which first executes structural and then behavioral tests. This feature can help students to better concentrate on the immediate challenge at hand. diff --git a/docs/user/exercises/programming-repository-access.inc b/docs/user/exercises/programming-repository-access.inc index 45323fced7dd..c4e201d0f4b6 100644 --- a/docs/user/exercises/programming-repository-access.inc +++ b/docs/user/exercises/programming-repository-access.inc @@ -1,3 +1,5 @@ +If you are a student, and want to know how to use the Artemis Version Control for checking out repositories locally, :ref:`checkout this guide.` + The following tables lists the different types of repositories and gives an overview of the access rights different users have. To gain these access rights, a user must assume the indicated role in the course the repository belongs to. diff --git a/docs/user/exercises/programming.rst b/docs/user/exercises/programming.rst index 6f8a8e00782c..61f1731c4dff 100644 --- a/docs/user/exercises/programming.rst +++ b/docs/user/exercises/programming.rst @@ -224,19 +224,5 @@ Each one represents a single test case feedback and should have the format: Integrated Code Lifecycle ------------------------- -The following sections describe programming exercise features that are part of the integrated code lifecycle system. - -Repository View -^^^^^^^^^^^^^^^ - -.. include:: programming-integrated-code-lifecycle-repository-view.inc - -Build Agent View -^^^^^^^^^^^^^^^^ - -.. include:: programming-integrated-code-lifecycle-build-agent-view.inc - -Build Overview View -^^^^^^^^^^^^^^^^^^^ - -.. include:: programming-integrated-code-lifecycle-build-queue-view.inc +The Artemis Integrated Code Lifecycle system allows you to use programming exercises fully integrated within Artemis, without the need of any external tools. +Find more information on it :ref:`here`. diff --git a/docs/user/exercises/programming/build-agent-details.png b/docs/user/exercises/programming/build-agent-details.png deleted file mode 100644 index ae9d8f2561f4..000000000000 Binary files a/docs/user/exercises/programming/build-agent-details.png and /dev/null differ diff --git a/docs/user/exercises/programming/build-agent-summary.png b/docs/user/exercises/programming/build-agent-summary.png deleted file mode 100644 index 414451407f71..000000000000 Binary files a/docs/user/exercises/programming/build-agent-summary.png and /dev/null differ diff --git a/docs/user/exercises/programming/buildQueueCourseManagement.png b/docs/user/exercises/programming/buildQueueCourseManagement.png deleted file mode 100644 index dc16f6dd6a32..000000000000 Binary files a/docs/user/exercises/programming/buildQueueCourseManagement.png and /dev/null differ diff --git a/docs/user/exercises/programming/buildQueueSystemAdministration.png b/docs/user/exercises/programming/buildQueueSystemAdministration.png deleted file mode 100644 index 1a18244e443a..000000000000 Binary files a/docs/user/exercises/programming/buildQueueSystemAdministration.png and /dev/null differ diff --git a/docs/user/exercises/programming/commit-diff-view.png b/docs/user/exercises/programming/commit-diff-view.png deleted file mode 100644 index cfd5cda349cc..000000000000 Binary files a/docs/user/exercises/programming/commit-diff-view.png and /dev/null differ diff --git a/docs/user/exercises/programming/commit-history-view.png b/docs/user/exercises/programming/commit-history-view.png deleted file mode 100644 index ac691c9c3a60..000000000000 Binary files a/docs/user/exercises/programming/commit-history-view.png and /dev/null differ diff --git a/docs/user/exercises/programming/course-management-repositories.png b/docs/user/exercises/programming/course-management-repositories.png deleted file mode 100644 index 47e842da25a5..000000000000 Binary files a/docs/user/exercises/programming/course-management-repositories.png and /dev/null differ diff --git a/docs/user/exercises/programming/current-repository-content-view.png b/docs/user/exercises/programming/current-repository-content-view.png deleted file mode 100644 index 041b6411f6a1..000000000000 Binary files a/docs/user/exercises/programming/current-repository-content-view.png and /dev/null differ diff --git a/docs/user/exercises/programming/finished-build-jobs.png b/docs/user/exercises/programming/finished-build-jobs.png deleted file mode 100644 index 149a7f98819b..000000000000 Binary files a/docs/user/exercises/programming/finished-build-jobs.png and /dev/null differ diff --git a/docs/user/exercises/programming/open-repository-button.png b/docs/user/exercises/programming/open-repository-button.png deleted file mode 100644 index a758454dead7..000000000000 Binary files a/docs/user/exercises/programming/open-repository-button.png and /dev/null differ diff --git a/docs/user/exercises/programming/open-repository-instructor-participations.png b/docs/user/exercises/programming/open-repository-instructor-participations.png deleted file mode 100644 index 03e9e66e3910..000000000000 Binary files a/docs/user/exercises/programming/open-repository-instructor-participations.png and /dev/null differ diff --git a/docs/user/exercises/programming/open-repository-student.png b/docs/user/exercises/programming/open-repository-student.png deleted file mode 100644 index 5685e134d177..000000000000 Binary files a/docs/user/exercises/programming/open-repository-student.png and /dev/null differ diff --git a/docs/user/exercises/programming/queued-build-jobs.png b/docs/user/exercises/programming/queued-build-jobs.png deleted file mode 100644 index eb7165c01436..000000000000 Binary files a/docs/user/exercises/programming/queued-build-jobs.png and /dev/null differ diff --git a/docs/user/exercises/programming/running-build-jobs.png b/docs/user/exercises/programming/running-build-jobs.png deleted file mode 100644 index 08ccfa8856fd..000000000000 Binary files a/docs/user/exercises/programming/running-build-jobs.png and /dev/null differ diff --git a/docs/user/icl/general.rst b/docs/user/icl/general.rst new file mode 100644 index 000000000000..bf0132e6d20e --- /dev/null +++ b/docs/user/icl/general.rst @@ -0,0 +1,12 @@ +.. _icl-general-information: + +General Information +=================== + +Artemis offers the Integrated Code Lifecycle (ICL), a comprehensive feature designed to streamline the development process for programming exercises. +ICL combines version control, secure communication, and continuous integration to provide a seamless experience for students and instructors. +Understanding these components is crucial for effectively using Artemis, especially if you're new to concepts like SSH and Git. The key components of ICL are: + +- :ref:`Local Version Control`: Use the Local Version Control to interact with the repositories of programming exercises. +- :ref:`SSH`: Use SSH to perform Git operations on repositories. +- :ref:`Local Continuous Integration`: Exercise submissions are built and tested by the Local CI system. diff --git a/docs/user/exercises/programming-integrated-code-lifecycle-build-agent-view.inc b/docs/user/icl/local-ci-build-agent-view.inc similarity index 95% rename from docs/user/exercises/programming-integrated-code-lifecycle-build-agent-view.inc rename to docs/user/icl/local-ci-build-agent-view.inc index a59068be8589..b211e879b252 100644 --- a/docs/user/exercises/programming-integrated-code-lifecycle-build-agent-view.inc +++ b/docs/user/icl/local-ci-build-agent-view.inc @@ -5,7 +5,7 @@ The build agent view consists of two parts: the *Build Agent Summary View* and t The **Build Agent Summary View** shows a list of all build agents in the system, along with their status (idle and running), maximum number of concurrent builds, and running builds. The running builds can be canceled individually by clicking the red cancellation button next to the build. An Administrator can also cancel all running builds on a build agent by clicking the '*Cancel All*' button. -.. figure:: programming/build-agent-summary.png +.. figure:: local-ci/build-agent-summary.png :alt: Build Agent Summary View :align: center @@ -20,7 +20,7 @@ the submission time, start time, end time, the duration of the build job, the co The administrator can click on the participation ID to navigate to the participation's submission page. The administrator can also click on the commit hash to navigate to the commits details page and the course ID to navigate to the course management page. -.. figure:: programming/build-agent-details.png +.. figure:: local-ci/build-agent-details.png :alt: Build Agent Details :align: center diff --git a/docs/user/exercises/programming-integrated-code-lifecycle-build-queue-view.inc b/docs/user/icl/local-ci-build-queue-view.inc similarity index 90% rename from docs/user/exercises/programming-integrated-code-lifecycle-build-queue-view.inc rename to docs/user/icl/local-ci-build-queue-view.inc index 2c2470d9561a..7c865758f98c 100644 --- a/docs/user/exercises/programming-integrated-code-lifecycle-build-queue-view.inc +++ b/docs/user/icl/local-ci-build-queue-view.inc @@ -1,7 +1,7 @@ Artemis provides a build overview view that displays all queued, running, and finished build jobs. Access to the system-wide build overview is exclusively available to **Administrators** through the *System Administration* menu. -.. figure:: programming/buildQueueSystemAdministration.png +.. figure:: local-ci/buildQueueSystemAdministration.png :alt: Build Overview System Administration :align: center @@ -10,7 +10,7 @@ exclusively available to **Administrators** through the *System Administration* **Instructors** can access the build overview for a specific course through the *Build Overview* button located in *Course Management*. This view displays only the queued, running, and finished build jobs associated with the selected course. -.. figure:: programming/buildQueueCourseManagement.png +.. figure:: local-ci/buildQueueCourseManagement.png :alt: Build Overview Course Management :align: center @@ -27,7 +27,7 @@ Jobs are dynamically added to and removed from the queue in real-time. Users have the ability to cancel any job in progress. The table provides the following information: -.. figure:: programming/running-build-jobs.png +.. figure:: local-ci/running-build-jobs.png :alt: Running Build Jobs :align: center @@ -43,7 +43,7 @@ Users also have the option to cancel any job that is queued. The table below displays the following information: -.. figure:: programming/queued-build-jobs.png +.. figure:: local-ci/queued-build-jobs.png :alt: Queued Build Jobs :align: center @@ -59,7 +59,7 @@ Instructors can also access build logs with detailed information about the build The table provides the following information: -.. figure:: programming/finished-build-jobs.png +.. figure:: local-ci/finished-build-jobs.png :alt: Finished Build Jobs :align: center diff --git a/docs/user/icl/local-ci/build-agent-details.png b/docs/user/icl/local-ci/build-agent-details.png new file mode 100644 index 000000000000..4b5b8474781a Binary files /dev/null and b/docs/user/icl/local-ci/build-agent-details.png differ diff --git a/docs/user/icl/local-ci/build-agent-summary.png b/docs/user/icl/local-ci/build-agent-summary.png new file mode 100644 index 000000000000..ec11e28a0d1d Binary files /dev/null and b/docs/user/icl/local-ci/build-agent-summary.png differ diff --git a/docs/user/icl/local-ci/buildQueueCourseManagement.png b/docs/user/icl/local-ci/buildQueueCourseManagement.png new file mode 100644 index 000000000000..d4e255f39988 Binary files /dev/null and b/docs/user/icl/local-ci/buildQueueCourseManagement.png differ diff --git a/docs/user/icl/local-ci/buildQueueSystemAdministration.png b/docs/user/icl/local-ci/buildQueueSystemAdministration.png new file mode 100644 index 000000000000..9a857a317ce8 Binary files /dev/null and b/docs/user/icl/local-ci/buildQueueSystemAdministration.png differ diff --git a/docs/user/icl/local-ci/finished-build-jobs.png b/docs/user/icl/local-ci/finished-build-jobs.png new file mode 100644 index 000000000000..eb7b3dda190d Binary files /dev/null and b/docs/user/icl/local-ci/finished-build-jobs.png differ diff --git a/docs/user/icl/local-ci/queued-build-jobs.png b/docs/user/icl/local-ci/queued-build-jobs.png new file mode 100644 index 000000000000..acd382dfe1f8 Binary files /dev/null and b/docs/user/icl/local-ci/queued-build-jobs.png differ diff --git a/docs/user/icl/local-ci/running-build-jobs.png b/docs/user/icl/local-ci/running-build-jobs.png new file mode 100644 index 000000000000..8cc66a2e5c63 Binary files /dev/null and b/docs/user/icl/local-ci/running-build-jobs.png differ diff --git a/docs/user/icl/local-continuous-integration.rst b/docs/user/icl/local-continuous-integration.rst new file mode 100644 index 000000000000..6c3cdd9b8e65 --- /dev/null +++ b/docs/user/icl/local-continuous-integration.rst @@ -0,0 +1,27 @@ +.. _local-ci: + +Continuous Integration +====================== + +Continuous Integration (CI) is a software development practice where developers frequently merge their code changes into a shared repository. Each change is automatically built and tested, which helps to: + +- Detect and address integration issues early +- Ensure code quality and consistency +- Streamline the development process + +Artemis Local CI is our implementation of these CI principles, tailored to support the Artemis learning platform. +It provides tools and views to help users build and test in programming exercises effectively. + +This document will introduce you to the key components of Artemis Local CI: the Build Agent View and the Build Overview View. +These tools will assist you throughout your development workflow on the Artemis platform. + +Build Agent View +^^^^^^^^^^^^^^^^ + +.. include:: local-ci-build-agent-view.inc + + +Build Overview View +^^^^^^^^^^^^^^^^^^^ + +.. include:: local-ci-build-queue-view.inc diff --git a/docs/user/icl/local-vc-authentication.inc b/docs/user/icl/local-vc-authentication.inc new file mode 100644 index 000000000000..6735cd2743df --- /dev/null +++ b/docs/user/icl/local-vc-authentication.inc @@ -0,0 +1,67 @@ +Cloning a repository +^^^^^^^^^^^^^^^^^^^^ + +You can use Sourcetree, git from the terminal, or any client you like to clone your Git repository. +These instructions show you how to clone your repository using Git from the terminal. + +From the exercise view, click the code button to display the Clone dialog. +Copy the clone URL (either the SSH format or the HTTPS, with or without token). +If you are using the SSH protocol, ensure your public key is stored in your Artemis account settings and loaded on the local system to which you are cloning. +From a terminal window, change to the local directory where you want to clone your repository. + +Paste the command you copied from Bitbucket, for example: + +Clone over HTTPS: + +.. code-block:: bash + + git clone https://username@artemis.cit.tum.de/course/documentation-tests.git + + +Clone over HTTPS with access token: + +.. code-block:: bash + + git clone https://username:accessToken@artemis.cit.tum.de/course/documentation-tests.git + + +Clone over SSH: + +.. code-block:: bash + + git clone ssh://git@artemis.cit.tum.de/course/documentation-tests.git + + +If the clone was successful, a new sub-directory appears on your local drive. +This directory has the same name as the repository that you cloned. +The clone contains the files and metadata that Git requires to maintain the changes you make to the source files. + +Choosing between HTTPS and SSH: + +- HTTPS: Easier to set up initially, works through firewalls, but requires entering credentials more frequently. +- SSH: More secure, doesn't require entering passwords for each operation once set up, but initial setup can be more complex. + +Choose HTTPS if you're new to Git or working in an environment with strict firewall rules. +Choose SSH for enhanced security and convenience in long-term development. + +HTTPS access tokens +^^^^^^^^^^^^^^^^^^^ + +Instructors can create HTTP access tokens for repository access in Artemis. +They are created in the account settings and are used in place of passwords for Git over HTTPS. +For every student's exercise, Artemis automatically generates an access token, only associated with the repository of this particular exercise. +You can use these to authenticate to the Artemis Local Version Control. + +Token Creation +"""""""""""""" + +1. Go to Profile > Settings > VCS token. +2. Create a new token + +Using SSH keys to secure Git operations +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Artemis provides a simple way for users to connect securely to repositories, using SSH to perform Git operations. +Next is a :ref:`small and basic introduction to SSH`, and if you already know it, :ref:`here is a guide on how to create SSH keys`. +If you already have an SSH key, :ref:`learn how to add it to your Artemis account here`. + diff --git a/docs/user/exercises/programming-integrated-code-lifecycle-repository-view.inc b/docs/user/icl/local-vc-repository-view.inc similarity index 88% rename from docs/user/exercises/programming-integrated-code-lifecycle-repository-view.inc rename to docs/user/icl/local-vc-repository-view.inc index 5273befacd08..aef46936e99a 100644 --- a/docs/user/exercises/programming-integrated-code-lifecycle-repository-view.inc +++ b/docs/user/icl/local-vc-repository-view.inc @@ -3,13 +3,13 @@ These changes are stored in a repository. A repository is a collection of files How to navigate through the repository and view the code is explained in the following sections. This guide is divided into two parts: one for students and one for instructors. It is demonstrated using course programming exercises, but the same principles apply to exams as well. -For Students -"""""""""""" +Access Repositories as a Student +"""""""""""""""""""""""""""""""" As a student, you can use the repository to view your course submissions. To access your submissions, you need to navigate to the exercise, press the '*Code*' button, and click on |open-repository-button|. -.. figure:: programming/open-repository-student.png +.. figure:: local-vc/open-repository-student.png :alt: Opening the repository in the student view :align: center @@ -22,7 +22,7 @@ To the right side of the screen, above the problem statement, you can see the re the '*Code*' button to clone the repository to your local machine and see the full commit history by pressing the '*Open Commit History*' button. Finally, you can download the repository as a ZIP file by pressing the '*Download Repository*' button. -.. figure:: programming/current-repository-content-view.png +.. figure:: local-vc/current-repository-content-view.png :alt: Current Repository Content :align: center @@ -33,7 +33,7 @@ You can see the commit message, the author of the commit, the date of the commit If you created a submission with multiple commits, you can see all of them here but only the last commit has the result of the submission. Lastly, you can also view the code of the commit by pressing on the commit hash. -.. figure:: programming/commit-history-view.png +.. figure:: local-vc/commit-history-view.png :alt: Commit History View :align: center @@ -44,20 +44,20 @@ You can see the changes in the code, the files that have been added, the files t Green color indicates the lines that have been added and red color indicates the lines that have been deleted. You can also see the commit message, the author of the commit, the date of the commit and the commit hash. -.. figure:: programming/commit-diff-view.png +.. figure:: local-vc/commit-diff-view.png :alt: Commit Diff View :align: center Commit Diff View -For Instructors -""""""""""""""" +Access Repositories as an Instructor +"""""""""""""""""""""""""""""""""""" As an instructor, you can use the repository to view the submissions of your students. For this purpose, you need to navigate to the exercise participations page. Here you can see all the students’ participations for the exercise and navigate to the repository of a student by pressing the '*Code*' button and clicking on |open-repository-button|. This will show the repository of the student just like it is shown to the student. -.. figure:: programming/open-repository-instructor-participations.png +.. figure:: local-vc/open-repository-instructor-participations.png :alt: Open Repository Button in Participations Page :align: center @@ -66,11 +66,11 @@ This will show the repository of the student just like it is shown to the studen You can also see the repositories for an exercises **solution**, **template** and **test** repositories on the exercise management page. You can navigate to these repositories by pressing the '*Code*' button and clicking |open-repository-button| as described above. -.. figure:: programming/course-management-repositories.png +.. figure:: local-vc/course-management-repositories.png :alt: Solution, Template and Test Repositories in Exercise Management Page :align: center Solution, Template and Test Repositories in Exercise Management Page -.. |open-repository-button| image:: programming/open-repository-button.png +.. |open-repository-button| image:: local-vc/open-repository-button.png :scale: 50% diff --git a/docs/user/icl/local-vc/commit-diff-view.png b/docs/user/icl/local-vc/commit-diff-view.png new file mode 100644 index 000000000000..19ebb58be3ab Binary files /dev/null and b/docs/user/icl/local-vc/commit-diff-view.png differ diff --git a/docs/user/icl/local-vc/commit-history-view.png b/docs/user/icl/local-vc/commit-history-view.png new file mode 100644 index 000000000000..2dd208d0de16 Binary files /dev/null and b/docs/user/icl/local-vc/commit-history-view.png differ diff --git a/docs/user/icl/local-vc/course-management-repositories.png b/docs/user/icl/local-vc/course-management-repositories.png new file mode 100644 index 000000000000..ab0af10e9103 Binary files /dev/null and b/docs/user/icl/local-vc/course-management-repositories.png differ diff --git a/docs/user/icl/local-vc/current-repository-content-view.png b/docs/user/icl/local-vc/current-repository-content-view.png new file mode 100644 index 000000000000..961e9f17889b Binary files /dev/null and b/docs/user/icl/local-vc/current-repository-content-view.png differ diff --git a/docs/user/icl/local-vc/open-repository-button.png b/docs/user/icl/local-vc/open-repository-button.png new file mode 100644 index 000000000000..b1b4d60873cd Binary files /dev/null and b/docs/user/icl/local-vc/open-repository-button.png differ diff --git a/docs/user/icl/local-vc/open-repository-instructor-participations.png b/docs/user/icl/local-vc/open-repository-instructor-participations.png new file mode 100644 index 000000000000..bf051e6d644d Binary files /dev/null and b/docs/user/icl/local-vc/open-repository-instructor-participations.png differ diff --git a/docs/user/icl/local-vc/open-repository-student.png b/docs/user/icl/local-vc/open-repository-student.png new file mode 100644 index 000000000000..93312d1cab27 Binary files /dev/null and b/docs/user/icl/local-vc/open-repository-student.png differ diff --git a/docs/user/icl/local-vc/open-settings.png b/docs/user/icl/local-vc/open-settings.png new file mode 100644 index 000000000000..84c13407ab74 Binary files /dev/null and b/docs/user/icl/local-vc/open-settings.png differ diff --git a/docs/user/icl/local-vc/ssh-add-public-key.png b/docs/user/icl/local-vc/ssh-add-public-key.png new file mode 100644 index 000000000000..3e4683c09b7e Binary files /dev/null and b/docs/user/icl/local-vc/ssh-add-public-key.png differ diff --git a/docs/user/icl/local-version-control.rst b/docs/user/icl/local-version-control.rst new file mode 100644 index 000000000000..1ca1c1c2c31c --- /dev/null +++ b/docs/user/icl/local-version-control.rst @@ -0,0 +1,16 @@ +.. _local-vc: + +Local Version Control +===================== + +.. contents:: Content of this document + :local: + :depth: 2 + + +Repository View +^^^^^^^^^^^^^^^ + +.. include:: local-vc-repository-view.inc + +.. include:: local-vc-authentication.inc diff --git a/docs/user/icl/ssh-add-key-to-artemis.rst b/docs/user/icl/ssh-add-key-to-artemis.rst new file mode 100644 index 000000000000..0e3425faa501 --- /dev/null +++ b/docs/user/icl/ssh-add-key-to-artemis.rst @@ -0,0 +1,68 @@ +.. _use ssh key: + +Using SSH with Artemis +^^^^^^^^^^^^^^^^^^^^^^ + +.. contents:: Content of this document + :local: + :depth: 1 + +You can use SSH keys to establish a secure connection between your computer and Artemis when you are performing Git operations (pull, clone, push) from your local machine. +Personal keys are linked to your Artemis account, inheriting its permissions and operating under its unique identity. +To use your generated SSH keys with Artemis, you need to add it in the account settings. + + +Add an SSH key to your Artemis account +"""""""""""""""""""""""""""""""""""""" + +**1. Copy your public key** + +On Windows in your command prompt, change directory to your `.ssh` directory, and copy the public key file to your clipboard by running: + +.. code-block:: bash + + cd %userprofile%/.ssh + clip < id_ed25519.pub + +On macOS or Linux simply run the following in a terminal: + +.. _xclip: https://wiki.ubuntuusers.de/xclip/ + +.. code-block:: bash + + pbcopy < ~/.ssh/id_ed25519.pub + +If `pbcopy` isn't working, locate the hidden `.ssh` folder, open the file in a text editor, and copy it to your clipboard. +Note that on Linux, you may need to download and install `xclip`_, then use that, as shown in this code snippet: + +.. code-block:: bash + + sudo apt-get install xclip + xclip -sel clip < ~/.ssh/id_ed25519.pub + +Note that the key's name is not necessarily **id_ed25519.pub**, but can be arbitrary, and depends on how you saved it. + + +**2. Add the key to your Artemis account** + +Open the settings, go to the SSH tab, and select 'New Key'. +Then paste the copied SSH key into the text box. + ++---------------------------------------------------+--------------------------------------------------------------+ +|.. figure:: local-vc/open-settings.png | .. figure:: local-vc/ssh-add-public-key.png | +| :alt: Open account settings | :alt: Add public SSH key to account | +| :align: center | :align: center | +| | | +| Open you Artemis account settings | Add public SSH key to account in account settings | ++---------------------------------------------------+--------------------------------------------------------------+ + +**3. Save the key. You're done!** + +Use SSH to connect to Artemis repositories +"""""""""""""""""""""""""""""""""""""""""" + +After everything is set up, you can go to a programming exercise, and use the SSH clone URL with git to access the repository locally, like this, for example: + +.. code-block:: bash + + git clone ssh://git@artemis.cit.tum.de:7921/git/COURSE/exercise-user_1.git diff --git a/docs/user/icl/ssh-intro.rst b/docs/user/icl/ssh-intro.rst new file mode 100644 index 000000000000..fd41034ebe5d --- /dev/null +++ b/docs/user/icl/ssh-intro.rst @@ -0,0 +1,67 @@ +.. _basic SSH introduction: + +SSH +^^^ + +.. contents:: Content of this document + :local: + :depth: 2 + +Artemis uses SSH as a simple way for users to connect securely to repositories to perform Git operations. + +What is SSH? +"""""""""""" + +.. _SSH (Secure Shell): https://en.wikipedia.org/wiki/Secure_Shell + +`SSH (Secure Shell)`_ is a protocol that allows you to securely connect to another computer over a network. +It’s mostly used by system administrators, developers, and IT professionals to remotely manage servers or computers. +SSH provides a secure and encrypted communication channel between your computer and a remote machine, so any data passed (like passwords or commands) is protected from eavesdropping. +In Artemis you an use SSH to access your repositories with Git. + +Why use SSH? +"""""""""""" + +The main advantage of SSH is security. +When you connect to a remote machine using SSH, all the data exchanged between your computer and the server is encrypted. +This means if someone tries to intercept the communication, they can't read it. It's like sending messages through a locked box that only you and the server can open. + +How does SSH work? +"""""""""""""""""" + +SSH works by using two components: + +- Client: The computer you are using to connect. +- Server: The machine you want to connect to. + +When you want to connect, your SSH client sends a request to the server. +If the connection is successful, you can log in to the server and start working as if you were sitting in front of it. +The connection uses SSH keys for authentication. Although it is also possible to use username and password to connect over SSH, this is discouraged. + +What are SSH Keys? +"""""""""""""""""" + +.. _public-key cryptography: https://en.wikipedia.org/wiki/Public-key_cryptography + + +SSH keys are a more secure alternative to passwords for logging into a server. +They are based on `public-key cryptography`_ and come in pairs: a public key and a private key. + +- Public Key: This key is stored on the server. Think of it like a lock that only you can open. +- Private Key: This key stays on your local machine (never shared!). It’s like the key to that lock. + +When you try to connect to the server, your computer proves it has the private key that matches the server's public key, granting you access. +You can add a personal SSH key to your user account to easily authenticate when performing read operations from your local machine. +An Artemis user can currently add one key to their account. +For instructions on how to add your SSH key to your Artemis account, please refer to :ref:`the relevant documentation`. + +Before you can use SSH keys to secure a connection with Artemis the following must have already been done: + +- SSH is enabled on your university's Artemis instance +- You need an SSH key! See :ref:`Creating SSH keys`. + +.. note:: + + - You can use the same SSH key for multiple repositories or projects. + - An Artemis user can currently only add one key to their account. + - Artemis supports ECDSA, RSA2, and Ed25519 key types. diff --git a/docs/user/icl/ssh-key-creation.rst b/docs/user/icl/ssh-key-creation.rst new file mode 100644 index 000000000000..58e7b01f5a4d --- /dev/null +++ b/docs/user/icl/ssh-key-creation.rst @@ -0,0 +1,161 @@ +.. _create ssh key: + +Creating SSH keys +^^^^^^^^^^^^^^^^^ + +.. contents:: Content of this document + :local: + :depth: 2 + +SSH keys can be used to establish a secure connection with the Artemis Local Version Control, where you are performing Git operations from your local machine. +The SSH key needs to be added to Artemis before you can make use of the key. + +Creating an SSH key on Windows +"""""""""""""""""""""""""""""" + +**1. Check for existing keys** + +You should check for existing SSH keys on your local computer. Open a command prompt, and run: + +.. code-block:: bash + + cd %userprofile%/.ssh + +- If you see "No such file or directory", then there aren't any existing keys: go to step 3. + +- Check to see if you have a key already: + +.. code-block:: bash + + dir id_* + +If there are existing keys, you may want to use those: :ref:`Add your key to Artemis`. + +**2. Back up old SSH keys** + +If you have existing SSH keys, but you don't want to use them when connecting to Bitbucket, you should back those up. +In a command prompt on your local computer, run: + +.. code-block:: bash + + mkdir key_backup + copy * key_backup + +**3. Generate a new SSH key** + +If you don't have an existing SSH key that you wish to use, generate one as follows: +1. Log in to your local computer as an administrator. +2. In a command prompt, run: + +.. _Git (with Git Bash): https://gitforwindows.org/ + + +.. code-block:: bash + + ssh-keygen -t ed25519 -C "your_email@example.com" + +Associating the key with your email address helps you to identify the key later on. +Note that the `ssh-keygen` command is only available if you have already installed `Git (with Git Bash)`_. +You'll see a response similar to this: + +.. code-block:: bash + + C:\Users\artemis>ssh-keygen -t ed25519 -C "your_email@example.com" + Generating public/private ed25519 key pair. + Enter file in which to save the key (/c/Users/artemis/.ssh/id_ed25519): + +3. Just press to accept the default location and file name. If the .ssh directory doesn't exist, the system creates one for you. +4. Enter, and re-enter, a passphrase when prompted. The whole interaction will look similar to this: + +.. code-block:: bash + + C:\Users\artemis>ssh-keygen -t ed25519 -C "your_email@example.com" + Generating public/private ed25519 key pair. + Enter file in which to save the key (/c/Users/artemis/.ssh/id_ed25519): + Created directory '/c/Users/artemis/.ssh'. + Enter passphrase (empty for no passphrase): + Enter same passphrase again: + Your identification has been saved in c/Users/artemis/.ssh/id_ed25519. + Your public key has been saved in c/Users/artemis/.ssh/id_ed25519.pub. + The key fingerprint is: + SHA256:wvaHYeLtY6+DlvV5sFZgDi3abcdefghijklmnopqrstuvw your_email@example.com + +5. You're done and you can now :ref:`add your key to Artemis`. + +Creating an SSH key on Linux & macOS +"""""""""""""""""""""""""""""""""""" + +**1. Check for existing SSH keys** + +You should check for existing SSH keys on your local computer. Open a terminal and run: + +.. code-block:: bash + + cd ~/.ssh + +If you see "No such file or directory, then there aren't any existing keys: go to step 3. +Check to see if you have a key already: + +.. code-block:: bash + + ls id_* + +If there are existing keys, you may want to use those: :ref:`Add your key to Artemis`. + +**2. Back up old SSH keys** + +If you have existing SSH keys, but you don't want to use them when connecting to Bitbucket, you should back those up. +In a command prompt on your local computer, run: + +.. code-block:: bash + + mkdir key_backup + cp * key_backup + +**3. Generate a new SSH key** + +If you don't have an existing SSH key that you wish to use, generate one as follows: + +1. Open a terminal on your local computer and enter the following: + +.. code-block:: bash + + ssh-keygen -t ed25519 -C "your_email@example.com" + +Associating the key with your email address helps you to identify the key later on. You'll see a response similar to this: + +.. code-block:: bash + + artemis@homemac ~ % ssh-keygen -t ed25519 -C artemis@email.com + Generating public/private ed25519 key pair. + Enter file in which to save the key (/Users/artemis/.ssh/id_ed25519): + +2. Just press to accept the default location and file name. If the .ssh directory doesn't exist, the system creates one for you. +3. Enter, and re-enter, a passphrase when prompted. The whole interaction will look similar to this: + +.. code-block:: bash + + artemis@homemac ~ % ssh-keygen -t ed25519 -C artemis@email.com + Generating public/private ed25519 key pair. + Enter file in which to save the key (/Users/artemis/.ssh/id_ed25519): + Enter passphrase (empty for no passphrase): + Enter same passphrase again: + Your identification has been saved in /Users/artemis/.ssh/id_ed25519. + Your public key has been saved in /Users/artemis/.ssh/id_ed25519.pub. + The key fingerprint is: + SHA256:gTVWKbn41z6JgBNu3wYjLC4abcdefghijklmnopqrstuvwxy artemis@email.com + The keys randomart image is: + +--[ED25519 256]--+ + |==+. +o.. | + |.oE. +o.. | + | . ...o | + | .o... | + | oo+S . | + | + ..B = . . | + |.+.+.oo+ * o . | + |o++.o+ . + + | + |B+ o. . . | + +----[SHA256]-----+ + artemis@homemac ~ % + +4. You're done and you can now :ref:`add your key to Artemis`. diff --git a/docs/user/integrated-code-lifecycle.rst b/docs/user/integrated-code-lifecycle.rst new file mode 100644 index 000000000000..9e5ab5231ef0 --- /dev/null +++ b/docs/user/integrated-code-lifecycle.rst @@ -0,0 +1,15 @@ +.. _integrated code lifecycle: + +Integrated Code Lifecycle +========================= + +Artemis' Integrated Code Lifecycle consists of two main components: Local Version Control and Local Continuous Integration. + +.. toctree:: + + icl/general + icl/local-version-control + icl/ssh-intro + icl/ssh-key-creation + icl/ssh-add-key-to-artemis + icl/local-continuous-integration diff --git a/gradle.properties b/gradle.properties index fc54fad2849b..07ee79d07d25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,29 +18,29 @@ jaxb_runtime_version=4.0.5 hazelcast_version=5.5.0 fasterxml_version=2.18.0 jgit_version=7.0.0.202409031743-r -sshd_version=2.13.2 -checkstyle_version=10.18.1 +sshd_version=2.14.0 +checkstyle_version=10.18.2 jplag_version=5.1.0 # not really used in Artemis, nor Jplag, nor the used version of Stanford CoreNLP, but we use the latest to avoid security vulnerabilities # NOTE: we do not need to use the latest version 9.x here as long as Stanford CoreNLP does not reference it lucene_version=8.11.4 slf4j_version=2.0.16 -sentry_version=7.14.0 +sentry_version=7.15.0 liquibase_version=4.29.2 docker_java_version=3.4.0 -logback_version=1.5.8 +logback_version=1.5.10 java_parser_version=3.26.2 -byte_buddy_version=1.15.3 +byte_buddy_version=1.15.4 # testing # make sure both versions are compatible junit_version=5.11.0 -junit_platform_version=1.11.1 -mockito_version=5.13.0 +junit_platform_version=1.11.2 +mockito_version=5.14.1 # gradle plugin version -gradle_node_plugin_version=7.0.2 +gradle_node_plugin_version=7.1.0 apt_plugin_version=0.21 liquibase_plugin_version=2.1.1 modernizer_plugin_version=1.9.3 diff --git a/jest.config.js b/jest.config.js index 41354957ab0d..9855e511a99a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -102,10 +102,10 @@ module.exports = { coverageThreshold: { global: { // TODO: in the future, the following values should increase to at least 90% - statements: 87.35, - branches: 73.57, - functions: 81.91, - lines: 87.41, + statements: 87.39, + branches: 73.60, + functions: 81.97, + lines: 87.45, }, }, coverageReporters: ['clover', 'json', 'lcov', 'text-summary'], diff --git a/package-lock.json b/package-lock.json index bc1d3b7dff03..91ee03d72aaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,27 +1,27 @@ { "name": "artemis", - "version": "7.5.6", + "version": "7.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "artemis", - "version": "7.5.6", + "version": "7.6.0", "hasInstallScript": true, "license": "MIT", "dependencies": { - "@angular/animations": "18.2.6", - "@angular/cdk": "18.2.6", - "@angular/common": "18.2.6", - "@angular/compiler": "18.2.6", - "@angular/core": "18.2.6", - "@angular/forms": "18.2.6", - "@angular/localize": "18.2.6", - "@angular/material": "18.2.6", - "@angular/platform-browser": "18.2.6", - "@angular/platform-browser-dynamic": "18.2.6", - "@angular/router": "18.2.6", - "@angular/service-worker": "18.2.6", + "@angular/animations": "18.2.8", + "@angular/cdk": "18.2.8", + "@angular/common": "18.2.8", + "@angular/compiler": "18.2.8", + "@angular/core": "18.2.8", + "@angular/forms": "18.2.8", + "@angular/localize": "18.2.8", + "@angular/material": "18.2.8", + "@angular/platform-browser": "18.2.8", + "@angular/platform-browser-dynamic": "18.2.8", + "@angular/router": "18.2.8", + "@angular/service-worker": "18.2.8", "@ctrl/ngx-emoji-mart": "9.2.0", "@danielmoncada/angular-datetime-picker": "18.1.0", "@fingerprintjs/fingerprintjs": "4.5.0", @@ -33,7 +33,7 @@ "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", - "@sentry/angular": "8.32.0", + "@sentry/angular": "8.34.0", "@siemens/ngx-datatable": "22.4.1", "@swimlane/ngx-charts": "20.5.0", "@swimlane/ngx-graph": "8.4.0", @@ -55,12 +55,12 @@ "jszip": "3.10.1", "lodash-es": "4.17.21", "mobile-drag-drop": "3.0.0-rc.0", - "monaco-editor": "0.51.0", + "monaco-editor": "0.52.0", "ngx-infinite-scroll": "18.0.0", "ngx-webstorage": "18.0.0", "papaparse": "5.4.1", - "pdfjs-dist": "4.6.82", - "posthog-js": "1.165.0", + "pdfjs-dist": "4.7.76", + "posthog-js": "1.167.0", "rxjs": "7.8.1", "showdown": "2.1.0", "showdown-highlight": "3.1.0", @@ -78,30 +78,30 @@ }, "devDependencies": { "@angular-builders/jest": "18.0.0", - "@angular-devkit/build-angular": "18.2.6", + "@angular-devkit/build-angular": "18.2.8", "@angular-eslint/builder": "18.3.1", "@angular-eslint/eslint-plugin": "18.3.1", "@angular-eslint/eslint-plugin-template": "18.3.1", "@angular-eslint/schematics": "18.3.1", "@angular-eslint/template-parser": "18.3.1", - "@angular/cli": "18.2.6", - "@angular/compiler-cli": "18.2.6", - "@angular/language-service": "18.2.6", - "@sentry/types": "8.32.0", + "@angular/cli": "18.2.8", + "@angular/compiler-cli": "18.2.8", + "@angular/language-service": "18.2.8", + "@sentry/types": "8.34.0", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", "@types/jest": "29.5.13", "@types/lodash-es": "4.17.12", - "@types/node": "22.7.3", + "@types/node": "22.7.5", "@types/papaparse": "5.3.14", "@types/showdown": "2.0.6", "@types/smoothscroll-polyfill": "0.3.4", "@types/sockjs-client": "1.5.4", "@types/uuid": "10.0.0", - "@typescript-eslint/eslint-plugin": "8.7.0", - "@typescript-eslint/parser": "8.7.0", - "eslint": "9.11.1", + "@typescript-eslint/eslint-plugin": "8.8.1", + "@typescript-eslint/parser": "8.8.1", + "eslint": "9.12.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-deprecation": "3.0.0", "eslint-plugin-jest": "28.8.3", @@ -113,7 +113,7 @@ "jest-canvas-mock": "2.5.2", "jest-date-mock": "1.0.10", "jest-extended": "4.0.2", - "jest-fail-on-console": "3.3.0", + "jest-fail-on-console": "3.3.1", "jest-junit": "16.0.0", "jest-preset-angular": "14.2.4", "lint-staged": "15.2.10", @@ -121,7 +121,7 @@ "ngxtension": "4.0.0", "prettier": "3.3.3", "rimraf": "6.0.1", - "sass": "1.79.3", + "sass": "1.79.5", "ts-jest": "29.2.5", "typescript": "5.5.4", "weak-napi": "2.0.2" @@ -212,13 +212,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1802.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.6.tgz", - "integrity": "sha512-oF7cPFdTLxeuvXkK/opSdIxZ1E4LrBbmuytQ/nCoAGOaKBWdqvwagRZ6jVhaI0Gwu48rkcV7Zhesg/ESNnROdw==", + "version": "0.1802.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.8.tgz", + "integrity": "sha512-/rtFQEKgS7LlB9oHr4NCBSdKnvP5kr8L5Hbd3Vl8hZOYK9QWjxKPEXnryA2d5+PCE98bBzZswCNXqELZCPTgIQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.6", + "@angular-devkit/core": "18.2.8", "rxjs": "7.8.1" }, "engines": { @@ -228,17 +228,17 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.6.tgz", - "integrity": "sha512-u12cJZttgs5j7gICHWSmcaTCu0EFXEzKqI8nkYCwq2MtuJlAXiMQSXYuEP9OU3Go4vMAPtQh2kShyOWCX5b4EQ==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.8.tgz", + "integrity": "sha512-qK/iLk7A8vQp1CyiJV4DpwfLjPKoiOlTtFqoO5vD8Tyxmc+R06FQp6GJTsZ7JtrTLYSiH+QAWiY6NgF/Rj/hHg==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.6", - "@angular-devkit/build-webpack": "0.1802.6", - "@angular-devkit/core": "18.2.6", - "@angular/build": "18.2.6", + "@angular-devkit/architect": "0.1802.8", + "@angular-devkit/build-webpack": "0.1802.8", + "@angular-devkit/core": "18.2.8", + "@angular/build": "18.2.8", "@babel/core": "7.25.2", "@babel/generator": "7.25.0", "@babel/helper-annotate-as-pure": "7.24.7", @@ -249,7 +249,7 @@ "@babel/preset-env": "7.25.3", "@babel/runtime": "7.25.0", "@discoveryjs/json-ext": "0.6.1", - "@ngtools/webpack": "18.2.6", + "@ngtools/webpack": "18.2.8", "@vitejs/plugin-basic-ssl": "1.1.0", "ansi-colors": "4.1.3", "autoprefixer": "10.4.20", @@ -382,13 +382,13 @@ "license": "0BSD" }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1802.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.6.tgz", - "integrity": "sha512-JMLcXFaitJplwZMKkqhbYirINCRD6eOPZuIGaIOVynXYGWgvJkLT9t5C2wm9HqSLtp1K7NcYG2Y7PtTVR4krnQ==", + "version": "0.1802.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.8.tgz", + "integrity": "sha512-uPpopkXkO66SSdjtVr7xCyQCPs/x6KUC76xkDc4j0b8EEHifTbi/fNpbkcZ6wBmoAfjKLWXfKvtkh0TqKK5Hkw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1802.6", + "@angular-devkit/architect": "0.1802.8", "rxjs": "7.8.1" }, "engines": { @@ -402,9 +402,9 @@ } }, "node_modules/@angular-devkit/core": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.6.tgz", - "integrity": "sha512-la4CFvs5PcRWSkQ/H7TB5cPZirFVA9GoWk5LzIk8si6VjWBJRm8b3keKJoC9LlNeABRUIR5z0ocYkyQQUhdMfg==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.8.tgz", + "integrity": "sha512-4o2T6wsmXGE/v53+F8L7kGoN2+qzt03C9rtjLVQpOljzpJVttQ8bhvfWxyYLWwcl04RWqRa+82fpIZtBkOlZJw==", "dev": true, "license": "MIT", "dependencies": { @@ -430,13 +430,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.6.tgz", - "integrity": "sha512-uIttrQ2cQ2PWAFFVPeCoNR8xvs7tPJ2i8gzqsIwYdge107xDC6u9CqfgmBqPDSFpWj+IiC2Jwcm8Z4HYKU4+7A==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.8.tgz", + "integrity": "sha512-i/h2Oji5FhJMC7wDSnIl5XUe/qym+C1ZwScaATJwDyRLCUIynZkj5rLgdG/uK6l+H0PgvxigkF+akWpokkwW6w==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.6", + "@angular-devkit/core": "18.2.8", "jsonc-parser": "3.3.1", "magic-string": "0.30.11", "ora": "5.4.1", @@ -549,9 +549,9 @@ } }, "node_modules/@angular/animations": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.6.tgz", - "integrity": "sha512-vy9wy+Q9beiRxkEO8wNxFQ63AqAujGvk8AUHepxxIT7QNNc512TNKz8uH+feWDPO38Dm2obwYQHMGzs3WO7pUA==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.8.tgz", + "integrity": "sha512-dMSn2hg70siv3lhP+vqhMbgc923xw6XBUvnpCPEzhZqFHvPXfh/LubmsD5RtqHmjWebXtgVcgS+zg3Gq3jB2lg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -560,18 +560,18 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.6" + "@angular/core": "18.2.8" } }, "node_modules/@angular/build": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.6.tgz", - "integrity": "sha512-TQzX6Mi7uXFvmz7+OVl4Za7WawYPcx+B5Ewm6IY/DdMyB9P/Z4tbKb1LO+ynWUXYwm7avXo6XQQ4m5ArDY5F/A==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.8.tgz", + "integrity": "sha512-ufuA4vHJSrL9SQW7bKV61DOoN1mm0t0ILTHaxSoCG3YF70cZJOX7+HNp3cK2uoldRMwbTOKSvCWBw54KKDRd5Q==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.6", + "@angular-devkit/architect": "0.1802.8", "@babel/core": "7.25.2", "@babel/helper-annotate-as-pure": "7.24.7", "@babel/helper-split-export-declaration": "7.24.7", @@ -651,9 +651,9 @@ } }, "node_modules/@angular/cdk": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.6.tgz", - "integrity": "sha512-Gfq/iv4zhlKYpdQkDaBRwxI71NHNUHM1Cs1XhnZ0/oFct5HXvSv1RHRGTKqBJLLACaAPzZKXJ/UglLoyO5CNiQ==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.8.tgz", + "integrity": "sha512-J8A2FkwTBzLleAEWz6EgW73dEoeq87GREBPjTv8+2JV09LX+V3hnbgNk6zWq5k4OXtQNg9WrWP9QyRbUyA597g==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -668,18 +668,18 @@ } }, "node_modules/@angular/cli": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.6.tgz", - "integrity": "sha512-tdXsnV/w+Rgu8q0zFsLU5L9ImTVqrTol1vppHaQkJ/vuoHy+s8ZEbBqhVrO/ffosNb2xseUybGYvqMS4zkNQjg==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.8.tgz", + "integrity": "sha512-GKXG7F7z5rxwZ8/bnW/Bp8/zsfE/BpHmIP/icLfUIOwv2kaY5OD2tfQssWXPEuqZzYq2AYz+wjVSbWjxGoja8A==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1802.6", - "@angular-devkit/core": "18.2.6", - "@angular-devkit/schematics": "18.2.6", + "@angular-devkit/architect": "0.1802.8", + "@angular-devkit/core": "18.2.8", + "@angular-devkit/schematics": "18.2.8", "@inquirer/prompts": "5.3.8", "@listr2/prompt-adapter-inquirer": "2.0.15", - "@schematics/angular": "18.2.6", + "@schematics/angular": "18.2.8", "@yarnpkg/lockfile": "1.1.0", "ini": "4.1.3", "jsonc-parser": "3.3.1", @@ -702,9 +702,9 @@ } }, "node_modules/@angular/common": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.6.tgz", - "integrity": "sha512-89793ow+wrI1c7C6kyMbnweLNIZHzXthosxAEjipRZGBrqBYjvTtkE45Fl+5yBa3JO7bAhyGkUnEoyvWtZIAEA==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.8.tgz", + "integrity": "sha512-TYsKtE5nVaIScWSLGSO34Skc+s3hB/BujSddnfQHoNFvPT/WR0dfmdlpVCTeLj+f50htFoMhW11tW99PbK+whQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -713,14 +713,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.6", + "@angular/core": "18.2.8", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.6.tgz", - "integrity": "sha512-3tX2/Qw+bZ8XzKitviH8jzNGyY0uohhehhBB57OJOCc+yr4ojy/7SYFnun1lSsRnDztdCE461641X4iQLCQ94w==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.8.tgz", + "integrity": "sha512-JRedHNfK1CCPVyeGQB5w3WBYqMA6X8Q240CkvjlGfn0pVXihf9DWk3nkSQJVgYxpvpHfxdgjaYZ5IpMzlkmkhw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -729,7 +729,7 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.6" + "@angular/core": "18.2.8" }, "peerDependenciesMeta": { "@angular/core": { @@ -738,14 +738,14 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.6.tgz", - "integrity": "sha512-b5x9STfjNiNM/S0D+CnqRP9UOxPtSz1+RlCH5WdOMiW/p8j5p6dBix8YYgTe6Wg3OD7eItD2pnFQKgF/dWiopA==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.8.tgz", + "integrity": "sha512-OksDE4LWQUCcIvMjtZF7eiDCdIMrcMMpC1+Q0PIYi7KmnqXFGs4/Y0NdJvtn/LrQznzz5WaKM3ZDVNZTRX4wmw==", "license": "MIT", "dependencies": { "@babel/core": "7.25.2", "@jridgewell/sourcemap-codec": "^1.4.14", - "chokidar": "^3.0.0", + "chokidar": "^4.0.0", "convert-source-map": "^1.5.1", "reflect-metadata": "^0.2.0", "semver": "^7.0.0", @@ -761,14 +761,42 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.6", + "@angular/compiler": "18.2.8", "typescript": ">=5.4 <5.6" } }, + "node_modules/@angular/compiler-cli/node_modules/chokidar": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", + "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular/compiler-cli/node_modules/readdirp": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", + "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "license": "MIT", + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular/core": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.6.tgz", - "integrity": "sha512-PjFad2j4YBwLVTw+0Te8CJCa/tV0W8caTHG8aOjj3ObdL6ihGI+FKnwerLc9RVzDFd14BOO4C6/+LbOQAh3Ltw==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.8.tgz", + "integrity": "sha512-NwIuX/Iby1jT6Iv1/s6S3wOFf8xfuQR3MPGvKhGgNtjXLbHG+TXceK9+QPZC0s9/Z8JR/hz+li34B79GrIKgUg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -782,9 +810,9 @@ } }, "node_modules/@angular/forms": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.6.tgz", - "integrity": "sha512-quGkUqTxlBaLB8C/RnpfFG57fdmNF5RQ+368N89Ma++2lpIsVAHaGZZn4yOyo3wNYaM2jBxNqaYxOzZNUl5Tig==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.8.tgz", + "integrity": "sha512-JCLki7KC6D5vF6dE6yGlBmW33khIgpHs8N9SzuiJtkQqNDTIQA8cPsGV6qpLpxflxASynQOX5lDkWYdQyfm77Q==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -793,16 +821,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.6", - "@angular/core": "18.2.6", - "@angular/platform-browser": "18.2.6", + "@angular/common": "18.2.8", + "@angular/core": "18.2.8", + "@angular/platform-browser": "18.2.8", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-service": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.6.tgz", - "integrity": "sha512-GBvBvS2llh+/l2YhO7UO5o3GftlvQQoXnw3v0hcNoHKwcnvqXV4CCi+T2WOaZyK0iB8Is4QRbMrpJUC66HokZg==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.8.tgz", + "integrity": "sha512-IueQ57CPP0Dt0z2n8B1A6JTwTq6m/AJVObZzrkSfXlzY1rY2qRuTJmAbZpTJ3iAxVzNYoaGh+NFHmJL8fRiXKQ==", "dev": true, "license": "MIT", "engines": { @@ -810,9 +838,9 @@ } }, "node_modules/@angular/localize": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.6.tgz", - "integrity": "sha512-4NZwh5EAyXItmwv6hqilV+JyN8DT+d+S1rW+M1IwJqC9asCDfpFqipKpuQF81LQKeLH0mn/phNfVbnJCLP0Tkw==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.8.tgz", + "integrity": "sha512-1T7aXEdgVyeYnHOfQUuIDO8Lsamg1ZLrJrA5zUv61asPJp6HCcMjXy9vDQ1XvHm5+CdDjKk/rczlN4lSMZ0QRw==", "license": "MIT", "dependencies": { "@babel/core": "7.25.2", @@ -829,21 +857,21 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.6", - "@angular/compiler-cli": "18.2.6" + "@angular/compiler": "18.2.8", + "@angular/compiler-cli": "18.2.8" } }, "node_modules/@angular/material": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.6.tgz", - "integrity": "sha512-ObxC/vomSb9QF3vIztuiInQzws+D6u09Dhfx6uNFjtyICqxEFpF7+Qx7QVDWrsuXOgxZTKgacK8f46iV8hWUfg==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.8.tgz", + "integrity": "sha512-wQGMVsfQ9lQfih2VsWAvV4z3S3uBxrxc61owlE+K0T1BxH9u/jo3A/rnRitIdvR/L4NnYlfhCnmrW9K+Pl+WCg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/animations": "^18.0.0 || ^19.0.0", - "@angular/cdk": "18.2.6", + "@angular/cdk": "18.2.8", "@angular/common": "^18.0.0 || ^19.0.0", "@angular/core": "^18.0.0 || ^19.0.0", "@angular/forms": "^18.0.0 || ^19.0.0", @@ -852,9 +880,9 @@ } }, "node_modules/@angular/platform-browser": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.6.tgz", - "integrity": "sha512-RA8UMiYNLga+QMwpKcDw1357gYPfPyY/rmLeezMak//BbsENFYQOJ4Z6DBOBNiPlHxmBsUJMGaKdlpQhfCROyQ==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.8.tgz", + "integrity": "sha512-EPai4ZPqSq3ilLJUC85kPi9wo5j5suQovwtgRyjM/75D9Qy4TV19g8hkVM5Co/zrltO8a2G6vDscCNI5BeGw2A==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -863,9 +891,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "18.2.6", - "@angular/common": "18.2.6", - "@angular/core": "18.2.6" + "@angular/animations": "18.2.8", + "@angular/common": "18.2.8", + "@angular/core": "18.2.8" }, "peerDependenciesMeta": { "@angular/animations": { @@ -874,9 +902,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.6.tgz", - "integrity": "sha512-kGBU3FNc+DF9r33hwHZqiWoZgQbCDdEIucU0NCLCIg0Hw6/Q9Hr2ndjxQI+WynCPg0JeBn34jpouvpeJer3YDQ==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.8.tgz", + "integrity": "sha512-poZoapDqyN/rxGKQ3C6esdPiPLMkSpP2v12hoEa12KHgfPk7T1e+a+NMyJjV8HeOY3WyvL7tGRhW0NPTajTkhw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -885,16 +913,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.6", - "@angular/compiler": "18.2.6", - "@angular/core": "18.2.6", - "@angular/platform-browser": "18.2.6" + "@angular/common": "18.2.8", + "@angular/compiler": "18.2.8", + "@angular/core": "18.2.8", + "@angular/platform-browser": "18.2.8" } }, "node_modules/@angular/router": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.6.tgz", - "integrity": "sha512-t57Sqja8unHhZlPr+4CWnQacuox2M4p2pMHps+31wt337qH6mKf4jqDmK0dE/MFdRyKjT2a2E/2NwtxXxcWNuw==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.8.tgz", + "integrity": "sha512-L+olYgxIiBq+tbfayVI0cv1yOuymsw33msnGC2l/vpc9sSVfqGzESFnB4yMVU3vHtE9v6v2Y6O+iV44/b79W/g==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -903,16 +931,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.6", - "@angular/core": "18.2.6", - "@angular/platform-browser": "18.2.6", + "@angular/common": "18.2.8", + "@angular/core": "18.2.8", + "@angular/platform-browser": "18.2.8", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/service-worker": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.6.tgz", - "integrity": "sha512-KNqRAunG0yj3jVA/YYKH9wbAe261gAIwKeQsJyeMHGR48H88tSKdcstttNZZ3S6wdhp7tcyUC526Fc4phXnSJw==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.8.tgz", + "integrity": "sha512-LQktgS2Hn845ASWNyjde18V+CHkkPeCzORfh0ChYKiOmXYFtj/myEik5o/QI/G13Kaymy+vcuwQKiUuZjZiD1w==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -924,17 +952,17 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.6", - "@angular/core": "18.2.6" + "@angular/common": "18.2.8", + "@angular/core": "18.2.8" } }, "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", + "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.7", + "@babel/highlight": "^7.25.7", "picocolors": "^1.0.0" }, "engines": { @@ -942,9 +970,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", - "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz", + "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1014,28 +1042,28 @@ } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", - "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz", + "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", - "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz", + "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==", "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.2", - "@babel/helper-validator-option": "^7.24.8", - "browserslist": "^4.23.1", + "@babel/compat-data": "^7.25.7", + "@babel/helper-validator-option": "^7.25.7", + "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -1044,18 +1072,18 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", - "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz", + "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-member-expression-to-functions": "^7.25.7", + "@babel/helper-optimise-call-expression": "^7.25.7", + "@babel/helper-replace-supers": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", + "@babel/traverse": "^7.25.7", "semver": "^6.3.1" }, "engines": { @@ -1065,15 +1093,28 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", + "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", - "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz", + "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "regexpu-core": "^5.3.1", + "@babel/helper-annotate-as-pure": "^7.25.7", + "regexpu-core": "^6.1.1", "semver": "^6.3.1" }, "engines": { @@ -1083,6 +1124,19 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", + "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-define-polyfill-provider": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", @@ -1101,42 +1155,42 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", - "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz", + "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.8" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz", + "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==", "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", - "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz", + "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==", "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.2" + "@babel/helper-module-imports": "^7.25.7", + "@babel/helper-simple-access": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1146,37 +1200,37 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", - "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz", + "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", - "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz", + "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", - "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz", + "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-wrap-function": "^7.25.0", - "@babel/traverse": "^7.25.0" + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-wrap-function": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1185,16 +1239,29 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", + "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-replace-supers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", - "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz", + "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-member-expression-to-functions": "^7.25.7", + "@babel/helper-optimise-call-expression": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1204,27 +1271,27 @@ } }, "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz", + "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==", "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", - "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz", + "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1244,67 +1311,67 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", + "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", + "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", - "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz", + "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", - "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz", + "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/template": "^7.25.7", + "@babel/traverse": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", - "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz", + "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==", "license": "MIT", "dependencies": { - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6" + "@babel/template": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", + "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", + "@babel/helper-validator-identifier": "^7.25.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -1314,12 +1381,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", + "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.25.8" }, "bin": { "parser": "bin/babel-parser.js" @@ -1329,14 +1396,14 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", - "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.7.tgz", + "integrity": "sha512-UV9Lg53zyebzD1DwQoT9mzkEKa922LNUp5YkTJ6Uta0RbyXaQNUgcvSt7qIu1PpPzVb6rd10OVNTzkyBGeVmxQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.3" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1346,13 +1413,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", - "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.7.tgz", + "integrity": "sha512-GDDWeVLNxRIkQTnJn2pDOM1pkCgYdSqPeT1a9vh9yIqu2uzzgw1zcqEb+IJOhy+dTBMlNdThrDIksr2o09qrrQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1362,13 +1429,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", - "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz", + "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1378,15 +1445,15 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", - "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz", + "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7", + "@babel/plugin-transform-optional-chaining": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1396,14 +1463,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", - "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz", + "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.0" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1507,13 +1574,13 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", - "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz", + "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1565,12 +1632,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", - "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz", + "integrity": "sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1690,13 +1757,13 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz", - "integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.7.tgz", + "integrity": "sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1723,13 +1790,13 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", - "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz", + "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1776,13 +1843,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", - "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz", + "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1792,13 +1859,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", - "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz", + "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1808,14 +1875,14 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz", - "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz", + "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1825,15 +1892,14 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", - "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz", + "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-class-static-block": "^7.14.5" + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1843,17 +1909,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", - "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz", + "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-replace-supers": "^7.25.7", + "@babel/traverse": "^7.25.7", "globals": "^11.1.0" }, "engines": { @@ -1863,15 +1929,28 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", + "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", - "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz", + "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/template": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/template": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1881,13 +1960,13 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", - "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz", + "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1897,14 +1976,14 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", - "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz", + "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1914,13 +1993,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", - "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz", + "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1930,14 +2009,14 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", - "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.7.tgz", + "integrity": "sha512-HvS6JF66xSS5rNKXLqkk7L9c/jZ/cdIVIcoPVrnl8IsVpLggTjXs8OWekbLHs/VtYDDh5WXnQyeE3PPUGm22MA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1947,14 +2026,13 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", - "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz", + "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1964,14 +2042,14 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", - "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz", + "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1981,14 +2059,13 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", - "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz", + "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -1998,14 +2075,14 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", - "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz", + "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2015,15 +2092,15 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.25.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", - "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz", + "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.1" + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2033,14 +2110,13 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", - "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz", + "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-json-strings": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2050,13 +2126,13 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", - "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz", + "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2066,14 +2142,13 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", - "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz", + "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2083,13 +2158,13 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", - "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz", + "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2099,14 +2174,14 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", - "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz", + "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2116,15 +2191,15 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", - "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz", + "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-simple-access": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-simple-access": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2134,16 +2209,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", - "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz", + "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", + "@babel/traverse": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2153,14 +2228,14 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", - "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz", + "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2170,14 +2245,14 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", - "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz", + "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2187,13 +2262,13 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", - "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz", + "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2203,14 +2278,13 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", - "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz", + "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2220,14 +2294,13 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", - "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz", + "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2237,16 +2310,15 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", - "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz", + "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.24.7" + "@babel/helper-compilation-targets": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/plugin-transform-parameters": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2256,14 +2328,14 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", - "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz", + "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-replace-supers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-replace-supers": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2273,14 +2345,13 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", - "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz", + "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2290,15 +2361,14 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", - "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz", + "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2308,13 +2378,13 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", - "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz", + "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2324,14 +2394,14 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz", - "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz", + "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2341,16 +2411,15 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", - "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz", + "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.25.7", + "@babel/helper-create-class-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2359,14 +2428,27 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz", + "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", - "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz", + "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2376,13 +2458,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", - "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz", + "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.7", "regenerator-transform": "^0.15.2" }, "engines": { @@ -2393,13 +2475,13 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", - "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz", + "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2430,13 +2512,13 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", - "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz", + "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2446,14 +2528,14 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", - "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz", + "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2463,13 +2545,13 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", - "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz", + "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2479,13 +2561,13 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", - "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz", + "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2495,13 +2577,13 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", - "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz", + "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2511,13 +2593,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", - "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz", + "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2527,14 +2609,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", - "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz", + "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2544,14 +2626,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", - "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz", + "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2561,14 +2643,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz", - "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz", + "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.7", + "@babel/helper-plugin-utils": "^7.25.7" }, "engines": { "node": ">=6.9.0" @@ -2690,13 +2772,6 @@ "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/regjsgen": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", - "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/runtime": { "version": "7.25.0", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz", @@ -2710,30 +2785,30 @@ } }, "node_modules/@babel/template": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", - "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", + "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/code-frame": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/types": "^7.25.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", - "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", + "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.6", - "@babel/parser": "^7.25.6", - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6", + "@babel/code-frame": "^7.25.7", + "@babel/generator": "^7.25.7", + "@babel/parser": "^7.25.7", + "@babel/template": "^7.25.7", + "@babel/types": "^7.25.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -2742,28 +2817,40 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", - "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", + "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6", + "@babel/types": "^7.25.7", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/traverse/node_modules/jsesc": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", + "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", + "@babel/helper-string-parser": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2838,9 +2925,9 @@ } }, "node_modules/@emnapi/core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.2.0.tgz", - "integrity": "sha512-E7Vgw78I93we4ZWdYCb4DGAwRROGkMIXk7/y87UmANR+J6qsWusmC3gLt0H+O0KOt5e6O38U8oJamgbudrES/w==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", + "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", "dev": true, "license": "MIT", "dependencies": { @@ -2849,9 +2936,9 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.2.0.tgz", - "integrity": "sha512-bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", + "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", "dev": true, "license": "MIT", "dependencies": { @@ -3464,9 +3551,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.11.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.1.tgz", - "integrity": "sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.12.0.tgz", + "integrity": "sha512-eohesHH8WFRUprDNyEREgqP6beG6htMeUYeCpkEgBCieCMme5r9zFWjzAJp//9S+Kub4rqE+jXe9Cp1a7IYIIA==", "dev": true, "license": "MIT", "engines": { @@ -3563,6 +3650,30 @@ "node": ">=6" } }, + "node_modules/@humanfs/core": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz", + "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.5", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz", + "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.0", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -3578,9 +3689,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -3699,9 +3810,9 @@ } }, "node_modules/@inquirer/figures": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.6.tgz", - "integrity": "sha512-yfZzps3Cso2UbM7WlxKwZQh2Hs6plrbjs1QnzQDZhK2DgyCo6D8AaHps9olkNcUFlcYERMqU3uJSp1gmy3s/qQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.7.tgz", + "integrity": "sha512-m+Trk77mp54Zma6xLkLuY+mvanPxlE4A7yNKs2HBiyZ4UkVs28Mv5c/pgWrHeInx+USHeX/WEPzjrWrcJiQgjw==", "dev": true, "license": "MIT", "engines": { @@ -4896,9 +5007,9 @@ } }, "node_modules/@jsonjoy.com/util": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz", - "integrity": "sha512-Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.5.0.tgz", + "integrity": "sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -5265,9 +5376,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.6.tgz", - "integrity": "sha512-7HwOPE1EOgcHnpt4brSiT8G2CcXB50G0+CbCBaKGy4LYCG3Y3mrlzF5Fup9HvMJ6Tzqd62RqzpKKYBiGUT7hxg==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.8.tgz", + "integrity": "sha512-sq0kI8gEen4QlM6X8XqOYy7j4B8iLCYNo+iKxatV36ts4AXH0MuVkP56+oMaoH5oZNoSqd0RlfnotEHfvJAr8A==", "dev": true, "license": "MIT", "engines": { @@ -5597,23 +5708,23 @@ } }, "node_modules/@nrwl/devkit": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.6.5.tgz", - "integrity": "sha512-KaQeVyYaWBQwQSITtumPvx+P7IpKFReETx4gLTcOpQ/a3QD/AZFGbNjiG+xDLbgo1FDh9dRt9k7eWhGk6oPWKQ==", + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.8.4.tgz", + "integrity": "sha512-OoIqDjj2mWzLs3aSF6w5OiC2xywYi/jBxHc7t7Lyi56Vc4dQq8vJMELa9WtG6qH0k05fF7N+jAoKlfvLgbbEFA==", "dev": true, "license": "MIT", "dependencies": { - "@nx/devkit": "19.6.5" + "@nx/devkit": "19.8.4" } }, "node_modules/@nrwl/tao": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-19.6.5.tgz", - "integrity": "sha512-EoUN/kE6CMWJ4ZZgcXAyiOzn8BSshG2DhC5PNwzLTAxRBus8FgXR/9c0XOzchaP46Kq3hoBGFgeyW434tfuv5w==", + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-19.8.4.tgz", + "integrity": "sha512-03/+QZ4/6HmKbEmvzCutLI1XIclBspNYtiVHmGPRWuwhnZViqYfnyl8J7RWVdFEoKKA5fhJqpg7e28aGuoMBvQ==", "dev": true, "license": "MIT", "dependencies": { - "nx": "19.6.5", + "nx": "19.8.4", "tslib": "^2.3.0" }, "bin": { @@ -5621,13 +5732,13 @@ } }, "node_modules/@nx/devkit": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-19.6.5.tgz", - "integrity": "sha512-AEaMSr55Ar48QHU8TBi/gzLtjeT100zdyfLmk0RoiLzjjC8pWmm3Xfvqxyt1WsUUf4oQhlHlolJuoM41qKsdZw==", + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-19.8.4.tgz", + "integrity": "sha512-FPFT8gVDFRSEmU0n7nRkT4Rnqy7OMznfPXLfDZtVuzEi5Cl6ftG3UBUvCgJcJFCYJVAZAUuv6vRSRarHd51XFQ==", "dev": true, "license": "MIT", "dependencies": { - "@nrwl/devkit": "19.6.5", + "@nrwl/devkit": "19.8.4", "ejs": "^3.1.7", "enquirer": "~2.3.6", "ignore": "^5.0.4", @@ -5668,9 +5779,9 @@ } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.6.5.tgz", - "integrity": "sha512-sFU2k0BaklM17206F2E5C3866y0SICb0xyuPeD6D07a6hB4IstjIUkldUJJN70wEsJ5I3VP4yZ2oJcwnb1TTRQ==", + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.8.4.tgz", + "integrity": "sha512-mbSGt63hYcVCSQ54kpHl0lFqr5CsbkGJ4L3liWE30Da7vXZJwUBr9f+b9DnQ64IZzlu6vAhNcaiYQXa9lAk0yQ==", "cpu": [ "arm64" ], @@ -5685,9 +5796,9 @@ } }, "node_modules/@nx/nx-darwin-x64": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-19.6.5.tgz", - "integrity": "sha512-EJmTbUPmlksgOap6xkQl89+zXwHpaAnZLsyLHUd7i00eVRa21FRhdKFnVsRxtwPDZp/YCG84IzMUye/IrwDFTQ==", + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-19.8.4.tgz", + "integrity": "sha512-lTcXUCXNvqHdLmrNCOyDF+u6pDx209Ew7nSR47sQPvkycIHYi0gvgk0yndFn1Swah0lP4OxWg7rzAfmOlZd6ew==", "cpu": [ "x64" ], @@ -5702,9 +5813,9 @@ } }, "node_modules/@nx/nx-freebsd-x64": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.6.5.tgz", - "integrity": "sha512-rR8NJCskoEmIbK96uxaevHm146WDTA0V3jId+X1joITqjj3E2DMm0U4r5v/OgI5+iqbhFV4S83LrMxP6gBLTsQ==", + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.8.4.tgz", + "integrity": "sha512-4BUplOxPZeUwlUNfzHHMmebNVgDFW/jNX6TWRS+jINwOHnpWLkLFAXu27G80/S3OaniVCzEQklXO9b+1UsdgXw==", "cpu": [ "x64" ], @@ -5718,12 +5829,270 @@ "node": ">= 10" } }, - "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.6.5.tgz", - "integrity": "sha512-OUHFV6iLlJN7b7qFnqLfa0Yj/aoylEiRXcEhV1bhPm0Ryt1bOeGDmLYScVN8n5t+AVmrwwYHk+ajXMzCOLLeZw==", + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.8.4.tgz", + "integrity": "sha512-Wahul8oz9huEm/Jv3wud5IGWdZxkGG4tdJm9i5TV5wxfUMAWbKU9v2nzZZins452UYESWvwvDkiuBPZqSto3qw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.8.4.tgz", + "integrity": "sha512-L0RVCZkNAtZDplLT7uJV7M9cXxq2Fxw+8ex3eb9XSp7eyLeFO21T0R6vTouJ42E/PEvGApCAcyGqtnyPNMZFfw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.8.4.tgz", + "integrity": "sha512-0q8r8I8WCsY3xowDI2j109SCUSkFns/BJ40aCfRh9hhrtaIIc5qXUw2YFTjxUZNcRJXx9j9+hTe9jBkUSIGvCw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.8.4.tgz", + "integrity": "sha512-XcRBNe0ws7KB0PMcUlpQqzzjjxMP8VdqirBz7CfB2XQ8xKmP3370p0cDvqs/4oKDHK4PCkmvVFX60tzakutylA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-musl": { + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.8.4.tgz", + "integrity": "sha512-JB4tAuZBCF0yqSnKF3pHXa0b7LA3ebi3Bw08QmMr//ON4aU+eXURGBuj9XvULD2prY+gpBrvf+MsG1XJAHL6Zg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.8.4.tgz", + "integrity": "sha512-WvQag/pN9ofRWRDvOZxj3jvJoTetlvV1uyirnDrhupRgi+Fj67OlGGt2zVUHaXFGEa1MfCEG6Vhk6152m4KyaQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.8.4.tgz", + "integrity": "sha512-//JntLrN3L7WL/WgP3D0FE34caYTPcG/GIMBguC9w7YDyTlEikLgLbobjdCPz+2f9OWGvIZbJgGmtHNjnETM/g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz", + "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.4.1", + "@parcel/watcher-darwin-arm64": "2.4.1", + "@parcel/watcher-darwin-x64": "2.4.1", + "@parcel/watcher-freebsd-x64": "2.4.1", + "@parcel/watcher-linux-arm-glibc": "2.4.1", + "@parcel/watcher-linux-arm64-glibc": "2.4.1", + "@parcel/watcher-linux-arm64-musl": "2.4.1", + "@parcel/watcher-linux-x64-glibc": "2.4.1", + "@parcel/watcher-linux-x64-musl": "2.4.1", + "@parcel/watcher-win32-arm64": "2.4.1", + "@parcel/watcher-win32-ia32": "2.4.1", + "@parcel/watcher-win32-x64": "2.4.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz", + "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz", + "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz", + "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz", + "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz", + "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz", + "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==", "cpu": [ - "arm" + "arm64" ], "dev": true, "license": "MIT", @@ -5732,13 +6101,17 @@ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.6.5.tgz", - "integrity": "sha512-CzbJfb24poaJgBHt4aKLaL8a7bO9KXCLls+TX0SZfmzA9AWX6YuiX9lhxwBv6cqsViXTDB4KnXndMDB/H0Gk4g==", + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz", + "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==", "cpu": [ "arm64" ], @@ -5749,15 +6122,19 @@ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-arm64-musl": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.6.5.tgz", - "integrity": "sha512-MgidKilQ0KWxQbTnaqXGjASu7wtAC9q6zAwFNKFENkwJq3nThaQH6jQVlnINE4lL9NSgyyg0AS/ix31hiqAgvA==", + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz", + "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MIT", @@ -5766,13 +6143,17 @@ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-x64-gnu": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.6.5.tgz", - "integrity": "sha512-rGDylAoslIlk5TDbEJ6YoQOYxxYP9gCpi6FLke2mFgXVzOmVlLKHfVsegIHYVMYYF26h3NJh0NLGGzGdoBjWgQ==", + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz", + "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==", "cpu": [ "x64" ], @@ -5783,32 +6164,40 @@ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-x64-musl": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.6.5.tgz", - "integrity": "sha512-C/pNjDL/bDEcrDypgBo4r1AOiPTk8gWJwBsFE1QHIvg7//5WFSreqRj34rJu/GZ95eLYJH5tje1VW6z+atEGkQ==", + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz", + "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==", "cpu": [ - "x64" + "arm64" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "linux" + "win32" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.6.5.tgz", - "integrity": "sha512-mMi8i16OFux17xed2iLPWwUdCbS1mYA9Ny/gnoNUCosmihmXX9wrzaGBkNAMsHA28huYQtPhGormsEs+zuiVFg==", + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz", + "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==", "cpu": [ - "arm64" + "ia32" ], "dev": true, "license": "MIT", @@ -5817,13 +6206,17 @@ "win32" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-win32-x64-msvc": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.6.5.tgz", - "integrity": "sha512-jjhbDYNBkyz9Fg1jf0KZTrgdf/yx4v+k0ifukDIHZjva+jko0Ve5WzdkQ2K07M9ZxxYibDtTDqX9uX6+eFZtoA==", + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz", + "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==", "cpu": [ "x64" ], @@ -5834,9 +6227,33 @@ "win32" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher/node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" } }, + "node_modules/@parcel/watcher/node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -6153,14 +6570,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.6.tgz", - "integrity": "sha512-Y988EoOEQDLEyHu3414T6AeVUyx21AexBHQNbUNQkK8cxlxyB6m1eH1cx6vFgLRFUTsLVv+C6Ln/ICNTfLcG4A==", + "version": "18.2.8", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.8.tgz", + "integrity": "sha512-62Sr7/j/dlhZorxH4GzQgpJy0s162BVts0Q7knZuEacP4VL+IWOUE1NS9OFkh/cbomoyXBdoewkZ5Zd1dVX78w==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.6", - "@angular-devkit/schematics": "18.2.6", + "@angular-devkit/core": "18.2.8", + "@angular-devkit/schematics": "18.2.8", "jsonc-parser": "3.3.1" }, "engines": { @@ -6170,73 +6587,73 @@ } }, "node_modules/@sentry-internal/browser-utils": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.32.0.tgz", - "integrity": "sha512-DpUGhk5O1OVjT0fo9wsbEdO1R/S9gGBRDtn9+FFVeRtieJHwXpeZiLK+tZhTOvaILmtSoTPUEY3L5sK4j5Xq9g==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.34.0.tgz", + "integrity": "sha512-4AcYOzPzD1tL5eSRQ/GpKv5enquZf4dMVUez99/Bh3va8qiJrNP55AcM7UzZ7WZLTqKygIYruJTU5Zu2SpEAPQ==", "license": "MIT", "dependencies": { - "@sentry/core": "8.32.0", - "@sentry/types": "8.32.0", - "@sentry/utils": "8.32.0" + "@sentry/core": "8.34.0", + "@sentry/types": "8.34.0", + "@sentry/utils": "8.34.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/feedback": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.32.0.tgz", - "integrity": "sha512-XB7hiVJQW1tNzpoXIHbvm3rjipIt7PZiJJtFg2vxaqu/FzdgOcYqQiwIKivJVAKuRZ9rIeJtK1jdXQFOc/TRJA==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.34.0.tgz", + "integrity": "sha512-aYSM2KPUs0FLPxxbJCFSwCYG70VMzlT04xepD1Y/tTlPPOja/02tSv2tyOdZbv8Uw7xslZs3/8Lhj74oYcTBxw==", "license": "MIT", "dependencies": { - "@sentry/core": "8.32.0", - "@sentry/types": "8.32.0", - "@sentry/utils": "8.32.0" + "@sentry/core": "8.34.0", + "@sentry/types": "8.34.0", + "@sentry/utils": "8.34.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.32.0.tgz", - "integrity": "sha512-yiEUnn2yyo1AIQIFNeRX3tdK8fmyKIkxdFS1WiVQmeYI/hFwYBTZPly0FcO/g3xnRMSA2tvrS+hZEaaXfK4WhA==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.34.0.tgz", + "integrity": "sha512-EoMh9NYljNewZK1quY23YILgtNdGgrkzJ9TPsj6jXUG0LZ0Q7N7eFWd0xOEDBvFxrmI3cSXF1i4d1sBb+eyKRw==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.32.0", - "@sentry/core": "8.32.0", - "@sentry/types": "8.32.0", - "@sentry/utils": "8.32.0" + "@sentry-internal/browser-utils": "8.34.0", + "@sentry/core": "8.34.0", + "@sentry/types": "8.34.0", + "@sentry/utils": "8.34.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay-canvas": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.32.0.tgz", - "integrity": "sha512-oBbhtDBkD+5z/T0NVJ5VenBWAid/S9QdVrod/UqxVqU7F8N+E9/INFQI48zCWr4iVlUMcszJPDElvJEsMDvvBQ==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.34.0.tgz", + "integrity": "sha512-x8KhZcCDpbKHqFOykYXiamX6x0LRxv6N1OJHoH+XCrMtiDBZr4Yo30d/MaS6rjmKGMtSRij30v+Uq+YWIgxUrg==", "license": "MIT", "dependencies": { - "@sentry-internal/replay": "8.32.0", - "@sentry/core": "8.32.0", - "@sentry/types": "8.32.0", - "@sentry/utils": "8.32.0" + "@sentry-internal/replay": "8.34.0", + "@sentry/core": "8.34.0", + "@sentry/types": "8.34.0", + "@sentry/utils": "8.34.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/angular": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.32.0.tgz", - "integrity": "sha512-HgdpLFTdAMgTG4yz6mb9umg+yGlCkuRDqC4Wv1zNW7ARoSioavyz4kMRkKqJR6hxgGh2vPoXCz6E+w8L4k9oPg==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.34.0.tgz", + "integrity": "sha512-FjBN5s+SFzTFHQh5DqWUGUp19p3V7p86I7Dq1a7MBCzmQukGM1bcW8+n6wLj6CxlEoyLCPPZpTIXIO4ulheIwg==", "license": "MIT", "dependencies": { - "@sentry/browser": "8.32.0", - "@sentry/core": "8.32.0", - "@sentry/types": "8.32.0", - "@sentry/utils": "8.32.0", + "@sentry/browser": "8.34.0", + "@sentry/core": "8.34.0", + "@sentry/types": "8.34.0", + "@sentry/utils": "8.34.0", "tslib": "^2.4.1" }, "engines": { @@ -6250,52 +6667,52 @@ } }, "node_modules/@sentry/browser": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.32.0.tgz", - "integrity": "sha512-AEKFj64g4iYwEMRvVcxiY0FswmClRXCP1IEvCqujn8OBS8AjMOr1z/RwYieEs0D90yNNB3YEqF8adrKENblJmw==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.34.0.tgz", + "integrity": "sha512-3HHG2NXxzHq1lVmDy2uRjYjGNf9NsJsTPlOC70vbQdOb+S49EdH/XMPy+J3ruIoyv6Cu0LwvA6bMOM6rHZOgNQ==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.32.0", - "@sentry-internal/feedback": "8.32.0", - "@sentry-internal/replay": "8.32.0", - "@sentry-internal/replay-canvas": "8.32.0", - "@sentry/core": "8.32.0", - "@sentry/types": "8.32.0", - "@sentry/utils": "8.32.0" + "@sentry-internal/browser-utils": "8.34.0", + "@sentry-internal/feedback": "8.34.0", + "@sentry-internal/replay": "8.34.0", + "@sentry-internal/replay-canvas": "8.34.0", + "@sentry/core": "8.34.0", + "@sentry/types": "8.34.0", + "@sentry/utils": "8.34.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/core": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.32.0.tgz", - "integrity": "sha512-+xidTr0lZ0c755tq4k75dXPEb8PA+qvIefW3U9+dQMORLokBrYoKYMf5zZTG2k/OfSJS6OSxatUj36NFuCs3aA==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.34.0.tgz", + "integrity": "sha512-adrXCTK/zsg5pJ67lgtZqdqHvyx6etMjQW3P82NgWdj83c8fb+zH+K79Z47pD4zQjX0ou2Ws5nwwi4wJbz4bfA==", "license": "MIT", "dependencies": { - "@sentry/types": "8.32.0", - "@sentry/utils": "8.32.0" + "@sentry/types": "8.34.0", + "@sentry/utils": "8.34.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/types": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.32.0.tgz", - "integrity": "sha512-hxckvN2MzS5SgGDgVQ0/QpZXk13Vrq4BtZLwXhPhyeTmZtUiUfWvcL5TFQqLinfKdTKPe9q2MxeAJ0D4LalhMg==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.34.0.tgz", + "integrity": "sha512-zLRc60CzohGCo6zNsNeQ9JF3SiEeRE4aDCP9fDDdIVCOKovS+mn1rtSip0qd0Vp2fidOu0+2yY0ALCz1A3PJSQ==", "license": "MIT", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.32.0.tgz", - "integrity": "sha512-t1WVERhgmYURxbBj9J4/H2P2X+VKqm7B3ce9iQyrZbdf5NekhcU4jHIecPUWCPHjQkFIqkVTorqeBmDTlg/UmQ==", + "version": "8.34.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.34.0.tgz", + "integrity": "sha512-W1KoRlFUjprlh3t86DZPFxLfM6mzjRzshVfMY7vRlJFymBelJsnJ3A1lPeBZM9nCraOSiw6GtOWu6k5BAkiGIg==", "license": "MIT", "dependencies": { - "@sentry/types": "8.32.0" + "@sentry/types": "8.34.0" }, "engines": { "node": ">=14.18" @@ -6909,9 +7326,9 @@ "license": "MIT" }, "node_modules/@types/lodash": { - "version": "4.17.9", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.9.tgz", - "integrity": "sha512-w9iWudx1XWOHW5lQRS9iKpK/XuRhnN+0T7HvdCCd802FYkT1AMTnxndJHGrNJwRoRHkslGr4S29tjm1cT7x/7w==", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==", "dev": true, "license": "MIT" }, @@ -6943,9 +7360,9 @@ } }, "node_modules/@types/node": { - "version": "22.7.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz", - "integrity": "sha512-qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA==", + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6993,9 +7410,9 @@ "license": "MIT" }, "node_modules/@types/react": { - "version": "18.3.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.9.tgz", - "integrity": "sha512-+BpAVyTpJkNWWSSnaLBk6ePpHLOGJKnEQNbINNovPWzvEUyAe3e+/d494QdEh71RekM/qV7lw6jzf1HGrJyAtQ==", + "version": "18.3.11", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz", + "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==", "license": "MIT", "dependencies": { "@types/prop-types": "*", @@ -7149,17 +7566,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.7.0.tgz", - "integrity": "sha512-RIHOoznhA3CCfSTFiB6kBGLQtB/sox+pJ6jeFu6FxJvqL8qRxq/FfGO/UhsGgQM9oGdXkV4xUgli+dt26biB6A==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.8.1.tgz", + "integrity": "sha512-xfvdgA8AP/vxHgtgU310+WBnLB4uJQ9XdyP17RebG26rLtDrQJV3ZYrcopX91GrHmMoH8bdSwMRh2a//TiJ1jQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.7.0", - "@typescript-eslint/type-utils": "8.7.0", - "@typescript-eslint/utils": "8.7.0", - "@typescript-eslint/visitor-keys": "8.7.0", + "@typescript-eslint/scope-manager": "8.8.1", + "@typescript-eslint/type-utils": "8.8.1", + "@typescript-eslint/utils": "8.8.1", + "@typescript-eslint/visitor-keys": "8.8.1", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -7183,16 +7600,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.7.0.tgz", - "integrity": "sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.8.1.tgz", + "integrity": "sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "8.7.0", - "@typescript-eslint/types": "8.7.0", - "@typescript-eslint/typescript-estree": "8.7.0", - "@typescript-eslint/visitor-keys": "8.7.0", + "@typescript-eslint/scope-manager": "8.8.1", + "@typescript-eslint/types": "8.8.1", + "@typescript-eslint/typescript-estree": "8.8.1", + "@typescript-eslint/visitor-keys": "8.8.1", "debug": "^4.3.4" }, "engines": { @@ -7212,14 +7629,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.7.0.tgz", - "integrity": "sha512-87rC0k3ZlDOuz82zzXRtQ7Akv3GKhHs0ti4YcbAJtaomllXoSO8hi7Ix3ccEvCd824dy9aIX+j3d2UMAfCtVpg==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.1.tgz", + "integrity": "sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.7.0", - "@typescript-eslint/visitor-keys": "8.7.0" + "@typescript-eslint/types": "8.8.1", + "@typescript-eslint/visitor-keys": "8.8.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7230,14 +7647,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.7.0.tgz", - "integrity": "sha512-tl0N0Mj3hMSkEYhLkjREp54OSb/FI6qyCzfiiclvJvOqre6hsZTGSnHtmFLDU8TIM62G7ygEa1bI08lcuRwEnQ==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.8.1.tgz", + "integrity": "sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.7.0", - "@typescript-eslint/utils": "8.7.0", + "@typescript-eslint/typescript-estree": "8.8.1", + "@typescript-eslint/utils": "8.8.1", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -7255,9 +7672,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.7.0.tgz", - "integrity": "sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.1.tgz", + "integrity": "sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==", "dev": true, "license": "MIT", "engines": { @@ -7269,14 +7686,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.7.0.tgz", - "integrity": "sha512-MC8nmcGHsmfAKxwnluTQpNqceniT8SteVwd2voYlmiSWGOtjvGXdPl17dYu2797GVscK30Z04WRM28CrKS9WOg==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.1.tgz", + "integrity": "sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "8.7.0", - "@typescript-eslint/visitor-keys": "8.7.0", + "@typescript-eslint/types": "8.8.1", + "@typescript-eslint/visitor-keys": "8.8.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -7298,16 +7715,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.7.0.tgz", - "integrity": "sha512-ZbdUdwsl2X/s3CiyAu3gOlfQzpbuG3nTWKPoIvAu1pu5r8viiJvv2NPN2AqArL35NCYtw/lrPPfM4gxrMLNLPw==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.1.tgz", + "integrity": "sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.7.0", - "@typescript-eslint/types": "8.7.0", - "@typescript-eslint/typescript-estree": "8.7.0" + "@typescript-eslint/scope-manager": "8.8.1", + "@typescript-eslint/types": "8.8.1", + "@typescript-eslint/typescript-estree": "8.8.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7321,13 +7738,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.7.0.tgz", - "integrity": "sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.1.tgz", + "integrity": "sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.7.0", + "@typescript-eslint/types": "8.8.1", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -7835,6 +8252,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -7848,6 +8266,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -8347,6 +8766,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -8691,9 +9111,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001664", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz", - "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==", + "version": "1.0.30001668", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz", + "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==", "funding": [ { "type": "opencollective", @@ -8761,6 +9181,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, "license": "MIT", "dependencies": { "anymatch": "~3.1.2", @@ -8781,6 +9202,19 @@ "fsevents": "~2.3.2" } }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", @@ -8851,9 +9285,9 @@ } }, "node_modules/cli-spinners": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", - "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", "dev": true, "license": "MIT", "engines": { @@ -9020,9 +9454,9 @@ } }, "node_modules/code-block-writer": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.2.tgz", - "integrity": "sha512-XfXzAGiStXSmCIwrkdfvc7FS5Dtj8yelCtyOf2p2skCAfvLd6zu0rGzuS9NSCO3bq1JKpFZ7tbKdKlcd5occQA==", + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.3.tgz", + "integrity": "sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==", "dev": true, "license": "MIT" }, @@ -9218,9 +9652,9 @@ "license": "MIT" }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, "license": "MIT", "engines": { @@ -9272,19 +9706,6 @@ "webpack": "^5.1.0" } }, - "node_modules/copy-webpack-plugin/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/core-js": { "version": "3.38.1", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz", @@ -10090,19 +10511,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/default-gateway": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", - "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "execa": "^5.0.0" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/defaults": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", @@ -10416,9 +10824,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.29", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz", - "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==", + "version": "1.5.36", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz", + "integrity": "sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==", "license": "ISC" }, "node_modules/emittery": { @@ -10699,9 +11107,9 @@ } }, "node_modules/eslint": { - "version": "9.11.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.11.1.tgz", - "integrity": "sha512-MobhYKIoAO1s1e4VUrgx1l1Sk2JBR/Gqjjgw8+mfgoLE2xwsHur4gdfTxyTgShrhvdVFTaJSgMiQBl1jv/AWxg==", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.12.0.tgz", + "integrity": "sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==", "dev": true, "license": "MIT", "dependencies": { @@ -10710,11 +11118,11 @@ "@eslint/config-array": "^0.18.0", "@eslint/core": "^0.6.0", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.11.1", + "@eslint/js": "9.12.0", "@eslint/plugin-kit": "^0.2.0", + "@humanfs/node": "^0.16.5", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.3.0", - "@nodelib/fs.walk": "^1.2.8", + "@humanwhocodes/retry": "^0.3.1", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -10722,9 +11130,9 @@ "cross-spawn": "^7.0.2", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.0.2", - "eslint-visitor-keys": "^4.0.0", - "espree": "^10.1.0", + "eslint-scope": "^8.1.0", + "eslint-visitor-keys": "^4.1.0", + "espree": "^10.2.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -10734,13 +11142,11 @@ "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", "text-table": "^0.2.0" }, "bin": { @@ -11157,9 +11563,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", - "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz", + "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -11281,9 +11687,9 @@ } }, "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz", + "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -11293,19 +11699,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/eslint/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -11350,15 +11743,15 @@ } }, "node_modules/espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz", + "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==", "dev": true, "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" + "eslint-visitor-keys": "^4.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -11368,9 +11761,9 @@ } }, "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz", + "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -11658,6 +12051,18 @@ "node": ">=8.6.0" } }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-patch": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz", @@ -11939,9 +12344,9 @@ } }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "dev": true, "license": "MIT", "dependencies": { @@ -12048,31 +12453,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/fs-extra/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/fs-minipass": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", @@ -12097,6 +12477,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -12292,15 +12673,16 @@ } }, "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "license": "ISC", "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/glob-to-regexp": { @@ -13053,6 +13435,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -13201,16 +13584,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-obj": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", @@ -14254,9 +14627,9 @@ } }, "node_modules/jest-fail-on-console": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/jest-fail-on-console/-/jest-fail-on-console-3.3.0.tgz", - "integrity": "sha512-J9rnFQvQwkcGJw01zCEKe2Uag+E926lFgIyaQGep2LqhQH7OCRHyD+tm/jnNoKlSRnOBO60DmzMjeQAVI3f5cw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jest-fail-on-console/-/jest-fail-on-console-3.3.1.tgz", + "integrity": "sha512-dmq/dmh5OBgJlD1MJdpznzwFQP8S7msf3ghTGWQLGhagWwHKzGtqXza76nuJUKOK7BdwqcTK6CCE49Xxv4ckUQ==", "dev": true, "license": "MIT" }, @@ -15481,13 +15854,13 @@ "license": "MIT" }, "node_modules/jsdom": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.0.tgz", - "integrity": "sha512-OhoFVT59T7aEq75TVw9xxEfkXgacpqAhQaYgP9y/fDqWQCMB/b1H66RfmPm/MaeaAIU9nDwMOVTlPN51+ao6CQ==", + "version": "25.0.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.1.tgz", + "integrity": "sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==", "dev": true, "license": "MIT", "dependencies": { - "cssstyle": "^4.0.1", + "cssstyle": "^4.1.0", "data-urls": "^5.0.0", "decimal.js": "^10.4.3", "form-data": "^4.0.0", @@ -15500,7 +15873,7 @@ "rrweb-cssom": "^0.7.1", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^4.1.4", + "tough-cookie": "^5.0.0", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^3.1.1", @@ -15583,29 +15956,6 @@ "dev": true, "license": "MIT" }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/jsonfile/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -15849,11 +16199,14 @@ } }, "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } }, "node_modules/lint-staged": { "version": "15.2.10", @@ -16534,9 +16887,9 @@ } }, "node_modules/memfs": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz", - "integrity": "sha512-74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.13.0.tgz", + "integrity": "sha512-dIs5KGy24fbdDhIAg0RxXpFqQp3RwL6wgSMRF9OSuphL/Uc9a4u2/SDJKPLj/zUgtOGKuHrRMrj563+IErj4Cg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -16934,9 +17287,9 @@ "license": "MIT" }, "node_modules/monaco-editor": { - "version": "0.51.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.51.0.tgz", - "integrity": "sha512-xaGwVV1fq343cM7aOYB6lVE4Ugf0UyimdD/x5PWcWBMKENwectaEu77FAN7c5sFiyumqeJdX1RPTh1ocioyDjw==", + "version": "0.52.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.0.tgz", + "integrity": "sha512-OeWhNpABLCeTqubfqLMXGsqf6OmPU6pHM85kF3dhy6kq5hnhuVS1p3VrEW/XhWHc71P2tHyS5JFySD8mgs1crw==", "license": "MIT" }, "node_modules/moo-color": { @@ -17040,9 +17393,9 @@ } }, "node_modules/nan": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", - "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", "license": "MIT", "optional": true }, @@ -17432,6 +17785,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -17589,22 +17943,22 @@ } }, "node_modules/nwsapi": { - "version": "2.2.12", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", - "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", + "version": "2.2.13", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.13.tgz", + "integrity": "sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==", "dev": true, "license": "MIT" }, "node_modules/nx": { - "version": "19.6.5", - "resolved": "https://registry.npmjs.org/nx/-/nx-19.6.5.tgz", - "integrity": "sha512-igPYPsBF1BM1YxEiGDvaLOz0CWWoEvxzR7yQg3iULjGG9zKgDFNHHIHJwkyHsCBTtMhhkgeUl16PsTVgDuil3A==", + "version": "19.8.4", + "resolved": "https://registry.npmjs.org/nx/-/nx-19.8.4.tgz", + "integrity": "sha512-fc833c3UKo6kuoG4z0kSKet17yWym3VzcQ+yPWYspxxxd8GFVVk42+9wieyVQDi9YqtKZQ6PdQfSEPm59/M7SA==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { "@napi-rs/wasm-runtime": "0.2.4", - "@nrwl/tao": "19.6.5", + "@nrwl/tao": "19.8.4", "@yarnpkg/lockfile": "^1.1.0", "@yarnpkg/parsers": "3.0.0-rc.46", "@zkochan/js-yaml": "0.0.7", @@ -17619,11 +17973,10 @@ "figures": "3.2.0", "flat": "^5.0.2", "front-matter": "^4.0.2", - "fs-extra": "^11.1.0", "ignore": "^5.0.4", "jest-diff": "^29.4.1", "jsonc-parser": "3.2.0", - "lines-and-columns": "~2.0.3", + "lines-and-columns": "2.0.3", "minimatch": "9.0.3", "node-machine-id": "1.1.12", "npm-run-path": "^4.0.1", @@ -17644,16 +17997,16 @@ "nx-cloud": "bin/nx-cloud.js" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "19.6.5", - "@nx/nx-darwin-x64": "19.6.5", - "@nx/nx-freebsd-x64": "19.6.5", - "@nx/nx-linux-arm-gnueabihf": "19.6.5", - "@nx/nx-linux-arm64-gnu": "19.6.5", - "@nx/nx-linux-arm64-musl": "19.6.5", - "@nx/nx-linux-x64-gnu": "19.6.5", - "@nx/nx-linux-x64-musl": "19.6.5", - "@nx/nx-win32-arm64-msvc": "19.6.5", - "@nx/nx-win32-x64-msvc": "19.6.5" + "@nx/nx-darwin-arm64": "19.8.4", + "@nx/nx-darwin-x64": "19.8.4", + "@nx/nx-freebsd-x64": "19.8.4", + "@nx/nx-linux-arm-gnueabihf": "19.8.4", + "@nx/nx-linux-arm64-gnu": "19.8.4", + "@nx/nx-linux-arm64-musl": "19.8.4", + "@nx/nx-linux-x64-gnu": "19.8.4", + "@nx/nx-linux-x64-musl": "19.8.4", + "@nx/nx-win32-arm64-msvc": "19.8.4", + "@nx/nx-win32-x64-msvc": "19.8.4" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -17714,19 +18067,6 @@ "node": ">=8" } }, - "node_modules/nx/node_modules/cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/nx/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -17820,16 +18160,6 @@ "dev": true, "license": "MIT" }, - "node_modules/nx/node_modules/lines-and-columns": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", - "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/nx/node_modules/minimatch": { "version": "9.0.3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", @@ -18388,6 +18718,13 @@ "dev": true, "license": "MIT" }, + "node_modules/parse-json/node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true, + "license": "MIT" + }, "node_modules/parse-node-version": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", @@ -18548,9 +18885,9 @@ } }, "node_modules/pdfjs-dist": { - "version": "4.6.82", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.6.82.tgz", - "integrity": "sha512-BUOryeRFwvbLe0lOU6NhkJNuVQUp06WxlJVVCsxdmJ4y5cU3O3s3/0DunVdK1PMm7v2MUw52qKYaidhDH1Z9+w==", + "version": "4.7.76", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.7.76.tgz", + "integrity": "sha512-8y6wUgC/Em35IumlGjaJOCm3wV4aY/6sqnIT3fVW/67mXsOZ9HWBn8GDKmJUK0GSzpbmX3gQqwfoFayp78Mtqw==", "license": "Apache-2.0", "engines": { "node": ">=18" @@ -18885,9 +19222,9 @@ "license": "MIT" }, "node_modules/posthog-js": { - "version": "1.165.0", - "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.165.0.tgz", - "integrity": "sha512-rUfRJobvOz3Q9Er+zwb32Eq2qs+ToBe/B4k4IoKzmyszI7240Rf4xVWRB0ky8LvmdZfCeYX5knS2Uv3pnn/d5A==", + "version": "1.167.0", + "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.167.0.tgz", + "integrity": "sha512-/zXQ6tuJgiF1d4mgg3UsAi/uoyg7UnfFNQtikuALmaE53xFExpcAKbMfHPG/f54QgTvLxSHyGL1kFl/1uspkGg==", "license": "MIT", "dependencies": { "fflate": "^0.4.8", @@ -18896,9 +19233,9 @@ } }, "node_modules/preact": { - "version": "10.24.1", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.1.tgz", - "integrity": "sha512-PnBAwFI3Yjxxcxw75n6VId/5TFxNW/81zexzWD9jn1+eSrOP84NdsS38H5IkF/UH3frqRPT+MvuCoVHjTDTnDw==", + "version": "10.24.2", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.2.tgz", + "integrity": "sha512-1cSoF0aCC8uaARATfrlz4VCBqE8LwZwRfLgkxJOQwAlQt6ayTmi0D9OF7nXid1POI5SZidFuG9CnlXbDfLqY/Q==", "license": "MIT", "funding": { "type": "opencollective", @@ -19336,6 +19673,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -19348,6 +19686,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -19439,16 +19778,16 @@ "license": "MIT" }, "node_modules/regexpu-core": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", - "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz", + "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsparser": "^0.9.1", + "regenerate-unicode-properties": "^10.2.0", + "regjsgen": "^0.8.0", + "regjsparser": "^0.11.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" }, @@ -19456,26 +19795,37 @@ "node": ">=4" } }, + "node_modules/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==", + "dev": true, + "license": "MIT" + }, "node_modules/regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz", + "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "jsesc": "~0.5.0" + "jsesc": "~3.0.2" }, "bin": { "regjsparser": "bin/parser" } }, "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" } }, "node_modules/require-directory": { @@ -19877,12 +20227,13 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.79.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz", - "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==", + "version": "1.79.5", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.5.tgz", + "integrity": "sha512-W1h5kp6bdhqFh2tk3DsI771MoEJjvrSY/2ihJRJS4pjIyfJCw0nTsxqhnrUzaLMOJjFchj8rOvraI/YUVjtx5g==", "dev": true, "license": "MIT", "dependencies": { + "@parcel/watcher": "^2.4.1", "chokidar": "^4.0.0", "immutable": "^4.0.0", "source-map-js": ">=0.6.2 <2.0.0" @@ -19952,9 +20303,9 @@ } }, "node_modules/sass/node_modules/readdirp": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz", - "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", + "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", "dev": true, "license": "MIT", "engines": { @@ -21058,9 +21409,9 @@ "license": "MIT" }, "node_modules/synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz", + "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==", "dev": true, "license": "MIT", "dependencies": { @@ -21412,22 +21763,22 @@ "license": "MIT" }, "node_modules/tldts": { - "version": "6.1.47", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.47.tgz", - "integrity": "sha512-R/K2tZ5MiY+mVrnSkNJkwqYT2vUv1lcT6wJvd2emGaMJ7PHUGRY4e3tUsdFCXgqxi2QgbHjL3yJgXCo40v9Hxw==", + "version": "6.1.51", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.51.tgz", + "integrity": "sha512-33lfQoL0JsDogIbZ8fgRyvv77GnRtwkNE/MOKocwUgPO1WrSfsq7+vQRKxRQZai5zd+zg97Iv9fpFQSzHyWdLA==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^6.1.47" + "tldts-core": "^6.1.51" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.47", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.47.tgz", - "integrity": "sha512-6SWyFMnlst1fEt7GQVAAu16EGgFK0cLouH/2Mk6Ftlwhv3Ol40L0dlpGMcnnNiiOMyD2EV/aF3S+U2nKvvLvrA==", + "version": "6.1.51", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.51.tgz", + "integrity": "sha512-bu9oCYYWC1iRjx+3UnAjqCsfrWNZV1ghNQf49b3w5xE8J/tNShHTzp5syWJfwGH+pxUgTTLUnzHnfuydW7wmbg==", "dev": true, "license": "MIT" }, @@ -21945,9 +22296,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "funding": [ { "type": "opencollective", @@ -21964,8 +22315,8 @@ ], "license": "MIT", "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" }, "bin": { "update-browserslist-db": "cli.js" @@ -22797,9 +23148,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz", - "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz", + "integrity": "sha512-aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==", "dev": true, "license": "MIT", "dependencies": { @@ -22816,8 +23167,7 @@ "colorette": "^2.0.10", "compression": "^1.7.4", "connect-history-api-fallback": "^2.0.0", - "default-gateway": "^6.0.3", - "express": "^4.17.3", + "express": "^4.19.2", "graceful-fs": "^4.2.6", "html-entities": "^2.4.0", "http-proxy-middleware": "^2.0.3", @@ -22825,14 +23175,13 @@ "launch-editor": "^2.6.1", "open": "^10.0.3", "p-retry": "^6.2.0", - "rimraf": "^5.0.5", "schema-utils": "^4.2.0", "selfsigned": "^2.4.1", "serve-index": "^1.9.1", "sockjs": "^0.3.24", "spdy": "^4.0.2", - "webpack-dev-middleware": "^7.1.0", - "ws": "^8.16.0" + "webpack-dev-middleware": "^7.4.2", + "ws": "^8.18.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -22857,9 +23206,9 @@ } }, "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 03ab87fb7b80..755adfae3d3e 100644 --- a/package.json +++ b/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", @@ -13,18 +13,18 @@ "node_modules" ], "dependencies": { - "@angular/animations": "18.2.6", - "@angular/cdk": "18.2.6", - "@angular/common": "18.2.6", - "@angular/compiler": "18.2.6", - "@angular/core": "18.2.6", - "@angular/forms": "18.2.6", - "@angular/localize": "18.2.6", - "@angular/material": "18.2.6", - "@angular/platform-browser": "18.2.6", - "@angular/platform-browser-dynamic": "18.2.6", - "@angular/router": "18.2.6", - "@angular/service-worker": "18.2.6", + "@angular/animations": "18.2.8", + "@angular/cdk": "18.2.8", + "@angular/common": "18.2.8", + "@angular/compiler": "18.2.8", + "@angular/core": "18.2.8", + "@angular/forms": "18.2.8", + "@angular/localize": "18.2.8", + "@angular/material": "18.2.8", + "@angular/platform-browser": "18.2.8", + "@angular/platform-browser-dynamic": "18.2.8", + "@angular/router": "18.2.8", + "@angular/service-worker": "18.2.8", "@ctrl/ngx-emoji-mart": "9.2.0", "@danielmoncada/angular-datetime-picker": "18.1.0", "@fingerprintjs/fingerprintjs": "4.5.0", @@ -36,7 +36,7 @@ "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", - "@sentry/angular": "8.32.0", + "@sentry/angular": "8.34.0", "@siemens/ngx-datatable": "22.4.1", "@swimlane/ngx-charts": "20.5.0", "@swimlane/ngx-graph": "8.4.0", @@ -58,12 +58,12 @@ "jszip": "3.10.1", "lodash-es": "4.17.21", "mobile-drag-drop": "3.0.0-rc.0", - "monaco-editor": "0.51.0", + "monaco-editor": "0.52.0", "ngx-infinite-scroll": "18.0.0", "ngx-webstorage": "18.0.0", "papaparse": "5.4.1", - "pdfjs-dist": "4.6.82", - "posthog-js": "1.165.0", + "pdfjs-dist": "4.7.76", + "posthog-js": "1.167.0", "rxjs": "7.8.1", "showdown": "2.1.0", "showdown-highlight": "3.1.0", @@ -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,36 +112,37 @@ "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" }, "devDependencies": { "@angular-builders/jest": "18.0.0", - "@angular-devkit/build-angular": "18.2.6", + "@angular-devkit/build-angular": "18.2.8", "@angular-eslint/builder": "18.3.1", "@angular-eslint/eslint-plugin": "18.3.1", "@angular-eslint/eslint-plugin-template": "18.3.1", "@angular-eslint/schematics": "18.3.1", "@angular-eslint/template-parser": "18.3.1", - "@angular/cli": "18.2.6", - "@angular/compiler-cli": "18.2.6", - "@angular/language-service": "18.2.6", - "@sentry/types": "8.32.0", + "@angular/cli": "18.2.8", + "@angular/compiler-cli": "18.2.8", + "@angular/language-service": "18.2.8", + "@sentry/types": "8.34.0", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", "@types/jest": "29.5.13", "@types/lodash-es": "4.17.12", - "@types/node": "22.7.3", + "@types/node": "22.7.5", "@types/papaparse": "5.3.14", "@types/showdown": "2.0.6", "@types/smoothscroll-polyfill": "0.3.4", "@types/sockjs-client": "1.5.4", "@types/uuid": "10.0.0", - "@typescript-eslint/eslint-plugin": "8.7.0", - "@typescript-eslint/parser": "8.7.0", - "eslint": "9.11.1", + "@typescript-eslint/eslint-plugin": "8.8.1", + "@typescript-eslint/parser": "8.8.1", + "eslint": "9.12.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-deprecation": "3.0.0", "eslint-plugin-jest": "28.8.3", @@ -151,7 +154,7 @@ "jest-canvas-mock": "2.5.2", "jest-date-mock": "1.0.10", "jest-extended": "4.0.2", - "jest-fail-on-console": "3.3.0", + "jest-fail-on-console": "3.3.1", "jest-junit": "16.0.0", "jest-preset-angular": "14.2.4", "lint-staged": "15.2.10", @@ -159,7 +162,7 @@ "ng-mocks": "14.13.1", "prettier": "3.3.3", "rimraf": "6.0.1", - "sass": "1.79.3", + "sass": "1.79.5", "ts-jest": "29.2.5", "typescript": "5.5.4", "weak-napi": "2.0.2" diff --git a/prebuild.mjs b/prebuild.mjs index 7ef783be432c..5f362babe3fc 100644 --- a/prebuild.mjs +++ b/prebuild.mjs @@ -5,10 +5,11 @@ * - webpack.DefinePlugin and * - MergeJsonWebpackPlugin */ -import fs from "fs"; -import path from "path"; -import { hashElement } from "folder-hash"; -import { fileURLToPath } from "url"; +import fs from 'fs'; +import path from 'path'; +import { hashElement } from 'folder-hash'; +import { fileURLToPath } from 'url'; +import * as esbuild from 'esbuild'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); @@ -111,4 +112,25 @@ for (const group of groups) { } } +/* + * The workers of the monaco editor must be bundled separately. + * Specialized workers are available in the vs/esm/language/ directory. + * Be sure to modify the MonacoConfig if you choose to add a worker here. + * For more details, refer to https://github.com/microsoft/monaco-editor/blob/main/samples/browser-esm-esbuild/build.js + */ +const workerEntryPoints = [ + 'vs/language/json/json.worker.js', + 'vs/language/css/css.worker.js', + 'vs/language/html/html.worker.js', + 'vs/language/typescript/ts.worker.js', + 'vs/editor/editor.worker.js' +]; +await esbuild.build({ + entryPoints: workerEntryPoints.map((entry) => `node_modules/monaco-editor/esm/${entry}`), + bundle: true, + format: 'esm', + outbase: 'node_modules/monaco-editor/esm', + outdir: 'node_modules/monaco-editor/bundles' +}); + console.log("Pre-Build complete!"); diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java index cc14d7a35e34..77c01c6fae19 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java @@ -629,7 +629,7 @@ public boolean isAutomatic() { * @return true if the result is an automatic AI Athena result */ @JsonIgnore - public boolean isAthenaAutomatic() { + public boolean isAthenaBased() { return AssessmentType.AUTOMATIC_ATHENA == assessmentType; } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 87c381b777d9..5a7b75e82de5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -427,6 +427,14 @@ SELECT COUNT(DISTINCT p) */ boolean existsByParticipationId(long participationId); + /** + * Checks if a result exists for the given submission ID. + * + * @param submissionId the ID of the submission to check. + * @return true if a result exists for the given submission ID, false otherwise. + */ + boolean existsBySubmissionId(long submissionId); + /** * Returns true if there is at least one result for the given exercise. * diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java index 267efe722982..ab4c961be143 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java @@ -31,6 +31,12 @@ public class LearningPath extends DomainObject { @Column(name = "progress") private int progress; + /** + * flag indicating if a student started the learning path + */ + @Column(name = "started_by_student") + private boolean startedByStudent = false; + @ManyToOne @JoinColumn(name = "user_id") private User user; @@ -89,8 +95,16 @@ public void removeCompetency(CourseCompetency competency) { this.competencies.remove(competency); } + public boolean isStartedByStudent() { + return startedByStudent; + } + + public void setStartedByStudent(boolean startedByStudent) { + this.startedByStudent = startedByStudent; + } + @Override public String toString() { - return "LearningPath{" + "id=" + getId() + ", user=" + user + ", course=" + course + ", competencies=" + competencies + '}'; + return "LearningPath{" + "id=" + getId() + ", user=" + user + ", course=" + course + ", competencies=" + competencies + ", startedByStudent=" + startedByStudent + "}"; } } diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyImportOptionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyImportOptionsDTO.java new file mode 100644 index 000000000000..7d64a43ca560 --- /dev/null +++ b/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 competencyIds, Optional sourceCourseId, boolean importRelations, boolean importExercises, boolean importLectures, + Optional referenceDate, boolean isReleaseDate) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathDTO.java new file mode 100644 index 000000000000..f61598b30cf4 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathDTO.java @@ -0,0 +1,13 @@ +package de.tum.cit.aet.artemis.atlas.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record LearningPathDTO(long id, boolean startedByStudent, int progress) { + + public static LearningPathDTO of(LearningPath learningPath) { + return new LearningPathDTO(learningPath.getId(), learningPath.isStartedByStudent(), learningPath.getProgress()); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java index 02e0fc7edeb2..f361bc402718 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; /** @@ -19,4 +20,15 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyInformationDTO(long id, String title, String description, CompetencyTaxonomy taxonomy, ZonedDateTime softDueDate, boolean optional, int masteryThreshold) { + + /** + * Creates a CompetencyInformationDTO from a Competency. + * + * @param competency the Competency to create the DTO from + * @return the created DTO + */ + public static CompetencyInformationDTO of(C competency) { + return new CompetencyInformationDTO(competency.getId(), competency.getTitle(), competency.getDescription(), competency.getTaxonomy(), competency.getSoftDueDate(), + competency.isOptional(), competency.getMasteryThreshold()); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java index 3a5d9cc8bcb4..8f4016a5f346 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java @@ -18,4 +18,15 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record LectureUnitInformationDTO(long id, long lectureId, String lectureTitle, String name, ZonedDateTime releaseDate, Class type) { + + /** + * Creates a LectureUnitInformationDTO from a LectureUnit. + * + * @param lectureUnit the LectureUnit to create the DTO from + * @return the created DTO + */ + public static LectureUnitInformationDTO of(L lectureUnit) { + return new LectureUnitInformationDTO(lectureUnit.getId(), lectureUnit.getLecture().getId(), lectureUnit.getLecture().getTitle(), lectureUnit.getName(), + lectureUnit.getReleaseDate(), lectureUnit.getClass()); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java index eb2fc3eccab5..91ae85978b42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java @@ -26,9 +26,13 @@ public interface CompetencyRepository extends ArtemisJpaRepository findAllForCourse(@Param("courseId") long courseId); + Set findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(@Param("courseId") long courseId); @Query(""" SELECT c diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java index 9a164343bc0e..d8b66519355c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java @@ -45,6 +45,44 @@ public interface CourseCompetencyRepository extends ArtemisJpaRepository findAllForCourse(@Param("courseId") long courseId); + @Query(""" + SELECT c + FROM CourseCompetency c + LEFT JOIN FETCH c.exercises ex + LEFT JOIN FETCH c.lectureUnits lu + LEFT JOIN FETCH lu.lecture l + LEFT JOIN FETCH l.attachments + WHERE c.course.id = :courseId + """) + Set findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(@Param("courseId") long courseId); + + @Query(""" + SELECT c + FROM CourseCompetency c + LEFT JOIN FETCH c.exercises ex + LEFT JOIN FETCH c.lectureUnits lu + LEFT JOIN FETCH lu.lecture l + LEFT JOIN FETCH l.lectureUnits + LEFT JOIN FETCH l.attachments + WHERE c.id = :id + """) + Optional findByIdWithExercisesAndLectureUnitsAndLectures(@Param("id") long id); + + default CourseCompetency findByIdWithExercisesAndLectureUnitsAndLecturesElseThrow(long id) { + return getValueElseThrow(findByIdWithExercisesAndLectureUnitsAndLectures(id), id); + } + + @Query(""" + SELECT c + FROM CourseCompetency c + LEFT JOIN FETCH c.exercises ex + LEFT JOIN FETCH c.lectureUnits lu + LEFT JOIN FETCH lu.lecture l + LEFT JOIN FETCH l.attachments + WHERE c.id IN :ids + """) + Set findAllByIdWithExercisesAndLectureUnitsAndLecturesAndAttachments(@Param("ids") Set ids); + /** * Fetches all information related to the calculation of the mastery for exercises in a competency. * The complex grouping by is necessary for postgres diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java index a2187579a427..9616c2a5f34b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java @@ -19,26 +19,30 @@ public interface PrerequisiteRepository extends ArtemisJpaRepository findAllByCourseIdOrderById(long courseId); @Query(""" - SELECT c - FROM Prerequisite c - WHERE c.course.id = :courseId + SELECT p + FROM Prerequisite p + LEFT JOIN FETCH p.exercises + LEFT JOIN FETCH p.lectureUnits lu + LEFT JOIN FETCH lu.lecture l + LEFT JOIN FETCH l.attachments + WHERE p.course.id = :courseId """) - Set findAllForCourse(@Param("courseId") long courseId); + Set findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(@Param("courseId") long courseId); @Query(""" - SELECT c - FROM Prerequisite c - LEFT JOIN FETCH c.lectureUnits lu - LEFT JOIN FETCH c.exercises - WHERE c.id = :competencyId + SELECT p + FROM Prerequisite p + LEFT JOIN FETCH p.lectureUnits lu + LEFT JOIN FETCH p.exercises + WHERE p.id = :competencyId """) Optional findByIdWithLectureUnitsAndExercises(@Param("competencyId") long competencyId); @Query(""" - SELECT c - FROM Prerequisite c - LEFT JOIN FETCH c.lectureUnits lu - WHERE c.id = :competencyId + SELECT p + FROM Prerequisite p + LEFT JOIN FETCH p.lectureUnits lu + WHERE p.id = :competencyId """) Optional findByIdWithLectureUnits(@Param("competencyId") long competencyId); diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/LearningObjectImportService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/LearningObjectImportService.java new file mode 100644 index 000000000000..6b67d8f01b44 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/LearningObjectImportService.java @@ -0,0 +1,445 @@ +package de.tum.cit.aet.artemis.atlas.service; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.io.IOException; +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; +import org.springframework.util.function.ThrowingBiFunction; + +import com.fasterxml.jackson.core.JsonProcessingException; + +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.NoUniqueQueryException; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseImportService; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureImportService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitImportService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseImportService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseImportService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; + +/** + * Service for importing learning objects related to competencies. + */ +@Profile(PROFILE_CORE) +@Service +public class LearningObjectImportService { + + private static final Logger log = LoggerFactory.getLogger(LearningObjectImportService.class); + + private final ExerciseRepository exerciseRepository; + + private final ProgrammingExerciseRepository programmingExerciseRepository; + + private final ProgrammingExerciseImportService programmingExerciseImportService; + + private final FileUploadExerciseRepository fileUploadExerciseRepository; + + private final FileUploadExerciseImportService fileUploadExerciseImportService; + + private final ModelingExerciseRepository modelingExerciseRepository; + + private final ModelingExerciseImportService modelingExerciseImportService; + + private final TextExerciseRepository textExerciseRepository; + + private final TextExerciseImportService textExerciseImportService; + + private final QuizExerciseRepository quizExerciseRepository; + + private final QuizExerciseImportService quizExerciseImportService; + + private final LectureRepository lectureRepository; + + private final LectureImportService lectureImportService; + + private final LectureUnitRepository lectureUnitRepository; + + private final LectureUnitImportService lectureUnitImportService; + + private final CourseCompetencyRepository courseCompetencyRepository; + + private final ProgrammingExerciseTaskRepository programmingExerciseTaskRepository; + + private final GradingCriterionRepository gradingCriterionRepository; + + public LearningObjectImportService(ExerciseRepository exerciseRepository, ProgrammingExerciseRepository programmingExerciseRepository, + ProgrammingExerciseImportService programmingExerciseImportService, FileUploadExerciseRepository fileUploadExerciseRepository, + FileUploadExerciseImportService fileUploadExerciseImportService, ModelingExerciseRepository modelingExerciseRepository, + ModelingExerciseImportService modelingExerciseImportService, TextExerciseRepository textExerciseRepository, TextExerciseImportService textExerciseImportService, + QuizExerciseRepository quizExerciseRepository, QuizExerciseImportService quizExerciseImportService, LectureRepository lectureRepository, + LectureImportService lectureImportService, LectureUnitRepository lectureUnitRepository, LectureUnitImportService lectureUnitImportService, + CourseCompetencyRepository courseCompetencyRepository, ProgrammingExerciseTaskRepository programmingExerciseTaskRepository, + GradingCriterionRepository gradingCriterionRepository) { + this.exerciseRepository = exerciseRepository; + this.programmingExerciseRepository = programmingExerciseRepository; + this.programmingExerciseImportService = programmingExerciseImportService; + this.fileUploadExerciseRepository = fileUploadExerciseRepository; + this.fileUploadExerciseImportService = fileUploadExerciseImportService; + this.modelingExerciseRepository = modelingExerciseRepository; + this.modelingExerciseImportService = modelingExerciseImportService; + this.textExerciseRepository = textExerciseRepository; + this.textExerciseImportService = textExerciseImportService; + this.quizExerciseRepository = quizExerciseRepository; + this.quizExerciseImportService = quizExerciseImportService; + this.lectureRepository = lectureRepository; + this.lectureImportService = lectureImportService; + this.lectureUnitRepository = lectureUnitRepository; + this.lectureUnitImportService = lectureUnitImportService; + this.courseCompetencyRepository = courseCompetencyRepository; + this.programmingExerciseTaskRepository = programmingExerciseTaskRepository; + this.gradingCriterionRepository = gradingCriterionRepository; + } + + /** + * Imports the related learning objects from the source course competencies into the course to import into and links them to the imported competencies. + * + * @param sourceCourseCompetencies The source course competencies to import from. + * @param idToImportedCompetency A map from the source competency IDs to the imported competencies. + * @param courseToImportInto The course to import the learning objects into. + * @param importOptions The import options. + */ + public void importRelatedLearningObjects(Collection sourceCourseCompetencies, Map idToImportedCompetency, + Course courseToImportInto, CompetencyImportOptionsDTO importOptions) { + Set importedCourseCompetencies = idToImportedCompetency.values().stream().map(CompetencyWithTailRelationDTO::competency).collect(Collectors.toSet()); + + Set importedExercises = new HashSet<>(); + if (importOptions.importExercises()) { + importOrLoadExercises(sourceCourseCompetencies, idToImportedCompetency, courseToImportInto, importedExercises); + } + Map titleToImportedLectures = new HashMap<>(); + Set importedLectureUnits = new HashSet<>(); + if (importOptions.importLectures()) { + importOrLoadLectureUnits(sourceCourseCompetencies, idToImportedCompetency, courseToImportInto, titleToImportedLectures, importedLectureUnits); + } + Set importedLectures = new HashSet<>(titleToImportedLectures.values()); + + if (importOptions.referenceDate().isPresent()) { + setAllDates(importedExercises, importedLectures, importedLectureUnits, importedCourseCompetencies, importOptions.referenceDate().get(), importOptions.isReleaseDate()); + } + + courseCompetencyRepository.saveAll(importedCourseCompetencies); + exerciseRepository.saveAll(importedExercises); + lectureRepository.saveAll(importedLectures); + } + + private void importOrLoadExercises(Collection sourceCourseCompetencies, Map idToImportedCompetency, + Course courseToImportInto, Set importedExercises) { + for (CourseCompetency sourceCourseCompetency : sourceCourseCompetencies) { + for (Exercise sourceExercise : sourceCourseCompetency.getExercises()) { + try { + Exercise importedExercise = importOrLoadExercise(sourceExercise, courseToImportInto); + + importedExercises.add(importedExercise); + + importedExercise.getCompetencies().add(idToImportedCompetency.get(sourceCourseCompetency.getId()).competency()); + idToImportedCompetency.get(sourceCourseCompetency.getId()).competency().getExercises().add(importedExercise); + } + catch (Exception e) { + log.error("Failed to import exercise with title {} together with its competency with id {}", sourceExercise.getTitle(), sourceCourseCompetency.getId(), e); + } + } + } + } + + private Exercise importOrLoadExercise(Exercise sourceExercise, Course course) throws JsonProcessingException { + return switch (sourceExercise) { + case ProgrammingExercise programmingExercise -> importOrLoadProgrammingExercise(programmingExercise, course); + case FileUploadExercise fileUploadExercise -> + importOrLoadExercise(fileUploadExercise, course, fileUploadExerciseRepository::findUniqueWithCompetenciesByTitleAndCourseId, + fileUploadExerciseRepository::findWithGradingCriteriaByIdElseThrow, fileUploadExerciseImportService::importFileUploadExercise); + case ModelingExercise modelingExercise -> importOrLoadExercise(modelingExercise, course, modelingExerciseRepository::findUniqueWithCompetenciesByTitleAndCourseId, + modelingExerciseRepository::findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigElseThrow, + modelingExerciseImportService::importModelingExercise); + case TextExercise textExercise -> importOrLoadExercise(textExercise, course, textExerciseRepository::findUniqueWithCompetenciesByTitleAndCourseId, + textExerciseRepository::findByIdWithExampleSubmissionsAndResultsAndGradingCriteriaElseThrow, textExerciseImportService::importTextExercise); + case QuizExercise quizExercise -> importOrLoadExercise(quizExercise, course, quizExerciseRepository::findUniqueWithCompetenciesByTitleAndCourseId, + quizExerciseRepository::findByIdWithQuestionsAndStatisticsAndCompetenciesAndBatchesAndGradingCriteriaElseThrow, (exercise, templateExercise) -> { + try { + return quizExerciseImportService.importQuizExercise(exercise, templateExercise, null); + } + catch (IOException e) { + throw new RuntimeException(e); + } + }); + default -> throw new IllegalStateException("Unexpected value: " + sourceExercise); + }; + } + + private Exercise importOrLoadProgrammingExercise(ProgrammingExercise programmingExercise, Course course) throws JsonProcessingException { + Optional foundByTitle = programmingExerciseRepository.findWithCompetenciesByTitleAndCourseId(programmingExercise.getTitle(), course.getId()); + Optional foundByShortName = programmingExerciseRepository.findByShortNameAndCourseIdWithCompetencies(programmingExercise.getShortName(), + course.getId()); + + if (foundByTitle.isPresent() && foundByShortName.isPresent() && !foundByTitle.get().equals(foundByShortName.get())) { + throw new IllegalArgumentException("Two programming exercises with the title or short name already exist in the course"); + } + + if (foundByTitle.isPresent()) { + return foundByTitle.get(); + } + else if (foundByShortName.isPresent()) { + return foundByShortName.get(); + } + else { + programmingExercise = programmingExerciseRepository.findByIdForImportElseThrow(programmingExercise.getId()); + // Fetching the tasks separately, as putting it in the query above leads to Hibernate duplicating the tasks. + var templateTasks = programmingExerciseTaskRepository.findByExerciseIdWithTestCases(programmingExercise.getId()); + programmingExercise.setTasks(new ArrayList<>(templateTasks)); + Set gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(programmingExercise.getId()); + programmingExercise.setGradingCriteria(gradingCriteria); + + ProgrammingExercise newExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigAndBuildConfigElseThrow( + programmingExercise.getId()); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNullAndCourseExercise(newExercise, programmingExerciseRepository); + newExercise.setCourse(course); + newExercise.forceNewProjectKey(); + + clearProgrammingExerciseAttributes(newExercise); + + return programmingExerciseImportService.importProgrammingExercise(programmingExercise, newExercise, false, false, false); + } + } + + private void clearProgrammingExerciseAttributes(ProgrammingExercise programmingExercise) { + programmingExercise.setTasks(null); + programmingExercise.setExerciseHints(new HashSet<>()); + programmingExercise.setTestCases(new HashSet<>()); + programmingExercise.setStaticCodeAnalysisCategories(new HashSet<>()); + programmingExercise.setTeams(new HashSet<>()); + programmingExercise.setGradingCriteria(new HashSet<>()); + programmingExercise.setStudentParticipations(new HashSet<>()); + programmingExercise.setTutorParticipations(new HashSet<>()); + programmingExercise.setExampleSubmissions(new HashSet<>()); + programmingExercise.setAttachments(new HashSet<>()); + programmingExercise.setPosts(new HashSet<>()); + programmingExercise.setPlagiarismCases(new HashSet<>()); + programmingExercise.setCompetencies(new HashSet<>()); + } + + /** + * Imports or loads an exercise. + * + * @param exercise The source exercise for the import + * @param course The course to import the exercise into + * @param findFunction The function to find an existing exercise by title + * @param loadForImport The function to load an exercise for import + * @param importFunction The function to import the exercise + * @return The imported or loaded exercise + * @param The type of the exercise + */ + private Exercise importOrLoadExercise(E exercise, Course course, ThrowingBiFunction> findFunction, + Function loadForImport, BiFunction importFunction) { + Optional foundByTitle = findFunction.apply(exercise.getTitle(), course.getId()); + if (foundByTitle.isPresent()) { + return foundByTitle.get(); + } + else { + exercise = loadForImport.apply(exercise.getId()); + exercise.setCourse(course); + exercise.setId(null); + exercise.setCompetencies(new HashSet<>()); + + return importFunction.apply(exercise, exercise); + } + } + + /** + * Imports or loads a lecture unit. If the lecture unit needs to be imported, the lecture is imported or loaded as well. + * + * @param sourceCourseCompetencies The source course competencies to import from + * @param idToImportedCompetency A map from the source competency IDs to the imported competencies + * @param courseToImportInto The course to import the lecture unit into + * @param titleToImportedLectures A map from the source lecture titles to the imported lectures + * @param importedLectureUnits The set of imported lecture units + */ + private void importOrLoadLectureUnits(Collection sourceCourseCompetencies, Map idToImportedCompetency, + Course courseToImportInto, Map titleToImportedLectures, Set importedLectureUnits) { + for (CourseCompetency sourceCourseCompetency : sourceCourseCompetencies) { + for (LectureUnit sourceLectureUnit : sourceCourseCompetency.getLectureUnits()) { + try { + importOrLoadLectureUnit(sourceLectureUnit, sourceCourseCompetency, idToImportedCompetency, courseToImportInto, titleToImportedLectures, importedLectureUnits); + } + catch (Exception e) { + log.error("Failed to import lecture unit with name {} together with its competency with id {}", sourceLectureUnit.getName(), sourceCourseCompetency.getId(), e); + } + } + } + } + + private void importOrLoadLectureUnit(LectureUnit sourceLectureUnit, CourseCompetency sourceCourseCompetency, Map idToImportedCompetency, + Course courseToImportInto, Map titleToImportedLectures, Set importedLectureUnits) throws NoUniqueQueryException { + Lecture sourceLecture = sourceLectureUnit.getLecture(); + Lecture importedLecture = importOrLoadLecture(sourceLecture, courseToImportInto, titleToImportedLectures); + + Optional foundLectureUnit = lectureUnitRepository.findByNameAndLectureTitleAndCourseIdWithCompetencies(sourceLectureUnit.getName(), sourceLecture.getTitle(), + courseToImportInto.getId()); + LectureUnit importedLectureUnit; + if (foundLectureUnit.isEmpty()) { + importedLectureUnit = lectureUnitImportService.importLectureUnit(sourceLectureUnit); + + importedLecture.getLectureUnits().add(importedLectureUnit); + importedLectureUnit.setLecture(importedLecture); + } + else { + importedLectureUnit = foundLectureUnit.get(); + } + + importedLectureUnits.add(importedLectureUnit); + + importedLectureUnit.getCompetencies().add(idToImportedCompetency.get(sourceCourseCompetency.getId()).competency()); + idToImportedCompetency.get(sourceCourseCompetency.getId()).competency().getLectureUnits().add(importedLectureUnit); + } + + private Lecture importOrLoadLecture(Lecture sourceLecture, Course courseToImportInto, Map titleToImportedLectures) throws NoUniqueQueryException { + Optional foundLecture = Optional.ofNullable(titleToImportedLectures.get(sourceLecture.getTitle())); + if (foundLecture.isEmpty()) { + foundLecture = lectureRepository.findUniqueByTitleAndCourseIdWithLectureUnitsElseThrow(sourceLecture.getTitle(), courseToImportInto.getId()); + } + Lecture importedLecture = foundLecture.orElseGet(() -> lectureImportService.importLecture(sourceLecture, courseToImportInto, false)); + titleToImportedLectures.put(importedLecture.getTitle(), importedLecture); + + return importedLecture; + } + + private void setAllDates(Set importedExercises, Set importedLectures, Set importedLectureUnits, + Set importedCourseCompetencies, ZonedDateTime referenceDate, boolean isReleaseDate) { + long timeOffset = determineTimeOffset(importedExercises, importedLectures, importedLectureUnits, importedCourseCompetencies, referenceDate, isReleaseDate); + if (timeOffset == 0) { + return; + } + + importedExercises.forEach(exercise -> setAllExerciseDates(exercise, timeOffset)); + importedLectures.forEach(lecture -> setAllLectureDates(lecture, timeOffset)); + importedLectureUnits.forEach(lectureUnit -> setAllLectureUnitDates(lectureUnit, timeOffset)); + importedCourseCompetencies.forEach(competency -> setAllCompetencyDates(competency, timeOffset)); + } + + /** + * Finds the earliest relevant time and determines the time offset to apply to the dates of the imported learning objects. + * + * @param importedExercises The imported exercises + * @param importedLectures The imported lectures + * @param importedLectureUnits The imported lecture units + * @param importedCourseCompetencies The imported competencies + * @param referenceDate The reference date to calculate the offset from + * @param isReleaseDate Whether the offset is for the release date or the due date + * @return The time offset to apply + */ + private long determineTimeOffset(Set importedExercises, Set importedLectures, Set importedLectureUnits, + Set importedCourseCompetencies, ZonedDateTime referenceDate, boolean isReleaseDate) { + Optional earliestTime; + + if (isReleaseDate) { + Stream exerciseDates = importedExercises.stream().map(Exercise::getReleaseDate); + Stream lectureDates = importedLectures.stream().map(Lecture::getVisibleDate); + Stream lectureUnitDates = importedLectureUnits.stream().map(LectureUnit::getReleaseDate); + earliestTime = Stream.concat(exerciseDates, Stream.concat(lectureDates, lectureUnitDates)).filter(Objects::nonNull).min(Comparator.naturalOrder()); + } + else { + Stream exerciseDates = importedExercises.stream().map(Exercise::getDueDate); + Stream lectureDates = importedLectures.stream().map(Lecture::getEndDate); + Stream competencyDates = importedCourseCompetencies.stream().map(CourseCompetency::getSoftDueDate); + earliestTime = Stream.concat(exerciseDates, Stream.concat(lectureDates, competencyDates)).filter(Objects::nonNull).min(Comparator.naturalOrder()); + } + + return earliestTime.map(zonedDateTime -> referenceDate.toEpochSecond() - zonedDateTime.toEpochSecond()).orElse(0L); + } + + private void setAllExerciseDates(Exercise exercise, long timeOffset) { + if (exercise.getReleaseDate() != null) { + exercise.setReleaseDate(exercise.getReleaseDate().plusSeconds(timeOffset)); + } + if (exercise.getStartDate() != null) { + exercise.setStartDate(exercise.getStartDate().plusSeconds(timeOffset)); + } + if (exercise.getDueDate() != null) { + exercise.setDueDate(exercise.getDueDate().plusSeconds(timeOffset)); + } + if (exercise.getAssessmentDueDate() != null) { + exercise.setAssessmentDueDate(exercise.getAssessmentDueDate().plusSeconds(timeOffset)); + } + if (exercise.getExampleSolutionPublicationDate() != null) { + exercise.setExampleSolutionPublicationDate(exercise.getExampleSolutionPublicationDate().plusSeconds(timeOffset)); + } + + if (exercise instanceof QuizExercise quizExercise && !quizExercise.getQuizBatches().isEmpty()) { + quizExercise.getQuizBatches().forEach(batch -> { + if (batch.getStartTime() != null) { + batch.setStartTime(batch.getStartTime().plusSeconds(timeOffset)); + } + }); + } + + if (exercise instanceof ProgrammingExercise programmingExercise && programmingExercise.getBuildAndTestStudentSubmissionsAfterDueDate() != null) { + programmingExercise.setBuildAndTestStudentSubmissionsAfterDueDate(programmingExercise.getBuildAndTestStudentSubmissionsAfterDueDate().plusSeconds(timeOffset)); + } + } + + private void setAllLectureDates(Lecture lecture, long timeOffset) { + if (lecture.getVisibleDate() != null) { + lecture.setVisibleDate(lecture.getVisibleDate().plusSeconds(timeOffset)); + } + if (lecture.getStartDate() != null) { + lecture.setStartDate(lecture.getStartDate().plusSeconds(timeOffset)); + } + if (lecture.getEndDate() != null) { + lecture.setEndDate(lecture.getEndDate().plusSeconds(timeOffset)); + } + } + + private void setAllLectureUnitDates(LectureUnit lectureUnit, long timeOffset) { + if (lectureUnit.getReleaseDate() != null) { + lectureUnit.setReleaseDate(lectureUnit.getReleaseDate().plusSeconds(timeOffset)); + } + } + + private void setAllCompetencyDates(CourseCompetency competency, long timeOffset) { + if (competency.getSoftDueDate() != null) { + competency.setSoftDueDate(competency.getSoftDueDate().plusSeconds(timeOffset)); + } + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java index 9217aa5196ad..9ec942846bf8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java @@ -13,12 +13,14 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; 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.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.LearningObjectImportService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -38,20 +40,22 @@ public class CompetencyService extends CourseCompetencyService { public CompetencyService(CompetencyRepository competencyRepository, AuthorizationCheckService authCheckService, CompetencyRelationRepository competencyRelationRepository, LearningPathService learningPathService, CompetencyProgressService competencyProgressService, LectureUnitService lectureUnitService, CompetencyProgressRepository competencyProgressRepository, LectureUnitCompletionRepository lectureUnitCompletionRepository, - StandardizedCompetencyRepository standardizedCompetencyRepository, CourseCompetencyRepository courseCompetencyRepository, ExerciseService exerciseService) { + StandardizedCompetencyRepository standardizedCompetencyRepository, CourseCompetencyRepository courseCompetencyRepository, ExerciseService exerciseService, + LearningObjectImportService learningObjectImportService) { super(competencyProgressRepository, courseCompetencyRepository, competencyRelationRepository, competencyProgressService, exerciseService, lectureUnitService, - learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository); + learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository, learningObjectImportService); this.competencyRepository = competencyRepository; } /** * Imports the given competencies and relations into a course * - * @param course the course to import into - * @param competencies the competencies to import + * @param course the course to import into + * @param competencies the competencies to import + * @param importOptions the options for importing the competencies * @return The set of imported competencies, each also containing the relations it is the tail competency for. */ - public Set importCompetenciesAndRelations(Course course, Collection competencies) { + public Set importCompetencies(Course course, Collection competencies, CompetencyImportOptionsDTO importOptions) { var idToImportedCompetency = new HashMap(); for (var competency : competencies) { @@ -62,7 +66,7 @@ public Set importCompetenciesAndRelations(Course idToImportedCompetency.put(competency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>())); } - return importCourseCompetenciesAndRelations(course, idToImportedCompetency); + return importCourseCompetencies(course, competencies, idToImportedCompetency, importOptions); } /** @@ -76,17 +80,6 @@ public List importStandardizedCompetencies(List competen return super.importStandardizedCompetencies(competencyIdsToImport, course, Competency::new); } - /** - * Imports the given course competencies into a course - * - * @param course the course to import into - * @param competencies the course competencies to import - * @return The list of imported competencies - */ - public Set importCompetencies(Course course, Collection competencies) { - return importCourseCompetencies(course, competencies, Competency::new); - } - /** * Creates a new competency and links it to a course and lecture units. * diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index 05b4f0bca77e..01eb37cf8271 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -24,12 +24,14 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; 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.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.LearningObjectImportService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -73,10 +75,13 @@ public class CourseCompetencyService { protected final LectureUnitCompletionRepository lectureUnitCompletionRepository; + private final LearningObjectImportService learningObjectImportService; + public CourseCompetencyService(CompetencyProgressRepository competencyProgressRepository, CourseCompetencyRepository courseCompetencyRepository, CompetencyRelationRepository competencyRelationRepository, CompetencyProgressService competencyProgressService, ExerciseService exerciseService, LectureUnitService lectureUnitService, LearningPathService learningPathService, AuthorizationCheckService authCheckService, - StandardizedCompetencyRepository standardizedCompetencyRepository, LectureUnitCompletionRepository lectureUnitCompletionRepository) { + StandardizedCompetencyRepository standardizedCompetencyRepository, LectureUnitCompletionRepository lectureUnitCompletionRepository, + LearningObjectImportService learningObjectImportService) { this.competencyProgressRepository = competencyProgressRepository; this.courseCompetencyRepository = courseCompetencyRepository; this.competencyRelationRepository = competencyRelationRepository; @@ -87,6 +92,7 @@ public CourseCompetencyService(CompetencyProgressRepository competencyProgressRe this.authCheckService = authCheckService; this.standardizedCompetencyRepository = standardizedCompetencyRepository; this.lectureUnitCompletionRepository = lectureUnitCompletionRepository; + this.learningObjectImportService = learningObjectImportService; } /** @@ -158,9 +164,10 @@ public void filterOutLearningObjectsThatUserShouldNotSee(CourseCompetency compet * * @param course the course to import into * @param courseCompetencies the course competencies to import + * @param importOptions the import options * @return The set of imported course competencies, each also containing the relations it is the tail competency for. */ - public Set importCourseCompetenciesAndRelations(Course course, Collection courseCompetencies) { + public Set importCourseCompetencies(Course course, Collection courseCompetencies, CompetencyImportOptionsDTO importOptions) { var idToImportedCompetency = new HashMap(); for (var courseCompetency : courseCompetencies) { @@ -175,37 +182,45 @@ public Set importCourseCompetenciesAndRelations(C idToImportedCompetency.put(courseCompetency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>())); } - return importCourseCompetenciesAndRelations(course, idToImportedCompetency); + return importCourseCompetencies(course, courseCompetencies, idToImportedCompetency, importOptions); } /** * Imports the given competencies and relations into a course * * @param course the course to import into + * @param competenciesToImport the source competencies that were imported * @param idToImportedCompetency map of original competency id to imported competency + * @param importOptions the import options * @return The set of imported competencies, each also containing the relations it is the tail competency for. */ - public Set importCourseCompetenciesAndRelations(Course course, Map idToImportedCompetency) { + public Set importCourseCompetencies(Course course, Collection competenciesToImport, + Map idToImportedCompetency, CompetencyImportOptionsDTO importOptions) { if (course.getLearningPathsEnabled()) { var importedCompetencies = idToImportedCompetency.values().stream().map(CompetencyWithTailRelationDTO::competency).toList(); learningPathService.linkCompetenciesToLearningPathsOfCourse(importedCompetencies, course.getId()); } - var originalCompetencyIds = idToImportedCompetency.keySet(); - var relations = competencyRelationRepository.findAllByHeadCompetencyIdInAndTailCompetencyIdIn(originalCompetencyIds, originalCompetencyIds); + if (importOptions.importRelations()) { + var originalCompetencyIds = idToImportedCompetency.keySet(); + var relations = competencyRelationRepository.findAllByHeadCompetencyIdInAndTailCompetencyIdIn(originalCompetencyIds, originalCompetencyIds); - for (var relation : relations) { - var tailCompetencyDTO = idToImportedCompetency.get(relation.getTailCompetency().getId()); - var headCompetencyDTO = idToImportedCompetency.get(relation.getHeadCompetency().getId()); + for (var relation : relations) { + var tailCompetencyDTO = idToImportedCompetency.get(relation.getTailCompetency().getId()); + var headCompetencyDTO = idToImportedCompetency.get(relation.getHeadCompetency().getId()); - CompetencyRelation relationToImport = new CompetencyRelation(); - relationToImport.setType(relation.getType()); - relationToImport.setTailCompetency(tailCompetencyDTO.competency()); - relationToImport.setHeadCompetency(headCompetencyDTO.competency()); + CompetencyRelation relationToImport = new CompetencyRelation(); + relationToImport.setType(relation.getType()); + relationToImport.setTailCompetency(tailCompetencyDTO.competency()); + relationToImport.setHeadCompetency(headCompetencyDTO.competency()); - relationToImport = competencyRelationRepository.save(relationToImport); - tailCompetencyDTO.tailRelations().add(CompetencyRelationDTO.of(relationToImport)); + relationToImport = competencyRelationRepository.save(relationToImport); + tailCompetencyDTO.tailRelations().add(CompetencyRelationDTO.of(relationToImport)); + } } + + learningObjectImportService.importRelatedLearningObjects(competenciesToImport, idToImportedCompetency, course, importOptions); + return new HashSet<>(idToImportedCompetency.values()); } @@ -247,51 +262,6 @@ public List importStandardizedCompetencies(List competen return importedCompetencies; } - /** - * Imports the given course competencies into a course - * - * @param course the course to import into - * @param courseCompetencies the course competencies to import - * @return The list of imported competencies - */ - public Set importCourseCompetencies(Course course, Collection courseCompetencies) { - Function courseCompetencyFunction = courseCompetency -> switch (courseCompetency) { - case Competency competency -> new Competency(competency); - case Prerequisite prerequisite -> new Prerequisite(prerequisite); - default -> throw new IllegalStateException("Unexpected value: " + courseCompetency); - }; - return importCourseCompetencies(course, courseCompetencies, courseCompetencyFunction); - } - - /** - * Imports the given course competencies into a course - * - * @param course the course to import into - * @param competencies the course competencies to import - * @param courseCompetencyFunction the function that creates new course competencies - * @return The set of imported competencies - */ - public Set importCourseCompetencies(Course course, Collection competencies, - Function courseCompetencyFunction) { - var importedCompetencies = new ArrayList(); - Set createdDTOs = new HashSet<>(); - - for (var competency : competencies) { - CourseCompetency importedCompetency = courseCompetencyFunction.apply(competency); - importedCompetency.setCourse(course); - - importedCompetency = courseCompetencyRepository.save(importedCompetency); - importedCompetencies.add(importedCompetency); - createdDTOs.add(new CompetencyWithTailRelationDTO(importedCompetency, Collections.emptyList())); - } - - if (course.getLearningPathsEnabled()) { - learningPathService.linkCompetenciesToLearningPathsOfCourse(importedCompetencies, course.getId()); - } - - return createdDTOs; - } - /** * Creates a new competency and links it to a course and lecture units. * If learning paths are enabled, the competency is also linked to the learning paths of the course. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/LearningObjectImportService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/LearningObjectImportService.java new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java index aff6e8927bd7..3fc520a21378 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java @@ -13,12 +13,14 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; 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.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.LearningObjectImportService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -38,9 +40,10 @@ public class PrerequisiteService extends CourseCompetencyService { public PrerequisiteService(PrerequisiteRepository prerequisiteRepository, AuthorizationCheckService authCheckService, CompetencyRelationRepository competencyRelationRepository, LearningPathService learningPathService, CompetencyProgressService competencyProgressService, LectureUnitService lectureUnitService, CompetencyProgressRepository competencyProgressRepository, LectureUnitCompletionRepository lectureUnitCompletionRepository, - StandardizedCompetencyRepository standardizedCompetencyRepository, CourseCompetencyRepository courseCompetencyRepository, ExerciseService exerciseService) { + StandardizedCompetencyRepository standardizedCompetencyRepository, CourseCompetencyRepository courseCompetencyRepository, ExerciseService exerciseService, + LearningObjectImportService learningObjectImportService) { super(competencyProgressRepository, courseCompetencyRepository, competencyRelationRepository, competencyProgressService, exerciseService, lectureUnitService, - learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository); + learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository, learningObjectImportService); this.prerequisiteRepository = prerequisiteRepository; } @@ -49,9 +52,10 @@ public PrerequisiteService(PrerequisiteRepository prerequisiteRepository, Author * * @param course the course to import into * @param prerequisites the prerequisites to import + * @param importOptions the options for importing the prerequisites * @return The set of imported prerequisites, each also containing the relations for which it is the tail prerequisite for. */ - public Set importPrerequisitesAndRelations(Course course, Collection prerequisites) { + public Set importPrerequisites(Course course, Collection prerequisites, CompetencyImportOptionsDTO importOptions) { var idToImportedPrerequisite = new HashMap(); for (var prerequisite : prerequisites) { @@ -62,7 +66,7 @@ public Set importPrerequisitesAndRelations(Course idToImportedPrerequisite.put(prerequisite.getId(), new CompetencyWithTailRelationDTO(importedPrerequisite, new ArrayList<>())); } - return importCourseCompetenciesAndRelations(course, idToImportedPrerequisite); + return importCourseCompetencies(course, prerequisites, idToImportedPrerequisite, importOptions); } /** @@ -76,17 +80,6 @@ public List importStandardizedPrerequisites(List prerequ return super.importStandardizedCompetencies(prerequisiteIdsToImport, course, Prerequisite::new); } - /** - * Imports the given course prerequisites into a course - * - * @param course the course to import into - * @param prerequisites the course prerequisites to import - * @return The list of imported prerequisites - */ - public Set importPrerequisites(Course course, Collection prerequisites) { - return importCourseCompetencies(course, prerequisites, Prerequisite::new); - } - /** * Creates a new prerequisite and links it to a course and lecture units. * diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java index 937123a30fe1..190565c5c35c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphEdgeDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; @@ -39,6 +40,7 @@ import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.util.PageUtil; @@ -243,6 +245,52 @@ private void updateLearningPathProgress(@NotNull LearningPath learningPath) { log.debug("Updated LearningPath (id={}) for user (id={})", learningPath.getId(), userId); } + /** + * Get the learning path for the current user in the given course. + * + * @param courseId the id of the course + * @return the learning path of the current user + */ + public LearningPathDTO getLearningPathForCurrentUser(long courseId) { + final var currentUser = userRepository.getUser(); + final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(courseId, currentUser.getId()); + return LearningPathDTO.of(learningPath); + } + + /** + * Generate a learning path for the current user in the given course. + * + * @param courseId the id of the course + * @return the generated learning path + */ + public LearningPathDTO generateLearningPathForCurrentUser(long courseId) { + final var currentUser = userRepository.getUser(); + final var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); + if (learningPathRepository.findByCourseIdAndUserId(courseId, currentUser.getId()).isPresent()) { + throw new ConflictException("Learning path already exists.", "LearningPath", "learningPathAlreadyExists"); + } + final var learningPath = generateLearningPathForUser(course, currentUser); + return LearningPathDTO.of(learningPath); + } + + /** + * Start the learning path for the current user + * + * @param learningPathId the id of the learning path + */ + public void startLearningPathForCurrentUser(long learningPathId) { + final var learningPath = learningPathRepository.findByIdElseThrow(learningPathId); + final var currentUser = userRepository.getUser(); + if (!learningPath.getUser().equals(currentUser)) { + throw new AccessForbiddenException("You are not allowed to start this learning path."); + } + else if (learningPath.isStartedByStudent()) { + throw new ConflictException("Learning path already started.", "LearningPath", "learningPathAlreadyStarted"); + } + learningPath.setStartedByStudent(true); + learningPathRepository.save(learningPath); + } + /** * Gets the health status of learning paths for the given course. * diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java index aa240c5f9a42..aa1a9f78dc0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java @@ -8,7 +8,6 @@ import java.util.Set; import jakarta.validation.constraints.NotNull; -import jakarta.ws.rs.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,11 +21,11 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; 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; @@ -136,9 +135,8 @@ public ResponseEntity getCompetency(@PathVariable long competencyId, @EnforceAtLeastInstructorInCourse public ResponseEntity createCompetency(@PathVariable long courseId, @RequestBody Competency competency) throws URISyntaxException { log.debug("REST request to create Competency : {}", competency); - if (competency.getId() != null || competency.getTitle() == null || competency.getTitle().trim().isEmpty()) { - throw new BadRequestException(); - } + checkCompetencyAttributesForCreation(competency); + var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); final var persistedCompetency = competencyService.createCourseCompetency(competency, course); @@ -159,9 +157,7 @@ public ResponseEntity createCompetency(@PathVariable long courseId, public ResponseEntity> createCompetencies(@PathVariable Long courseId, @RequestBody List competencies) throws URISyntaxException { log.debug("REST request to create Competencies : {}", competencies); for (Competency competency : competencies) { - if (competency.getId() != null || competency.getTitle() == null || competency.getTitle().trim().isEmpty()) { - throw new BadRequestException(); - } + checkCompetencyAttributesForCreation(competency); } var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); @@ -173,25 +169,31 @@ public ResponseEntity> createCompetencies(@PathVariable Long co /** * POST courses/:courseId/competencies/import : imports a new competency. * - * @param courseId the id of the course to which the competency should be imported to - * @param competencyId the id of the competency that should be imported + * @param courseId the id of the course to which the competency should be imported to + * @param importOptions the options for the import * @return the ResponseEntity with status 201 (Created) and with body containing the imported competency * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping("courses/{courseId}/competencies/import") @EnforceAtLeastInstructorInCourse - public ResponseEntity importCompetency(@PathVariable long courseId, @RequestBody long competencyId) throws URISyntaxException { - log.info("REST request to import a competency: {}", competencyId); + public ResponseEntity importCompetency(@PathVariable long courseId, @RequestBody CompetencyImportOptionsDTO importOptions) throws URISyntaxException { + log.info("REST request to import a competency: {}", importOptions.competencyIds()); + + if (importOptions.competencyIds() == null || importOptions.competencyIds().size() != 1) { + throw new BadRequestAlertException("Exactly one competency must be imported", ENTITY_NAME, "noCompetency"); + } + long competencyId = importOptions.competencyIds().iterator().next(); var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); - var competencyToImport = courseCompetencyRepository.findByIdElseThrow(competencyId); + var competencyToImport = courseCompetencyRepository.findByIdWithExercisesAndLectureUnitsAndLecturesElseThrow(competencyId); authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, competencyToImport.getCourse(), null); if (competencyToImport.getCourse().getId().equals(courseId)) { throw new BadRequestAlertException("The competency is already added to this course", ENTITY_NAME, "competencyCycle"); } - Competency createdCompetency = competencyService.createCompetency(competencyToImport, course); + Set createdCompetencies = competencyService.importCompetencies(course, Set.of(competencyToImport), importOptions); + Competency createdCompetency = (Competency) createdCompetencies.iterator().next().competency(); return ResponseEntity.created(new URI("/api/courses/" + courseId + "/competencies/" + createdCompetency.getId())).body(createdCompetency); } @@ -199,21 +201,24 @@ public ResponseEntity importCompetency(@PathVariable long courseId, /** * POST courses/:courseId/competencies/import/bulk : imports a number of competencies (and optionally their relations) into a course. * - * @param courseId the id of the course to which the competencies should be imported to - * @param competencyIds the ids of the competencies that should be imported - * @param importRelations if relations should be imported as well + * @param courseId the id of the course to which the competencies should be imported to + * @param importOptions the options for the import * @return the ResponseEntity with status 201 (Created) and with body containing the imported competencies * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping("courses/{courseId}/competencies/import/bulk") @EnforceAtLeastEditorInCourse - public ResponseEntity> importCompetencies(@PathVariable long courseId, @RequestBody Set competencyIds, - @RequestParam(defaultValue = "false") boolean importRelations) throws URISyntaxException { - log.info("REST request to import competencies: {}", competencyIds); + public ResponseEntity> importCompetencies(@PathVariable long courseId, @RequestBody CompetencyImportOptionsDTO importOptions) + throws URISyntaxException { + log.info("REST request to import competencies: {}", importOptions.competencyIds()); + + if (importOptions.competencyIds() == null || importOptions.competencyIds().isEmpty()) { + throw new BadRequestAlertException("No competencies to import", ENTITY_NAME, "noCompetencies"); + } var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); - List competenciesToImport = courseCompetencyRepository.findAllById(competencyIds); + Set competenciesToImport = courseCompetencyRepository.findAllByIdWithExercisesAndLectureUnitsAndLecturesAndAttachments(importOptions.competencyIds()); User user = userRepository.getUserWithGroupsAndAuthorities(); competenciesToImport.forEach(competencyToImport -> { @@ -223,48 +228,37 @@ public ResponseEntity> importCompetencies(@Pa } }); - Set importedCompetencies; - if (importRelations) { - importedCompetencies = competencyService.importCompetenciesAndRelations(course, competenciesToImport); - } - else { - importedCompetencies = competencyService.importCompetencies(course, competenciesToImport); - } + Set importedCompetencies = competencyService.importCompetencies(course, competenciesToImport, importOptions); return ResponseEntity.created(new URI("/api/courses/" + courseId + "/competencies/")).body(importedCompetencies); } /** - * POST courses/{courseId}/competencies/import-all/{sourceCourseId} : Imports all competencies of the source course (and optionally their relations) into another. + * POST courses/{courseId}/competencies/import-all : Imports all competencies of the source course (and optionally their relations) into another. * - * @param courseId the id of the course to import into - * @param sourceCourseId the id of the course to import from - * @param importRelations if relations should be imported as well + * @param courseId the id of the course to import into + * @param importOptions the options for the import * @return the ResponseEntity with status 201 (Created) and with body containing the imported competencies (and relations) * @throws URISyntaxException if the Location URI syntax is incorrect */ - @PostMapping("courses/{courseId}/competencies/import-all/{sourceCourseId}") + @PostMapping("courses/{courseId}/competencies/import-all") @EnforceAtLeastInstructorInCourse - public ResponseEntity> importAllCompetenciesFromCourse(@PathVariable long courseId, @PathVariable long sourceCourseId, - @RequestParam(defaultValue = "false") boolean importRelations) throws URISyntaxException { - log.info("REST request to all competencies from course {} into course {}", sourceCourseId, courseId); + public ResponseEntity> importAllCompetenciesFromCourse(@PathVariable long courseId, @RequestBody CompetencyImportOptionsDTO importOptions) + throws URISyntaxException { + log.info("REST request to all competencies from course {} into course {}", importOptions.sourceCourseId(), courseId); - if (courseId == sourceCourseId) { - throw new BadRequestAlertException("Cannot import from a course into itself", "Course", "courseCycle"); + if (importOptions.sourceCourseId().isEmpty()) { + throw new BadRequestAlertException("No source course specified", ENTITY_NAME, "noSourceCourse"); + } + else if (courseId == importOptions.sourceCourseId().get()) { + throw new BadRequestAlertException("Cannot import from a course into itself", ENTITY_NAME, "courseCycle"); } var targetCourse = courseRepository.findByIdElseThrow(courseId); - var sourceCourse = courseRepository.findByIdElseThrow(sourceCourseId); + var sourceCourse = courseRepository.findByIdElseThrow(importOptions.sourceCourseId().get()); authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, sourceCourse, null); - var competencies = competencyRepository.findAllForCourse(sourceCourse.getId()); - Set importedCompetencies; - - if (importRelations) { - importedCompetencies = competencyService.importCompetenciesAndRelations(targetCourse, competencies); - } - else { - importedCompetencies = competencyService.importCompetencies(targetCourse, competencies); - } + var competencies = competencyRepository.findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(sourceCourse.getId()); + Set importedCompetencies = competencyService.importCompetencies(targetCourse, competencies, importOptions); return ResponseEntity.created(new URI("/api/courses/" + courseId + "/competencies/")).body(importedCompetencies); } @@ -300,9 +294,8 @@ public ResponseEntity> importStandardizedCompe @EnforceAtLeastInstructorInCourse public ResponseEntity updateCompetency(@PathVariable long courseId, @RequestBody Competency competency) { log.debug("REST request to update Competency : {}", competency); - if (competency.getId() == null) { - throw new BadRequestException(); - } + checkCompetencyAttributesForUpdate(competency); + var course = courseRepository.findByIdElseThrow(courseId); var existingCompetency = competencyRepository.findByIdWithLectureUnitsElseThrow(competency.getId()); checkCourseForCompetency(course, existingCompetency); @@ -334,6 +327,26 @@ public ResponseEntity deleteCompetency(@PathVariable long competencyId, @P return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, competency.getTitle())).build(); } + private void checkCompetencyAttributesForCreation(Competency competency) { + if (competency.getId() != null) { + throw new BadRequestAlertException("A new competency should not have an id", ENTITY_NAME, "existingCompetencyId"); + } + checkCompetencyAttributes(competency); + } + + private void checkCompetencyAttributesForUpdate(Competency competency) { + if (competency.getId() == null) { + throw new BadRequestAlertException("An updated competency should have an id", ENTITY_NAME, "missingCompetencyId"); + } + checkCompetencyAttributes(competency); + } + + private void checkCompetencyAttributes(Competency competency) { + if (competency.getTitle() == null || competency.getTitle().trim().isEmpty() || competency.getMasteryThreshold() < 1 || competency.getMasteryThreshold() > 100) { + throw new BadRequestAlertException("The attributes of the competency are invalid!", ENTITY_NAME, "invalidPrerequisiteAttributes"); + } + } + /** * Checks if the competency matches the course. * diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java index d335c9285f59..449a92a1d171 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; @@ -232,36 +233,31 @@ public ResponseEntity> getCompetenciesForI } /** - * POST courses/{courseId}/course-competencies/import-all/{sourceCourseId} : Imports all course competencies of the source course (and optionally their relations) into another. + * POST courses/{courseId}/course-competencies/import-all : Imports all course competencies of the source course (and optionally their relations) into another. * - * @param courseId the id of the course to import into - * @param sourceCourseId the id of the course to import from - * @param importRelations if relations should be imported as well + * @param courseId the id of the course to import into + * @param importOptions the options for the import * @return the ResponseEntity with status 201 (Created) and with body containing the imported competencies (and relations) * @throws URISyntaxException if the Location URI syntax is incorrect */ - @PostMapping("courses/{courseId}/course-competencies/import-all/{sourceCourseId}") + @PostMapping("courses/{courseId}/course-competencies/import-all") @EnforceAtLeastInstructorInCourse - public ResponseEntity> importAllCompetenciesFromCourse(@PathVariable long courseId, @PathVariable long sourceCourseId, - @RequestParam(defaultValue = "false") boolean importRelations) throws URISyntaxException { - log.info("REST request to all course competencies from course {} into course {}", sourceCourseId, courseId); + public ResponseEntity> importAllCompetenciesFromCourse(@PathVariable long courseId, @RequestBody CompetencyImportOptionsDTO importOptions) + throws URISyntaxException { + log.info("REST request to all course competencies from course {} into course {}", importOptions.sourceCourseId(), courseId); - if (courseId == sourceCourseId) { - throw new BadRequestAlertException("Cannot import from a course into itself", "Course", "courseCycle"); + if (importOptions.sourceCourseId().isEmpty()) { + throw new BadRequestAlertException("No source course specified", ENTITY_NAME, "noSourceCourse"); + } + else if (courseId == importOptions.sourceCourseId().get()) { + throw new BadRequestAlertException("Cannot import from a course into itself", ENTITY_NAME, "courseCycle"); } var targetCourse = courseRepository.findByIdElseThrow(courseId); - var sourceCourse = courseRepository.findByIdElseThrow(sourceCourseId); + var sourceCourse = courseRepository.findByIdElseThrow(importOptions.sourceCourseId().get()); authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, sourceCourse, null); - var competencies = courseCompetencyRepository.findAllForCourse(sourceCourse.getId()); - Set importedCompetencies; - - if (importRelations) { - importedCompetencies = courseCompetencyService.importCourseCompetenciesAndRelations(targetCourse, competencies); - } - else { - importedCompetencies = courseCompetencyService.importCourseCompetencies(targetCourse, competencies); - } + var competencies = courseCompetencyRepository.findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(sourceCourse.getId()); + Set importedCompetencies = courseCompetencyService.importCourseCompetencies(targetCourse, competencies, importOptions); return ResponseEntity.created(new URI("/api/courses/" + courseId + "/competencies/")).body(importedCompetencies); } diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java index 709ac913cdf9..f69dae28f80c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java @@ -17,6 +17,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -28,6 +29,7 @@ import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyProgressForLearningPathDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; @@ -57,6 +59,7 @@ import de.tum.cit.aet.artemis.lecture.service.LearningObjectService; @Profile(PROFILE_CORE) +@FeatureToggle(Feature.LearningPaths) @RestController @RequestMapping("api/") public class LearningPathResource { @@ -106,7 +109,6 @@ public LearningPathResource(CourseService courseService, CourseRepository course * @return the ResponseEntity with status 200 (OK) */ @PutMapping("courses/{courseId}/learning-paths/enable") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastInstructorInCourse public ResponseEntity enableLearningPathsForCourse(@PathVariable long courseId) { log.debug("REST request to enable learning paths for course with id: {}", courseId); @@ -127,7 +129,6 @@ public ResponseEntity enableLearningPathsForCourse(@PathVariable long cour * @return the ResponseEntity with status 200 (OK) */ @PutMapping("courses/{courseId}/learning-paths/generate-missing") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastInstructorInCourse public ResponseEntity generateMissingLearningPathsForCourse(@PathVariable long courseId) { log.debug("REST request to generate missing learning paths for course with id: {}", courseId); @@ -145,7 +146,6 @@ public ResponseEntity generateMissingLearningPathsForCourse(@PathVariable * @return the ResponseEntity with status 200 (OK) and with body the desired page, sorted and matching the given query */ @GetMapping("courses/{courseId}/learning-paths") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastInstructorInCourse public ResponseEntity> getLearningPathsOnPage(@PathVariable long courseId, SearchTermPageableSearchDTO search) { log.debug("REST request to get learning paths for course with id: {}", courseId); @@ -160,7 +160,6 @@ public ResponseEntity> getLearni * @return the ResponseEntity with status 200 (OK) and with body the health status */ @GetMapping("courses/{courseId}/learning-path-health") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastInstructorInCourse public ResponseEntity getHealthStatusForCourse(@PathVariable long courseId) { log.debug("REST request to get health status of learning paths in course with id: {}", courseId); @@ -175,7 +174,6 @@ public ResponseEntity getHealthStatusForCourse(@PathVaria * @return the ResponseEntity with status 200 (OK) and with body the learning path */ @GetMapping("learning-path/{learningPathId}") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastStudent public ResponseEntity getLearningPath(@PathVariable long learningPathId) { log.debug("REST request to get learning path with id: {}", learningPathId); @@ -194,7 +192,6 @@ public ResponseEntity getLearningPath(@PathVariable * @return the ResponseEntity with status 200 (OK) and with body the graph */ @GetMapping("learning-path/{learningPathId}/competency-graph") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastStudent public ResponseEntity getLearningPathCompetencyGraph(@PathVariable long learningPathId) { log.debug("REST request to get competency graph for learning path with id: {}", learningPathId); @@ -213,7 +210,6 @@ public ResponseEntity getLearningPathCompetencyG * @return the ResponseEntity with status 200 (OK) and with body the ngx representation of the learning path */ @GetMapping("learning-path/{learningPathId}/graph") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastStudent public ResponseEntity getLearningPathNgxGraph(@PathVariable long learningPathId) { log.debug("REST request to get ngx graph representation of learning path with id: {}", learningPathId); @@ -227,7 +223,6 @@ public ResponseEntity getLearningPathNgxGraph(@PathVariable * @return the ResponseEntity with status 200 (OK) and with body the ngx representation of the learning path */ @GetMapping("learning-path/{learningPathId}/path") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastStudent public ResponseEntity getLearningPathNgxPath(@PathVariable long learningPathId) { log.debug("REST request to get ngx path representation of learning path with id: {}", learningPathId); @@ -244,7 +239,6 @@ public ResponseEntity getLearningPathNgxPath(@PathVariable l * @return the ResponseEntity with status 200 (OK) and with body the navigation information */ @GetMapping("learning-path/{learningPathId}/relative-navigation") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastStudent public ResponseEntity getRelativeLearningPathNavigation(@PathVariable @Valid long learningPathId, @RequestParam long learningObjectId, @RequestParam LearningObjectType learningObjectType, @RequestParam long competencyId) { @@ -263,7 +257,6 @@ public ResponseEntity getRelativeLearningPathNavigati * @return the ResponseEntity with status 200 (OK) and with body the navigation information */ @GetMapping("learning-path/{learningPathId}/navigation") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastStudent public ResponseEntity getLearningPathNavigation(@PathVariable long learningPathId) { log.debug("REST request to get navigation for learning path with id: {}", learningPathId); @@ -279,7 +272,6 @@ public ResponseEntity getLearningPathNavigation(@Path * @return the ResponseEntity with status 200 (OK) and with body the navigation overview */ @GetMapping("learning-path/{learningPathId}/navigation-overview") - @FeatureToggle(Feature.LearningPaths) @EnforceAtLeastStudent public ResponseEntity getLearningPathNavigationOverview(@PathVariable @Valid long learningPathId) { log.debug("REST request to get navigation overview for learning path with id: {}", learningPathId); @@ -301,19 +293,31 @@ private ResponseEntity getLearningPathNgx(@PathVariable long } /** - * GET courses/:courseId/learning-path-id : Gets the id of the learning path. + * GET courses/:courseId/learning-path/me : Gets the learning path of the current user in the course. * - * @param courseId the id of the course from which the learning path id should be fetched - * @return the ResponseEntity with status 200 (OK) and with body the id of the learning path + * @param courseId the id of the course for which the learning path should be fetched + * @return the ResponseEntity with status 200 (OK) and with body the learning path */ - @GetMapping("courses/{courseId}/learning-path-id") + @GetMapping("courses/{courseId}/learning-path/me") @EnforceAtLeastStudentInCourse - public ResponseEntity getLearningPathId(@PathVariable long courseId) { - log.debug("REST request to get learning path id for course with id: {}", courseId); + public ResponseEntity getLearningPathForCurrentUser(@PathVariable long courseId) { + log.debug("REST request to get learning path of current user for course with id: {}", courseId); courseService.checkLearningPathsEnabledElseThrow(courseId); - User user = userRepository.getUser(); - final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(courseId, user.getId()); - return ResponseEntity.ok(learningPath.getId()); + return ResponseEntity.ok(learningPathService.getLearningPathForCurrentUser(courseId)); + } + + /** + * PATCH learning-path/:learningPathId/start : Starts the learning path for the current user. + * + * @param learningPathId the id of the learning path to start + * @return the ResponseEntity with status 204 (NO_CONTENT) + */ + @PatchMapping("learning-path/{learningPathId}/start") + @EnforceAtLeastStudent + public ResponseEntity startLearningPathForCurrentUser(@PathVariable long learningPathId) { + log.debug("REST request to start learning path with id: {}", learningPathId); + learningPathService.startLearningPathForCurrentUser(learningPathId); + return ResponseEntity.noContent().build(); } /** @@ -324,20 +328,11 @@ public ResponseEntity getLearningPathId(@PathVariable long courseId) { */ @PostMapping("courses/{courseId}/learning-path") @EnforceAtLeastStudentInCourse - public ResponseEntity generateLearningPath(@PathVariable long courseId) throws URISyntaxException { - log.debug("REST request to generate learning path for user in course with id: {}", courseId); + public ResponseEntity generateLearningPathForCurrentUser(@PathVariable long courseId) throws URISyntaxException { + log.debug("REST request to generate learning path for current user in course with id: {}", courseId); courseService.checkLearningPathsEnabledElseThrow(courseId); - - User user = userRepository.getUser(); - final var learningPathOptional = learningPathRepository.findByCourseIdAndUserId(courseId, user.getId()); - - if (learningPathOptional.isPresent()) { - throw new BadRequestException("Learning path already exists."); - } - - final var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); - final var learningPath = learningPathService.generateLearningPathForUser(course, user); - return ResponseEntity.created(new URI("api/learning-path/" + learningPath.getId())).body(learningPath.getId()); + final var learningPathDTO = learningPathService.generateLearningPathForCurrentUser(courseId); + return ResponseEntity.created(new URI("api/learning-path/" + learningPathDTO.id())).body(learningPathDTO); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java index 7cd32bdd957a..a9be53c3c4a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java @@ -8,7 +8,6 @@ import java.util.Set; import jakarta.validation.constraints.NotNull; -import jakarta.ws.rs.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,11 +21,11 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; 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.CourseCompetencyRepository; @@ -39,6 +38,7 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; @@ -97,7 +97,7 @@ public PrerequisiteResource(CourseRepository courseRepository, AuthorizationChec * @return the ResponseEntity with status 200 (OK) and with body the found prerequisites */ @GetMapping("courses/{courseId}/prerequisites") - @EnforceAtLeastStudentInCourse + @EnforceAtLeastStudent public ResponseEntity> getPrerequisitesWithProgress(@PathVariable long courseId) { log.debug("REST request to get prerequisites for course with id: {}", courseId); User user = userRepository.getUserWithGroupsAndAuthorities(); @@ -139,9 +139,8 @@ public ResponseEntity getPrerequisite(@PathVariable long prerequis @EnforceAtLeastInstructorInCourse public ResponseEntity createPrerequisite(@PathVariable long courseId, @RequestBody Prerequisite prerequisite) throws URISyntaxException { log.debug("REST request to create Prerequisite : {}", prerequisite); - if (prerequisite.getId() != null || prerequisite.getTitle() == null || prerequisite.getTitle().trim().isEmpty()) { - throw new BadRequestException(); - } + checkPrerequisitesAttributesForCreation(prerequisite); + var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); final var persistedPrerequisite = prerequisiteService.createCourseCompetency(prerequisite, course); @@ -162,9 +161,7 @@ public ResponseEntity createPrerequisite(@PathVariable long course public ResponseEntity> createPrerequisite(@PathVariable Long courseId, @RequestBody List prerequisites) throws URISyntaxException { log.debug("REST request to create Prerequisites : {}", prerequisites); for (Prerequisite prerequisite : prerequisites) { - if (prerequisite.getId() != null || prerequisite.getTitle() == null || prerequisite.getTitle().trim().isEmpty()) { - throw new BadRequestException(); - } + checkPrerequisitesAttributesForCreation(prerequisite); } var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); @@ -176,25 +173,31 @@ public ResponseEntity> createPrerequisite(@PathVariable Long /** * POST courses/:courseId/prerequisites/import : imports a new prerequisite. * - * @param courseId the id of the course to which the prerequisite should be imported to - * @param prerequisiteId the id of the prerequisite that should be imported + * @param courseId the id of the course to which the prerequisite should be imported to + * @param importOptions the options for the import * @return the ResponseEntity with status 201 (Created) and with body containing the imported prerequisite * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping("courses/{courseId}/prerequisites/import") @EnforceAtLeastInstructorInCourse - public ResponseEntity importPrerequisite(@PathVariable long courseId, @RequestBody long prerequisiteId) throws URISyntaxException { - log.info("REST request to import a prerequisite: {}", prerequisiteId); + public ResponseEntity importPrerequisite(@PathVariable long courseId, @RequestBody CompetencyImportOptionsDTO importOptions) throws URISyntaxException { + log.info("REST request to import a prerequisite: {}", importOptions.competencyIds()); + + if (importOptions.competencyIds() == null || importOptions.competencyIds().size() != 1) { + throw new BadRequestAlertException("Exactly one prerequisite must be imported", ENTITY_NAME, "noPrerequisite"); + } + long prerequisiteId = importOptions.competencyIds().iterator().next(); var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); - var prerequisiteToImport = courseCompetencyRepository.findByIdElseThrow(prerequisiteId); + var prerequisiteToImport = courseCompetencyRepository.findByIdWithExercisesAndLectureUnitsAndLecturesElseThrow(prerequisiteId); authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, prerequisiteToImport.getCourse(), null); if (prerequisiteToImport.getCourse().getId().equals(courseId)) { throw new BadRequestAlertException("The prerequisite is already added to this course", ENTITY_NAME, "prerequisiteCycle"); } - Prerequisite createdPrerequisite = prerequisiteService.createPrerequisite(prerequisiteToImport, course); + Set createdPrerequisites = prerequisiteService.importPrerequisites(course, Set.of(prerequisiteToImport), importOptions); + Prerequisite createdPrerequisite = (Prerequisite) createdPrerequisites.iterator().next().competency(); return ResponseEntity.created(new URI("/api/courses/" + courseId + "/prerequisites/" + createdPrerequisite.getId())).body(createdPrerequisite); } @@ -202,21 +205,24 @@ public ResponseEntity importPrerequisite(@PathVariable long course /** * POST courses/:courseId/prerequisites/import/bulk : imports a number of prerequisites (and optionally their relations) into a course. * - * @param courseId the id of the course to which the prerequisites should be imported to - * @param prerequisiteIds the ids of the prerequisites that should be imported - * @param importRelations if relations should be imported as well + * @param courseId the id of the course to which the prerequisites should be imported to + * @param importOptions the options for the import * @return the ResponseEntity with status 201 (Created) and with body containing the imported prerequisites * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping("courses/{courseId}/prerequisites/import/bulk") @EnforceAtLeastEditorInCourse - public ResponseEntity> importPrerequisites(@PathVariable long courseId, @RequestBody Set prerequisiteIds, - @RequestParam(defaultValue = "false") boolean importRelations) throws URISyntaxException { - log.info("REST request to import prerequisites: {}", prerequisiteIds); + public ResponseEntity> importPrerequisites(@PathVariable long courseId, @RequestBody CompetencyImportOptionsDTO importOptions) + throws URISyntaxException { + log.info("REST request to import prerequisites: {}", importOptions.competencyIds()); + + if (importOptions.competencyIds() == null || importOptions.competencyIds().isEmpty()) { + throw new BadRequestAlertException("No prerequisites to import", ENTITY_NAME, "noPrerequisites"); + } var course = courseRepository.findWithEagerCompetenciesAndPrerequisitesByIdElseThrow(courseId); - List prerequisitesToImport = courseCompetencyRepository.findAllById(prerequisiteIds); + Set prerequisitesToImport = courseCompetencyRepository.findAllByIdWithExercisesAndLectureUnitsAndLecturesAndAttachments(importOptions.competencyIds()); User user = userRepository.getUserWithGroupsAndAuthorities(); prerequisitesToImport.forEach(prerequisiteToImport -> { @@ -226,48 +232,37 @@ public ResponseEntity> importPrerequisites(@P } }); - Set importedPrerequisites; - if (importRelations) { - importedPrerequisites = prerequisiteService.importPrerequisitesAndRelations(course, prerequisitesToImport); - } - else { - importedPrerequisites = prerequisiteService.importPrerequisites(course, prerequisitesToImport); - } + Set importedPrerequisites = prerequisiteService.importPrerequisites(course, prerequisitesToImport, importOptions); return ResponseEntity.created(new URI("/api/courses/" + courseId + "/prerequisites/")).body(importedPrerequisites); } /** - * POST courses/{courseId}/prerequisites/import-all/{sourceCourseId} : Imports all prerequisites of the source course (and optionally their relations) into another. + * POST courses/{courseId}/prerequisites/import-all : Imports all prerequisites of the source course (and optionally their relations) into another. * - * @param courseId the id of the course to import into - * @param sourceCourseId the id of the course to import from - * @param importRelations if relations should be imported as well + * @param courseId the id of the course to import into + * @param importOptions the options for the import * @return the ResponseEntity with status 201 (Created) and with body containing the imported prerequisites (and relations) * @throws URISyntaxException if the Location URI syntax is incorrect */ - @PostMapping("courses/{courseId}/prerequisites/import-all/{sourceCourseId}") + @PostMapping("courses/{courseId}/prerequisites/import-all") @EnforceAtLeastInstructorInCourse - public ResponseEntity> importAllPrerequisitesFromCourse(@PathVariable long courseId, @PathVariable long sourceCourseId, - @RequestParam(defaultValue = "false") boolean importRelations) throws URISyntaxException { - log.info("REST request to all prerequisites from course {} into course {}", sourceCourseId, courseId); + public ResponseEntity> importAllPrerequisitesFromCourse(@PathVariable long courseId, @RequestBody CompetencyImportOptionsDTO importOptions) + throws URISyntaxException { + log.info("REST request to all prerequisites from course {} into course {}", importOptions.sourceCourseId(), courseId); - if (courseId == sourceCourseId) { - throw new BadRequestAlertException("Cannot import from a course into itself", "Course", "courseCycle"); + if (importOptions.sourceCourseId().isEmpty()) { + throw new BadRequestAlertException("No source course specified", ENTITY_NAME, "noSourceCourse"); + } + else if (courseId == importOptions.sourceCourseId().get()) { + throw new BadRequestAlertException("Cannot import from a course into itself", ENTITY_NAME, "courseCycle"); } var targetCourse = courseRepository.findByIdElseThrow(courseId); - var sourceCourse = courseRepository.findByIdElseThrow(sourceCourseId); + var sourceCourse = courseRepository.findByIdElseThrow(importOptions.sourceCourseId().get()); authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, sourceCourse, null); - var prerequisites = prerequisiteRepository.findAllForCourse(sourceCourse.getId()); - Set importedPrerequisites; - - if (importRelations) { - importedPrerequisites = prerequisiteService.importPrerequisitesAndRelations(targetCourse, prerequisites); - } - else { - importedPrerequisites = prerequisiteService.importPrerequisites(targetCourse, prerequisites); - } + var prerequisites = prerequisiteRepository.findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(sourceCourse.getId()); + Set importedPrerequisites = prerequisiteService.importPrerequisites(targetCourse, prerequisites, importOptions); return ResponseEntity.created(new URI("/api/courses/" + courseId + "/prerequisites/")).body(importedPrerequisites); } @@ -303,9 +298,8 @@ public ResponseEntity> importStandardizedPrere @EnforceAtLeastInstructorInCourse public ResponseEntity updatePrerequisite(@PathVariable long courseId, @RequestBody Prerequisite prerequisite) { log.debug("REST request to update Prerequisite : {}", prerequisite); - if (prerequisite.getId() == null) { - throw new BadRequestException(); - } + checkPrerequisitesAttributesForUpdate(prerequisite); + var course = courseRepository.findByIdElseThrow(courseId); var existingPrerequisite = prerequisiteRepository.findByIdWithLectureUnitsElseThrow(prerequisite.getId()); checkCourseForPrerequisite(course, existingPrerequisite); @@ -337,6 +331,26 @@ public ResponseEntity deletePrerequisite(@PathVariable long prerequisiteId return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, prerequisite.getTitle())).build(); } + private void checkPrerequisitesAttributesForCreation(Prerequisite prerequisite) { + if (prerequisite.getId() != null) { + throw new BadRequestAlertException("A new prerequiste should not have an id", ENTITY_NAME, "existingPrerequisiteId"); + } + checkPrerequisitesAttributes(prerequisite); + } + + private void checkPrerequisitesAttributesForUpdate(Prerequisite prerequisite) { + if (prerequisite.getId() == null) { + throw new BadRequestAlertException("An updated prerequiste should have an id", ENTITY_NAME, "missingPrerequisiteId"); + } + checkPrerequisitesAttributes(prerequisite); + } + + private void checkPrerequisitesAttributes(Prerequisite prerequisite) { + if (prerequisite.getTitle() == null || prerequisite.getTitle().trim().isEmpty() || prerequisite.getMasteryThreshold() < 1 || prerequisite.getMasteryThreshold() > 100) { + throw new BadRequestAlertException("The attributes of the competency are invalid!", ENTITY_NAME, "invalidPrerequisiteAttributes"); + } + } + /** * Checks if the prerequisite matches the course. * diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceResource.java index 7312cc824997..d4e1563df41c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceResource.java @@ -21,6 +21,7 @@ * REST controller providing the science related endpoints. */ @Profile(PROFILE_CORE) +@FeatureToggle(Feature.Science) @RestController @RequestMapping("api/") public class ScienceResource { @@ -40,7 +41,6 @@ public ScienceResource(ScienceEventService scienceEventService) { * @return the ResponseEntity with status 200 (OK) */ @PutMapping(value = "science") - @FeatureToggle(Feature.Science) @EnforceAtLeastStudent public ResponseEntity science(@RequestBody ScienceEventDTO event) { log.debug("REST request to log science event of type {}", event); diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java index 8b6316fcc51c..b205db140bc3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java @@ -29,6 +29,7 @@ * REST controller for managing {@link StandardizedCompetency} entities. */ @Profile(PROFILE_CORE) +@FeatureToggle(Feature.StandardizedCompetencies) @RestController @RequestMapping("api/standardized-competencies/") public class StandardizedCompetencyResource { @@ -58,7 +59,6 @@ public StandardizedCompetencyResource(StandardizedCompetencyService standardized * @return the ResponseEntity with status 200 (OK) and with body containing the standardized competency, or with status 404 (Not Found) */ @GetMapping("{competencyId}") - @FeatureToggle(Feature.StandardizedCompetencies) @EnforceAtLeastInstructor public ResponseEntity getStandardizedCompetency(@PathVariable long competencyId) { log.debug("REST request to get standardized competency with id : {}", competencyId); @@ -74,7 +74,6 @@ public ResponseEntity getStandardizedCompetency(@PathVar * @return the ResponseEntity with status 200 (OK) and with body containing the knowledge areas */ @GetMapping("for-tree-view") - @FeatureToggle(Feature.StandardizedCompetencies) @EnforceAtLeastInstructor public ResponseEntity> getAllForTreeView() { log.debug("REST request to all knowledge areas for tree view"); @@ -91,7 +90,6 @@ public ResponseEntity> getAllForTreeView() { * @return the ResponseEntity with status 200 (OK) and with body containing the knowledge area, or with status 404 (Not Found) */ @GetMapping("knowledge-areas/{knowledgeAreaId}") - @FeatureToggle(Feature.StandardizedCompetencies) @EnforceAtLeastInstructor public ResponseEntity getKnowledgeArea(@PathVariable long knowledgeAreaId) { log.debug("REST request to get knowledge area with id : {}", knowledgeAreaId); @@ -107,7 +105,6 @@ public ResponseEntity getKnowledgeArea(@PathVariable long knowled * @return the ResponseEntity with status 200 (OK) and with body containing the list of sources */ @GetMapping("sources") - @FeatureToggle(Feature.StandardizedCompetencies) @EnforceAtLeastInstructor public ResponseEntity> getSources() { log.debug("REST request to get all sources"); diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/admin/AdminStandardizedCompetencyResource.java index 376cedb132dc..5c974101f8bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/admin/AdminStandardizedCompetencyResource.java @@ -38,6 +38,8 @@ * Admin REST controller for managing {@link StandardizedCompetency} entities. */ @Profile(PROFILE_CORE) +@FeatureToggle(Feature.StandardizedCompetencies) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminStandardizedCompetencyResource { @@ -61,8 +63,6 @@ public AdminStandardizedCompetencyResource(StandardizedCompetencyService standar * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping("standardized-competencies") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity createStandardizedCompetency(@RequestBody @Valid StandardizedCompetencyRequestDTO competency) throws URISyntaxException { log.debug("REST request to create standardized competency : {}", competency); @@ -79,8 +79,6 @@ public ResponseEntity createStandardizedCompete * @return the ResponseEntity with status 200 (OK) and with body the updated standardized competency */ @PutMapping("standardized-competencies/{competencyId}") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity updateStandardizedCompetency(@PathVariable long competencyId, @RequestBody @Valid StandardizedCompetencyRequestDTO competency) { log.debug("REST request to update standardized competency : {}", competency); @@ -97,8 +95,6 @@ public ResponseEntity updateStandardizedCompete * @return the ResponseEntity with status 200 (OK) */ @DeleteMapping("standardized-competencies/{competencyId}") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity deleteStandardizedCompetency(@PathVariable long competencyId) { log.debug("REST request to delete standardized competency : {}", competencyId); @@ -115,8 +111,6 @@ public ResponseEntity deleteStandardizedCompetency(@PathVariable long comp * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping("standardized-competencies/knowledge-areas") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity createKnowledgeArea(@RequestBody @Valid KnowledgeAreaRequestDTO knowledgeArea) throws URISyntaxException { log.debug("REST request to create knowledge area : {}", knowledgeArea); @@ -134,8 +128,6 @@ public ResponseEntity createKnowledgeArea(@RequestBody @ * @return the ResponseEntity with status 200 (OK) and with body the updated knowledge area */ @PutMapping("standardized-competencies/knowledge-areas/{knowledgeAreaId}") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity updateKnowledgeArea(@PathVariable long knowledgeAreaId, @RequestBody @Valid KnowledgeAreaRequestDTO knowledgeArea) { log.debug("REST request to update knowledge area : {}", knowledgeArea); @@ -151,8 +143,6 @@ public ResponseEntity updateKnowledgeArea(@PathVariable * @return the ResponseEntity with status 200 (OK) */ @DeleteMapping("standardized-competencies/knowledge-areas/{knowledgeAreaId}") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity deleteKnowledgeArea(@PathVariable long knowledgeAreaId) { log.debug("REST request to delete knowledge area : {}", knowledgeAreaId); @@ -168,8 +158,6 @@ public ResponseEntity deleteKnowledgeArea(@PathVariable long knowledgeArea * @return the ResponseEntity with status 200 (OK) */ @PutMapping("standardized-competencies/import") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity importStandardizedCompetencyCatalog(@RequestBody @Valid StandardizedCompetencyCatalogDTO standardizedCompetencyCatalogDTO) { log.debug("REST request to import standardized competency catalog"); @@ -184,8 +172,6 @@ public ResponseEntity importStandardizedCompetencyCatalog(@RequestBody @Va * @return the ResponseEntity with status 200 (OK) and the body containing the JSON string of the standardized competency catalog */ @GetMapping("standardized-competencies/export") - @FeatureToggle(Feature.StandardizedCompetencies) - @EnforceAdmin public ResponseEntity exportStandardizedCompetencyCatalog() { log.debug("REST request to export standardized competency catalog"); diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildConfig.java index bce9a9b20e65..9a41fc6fdc20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildConfig.java @@ -15,7 +15,7 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildConfig(String buildScript, String dockerImage, String commitHashToBuild, String assignmentCommitHash, String testCommitHash, String branch, ProgrammingLanguage programmingLanguage, ProjectType projectType, boolean scaEnabled, boolean sequentialTestRunsEnabled, boolean testwiseCoverageEnabled, - List resultPaths) implements Serializable { + List resultPaths, int timeoutSeconds, String assignmentCheckoutPath, String testCheckoutPath, String solutionCheckoutPath) implements Serializable { @Override public String dockerImage() { diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java index 8df60f45026f..b7c97daa9786 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java @@ -24,6 +24,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -275,11 +276,22 @@ public String getIDOfRunningContainer(String containerName) { * @param auxiliaryRepositoriesPaths An array of paths for auxiliary repositories to be included in the build process. * @param auxiliaryRepositoryCheckoutDirectories An array of directory names within the container where each auxiliary repository should be checked out. * @param programmingLanguage The programming language of the repositories, which influences directory naming conventions. + * @param assignmentCheckoutPath The directory within the container where the assignment repository should be checked out; can be null if not applicable, + * default would be used. + * @param testCheckoutPath The directory within the container where the test repository should be checked out; can be null if not applicable, default + * would be used. + * @param solutionCheckoutPath The directory within the container where the solution repository should be checked out; can be null if not applicable, default + * would be used. */ public void populateBuildJobContainer(String buildJobContainerId, Path assignmentRepositoryPath, Path testRepositoryPath, Path solutionRepositoryPath, - Path[] auxiliaryRepositoriesPaths, String[] auxiliaryRepositoryCheckoutDirectories, ProgrammingLanguage programmingLanguage) { - String testCheckoutPath = RepositoryCheckoutPath.TEST.forProgrammingLanguage(programmingLanguage); - String assignmentCheckoutPath = RepositoryCheckoutPath.ASSIGNMENT.forProgrammingLanguage(programmingLanguage); + Path[] auxiliaryRepositoriesPaths, String[] auxiliaryRepositoryCheckoutDirectories, ProgrammingLanguage programmingLanguage, String assignmentCheckoutPath, + String testCheckoutPath, String solutionCheckoutPath) { + + assignmentCheckoutPath = (!StringUtils.isBlank(assignmentCheckoutPath)) ? assignmentCheckoutPath + : RepositoryCheckoutPath.ASSIGNMENT.forProgrammingLanguage(programmingLanguage); + + String defaultTestCheckoutPath = RepositoryCheckoutPath.TEST.forProgrammingLanguage(programmingLanguage); + testCheckoutPath = (!StringUtils.isBlank(defaultTestCheckoutPath) && !StringUtils.isBlank(testCheckoutPath)) ? testCheckoutPath : defaultTestCheckoutPath; // Make sure to create the working directory in case it does not exist. // In case the test checkout path is the working directory, we only create up to the parent, as the working directory is created below. @@ -292,7 +304,8 @@ public void populateBuildJobContainer(String buildJobContainerId, Path assignmen // Copy the assignment repository to the container and move it to the assignment checkout path addAndPrepareDirectory(buildJobContainerId, assignmentRepositoryPath, LOCALCI_WORKING_DIRECTORY + "/testing-dir/" + assignmentCheckoutPath); if (solutionRepositoryPath != null) { - String solutionCheckoutPath = RepositoryCheckoutPath.SOLUTION.forProgrammingLanguage(programmingLanguage); + solutionCheckoutPath = (!StringUtils.isBlank(solutionCheckoutPath)) ? solutionCheckoutPath + : RepositoryCheckoutPath.SOLUTION.forProgrammingLanguage(programmingLanguage); addAndPrepareDirectory(buildJobContainerId, solutionRepositoryPath, LOCALCI_WORKING_DIRECTORY + "/testing-dir/" + solutionCheckoutPath); } for (int i = 0; i < auxiliaryRepositoriesPaths.length; i++) { @@ -309,6 +322,7 @@ private void createScriptFile(String buildJobContainerId) { private void addAndPrepareDirectory(String containerId, Path repositoryPath, String newDirectoryName) { copyToContainer(repositoryPath.toString(), containerId); + addDirectory(containerId, getParentFolderPath(newDirectoryName), true); renameDirectoryOrFile(containerId, LOCALCI_WORKING_DIRECTORY + "/" + repositoryPath.getFileName().toString(), newDirectoryName); } @@ -428,4 +442,9 @@ private Container getContainerForName(String containerName) { List containers = dockerClient.listContainersCmd().withShowAll(true).exec(); return containers.stream().filter(container -> container.getNames()[0].equals("/" + containerName)).findFirst().orElse(null); } + + private String getParentFolderPath(String path) { + Path parentPath = Paths.get(path).normalize().getParent(); + return parentPath != null ? parentPath.toString() : ""; + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java index f25d5b6f749d..9c968c453e47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java @@ -245,7 +245,8 @@ private BuildResult runScriptAndParseResults(BuildJobQueueItem buildJob, String buildLogsMap.appendBuildLogEntry(buildJob.id(), msg); log.debug(msg); buildJobContainerService.populateBuildJobContainer(containerId, assignmentRepositoryPath, testsRepositoryPath, solutionRepositoryPath, auxiliaryRepositoriesPaths, - buildJob.repositoryInfo().auxiliaryRepositoryCheckoutDirectories(), buildJob.buildConfig().programmingLanguage()); + buildJob.repositoryInfo().auxiliaryRepositoryCheckoutDirectories(), buildJob.buildConfig().programmingLanguage(), buildJob.buildConfig().assignmentCheckoutPath(), + buildJob.buildConfig().testCheckoutPath(), buildJob.buildConfig().solutionCheckoutPath()); msg = "~~~~~~~~~~~~~~~~~~~~ Executing Build Script for Build job " + buildJob.id() + " ~~~~~~~~~~~~~~~~~~~~"; buildLogsMap.appendBuildLogEntry(buildJob.id(), msg); diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java index f514d59496cd..804d7d1e50df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java @@ -58,7 +58,7 @@ public class BuildJobManagementService { private final ReentrantLock lock = new ReentrantLock(); - @Value("${artemis.continuous-integration.timeout-seconds:240}") + @Value("${artemis.continuous-integration.timeout-seconds:120}") private int timeoutSeconds; @Value("${artemis.continuous-integration.asynchronous:true}") @@ -149,9 +149,17 @@ public CompletableFuture executeBuildJob(BuildJobQueueItem buildJob lock.unlock(); } + int buildJobTimeoutSeconds; + if (buildJobItem.buildConfig().timeoutSeconds() != 0 && buildJobItem.buildConfig().timeoutSeconds() < this.timeoutSeconds) { + buildJobTimeoutSeconds = buildJobItem.buildConfig().timeoutSeconds(); + } + else { + buildJobTimeoutSeconds = this.timeoutSeconds; + } + CompletableFuture futureResult = createCompletableFuture(() -> { try { - return future.get(timeoutSeconds, TimeUnit.SECONDS); + return future.get(buildJobTimeoutSeconds, TimeUnit.SECONDS); } catch (Exception e) { // RejectedExecutionException is thrown if the queue size limit (defined in "artemis.continuous-integration.queue-size-limit") is reached. diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java index f82f7aa7a36f..7534de04e3bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java @@ -294,6 +294,7 @@ private void processBuild(BuildJobQueueItem buildJob) { CompletableFuture futureResult = buildJobManagementService.executeBuildJob(buildJob); futureResult.thenAccept(buildResult -> { + log.debug("Build job completed: {}", buildJob); JobTimingInfo jobTimingInfo = new JobTimingInfo(buildJob.jobTimingInfo().submissionDate(), buildJob.jobTimingInfo().buildStartDate(), ZonedDateTime.now()); BuildJobQueueItem finishedJob = new BuildJobQueueItem(buildJob.id(), buildJob.name(), buildJob.buildAgentAddress(), buildJob.participationId(), buildJob.courseId(), @@ -316,6 +317,8 @@ private void processBuild(BuildJobQueueItem buildJob) { }); futureResult.exceptionally(ex -> { + log.debug("Build job completed with exception: {}", buildJob, ex); + ZonedDateTime completionDate = ZonedDateTime.now(); BuildJobQueueItem job; @@ -364,6 +367,7 @@ public class QueuedBuildJobItemListener implements ItemListener event) { log.debug("CIBuildJobQueueItem added to queue: {}", event.getItem()); + log.debug("Current queued items: {}", queue.size()); checkAvailabilityAndProcessNextBuild(); } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Faq.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Faq.java new file mode 100644 index 000000000000..fd7ce4fca468 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Faq.java @@ -0,0 +1,99 @@ +package de.tum.cit.aet.artemis.communication.domain; + +import java.util.HashSet; +import java.util.Set; + +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.core.domain.Course; + +/** + * A FAQ. + */ +@Entity +@Table(name = "faq") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class Faq extends AbstractAuditingEntity { + + @Column(name = "question_title") + private String questionTitle; + + @Column(name = "question_answer") + private String questionAnswer; + + @ElementCollection(fetch = FetchType.EAGER) + @CollectionTable(name = "faq_category", joinColumns = @JoinColumn(name = "faq_id")) + @Column(name = "category") + private Set categories = new HashSet<>(); + + @Enumerated(EnumType.STRING) + @Column(name = "faq_state") + private FaqState faqState; + + @ManyToOne + @JsonIgnoreProperties(value = { "faqs" }, allowSetters = true) + private Course course; + + public String getQuestionTitle() { + return questionTitle; + } + + public void setQuestionTitle(String questionTitle) { + this.questionTitle = questionTitle; + } + + public String getQuestionAnswer() { + return questionAnswer; + } + + public void setQuestionAnswer(String questionAnswer) { + this.questionAnswer = questionAnswer; + } + + public Course getCourse() { + return course; + } + + public void setCourse(Course course) { + this.course = course; + } + + public Set getCategories() { + return categories; + } + + public void setCategories(Set categories) { + this.categories = categories; + } + + public FaqState getFaqState() { + return faqState; + } + + public void setFaqState(FaqState faqState) { + this.faqState = faqState; + } + + @Override + public String toString() { + return "Faq{" + "id=" + getId() + ", questionTitle='" + getQuestionTitle() + "'" + ", questionAnswer='" + getQuestionAnswer() + "'" + ", faqState='" + getFaqState() + "}"; + } + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/FaqState.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/FaqState.java new file mode 100644 index 000000000000..9018a3be3a12 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/FaqState.java @@ -0,0 +1,5 @@ +package de.tum.cit.aet.artemis.communication.domain; + +public enum FaqState { + ACCEPTED, REJECTED, PROPOSED +} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java index d3bf4e217ea3..4ff2d48fedf5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java @@ -167,6 +167,10 @@ public void addTag(String tag) { this.tags.add(tag); } + public void setCourse(Course course) { + this.course = course; + } + public Conversation getConversation() { return conversation; } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java index f143f959f89f..71dc52ae4e93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java @@ -434,7 +434,7 @@ public static String[] createPlaceholdersForUserGroupChat(String courseTitle, St } @NotificationPlaceholderCreator(values = { CONVERSATION_ADD_USER_CHANNEL, CONVERSATION_REMOVE_USER_CHANNEL, CONVERSATION_DELETE_CHANNEL }) - public static String[] createPlaceholdersForUserChannel(String courseTitle, String channelName, String responsibleForUserName) { - return new String[] { courseTitle, channelName, responsibleForUserName }; + public static String[] createPlaceholdersForUserChannel(String courseTitle, String conversationName, String responsibleForUserName) { + return new String[] { courseTitle, conversationName, responsibleForUserName }; } } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java index c6bfd3384110..b9a911ce6194 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java @@ -106,7 +106,9 @@ public boolean equals(Object object) { return false; } PushNotificationDeviceConfiguration that = (PushNotificationDeviceConfiguration) object; - return token.equals(that.token) && deviceType == that.deviceType && expirationDate.equals(that.expirationDate) && Arrays.equals(secretKey, that.secretKey) + // Use compareTo rather than equals for dates to ensure timestamps and dates with the same time are considered equal + // This is caused by Java internal design having different classes for Date (java.util) and Timestamp (java.sql) + return token.equals(that.token) && deviceType == that.deviceType && expirationDate.compareTo(that.expirationDate) == 0 && Arrays.equals(secretKey, that.secretKey) && owner.equals(that.owner); } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/FaqDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FaqDTO.java new file mode 100644 index 000000000000..efab02ad1bf9 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FaqDTO.java @@ -0,0 +1,17 @@ +package de.tum.cit.aet.artemis.communication.dto; + +import java.util.Set; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.communication.domain.Faq; +import de.tum.cit.aet.artemis.communication.domain.FaqState; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record FaqDTO(Long id, String questionTitle, String questionAnswer, Set categories, FaqState faqState) { + + public FaqDTO(Faq faq) { + this(faq.getId(), faq.getQuestionTitle(), faq.getQuestionAnswer(), faq.getCategories(), faq.getFaqState()); + } + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java index c6a915b994e2..db61138b3a73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java @@ -30,4 +30,6 @@ default AnswerPost findAnswerPostByIdElseThrow(Long answerPostId) { default AnswerPost findAnswerMessageByIdElseThrow(Long answerPostId) { return getValueElseThrow(findById(answerPostId).filter(answerPost -> answerPost.getPost().getConversation() != null), answerPostId); } + + long countAnswerPostsByPostIdIn(List postIds); } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/FaqRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/FaqRepository.java new file mode 100644 index 000000000000..bd8bb8989995 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/FaqRepository.java @@ -0,0 +1,37 @@ +package de.tum.cit.aet.artemis.communication.repository; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.util.Set; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.communication.domain.Faq; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; + +/** + * Spring Data repository for the Faq entity. + */ +@Profile(PROFILE_CORE) +@Repository +public interface FaqRepository extends ArtemisJpaRepository { + + Set findAllByCourseId(Long courseId); + + @Query(""" + SELECT DISTINCT faq.categories + FROM Faq faq + WHERE faq.course.id = :courseId + """) + Set findAllCategoriesByCourseId(@Param("courseId") Long courseId); + + @Transactional + @Modifying + void deleteAllByCourseId(Long courseId); + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java index 449a629fb4af..aacfbc33d179 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java @@ -45,4 +45,8 @@ default Post findPostByIdElseThrow(Long postId) throws EntityNotFoundException { default Post findPostOrMessagePostByIdElseThrow(Long postId) throws EntityNotFoundException { return getValueElseThrow(findById(postId), postId); } + + List findAllByConversationId(Long conversationId); + + List findAllByCourseId(Long courseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java index 1e13dce59c5a..d009074927b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationPlaceholderCreator; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; @@ -57,37 +58,39 @@ public ConversationNotificationService(ConversationNotificationRepository conver * @return the created notification */ public ConversationNotification createNotification(Post createdMessage, Conversation conversation, Course course, Set mentionedUsers) { - String notificationText; - String[] placeholders; NotificationType notificationType = CONVERSATION_NEW_MESSAGE; String conversationName = conversation.getHumanReadableNameForReceiver(createdMessage.getAuthor()); + String conversationType; + String notificationText; // add channel/groupChat/oneToOneChat string to placeholders for notification to distinguish in mobile client - if (conversation instanceof Channel channel) { - notificationText = NEW_MESSAGE_CHANNEL_TEXT; - placeholders = createPlaceholdersNewMessageChannelText(course.getTitle(), createdMessage.getContent(), createdMessage.getCreationDate().toString(), - createdMessage.getAuthor().getName(), conversationName, "channel"); - notificationType = getNotificationTypeForChannel(channel); - } - else if (conversation instanceof GroupChat) { - notificationText = NEW_MESSAGE_GROUP_CHAT_TEXT; - placeholders = createPlaceholdersNewMessageChannelText(course.getTitle(), createdMessage.getContent(), createdMessage.getCreationDate().toString(), - createdMessage.getAuthor().getName(), conversationName, "groupChat"); - } - else { - notificationText = NEW_MESSAGE_DIRECT_TEXT; - placeholders = createPlaceholdersNewMessageChannelText(course.getTitle(), createdMessage.getContent(), createdMessage.getCreationDate().toString(), - createdMessage.getAuthor().getName(), conversationName, "oneToOneChat"); + switch (conversation) { + case Channel channel -> { + notificationText = NEW_MESSAGE_CHANNEL_TEXT; + conversationType = "channel"; + notificationType = getNotificationTypeForChannel(channel); + } + case GroupChat ignored -> { + notificationText = NEW_MESSAGE_GROUP_CHAT_TEXT; + conversationType = "groupChat"; + } + case OneToOneChat ignored -> { + notificationText = NEW_MESSAGE_DIRECT_TEXT; + conversationType = "oneToOneChat"; + } + default -> throw new IllegalStateException("Unexpected value: " + conversation); } + String[] placeholders = createPlaceholdersNewMessageChannelText(course.getTitle(), createdMessage.getContent(), createdMessage.getCreationDate().toString(), + conversationName, createdMessage.getAuthor().getName(), conversationType); ConversationNotification notification = createConversationMessageNotification(course.getId(), createdMessage, notificationType, notificationText, true, placeholders); save(notification, mentionedUsers, placeholders); return notification; } @NotificationPlaceholderCreator(values = { CONVERSATION_NEW_MESSAGE }) - public static String[] createPlaceholdersNewMessageChannelText(String courseTitle, String messageContent, String messageCreationDate, String channelName, String authorName, - String conversationType) { - return new String[] { courseTitle, messageContent, messageCreationDate, channelName, authorName, conversationType }; + public static String[] createPlaceholdersNewMessageChannelText(String courseTitle, String messageContent, String messageCreationDate, String conversationName, + String authorName, String conversationType) { + return new String[] { courseTitle, messageContent, messageCreationDate, conversationName, authorName, conversationType }; } private void save(ConversationNotification notification, Set mentionedUsers, String[] placeHolders) { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/FaqResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/FaqResource.java new file mode 100644 index 000000000000..91a542aaa220 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/FaqResource.java @@ -0,0 +1,194 @@ +package de.tum.cit.aet.artemis.communication.web; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import de.tum.cit.aet.artemis.communication.domain.Faq; +import de.tum.cit.aet.artemis.communication.dto.FaqDTO; +import de.tum.cit.aet.artemis.communication.repository.FaqRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; + +/** + * REST controller for managing Faqs. + */ +@Profile(PROFILE_CORE) +@RestController +@RequestMapping("api/") +public class FaqResource { + + private static final Logger log = LoggerFactory.getLogger(FaqResource.class); + + private static final String ENTITY_NAME = "faq"; + + @Value("${jhipster.clientApp.name}") + private String applicationName; + + private final CourseRepository courseRepository; + + private final AuthorizationCheckService authCheckService; + + private final FaqRepository faqRepository; + + public FaqResource(CourseRepository courseRepository, AuthorizationCheckService authCheckService, FaqRepository faqRepository) { + + this.courseRepository = courseRepository; + this.authCheckService = authCheckService; + this.faqRepository = faqRepository; + } + + /** + * POST /courses/:courseId/faqs : Create a new faq. + * + * @param faq the faq to create * + * @param courseId the id of the course the faq belongs to + * @return the ResponseEntity with status 201 (Created) and with body the new faq, or with status 400 (Bad Request) + * if the faq has already an ID or if the faq course id does not match with the path variable + * @throws URISyntaxException if the Location URI syntax is incorrect + */ + @PostMapping("courses/{courseId}/faqs") + @EnforceAtLeastInstructor + public ResponseEntity createFaq(@RequestBody Faq faq, @PathVariable Long courseId) throws URISyntaxException { + log.debug("REST request to save Faq : {}", faq); + if (faq.getId() != null) { + throw new BadRequestAlertException("A new faq cannot already have an ID", ENTITY_NAME, "idExists"); + } + + if (faq.getCourse() == null || !faq.getCourse().getId().equals(courseId)) { + throw new BadRequestAlertException("Course ID in path and FAQ do not match", ENTITY_NAME, "courseIdMismatch"); + } + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, faq.getCourse(), null); + + Faq savedFaq = faqRepository.save(faq); + FaqDTO dto = new FaqDTO(savedFaq); + return ResponseEntity.created(new URI("/api/courses/" + courseId + "/faqs/" + savedFaq.getId())).body(dto); + } + + /** + * PUT /courses/:courseId/faqs/:faqId : Updates an existing faq. + * + * @param faq the faq to update + * @param faqId id of the faq to be updated * + * @param courseId the id of the course the faq belongs to + * @return the ResponseEntity with status 200 (OK) and with body the updated faq, or with status 400 (Bad Request) + * if the faq is not valid or if the faq course id does not match with the path variable + */ + @PutMapping("courses/{courseId}/faqs/{faqId}") + @EnforceAtLeastInstructor + public ResponseEntity updateFaq(@RequestBody Faq faq, @PathVariable Long faqId, @PathVariable Long courseId) { + log.debug("REST request to update Faq : {}", faq); + if (faqId == null || !faqId.equals(faq.getId())) { + throw new BadRequestAlertException("Id of FAQ and path must match", ENTITY_NAME, "idNull"); + } + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, faq.getCourse(), null); + Faq existingFaq = faqRepository.findByIdElseThrow(faqId); + if (!Objects.equals(existingFaq.getCourse().getId(), courseId)) { + throw new BadRequestAlertException("Course ID of the FAQ provided courseID must match", ENTITY_NAME, "idNull"); + } + Faq updatedFaq = faqRepository.save(faq); + FaqDTO dto = new FaqDTO(updatedFaq); + return ResponseEntity.ok().body(dto); + } + + /** + * GET /courses/:courseId/faqs/:faqId : get the faq with the id faqId. + * + * @param faqId the faqId of the faq to retrieve * + * @param courseId the id of the course the faq belongs to + * @return the ResponseEntity with status 200 (OK) and with body the faq, or with status 404 (Not Found) + */ + @GetMapping("courses/{courseId}/faqs/{faqId}") + @EnforceAtLeastStudent + public ResponseEntity getFaq(@PathVariable Long faqId, @PathVariable Long courseId) { + log.debug("REST request to get faq {}", faqId); + Faq faq = faqRepository.findByIdElseThrow(faqId); + if (faq.getCourse() == null || !faq.getCourse().getId().equals(courseId)) { + throw new BadRequestAlertException("Course ID in path and FAQ do not match", ENTITY_NAME, "courseIdMismatch"); + } + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, faq.getCourse(), null); + FaqDTO dto = new FaqDTO(faq); + return ResponseEntity.ok(dto); + } + + /** + * DELETE /courses/:courseId/faqs/:faqId : delete the "id" faq. + * + * @param faqId the id of the faq to delete + * @param courseId the id of the course the faq belongs to + * @return the ResponseEntity with status 200 (OK) + */ + @DeleteMapping("courses/{courseId}/faqs/{faqId}") + @EnforceAtLeastInstructor + public ResponseEntity deleteFaq(@PathVariable Long faqId, @PathVariable Long courseId) { + + log.debug("REST request to delete faq {}", faqId); + Faq existingFaq = faqRepository.findByIdElseThrow(faqId); + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, existingFaq.getCourse(), null); + if (!Objects.equals(existingFaq.getCourse().getId(), courseId)) { + throw new BadRequestAlertException("Course ID of the FAQ provided courseID must match", ENTITY_NAME, "idNull"); + } + faqRepository.deleteById(faqId); + return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, faqId.toString())).build(); + } + + /** + * GET /courses/:courseId/faqs : get all the faqs of a course + * + * @param courseId the courseId of the course for which all faqs should be returned + * @return the ResponseEntity with status 200 (OK) and the list of faqs in body + */ + @GetMapping("courses/{courseId}/faqs") + @EnforceAtLeastStudent + public ResponseEntity> getFaqForCourse(@PathVariable Long courseId) { + log.debug("REST request to get all Faqs for the course with id : {}", courseId); + + Course course = courseRepository.findByIdElseThrow(courseId); + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, course, null); + Set faqs = faqRepository.findAllByCourseId(courseId); + Set faqDTOS = faqs.stream().map(FaqDTO::new).collect(Collectors.toSet()); + return ResponseEntity.ok().body(faqDTOS); + } + + /** + * GET /courses/:courseId/faq-categories : get all the faq categories of a course + * + * @param courseId the courseId of the course for which all faq categories should be returned + * @return the ResponseEntity with status 200 (OK) and the list of faqs in body + */ + @GetMapping("courses/{courseId}/faq-categories") + @EnforceAtLeastStudent + public ResponseEntity> getFaqCategoriesForCourse(@PathVariable Long courseId) { + log.debug("REST request to get all Faq Categories for the course with id : {}", courseId); + + Course course = courseRepository.findByIdElseThrow(courseId); + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, course, null); + Set faqs = faqRepository.findAllCategoriesByCourseId(courseId); + + return ResponseEntity.ok().body(faqs); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/admin/AdminSystemNotificationResource.java index 6850598633e9..4e94766284d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/admin/AdminSystemNotificationResource.java @@ -30,6 +30,7 @@ * REST controller for administrating system notifications. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminSystemNotificationResource { @@ -58,7 +59,6 @@ public AdminSystemNotificationResource(SystemNotificationRepository systemNotifi * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping("system-notifications") - @EnforceAdmin public ResponseEntity createSystemNotification(@RequestBody SystemNotification systemNotification) throws URISyntaxException { log.debug("REST request to save SystemNotification : {}", systemNotification); if (systemNotification.getId() != null) { @@ -79,7 +79,6 @@ public ResponseEntity createSystemNotification(@RequestBody System * status 500 (Internal Server Error) if the system notification couldn't be updated */ @PutMapping("system-notifications") - @EnforceAdmin public ResponseEntity updateSystemNotification(@RequestBody SystemNotification systemNotification) { log.debug("REST request to update SystemNotification : {}", systemNotification); if (systemNotification.getId() == null) { @@ -101,7 +100,6 @@ public ResponseEntity updateSystemNotification(@RequestBody * @return the ResponseEntity with status 200 (OK) */ @DeleteMapping("system-notifications/{notificationId}") - @EnforceAdmin public ResponseEntity deleteSystemNotification(@PathVariable Long notificationId) { log.debug("REST request to delete SystemNotification : {}", notificationId); systemNotificationRepository.deleteById(notificationId); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index 71e4dc0a5775..3f61f7de5ff0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -93,6 +93,8 @@ public final class Constants { // Used to cut off CI specific path segments when receiving static code analysis reports public static final String ASSIGNMENT_DIRECTORY = "/" + ASSIGNMENT_REPO_NAME + "/"; + public static final String TEST_WORKING_DIRECTORY = "test"; + // Used as a value for for the Java template pom.xml public static final String STUDENT_WORKING_DIRECTORY = ASSIGNMENT_DIRECTORY + "src"; @@ -390,6 +392,18 @@ public final class Constants { */ public static final int MIN_SCORE_ORANGE = 40; + public static final String ASSIGNMENT_REPO_PLACEHOLDER = "${studentWorkingDirectory}"; + + public static final String TEST_REPO_PLACEHOLDER = "${testWorkingDirectory}"; + + public static final String SOLUTION_REPO_PLACEHOLDER = "${solutionWorkingDirectory}"; + + public static final String ASSIGNMENT_REPO_PARENT_PLACEHOLDER = "${studentParentWorkingDirectoryName}"; + + public static final String ASSIGNMENT_REPO_PLACEHOLDER_NO_SLASH = "${studentWorkingDirectoryNoSlash}"; + + public static final Pattern ALLOWED_CHECKOUT_DIRECTORY = Pattern.compile("[\\w-]+(/[\\w-]+)*$"); + private Constants() { } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index 9163cfb7d7f1..d0c6941cc698 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -64,7 +64,6 @@ import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -309,8 +308,7 @@ private boolean allowSubscription(@Nullable Principal principal, String destinat // TODO: Is it right that TAs are not allowed to subscribe to exam exercises? if (exerciseRepository.isExamExercise(exerciseId)) { - Exercise exercise = exerciseRepository.findByIdElseThrow(exerciseId); - return authorizationCheckService.isAtLeastInstructorInCourse(login, exercise.getCourseViaExerciseGroupOrCourseMember().getId()); + return authorizationCheckService.isAtLeastInstructorInExercise(login, exerciseId); } else { return authorizationCheckService.isAtLeastTeachingAssistantInExercise(login, exerciseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java index beacc4af0aa0..8000a24c0b55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.communication.domain.Faq; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -187,6 +188,9 @@ public class Course extends DomainObject { @Column(name = "unenrollment_enabled") private boolean unenrollmentEnabled = false; + @Column(name = "faq_enabled") + private boolean faqEnabled = false; + @Column(name = "presentation_score") private Integer presentationScore; @@ -260,6 +264,10 @@ public class Course extends DomainObject { @JsonIgnoreProperties("course") private TutorialGroupsConfiguration tutorialGroupsConfiguration; + @OneToMany(mappedBy = "course", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY) + @JsonIgnoreProperties(value = "course", allowSetters = true) + private Set faqs = new HashSet<>(); + // NOTE: Helpers variable names must be different from Getter name, so that Jackson ignores the @Transient annotation, but Hibernate still respects it @Transient private Long numberOfInstructorsTransient; @@ -627,6 +635,14 @@ public void setEnrollmentEnabled(Boolean enrollmentEnabled) { this.enrollmentEnabled = enrollmentEnabled; } + public boolean isFaqEnabled() { + return faqEnabled; + } + + public void setFaqEnabled(boolean faqEnabled) { + this.faqEnabled = faqEnabled; + } + public String getEnrollmentConfirmationMessage() { return enrollmentConfirmationMessage; } @@ -717,7 +733,7 @@ public String toString() { + "'" + ", enrollmentStartDate='" + getEnrollmentStartDate() + "'" + ", enrollmentEndDate='" + getEnrollmentEndDate() + "'" + ", unenrollmentEndDate='" + getUnenrollmentEndDate() + "'" + ", semester='" + getSemester() + "'" + "'" + ", onlineCourse='" + isOnlineCourse() + "'" + ", color='" + getColor() + "'" + ", courseIcon='" + getCourseIcon() + "'" + ", enrollmentEnabled='" + isEnrollmentEnabled() + "'" + ", unenrollmentEnabled='" + isUnenrollmentEnabled() + "'" - + ", presentationScore='" + getPresentationScore() + "'" + "}"; + + ", presentationScore='" + getPresentationScore() + "'" + ", faqEnabled='" + isFaqEnabled() + "'" + "}"; } public void setNumberOfInstructors(Long numberOfInstructors) { @@ -1057,4 +1073,17 @@ public String getMappedColumnName() { return mappedColumnName; } } + + public Set getFaqs() { + return faqs; + } + + public void setFaqs(Set faqs) { + this.faqs = faqs; + } + + public void addFaq(Faq faq) { + this.faqs.add(faq); + faq.setCourse(this); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java index 7fa995658af1..6498340f3bc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java @@ -561,4 +561,9 @@ public void hasAcceptedIrisElseThrow() { public String getSshPublicKey() { return sshPublicKey; } + + @Nullable + public @Size(max = 100) String getSshPublicKeyHash() { + return sshPublicKeyHash; + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseDeletionSummaryDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseDeletionSummaryDTO.java new file mode 100644 index 000000000000..2f3b8d51596c --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseDeletionSummaryDTO.java @@ -0,0 +1,7 @@ +package de.tum.cit.aet.artemis.core.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record CourseDeletionSummaryDTO(long numberOfBuilds, long numberOfCommunicationPosts, long numberOfAnswerPosts) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/UserDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserDTO.java index 1ac72940f919..3d627425a8f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/UserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserDTO.java @@ -78,6 +78,8 @@ public class UserDTO extends AuditingEntityDTO { private String sshPublicKey; + private String sshKeyHash; + private ZonedDateTime irisAccepted; public UserDTO() { @@ -291,4 +293,12 @@ public ZonedDateTime getIrisAccepted() { public void setIrisAccepted(ZonedDateTime irisAccepted) { this.irisAccepted = irisAccepted; } + + public String getSshKeyHash() { + return sshKeyHash; + } + + public void setSshKeyHash(String sshKeyHash) { + this.sshKeyHash = sshKeyHash; + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/UserPublicInfoDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserPublicInfoDTO.java index a6da8966dfc5..f84bf9e0819a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/UserPublicInfoDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserPublicInfoDTO.java @@ -25,6 +25,8 @@ public class UserPublicInfoDTO { private String lastName; + private String imageUrl; + private Boolean isInstructor; private Boolean isEditor; @@ -43,6 +45,7 @@ public UserPublicInfoDTO(User user) { this.name = user.getName(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); + this.imageUrl = user.getImageUrl(); } /** @@ -101,6 +104,14 @@ public void setLastName(String lastName) { this.lastName = lastName; } + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + public Boolean getIsInstructor() { return isInstructor; } @@ -152,6 +163,7 @@ public int hashCode() { @Override public String toString() { return "UserPublicInfoDTO{" + "id=" + id + ", login='" + login + '\'' + ", name='" + name + '\'' + ", firstName='" + firstName + '\'' + ", lastName='" + lastName + '\'' - + ", isInstructor=" + isInstructor + ", isEditor=" + isEditor + ", isTeachingAssistant=" + isTeachingAssistant + ", isStudent=" + isStudent + '}'; + + ", imageUrl='" + imageUrl + '\'' + ", isInstructor=" + isInstructor + ", isEditor=" + isEditor + ", isTeachingAssistant=" + isTeachingAssistant + ", isStudent=" + + isStudent + '}'; } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/NoUniqueQueryException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/NoUniqueQueryException.java new file mode 100644 index 000000000000..f76fc32879ed --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/NoUniqueQueryException.java @@ -0,0 +1,11 @@ +package de.tum.cit.aet.artemis.core.exception; + +/** + * Checked exception in case a query does not return a unique result, so calling methods must handle this case. + */ +public class NoUniqueQueryException extends Exception { + + public NoUniqueQueryException(String message) { + super(message); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/AnnotationUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/AnnotationUtils.java index c5aef335defb..028342bfeee9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/AnnotationUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/AnnotationUtils.java @@ -3,7 +3,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Optional; import jakarta.validation.constraints.NotBlank; @@ -22,7 +24,8 @@ private AnnotationUtils() { } /** - * Extracts the annotation from the method or type + * Extracts the annotation from the method or type and all super classes. + * In case multiple versions of the annotation are present, the one closest to the method is returned. * * @param clazz the annotation class * @param joinPoint the join point @@ -33,26 +36,71 @@ private AnnotationUtils() { public static Optional getAnnotation(@NotNull Class clazz, @NotNull ProceedingJoinPoint joinPoint) { final var method = ((MethodSignature) joinPoint.getSignature()).getMethod(); T annotation = method.getAnnotation(clazz); + + Optional foundAnnotation = getAnnotation(clazz, method.getDeclaredAnnotations(), annotation); + if (foundAnnotation.isPresent()) { + return foundAnnotation; + } + + for (Class declaringClass = method.getDeclaringClass(); declaringClass != null; declaringClass = declaringClass.getSuperclass()) { + annotation = declaringClass.getAnnotation(clazz); + foundAnnotation = getAnnotation(clazz, declaringClass.getDeclaredAnnotations(), annotation); + if (foundAnnotation.isPresent()) { + return foundAnnotation; + } + } + + return Optional.empty(); + } + + private static Optional getAnnotation(Class clazz, Annotation[] declaredAnnotations, T annotation) { if (annotation != null) { return Optional.of(annotation); } - for (Annotation a : method.getDeclaredAnnotations()) { + for (Annotation a : declaredAnnotations) { annotation = a.annotationType().getAnnotation(clazz); if (annotation != null) { return Optional.of(annotation); } } - annotation = method.getDeclaringClass().getAnnotation(clazz); + return Optional.empty(); + } + + /** + * Extracts the annotations from the method or type and all super classes. + * In case multiple versions of the annotation are present, all are returned. + * + * @param clazz the annotation class + * @param joinPoint the join point + * @param the type of the annotation + * @return the annotations if they are present, empty otherwise + */ + public static List getAnnotations(@NotNull Class clazz, @NotNull ProceedingJoinPoint joinPoint) { + List annotations = new ArrayList<>(); + + final var method = ((MethodSignature) joinPoint.getSignature()).getMethod(); + T annotation = method.getAnnotation(clazz); + + addAnnotations(clazz, method.getDeclaredAnnotations(), annotation, annotations); + + for (Class declaringClass = method.getDeclaringClass(); declaringClass != null; declaringClass = declaringClass.getSuperclass()) { + annotation = declaringClass.getAnnotation(clazz); + addAnnotations(clazz, declaringClass.getDeclaredAnnotations(), annotation, annotations); + } + + return annotations; + } + + private static void addAnnotations(Class clazz, Annotation[] declaredAnnotations, T annotation, List annotations) { if (annotation != null) { - return Optional.of(annotation); + annotations.add(annotation); } - for (Annotation a : method.getDeclaringClass().getDeclaredAnnotations()) { + for (Annotation a : declaredAnnotations) { annotation = a.annotationType().getAnnotation(clazz); if (annotation != null) { - return Optional.of(annotation); + annotations.add(annotation); } } - return Optional.empty(); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceAdmin.java b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceAdmin.java index 5adbcd73c16c..9fdbf88d9d82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceAdmin.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceAdmin.java @@ -10,11 +10,8 @@ /** * This annotation is used to enforce that the user is an admin. * It should only be used with endpoints starting with {@code /api/admin/} - *

- * It's only addable to methods. The intention is that a developer can see the required role without the need to scroll up. - * This also prevents overrides of the annotation. */ -@Target(ElementType.METHOD) +@Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @PreAuthorize("hasRole('ADMIN')") public @interface EnforceAdmin { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java index 9e3b69f269cc..cba16e58ad7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java @@ -58,8 +58,12 @@ import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.communication.domain.NotificationType; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.FaqRepository; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -67,6 +71,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.CourseContentCount; +import de.tum.cit.aet.artemis.core.dto.CourseDeletionSummaryDTO; import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; import de.tum.cit.aet.artemis.core.dto.DueDateStat; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; @@ -103,6 +108,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; @@ -117,6 +123,8 @@ public class CourseService { private static final Logger log = LoggerFactory.getLogger(CourseService.class); + private final FaqRepository faqRepository; + @Value("${artemis.course-archives-path}") private Path courseArchivesDirPath; @@ -198,6 +206,12 @@ public class CourseService { private final TutorialGroupNotificationRepository tutorialGroupNotificationRepository; + private final PostRepository postRepository; + + private final AnswerPostRepository answerPostRepository; + + private final BuildJobRepository buildJobRepository; + public CourseService(CourseRepository courseRepository, ExerciseService exerciseService, ExerciseDeletionService exerciseDeletionService, AuthorizationCheckService authCheckService, UserRepository userRepository, LectureService lectureService, GroupNotificationRepository groupNotificationRepository, ExerciseGroupRepository exerciseGroupRepository, AuditEventRepository auditEventRepository, UserService userService, ExamDeletionService examDeletionService, @@ -210,7 +224,8 @@ public CourseService(CourseRepository courseRepository, ExerciseService exercise TutorialGroupRepository tutorialGroupRepository, PlagiarismCaseRepository plagiarismCaseRepository, ConversationRepository conversationRepository, LearningPathService learningPathService, Optional irisSettingsService, LectureRepository lectureRepository, TutorialGroupNotificationRepository tutorialGroupNotificationRepository, TutorialGroupChannelManagementService tutorialGroupChannelManagementService, - PrerequisiteRepository prerequisiteRepository, CompetencyRelationRepository competencyRelationRepository) { + PrerequisiteRepository prerequisiteRepository, CompetencyRelationRepository competencyRelationRepository, PostRepository postRepository, + AnswerPostRepository answerPostRepository, BuildJobRepository buildJobRepository, FaqRepository faqRepository) { this.courseRepository = courseRepository; this.exerciseService = exerciseService; this.exerciseDeletionService = exerciseDeletionService; @@ -250,6 +265,10 @@ public CourseService(CourseRepository courseRepository, ExerciseService exercise this.tutorialGroupChannelManagementService = tutorialGroupChannelManagementService; this.prerequisiteRepository = prerequisiteRepository; this.competencyRelationRepository = competencyRelationRepository; + this.buildJobRepository = buildJobRepository; + this.postRepository = postRepository; + this.answerPostRepository = answerPostRepository; + this.faqRepository = faqRepository; } /** @@ -440,6 +459,22 @@ public Set findAllOnlineCoursesForPlatformForUser(String registrationId, .collect(Collectors.toSet()); } + /** + * Get the course deletion summary for the given course. + * + * @param course the course for which to get the deletion summary + * @return the course deletion summary + */ + public CourseDeletionSummaryDTO getDeletionSummary(Course course) { + List programmingExerciseIds = course.getExercises().stream().map(Exercise::getId).toList(); + long numberOfBuilds = buildJobRepository.countBuildJobsByExerciseIds(programmingExerciseIds); + + List posts = postRepository.findAllByCourseId(course.getId()); + long numberOfCommunicationPosts = posts.size(); + long numberOfAnswerPosts = answerPostRepository.countAnswerPostsByPostIdIn(posts.stream().map(Post::getId).toList()); + return new CourseDeletionSummaryDTO(numberOfBuilds, numberOfCommunicationPosts, numberOfAnswerPosts); + } + /** * Deletes all elements associated with the course including: *

    @@ -467,6 +502,7 @@ public void delete(Course course) { deleteDefaultGroups(course); deleteExamsOfCourse(course); deleteGradingScaleOfCourse(course); + deleteFaqsOfCourse(course); irisSettingsService.ifPresent(iss -> iss.deleteSettingsFor(course)); courseRepository.deleteById(course.getId()); log.debug("Successfully deleted course {}.", course.getTitle()); @@ -542,6 +578,10 @@ private void deleteCompetenciesOfCourse(Course course) { competencyRepository.deleteAll(course.getCompetencies()); } + private void deleteFaqsOfCourse(Course course) { + faqRepository.deleteAllByCourseId(course.getId()); + } + /** * If the exercise is part of an exam, retrieve the course through ExerciseGroup -> Exam -> Course. * Otherwise, the course is already set and the id can be used to retrieve the course from the database. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/ZipFileService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ZipFileService.java index 4d40473c4eb9..5871cd7ed7d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/ZipFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ZipFileService.java @@ -6,6 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; +import java.util.Set; import java.util.function.Predicate; import java.util.stream.Stream; import java.util.zip.ZipEntry; @@ -33,6 +34,12 @@ public class ZipFileService { private final FileService fileService; + /** + * Set of file names that should be ignored when zipping. + * This currently only includes the gc.log.lock (garbage collector) file created by JGit in programming repositories. + */ + private static final Set IGNORED_ZIP_FILE_NAMES = Set.of(Path.of("gc.log.lock")); + public ZipFileService(FileService fileService) { this.fileService = fileService; } @@ -113,7 +120,7 @@ private void createZipFileFromPathStream(Path zipFilePath, Stream paths, P if (extraFilter != null) { filteredPaths = filteredPaths.filter(extraFilter); } - filteredPaths.forEach(path -> { + filteredPaths.filter(path -> !IGNORED_ZIP_FILE_NAMES.contains(path)).forEach(path -> { ZipEntry zipEntry = new ZipEntry(pathsRoot.relativize(path).toString()); copyToZipFile(zipOutputStream, path, zipEntry); }); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java index 87785e123cec..ffeed9cfa513 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java @@ -1,8 +1,11 @@ package de.tum.cit.aet.artemis.core.service.feature; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.security.annotations.AnnotationUtils.getAnnotations; import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -26,25 +29,24 @@ public FeatureToggleAspect(FeatureToggleService featureToggleService) { /** * Pointcut around all methods or classes annotated with {@link FeatureToggle}. - * - * @param featureToggle The feature toggle annotation containing the relevant features */ - @Pointcut("@within(featureToggle) || @annotation(featureToggle)") - public void callAt(FeatureToggle featureToggle) { + @Pointcut("@within(de.tum.cit.aet.artemis.core.service.feature.FeatureToggle) || @annotation(de.tum.cit.aet.artemis.core.service.feature.FeatureToggle) || execution(@(@de.tum.cit.aet.artemis.core.service.feature.FeatureToggle *) * *(..))") + protected void callAt() { } /** * Aspect around all methods for which a feature toggle has been activated. Will check all specified features and only * execute the underlying method if all features are enabled. Will otherwise return forbidden (as response entity) * - * @param joinPoint Proceeding join point of the aspect - * @param featureToggle The feature toggle annotation containing all features that should get checked + * @param joinPoint Proceeding join point of the aspect * @return The original return value of the called method, if all features are enabled, a forbidden response entity otherwise * @throws Throwable If there was any error during method execution (both the aspect or the actual called method) */ - @Around(value = "callAt(featureToggle)", argNames = "joinPoint,featureToggle") - public Object around(ProceedingJoinPoint joinPoint, FeatureToggle featureToggle) throws Throwable { - if (Arrays.stream(featureToggle.value()).allMatch(featureToggleService::isFeatureEnabled)) { + @Around(value = "callAt()", argNames = "joinPoint") + public Object around(ProceedingJoinPoint joinPoint) throws Throwable { + List featureToggleAnnotations = getAnnotations(FeatureToggle.class, joinPoint); + Stream features = featureToggleAnnotations.stream().flatMap(featureToggle -> Arrays.stream(featureToggle.value())); + if (features.allMatch(featureToggleService::isFeatureEnabled)) { return joinPoint.proceed(); } else { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java index 10da69a96a5d..0cb3379e4f99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java @@ -364,14 +364,14 @@ else if (courseUpdate.getCourseIcon() == null && existingCourse.getCourseIcon() } /** - * PUT courses/:courseId/onlineCourseConfiguration : Updates the onlineCourseConfiguration for the given course. + * PUT courses/:courseId/online-course-configuration : Updates the onlineCourseConfiguration for the given course. * * @param courseId the id of the course to update * @param onlineCourseConfiguration the online course configuration to update * @return the ResponseEntity with status 200 (OK) and with body the updated online course configuration */ // TODO: move into LTIResource - @PutMapping("courses/{courseId}/onlineCourseConfiguration") + @PutMapping("courses/{courseId}/online-course-configuration") @EnforceAtLeastInstructor @Profile(PROFILE_LTI) public ResponseEntity updateOnlineCourseConfiguration(@PathVariable Long courseId, @@ -821,12 +821,12 @@ public ResponseEntity getCourseWithOrganizations(@PathVariable Long cour } /** - * GET /courses/:courseId/lockedSubmissions Get locked submissions for course for user + * GET /courses/:courseId/locked-submissions Get locked submissions for course for user * * @param courseId the id of the course * @return the ResponseEntity with status 200 (OK) and with body the course, or with status 404 (Not Found) */ - @GetMapping("courses/{courseId}/lockedSubmissions") + @GetMapping("courses/{courseId}/locked-submissions") @EnforceAtLeastTutor public ResponseEntity> getLockedSubmissionsForCourse(@PathVariable Long courseId) { log.debug("REST request to get all locked submissions for course : {}", courseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminAuditResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminAuditResource.java index fe8af9ff7eb0..7c0a339d9717 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminAuditResource.java @@ -30,13 +30,14 @@ * REST controller for getting the audit events. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") -public class AuditResource { +public class AdminAuditResource { private final AuditEventService auditEventService; - public AuditResource(AuditEventService auditEventService) { + public AdminAuditResource(AuditEventService auditEventService) { this.auditEventService = auditEventService; } @@ -47,7 +48,6 @@ public AuditResource(AuditEventService auditEventService) { * @return the ResponseEntity with status 200 (OK) and the list of AuditEvents in body */ @GetMapping("audits") - @EnforceAdmin public ResponseEntity> getAll(Pageable pageable) { Page page = auditEventService.findAll(pageable); HttpHeaders headers = generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page); @@ -63,7 +63,6 @@ public ResponseEntity> getAll(Pageable pageable) { * @return the ResponseEntity with status 200 (OK) and the list of AuditEvents in body */ @GetMapping(value = "audits", params = { "fromDate", "toDate" }) - @EnforceAdmin public ResponseEntity> getByDates(@RequestParam(value = "fromDate") LocalDate fromDate, @RequestParam(value = "toDate") LocalDate toDate, Pageable pageable) { Instant from = fromDate.atStartOfDay(ZoneId.systemDefault()).toInstant(); @@ -81,7 +80,6 @@ public ResponseEntity> getByDates(@RequestParam(value = "fromDa * @return the ResponseEntity with status 200 (OK) and the AuditEvent in body, or status 404 (Not Found) */ @GetMapping("audits/{id:.+}") - @EnforceAdmin public ResponseEntity get(@PathVariable Long id) { return ResponseUtil.wrapOrNotFound(auditEventService.find(id)); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java index bd1bcc4dea1b..db71ab34c05a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java @@ -33,6 +33,7 @@ import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminBuildJobQueueResource { @@ -54,7 +55,6 @@ public AdminBuildJobQueueResource(SharedQueueManagementService localCIBuildJobQu * @return the queued build jobs */ @GetMapping("queued-jobs") - @EnforceAdmin public ResponseEntity> getQueuedBuildJobs() { log.debug("REST request to get the queued build jobs"); List buildJobQueue = localCIBuildJobQueueService.getQueuedJobs(); @@ -67,7 +67,6 @@ public ResponseEntity> getQueuedBuildJobs() { * @return the running build jobs */ @GetMapping("running-jobs") - @EnforceAdmin public ResponseEntity> getRunningBuildJobs() { log.debug("REST request to get the running build jobs"); List runningBuildJobs = localCIBuildJobQueueService.getProcessingJobs(); @@ -80,7 +79,6 @@ public ResponseEntity> getRunningBuildJobs() { * @return list of build agents information */ @GetMapping("build-agents") - @EnforceAdmin public ResponseEntity> getBuildAgentSummary() { log.debug("REST request to get information on available build agents"); List buildAgentSummary = localCIBuildJobQueueService.getBuildAgentInformationWithoutRecentBuildJobs(); @@ -94,7 +92,6 @@ public ResponseEntity> getBuildAgentSummary() { * @return the build agent information */ @GetMapping("build-agent") - @EnforceAdmin public ResponseEntity getBuildAgentDetails(@RequestParam String agentName) { log.debug("REST request to get information on build agent {}", agentName); BuildAgentInformation buildAgentDetails = localCIBuildJobQueueService.getBuildAgentInformation().stream().filter(agent -> agent.name().equals(agentName)).findFirst() @@ -109,7 +106,6 @@ public ResponseEntity getBuildAgentDetails(@RequestParam * @return the ResponseEntity with the result of the cancellation */ @DeleteMapping("cancel-job/{buildJobId}") - @EnforceAdmin public ResponseEntity cancelBuildJob(@PathVariable String buildJobId) { log.debug("REST request to cancel the build job with id {}", buildJobId); // Call the cancelBuildJob method in LocalCIBuildJobManagementService @@ -124,7 +120,6 @@ public ResponseEntity cancelBuildJob(@PathVariable String buildJobId) { * @return the ResponseEntity with the result of the cancellation */ @DeleteMapping("cancel-all-queued-jobs") - @EnforceAdmin public ResponseEntity cancelAllQueuedBuildJobs() { log.debug("REST request to cancel all queued build jobs"); // Call the cancelAllQueuedBuildJobs method in LocalCIBuildJobManagementService @@ -139,7 +134,6 @@ public ResponseEntity cancelAllQueuedBuildJobs() { * @return the ResponseEntity with the result of the cancellation */ @DeleteMapping("cancel-all-running-jobs") - @EnforceAdmin public ResponseEntity cancelAllRunningBuildJobs() { log.debug("REST request to cancel all running build jobs"); // Call the cancelAllRunningBuildJobs method in LocalCIBuildJobManagementService @@ -155,7 +149,6 @@ public ResponseEntity cancelAllRunningBuildJobs() { * @return the ResponseEntity with the result of the cancellation */ @DeleteMapping("cancel-all-running-jobs-for-agent") - @EnforceAdmin public ResponseEntity cancelAllRunningBuildJobsForAgent(@RequestParam String agentName) { log.debug("REST request to cancel all running build jobs for agent {}", agentName); // Call the cancelAllRunningBuildJobsForAgent method in LocalCIBuildJobManagementService @@ -171,7 +164,6 @@ public ResponseEntity cancelAllRunningBuildJobsForAgent(@RequestParam Stri * @return the page of finished build jobs */ @GetMapping("finished-jobs") - @EnforceAdmin public ResponseEntity> getFinishedBuildJobs(FinishedBuildJobPageableSearchDTO search) { log.debug("REST request to get a page of finished build jobs with build status {}, build agent address {}, start date {} and end date {}", search.buildStatus(), search.buildAgentAddress(), search.startDate(), search.endDate()); @@ -190,7 +182,6 @@ public ResponseEntity> getFinishedBuildJobs(FinishedBu * @return the build job statistics */ @GetMapping("build-job-statistics") - @EnforceAdmin public ResponseEntity getBuildJobStatistics(@RequestParam(required = false, defaultValue = "7") int span) { log.debug("REST request to get the build job statistics"); List buildJobResultCountDtos = buildJobRepository.getBuildJobsResultsStatistics(ZonedDateTime.now().minusDays(span), null); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index a75b2e2d4a0a..6c26cab4798f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseDeletionSummaryDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -48,6 +49,7 @@ * REST controller for managing Course. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminCourseResource { @@ -90,7 +92,6 @@ public AdminCourseResource(UserRepository userRepository, CourseService courseSe * @return the list of groups (the user has access to) */ @GetMapping("courses/groups") - @EnforceAdmin public ResponseEntity> getAllGroupsForAllCourses() { log.debug("REST request to get all Groups for all Courses"); List courses = courseRepository.findAll(); @@ -113,7 +114,6 @@ public ResponseEntity> getAllGroupsForAllCourses() { * @throws URISyntaxException if the Location URI syntax is incorrect */ @PostMapping(value = "courses", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - @EnforceAdmin public ResponseEntity createCourse(@RequestPart Course course, @RequestPart(required = false) MultipartFile file) throws URISyntaxException { log.debug("REST request to save Course : {}", course); if (course.getId() != null) { @@ -167,7 +167,6 @@ public ResponseEntity createCourse(@RequestPart Course course, @RequestP * @return the ResponseEntity with status 200 (OK) */ @DeleteMapping("courses/{courseId}") - @EnforceAdmin public ResponseEntity deleteCourse(@PathVariable long courseId) { log.info("REST request to delete Course : {}", courseId); Course course = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(courseId); @@ -183,6 +182,20 @@ public ResponseEntity deleteCourse(@PathVariable long courseId) { return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, Course.ENTITY_NAME, course.getTitle())).build(); } + /** + * GET /courses/:courseId/deletion-summary : get the deletion summary for the course with the given id. + * + * @param courseId the id of the course + * @return the ResponseEntity with status 200 (OK) and the deletion summary in the body + */ + @GetMapping("courses/{courseId}/deletion-summary") + public ResponseEntity getDeletionSummary(@PathVariable long courseId) { + log.debug("REST request to get deletion summary course: {}", courseId); + final Course course = courseRepository.findByIdWithEagerExercisesElseThrow(courseId); + + return ResponseEntity.ok().body(courseService.getDeletionSummary(course)); + } + /** * Creates a default channel with the given name and adds all students, tutors and instructors as participants. * diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java index 0e1f17de42c1..6547fd7ef57a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java @@ -17,6 +17,7 @@ * REST controller for requesting data exports for another user as admin. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminDataExportResource { @@ -34,7 +35,6 @@ public AdminDataExportResource(DataExportService dataExportService) { * @return the ResponseEntity with status 200 (OK) and with body a DTO containing the id, the state and the request date of the data export */ @PostMapping("data-exports/{login}") - @EnforceAdmin public ResponseEntity requestDataExportForUser(@PathVariable String login) { return ResponseEntity.ok(dataExportService.requestDataExportForUserAsAdmin(login)); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminFeatureToggleResource.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminFeatureToggleResource.java index 84a58f7918aa..e2d24720efbd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminFeatureToggleResource.java @@ -18,13 +18,14 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") -public class FeatureToggleResource { +public class AdminFeatureToggleResource { private final FeatureToggleService featureToggleService; - public FeatureToggleResource(FeatureToggleService featureToggleService) { + public AdminFeatureToggleResource(FeatureToggleService featureToggleService) { this.featureToggleService = featureToggleService; } @@ -36,7 +37,6 @@ public FeatureToggleResource(FeatureToggleService featureToggleService) { * @see FeatureToggleService */ @PutMapping("feature-toggle") - @EnforceAdmin public ResponseEntity> toggleFeatures(@RequestBody Map features) { featureToggleService.updateFeatureToggles(features); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java index 1e705926232c..58c99393679a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java @@ -22,6 +22,7 @@ * REST controller for editing the imprint as an admin. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminImprintResource { @@ -40,7 +41,6 @@ public AdminImprintResource(LegalDocumentService legalDocumentService) { * @return the ResponseEntity with status 200 (OK) and with body the imprint with the given language */ @GetMapping("imprint-for-update") - @EnforceAdmin public ResponseEntity getImprintForUpdate(@RequestParam("language") String language) { if (!Language.isValidShortName(language)) { throw new BadRequestException("Language not supported"); @@ -55,7 +55,6 @@ public ResponseEntity getImprintForUpdate(@RequestParam("language") * @return the ResponseEntity with status 200 (OK) and with body the updated imprint */ @PutMapping("imprint") - @EnforceAdmin public ResponseEntity updateImprint(@RequestBody ImprintDTO imprint) { return ResponseEntity.ok(legalDocumentService.updateImprint(imprint)); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLogResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLogResource.java index 375deea352f6..a0855aa92929 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLogResource.java @@ -23,9 +23,10 @@ * Controller for view and managing Log Level at runtime. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") -public class LogResource { +public class AdminLogResource { /** * GET logs -- Gets the current log levels. @@ -33,7 +34,6 @@ public class LogResource { * @return A list of all loggers with their log level */ @GetMapping("logs") - @EnforceAdmin public ResponseEntity> getList() { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); return ResponseEntity.ok(context.getLoggerList().stream().map(LoggerVM::new).toList()); @@ -46,7 +46,6 @@ public ResponseEntity> getList() { * @return The updated logger */ @PutMapping("logs") - @EnforceAdmin public ResponseEntity changeLevel(@RequestBody LoggerVM jsonLogger) { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); Logger logger = context.getLogger(jsonLogger.getName()); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java index 75d3719b9c6e..c62673b6178f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java @@ -36,6 +36,7 @@ * REST controller for administrating the Organization entities */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminOrganizationResource { @@ -72,7 +73,6 @@ public AdminOrganizationResource(OrganizationService organizationService, Organi * @return empty ResponseEntity with status 200 (OK), or 404 (Not Found) otherwise */ @PostMapping("organizations/{organizationId}/courses/{courseId}") - @EnforceAdmin public ResponseEntity addCourseToOrganization(@PathVariable Long courseId, @PathVariable Long organizationId) { log.debug("REST request to add course to organization : {}", organizationId); Organization organization = organizationRepository.findByIdElseThrow(organizationId); @@ -90,7 +90,6 @@ public ResponseEntity addCourseToOrganization(@PathVariable Long courseId, * @return empty ResponseEntity with status 200 (OK), or 404 (Not Found) otherwise */ @DeleteMapping("organizations/{organizationId}/courses/{courseId}") - @EnforceAdmin public ResponseEntity removeCourseFromOrganization(@PathVariable Long courseId, @PathVariable Long organizationId) { Organization organization = organizationRepository.findByIdElseThrow(organizationId); courseRepository.removeOrganizationFromCourse(courseId, organization); @@ -107,7 +106,6 @@ public ResponseEntity removeCourseFromOrganization(@PathVariable Long cour * @return empty ResponseEntity with status 200 (OK), or 404 (Not Found) otherwise */ @PostMapping("organizations/{organizationId}/users/{userLogin}") - @EnforceAdmin public ResponseEntity addUserToOrganization(@PathVariable String userLogin, @PathVariable Long organizationId) { User user = userRepository.getUserByLoginElseThrow(userLogin); Organization organization = organizationRepository.findByIdElseThrow(organizationId); @@ -128,7 +126,6 @@ public ResponseEntity addUserToOrganization(@PathVariable String userLogin * @return empty ResponseEntity with status 200 (OK), or 404 (Not Found) otherwise */ @DeleteMapping("organizations/{organizationId}/users/{userLogin}") - @EnforceAdmin public ResponseEntity removeUserFromOrganization(@PathVariable String userLogin, @PathVariable Long organizationId) { log.debug("REST request to remove course to organization : {}", organizationId); User user = userRepository.getUserByLoginElseThrow(userLogin); @@ -145,7 +142,6 @@ public ResponseEntity removeUserFromOrganization(@PathVariable String user * @return the ResponseEntity containing the added organization with status 200 (OK), or 404 (Not Found) otherwise */ @PostMapping("organizations") - @EnforceAdmin public ResponseEntity addOrganization(@RequestBody Organization organization) { log.debug("REST request to add new organization : {}", organization); Organization created = organizationService.add(organization); @@ -161,7 +157,6 @@ public ResponseEntity addOrganization(@RequestBody Organization or * @return the ResponseEntity containing the updated organization with status 200 (OK), or 404 (Not Found) otherwise */ @PutMapping("organizations/{organizationId}") - @EnforceAdmin public ResponseEntity updateOrganization(@PathVariable Long organizationId, @RequestBody Organization organization) { log.debug("REST request to update organization : {}", organization); if (organization.getId() == null) { @@ -182,7 +177,6 @@ public ResponseEntity updateOrganization(@PathVariable Long organi * @return empty ResponseEntity with status 200 (OK), or 404 (Not Found) otherwise */ @DeleteMapping("organizations/{organizationId}") - @EnforceAdmin public ResponseEntity deleteOrganization(@PathVariable Long organizationId) { log.debug("REST request to delete organization : {}", organizationId); organizationService.deleteOrganization(organizationId); @@ -195,7 +189,6 @@ public ResponseEntity deleteOrganization(@PathVariable Long organizationId * @return ResponseEntity containing a list of all organizations with status 200 (OK) */ @GetMapping("organizations") - @EnforceAdmin public ResponseEntity> getAllOrganizations() { log.debug("REST request to get all organizations"); // TODO: we should avoid findAll() and instead load batches of organizations @@ -210,7 +203,6 @@ public ResponseEntity> getAllOrganizations() { * @return ResponseEntity containing a map containing the numbers of users and courses */ @GetMapping("organizations/{organizationId}/count") - @EnforceAdmin public ResponseEntity getNumberOfUsersAndCoursesByOrganization(@PathVariable long organizationId) { log.debug("REST request to get number of users and courses of organization : {}", organizationId); @@ -227,7 +219,6 @@ public ResponseEntity getNumberOfUsersAndCoursesByOrganiza * containing their relative numbers of users and courses */ @GetMapping("organizations/count-all") - @EnforceAdmin public ResponseEntity> getNumberOfUsersAndCoursesOfAllOrganizations() { log.debug("REST request to get number of users and courses of all organizations"); @@ -250,7 +241,6 @@ public ResponseEntity> getNumberOfUsersAndCoursesOfAl * if exists, else with status 404 (Not Found) */ @GetMapping("organizations/{organizationId}") - @EnforceAdmin public ResponseEntity getOrganizationById(@PathVariable long organizationId) { log.debug("REST request to get organization : {}", organizationId); Organization organization = organizationRepository.findByIdElseThrow(organizationId); @@ -265,7 +255,6 @@ public ResponseEntity getOrganizationById(@PathVariable long organ * if exists, else with status 404 (Not Found) */ @GetMapping("organizations/{organizationId}/full") - @EnforceAdmin public ResponseEntity getOrganizationByIdWithUsersAndCourses(@PathVariable long organizationId) { log.debug("REST request to get organization with users and courses : {}", organizationId); Organization organization = organizationRepository.findByIdWithEagerUsersAndCoursesElseThrow(organizationId); @@ -279,7 +268,6 @@ public ResponseEntity getOrganizationByIdWithUsersAndCourses(@Path * @return ResponseEntity containing a set of organizations containing the given user */ @GetMapping("organizations/users/{userId}") - @EnforceAdmin public ResponseEntity> getAllOrganizationsByUser(@PathVariable Long userId) { log.debug("REST request to get all organizations of user : {}", userId); Set organizations = organizationRepository.findAllOrganizationsByUserId(userId); @@ -293,7 +281,6 @@ public ResponseEntity> getAllOrganizationsByUser(@PathVariable * @return the title of the organization wrapped in an ResponseEntity or 404 Not Found if no organization with that id exists */ @GetMapping("organizations/{organizationId}/title") - @EnforceAdmin public ResponseEntity getOrganizationTitle(@PathVariable Long organizationId) { final var title = organizationRepository.getOrganizationTitle(organizationId); return title == null ? ResponseEntity.notFound().build() : ResponseEntity.ok(title); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java index af48dc8f3565..736d926218ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java @@ -22,6 +22,7 @@ * REST controller for editing the Privacy Statement as an admin. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminPrivacyStatementResource { @@ -39,7 +40,6 @@ public AdminPrivacyStatementResource(LegalDocumentService legalDocumentService) * @param language the language of the privacy statement * @return the ResponseEntity with status 200 (OK) and with body the privacy statement */ - @EnforceAdmin @GetMapping("privacy-statement-for-update") public ResponseEntity getPrivacyStatementForUpdate(@RequestParam("language") String language) { if (!Language.isValidShortName(language)) { @@ -54,7 +54,6 @@ public ResponseEntity getPrivacyStatementForUpdate(@Request * @param privacyStatement the privacy statement to update * @return the ResponseEntity with status 200 (OK) and with body the updated privacy statement */ - @EnforceAdmin @PutMapping("privacy-statement") public ResponseEntity updatePrivacyStatement(@RequestBody PrivacyStatementDTO privacyStatement) { return ResponseEntity.ok(legalDocumentService.updatePrivacyStatement(privacyStatement)); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java index 9c6db4cc7616..c91d7df176c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java @@ -23,6 +23,7 @@ * REST controller for administrating statistics. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminStatisticsResource { @@ -44,7 +45,6 @@ public AdminStatisticsResource(StatisticsService statisticsService) { * @return the ResponseEntity with status 200 (OK) and the data in body, or status 404 (Not Found) */ @GetMapping("management/statistics/data") - @EnforceAdmin public ResponseEntity> getChartData(@RequestParam SpanType span, @RequestParam Integer periodIndex, @RequestParam GraphType graphType) { log.debug("REST request to get graph data"); return ResponseEntity.ok(this.statisticsService.getChartData(span, periodIndex, graphType, StatisticsView.ARTEMIS, null)); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index 289d296c5624..3f25c36d8a67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; @@ -69,6 +68,7 @@ * Another option would be to have a specific JPA entity graph to handle this case. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminUserResource { @@ -108,7 +108,6 @@ public AdminUserResource(UserRepository userRepository, UserService userService, * @throws BadRequestAlertException 400 (Bad Request) if the login or email is already in use */ @PostMapping("users") - @EnforceAdmin public ResponseEntity createUser(@Valid @RequestBody ManagedUserVM managedUserVM) throws URISyntaxException { this.userService.checkUsernameAndPasswordValidityElseThrow(managedUserVM.getLogin(), managedUserVM.getPassword()); @@ -144,7 +143,6 @@ else if (userRepository.findOneByEmailIgnoreCase(managedUserVM.getEmail()).isPre * @throws LoginAlreadyUsedException 400 (Bad Request) if the login is already in use */ @PutMapping("users") - @EnforceAdmin public ResponseEntity updateUser(@Valid @RequestBody ManagedUserVM managedUserVM) { this.userService.checkUsernameAndPasswordValidityElseThrow(managedUserVM.getLogin(), managedUserVM.getPassword()); log.debug("REST request to update User : {}", managedUserVM); @@ -181,7 +179,6 @@ public ResponseEntity updateUser(@Valid @RequestBody ManagedUserVM mana * @return the ResponseEntity with status 200 (OK) and with body the "login" user, or with status 404 (Not Found) */ @GetMapping("users/{login:" + Constants.LOGIN_REGEX + "}") - @EnforceAdmin public ResponseEntity getUser(@PathVariable String login) { log.debug("REST request to get User : {}", login); return ResponseUtil.wrapOrNotFound(userRepository.findOneWithGroupsAndAuthoritiesByLogin(login).map(user -> { @@ -201,7 +198,6 @@ public ResponseEntity getUser(@PathVariable String login) { * @return the list of users who could not be imported, because they could NOT be found in the Artemis database and could NOT be found in the connected LDAP */ @PostMapping("users/import") - @EnforceAdmin public ResponseEntity> importUsers(@RequestBody List userDtos) { log.debug("REST request to import {} to Artemis", userDtos); List notFoundStudentsDtos = userService.importUsers(userDtos); @@ -215,7 +211,6 @@ public ResponseEntity> importUsers(@RequestBody List syncUserViaLdap(@PathVariable Long userId) { log.debug("REST request to update ldap information User : {}", userId); @@ -235,7 +230,6 @@ public ResponseEntity syncUserViaLdap(@PathVariable Long userId) { * @return the ResponseEntity with status 200 (OK) and with body all users */ @GetMapping("users") - @EnforceAdmin public ResponseEntity> getAllUsers(UserPageableSearchDTO userSearch) { final Page page = userRepository.getAllManagedUsers(userSearch); HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page); @@ -248,7 +242,6 @@ public ResponseEntity> getAllUsers(UserPageableSearchDTO userSearc * @return the ResponseEntity with status 200 (OK) and with body all logins of not enrolled users */ @GetMapping("users/not-enrolled") - @EnforceAdmin public ResponseEntity> getNotEnrolledUsers() { List logins = userRepository.findAllNotEnrolledUsers(); return new ResponseEntity<>(logins, HttpStatus.OK); @@ -260,7 +253,6 @@ public ResponseEntity> getNotEnrolledUsers() { * @return the ResponseEntity with status 200 (OK) and with body a string list of the all the roles */ @GetMapping("users/authorities") - @EnforceAdmin public ResponseEntity> getAuthorities() { return ResponseEntity.ok(authorityRepository.getAuthorities()); } @@ -272,7 +264,6 @@ public ResponseEntity> getAuthorities() { * @return the ResponseEntity with status 200 (OK) */ @DeleteMapping("users/{login:" + Constants.LOGIN_REGEX + "}") - @EnforceAdmin public ResponseEntity deleteUser(@PathVariable String login) { log.debug("REST request to delete User: {}", login); if (userRepository.isCurrentUser(login)) { @@ -289,8 +280,7 @@ public ResponseEntity deleteUser(@PathVariable String login) { * @return the ResponseEntity with status 200 (OK) */ @DeleteMapping("users") - @EnforceAdmin - public ResponseEntity> deleteUsers(@RequestParam(name = "login") List logins) { + public ResponseEntity> deleteUsers(@RequestBody List logins) { log.debug("REST request to delete {} users", logins.size()); List deletedUsers = Collections.synchronizedList(new java.util.ArrayList<>()); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java index 992b340359a1..bd673ece51d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java @@ -167,6 +167,7 @@ public ResponseEntity getAccount() { userDTO.setVcsAccessToken(user.getVcsAccessToken()); userDTO.setVcsAccessTokenExpiryDate(user.getVcsAccessTokenExpiryDate()); userDTO.setSshPublicKey(user.getSshPublicKey()); + userDTO.setSshKeyHash(user.getSshPublicKeyHash()); log.info("GET /account {} took {}ms", user.getLogin(), System.currentTimeMillis() - start); return ResponseEntity.ok(userDTO); } diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamDeletionSummaryDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamDeletionSummaryDTO.java new file mode 100644 index 000000000000..c0cd6608ec2c --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamDeletionSummaryDTO.java @@ -0,0 +1,8 @@ +package de.tum.cit.aet.artemis.exam.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record ExamDeletionSummaryDTO(long numberOfBuilds, long numberOfCommunicationPosts, long numberOfAnswerPosts, long numberRegisteredStudents, long numberNotStartedExams, + long numberStartedExams, long numberSubmittedExams) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java index 2236d4d2035c..4d3bcfe61369 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java @@ -245,6 +245,10 @@ SELECT MAX(se.workingTime) """) Set findAllUnsubmittedWithExercisesByExamId(@Param("examId") Long examId); + List findAllByExamId(Long examId); + + List findAllByExamId_AndTestRunIsTrue(Long examId); + @Query(""" SELECT DISTINCT se FROM StudentExam se diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java index a8fd46512528..1c05e1d4be65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java @@ -20,7 +20,10 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -29,13 +32,16 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamDeletionSummaryDTO; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; @@ -71,10 +77,17 @@ public class ExamDeletionService { private final QuizPoolRepository quizPoolRepository; + private final BuildJobRepository buildJobRepository; + + private final PostRepository postRepository; + + private final AnswerPostRepository answerPostRepository; + public ExamDeletionService(ExerciseDeletionService exerciseDeletionService, ParticipationService participationService, CacheManager cacheManager, UserRepository userRepository, ExamRepository examRepository, AuditEventRepository auditEventRepository, StudentExamRepository studentExamRepository, GradingScaleRepository gradingScaleRepository, StudentParticipationRepository studentParticipationRepository, ChannelRepository channelRepository, ChannelService channelService, - ExamLiveEventRepository examLiveEventRepository, QuizPoolRepository quizPoolRepository) { + ExamLiveEventRepository examLiveEventRepository, QuizPoolRepository quizPoolRepository, BuildJobRepository buildJobRepository, PostRepository postRepository, + AnswerPostRepository answerPostRepository) { this.exerciseDeletionService = exerciseDeletionService; this.participationService = participationService; this.cacheManager = cacheManager; @@ -88,6 +101,9 @@ public ExamDeletionService(ExerciseDeletionService exerciseDeletionService, Part this.channelService = channelService; this.examLiveEventRepository = examLiveEventRepository; this.quizPoolRepository = quizPoolRepository; + this.buildJobRepository = buildJobRepository; + this.postRepository = postRepository; + this.answerPostRepository = answerPostRepository; } /** @@ -240,4 +256,34 @@ public void deleteTestRun(Long testRunId) { log.info("Request to delete Test Run {}", testRunId); studentExamRepository.deleteById(testRunId); } + + /** + * Get the exam deletion summary for the given exam. + * + * @param examId the ID of the exam for which the deletion summary should be fetched + * @return the exam deletion summary + */ + public ExamDeletionSummaryDTO getExamDeletionSummary(@NotNull long examId) { + Exam exam = examRepository.findOneWithEagerExercisesGroupsAndStudentExams(examId); + long numberOfBuilds = exam.getExerciseGroups().stream().flatMap(group -> group.getExercises().stream()) + .filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())) + .mapToLong(exercise -> buildJobRepository.countBuildJobsByExerciseIds(List.of(exercise.getId()))).sum(); + + Channel channel = channelRepository.findChannelByExamId(examId); + Long conversationId = channel.getId(); + + List postIds = postRepository.findAllByConversationId(conversationId).stream().map(Post::getId).toList(); + long numberOfCommunicationPosts = postIds.size(); + long numberOfAnswerPosts = answerPostRepository.countAnswerPostsByPostIdIn(postIds); + + Set studentExams = exam.getStudentExams(); + long numberRegisteredStudents = studentExams.size(); + + // Boolean.TRUE/Boolean.FALSE are used to handle the case where isStarted/isSubmitted is null + long notStartedExams = studentExams.stream().filter(studentExam -> studentExam.isStarted() == null || !studentExam.isStarted()).count(); + long startedExams = studentExams.stream().filter(studentExam -> Boolean.TRUE.equals(studentExam.isStarted())).count(); + long submittedExams = studentExams.stream().filter(studentExam -> Boolean.TRUE.equals(studentExam.isStarted()) && Boolean.TRUE.equals(studentExam.isSubmitted())).count(); + + return new ExamDeletionSummaryDTO(numberOfBuilds, numberOfCommunicationPosts, numberOfAnswerPosts, numberRegisteredStudents, notStartedExams, startedExams, submittedExams); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java index 92430d5ef7f1..58fcf03cc97a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java @@ -291,7 +291,7 @@ private void addExercisesToExerciseGroup(ExerciseGroup exerciseGroupToCopy, Exer Optional exerciseCopied = switch (exerciseToCopy.getExerciseType()) { case MODELING -> { final Optional optionalOriginalModellingExercise = modelingExerciseRepository - .findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(exerciseToCopy.getId()); + .findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigAndGradingCriteria(exerciseToCopy.getId()); // We do not want to abort the whole exam import process, we only skip the relevant exercise if (optionalOriginalModellingExercise.isEmpty()) { yield Optional.empty(); diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java index 40be2685e58e..8223ba8e54a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java @@ -77,6 +77,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; @@ -88,6 +89,7 @@ import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamDeletionSummaryDTO; import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; @@ -1170,13 +1172,13 @@ public ResponseEntity getLatestIndividualEndDateOfExam(@Path } /** - * GET /courses/:courseId/exams/:examId/lockedSubmissions Get locked submissions for exam for user + * GET /courses/:courseId/exams/:examId/locked-submissions Get locked submissions for exam for user * * @param courseId - the id of the course * @param examId - the id of the exam * @return the ResponseEntity with status 200 (OK) and with body the course, or with status 404 (Not Found) */ - @GetMapping("courses/{courseId}/exams/{examId}/lockedSubmissions") + @GetMapping("courses/{courseId}/exams/{examId}/locked-submissions") @EnforceAtLeastInstructor public ResponseEntity> getLockedSubmissionsForExam(@PathVariable Long courseId, @PathVariable Long examId) { log.debug("REST request to get all locked submissions for course : {}", courseId); @@ -1320,4 +1322,19 @@ public ResponseEntity> getAllSuspiciousExamSessio analyzeSessionsIpOutsideOfRange); return ResponseEntity.ok(examSessionService.retrieveAllSuspiciousExamSessionsByExamId(examId, options, Optional.ofNullable(ipSubnet))); } + + /** + * GET /courses/{courseId}/exams/{examId}/deletion-summary : Get a summary of the deletion of an exam. + * + * @param courseId the id of the course + * @param examId the id of the exam + * + * @return the ResponseEntity with status 200 (OK) and with body a summary of the deletion of the exam + */ + @GetMapping("courses/{courseId}/exams/{examId}/deletion-summary") + @EnforceAtLeastInstructorInCourse + public ResponseEntity getDeletionSummary(@PathVariable long courseId, @PathVariable long examId) { + log.debug("REST request to get deletion summary for exam : {}", examId); + return ResponseEntity.ok(examDeletionService.getExamDeletionSummary(examId)); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExerciseGroupResource.java index 2593102ed063..97ebc25f858b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExerciseGroupResource.java @@ -83,7 +83,7 @@ public ExerciseGroupResource(ExerciseGroupRepository exerciseGroupRepository, Ex } /** - * POST /courses/{courseId}/exams/{examId}/exerciseGroups : Create a new exercise group. + * POST /courses/{courseId}/exams/{examId}/exercise-groups : Create a new exercise group. * * @param courseId the course to which the exercise group belongs to * @param examId the exam to which the exercise group belongs to @@ -92,7 +92,7 @@ public ExerciseGroupResource(ExerciseGroupRepository exerciseGroupRepository, Ex * or with status 400 (Bad Request) if the exerciseGroup has already an ID * @throws URISyntaxException if the Location URI syntax is incorrect */ - @PostMapping("courses/{courseId}/exams/{examId}/exerciseGroups") + @PostMapping("courses/{courseId}/exams/{examId}/exercise-groups") @EnforceAtLeastEditor public ResponseEntity createExerciseGroup(@PathVariable Long courseId, @PathVariable Long examId, @RequestBody ExerciseGroup exerciseGroup) throws URISyntaxException { @@ -117,11 +117,11 @@ public ResponseEntity createExerciseGroup(@PathVariable Long cour Exam savedExam = examRepository.save(examFromDB); ExerciseGroup savedExerciseGroup = savedExam.getExerciseGroups().getLast(); - return ResponseEntity.created(new URI("/api/courses/" + courseId + "/exams/" + examId + "/exerciseGroups/" + savedExerciseGroup.getId())).body(savedExerciseGroup); + return ResponseEntity.created(new URI("/api/courses/" + courseId + "/exams/" + examId + "/exercise-groups/" + savedExerciseGroup.getId())).body(savedExerciseGroup); } /** - * PUT /courses/{courseId}/exams/{examId}/exerciseGroups : Update an existing exercise group. + * PUT /courses/{courseId}/exams/{examId}/exercise-groups : Update an existing exercise group. * * @param courseId the course to which the exercise group belongs to * @param examId the exam to which the exercise group belongs to @@ -129,7 +129,7 @@ public ResponseEntity createExerciseGroup(@PathVariable Long cour * @return the ResponseEntity with status 200 (OK) and with the body of the updated exercise group * @throws URISyntaxException if the Location URI syntax is incorrect */ - @PutMapping("courses/{courseId}/exams/{examId}/exerciseGroups") + @PutMapping("courses/{courseId}/exams/{examId}/exercise-groups") @EnforceAtLeastEditor public ResponseEntity updateExerciseGroup(@PathVariable Long courseId, @PathVariable Long examId, @RequestBody ExerciseGroup updatedExerciseGroup) throws URISyntaxException { @@ -170,14 +170,14 @@ public ResponseEntity> importExerciseGroup(@PathVariable Lon } /** - * GET /courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId} : Find an exercise group by id. + * GET /courses/{courseId}/exams/{examId}/exercise-groups/{exerciseGroupId} : Find an exercise group by id. * * @param courseId the course to which the exercise group belongs to * @param examId the exam to which the exercise group belongs to * @param exerciseGroupId the id of the exercise group to find * @return the ResponseEntity with status 200 (OK) and with the found exercise group as body */ - @GetMapping("courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId}") + @GetMapping("courses/{courseId}/exams/{examId}/exercise-groups/{exerciseGroupId}") @EnforceAtLeastEditor public ResponseEntity getExerciseGroup(@PathVariable Long courseId, @PathVariable Long examId, @PathVariable Long exerciseGroupId) { log.debug("REST request to get exercise group : {}", exerciseGroupId); @@ -189,13 +189,13 @@ public ResponseEntity getExerciseGroup(@PathVariable Long courseI } /** - * GET courses/{courseId}/exams/{examId}/exerciseGroups : Get all exercise groups of the given exam + * GET courses/{courseId}/exams/{examId}/exercise-groups : Get all exercise groups of the given exam * * @param courseId the course to which the exercise groups belong to * @param examId the exam to which the exercise groups belong to * @return the ResponseEntity with status 200 (OK) and a list of exercise groups. The list can be empty */ - @GetMapping("courses/{courseId}/exams/{examId}/exerciseGroups") + @GetMapping("courses/{courseId}/exams/{examId}/exercise-groups") @EnforceAtLeastEditor public ResponseEntity> getExerciseGroupsForExam(@PathVariable Long courseId, @PathVariable Long examId) { log.debug("REST request to get all exercise groups for exam : {}", examId); @@ -207,7 +207,7 @@ public ResponseEntity> getExerciseGroupsForExam(@PathVariabl } /** - * DELETE /courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId} : Delete the exercise group with the given id. + * DELETE /courses/{courseId}/exams/{examId}/exercise-groups/{exerciseGroupId} : Delete the exercise group with the given id. * * @param courseId the course to which the exercise group belongs to * @param examId the exam to which the exercise group belongs to @@ -218,7 +218,7 @@ public ResponseEntity> getExerciseGroupsForExam(@PathVariabl * LocalCI, it does not make sense to keep these artifacts * @return the ResponseEntity with status 200 (OK) */ - @DeleteMapping("courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId}") + @DeleteMapping("courses/{courseId}/exams/{examId}/exercise-groups/{exerciseGroupId}") @EnforceAtLeastInstructor public ResponseEntity deleteExerciseGroup(@PathVariable Long courseId, @PathVariable Long examId, @PathVariable Long exerciseGroupId, @RequestParam(defaultValue = "true") boolean deleteStudentReposBuildPlans, @RequestParam(defaultValue = "true") boolean deleteBaseReposBuildPlans) { diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java index add9135f8c54..d1f70035e858 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java @@ -20,6 +20,7 @@ * REST controller for administrating Exam. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminExamResource { @@ -38,7 +39,6 @@ public AdminExamResource(ExamRepository examRepository) { * @return the ResponseEntity with status 200 (OK) and a list of exams. */ @GetMapping("courses/upcoming-exams") - @EnforceAdmin public ResponseEntity> getCurrentAndUpcomingExams() { log.debug("REST request to get all upcoming exams"); diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index 7503427a81fc..b25eb7ab154d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -562,8 +562,9 @@ public Submission findLatestSubmissionWithRatedResultWithCompletionDate(Particip boolean ratedOrPractice = Boolean.TRUE.equals(result.isRated()) || participation.isPracticeMode(); boolean noProgrammingAndAssessmentOver = !isProgrammingExercise && isAssessmentOver; // For programming exercises we check that the assessment due date has passed (if set) for manual results otherwise we always show the automatic result - boolean programmingAfterAssessmentOrAutomatic = isProgrammingExercise && ((result.isManual() && isAssessmentOver) || result.isAutomatic()); - if (ratedOrPractice && (noProgrammingAndAssessmentOver || programmingAfterAssessmentOrAutomatic)) { + boolean programmingAfterAssessmentOrAutomaticOrAthena = isProgrammingExercise + && ((result.isManual() && isAssessmentOver) || result.isAutomatic() || result.isAthenaBased()); + if (ratedOrPractice && (noProgrammingAndAssessmentOver || programmingAfterAssessmentOrAutomaticOrAthena)) { // take the first found result that fulfills the above requirements // or // take newer results and thus disregard older ones diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java index 326507d47dd4..304c206938b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java @@ -162,7 +162,7 @@ public Result getResultForCorrectionRound(int correctionRound) { */ @NotNull private List filterNonAutomaticResults() { - return results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaAutomatic())).toList(); + return results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaBased())).toList(); } /** @@ -188,8 +188,7 @@ public boolean hasResultForCorrectionRound(int correctionRound) { */ @JsonIgnore public void removeAutomaticResults() { - this.results = this.results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaAutomatic())) - .collect(Collectors.toCollection(ArrayList::new)); + this.results = this.results.stream().filter(result -> result == null || !(result.isAutomatic() || result.isAthenaBased())).collect(Collectors.toCollection(ArrayList::new)); } /** @@ -214,7 +213,7 @@ public List getResults() { @JsonIgnore public List getManualResults() { - return results.stream().filter(result -> result != null && !result.isAutomatic() && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new)); + return results.stream().filter(result -> result != null && !result.isAutomatic() && !result.isAthenaBased()).collect(Collectors.toCollection(ArrayList::new)); } /** @@ -224,7 +223,7 @@ public List getManualResults() { */ @JsonIgnore public List getNonAthenaResults() { - return results.stream().filter(result -> result != null && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new)); + return results.stream().filter(result -> result != null && !result.isAthenaBased()).collect(Collectors.toCollection(ArrayList::new)); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java index 6559c28b9d93..898b4456de07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java @@ -20,7 +20,6 @@ import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; -import org.apache.velocity.exception.ResourceNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -382,7 +381,7 @@ private ResponseEntity handleExerciseFeedbackRequest(Exerc throw new BadRequestAlertException("Not intended for the use in exams", "participation", "preconditions not met"); } if (exercise.getDueDate() != null && now().isAfter(exercise.getDueDate())) { - throw new BadRequestAlertException("The due date is over", "participation", "preconditions not met"); + throw new BadRequestAlertException("The due date is over", "participation", "feedbackRequestAfterDueDate", true); } if (exercise instanceof ProgrammingExercise) { ((ProgrammingExercise) exercise).validateSettingsForFeedbackRequest(); @@ -393,7 +392,7 @@ private ResponseEntity handleExerciseFeedbackRequest(Exerc StudentParticipation participation = (exercise instanceof ProgrammingExercise) ? programmingExerciseParticipationService.findStudentParticipationByExerciseAndStudentId(exercise, principal.getName()) : studentParticipationRepository.findByExerciseIdAndStudentLogin(exercise.getId(), principal.getName()) - .orElseThrow(() -> new ResourceNotFoundException("Participation not found")); + .orElseThrow(() -> new BadRequestAlertException("Submission not found", "participation", "noSubmissionExists", true)); checkAccessPermissionOwner(participation, user); participation = studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId()); @@ -406,15 +405,14 @@ private ResponseEntity handleExerciseFeedbackRequest(Exerc } else if (exercise instanceof ProgrammingExercise) { if (participation.findLatestLegalResult() == null) { - throw new BadRequestAlertException("User has not reached the conditions to submit a feedback request", "participation", "preconditions not met"); + throw new BadRequestAlertException("You need to submit at least once and have the build results", "participation", "noSubmissionExists", true); } } // Check if feedback has already been requested - var currentDate = now(); - var participationIndividualDueDate = participation.getIndividualDueDate(); - if (participationIndividualDueDate != null && currentDate.isAfter(participationIndividualDueDate)) { - throw new BadRequestAlertException("Request has already been sent", "participation", "already sent"); + var latestResult = participation.findLatestResult(); + if (latestResult != null && latestResult.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA && latestResult.getCompletionDate().isAfter(now())) { + throw new BadRequestAlertException("Request has already been sent", "participation", "feedbackRequestAlreadySent", true); } // Process feedback request @@ -718,7 +716,7 @@ public ResponseEntity> getAllParticipationsForCourse( * @param participationId the participationId of the participation to retrieve * @return the ResponseEntity with status 200 (OK) and with body the participation, or with status 404 (Not Found) */ - @GetMapping("participations/{participationId}/withLatestResult") + @GetMapping("participations/{participationId}/with-latest-result") @EnforceAtLeastStudent public ResponseEntity getParticipationWithLatestResult(@PathVariable Long participationId) { log.debug("REST request to get Participation : {}", participationId); @@ -756,7 +754,7 @@ public ResponseEntity getParticipationForCurrentUser(@Path * @param participationId The participationId of the participation * @return The latest build artifact (JAR/WAR) for the participation */ - @GetMapping("participations/{participationId}/buildArtifact") + @GetMapping("participations/{participationId}/build-artifact") @EnforceAtLeastStudent public ResponseEntity getParticipationBuildArtifact(@PathVariable Long participationId) { log.debug("REST request to get Participation build artifact: {}", participationId); @@ -931,14 +929,14 @@ private ResponseEntity deleteParticipation(StudentParticipation participat } /** - * DELETE /participations/:participationId : remove the build plan of the ProgrammingExerciseStudentParticipation of the "participationId". + * DELETE /participations/:participationId/cleanup-build-plan : remove the build plan of the ProgrammingExerciseStudentParticipation of the "participationId". * This only works for programming exercises. * * @param participationId the participationId of the ProgrammingExerciseStudentParticipation for which the build plan should be removed * @param principal The identity of the user accessing this resource * @return the ResponseEntity with status 200 (OK) */ - @PutMapping("participations/{participationId}/cleanupBuildPlan") + @PutMapping("participations/{participationId}/cleanup-build-plan") @EnforceAtLeastInstructor @FeatureToggle(Feature.ProgrammingExercises) public ResponseEntity cleanupBuildPlan(@PathVariable Long participationId, Principal principal) { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/admin/AdminExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/admin/AdminExerciseResource.java index 306ad29ddd4f..76546cbe6289 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/admin/AdminExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/admin/AdminExerciseResource.java @@ -20,6 +20,7 @@ * REST controller for administrating Exercise. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminExerciseResource { @@ -38,7 +39,6 @@ public AdminExerciseResource(ExerciseRepository exerciseRepository) { * @return the ResponseEntity with status 200 (OK) and a list of exercises. */ @GetMapping("exercises/upcoming") - @EnforceAdmin public ResponseEntity> getUpcomingExercises() { log.debug("REST request to get all upcoming exercises"); Set upcomingExercises = exerciseRepository.findAllExercisesWithCurrentOrUpcomingDueDate(); diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java index 4a0a53761fe0..376a70db4c7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java @@ -5,9 +5,11 @@ import java.util.List; import java.util.Optional; +import java.util.Set; import jakarta.validation.constraints.NotNull; +import org.hibernate.NonUniqueResultException; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -15,6 +17,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.NoUniqueQueryException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; @@ -38,8 +41,41 @@ public interface FileUploadExerciseRepository extends ArtemisJpaRepository findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesById(Long exerciseId); + @Query(""" + SELECT f + FROM FileUploadExercise f + LEFT JOIN FETCH f.competencies + WHERE f.title = :title + AND f.course.id = :courseId + """) + Set findAllWithCompetenciesByTitleAndCourseId(@Param("title") String title, @Param("courseId") long courseId) throws NonUniqueResultException; + + /** + * Finds a file upload exercise by its title and course id and throws a NoUniqueQueryException if multiple exercises are found. + * + * @param title the title of the exercise + * @param courseId the id of the course + * @return the exercise with the given title and course id + * @throws NoUniqueQueryException if multiple exercises are found with the same title + */ + default Optional findUniqueWithCompetenciesByTitleAndCourseId(String title, long courseId) throws NoUniqueQueryException { + Set allExercises = findAllWithCompetenciesByTitleAndCourseId(title, courseId); + if (allExercises.size() > 1) { + throw new NoUniqueQueryException("Found multiple exercises with title " + title + " in course with id " + courseId); + } + return allExercises.stream().findFirst(); + } + @NotNull default FileUploadExercise findWithEagerCompetenciesByIdElseThrow(Long exerciseId) { return getValueElseThrow(findWithEagerCompetenciesById(exerciseId), exerciseId); } + + @EntityGraph(type = LOAD, attributePaths = { "gradingCriteria" }) + Optional findWithGradingCriteriaById(Long exerciseId); + + @NotNull + default FileUploadExercise findWithGradingCriteriaByIdElseThrow(Long exerciseId) { + return getValueElseThrow(findWithGradingCriteriaById(exerciseId), exerciseId); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java deleted file mode 100644 index e1b486a34cbf..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.tum.cit.aet.artemis.iris.domain; - -import java.util.Objects; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.core.domain.DomainObject; - -/** - * An IrisTemplate represents a handlebars template for Iris. - * It is sent to the Iris Python server to generate a response. - */ -@Entity -@Table(name = "iris_template") -@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class IrisTemplate extends DomainObject { - - @Column(name = "content", columnDefinition = "LONGTEXT") - private String content; - - /** - * Empty constructor required for Hibernate and Jackson. - */ - public IrisTemplate() { - } - - /** - * Create a new IrisTemplate with content. - * - * @param content the content of the template - */ - public IrisTemplate(String content) { - this.content = content; - } - - public String getContent() { - return content; - } - - public void setContent(String template) { - this.content = template; - } - - @Override - public boolean equals(Object other) { - if (!super.equals(other)) { - return false; - } - IrisTemplate template = (IrisTemplate) other; - return Objects.equals(content, template.content); - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), content); - } -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisHestiaSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisHestiaSession.java deleted file mode 100644 index f23603711cf5..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisHestiaSession.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.tum.cit.aet.artemis.iris.domain.session; - -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; -import jakarta.persistence.ManyToOne; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; - -/** - * An Iris session for a hestia code hint. - * Currently used to generate descriptions for code hints. - */ -@Entity -@DiscriminatorValue("HESTIA") -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class IrisHestiaSession extends IrisSession { - - @ManyToOne - @JsonIgnore - private CodeHint codeHint; - - public CodeHint getCodeHint() { - return codeHint; - } - - public void setCodeHint(CodeHint codeHint) { - this.codeHint = codeHint; - } - - @Override - public String toString() { - return "IrisHestiaSession{" + "id=" + getId() + ", codeHint=" + (codeHint == null ? "null" : codeHint.getId()) + '}'; - } -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java index 3e6240a383de..13a4bd6f8b2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java @@ -28,7 +28,7 @@ /** * An IrisSession represents a list of messages of Artemis, a user, and an LLM. - * See {@link IrisExerciseChatSession} and {@link IrisHestiaSession} for concrete implementations. + * See {@link IrisExerciseChatSession} and {@link IrisCourseChatSession} for concrete implementations. */ @Entity @Table(name = "iris_session") @@ -40,7 +40,6 @@ @JsonSubTypes({ @JsonSubTypes.Type(value = IrisExerciseChatSession.class, name = "chat"), // TODO: Legacy. Should ideally be "exercise_chat" @JsonSubTypes.Type(value = IrisCourseChatSession.class, name = "course_chat"), - @JsonSubTypes.Type(value = IrisHestiaSession.class, name = "hestia"), }) // @formatter:on @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisTextExerciseChatSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisTextExerciseChatSession.java new file mode 100644 index 000000000000..071c4c5ed325 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisTextExerciseChatSession.java @@ -0,0 +1,48 @@ +package de.tum.cit.aet.artemis.iris.domain.session; + +import java.util.Optional; + +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.text.domain.TextExercise; + +/** + * An IrisTextExerciseChatSession represents a conversation between a user and an LLM in the context of a text exercise. + * This is used for students receiving tutor assistance from Iris while working on a text exercise. + */ +@Entity +@DiscriminatorValue("TEXT_EXERCISE_CHAT") +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class IrisTextExerciseChatSession extends IrisChatSession { + + @ManyToOne + @JsonIgnore + private TextExercise exercise; + + public IrisTextExerciseChatSession() { + } + + public IrisTextExerciseChatSession(TextExercise exercise, User user) { + super(user); + this.exercise = exercise; + } + + public TextExercise getExercise() { + return exercise; + } + + public void setExercise(TextExercise exercise) { + this.exercise = exercise; + } + + @Override + public String toString() { + return "IrisTextExerciseChatSession{" + "user=" + Optional.ofNullable(getUser()).map(User::getLogin).orElse("null") + "," + "exercise=" + exercise + '}'; + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java index 4305461b71cf..bf2851ae7979 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java @@ -1,31 +1,21 @@ package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.annotation.Nullable; -import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.OneToOne; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - /** * An {@link IrisSubSettings} implementation for chat settings. * Chat settings notably provide settings for the rate limit. - * Chat settings provide a single {@link IrisTemplate} for the chat messages. */ @Entity @DiscriminatorValue("CHAT") @JsonInclude(JsonInclude.Include.NON_EMPTY) public class IrisChatSubSettings extends IrisSubSettings { - @Nullable - @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) - private IrisTemplate template; - @Nullable @Column(name = "rate_limit") private Integer rateLimit; @@ -34,15 +24,6 @@ public class IrisChatSubSettings extends IrisSubSettings { @Column(name = "rate_limit_timeframe_hours") private Integer rateLimitTimeframeHours; - @Nullable - public IrisTemplate getTemplate() { - return template; - } - - public void setTemplate(@Nullable IrisTemplate template) { - this.template = template; - } - @Nullable public Integer getRateLimit() { return rateLimit; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java index f68ae30d4b53..b8447b1bb378 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java @@ -1,36 +1,16 @@ package de.tum.cit.aet.artemis.iris.domain.settings; -import jakarta.annotation.Nullable; -import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.OneToOne; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - /** * An {@link IrisSubSettings} implementation for the settings for competency generation. - * CompetencyGeneration settings provide a single {@link IrisTemplate} */ @Entity @DiscriminatorValue("COMPETENCY_GENERATION") @JsonInclude(JsonInclude.Include.NON_EMPTY) public class IrisCompetencyGenerationSubSettings extends IrisSubSettings { - @Nullable - @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) - private IrisTemplate template; - - @Nullable - public IrisTemplate getTemplate() { - return template; - } - - public void setTemplate(@Nullable IrisTemplate template) { - this.template = template; - } - } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java index 2354ffd3c142..fce389a7b95f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java @@ -29,22 +29,17 @@ public class IrisCourseSettings extends IrisSettings { private IrisChatSubSettings irisChatSettings; @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) - @JoinColumn(name = "iris_lecture_ingestion_settings_id") - private IrisLectureIngestionSubSettings irisLectureIngestionSettings; + @JoinColumn(name = "iris_text_exercise_chat_settings_id") + private IrisTextExerciseChatSubSettings irisTextExerciseChatSettings; @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) - @JoinColumn(name = "iris_hestia_settings_id") - private IrisHestiaSubSettings irisHestiaSettings; + @JoinColumn(name = "iris_lecture_ingestion_settings_id") + private IrisLectureIngestionSubSettings irisLectureIngestionSettings; @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false) @JoinColumn(name = "iris_competency_generation_settings_id") private IrisCompetencyGenerationSubSettings irisCompetencyGenerationSettings; - @Override - public boolean isValid() { - return course != null; - } - public Course getCourse() { return course; } @@ -74,13 +69,13 @@ public void setIrisChatSettings(IrisChatSubSettings irisChatSettings) { } @Override - public IrisHestiaSubSettings getIrisHestiaSettings() { - return irisHestiaSettings; + public IrisTextExerciseChatSubSettings getIrisTextExerciseChatSettings() { + return irisTextExerciseChatSettings; } @Override - public void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings) { - this.irisHestiaSettings = irisHestiaSettings; + public void setIrisTextExerciseChatSettings(IrisTextExerciseChatSubSettings irisTextExerciseChatSettings) { + this.irisTextExerciseChatSettings = irisTextExerciseChatSettings; } @Override diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java index 410bbde1954c..ba095a018808 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java @@ -28,10 +28,9 @@ public class IrisExerciseSettings extends IrisSettings { @JoinColumn(name = "iris_chat_settings_id") private IrisChatSubSettings irisChatSettings; - @Override - public boolean isValid() { - return exercise != null; - } + @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) + @JoinColumn(name = "iris_text_exercise_chat_settings_id") + private IrisTextExerciseChatSubSettings irisTextExerciseChatSettings; public Exercise getExercise() { return exercise; @@ -61,13 +60,13 @@ public void setIrisChatSettings(IrisChatSubSettings irisChatSettings) { } @Override - public IrisHestiaSubSettings getIrisHestiaSettings() { - return null; + public IrisTextExerciseChatSubSettings getIrisTextExerciseChatSettings() { + return irisTextExerciseChatSettings; } @Override - public void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings) { - + public void setIrisTextExerciseChatSettings(IrisTextExerciseChatSubSettings irisTextExerciseChatSettings) { + this.irisTextExerciseChatSettings = irisTextExerciseChatSettings; } @Override diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisGlobalSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisGlobalSettings.java index 0ae60c36edd8..ddb156da0038 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisGlobalSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisGlobalSettings.java @@ -1,15 +1,12 @@ package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; -import org.hibernate.Hibernate; - import com.fasterxml.jackson.annotation.JsonInclude; /** @@ -22,89 +19,22 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class IrisGlobalSettings extends IrisSettings { - @Column(name = "current_version") - private int currentVersion; - - @Column(name = "enable_auto_update_chat") - private boolean enableAutoUpdateChat; - - @Column(name = "enable_auto_update_hestia") - private boolean enableAutoUpdateHestia; - - @Column(name = "enable_auto_update_lecture_ingestion") - private boolean enableAutoUpdateLectureIngestion; - - @Column(name = "enable_auto_update_competency_generation") - private boolean enableAutoUpdateCompetencyGeneration; - @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false) @JoinColumn(name = "iris_chat_settings_id") private IrisChatSubSettings irisChatSettings; @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "iris_lecture_ingestion_settings_id") - private IrisLectureIngestionSubSettings irisLectureIngestionSettings; + @JoinColumn(name = "iris_text_exercise_chat_settings_id") + private IrisTextExerciseChatSubSettings irisTextExerciseChatSettings; @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "iris_hestia_settings_id") - private IrisHestiaSubSettings irisHestiaSettings; + @JoinColumn(name = "iris_lecture_ingestion_settings_id") + private IrisLectureIngestionSubSettings irisLectureIngestionSettings; @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, optional = false) @JoinColumn(name = "iris_competency_generation_settings_id") private IrisCompetencyGenerationSubSettings irisCompetencyGenerationSettings; - @Override - public boolean isValid() { - var chatSettingsValid = !Hibernate.isInitialized(irisChatSettings) || irisChatSettings == null - || (irisChatSettings.getTemplate() != null && irisChatSettings.getTemplate().getContent() != null && !irisChatSettings.getTemplate().getContent().isEmpty()); - var hestiaSettingsValid = !Hibernate.isInitialized(irisHestiaSettings) || irisHestiaSettings == null - || (irisHestiaSettings.getTemplate() != null && irisHestiaSettings.getTemplate().getContent() != null && !irisHestiaSettings.getTemplate().getContent().isEmpty()); - var competencyGenerationSettingsValid = !Hibernate.isInitialized(irisCompetencyGenerationSettings) || irisCompetencyGenerationSettings == null - || (irisCompetencyGenerationSettings.getTemplate() != null && irisCompetencyGenerationSettings.getTemplate().getContent() != null - && !irisCompetencyGenerationSettings.getTemplate().getContent().isEmpty()); - return chatSettingsValid && hestiaSettingsValid && competencyGenerationSettingsValid; - } - - public int getCurrentVersion() { - return currentVersion; - } - - public void setCurrentVersion(int currentVersion) { - this.currentVersion = currentVersion; - } - - public boolean isEnableAutoUpdateChat() { - return enableAutoUpdateChat; - } - - public void setEnableAutoUpdateChat(boolean enableAutoUpdateChat) { - this.enableAutoUpdateChat = enableAutoUpdateChat; - } - - public boolean isEnableAutoUpdateLectureIngestion() { - return enableAutoUpdateLectureIngestion; - } - - public void setEnableAutoUpdateLectureIngestion(boolean enableAutoUpdateLectureIngestion) { - this.enableAutoUpdateLectureIngestion = enableAutoUpdateLectureIngestion; - } - - public boolean isEnableAutoUpdateHestia() { - return enableAutoUpdateHestia; - } - - public void setEnableAutoUpdateHestia(boolean enableAutoUpdateHestia) { - this.enableAutoUpdateHestia = enableAutoUpdateHestia; - } - - public boolean isEnableAutoUpdateCompetencyGeneration() { - return enableAutoUpdateCompetencyGeneration; - } - - public void setEnableAutoUpdateCompetencyGeneration(boolean enableAutoUpdateCompetencyGeneration) { - this.enableAutoUpdateCompetencyGeneration = enableAutoUpdateCompetencyGeneration; - } - @Override public IrisLectureIngestionSubSettings getIrisLectureIngestionSettings() { return irisLectureIngestionSettings; @@ -126,13 +56,13 @@ public void setIrisChatSettings(IrisChatSubSettings irisChatSettings) { } @Override - public IrisHestiaSubSettings getIrisHestiaSettings() { - return irisHestiaSettings; + public IrisTextExerciseChatSubSettings getIrisTextExerciseChatSettings() { + return irisTextExerciseChatSettings; } @Override - public void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings) { - this.irisHestiaSettings = irisHestiaSettings; + public void setIrisTextExerciseChatSettings(IrisTextExerciseChatSubSettings irisTextExerciseChatSettings) { + this.irisTextExerciseChatSettings = irisTextExerciseChatSettings; } @Override diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisHestiaSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisHestiaSubSettings.java deleted file mode 100644 index 1c478a8ccfbe..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisHestiaSubSettings.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.tum.cit.aet.artemis.iris.domain.settings; - -import jakarta.annotation.Nullable; -import jakarta.persistence.CascadeType; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.OneToOne; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - -/** - * An {@link IrisSubSettings} implementation for the Hestia integration settings. - * Hestia settings provide a single {@link IrisTemplate} for the hestia code hint generation requests. - */ -@Entity -@DiscriminatorValue("HESTIA") -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class IrisHestiaSubSettings extends IrisSubSettings { - - @Nullable - @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) - private IrisTemplate template; - - @Nullable - public IrisTemplate getTemplate() { - return template; - } - - public void setTemplate(@Nullable IrisTemplate template) { - this.template = template; - } -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisModelListConverter.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisListConverter.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisModelListConverter.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisListConverter.java index 938ce5dae0c7..be4cf5199a0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisModelListConverter.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisListConverter.java @@ -9,7 +9,7 @@ import jakarta.persistence.Converter; @Converter -public class IrisModelListConverter implements AttributeConverter, String> { +public class IrisListConverter implements AttributeConverter, String> { @Override public String convertToDatabaseColumn(SortedSet type) { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java index 5ca715a2f688..61b2912d5cf6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java @@ -45,17 +45,15 @@ public abstract class IrisSettings extends DomainObject { public abstract void setIrisChatSettings(IrisChatSubSettings irisChatSettings); - public abstract IrisLectureIngestionSubSettings getIrisLectureIngestionSettings(); + public abstract IrisTextExerciseChatSubSettings getIrisTextExerciseChatSettings(); - public abstract void setIrisLectureIngestionSettings(IrisLectureIngestionSubSettings irisLectureIngestionSettings); + public abstract void setIrisTextExerciseChatSettings(IrisTextExerciseChatSubSettings irisTextExerciseChatSettings); - public abstract IrisHestiaSubSettings getIrisHestiaSettings(); + public abstract IrisLectureIngestionSubSettings getIrisLectureIngestionSettings(); - public abstract void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings); + public abstract void setIrisLectureIngestionSettings(IrisLectureIngestionSubSettings irisLectureIngestionSettings); public abstract IrisCompetencyGenerationSubSettings getIrisCompetencyGenerationSettings(); public abstract void setIrisCompetencyGenerationSettings(IrisCompetencyGenerationSubSettings irisCompetencyGenerationSubSettings); - - public abstract boolean isValid(); } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java index 16588cf448a5..c9fc576311db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java @@ -26,7 +26,6 @@ * IrisSubSettings is an abstract super class for the specific sub settings types. * Sub Settings are settings for a specific feature of Iris. * {@link IrisChatSubSettings} are used to specify settings for the chat feature. - * {@link IrisHestiaSubSettings} are used to specify settings for the Hestia integration. * {@link IrisCompetencyGenerationSubSettings} are used to specify settings for the competency generation feature. *

    * Also see {@link de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService} for more information. @@ -40,8 +39,8 @@ // @formatter:off @JsonSubTypes({ @JsonSubTypes.Type(value = IrisChatSubSettings.class, name = "chat"), + @JsonSubTypes.Type(value = IrisTextExerciseChatSubSettings.class, name = "text-exercise-chat"), @JsonSubTypes.Type(value = IrisLectureIngestionSubSettings.class, name = "lecture-ingestion"), - @JsonSubTypes.Type(value = IrisHestiaSubSettings.class, name = "hestia"), @JsonSubTypes.Type(value = IrisCompetencyGenerationSubSettings.class, name = "competency-generation") }) // @formatter:on @@ -51,13 +50,12 @@ public abstract class IrisSubSettings extends DomainObject { @Column(name = "enabled") private boolean enabled = false; - @Column(name = "allowed_models") - @Convert(converter = IrisModelListConverter.class) - private SortedSet allowedModels = new TreeSet<>(); + @Column(name = "allowed_variants", nullable = false) + @Convert(converter = IrisListConverter.class) + private SortedSet allowedVariants = new TreeSet<>(); - @Nullable - @Column(name = "preferred_model") - private String preferredModel; + @Column(name = "selected_variant", nullable = false) + private String selectedVariant; public boolean isEnabled() { return enabled; @@ -67,20 +65,20 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; } - public SortedSet getAllowedModels() { - return allowedModels; + public SortedSet getAllowedVariants() { + return allowedVariants; } - public void setAllowedModels(SortedSet allowedModels) { - this.allowedModels = allowedModels; + public void setAllowedVariants(SortedSet allowedVariants) { + this.allowedVariants = allowedVariants; } @Nullable - public String getPreferredModel() { - return preferredModel; + public String getSelectedVariant() { + return selectedVariant; } - public void setPreferredModel(@Nullable String preferredModel) { - this.preferredModel = preferredModel; + public void setSelectedVariant(@Nullable String selectedVariant) { + this.selectedVariant = selectedVariant; } } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettingsType.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettingsType.java index d938134f4555..dafdd1edcfb9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettingsType.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettingsType.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.iris.domain.settings; public enum IrisSubSettingsType { - CHAT, HESTIA, COMPETENCY_GENERATION, LECTURE_INGESTION + CHAT, // TODO: Split into PROGRAMMING_EXERCISE_CHAT and COURSE_CHAT + TEXT_EXERCISE_CHAT, COMPETENCY_GENERATION, LECTURE_INGESTION } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisTextExerciseChatSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisTextExerciseChatSubSettings.java new file mode 100644 index 000000000000..ed090bbe892a --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisTextExerciseChatSubSettings.java @@ -0,0 +1,44 @@ +package de.tum.cit.aet.artemis.iris.domain.settings; + +import jakarta.annotation.Nullable; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; + +import com.fasterxml.jackson.annotation.JsonInclude; + +/** + * An {@link IrisSubSettings} implementation for the settings for the chat in a text exercise. + */ +@Entity +@DiscriminatorValue("TEXT_EXERCISE_CHAT") +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class IrisTextExerciseChatSubSettings extends IrisSubSettings { + + @Nullable + @Column(name = "rate_limit") + private Integer rateLimit; + + @Nullable + @Column(name = "rate_limit_timeframe_hours") + private Integer rateLimitTimeframeHours; + + @Nullable + public Integer getRateLimit() { + return rateLimit; + } + + public void setRateLimit(@Nullable Integer rateLimit) { + this.rateLimit = rateLimit; + } + + @Nullable + public Integer getRateLimitTimeframeHours() { + return rateLimitTimeframeHours; + } + + public void setRateLimitTimeframeHours(@Nullable Integer rateLimitTimeframeHours) { + this.rateLimitTimeframeHours = rateLimitTimeframeHours; + } + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedChatSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedChatSubSettingsDTO.java index 72d8e599ed70..c5589e824507 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedChatSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedChatSubSettingsDTO.java @@ -6,10 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set allowedModels, - @Nullable String preferredModel, @Nullable IrisTemplate template) { +public record IrisCombinedChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set allowedVariants, + @Nullable String selectedVariant) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java index 18ffcbc17b50..414b422e0f64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java @@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, - @Nullable IrisTemplate template) { +public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedVariants, @Nullable String selectedVariant) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedHestiaSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedHestiaSubSettingsDTO.java deleted file mode 100644 index c70ce4825a92..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedHestiaSubSettingsDTO.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.tum.cit.aet.artemis.iris.dto; - -import java.util.Set; - -import jakarta.annotation.Nullable; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) { -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedSettingsDTO.java index 9353757c782e..b05645603dbe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedSettingsDTO.java @@ -2,7 +2,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; +// @formatter:off @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedSettingsDTO(IrisCombinedChatSubSettingsDTO irisChatSettings, IrisCombinedLectureIngestionSubSettingsDTO irisLectureIngestionSettings, - IrisCombinedHestiaSubSettingsDTO irisHestiaSettings, IrisCombinedCompetencyGenerationSubSettingsDTO irisCompetencyGenerationSettings) { -} +public record IrisCombinedSettingsDTO( + IrisCombinedChatSubSettingsDTO irisChatSettings, + IrisCombinedTextExerciseChatSubSettingsDTO irisTextExerciseChatSettings, + IrisCombinedLectureIngestionSubSettingsDTO irisLectureIngestionSettings, + IrisCombinedCompetencyGenerationSubSettingsDTO irisCompetencyGenerationSettings +) {} +// @formatter:on diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedTextExerciseChatSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedTextExerciseChatSubSettingsDTO.java new file mode 100644 index 000000000000..4f02a2d87720 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedTextExerciseChatSubSettingsDTO.java @@ -0,0 +1,13 @@ +package de.tum.cit.aet.artemis.iris.dto; + +import java.util.Set; + +import jakarta.annotation.Nullable; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record IrisCombinedTextExerciseChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set allowedVariants, + @Nullable String selectedVariant) { + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java deleted file mode 100644 index 22a14bd98bd7..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.tum.cit.aet.artemis.iris.repository; - -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; - -import java.util.List; - -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Repository; - -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; - -/** - * Repository interface for managing {@link IrisHestiaSession} entities. - * Provides custom queries for finding hestia sessions based on different criteria. - */ -@Repository -@Profile(PROFILE_IRIS) -public interface IrisHestiaSessionRepository extends ArtemisJpaRepository { - - /** - * Finds a list of {@link IrisHestiaSession} based on the exercise and user IDs. - * - * @param codeHintId The ID of the code hint. - * @return A list of hestia sessions sorted by creation date in descending order. - */ - List findByCodeHintIdOrderByCreationDateDesc(Long codeHintId); -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java index 8c4ffd56068e..c9e8eafba618 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java @@ -28,8 +28,8 @@ public interface IrisSettingsRepository extends ArtemisJpaRepository findAllGlobalSettings(); @@ -42,8 +42,8 @@ default IrisGlobalSettings findGlobalSettingsElseThrow() { SELECT irisSettings FROM IrisCourseSettings irisSettings LEFT JOIN FETCH irisSettings.irisChatSettings + LEFT JOIN FETCH irisSettings.irisTextExerciseChatSettings LEFT JOIN FETCH irisSettings.irisLectureIngestionSettings - LEFT JOIN FETCH irisSettings.irisHestiaSettings LEFT JOIN FETCH irisSettings.irisCompetencyGenerationSettings WHERE irisSettings.course.id = :courseId """) @@ -59,6 +59,7 @@ default IrisGlobalSettings findGlobalSettingsElseThrow() { SELECT irisSettings FROM IrisExerciseSettings irisSettings LEFT JOIN FETCH irisSettings.irisChatSettings + LEFT JOIN FETCH irisSettings.irisTextExerciseChatSettings WHERE irisSettings.exercise.id = :exerciseId """) Optional findExerciseSettings(@Param("exerciseId") long exerciseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java deleted file mode 100644 index 2b1a930d7aef..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package de.tum.cit.aet.artemis.iris.repository; - -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - -/** - * Spring Data repository for the IrisTemplate entity. - */ -public interface IrisTemplateRepository extends ArtemisJpaRepository { - -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTextExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTextExerciseChatSessionRepository.java new file mode 100644 index 000000000000..a8f76c5ff679 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTextExerciseChatSessionRepository.java @@ -0,0 +1,90 @@ +package de.tum.cit.aet.artemis.iris.repository; + +import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; + +import java.util.Collections; +import java.util.List; + +import jakarta.validation.constraints.NotNull; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.iris.domain.session.IrisTextExerciseChatSession; + +/** + * Repository interface for managing {@link IrisTextExerciseChatSession} entities. + * Provides custom queries for finding text exercise chat sessions based on different criteria. + */ +public interface IrisTextExerciseChatSessionRepository extends ArtemisJpaRepository { + + /** + * Finds a list of {@link IrisTextExerciseChatSession} based on the exercise and user IDs. + * + * @param exerciseId The ID of the exercise. + * @param userId The ID of the user. + * @return A list of text exercise chat sessions sorted by creation date in descending order. + */ + @Query(""" + + SELECT s + FROM IrisTextExerciseChatSession s + WHERE s.exercise.id = :exerciseId + AND s.user.id = :userId + ORDER BY s.creationDate DESC + """) + List findByExerciseIdAndUserId(@Param("exerciseId") Long exerciseId, @Param("userId") Long userId); + + @Query(""" + SELECT s + FROM IrisTextExerciseChatSession s + WHERE s.exercise.id = :exerciseId + AND s.user.id = :userId + ORDER BY s.creationDate DESC + """) + List findSessionsByExerciseIdAndUserId(@Param("exerciseId") Long exerciseId, @Param("userId") Long userId, Pageable pageable); + + @EntityGraph(type = LOAD, attributePaths = "messages") + List findSessionsWithMessagesByIdIn(List ids); + + /** + * Finds the latest text exercise chat sessions by exercise ID and user ID, including their messages, with pagination support. + * This method avoids in-memory paging by retrieving the session IDs directly from the database. + * + * @param exerciseId the ID of the exercise to find the text exercise chat sessions for + * @param userId the ID of the user to find the text exercise chat sessions for + * @param pageable the pagination information + * @return a list of {@code IrisExerciseChatSession} with messages, or an empty list if no sessions are found + */ + default List findLatestByExerciseIdAndUserIdWithMessages(Long exerciseId, Long userId, Pageable pageable) { + List ids = findSessionsByExerciseIdAndUserId(exerciseId, userId, pageable).stream().map(DomainObject::getId).toList(); + + if (ids.isEmpty()) { + return Collections.emptyList(); + } + + return findSessionsWithMessagesByIdIn(ids); + } + + /** + * Finds a list of text exercise chat sessions or throws an exception if none are found. + * + * @param exerciseId The ID of the exercise. + * @param userId The ID of the user. + * @return A list of text exercise chat sessions. + * @throws EntityNotFoundException if no sessions are found. + */ + @NotNull + default List findByExerciseIdAndUserIdElseThrow(long exerciseId, long userId) throws EntityNotFoundException { + var result = findByExerciseIdAndUserId(exerciseId, userId); + if (result.isEmpty()) { + throw new EntityNotFoundException("Iris Text Exercise Chat Session"); + } + return result; + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java index 7c37831a611c..98182ae92b06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.iris.service.websocket.IrisWebsocketService; /** - * Service to handle the Competency generation subsytem of Iris. + * Service to handle the Competency generation subsystem of Iris. */ @Service @Profile(PROFILE_IRIS) diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java deleted file mode 100644 index 2a4757596bf1..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java +++ /dev/null @@ -1,76 +0,0 @@ -package de.tum.cit.aet.artemis.iris.service; - -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.util.Optional; - -import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Profile; -import org.springframework.core.io.Resource; -import org.springframework.stereotype.Service; - -import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; - -/** - * Service that loads default Iris templates from the resources/templates/iris folder. - */ -@Profile(PROFILE_IRIS) -@Service -public class IrisDefaultTemplateService { - - private static final Logger log = LoggerFactory.getLogger(IrisDefaultTemplateService.class); - - private final ResourceLoaderService resourceLoaderService; - - public IrisDefaultTemplateService(ResourceLoaderService resourceLoaderService) { - this.resourceLoaderService = resourceLoaderService; - } - - /** - * Loads the default Iris template with the given file name. - * For example, "chat.hbs" will load the template from "resources/templates/iris/chat.hbs". - * - * @param templateFileName The file name of the template to load. - * @return The loaded Iris template, or an empty template if an IO error occurred. - */ - public IrisTemplate load(String templateFileName) { - Path filePath = Path.of("templates", "iris", templateFileName); - Resource resource = resourceLoaderService.getResource(filePath); - try { - String fileContent = IOUtils.toString(resource.getInputStream(), StandardCharsets.UTF_8); - return new IrisTemplate(fileContent); - } - catch (IOException e) { - log.error("Error while loading Iris template from file: {}", filePath, e); - return new IrisTemplate(""); - } - } - - /** - * Loads the global template version from the "resources/templates/iris/template-version.txt" file. - * - * @return an Optional containing the version loaded from the file, or an empty Optional if there was an error. - */ - public Optional loadGlobalTemplateVersion() { - Path filePath = Path.of("templates", "iris", "template-version.txt"); - Resource resource = resourceLoaderService.getResource(filePath); - try { - String fileContent = IOUtils.toString(resource.getInputStream(), StandardCharsets.UTF_8); - int version = Integer.parseInt(fileContent.trim()); - return Optional.of(version); - } - catch (IOException e) { - log.error("Error while loading global template version from file: {}", filePath, e); - } - catch (NumberFormatException e) { - log.error("Content of {} was not a parseable int!", filePath, e); - } - return Optional.empty(); - } -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java index 41fa1247b739..308637e97bcf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java @@ -14,14 +14,14 @@ import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisTextExerciseChatSession; import de.tum.cit.aet.artemis.iris.service.session.IrisChatBasedFeatureInterface; import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; -import de.tum.cit.aet.artemis.iris.service.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.iris.service.session.IrisRateLimitedFeatureInterface; import de.tum.cit.aet.artemis.iris.service.session.IrisSubFeatureInterface; +import de.tum.cit.aet.artemis.iris.service.session.IrisTextExerciseChatSessionService; /** * Service for managing Iris sessions. @@ -32,18 +32,18 @@ public class IrisSessionService { private final UserRepository userRepository; + private final IrisTextExerciseChatSessionService irisTextExerciseChatSessionService; + private final IrisExerciseChatSessionService irisExerciseChatSessionService; private final IrisCourseChatSessionService irisCourseChatSessionService; - private final IrisHestiaSessionService irisHestiaSessionService; - - public IrisSessionService(UserRepository userRepository, IrisExerciseChatSessionService irisExerciseChatSessionService, - IrisCourseChatSessionService irisCourseChatSessionService, IrisHestiaSessionService irisHestiaSessionService) { + public IrisSessionService(UserRepository userRepository, IrisTextExerciseChatSessionService irisTextExerciseChatSessionService, + IrisExerciseChatSessionService irisExerciseChatSessionService, IrisCourseChatSessionService irisCourseChatSessionService) { this.userRepository = userRepository; + this.irisTextExerciseChatSessionService = irisTextExerciseChatSessionService; this.irisExerciseChatSessionService = irisExerciseChatSessionService; this.irisCourseChatSessionService = irisCourseChatSessionService; - this.irisHestiaSessionService = irisHestiaSessionService; } /** @@ -136,9 +136,9 @@ public void checkRateLimit(IrisSession session, User user) { @SuppressWarnings("unchecked") private IrisSubFeatureWrapper getIrisSessionSubService(S session) { return switch (session) { + case IrisTextExerciseChatSession chatSession -> (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisTextExerciseChatSessionService, chatSession); case IrisExerciseChatSession chatSession -> (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisExerciseChatSessionService, chatSession); case IrisCourseChatSession courseChatSession -> (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisCourseChatSessionService, courseChatSession); - case IrisHestiaSession hestiaSession -> (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisHestiaSessionService, hestiaSession); case null, default -> throw new BadRequestException("Unknown Iris session type " + session.getClass().getSimpleName()); }; } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java index 785fc59b9ed7..f41de6b6c97d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java @@ -19,10 +19,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.exception.IrisException; import de.tum.cit.aet.artemis.iris.exception.IrisForbiddenException; import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; -import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisVariantDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; import de.tum.cit.aet.artemis.iris.web.open.PublicPyrisStatusUpdateResource; @@ -50,13 +51,14 @@ public PyrisConnectorService(@Qualifier("pyrisRestTemplate") RestTemplate restTe } /** - * Requests all available models from Pyris + * Requests all available variants from Pyris for a feature * - * @return A list of available Models as IrisModelDTO + * @param feature The feature to get the variants for + * @return A list of available Models as IrisVariantDTO */ - public List getOfferedModels() throws PyrisConnectorException { + public List getOfferedVariants(IrisSubSettingsType feature) throws PyrisConnectorException { try { - var response = restTemplate.getForEntity(pyrisUrl + "/api/v1/models", PyrisModelDTO[].class); + var response = restTemplate.getForEntity(pyrisUrl + "/api/v1/pipelines/" + feature.name() + "/variants", PyrisVariantDTO[].class); if (!response.getStatusCode().is2xxSuccessful() || !response.hasBody()) { throw new PyrisConnectorException("Could not fetch offered models"); } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java index aed62b6049c1..9403da9beb56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.textexercise.PyrisTextExerciseChatStatusUpdateDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; @@ -19,8 +20,10 @@ import de.tum.cit.aet.artemis.iris.service.pyris.job.CourseChatJob; import de.tum.cit.aet.artemis.iris.service.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.iris.service.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.TextExerciseChatJob; import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisTextExerciseChatSessionService; @Service @Profile(PROFILE_IRIS) @@ -30,6 +33,8 @@ public class PyrisStatusUpdateService { private final IrisExerciseChatSessionService irisExerciseChatSessionService; + private final IrisTextExerciseChatSessionService irisTextExerciseChatSessionService; + private final IrisCourseChatSessionService courseChatSessionService; private final IrisCompetencyGenerationService competencyGenerationService; @@ -37,9 +42,11 @@ public class PyrisStatusUpdateService { private static final Logger log = LoggerFactory.getLogger(PyrisStatusUpdateService.class); public PyrisStatusUpdateService(PyrisJobService pyrisJobService, IrisExerciseChatSessionService irisExerciseChatSessionService, - IrisCourseChatSessionService courseChatSessionService, IrisCompetencyGenerationService competencyGenerationService) { + IrisTextExerciseChatSessionService irisTextExerciseChatSessionService, IrisCourseChatSessionService courseChatSessionService, + IrisCompetencyGenerationService competencyGenerationService) { this.pyrisJobService = pyrisJobService; this.irisExerciseChatSessionService = irisExerciseChatSessionService; + this.irisTextExerciseChatSessionService = irisTextExerciseChatSessionService; this.courseChatSessionService = courseChatSessionService; this.competencyGenerationService = competencyGenerationService; } @@ -56,6 +63,19 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta removeJobIfTerminated(statusUpdate.stages(), job.jobId()); } + /** + * Handles the status update of an exercise chat job and forwards it to + * {@link IrisTextExerciseChatSessionService#handleStatusUpdate(TextExerciseChatJob, PyrisTextExerciseChatStatusUpdateDTO)} + * + * @param job the job that is updated + * @param statusUpdate the status update + */ + public void handleStatusUpdate(TextExerciseChatJob job, PyrisTextExerciseChatStatusUpdateDTO statusUpdate) { + irisTextExerciseChatSessionService.handleStatusUpdate(job, statusUpdate); + + removeJobIfTerminated(statusUpdate.stages(), job.jobId()); + } + /** * Handles the status update of a course chat job and forwards it to * {@link de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService#handleStatusUpdate(CourseChatJob, PyrisChatStatusUpdateDTO)} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisVariantDTO.java similarity index 67% rename from src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisVariantDTO.java index 705fada64870..ccfbecf7ee9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisVariantDTO.java @@ -3,5 +3,5 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisModelDTO(String id, String name, String description) { +public record PyrisVariantDTO(String id, String name, String description) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/textexercise/PyrisTextExerciseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/textexercise/PyrisTextExerciseChatPipelineExecutionDTO.java new file mode 100644 index 000000000000..1b2cf59d9fdb --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/textexercise/PyrisTextExerciseChatPipelineExecutionDTO.java @@ -0,0 +1,14 @@ +package de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.textexercise; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisTextExerciseDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisTextExerciseChatPipelineExecutionDTO(PyrisPipelineExecutionDTO execution, PyrisTextExerciseDTO exercise, List conversation, + String currentSubmission) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/textexercise/PyrisTextExerciseChatStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/textexercise/PyrisTextExerciseChatStatusUpdateDTO.java new file mode 100644 index 000000000000..e8b5de7a950b --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/textexercise/PyrisTextExerciseChatStatusUpdateDTO.java @@ -0,0 +1,11 @@ +package de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.textexercise; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisTextExerciseChatStatusUpdateDTO(String result, List stages) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisTextExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisTextExerciseDTO.java new file mode 100644 index 000000000000..8ba3b1f9aaa8 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisTextExerciseDTO.java @@ -0,0 +1,33 @@ +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; + +import java.time.Instant; +import java.time.chrono.ChronoZonedDateTime; +import java.util.Optional; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.text.domain.TextExercise; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisTextExerciseDTO(long id, String title, PyrisCourseDTO course, String problemStatement, Instant startDate, Instant endDate) { + + /** + * Create a new PyrisTextExerciseDTO from the given TextExercise + * + * @param exercise the exercise + * @return the dto + */ + public static PyrisTextExerciseDTO of(TextExercise exercise) { + // @formatter:off + return new PyrisTextExerciseDTO( + exercise.getId(), + exercise.getTitle(), + new PyrisCourseDTO(exercise.getCourseViaExerciseGroupOrCourseMember()), + exercise.getProblemStatement(), + Optional.ofNullable(exercise.getStartDate()).map(ChronoZonedDateTime::toInstant).orElse(null), + Optional.ofNullable(exercise.getDueDate()).map(ChronoZonedDateTime::toInstant).orElse(null) + ); + // @formatter:on + } + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/TextExerciseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/TextExerciseChatJob.java new file mode 100644 index 000000000000..b7dd4bb50046 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/TextExerciseChatJob.java @@ -0,0 +1,20 @@ +package de.tum.cit.aet.artemis.iris.service.pyris.job; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record TextExerciseChatJob(String jobId, long courseId, long exerciseId, long sessionId) implements PyrisJob { + + @Override + public boolean canAccess(Course course) { + return course.getId().equals(courseId); + } + + @Override + public boolean canAccess(Exercise exercise) { + return exercise.getId().equals(exerciseId); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java index a2c404b13103..6dea7a728ca6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java @@ -116,7 +116,8 @@ public void checkRateLimit(User user) { */ @Override public void requestAndHandleResponse(IrisCourseChatSession session) { - requestAndHandleResponse(session, "default", null); + var variant = irisSettingsService.getCombinedIrisSettingsFor(session.getCourse(), false).irisChatSettings().selectedVariant(); + requestAndHandleResponse(session, variant, null); } private void requestAndHandleResponse(IrisCourseChatSession session, String variant, CompetencyJol competencyJol) { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java index cec0a9322134..d520540a2db4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java @@ -142,13 +142,11 @@ public void requestAndHandleResponse(IrisExerciseChatSession session) { if (chatSession.getExercise().isExamExercise()) { throw new ConflictException("Iris is not supported for exam exercises", "Iris", "irisExamExercise"); } - // TODO support more exercise types var exercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(chatSession.getExercise().getId()); var latestSubmission = getLatestSubmissionIfExists(exercise, chatSession.getUser()); - // TODO: Use settings to determine the variant - // var irisSettings = irisSettingsService.getCombinedIrisSettingsFor(chatSession.getExercise(), false); - pyrisPipelineService.executeExerciseChatPipeline("default", latestSubmission, exercise, chatSession); + var variant = irisSettingsService.getCombinedIrisSettingsFor(session.getExercise(), false).irisChatSettings().selectedVariant(); + pyrisPipelineService.executeExerciseChatPipeline(variant, latestSubmission, exercise, chatSession); } private Optional getLatestSubmissionIfExists(ProgrammingExercise exercise, User user) { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java deleted file mode 100644 index 6762b6d23d43..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java +++ /dev/null @@ -1,113 +0,0 @@ -package de.tum.cit.aet.artemis.iris.service.session; - -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; - -import java.time.ZonedDateTime; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Service; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; -import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.iris.repository.IrisHestiaSessionRepository; -import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; -import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorService; -import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; - -/** - * Service to handle the Hestia integration of Iris. - */ -@Service -@Profile(PROFILE_IRIS) -public class IrisHestiaSessionService implements IrisButtonBasedFeatureInterface { - - private static final Logger log = LoggerFactory.getLogger(IrisHestiaSessionService.class); - - private final IrisSettingsService irisSettingsService; - - private final AuthorizationCheckService authCheckService; - - private final IrisSessionRepository irisSessionRepository; - - private final IrisHestiaSessionRepository irisHestiaSessionRepository; - - public IrisHestiaSessionService(PyrisConnectorService pyrisConnectorService, IrisSettingsService irisSettingsService, AuthorizationCheckService authCheckService, - IrisSessionRepository irisSessionRepository, IrisHestiaSessionRepository irisHestiaSessionRepository) { - this.irisSettingsService = irisSettingsService; - this.authCheckService = authCheckService; - this.irisSessionRepository = irisSessionRepository; - this.irisHestiaSessionRepository = irisHestiaSessionRepository; - } - - /** - * Creates a new Iris session for the given code hint. - * If there is already an existing session for the code hint from the last hour, it will be returned instead. - * - * @param codeHint The code hint to create the session for - * @return The Iris session for the code hint - */ - public IrisHestiaSession getOrCreateSession(CodeHint codeHint) { - var existingSessions = irisHestiaSessionRepository.findByCodeHintIdOrderByCreationDateDesc(codeHint.getId()); - // Return the newest session if there is one and it is not older than 1 hour - if (!existingSessions.isEmpty() && existingSessions.getFirst().getCreationDate().plusHours(1).isAfter(ZonedDateTime.now())) { - checkHasAccessTo(null, existingSessions.getFirst()); - return existingSessions.getFirst(); - } - - // Otherwise create a new session - var irisSession = new IrisHestiaSession(); - irisSession.setCodeHint(codeHint); - checkHasAccessTo(null, irisSession); - irisSession = irisSessionRepository.save(irisSession); - return irisSession; - } - - @JsonInclude(JsonInclude.Include.NON_EMPTY) - record HestiaDTO(CodeHint codeHint, IrisHestiaSession session, ProgrammingExercise exercise) { - } - - /** - * Generates the description and content for a code hint. - * It does not directly save the code hint, but instead returns it with the generated description and content. - * This way the instructor can still modify the code hint before saving it or discard the changes. - * - * @param session The Iris session to generate the description for - * @return The code hint with the generated description and content - */ - @Override - public CodeHint executeRequest(IrisHestiaSession session) { - // TODO: Re-add in a future PR. Remember to reenable the test cases! - return null; - } - - /** - * Checks if the user has at least the given role for the exercise of the code hint. - * - * @param user The user to check the access for - * @param session The Iris session to check the access for - */ - @Override - public void checkHasAccessTo(User user, IrisHestiaSession session) { - var exercise = session.getCodeHint().getExercise(); - authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, exercise, user); - } - - /** - * Not supported for Iris Hestia sessions. - * - * @param session The session to get a message for - */ - @Override - public void checkIsFeatureActivatedFor(IrisHestiaSession session) { - irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.HESTIA, session.getCodeHint().getExercise()); - } -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisTextExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisTextExerciseChatSessionService.java new file mode 100644 index 000000000000..4520417aad48 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisTextExerciseChatSessionService.java @@ -0,0 +1,170 @@ +package de.tum.cit.aet.artemis.iris.service.session; + +import java.util.Comparator; + +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.session.IrisTextExerciseChatSession; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.textexercise.PyrisTextExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.textexercise.PyrisTextExerciseChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisTextExerciseDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.job.TextExerciseChatJob; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; + +@Service +@Profile("iris") +public class IrisTextExerciseChatSessionService implements IrisChatBasedFeatureInterface, IrisRateLimitedFeatureInterface { + + private final IrisSettingsService irisSettingsService; + + private final IrisSessionRepository irisSessionRepository; + + private final IrisRateLimitService rateLimitService; + + private final IrisMessageService irisMessageService; + + private final TextExerciseRepository textExerciseRepository; + + private final StudentParticipationRepository studentParticipationRepository; + + private final PyrisPipelineService pyrisPipelineService; + + private final PyrisJobService pyrisJobService; + + private final IrisChatWebsocketService irisChatWebsocketService; + + private final AuthorizationCheckService authCheckService; + + public IrisTextExerciseChatSessionService(IrisSettingsService irisSettingsService, IrisSessionRepository irisSessionRepository, IrisRateLimitService rateLimitService, + IrisMessageService irisMessageService, TextExerciseRepository textExerciseRepository, StudentParticipationRepository studentParticipationRepository, + PyrisPipelineService pyrisPipelineService, PyrisJobService pyrisJobService, IrisChatWebsocketService irisChatWebsocketService, + AuthorizationCheckService authCheckService) { + this.irisSettingsService = irisSettingsService; + this.irisSessionRepository = irisSessionRepository; + this.rateLimitService = rateLimitService; + this.irisMessageService = irisMessageService; + this.textExerciseRepository = textExerciseRepository; + this.studentParticipationRepository = studentParticipationRepository; + this.pyrisPipelineService = pyrisPipelineService; + this.pyrisJobService = pyrisJobService; + this.irisChatWebsocketService = irisChatWebsocketService; + this.authCheckService = authCheckService; + } + + @Override + public void sendOverWebsocket(IrisTextExerciseChatSession session, IrisMessage message) { + irisChatWebsocketService.sendMessage(session, message, null); + } + + @Override + public void requestAndHandleResponse(IrisTextExerciseChatSession irisSession) { + var session = (IrisTextExerciseChatSession) irisSessionRepository.findByIdWithMessagesAndContents(irisSession.getId()); + if (session.getExercise().isExamExercise()) { + throw new ConflictException("Iris is not supported for exam exercises", "Iris", "irisExamExercise"); + } + var exercise = textExerciseRepository.findByIdElseThrow(session.getExercise().getId()); + if (!irisSettingsService.isEnabledFor(IrisSubSettingsType.TEXT_EXERCISE_CHAT, exercise)) { + throw new ConflictException("Iris is not enabled for this exercise", "Iris", "irisDisabled"); + } + var course = exercise.getCourseViaExerciseGroupOrCourseMember(); + // TODO: Once we can receive client form data through the IrisMessageResource, we should use that instead of fetching the latest submission to get the text + var participation = studentParticipationRepository.findWithEagerLegalSubmissionsByExerciseIdAndStudentLogin(exercise.getId(), session.getUser().getLogin()); + var latestSubmission = participation.flatMap(p -> p.getSubmissions().stream().max(Comparator.comparingLong(Submission::getId))).orElse(null); + String latestSubmissionText; + if (latestSubmission instanceof TextSubmission textSubmission) { + latestSubmissionText = textSubmission.getText(); + } + else { + latestSubmissionText = null; + } + var conversation = session.getMessages().stream().map(PyrisMessageDTO::of).toList(); + // @formatter:off + pyrisPipelineService.executePipeline( + "text-exercise-chat", + "default", + pyrisJobService.createTokenForJob(token -> new TextExerciseChatJob(token, course.getId(), exercise.getId(), session.getId())), + dto -> new PyrisTextExerciseChatPipelineExecutionDTO(dto, PyrisTextExerciseDTO.of(exercise), conversation, latestSubmissionText), + stages -> irisChatWebsocketService.sendMessage(session, null, stages) + ); + // @formatter:on + } + + /** + * Handles the status update of a text exercise chat job. + * + * @param job The job that is updated + * @param statusUpdate The status update + */ + public void handleStatusUpdate(TextExerciseChatJob job, PyrisTextExerciseChatStatusUpdateDTO statusUpdate) { + var session = (IrisTextExerciseChatSession) irisSessionRepository.findByIdElseThrow(job.sessionId()); + if (statusUpdate.result() != null) { + var message = session.newMessage(); + message.addContent(new IrisTextMessageContent(statusUpdate.result())); + IrisMessage savedMessage = irisMessageService.saveMessage(message, session, IrisMessageSender.LLM); + irisChatWebsocketService.sendMessage(session, savedMessage, statusUpdate.stages()); + } + else { + irisChatWebsocketService.sendMessage(session, null, statusUpdate.stages()); + } + } + + @Override + public void checkHasAccessTo(User user, IrisTextExerciseChatSession session) { + // TODO: This check is probably unnecessary since we are fetching the sessions from the database with the user ID already + if (!session.getUser().equals(user)) { + throw new AccessForbiddenException("Iris Text Exercise Chat Session", session.getId()); + } + // TODO: This check is probably unnecessary as the endpoint already checks it via the @EnforceAtLeastStudentInExercise annotation + authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.STUDENT, session.getExercise(), user); + } + + /** + * This method returns true if the user has access to the given session. + * The user has access iff the user is a student in the exercise's course, + * and they are the same user that created the session. + * + * @param user The user to check + * @param session The session to check + * @return True if the user has access, false otherwise + */ + public boolean hasAccess(User user, IrisTextExerciseChatSession session) { + try { + checkHasAccessTo(user, session); + return true; + } + catch (AccessForbiddenException e) { + return false; + } + } + + @Override + public void checkIsFeatureActivatedFor(IrisTextExerciseChatSession session) { + irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.TEXT_EXERCISE_CHAT, session.getExercise()); + } + + @Override + public void checkRateLimit(User user) { + rateLimitService.checkRateLimitElseThrow(user); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java index 39bb14ff31cd..fb8820a4c08b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java @@ -9,7 +9,8 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.Objects; -import java.util.Optional; +import java.util.Set; +import java.util.TreeSet; import java.util.function.Supplier; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -24,20 +25,18 @@ import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisGlobalSettings; -import de.tum.cit.aet.artemis.iris.domain.settings.IrisHestiaSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisLectureIngestionSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisTextExerciseChatSubSettings; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; -import de.tum.cit.aet.artemis.iris.service.IrisDefaultTemplateService; /** * Service for managing {@link IrisSettings}. @@ -54,34 +53,14 @@ public class IrisSettingsService { private final IrisSubSettingsService irisSubSettingsService; - private final IrisDefaultTemplateService irisDefaultTemplateService; - private final AuthorizationCheckService authCheckService; - public IrisSettingsService(IrisSettingsRepository irisSettingsRepository, IrisSubSettingsService irisSubSettingsService, IrisDefaultTemplateService irisDefaultTemplateService, - AuthorizationCheckService authCheckService) { + public IrisSettingsService(IrisSettingsRepository irisSettingsRepository, IrisSubSettingsService irisSubSettingsService, AuthorizationCheckService authCheckService) { this.irisSettingsRepository = irisSettingsRepository; this.irisSubSettingsService = irisSubSettingsService; - this.irisDefaultTemplateService = irisDefaultTemplateService; this.authCheckService = authCheckService; } - private Optional loadGlobalTemplateVersion() { - return irisDefaultTemplateService.loadGlobalTemplateVersion(); - } - - private IrisTemplate loadDefaultChatTemplate() { - return irisDefaultTemplateService.load("chat.hbs"); - } - - private IrisTemplate loadDefaultHestiaTemplate() { - return irisDefaultTemplateService.load("hestia.hbs"); - } - - private IrisTemplate loadDefaultCompetencyGenerationTemplate() { - return irisDefaultTemplateService.load("competency-generation.hbs"); - } - /** * Hooks into the {@link ApplicationReadyEvent} and creates or updates the global IrisSettings object on startup. * @@ -98,10 +77,6 @@ public void execute(ApplicationReadyEvent event) throws Exception { if (allGlobalSettings.size() > 1) { var maxIdSettings = allGlobalSettings.stream().max(Comparator.comparingLong(IrisSettings::getId)).orElseThrow(); allGlobalSettings.stream().filter(settings -> !Objects.equals(settings.getId(), maxIdSettings.getId())).forEach(irisSettingsRepository::delete); - autoUpdateGlobalSettings(maxIdSettings); - } - else { - autoUpdateGlobalSettings(allGlobalSettings.stream().findFirst().get()); } } @@ -110,46 +85,21 @@ public void execute(ApplicationReadyEvent event) throws Exception { */ private void createInitialGlobalSettings() { var settings = new IrisGlobalSettings(); - settings.setCurrentVersion(loadGlobalTemplateVersion().orElse(0)); initializeIrisChatSettings(settings); + initializeIrisTextExerciseChatSettings(settings); initializeIrisLectureIngestionSettings(settings); - initializeIrisHestiaSettings(settings); initializeIrisCompetencyGenerationSettings(settings); irisSettingsRepository.save(settings); } - /** - * Auto updates the global IrisSettings object if the current version is outdated. - * - * @param settings The global IrisSettings object to update - */ - private void autoUpdateGlobalSettings(IrisGlobalSettings settings) { - Optional globalVersion = loadGlobalTemplateVersion(); - if (globalVersion.isEmpty() || settings.getCurrentVersion() < globalVersion.get()) { - if (settings.isEnableAutoUpdateChat() || settings.getIrisChatSettings() == null) { - initializeIrisChatSettings(settings); - } - if (settings.isEnableAutoUpdateLectureIngestion() || settings.getIrisLectureIngestionSettings() == null) { - initializeIrisLectureIngestionSettings(settings); - } - if (settings.isEnableAutoUpdateHestia() || settings.getIrisHestiaSettings() == null) { - initializeIrisHestiaSettings(settings); - } - if (settings.isEnableAutoUpdateCompetencyGeneration() || settings.getIrisCompetencyGenerationSettings() == null) { - initializeIrisCompetencyGenerationSettings(settings); - } - - globalVersion.ifPresent(settings::setCurrentVersion); - saveIrisSettings(settings); - } - } - private static T initializeSettings(T settings, Supplier constructor) { if (settings == null) { settings = constructor.get(); settings.setEnabled(false); + settings.setAllowedVariants(new TreeSet<>(Set.of("default"))); + settings.setSelectedVariant("default"); } return settings; } @@ -157,27 +107,24 @@ private static T initializeSettings(T settings, Supp private void initializeIrisChatSettings(IrisGlobalSettings settings) { var irisChatSettings = settings.getIrisChatSettings(); irisChatSettings = initializeSettings(irisChatSettings, IrisChatSubSettings::new); - irisChatSettings.setTemplate(loadDefaultChatTemplate()); settings.setIrisChatSettings(irisChatSettings); } + private void initializeIrisTextExerciseChatSettings(IrisGlobalSettings settings) { + var irisChatSettings = settings.getIrisTextExerciseChatSettings(); + irisChatSettings = initializeSettings(irisChatSettings, IrisTextExerciseChatSubSettings::new); + settings.setIrisTextExerciseChatSettings(irisChatSettings); + } + private void initializeIrisLectureIngestionSettings(IrisGlobalSettings settings) { var irisLectureIngestionSettings = settings.getIrisLectureIngestionSettings(); irisLectureIngestionSettings = initializeSettings(irisLectureIngestionSettings, IrisLectureIngestionSubSettings::new); settings.setIrisLectureIngestionSettings(irisLectureIngestionSettings); } - private void initializeIrisHestiaSettings(IrisGlobalSettings settings) { - var irisHestiaSettings = settings.getIrisHestiaSettings(); - irisHestiaSettings = initializeSettings(irisHestiaSettings, IrisHestiaSubSettings::new); - irisHestiaSettings.setTemplate(loadDefaultHestiaTemplate()); - settings.setIrisHestiaSettings(irisHestiaSettings); - } - private void initializeIrisCompetencyGenerationSettings(IrisGlobalSettings settings) { var irisCompetencyGenerationSettings = settings.getIrisCompetencyGenerationSettings(); irisCompetencyGenerationSettings = initializeSettings(irisCompetencyGenerationSettings, IrisCompetencyGenerationSubSettings::new); - irisCompetencyGenerationSettings.setTemplate(loadDefaultCompetencyGenerationTemplate()); settings.setIrisCompetencyGenerationSettings(irisCompetencyGenerationSettings); } @@ -214,9 +161,6 @@ private T saveNewIrisSettings(T settings) { if (settings instanceof IrisGlobalSettings) { throw new BadRequestAlertException("You can not create new global settings", "IrisSettings", "notGlobal"); } - if (!settings.isValid()) { - throw new BadRequestAlertException("New Iris settings are not valid", "IrisSettings", "notValid"); - } if (settings instanceof IrisCourseSettings courseSettings && irisSettingsRepository.findCourseSettings(courseSettings.getCourse().getId()).isPresent()) { throw new ConflictException("Iris settings for this course already exist", "IrisSettings", "alreadyExists"); } @@ -241,9 +185,6 @@ private T updateIrisSettings(long existingSettingsId, T if (!Objects.equals(existingSettingsId, settingsUpdate.getId())) { throw new ConflictException("Existing Iris settings ID does not match update ID", "IrisSettings", "idMismatch"); } - if (!settingsUpdate.isValid()) { - throw new BadRequestAlertException("Updated Iris settings are not valid", "IrisSettings", "notValid"); - } var existingSettings = irisSettingsRepository.findByIdElseThrow(existingSettingsId); @@ -269,19 +210,32 @@ else if (existingSettings instanceof IrisExerciseSettings exerciseSettings && se * @return The updated global Iris settings */ private IrisGlobalSettings updateGlobalSettings(IrisGlobalSettings existingSettings, IrisGlobalSettings settingsUpdate) { - existingSettings.setCurrentVersion(settingsUpdate.getCurrentVersion()); - - existingSettings.setEnableAutoUpdateChat(settingsUpdate.isEnableAutoUpdateChat()); - existingSettings.setEnableAutoUpdateLectureIngestion(settingsUpdate.isEnableAutoUpdateLectureIngestion()); - existingSettings.setEnableAutoUpdateHestia(settingsUpdate.isEnableAutoUpdateHestia()); - existingSettings.setEnableAutoUpdateCompetencyGeneration(settingsUpdate.isEnableAutoUpdateCompetencyGeneration()); - - existingSettings.setIrisLectureIngestionSettings( - irisSubSettingsService.update(existingSettings.getIrisLectureIngestionSettings(), settingsUpdate.getIrisLectureIngestionSettings(), null, GLOBAL)); - existingSettings.setIrisChatSettings(irisSubSettingsService.update(existingSettings.getIrisChatSettings(), settingsUpdate.getIrisChatSettings(), null, GLOBAL)); - existingSettings.setIrisHestiaSettings(irisSubSettingsService.update(existingSettings.getIrisHestiaSettings(), settingsUpdate.getIrisHestiaSettings(), null, GLOBAL)); - existingSettings.setIrisCompetencyGenerationSettings( - irisSubSettingsService.update(existingSettings.getIrisCompetencyGenerationSettings(), settingsUpdate.getIrisCompetencyGenerationSettings(), null, GLOBAL)); + // @formatter:off + existingSettings.setIrisLectureIngestionSettings(irisSubSettingsService.update( + existingSettings.getIrisLectureIngestionSettings(), + settingsUpdate.getIrisLectureIngestionSettings(), + null, + GLOBAL + )); + existingSettings.setIrisTextExerciseChatSettings(irisSubSettingsService.update( + existingSettings.getIrisTextExerciseChatSettings(), + settingsUpdate.getIrisTextExerciseChatSettings(), + null, + GLOBAL + )); + existingSettings.setIrisChatSettings(irisSubSettingsService.update( + existingSettings.getIrisChatSettings(), + settingsUpdate.getIrisChatSettings(), + null, + GLOBAL + )); + existingSettings.setIrisCompetencyGenerationSettings(irisSubSettingsService.update( + existingSettings.getIrisCompetencyGenerationSettings(), + settingsUpdate.getIrisCompetencyGenerationSettings(), + null, + GLOBAL + )); + // @formatter:on return irisSettingsRepository.save(existingSettings); } @@ -295,14 +249,32 @@ private IrisGlobalSettings updateGlobalSettings(IrisGlobalSettings existingSetti */ private IrisCourseSettings updateCourseSettings(IrisCourseSettings existingSettings, IrisCourseSettings settingsUpdate) { var parentSettings = getCombinedIrisGlobalSettings(); - existingSettings.setIrisChatSettings( - irisSubSettingsService.update(existingSettings.getIrisChatSettings(), settingsUpdate.getIrisChatSettings(), parentSettings.irisChatSettings(), COURSE)); - existingSettings.setIrisLectureIngestionSettings(irisSubSettingsService.update(existingSettings.getIrisLectureIngestionSettings(), - settingsUpdate.getIrisLectureIngestionSettings(), parentSettings.irisLectureIngestionSettings(), COURSE)); - existingSettings.setIrisHestiaSettings( - irisSubSettingsService.update(existingSettings.getIrisHestiaSettings(), settingsUpdate.getIrisHestiaSettings(), parentSettings.irisHestiaSettings(), COURSE)); - existingSettings.setIrisCompetencyGenerationSettings(irisSubSettingsService.update(existingSettings.getIrisCompetencyGenerationSettings(), - settingsUpdate.getIrisCompetencyGenerationSettings(), parentSettings.irisCompetencyGenerationSettings(), COURSE)); + // @formatter:off + existingSettings.setIrisChatSettings(irisSubSettingsService.update( + existingSettings.getIrisChatSettings(), + settingsUpdate.getIrisChatSettings(), + parentSettings.irisChatSettings(), + COURSE + )); + existingSettings.setIrisTextExerciseChatSettings(irisSubSettingsService.update( + existingSettings.getIrisTextExerciseChatSettings(), + settingsUpdate.getIrisTextExerciseChatSettings(), + parentSettings.irisTextExerciseChatSettings(), + COURSE + )); + existingSettings.setIrisLectureIngestionSettings(irisSubSettingsService.update( + existingSettings.getIrisLectureIngestionSettings(), + settingsUpdate.getIrisLectureIngestionSettings(), + parentSettings.irisLectureIngestionSettings(), + COURSE + )); + existingSettings.setIrisCompetencyGenerationSettings(irisSubSettingsService.update( + existingSettings.getIrisCompetencyGenerationSettings(), + settingsUpdate.getIrisCompetencyGenerationSettings(), + parentSettings.irisCompetencyGenerationSettings(), + COURSE + )); + // @formatter:on return irisSettingsRepository.save(existingSettings); } @@ -316,8 +288,20 @@ private IrisCourseSettings updateCourseSettings(IrisCourseSettings existingSetti */ private IrisExerciseSettings updateExerciseSettings(IrisExerciseSettings existingSettings, IrisExerciseSettings settingsUpdate) { var parentSettings = getCombinedIrisSettingsFor(existingSettings.getExercise().getCourseViaExerciseGroupOrCourseMember(), false); - existingSettings.setIrisChatSettings( - irisSubSettingsService.update(existingSettings.getIrisChatSettings(), settingsUpdate.getIrisChatSettings(), parentSettings.irisChatSettings(), EXERCISE)); + // @formatter:off + existingSettings.setIrisChatSettings(irisSubSettingsService.update( + existingSettings.getIrisChatSettings(), + settingsUpdate.getIrisChatSettings(), + parentSettings.irisChatSettings(), + EXERCISE + )); + existingSettings.setIrisTextExerciseChatSettings(irisSubSettingsService.update( + existingSettings.getIrisTextExerciseChatSettings(), + settingsUpdate.getIrisTextExerciseChatSettings(), + parentSettings.irisTextExerciseChatSettings(), + EXERCISE + )); + // @formatter:on return irisSettingsRepository.save(existingSettings); } @@ -381,9 +365,14 @@ public IrisCombinedSettingsDTO getCombinedIrisGlobalSettings() { var settingsList = new ArrayList(); settingsList.add(getGlobalSettings()); - return new IrisCombinedSettingsDTO(irisSubSettingsService.combineChatSettings(settingsList, false), - irisSubSettingsService.combineLectureIngestionSubSettings(settingsList, false), irisSubSettingsService.combineHestiaSettings(settingsList, false), - irisSubSettingsService.combineCompetencyGenerationSettings(settingsList, false)); + // @formatter:off + return new IrisCombinedSettingsDTO( + irisSubSettingsService.combineChatSettings(settingsList, false), + irisSubSettingsService.combineTextExerciseChatSettings(settingsList, false), + irisSubSettingsService.combineLectureIngestionSubSettings(settingsList, false), + irisSubSettingsService.combineCompetencyGenerationSettings(settingsList, false) + ); + // @formatter:on } /** @@ -401,9 +390,14 @@ public IrisCombinedSettingsDTO getCombinedIrisSettingsFor(Course course, boolean settingsList.add(getGlobalSettings()); settingsList.add(irisSettingsRepository.findCourseSettings(course.getId()).orElse(null)); - return new IrisCombinedSettingsDTO(irisSubSettingsService.combineChatSettings(settingsList, minimal), - irisSubSettingsService.combineLectureIngestionSubSettings(settingsList, minimal), irisSubSettingsService.combineHestiaSettings(settingsList, minimal), - irisSubSettingsService.combineCompetencyGenerationSettings(settingsList, minimal)); + // @formatter:off + return new IrisCombinedSettingsDTO( + irisSubSettingsService.combineChatSettings(settingsList, minimal), + irisSubSettingsService.combineTextExerciseChatSettings(settingsList, minimal), + irisSubSettingsService.combineLectureIngestionSubSettings(settingsList, minimal), + irisSubSettingsService.combineCompetencyGenerationSettings(settingsList, minimal) + ); + // @formatter:on } /** @@ -422,9 +416,14 @@ public IrisCombinedSettingsDTO getCombinedIrisSettingsFor(Exercise exercise, boo settingsList.add(getRawIrisSettingsFor(exercise.getCourseViaExerciseGroupOrCourseMember())); settingsList.add(getRawIrisSettingsFor(exercise)); - return new IrisCombinedSettingsDTO(irisSubSettingsService.combineChatSettings(settingsList, minimal), - irisSubSettingsService.combineLectureIngestionSubSettings(settingsList, minimal), irisSubSettingsService.combineHestiaSettings(settingsList, minimal), - irisSubSettingsService.combineCompetencyGenerationSettings(settingsList, minimal)); + // @formatter:off + return new IrisCombinedSettingsDTO( + irisSubSettingsService.combineChatSettings(settingsList, minimal), + irisSubSettingsService.combineTextExerciseChatSettings(settingsList, minimal), + irisSubSettingsService.combineLectureIngestionSubSettings(settingsList, minimal), + irisSubSettingsService.combineCompetencyGenerationSettings(settingsList, minimal) + ); + // @formatter:on } /** @@ -450,8 +449,8 @@ public IrisCourseSettings getDefaultSettingsFor(Course course) { settings.setCourse(course); settings.setIrisLectureIngestionSettings(new IrisLectureIngestionSubSettings()); settings.setIrisChatSettings(new IrisChatSubSettings()); - settings.setIrisHestiaSettings(new IrisHestiaSubSettings()); settings.setIrisCompetencyGenerationSettings(new IrisCompetencyGenerationSubSettings()); + settings.setIrisTextExerciseChatSettings(new IrisTextExerciseChatSubSettings()); return settings; } @@ -466,6 +465,7 @@ public IrisExerciseSettings getDefaultSettingsFor(Exercise exercise) { var settings = new IrisExerciseSettings(); settings.setExercise(exercise); settings.setIrisChatSettings(new IrisChatSubSettings()); + settings.setIrisTextExerciseChatSettings(new IrisTextExerciseChatSubSettings()); return settings; } @@ -523,7 +523,7 @@ public void deleteSettingsFor(Exercise exercise) { private boolean isFeatureEnabledInSettings(IrisCombinedSettingsDTO settings, IrisSubSettingsType type) { return switch (type) { case CHAT -> settings.irisChatSettings().enabled(); - case HESTIA -> settings.irisHestiaSettings().enabled(); + case TEXT_EXERCISE_CHAT -> settings.irisTextExerciseChatSettings().enabled(); case COMPETENCY_GENERATION -> settings.irisCompetencyGenerationSettings().enabled(); case LECTURE_INGESTION -> settings.irisLectureIngestionSettings().enabled(); }; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java index dfd555bb59c5..4e804701151a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java @@ -15,19 +15,18 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; -import de.tum.cit.aet.artemis.iris.domain.settings.IrisHestiaSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisLectureIngestionSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisTextExerciseChatSubSettings; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedChatSubSettingsDTO; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO; -import de.tum.cit.aet.artemis.iris.dto.IrisCombinedHestiaSubSettingsDTO; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedLectureIngestionSubSettingsDTO; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedTextExerciseChatSubSettingsDTO; /** * Service for handling {@link IrisSubSettings} objects. @@ -76,75 +75,73 @@ public IrisChatSubSettings update(IrisChatSubSettings currentSettings, IrisChatS currentSettings.setRateLimit(newSettings.getRateLimit()); currentSettings.setRateLimitTimeframeHours(newSettings.getRateLimitTimeframeHours()); } - currentSettings.setAllowedModels(selectAllowedModels(currentSettings.getAllowedModels(), newSettings.getAllowedModels())); - currentSettings.setPreferredModel(validatePreferredModel(currentSettings.getPreferredModel(), newSettings.getPreferredModel(), currentSettings.getAllowedModels(), - parentSettings != null ? parentSettings.allowedModels() : null)); - currentSettings.setTemplate(newSettings.getTemplate()); + currentSettings.setAllowedVariants(selectAllowedVariants(currentSettings.getAllowedVariants(), newSettings.getAllowedVariants())); + currentSettings.setSelectedVariant(validateSelectedVariant(currentSettings.getSelectedVariant(), newSettings.getSelectedVariant(), currentSettings.getAllowedVariants(), + parentSettings != null ? parentSettings.allowedVariants() : null)); return currentSettings; } /** - * Updates a Lecture Ingestion sub settings object. - * If the new settings are null, the current settings will be deleted (except if the parent settings are null == if the settings are global). - * Special notes: + * Updates a text exercise chat sub settings object. * - * @param currentSettings Current Lecture Ingestion sub settings. - * @param newSettings Updated Lecture Ingestion sub settings. - * @param parentSettings Parent Lecture Ingestion sub settings. + * @param currentSettings Current chat sub settings. + * @param newSettings Updated chat sub settings. + * @param parentSettings Parent chat sub settings. * @param settingsType Type of the settings the sub settings belong to. - * @return Updated Lecture Ingestion sub settings. + * @return Updated chat sub settings. */ - public IrisLectureIngestionSubSettings update(IrisLectureIngestionSubSettings currentSettings, IrisLectureIngestionSubSettings newSettings, - IrisCombinedLectureIngestionSubSettingsDTO parentSettings, IrisSettingsType settingsType) { + public IrisTextExerciseChatSubSettings update(IrisTextExerciseChatSubSettings currentSettings, IrisTextExerciseChatSubSettings newSettings, + IrisCombinedTextExerciseChatSubSettingsDTO parentSettings, IrisSettingsType settingsType) { if (newSettings == null) { if (parentSettings == null) { - throw new IllegalArgumentException("Cannot delete the Lecture Ingestion settings"); + throw new IllegalArgumentException("Cannot delete the chat settings"); } return null; } if (currentSettings == null) { - currentSettings = new IrisLectureIngestionSubSettings(); + currentSettings = new IrisTextExerciseChatSubSettings(); } - - if (authCheckService.isAdmin() && (settingsType == IrisSettingsType.COURSE || settingsType == IrisSettingsType.GLOBAL)) { + if (settingsType == IrisSettingsType.EXERCISE || authCheckService.isAdmin()) { currentSettings.setEnabled(newSettings.isEnabled()); - currentSettings.setAutoIngestOnLectureAttachmentUpload(newSettings.getAutoIngestOnLectureAttachmentUpload()); } - + if (authCheckService.isAdmin()) { + currentSettings.setRateLimit(newSettings.getRateLimit()); + currentSettings.setRateLimitTimeframeHours(newSettings.getRateLimitTimeframeHours()); + } + currentSettings.setAllowedVariants(selectAllowedVariants(currentSettings.getAllowedVariants(), newSettings.getAllowedVariants())); + currentSettings.setSelectedVariant(validateSelectedVariant(currentSettings.getSelectedVariant(), newSettings.getSelectedVariant(), currentSettings.getAllowedVariants(), + parentSettings != null ? parentSettings.allowedVariants() : null)); return currentSettings; } /** - * Updates a Hestia sub settings object. + * Updates a Lecture Ingestion sub settings object. * If the new settings are null, the current settings will be deleted (except if the parent settings are null == if the settings are global). * Special notes: - * - If the user is not an admin the allowed models will not be updated. - * - If the user is not an admin the preferred model will only be updated if it is included in the allowed models. * - * @param currentSettings Current Hestia sub settings. - * @param newSettings Updated Hestia sub settings. - * @param parentSettings Parent Hestia sub settings. + * @param currentSettings Current Lecture Ingestion sub settings. + * @param newSettings Updated Lecture Ingestion sub settings. + * @param parentSettings Parent Lecture Ingestion sub settings. * @param settingsType Type of the settings the sub settings belong to. - * @return Updated Hestia sub settings. + * @return Updated Lecture Ingestion sub settings. */ - public IrisHestiaSubSettings update(IrisHestiaSubSettings currentSettings, IrisHestiaSubSettings newSettings, IrisCombinedHestiaSubSettingsDTO parentSettings, - IrisSettingsType settingsType) { + public IrisLectureIngestionSubSettings update(IrisLectureIngestionSubSettings currentSettings, IrisLectureIngestionSubSettings newSettings, + IrisCombinedLectureIngestionSubSettingsDTO parentSettings, IrisSettingsType settingsType) { if (newSettings == null) { if (parentSettings == null) { - throw new IllegalArgumentException("Cannot delete the Hestia settings"); + throw new IllegalArgumentException("Cannot delete the Lecture Ingestion settings"); } return null; } if (currentSettings == null) { - currentSettings = new IrisHestiaSubSettings(); + currentSettings = new IrisLectureIngestionSubSettings(); } - if (settingsType == IrisSettingsType.EXERCISE || authCheckService.isAdmin()) { + + if (authCheckService.isAdmin() && (settingsType == IrisSettingsType.COURSE || settingsType == IrisSettingsType.GLOBAL)) { currentSettings.setEnabled(newSettings.isEnabled()); + currentSettings.setAutoIngestOnLectureAttachmentUpload(newSettings.getAutoIngestOnLectureAttachmentUpload()); } - currentSettings.setAllowedModels(selectAllowedModels(currentSettings.getAllowedModels(), newSettings.getAllowedModels())); - currentSettings.setPreferredModel(validatePreferredModel(currentSettings.getPreferredModel(), newSettings.getPreferredModel(), currentSettings.getAllowedModels(), - parentSettings != null ? parentSettings.allowedModels() : null)); - currentSettings.setTemplate(newSettings.getTemplate()); + return currentSettings; } @@ -174,11 +171,10 @@ public IrisCompetencyGenerationSubSettings update(IrisCompetencyGenerationSubSet } if (authCheckService.isAdmin()) { currentSettings.setEnabled(newSettings.isEnabled()); - currentSettings.setAllowedModels(selectAllowedModels(currentSettings.getAllowedModels(), newSettings.getAllowedModels())); + currentSettings.setAllowedVariants(selectAllowedVariants(currentSettings.getAllowedVariants(), newSettings.getAllowedVariants())); } - currentSettings.setPreferredModel(validatePreferredModel(currentSettings.getPreferredModel(), newSettings.getPreferredModel(), currentSettings.getAllowedModels(), - parentSettings != null ? parentSettings.allowedModels() : null)); - currentSettings.setTemplate(newSettings.getTemplate()); + currentSettings.setSelectedVariant(validateSelectedVariant(currentSettings.getSelectedVariant(), newSettings.getSelectedVariant(), currentSettings.getAllowedVariants(), + parentSettings != null ? parentSettings.allowedVariants() : null)); return currentSettings; } @@ -187,12 +183,12 @@ public IrisCompetencyGenerationSubSettings update(IrisCompetencyGenerationSubSet * If the user is an admin, all models are allowed. * Otherwise, only models that are allowed by the parent settings or the current settings are allowed. * - * @param allowedModels The allowed models of the current settings. - * @param updatedAllowedModels The allowed models of the updated settings. + * @param allowedVariants The allowed models of the current settings. + * @param updatedAllowedVariants The allowed models of the updated settings. * @return The filtered allowed models. */ - private SortedSet selectAllowedModels(SortedSet allowedModels, SortedSet updatedAllowedModels) { - return authCheckService.isAdmin() ? updatedAllowedModels : allowedModels; + private SortedSet selectAllowedVariants(SortedSet allowedVariants, SortedSet updatedAllowedVariants) { + return authCheckService.isAdmin() ? updatedAllowedVariants : allowedVariants; } /** @@ -200,23 +196,23 @@ private SortedSet selectAllowedModels(SortedSet allowedModels, S * If the user is an admin, all models are allowed. * Otherwise, only models that are allowed by the current settings are allowed. * - * @param preferredModel The preferred model of the current settings. - * @param newPreferredModel The preferred model of the updated settings. - * @param allowedModels The allowed models of the current settings. - * @param parentAllowedModels The allowed models of the parent settings. + * @param selectedVariant The preferred model of the current settings. + * @param newSelectedVariant The preferred model of the updated settings. + * @param allowedVariants The allowed models of the current settings. + * @param parentAllowedVariants The allowed models of the parent settings. * @return The validated preferred model. */ - private String validatePreferredModel(String preferredModel, String newPreferredModel, Set allowedModels, Set parentAllowedModels) { - if (newPreferredModel == null || newPreferredModel.isBlank()) { + private String validateSelectedVariant(String selectedVariant, String newSelectedVariant, Set allowedVariants, Set parentAllowedVariants) { + if (newSelectedVariant == null || newSelectedVariant.isBlank()) { return null; } - var canChangePreferredModel = authCheckService.isAdmin() || (allowedModels != null && !allowedModels.isEmpty() && allowedModels.contains(newPreferredModel)) - || ((allowedModels == null || allowedModels.isEmpty()) && parentAllowedModels != null && parentAllowedModels.contains(newPreferredModel)); - if (canChangePreferredModel) { - return newPreferredModel; + var canChangeSelectedVariant = authCheckService.isAdmin() || (allowedVariants != null && !allowedVariants.isEmpty() && allowedVariants.contains(newSelectedVariant)) + || ((allowedVariants == null || allowedVariants.isEmpty()) && parentAllowedVariants != null && parentAllowedVariants.contains(newSelectedVariant)); + if (canChangeSelectedVariant) { + return newSelectedVariant; } - return preferredModel; + return selectedVariant; } /** @@ -228,45 +224,43 @@ private String validatePreferredModel(String preferredModel, String newPreferred * @param minimal Whether to return a minimal version of the combined settings. * @return Combined chat settings. */ - public IrisCombinedChatSubSettingsDTO combineChatSettings(ArrayList settingsList, boolean minimal) { - var enabled = getCombinedEnabled(settingsList, IrisSettings::getIrisChatSettings); + public IrisCombinedTextExerciseChatSubSettingsDTO combineTextExerciseChatSettings(ArrayList settingsList, boolean minimal) { + var enabled = getCombinedEnabled(settingsList, IrisSettings::getIrisTextExerciseChatSettings); var rateLimit = getCombinedRateLimit(settingsList); - var allowedModels = minimal ? getCombinedAllowedModels(settingsList, IrisSettings::getIrisChatSettings) : null; - var preferredModel = minimal ? getCombinedPreferredModel(settingsList, IrisSettings::getIrisChatSettings) : null; - var template = minimal ? getCombinedTemplate(settingsList, IrisSettings::getIrisChatSettings, IrisChatSubSettings::getTemplate) : null; - return new IrisCombinedChatSubSettingsDTO(enabled, rateLimit, null, allowedModels, preferredModel, template); + var allowedVariants = !minimal ? getCombinedAllowedVariants(settingsList, IrisSettings::getIrisChatSettings) : null; + var selectedVariant = !minimal ? getCombinedSelectedVariant(settingsList, IrisSettings::getIrisChatSettings) : null; + return new IrisCombinedTextExerciseChatSubSettingsDTO(enabled, rateLimit, null, allowedVariants, selectedVariant); } /** - * Combines the Lecture Ingestion settings of multiple {@link IrisSettings} objects. + * Combines the chat settings of multiple {@link IrisSettings} objects. * If minimal is true, the returned object will only contain the enabled and rateLimit fields. * The minimal version can safely be sent to students. * * @param settingsList List of {@link IrisSettings} objects to combine. * @param minimal Whether to return a minimal version of the combined settings. - * @return Combined Lecture Ingestion settings. + * @return Combined chat settings. */ - public IrisCombinedLectureIngestionSubSettingsDTO combineLectureIngestionSubSettings(ArrayList settingsList, boolean minimal) { - var enabled = getCombinedEnabled(settingsList, IrisSettings::getIrisLectureIngestionSettings); - return new IrisCombinedLectureIngestionSubSettingsDTO(enabled); + public IrisCombinedChatSubSettingsDTO combineChatSettings(ArrayList settingsList, boolean minimal) { + var enabled = getCombinedEnabled(settingsList, IrisSettings::getIrisChatSettings); + var rateLimit = getCombinedRateLimit(settingsList); + var allowedVariants = !minimal ? getCombinedAllowedVariants(settingsList, IrisSettings::getIrisChatSettings) : null; + var selectedVariant = !minimal ? getCombinedSelectedVariant(settingsList, IrisSettings::getIrisChatSettings) : null; + return new IrisCombinedChatSubSettingsDTO(enabled, rateLimit, null, allowedVariants, selectedVariant); } /** - * Combines the Hestia settings of multiple {@link IrisSettings} objects. - * If minimal is true, the returned object will only contain the enabled field. + * Combines the Lecture Ingestion settings of multiple {@link IrisSettings} objects. + * If minimal is true, the returned object will only contain the enabled and rateLimit fields. * The minimal version can safely be sent to students. * * @param settingsList List of {@link IrisSettings} objects to combine. * @param minimal Whether to return a minimal version of the combined settings. - * @return Combined Hestia settings. + * @return Combined Lecture Ingestion settings. */ - public IrisCombinedHestiaSubSettingsDTO combineHestiaSettings(ArrayList settingsList, boolean minimal) { - var actualSettingsList = settingsList.stream().filter(settings -> !(settings instanceof IrisExerciseSettings)).toList(); - var enabled = getCombinedEnabled(actualSettingsList, IrisSettings::getIrisHestiaSettings); - var allowedModels = minimal ? getCombinedAllowedModels(actualSettingsList, IrisSettings::getIrisHestiaSettings) : null; - var preferredModel = minimal ? getCombinedPreferredModel(actualSettingsList, IrisSettings::getIrisHestiaSettings) : null; - var template = minimal ? getCombinedTemplate(actualSettingsList, IrisSettings::getIrisHestiaSettings, IrisHestiaSubSettings::getTemplate) : null; - return new IrisCombinedHestiaSubSettingsDTO(enabled, allowedModels, preferredModel, template); + public IrisCombinedLectureIngestionSubSettingsDTO combineLectureIngestionSubSettings(ArrayList settingsList, boolean minimal) { + var enabled = getCombinedEnabled(settingsList, IrisSettings::getIrisLectureIngestionSettings); + return new IrisCombinedLectureIngestionSubSettingsDTO(enabled); } /** @@ -281,11 +275,9 @@ public IrisCombinedHestiaSubSettingsDTO combineHestiaSettings(ArrayList settingsList, boolean minimal) { var actualSettingsList = settingsList.stream().filter(settings -> !(settings instanceof IrisExerciseSettings)).toList(); var enabled = getCombinedEnabled(actualSettingsList, IrisSettings::getIrisCompetencyGenerationSettings); - var allowedModels = minimal ? getCombinedAllowedModels(actualSettingsList, IrisSettings::getIrisCompetencyGenerationSettings) : null; - var preferredModel = minimal ? getCombinedPreferredModel(actualSettingsList, IrisSettings::getIrisCompetencyGenerationSettings) : null; - var template = minimal ? getCombinedTemplate(actualSettingsList, IrisSettings::getIrisCompetencyGenerationSettings, IrisCompetencyGenerationSubSettings::getTemplate) - : null; - return new IrisCombinedCompetencyGenerationSubSettingsDTO(enabled, allowedModels, preferredModel, template); + var allowedVariants = !minimal ? getCombinedAllowedVariants(actualSettingsList, IrisSettings::getIrisCompetencyGenerationSettings) : null; + var selectedVariant = !minimal ? getCombinedSelectedVariant(actualSettingsList, IrisSettings::getIrisCompetencyGenerationSettings) : null; + return new IrisCombinedCompetencyGenerationSubSettingsDTO(enabled, allowedVariants, selectedVariant); } /** @@ -322,43 +314,28 @@ private Integer getCombinedRateLimit(List settingsList) { } /** - * Combines the allowedModels field of multiple {@link IrisSettings} objects. - * Simply takes the last allowedModels. + * Combines the allowedVariants field of multiple {@link IrisSettings} objects. + * Simply takes the last allowedVariants. * * @param settingsList List of {@link IrisSettings} objects to combine. * @param subSettingsFunction Function to get the sub settings from an IrisSettings object. - * @return Combined allowedModels field. + * @return Combined allowedVariants field. */ - private Set getCombinedAllowedModels(List settingsList, Function subSettingsFunction) { - return settingsList.stream().filter(Objects::nonNull).map(subSettingsFunction).filter(Objects::nonNull).map(IrisSubSettings::getAllowedModels).filter(Objects::nonNull) + private Set getCombinedAllowedVariants(List settingsList, Function subSettingsFunction) { + return settingsList.stream().filter(Objects::nonNull).map(subSettingsFunction).filter(Objects::nonNull).map(IrisSubSettings::getAllowedVariants).filter(Objects::nonNull) .filter(models -> !models.isEmpty()).reduce((first, second) -> second).orElse(new TreeSet<>()); } /** - * Combines the preferredModel field of multiple {@link IrisSettings} objects. - * Simply takes the last preferredModel. - * TODO + * Combines the selectedVariant field of multiple {@link IrisSettings} objects. + * Simply takes the last selectedVariant. * * @param settingsList List of {@link IrisSettings} objects to combine. * @param subSettingsFunction Function to get the sub settings from an IrisSettings object. - * @return Combined preferredModel field. + * @return Combined selectedVariant field. */ - private String getCombinedPreferredModel(List settingsList, Function subSettingsFunction) { - return settingsList.stream().filter(Objects::nonNull).map(subSettingsFunction).filter(Objects::nonNull).map(IrisSubSettings::getPreferredModel) + private String getCombinedSelectedVariant(List settingsList, Function subSettingsFunction) { + return settingsList.stream().filter(Objects::nonNull).map(subSettingsFunction).filter(Objects::nonNull).map(IrisSubSettings::getSelectedVariant) .filter(model -> model != null && !model.isBlank()).reduce((first, second) -> second).orElse(null); } - - /** - * Combines the template field of multiple {@link IrisSettings} objects. - * Simply takes the last template. - * - * @param settingsList List of {@link IrisSettings} objects to combine. - * @param templateFunction Function to get the template from the sub settings from an IrisSettings object. - * @return Combined template field. - */ - private IrisTemplate getCombinedTemplate(List settingsList, Function subSettingsFunction, - Function templateFunction) { - return settingsList.stream().filter(Objects::nonNull).map(subSettingsFunction).filter(Objects::nonNull).map(templateFunction) - .filter(template -> template != null && template.getContent() != null && !template.getContent().isBlank()).reduce((first, second) -> second).orElse(null); - } } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java index 55204aa63397..9e736ce8c358 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java @@ -35,6 +35,7 @@ @Profile(PROFILE_IRIS) @RestController @RequestMapping("api/iris/exercise-chat/") +// TODO: Rename to IrisProgrammingExerciseChatSessionResource public class IrisExerciseChatSessionResource { protected final UserRepository userRepository; @@ -47,6 +48,7 @@ public class IrisExerciseChatSessionResource { protected final IrisRateLimitService irisRateLimitService; + // TODO: This could be a ProgrammingExerciseRepository protected final ExerciseRepository exerciseRepository; private final IrisExerciseChatSessionRepository irisExerciseChatSessionRepository; @@ -134,6 +136,7 @@ public ResponseEntity createSessionForExercise(@PathVar private static ProgrammingExercise validateExercise(Exercise exercise) { if (!(exercise instanceof ProgrammingExercise programmingExercise)) { + // TODO: Remove this once we are only fetching ProgrammingExercises from the DB anyway throw new ConflictException("Iris is only supported for programming exercises", "Iris", "irisProgrammingExercise"); } if (exercise.isExamExercise()) { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java deleted file mode 100644 index ae4bedb82493..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java +++ /dev/null @@ -1,49 +0,0 @@ -package de.tum.cit.aet.artemis.iris.web; - -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; - -import java.util.List; - -import org.springframework.context.annotation.Profile; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorException; -import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorService; -import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; - -/** - * REST controller for managing the models Pyris provides. - */ -@Profile(PROFILE_IRIS) -@RestController -@RequestMapping("api/") -public class IrisModelsResource { - - private final PyrisConnectorService pyrisConnectorService; - - public IrisModelsResource(PyrisConnectorService pyrisConnectorService) { - this.pyrisConnectorService = pyrisConnectorService; - } - - /** - * GET iris/models: Retrieve all available models offered by Pyris - * - * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body a List of the models - */ - @GetMapping("iris/models") - @EnforceAtLeastEditor - public ResponseEntity> getAllModels() { - try { - var models = pyrisConnectorService.getOfferedModels(); - return ResponseEntity.ok(models); - } - catch (PyrisConnectorException e) { - throw new InternalServerErrorException("Could not fetch available Iris models"); - } - } -} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java index 32676da073bb..4f2c5416211d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java @@ -14,16 +14,20 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +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.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; /** * REST controller for managing {@link IrisSettings}. @@ -41,15 +45,15 @@ public class IrisSettingsResource { private final AuthorizationCheckService authCheckService; - private final ProgrammingExerciseRepository programmingExerciseRepository; + private final ExerciseRepository exerciseRepository; public IrisSettingsResource(UserRepository userRepository, CourseRepository courseRepository, IrisSettingsService irisSettingsService, - AuthorizationCheckService authCheckService, ProgrammingExerciseRepository programmingExerciseRepository) { + AuthorizationCheckService authCheckService, ExerciseRepository exerciseRepository) { this.userRepository = userRepository; this.courseRepository = courseRepository; this.irisSettingsService = irisSettingsService; this.authCheckService = authCheckService; - this.programmingExerciseRepository = programmingExerciseRepository; + this.exerciseRepository = exerciseRepository; } /** @@ -71,24 +75,23 @@ public ResponseEntity getGlobalSettings() { * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the settings, or with status {@code 404 (Not Found)} if the course could not be found. */ @GetMapping("courses/{courseId}/raw-iris-settings") - @EnforceAtLeastEditor + @EnforceAtLeastEditorInCourse public ResponseEntity getRawCourseSettings(@PathVariable Long courseId) { var course = courseRepository.findByIdElseThrow(courseId); - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, course, null); var irisSettings = irisSettingsService.getRawIrisSettingsFor(course); return ResponseEntity.ok(irisSettings); } /** - * GET programming-exercises/{exerciseId}/raw-iris-settings: Retrieve the raw iris settings for the programming exercise. + * GET exercises/{exerciseId}/raw-iris-settings: Retrieve the raw iris settings for the exercise. * - * @param exerciseId of the programming exercise + * @param exerciseId of the exercise * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the settings, or with status {@code 404 (Not Found)} if the exercise could not be found. */ - @GetMapping("programming-exercises/{exerciseId}/raw-iris-settings") - @EnforceAtLeastEditor - public ResponseEntity getRawProgrammingExerciseSettings(@PathVariable Long exerciseId) { - var exercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); + @GetMapping("exercises/{exerciseId}/raw-iris-settings") + @EnforceAtLeastEditorInExercise + public ResponseEntity getRawExerciseSettings(@PathVariable Long exerciseId) { + var exercise = exerciseRepository.findByIdElseThrow(exerciseId); var user = userRepository.getUserWithGroupsAndAuthorities(); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.STUDENT, exercise, user); @@ -103,11 +106,10 @@ public ResponseEntity getRawProgrammingExerciseSettings(@PathVaria * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the settings, or with status {@code 404 (Not Found)} if the course could not be found. */ @GetMapping("courses/{courseId}/iris-settings") - @EnforceAtLeastStudent + @EnforceAtLeastStudentInCourse public ResponseEntity getCourseSettings(@PathVariable Long courseId) { var course = courseRepository.findByIdElseThrow(courseId); var user = userRepository.getUserWithGroupsAndAuthorities(); - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, course, user); // Editors can see the full settings, students only the reduced settings var getReduced = !authCheckService.isAtLeastEditorInCourse(course, user); @@ -116,17 +118,16 @@ public ResponseEntity getCourseSettings(@PathVariable L } /** - * GET programming-exercises/{exerciseId}/iris-settings: Retrieve the actual iris settings for the programming exercise. + * GET exercises/{exerciseId}/iris-settings: Retrieve the actual iris settings for the exercise. * - * @param exerciseId of the programming exercise + * @param exerciseId of the exercise * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the settings, or with status {@code 404 (Not Found)} if the exercise could not be found. */ - @GetMapping("programming-exercises/{exerciseId}/iris-settings") - @EnforceAtLeastStudent - public ResponseEntity getProgrammingExerciseSettings(@PathVariable Long exerciseId) { - var exercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); + @GetMapping("exercises/{exerciseId}/iris-settings") + @EnforceAtLeastStudentInExercise + public ResponseEntity getExerciseSettings(@PathVariable Long exerciseId) { + var exercise = exerciseRepository.findByIdElseThrow(exerciseId); var user = userRepository.getUserWithGroupsAndAuthorities(); - authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.STUDENT, exercise, user); var combinedIrisSettings = irisSettingsService.getCombinedIrisSettingsFor(exercise, irisSettingsService.shouldShowMinimalSettings(exercise, user)); return ResponseEntity.ok(combinedIrisSettings); @@ -140,29 +141,26 @@ public ResponseEntity getProgrammingExerciseSettings(@P * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the updated settings, or with status {@code 404 (Not Found)} if the course could not be found. */ @PutMapping("courses/{courseId}/raw-iris-settings") - @EnforceAtLeastEditor + @EnforceAtLeastInstructorInCourse public ResponseEntity updateCourseSettings(@PathVariable Long courseId, @RequestBody IrisCourseSettings settings) { var course = courseRepository.findByIdElseThrow(courseId); - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, course, null); settings.setCourse(course); var updatedSettings = irisSettingsService.saveIrisSettings(settings); return ResponseEntity.ok(updatedSettings); } /** - * PUT programming-exercises/{exerciseId}/raw-iris-settings: Update the raw iris settings for the programming exercise. + * PUT exercises/{exerciseId}/raw-iris-settings: Update the raw iris settings for the exercise. * - * @param exerciseId of the programming exercise + * @param exerciseId of the exercise * @param settings the settings to update * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the updated settings, or with status {@code 404 (Not Found)} if the exercise could not be * found. */ - @PutMapping("programming-exercises/{exerciseId}/raw-iris-settings") - @EnforceAtLeastInstructor - public ResponseEntity updateProgrammingExerciseSettings(@PathVariable Long exerciseId, @RequestBody IrisExerciseSettings settings) { - var exercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); - var user = userRepository.getUserWithGroupsAndAuthorities(); - authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, exercise, user); + @PutMapping("exercises/{exerciseId}/raw-iris-settings") + @EnforceAtLeastInstructorInExercise + public ResponseEntity updateExerciseSettings(@PathVariable Long exerciseId, @RequestBody IrisExerciseSettings settings) { + var exercise = exerciseRepository.findByIdElseThrow(exerciseId); settings.setExercise(exercise); var updatedSettings = irisSettingsService.saveIrisSettings(settings); return ResponseEntity.ok(updatedSettings); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisTextExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisTextExerciseChatSessionResource.java new file mode 100644 index 000000000000..9ebb7aa647a2 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisTextExerciseChatSessionResource.java @@ -0,0 +1,137 @@ +package de.tum.cit.aet.artemis.iris.web; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.domain.Pageable; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.iris.domain.session.IrisTextExerciseChatSession; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.repository.IrisTextExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.iris.service.IrisSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisTextExerciseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; + +/** + * REST controller for managing {@link IrisTextExerciseChatSession}. + */ +@Profile("iris") +@RestController +@RequestMapping("api/iris/text-exercise-chat/") +public class IrisTextExerciseChatSessionResource { + + private final UserRepository userRepository; + + private final IrisSessionService irisSessionService; + + private final IrisSettingsService irisSettingsService; + + private final TextExerciseRepository textExerciseRepository; + + private final IrisTextExerciseChatSessionService irisTextExerciseChatSessionService; + + private final IrisTextExerciseChatSessionRepository irisTextExerciseChatSessionRepository; + + protected IrisTextExerciseChatSessionResource(IrisTextExerciseChatSessionRepository irisTextExerciseChatSessionRepository, UserRepository userRepository, + TextExerciseRepository textExerciseRepository, IrisSessionService irisSessionService, IrisSettingsService irisSettingsService, + IrisTextExerciseChatSessionService irisTextExerciseChatSessionService) { + this.irisTextExerciseChatSessionRepository = irisTextExerciseChatSessionRepository; + this.userRepository = userRepository; + this.irisSessionService = irisSessionService; + this.irisSettingsService = irisSettingsService; + this.textExerciseRepository = textExerciseRepository; + this.irisTextExerciseChatSessionService = irisTextExerciseChatSessionService; + } + + /** + * GET exercise-chat/{exerciseId}/sessions/current: Retrieve the current iris session for the programming exercise. + * + * @param exerciseId of the exercise + * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the current iris session for the exercise or {@code 404 (Not Found)} if no session exists + */ + @PostMapping("{exerciseId}/sessions/current") + @EnforceAtLeastStudentInExercise + public ResponseEntity getCurrentSessionOrCreateIfNotExists(@PathVariable Long exerciseId) throws URISyntaxException { + var exercise = textExerciseRepository.findByIdElseThrow(exerciseId); + validateExercise(exercise); + + irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.TEXT_EXERCISE_CHAT, exercise); + var user = userRepository.getUserWithGroupsAndAuthorities(); + + var sessionOptional = irisTextExerciseChatSessionRepository.findLatestByExerciseIdAndUserIdWithMessages(exercise.getId(), user.getId(), Pageable.ofSize(1)).stream() + .findFirst(); + if (sessionOptional.isPresent()) { + var session = sessionOptional.get(); + irisSessionService.checkHasAccessToIrisSession(session, user); + return ResponseEntity.ok(session); + } + + return createSessionForExercise(exerciseId); + } + + /** + * POST exercise-chat/{exerciseId}/session: Create a new iris session for an exercise and user. + * If there already exists an iris session for the exercise and user, a new one is created. + * Note: The old session including messages is not deleted and can still be retrieved + * + * @param exerciseId of the exercise + * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the new iris session for the exercise + */ + @PostMapping("{exerciseId}/sessions") + @EnforceAtLeastStudentInExercise + public ResponseEntity createSessionForExercise(@PathVariable Long exerciseId) throws URISyntaxException { + var textExercise = textExerciseRepository.findByIdElseThrow(exerciseId); + validateExercise(textExercise); + + irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.TEXT_EXERCISE_CHAT, textExercise); + var user = userRepository.getUserWithGroupsAndAuthorities(); + user.hasAcceptedIrisElseThrow(); + + var session = irisTextExerciseChatSessionRepository.save(new IrisTextExerciseChatSession(textExercise, user)); + var uriString = "/api/iris/sessions/" + session.getId(); + + return ResponseEntity.created(new URI(uriString)).body(session); + } + + /** + * GET exercise-chat/{exerciseId}/sessions: Retrieve all Iris Sessions for the programming exercise + * + * @param exerciseId of the exercise + * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body a list of the iris sessions for the exercise or {@code 404 (Not Found)} if no session exists + */ + @GetMapping("{exerciseId}/sessions") + @EnforceAtLeastStudentInExercise + public ResponseEntity> getAllSessions(@PathVariable Long exerciseId) { + var exercise = textExerciseRepository.findByIdElseThrow(exerciseId); + validateExercise(exercise); + + irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.TEXT_EXERCISE_CHAT, exercise); + var user = userRepository.getUserWithGroupsAndAuthorities(); + user.hasAcceptedIrisElseThrow(); + + var sessions = irisTextExerciseChatSessionRepository.findByExerciseIdAndUserIdElseThrow(exercise.getId(), user.getId()); + // TODO: Discuss this with the team: should we filter out sessions where the user does not have access, or throw an exception? + // Access check might not even be necessary here -> see comments in hasAccess method + var filteredSessions = sessions.stream().filter(session -> irisTextExerciseChatSessionService.hasAccess(user, session)).toList(); + return ResponseEntity.ok(filteredSessions); + } + + private static void validateExercise(TextExercise exercise) { + if (exercise.isExamExercise()) { + throw new ConflictException("Iris is not supported for exam exercises", "Iris", "irisExamExercise"); + } + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisVariantsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisVariantsResource.java new file mode 100644 index 000000000000..9342d1522023 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisVariantsResource.java @@ -0,0 +1,56 @@ +package de.tum.cit.aet.artemis.iris.web; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorException; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisVariantDTO; + +/** + * REST controller for managing the variants Pyris provides. + */ +@Profile("iris") +@RestController +@RequestMapping("api/") +public class IrisVariantsResource { + + private static final Logger log = LoggerFactory.getLogger(IrisVariantsResource.class); + + private final PyrisConnectorService pyrisConnectorService; + + public IrisVariantsResource(PyrisConnectorService pyrisConnectorService) { + this.pyrisConnectorService = pyrisConnectorService; + } + + /** + * GET iris/variants/{feature}: Retrieve all available variants offered by Pyris for a certain feature + * + * @param featureRaw the feature for which to retrieve the variants + * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body a List of the variants + */ + @GetMapping("iris/variants/{feature}") + @EnforceAtLeastEditor + public ResponseEntity> getAllVariants(@PathVariable("feature") String featureRaw) { + var feature = IrisSubSettingsType.valueOf(featureRaw.toUpperCase().replace("-", "_")); + try { + var variants = pyrisConnectorService.getOfferedVariants(feature); + return ResponseEntity.ok(variants); + } + catch (PyrisConnectorException e) { + log.error("Could not fetch available variants for feature {}", feature, e); + throw new InternalServerErrorException("Could not fetch available variants for feature " + feature); + } + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/admin/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/admin/AdminIrisSettingsResource.java index b8ea1f92ba31..40da3e5ee431 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/admin/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/admin/AdminIrisSettingsResource.java @@ -17,6 +17,7 @@ * REST controller for managing {@link IrisSettings}. */ @Profile(PROFILE_IRIS) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminIrisSettingsResource { @@ -34,7 +35,6 @@ public AdminIrisSettingsResource(IrisSettingsService irisSettingsService) { * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the updated settings. */ @PutMapping("iris/global-iris-settings") - @EnforceAdmin public ResponseEntity updateGlobalSettings(@RequestBody IrisSettings settings) { var updatedSettings = irisSettingsService.saveIrisSettings(settings); return ResponseEntity.ok(updatedSettings); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java index 05fecc5a287e..025a6ce4e897 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.iris.service.pyris.PyrisJobService; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisStatusUpdateService; import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.textexercise.PyrisTextExerciseChatStatusUpdateDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; import de.tum.cit.aet.artemis.iris.service.pyris.job.CompetencyExtractionJob; @@ -27,6 +28,7 @@ import de.tum.cit.aet.artemis.iris.service.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.iris.service.pyris.job.IngestionWebhookJob; import de.tum.cit.aet.artemis.iris.service.pyris.job.PyrisJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.TextExerciseChatJob; /** * REST controller for providing Pyris access to Artemis internal data and status updates. @@ -59,7 +61,7 @@ public PublicPyrisStatusUpdateResource(PyrisJobService pyrisJobService, PyrisSta * @throws AccessForbiddenException if the token is invalid * @return a {@link ResponseEntity} with status {@code 200 (OK)} */ - @PostMapping("pipelines/tutor-chat/runs/{runId}/status") // TODO: Rename this to 'exercise-chat' with next breaking Pyris version + @PostMapping("pipelines/tutor-chat/runs/{runId}/status") // TODO: Rename this to 'programming-exercise-chat' with next breaking Pyris version @EnforceNothing public ResponseEntity setStatusOfJob(@PathVariable String runId, @RequestBody PyrisChatStatusUpdateDTO statusUpdateDTO, HttpServletRequest request) { var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, ExerciseChatJob.class); @@ -123,6 +125,30 @@ public ResponseEntity setCompetencyExtractionJobStatus(@PathVariable Strin return ResponseEntity.ok().build(); } + /** + * {@code POST /api/public/pyris/pipelines/text-exercise-chat/runs/{runId}/status} : Set the status of a Text Exercise Chat job. + * + * @param runId the ID of the job + * @param statusUpdateDTO the status update + * @param request the HTTP request + * @return a {@link ResponseEntity} with status {@code 200 (OK)} + * @throws ConflictException if the run ID in the URL does not match the run ID in the request body + * @throws AccessForbiddenException if the token is invalid + */ + @PostMapping("pipelines/text-exercise-chat/runs/{runId}/status") + @EnforceNothing + public ResponseEntity respondInTextExerciseChat(@PathVariable String runId, @RequestBody PyrisTextExerciseChatStatusUpdateDTO statusUpdateDTO, + HttpServletRequest request) { + var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, TextExerciseChatJob.class); + if (!Objects.equals(job.jobId(), runId)) { + throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch"); + } + + pyrisStatusUpdateService.handleStatusUpdate(job, statusUpdateDTO); + + return ResponseEntity.ok().build(); + } + /** * {@code POST /api/public/pyris/webhooks/ingestion/runs/{runId}/status} : Set the status of an Ingestion job. * diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java index 7ab7df9d479d..621216563727 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.dto.CourseContentCount; +import de.tum.cit.aet.artemis.core.exception.NoUniqueQueryException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lecture.domain.Lecture; @@ -100,6 +101,30 @@ public interface LectureRepository extends ArtemisJpaRepository { """) Optional findByIdWithLectureUnitsAndSlidesAndAttachments(@Param("lectureId") long lectureId); + @Query(""" + SELECT lecture + FROM Lecture lecture + LEFT JOIN FETCH lecture.lectureUnits + WHERE lecture.title = :title AND lecture.course.id = :courseId + """) + Set findAllByTitleAndCourseIdWithLectureUnits(@Param("title") String title, @Param("courseId") long courseId); + + /** + * Finds a lecture by its title and course id and throws a NoUniqueQueryException if multiple lectures are found. + * + * @param title the title of the lecture + * @param courseId the id of the course + * @return the lecture with the given title and course id + * @throws NoUniqueQueryException if multiple lectures are found with the same title + */ + default Optional findUniqueByTitleAndCourseIdWithLectureUnitsElseThrow(String title, long courseId) throws NoUniqueQueryException { + Set allLectures = findAllByTitleAndCourseIdWithLectureUnits(title, courseId); + if (allLectures.size() > 1) { + throw new NoUniqueQueryException("Found multiple lectures with title " + title + " in course with id " + courseId); + } + return allLectures.stream().findFirst(); + } + @SuppressWarnings("PMD.MethodNamingConventions") Page findByTitleIgnoreCaseContainingOrCourse_TitleIgnoreCaseContaining(String partialTitle, String partialCourseTitle, Pageable pageable); diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java index fceab652c24d..ee29df83380a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java @@ -5,6 +5,7 @@ import java.util.Optional; import java.util.Set; +import org.hibernate.NonUniqueResultException; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -61,6 +62,27 @@ public interface LectureUnitRepository extends ArtemisJpaRepository findByIdWithCompletedUsers(@Param("lectureUnitId") long lectureUnitId); + /** + * Finds a lecture unit by name, lecture title and course id. Currently, name duplicates are allowed but this method throws an exception if multiple lecture units with the + * same name are found. + * + * @param name the name of the lecture unit + * @param lectureTitle the title of the lecture containing the lecture unit + * @param courseId the id of the course containing the lecture + * @return the lecture unit with the given name, lecture title and course id + * @throws NonUniqueResultException if multiple lecture units with the same name in the same lecture are found + */ + @Query(""" + SELECT lu + FROM LectureUnit lu + LEFT JOIN FETCH lu.competencies + WHERE lu.name = :name + AND lu.lecture.title = :lectureTitle + AND lu.lecture.course.id = :courseId + """) + Optional findByNameAndLectureTitleAndCourseIdWithCompetencies(@Param("name") String name, @Param("lectureTitle") String lectureTitle, + @Param("courseId") long courseId) throws NonUniqueResultException; + default LectureUnit findByIdWithCompletedUsersElseThrow(long lectureUnitId) { return getValueElseThrow(findByIdWithCompletedUsers(lectureUnitId), lectureUnitId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java index 5eca29ad0bc1..4a3e880640de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java @@ -2,11 +2,8 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import java.net.URI; -import java.nio.file.Path; import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Optional; import java.util.Set; @@ -16,22 +13,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.FilePathService; -import de.tum.cit.aet.artemis.core.service.FileService; -import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; -import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; -import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; -import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; -import de.tum.cit.aet.artemis.lecture.domain.TextUnit; -import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; @Profile(PROFILE_CORE) @Service @@ -41,39 +28,30 @@ public class LectureImportService { private final LectureRepository lectureRepository; - private final LectureUnitRepository lectureUnitRepository; - private final AttachmentRepository attachmentRepository; - private final Optional pyrisWebhookService; - - private final FileService fileService; - - private final SlideSplitterService slideSplitterService; + private final LectureUnitImportService lectureUnitImportService; - private final Optional irisSettingsRepository; + private final ChannelService channelService; - public LectureImportService(LectureRepository lectureRepository, LectureUnitRepository lectureUnitRepository, AttachmentRepository attachmentRepository, - Optional pyrisWebhookService, FileService fileService, SlideSplitterService slideSplitterService, - Optional irisSettingsRepository) { + public LectureImportService(LectureRepository lectureRepository, AttachmentRepository attachmentRepository, LectureUnitImportService lectureUnitImportService, + ChannelService channelService) { this.lectureRepository = lectureRepository; - this.lectureUnitRepository = lectureUnitRepository; this.attachmentRepository = attachmentRepository; - this.pyrisWebhookService = pyrisWebhookService; - this.fileService = fileService; - this.slideSplitterService = slideSplitterService; - this.irisSettingsRepository = irisSettingsRepository; + this.lectureUnitImportService = lectureUnitImportService; + this.channelService = channelService; } /** * Import the {@code importedLecture} including its lecture units and attachments to the {@code course} * - * @param importedLecture The lecture to be imported - * @param course The course to import to + * @param importedLecture The lecture to be imported + * @param course The course to import to + * @param importLectureUnits Whether to import the lecture units of the lecture * @return The lecture in the new course */ @Transactional // Required to circumvent errors with ordered collection of lecture units - public Lecture importLecture(final Lecture importedLecture, final Course course) { + public Lecture importLecture(final Lecture importedLecture, final Course course, boolean importLectureUnits) { log.debug("Creating a new Lecture based on lecture {}", importedLecture); // Copy the lecture itself to the new course @@ -83,127 +61,32 @@ public Lecture importLecture(final Lecture importedLecture, final Course course) lecture.setStartDate(importedLecture.getStartDate()); lecture.setEndDate(importedLecture.getEndDate()); lecture.setVisibleDate(importedLecture.getVisibleDate()); + lecture.setCourse(course); lecture = lectureRepository.save(lecture); - course.addLectures(lecture); - - log.debug("Importing lecture units from lecture"); - List lectureUnits = new ArrayList<>(); - for (LectureUnit lectureUnit : importedLecture.getLectureUnits()) { - LectureUnit clonedLectureUnit = cloneLectureUnit(lectureUnit, lecture); - if (clonedLectureUnit != null) { - clonedLectureUnit.setLecture(lecture); - lectureUnits.add(clonedLectureUnit); - } + + if (importLectureUnits) { + lectureUnitImportService.importLectureUnits(importedLecture, lecture); + } + else { + importedLecture.setLectureUnits(new ArrayList<>()); } - lecture.setLectureUnits(lectureUnits); - lectureUnitRepository.saveAll(lectureUnits); log.debug("Importing attachments from lecture"); Set attachments = new HashSet<>(); for (Attachment attachment : importedLecture.getAttachments()) { - Attachment clonedAttachment = cloneAttachment(lecture.getId(), attachment); + Attachment clonedAttachment = lectureUnitImportService.importAttachment(lecture.getId(), attachment); clonedAttachment.setLecture(lecture); attachments.add(clonedAttachment); } lecture.setAttachments(attachments); attachmentRepository.saveAll(attachments); - // Send lectures to pyris - if (pyrisWebhookService.isPresent() && irisSettingsRepository.isPresent()) { - pyrisWebhookService.get().autoUpdateAttachmentUnitsInPyris(lecture.getCourse().getId(), - lectureUnits.stream().filter(lectureUnit -> lectureUnit instanceof AttachmentUnit).map(lectureUnit -> (AttachmentUnit) lectureUnit).toList()); - } // Save again to establish the ordered list relationship - return lectureRepository.save(lecture); - } + Lecture savedLecture = lectureRepository.save(lecture); - /** - * This helper function clones the {@code importedLectureUnit} and returns it - * - * @param importedLectureUnit The original lecture unit to be copied - * @param newLecture The new lecture to which the lecture units are appended - * @return The cloned lecture unit - */ - private LectureUnit cloneLectureUnit(final LectureUnit importedLectureUnit, final Lecture newLecture) { - log.debug("Creating a new LectureUnit from lecture unit {}", importedLectureUnit); - - if (importedLectureUnit instanceof TextUnit importedTextUnit) { - TextUnit textUnit = new TextUnit(); - textUnit.setName(importedTextUnit.getName()); - textUnit.setReleaseDate(importedTextUnit.getReleaseDate()); - textUnit.setContent(importedTextUnit.getContent()); - return textUnit; - } - else if (importedLectureUnit instanceof VideoUnit importedVideoUnit) { - VideoUnit videoUnit = new VideoUnit(); - videoUnit.setName(importedVideoUnit.getName()); - videoUnit.setReleaseDate(importedVideoUnit.getReleaseDate()); - videoUnit.setDescription(importedVideoUnit.getDescription()); - videoUnit.setSource(importedVideoUnit.getSource()); - return videoUnit; - } - else if (importedLectureUnit instanceof AttachmentUnit importedAttachmentUnit) { - // Create and save the attachment unit, then the attachment itself, as the id is needed for file handling - AttachmentUnit attachmentUnit = new AttachmentUnit(); - attachmentUnit.setDescription(importedAttachmentUnit.getDescription()); - attachmentUnit.setLecture(newLecture); - lectureUnitRepository.save(attachmentUnit); - - Attachment attachment = cloneAttachment(attachmentUnit.getId(), importedAttachmentUnit.getAttachment()); - attachment.setAttachmentUnit(attachmentUnit); - attachmentRepository.save(attachment); - if (attachment.getLink().endsWith(".pdf")) { - slideSplitterService.splitAttachmentUnitIntoSingleSlides(attachmentUnit); - } - attachmentUnit.setAttachment(attachment); - return attachmentUnit; - } - else if (importedLectureUnit instanceof OnlineUnit importedOnlineUnit) { - OnlineUnit onlineUnit = new OnlineUnit(); - onlineUnit.setName(importedOnlineUnit.getName()); - onlineUnit.setReleaseDate(importedOnlineUnit.getReleaseDate()); - onlineUnit.setDescription(importedOnlineUnit.getDescription()); - onlineUnit.setSource(importedOnlineUnit.getSource()); - - return onlineUnit; - } - else if (importedLectureUnit instanceof ExerciseUnit) { - // TODO: Import exercises and link them to the exerciseUnit - // We have a dedicated exercise import system, so this is left out for now - return null; - } - return null; - } + channelService.createLectureChannel(savedLecture, Optional.empty()); - /** - * This helper function clones the {@code importedAttachment} (and duplicates its file) and returns it - * - * @param entityId The id of the new entity to which the attachment is linked - * @param importedAttachment The original attachment to be copied - * @return The cloned attachment with the file also duplicated to the temp directory on disk - */ - private Attachment cloneAttachment(Long entityId, final Attachment importedAttachment) { - log.debug("Creating a new Attachment from attachment {}", importedAttachment); - - Attachment attachment = new Attachment(); - attachment.setName(importedAttachment.getName()); - attachment.setUploadDate(importedAttachment.getUploadDate()); - attachment.setReleaseDate(importedAttachment.getReleaseDate()); - attachment.setVersion(importedAttachment.getVersion()); - attachment.setAttachmentType(importedAttachment.getAttachmentType()); - - Path oldPath = FilePathService.actualPathForPublicPathOrThrow(URI.create(importedAttachment.getLink())); - Path newPath; - if (oldPath.toString().contains("/attachment-unit/")) { - newPath = FilePathService.getAttachmentUnitFilePath().resolve(entityId.toString()); - } - else { - newPath = FilePathService.getLectureAttachmentFilePath().resolve(entityId.toString()); - } - log.debug("Copying attachment file from {} to {}", oldPath, newPath); - Path savePath = fileService.copyExistingFileToTarget(oldPath, newPath); - attachment.setLink(FilePathService.publicPathForActualPathOrThrow(savePath, entityId).toString()); - return attachment; + return savedLecture; } } diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitImportService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitImportService.java new file mode 100644 index 000000000000..0c537eda34bc --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitImportService.java @@ -0,0 +1,175 @@ +package de.tum.cit.aet.artemis.lecture.service; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.net.URI; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; + +@Profile(PROFILE_CORE) +@Service +public class LectureUnitImportService { + + private static final Logger log = LoggerFactory.getLogger(LectureUnitImportService.class); + + private final LectureUnitRepository lectureUnitRepository; + + private final AttachmentRepository attachmentRepository; + + private final FileService fileService; + + private final SlideSplitterService slideSplitterService; + + private final Optional pyrisWebhookService; + + private final Optional irisSettingsRepository; + + public LectureUnitImportService(LectureUnitRepository lectureUnitRepository, AttachmentRepository attachmentRepository, FileService fileService, + SlideSplitterService slideSplitterService, Optional pyrisWebhookService, Optional irisSettingsRepository) { + this.lectureUnitRepository = lectureUnitRepository; + this.attachmentRepository = attachmentRepository; + this.fileService = fileService; + this.slideSplitterService = slideSplitterService; + this.pyrisWebhookService = pyrisWebhookService; + this.irisSettingsRepository = irisSettingsRepository; + } + + /** + * This function imports the lecture units from the {@code importedLecture} and appends them to the {@code lecture} + * + * @param importedLecture The original lecture to be copied + * @param lecture The new lecture to which the lecture units are appended + */ + public void importLectureUnits(Lecture importedLecture, Lecture lecture) { + log.debug("Importing lecture units from lecture with Id {}", importedLecture.getId()); + List lectureUnits = new ArrayList<>(); + for (LectureUnit lectureUnit : importedLecture.getLectureUnits()) { + LectureUnit clonedLectureUnit = importLectureUnit(lectureUnit); + if (clonedLectureUnit != null) { + clonedLectureUnit.setLecture(lecture); + lectureUnits.add(clonedLectureUnit); + } + } + lecture.setLectureUnits(lectureUnits); + lectureUnitRepository.saveAll(lectureUnits); + + // Send lectures to pyris + if (pyrisWebhookService.isPresent() && irisSettingsRepository.isPresent()) { + pyrisWebhookService.get().autoUpdateAttachmentUnitsInPyris(lecture.getCourse().getId(), + lectureUnits.stream().filter(lectureUnit -> lectureUnit instanceof AttachmentUnit).map(lectureUnit -> (AttachmentUnit) lectureUnit).toList()); + } + } + + /** + * This function imports the {@code importedLectureUnit} and returns it + * + * @param importedLectureUnit The original lecture unit to be copied + * @return The imported lecture unit + */ + public LectureUnit importLectureUnit(final LectureUnit importedLectureUnit) { + log.debug("Creating a new LectureUnit from lecture unit {}", importedLectureUnit); + + switch (importedLectureUnit) { + case TextUnit importedTextUnit -> { + TextUnit textUnit = new TextUnit(); + textUnit.setName(importedTextUnit.getName()); + textUnit.setReleaseDate(importedTextUnit.getReleaseDate()); + textUnit.setContent(importedTextUnit.getContent()); + + return lectureUnitRepository.save(textUnit); + } + case VideoUnit importedVideoUnit -> { + VideoUnit videoUnit = new VideoUnit(); + videoUnit.setName(importedVideoUnit.getName()); + videoUnit.setReleaseDate(importedVideoUnit.getReleaseDate()); + videoUnit.setDescription(importedVideoUnit.getDescription()); + videoUnit.setSource(importedVideoUnit.getSource()); + + return lectureUnitRepository.save(videoUnit); + } + case AttachmentUnit importedAttachmentUnit -> { + // Create and save the attachment unit, then the attachment itself, as the id is needed for file handling + AttachmentUnit attachmentUnit = new AttachmentUnit(); + attachmentUnit.setDescription(importedAttachmentUnit.getDescription()); + attachmentUnit = lectureUnitRepository.save(attachmentUnit); + + Attachment attachment = importAttachment(attachmentUnit.getId(), importedAttachmentUnit.getAttachment()); + attachment.setAttachmentUnit(attachmentUnit); + attachmentRepository.save(attachment); + if (attachment.getLink().endsWith(".pdf")) { + slideSplitterService.splitAttachmentUnitIntoSingleSlides(attachmentUnit); + } + attachmentUnit.setAttachment(attachment); + return attachmentUnit; + } + case OnlineUnit importedOnlineUnit -> { + OnlineUnit onlineUnit = new OnlineUnit(); + onlineUnit.setName(importedOnlineUnit.getName()); + onlineUnit.setReleaseDate(importedOnlineUnit.getReleaseDate()); + onlineUnit.setDescription(importedOnlineUnit.getDescription()); + onlineUnit.setSource(importedOnlineUnit.getSource()); + + return lectureUnitRepository.save(onlineUnit); + } + case ExerciseUnit ignored -> { + // TODO: Import exercises and link them to the exerciseUnit + // We have a dedicated exercise import system, so this is left out for now + return null; + } + default -> throw new IllegalArgumentException("Unknown lecture unit type: " + importedLectureUnit.getClass()); + } + } + + /** + * This function imports the {@code importedAttachment}, and duplicates its file and returns it + * + * @param entityId The id of the new entity to which the attachment is linked + * @param importedAttachment The original attachment to be copied + * @return The imported attachment with the file also duplicated to the temp directory on disk + */ + public Attachment importAttachment(Long entityId, final Attachment importedAttachment) { + log.debug("Creating a new Attachment from attachment {}", importedAttachment); + + Attachment attachment = new Attachment(); + attachment.setName(importedAttachment.getName()); + attachment.setUploadDate(importedAttachment.getUploadDate()); + attachment.setReleaseDate(importedAttachment.getReleaseDate()); + attachment.setVersion(importedAttachment.getVersion()); + attachment.setAttachmentType(importedAttachment.getAttachmentType()); + + Path oldPath = FilePathService.actualPathForPublicPathOrThrow(URI.create(importedAttachment.getLink())); + Path newPath; + if (oldPath.toString().contains("/attachment-unit/")) { + newPath = FilePathService.getAttachmentUnitFilePath().resolve(entityId.toString()); + } + else { + newPath = FilePathService.getLectureAttachmentFilePath().resolve(entityId.toString()); + } + log.debug("Copying attachment file from {} to {}", oldPath, newPath); + Path savePath = fileService.copyExistingFileToTarget(oldPath, newPath); + attachment.setLink(FilePathService.publicPathForActualPathOrThrow(savePath, entityId).toString()); + return attachment; + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java index a69bc110de6f..54ae76bf3bad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java @@ -255,8 +255,7 @@ public ResponseEntity importLecture(@PathVariable long sourceLectureId, authCheckService.checkHasAtLeastRoleForLectureElseThrow(Role.EDITOR, sourceLecture, user); authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, destinationCourse, user); - final var savedLecture = lectureImportService.importLecture(sourceLecture, destinationCourse); - channelService.createLectureChannel(savedLecture, Optional.empty()); + final var savedLecture = lectureImportService.importLecture(sourceLecture, destinationCourse, true); return ResponseEntity.created(new URI("/api/lectures/" + savedLecture.getId())).body(savedLecture); } diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/admin/AdminLtiConfigurationResource.java index 654facd44302..0b5d3f71c2f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/admin/AdminLtiConfigurationResource.java @@ -33,6 +33,7 @@ * Handles administrative actions for LTI platforms, including configuration, deletion, and dynamic registration. */ @RestController +@EnforceAdmin @RequestMapping("api/admin/") @Profile(PROFILE_LTI) public class AdminLtiConfigurationResource { @@ -75,7 +76,6 @@ public AdminLtiConfigurationResource(LtiPlatformConfigurationRepository ltiPlatf * @return a {@code ResponseEntity} with an {@code Optional} and HTTP status. */ @GetMapping("lti-platform/{platformId}") - @EnforceAdmin public ResponseEntity getLtiPlatformConfiguration(@PathVariable("platformId") String platformId) { log.debug("REST request to configured lti platform"); LtiPlatformConfiguration platform = ltiPlatformConfigurationRepository.findByIdElseThrow(Long.parseLong(platformId)); @@ -89,7 +89,6 @@ public ResponseEntity getLtiPlatformConfiguration(@Pat * @return a {@code ResponseEntity} with status {@code 200 (OK)} and a header indicating the deletion. */ @DeleteMapping("lti-platform/{platformId}") - @EnforceAdmin public ResponseEntity deleteLtiPlatformConfiguration(@PathVariable("platformId") String platformId) { log.debug("REST request to configured lti platform"); LtiPlatformConfiguration platform = ltiPlatformConfigurationRepository.findByIdElseThrow(Long.parseLong(platformId)); @@ -105,7 +104,6 @@ public ResponseEntity deleteLtiPlatformConfiguration(@PathVariable("platfo * or with status 400 (Bad Request) if the provided platform configuration is invalid (e.g., missing ID) */ @PutMapping("lti-platform") - @EnforceAdmin public ResponseEntity updateLtiPlatformConfiguration(@RequestBody LtiPlatformConfiguration platform) { log.debug("REST request to update configured lti platform"); @@ -125,7 +123,6 @@ public ResponseEntity updateLtiPlatformConfiguration(@RequestBody LtiPlatf * or with status 400 (Bad Request) if the provided platform configuration is invalid (e.g., missing ID) */ @PostMapping("lti-platform") - @EnforceAdmin public ResponseEntity addLtiPlatformConfiguration(@RequestBody LtiPlatformConfiguration platform) { log.debug("REST request to add new lti platform"); @@ -147,7 +144,6 @@ public ResponseEntity addLtiPlatformConfiguration(@RequestBody LtiPlatform * @return a {@link ResponseEntity} with status 200 (OK) if the dynamic registration process was successful. */ @PostMapping("lti13/dynamic-registration") - @EnforceAdmin public ResponseEntity lti13DynamicRegistration(@RequestParam(name = "openid_configuration") String openIdConfiguration, @RequestParam(name = "registration_token", required = false) String registrationToken) { diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java index f6e80c0c17b2..626bb3c86694 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java @@ -6,6 +6,7 @@ import java.time.ZonedDateTime; import java.util.List; import java.util.Optional; +import java.util.Set; import jakarta.validation.constraints.NotNull; @@ -16,6 +17,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.NoUniqueQueryException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -54,9 +56,10 @@ public interface ModelingExerciseRepository extends ArtemisJpaRepository findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(@Param("exerciseId") Long exerciseId); + Optional findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigAndGradingCriteria(@Param("exerciseId") Long exerciseId); /** * Get all modeling exercises that need to be scheduled: Those must satisfy one of the following requirements: @@ -94,6 +97,31 @@ public interface ModelingExerciseRepository extends ArtemisJpaRepository findWithStudentParticipationsSubmissionsResultsById(Long exerciseId); + @Query(""" + SELECT m + FROM ModelingExercise m + LEFT JOIN FETCH m.competencies + WHERE m.title = :title + AND m.course.id = :courseId + """) + Set findAllWithCompetenciesByTitleAndCourseId(@Param("title") String title, @Param("courseId") long courseId); + + /** + * Finds a modeling exercise by its title and course id and throws a NoUniqueQueryException if multiple exercises are found. + * + * @param title the title of the exercise + * @param courseId the id of the course + * @return the exercise with the given title and course id + * @throws NoUniqueQueryException if multiple exercises are found with the same title + */ + default Optional findUniqueWithCompetenciesByTitleAndCourseId(String title, long courseId) throws NoUniqueQueryException { + Set allExercises = findAllWithCompetenciesByTitleAndCourseId(title, courseId); + if (allExercises.size() > 1) { + throw new NoUniqueQueryException("Found multiple exercises with title " + title + " in course with id " + courseId); + } + return allExercises.stream().findFirst(); + } + @NotNull default ModelingExercise findWithEagerExampleSubmissionsAndCompetenciesByIdElseThrow(long exerciseId) { return getValueElseThrow(findWithEagerExampleSubmissionsAndCompetenciesById(exerciseId), exerciseId); @@ -106,7 +134,7 @@ default ModelingExercise findWithEagerExampleSubmissionsAndCompetenciesAndPlagia @NotNull default ModelingExercise findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigElseThrow(long exerciseId) { - return getValueElseThrow(findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(exerciseId), exerciseId); + return getValueElseThrow(findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigAndGradingCriteria(exerciseId), exerciseId); } @NotNull diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java index 320d041325e9..c8b4285de3b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java @@ -131,12 +131,10 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu } // if athena results are present, then create a new submission on submit - if (modelingSubmission.getParticipation() != null && modelingSubmission.getParticipation().getResults() != null - && !modelingSubmission.getParticipation().getResults().isEmpty()) { - log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin()); + // If results exist for this submission, create a new submission by setting the ID to null + if (modelingSubmission.getId() != null && resultRepository.existsBySubmissionId(modelingSubmission.getId())) { modelingSubmission.setId(null); } - modelingSubmission = save(modelingSubmission, exercise, user, participation); return modelingSubmission; } diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java index e48f94b8e955..501309aea8e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java @@ -126,7 +126,6 @@ public ResponseEntity createModelingSubmission(@PathVariable @PutMapping("exercises/{exerciseId}/modeling-submissions") @EnforceAtLeastStudent public ResponseEntity updateModelingSubmission(@PathVariable long exerciseId, @Valid @RequestBody ModelingSubmission modelingSubmission) { - log.debug("REST request to update modeling submission: {}", modelingSubmission.getModel()); if (modelingSubmission.getId() == null) { return createModelingSubmission(exerciseId, modelingSubmission); } diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/admin/AdminModelingExerciseResource.java index 215ea0a05293..cf3c6d2ee627 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/admin/AdminModelingExerciseResource.java @@ -25,6 +25,7 @@ * REST controller for administrating ModelingExercise. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminModelingExerciseResource { @@ -59,7 +60,6 @@ public AdminModelingExerciseResource(ModelingExerciseRepository modelingExercise * @return the ResponseEntity with status 200 (OK) */ @GetMapping("modeling-exercises/{exerciseId}/check-clusters") - @EnforceAdmin public ResponseEntity checkClusters(@PathVariable Long exerciseId) { log.info("REST request to check clusters of ModelingExercise : {}", exerciseId); int clusterCount = modelClusterRepository.countByExerciseIdWithEagerElements(exerciseId); @@ -73,7 +73,6 @@ public ResponseEntity checkClusters(@PathVariable Long exerciseId) { * @return the ResponseEntity with status 200 (OK) */ @DeleteMapping("modeling-exercises/{exerciseId}/clusters") - @EnforceAdmin public ResponseEntity deleteModelingExerciseClustersAndElements(@PathVariable Long exerciseId) { log.info("REST request to delete ModelingExercise : {}", exerciseId); var modelingExercise = modelingExerciseRepository.findByIdElseThrow(exerciseId); @@ -91,7 +90,6 @@ public ResponseEntity deleteModelingExerciseClustersAndElements(@PathVaria * @return the ResponseEntity with status 200 (OK) */ @PostMapping("modeling-exercises/{exerciseId}/trigger-automatic-assessment") - @EnforceAdmin public ResponseEntity triggerAutomaticAssessment(@PathVariable Long exerciseId) { instanceMessageSendService.sendModelingExerciseInstantClustering(exerciseId); return ResponseEntity.ok().build(); diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java index a3c2cec8e9df..ea6ebfdf3b81 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java @@ -32,10 +32,13 @@ import de.jplag.clustering.ClusteringOptions; import de.jplag.exceptions.ExitException; import de.jplag.java.JavaLanguage; +import de.jplag.javascript.JavaScriptLanguage; import de.jplag.kotlin.KotlinLanguage; import de.jplag.options.JPlagOptions; import de.jplag.python3.PythonLanguage; import de.jplag.reporting.reportobject.ReportObjectFactory; +import de.jplag.rlang.RLanguage; +import de.jplag.rust.RustLanguage; import de.jplag.swift.SwiftLanguage; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.GitException; @@ -308,13 +311,17 @@ public void deleteTempLocalRepository(Repository repository) { private Language getJPlagProgrammingLanguage(ProgrammingExercise programmingExercise) { return switch (programmingExercise.getProgrammingLanguage()) { - case JAVA -> new JavaLanguage(); case C -> new CLanguage(); + case JAVA -> new JavaLanguage(); + case JAVASCRIPT -> new JavaScriptLanguage(); + case KOTLIN -> new KotlinLanguage(); case PYTHON -> new PythonLanguage(); + case R -> new RLanguage(); + case RUST -> new RustLanguage(); case SWIFT -> new SwiftLanguage(); - case KOTLIN -> new KotlinLanguage(); - default -> throw new BadRequestAlertException("Programming language " + programmingExercise.getProgrammingLanguage() + " not supported for plagiarism check.", - "ProgrammingExercise", "notSupported"); + case EMPTY, PHP, DART, HASKELL, ASSEMBLER, OCAML, C_SHARP, C_PLUS_PLUS, SQL, TYPESCRIPT, GO, MATLAB, BASH, VHDL, RUBY, POWERSHELL, ADA -> + throw new BadRequestAlertException("Programming language " + programmingExercise.getProgrammingLanguage() + " not supported for plagiarism check.", + "ProgrammingExercise", "notSupported"); }; } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/AuthenticationMechanism.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AuthenticationMechanism.java index 3caec801ed53..239ef3674d44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/AuthenticationMechanism.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AuthenticationMechanism.java @@ -20,5 +20,5 @@ public enum AuthenticationMechanism { /** * The user used the artemis client code editor to authenticate to the LocalVC */ - CODE_EDITOR + CODE_EDITOR, } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java index df7911670a22..c2a4666c7c1b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java @@ -712,8 +712,7 @@ private boolean checkForRatedAndAssessedResult(Result result) { * @return true if the result is manual and the assessment is over, or it is an automatic result, false otherwise */ private boolean checkForAssessedResult(Result result) { - return result.getCompletionDate() != null - && ((result.isManual() && ExerciseDateService.isAfterAssessmentDueDate(this)) || result.isAutomatic() || result.isAthenaAutomatic()); + return result.getCompletionDate() != null && ((result.isManual() && ExerciseDateService.isAfterAssessmentDueDate(this)) || result.isAutomatic() || result.isAthenaBased()); } @Override diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java index e8b5e554c37d..a5ada6708999 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java @@ -49,7 +49,13 @@ public class ProgrammingExerciseBuildConfig extends DomainObject { private boolean checkoutSolutionRepository = false; @Column(name = "checkout_path") - private String checkoutPath; + private String testCheckoutPath; + + @Column(name = "assignment_checkout_path") + private String assignmentCheckoutPath; + + @Column(name = "solution_checkout_path") + private String solutionCheckoutPath; @Column(name = "timeout_seconds") private int timeoutSeconds; @@ -85,7 +91,9 @@ public ProgrammingExerciseBuildConfig() { public ProgrammingExerciseBuildConfig(ProgrammingExerciseBuildConfig originalBuildConfig) { this.setBranch(originalBuildConfig.getBranch()); this.setBuildPlanConfiguration(originalBuildConfig.getBuildPlanConfiguration()); - this.setCheckoutPath(originalBuildConfig.getCheckoutPath()); + this.setTestCheckoutPath(originalBuildConfig.getTestCheckoutPath()); + this.setAssignmentCheckoutPath(originalBuildConfig.getAssignmentCheckoutPath()); + this.setSolutionCheckoutPath(originalBuildConfig.getSolutionCheckoutPath()); this.setCheckoutSolutionRepository(originalBuildConfig.getCheckoutSolutionRepository()); this.setDockerFlags(originalBuildConfig.getDockerFlags()); this.setSequentialTestRuns(originalBuildConfig.hasSequentialTestRuns()); @@ -166,12 +174,12 @@ public void setCheckoutSolutionRepository(boolean checkoutSolutionRepository) { this.checkoutSolutionRepository = checkoutSolutionRepository; } - public String getCheckoutPath() { - return checkoutPath; + public String getTestCheckoutPath() { + return testCheckoutPath; } - public void setCheckoutPath(String checkoutPath) { - this.checkoutPath = checkoutPath; + public void setTestCheckoutPath(String testCheckoutPath) { + this.testCheckoutPath = testCheckoutPath; } public int getTimeoutSeconds() { @@ -268,11 +276,27 @@ public void generateAndSetBuildPlanAccessSecret() { buildPlanAccessSecret = UUID.randomUUID().toString(); } + public String getAssignmentCheckoutPath() { + return assignmentCheckoutPath; + } + + public void setAssignmentCheckoutPath(String assignmentCheckoutPath) { + this.assignmentCheckoutPath = assignmentCheckoutPath; + } + + public String getSolutionCheckoutPath() { + return solutionCheckoutPath; + } + + public void setSolutionCheckoutPath(String solutionCheckoutPath) { + this.solutionCheckoutPath = solutionCheckoutPath; + } + @Override public String toString() { return "BuildJobConfig{" + "id=" + getId() + ", sequentialTestRuns=" + sequentialTestRuns + ", branch='" + branch + '\'' + ", buildPlanConfiguration='" + buildPlanConfiguration + '\'' + ", buildScript='" + buildScript + '\'' + ", checkoutSolutionRepository=" + checkoutSolutionRepository + ", checkoutPath='" - + checkoutPath + '\'' + ", timeoutSeconds=" + timeoutSeconds + ", dockerFlags='" + dockerFlags + '\'' + ", testwiseCoverageEnabled=" + testwiseCoverageEnabled + + testCheckoutPath + '\'' + ", timeoutSeconds=" + timeoutSeconds + ", dockerFlags='" + dockerFlags + '\'' + ", testwiseCoverageEnabled=" + testwiseCoverageEnabled + ", theiaImage='" + theiaImage + '\'' + ", allowBranching=" + allowBranching + ", branchRegex='" + branchRegex + '\'' + '}'; } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingLanguage.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingLanguage.java index 4206bfe15dbc..781ad04f98c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingLanguage.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingLanguage.java @@ -38,18 +38,19 @@ public enum ProgrammingLanguage { PHP("php"); private static final Set ENABLED_LANGUAGES = Set.of( - EMPTY, - JAVA, - PYTHON, + ASSEMBLER, C, HASKELL, + JAVA, + JAVASCRIPT, KOTLIN, - VHDL, - ASSEMBLER, - SWIFT, OCAML, + PYTHON, + R, RUST, - JAVASCRIPT + SWIFT, + VHDL, + EMPTY ); // @formatter:on diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 7c341585f60f..d7a5e662c744 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -89,4 +89,19 @@ default BuildJob findByBuildJobIdElseThrow(String buildJobId) { return getValueElseThrow(findByBuildJobId(buildJobId)); } + /** + * Get the number of build jobs for a list of exercise ids. + * + * @param exerciseIds the list of exercise ids + * @return the number of build jobs + */ + @Query(""" + SELECT COUNT(b) + FROM BuildJob b + LEFT JOIN Result r ON b.result.id = r.id + LEFT JOIN Participation p ON r.participation.id = p.id + LEFT JOIN Exercise e ON p.exercise.id = e.id + WHERE e.id IN :exerciseIds + """) + long countBuildJobsByExerciseIds(@Param("exerciseIds") List exerciseIds); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 370c191e0ac0..579d714b18a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -116,6 +116,8 @@ Optional findWithTemplateAndSolutionParticipationTeamAssign List findAllByProjectKey(String projectKey); + List findAllByCourseId(Long courseId); + @EntityGraph(type = LOAD, attributePaths = "submissionPolicy") List findWithSubmissionPolicyByProjectKey(String projectKey); @@ -226,26 +228,6 @@ default ProgrammingExercise findOneByProjectKeyOrThrow(String projectKey, boolea """) List findAllByRecentExamEndDate(@Param("endDate1") ZonedDateTime endDate1, @Param("endDate2") ZonedDateTime endDate2); - @Query(""" - SELECT DISTINCT pe - FROM ProgrammingExercise pe - LEFT JOIN FETCH pe.studentParticipations - WHERE pe.dueDate IS NOT NULL - AND :endDate1 <= pe.dueDate - AND pe.dueDate <= :endDate2 - """) - List findAllWithStudentParticipationByRecentDueDate(@Param("endDate1") ZonedDateTime endDate1, @Param("endDate2") ZonedDateTime endDate2); - - @Query(""" - SELECT DISTINCT pe - FROM ProgrammingExercise pe - LEFT JOIN FETCH pe.studentParticipations - WHERE pe.exerciseGroup IS NOT NULL - AND :endDate1 <= pe.exerciseGroup.exam.endDate - AND pe.exerciseGroup.exam.endDate <= :endDate2 - """) - List findAllWithStudentParticipationByRecentExamEndDate(@Param("endDate1") ZonedDateTime endDate1, @Param("endDate2") ZonedDateTime endDate2); - @EntityGraph(type = LOAD, attributePaths = { "studentParticipations", "studentParticipations.team", "studentParticipations.team.students" }) Optional findWithEagerStudentParticipationsById(long exerciseId); @@ -347,9 +329,34 @@ Optional findByIdWithEagerTestCasesStaticCodeAnalysisCatego LEFT JOIN FETCH p.buildConfig WHERE p.id = :exerciseId """) - Optional findByIdWithEagerBuildConfigTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxRepos( + Optional findByIdWithEagerBuildConfigTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndSolutionEntriesAndBuildConfig( @Param("exerciseId") long exerciseId); + default ProgrammingExercise findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndBuildConfigElseThrow(long exerciseId) + throws EntityNotFoundException { + return getValueElseThrow(findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndBuildConfig(exerciseId), exerciseId); + } + + @Query(""" + SELECT p + FROM ProgrammingExercise p + LEFT JOIN FETCH p.testCases tc + LEFT JOIN FETCH p.staticCodeAnalysisCategories + LEFT JOIN FETCH p.exerciseHints + LEFT JOIN FETCH p.templateParticipation + LEFT JOIN FETCH p.solutionParticipation + LEFT JOIN FETCH p.auxiliaryRepositories + LEFT JOIN FETCH tc.solutionEntries + LEFT JOIN FETCH p.buildConfig + LEFT JOIN FETCH p.plagiarismDetectionConfig + WHERE p.id = :exerciseId + """) + Optional findByIdForImport(@Param("exerciseId") long exerciseId); + + default ProgrammingExercise findByIdForImportElseThrow(long exerciseId) throws EntityNotFoundException { + return getValueElseThrow(findByIdForImport(exerciseId), exerciseId); + } + /** * Returns all programming exercises that have a due date after {@code now} and have tests marked with * {@link Visibility#AFTER_DUE_DATE} but no buildAndTestStudentSubmissionsAfterDueDate. @@ -537,6 +544,24 @@ SELECT COUNT (DISTINCT p) """) Optional findByIdWithGradingCriteria(@Param("exerciseId") long exerciseId); + @Query(""" + SELECT e + FROM ProgrammingExercise e + LEFT JOIN FETCH e.competencies + WHERE e.title = :title + AND e.course.id = :courseId + """) + Optional findWithCompetenciesByTitleAndCourseId(@Param("title") String title, @Param("courseId") long courseId); + + @Query(""" + SELECT e + FROM ProgrammingExercise e + LEFT JOIN FETCH e.competencies + WHERE e.shortName = :shortName + AND e.course.id = :courseId + """) + Optional findByShortNameAndCourseIdWithCompetencies(@Param("shortName") String shortName, @Param("courseId") long courseId); + default ProgrammingExercise findByIdWithGradingCriteriaElseThrow(long exerciseId) { return getValueElseThrow(findByIdWithGradingCriteria(exerciseId), exerciseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java index 8929c407336b..3739ed8dff71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java @@ -9,6 +9,8 @@ import java.util.Optional; import org.springframework.context.annotation.Profile; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -162,6 +164,21 @@ List findWithSubmissionsByExerciseIdAnd Optional findWithSubmissionsByExerciseIdAndStudentLoginAndTestRun(@Param("exerciseId") long exerciseId, @Param("username") String username, @Param("testRun") boolean testRun); + @Query(""" + SELECT participation.repositoryUri + FROM ProgrammingExerciseStudentParticipation participation + JOIN TREAT (participation.exercise AS ProgrammingExercise) pe + LEFT JOIN pe.exerciseGroup eg + LEFT JOIN eg.exam exam + WHERE participation.repositoryUri IS NOT NULL + AND ( + (pe.dueDate IS NOT NULL AND pe.dueDate BETWEEN :earliestDate AND :latestDate) + OR (eg IS NOT NULL AND exam IS NOT NULL AND exam.endDate BETWEEN :earliestDate AND :latestDate) + ) + """) + Page findRepositoryUrisByRecentDueDateOrRecentExamEndDate(@Param("earliestDate") ZonedDateTime earliestDate, @Param("latestDate") ZonedDateTime latestDate, + Pageable pageable); + @Query(""" SELECT participation FROM ProgrammingExerciseStudentParticipation participation diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java index e1ba117d2148..f1989c28865c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java @@ -3,6 +3,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static java.time.ZonedDateTime.now; +import java.net.URISyntaxException; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; import java.util.HashSet; @@ -16,6 +17,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @@ -25,6 +28,7 @@ import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; @@ -44,6 +48,8 @@ public class AutomaticProgrammingExerciseCleanupService { private final GitService gitService; + private static final int STUDENT_PARTICIPATION_CLEANUP_BATCH_SIZE = 500; + @Value("${artemis.external-system-request.batch-size}") private int externalSystemRequestBatchSize; @@ -82,49 +88,68 @@ public void cleanup() { log.error("Exception occurred during cleanupBuildPlansOnContinuousIntegrationServer", ex); } try { - cleanupGitRepositoriesOnArtemisServer(); + cleanupGitWorkingCopiesOnArtemisServer(); } catch (Exception ex) { - log.error("Exception occurred during cleanupGitRepositoriesOnArtemisServer", ex); + log.error("Exception occurred during cleanupGitWorkingCopiesOnArtemisServer", ex); } } /** * cleans up old local git repositories on the Artemis server */ - public void cleanupGitRepositoriesOnArtemisServer() { + public void cleanupGitWorkingCopiesOnArtemisServer() { SecurityUtils.setAuthorizationObject(); log.info("Cleanup git repositories on Artemis server"); // we are specifically interested in exercises older than 8 weeks - var endDate2 = ZonedDateTime.now().minusWeeks(8).truncatedTo(ChronoUnit.DAYS); + var latestDate = ZonedDateTime.now().minusWeeks(8).truncatedTo(ChronoUnit.DAYS); // NOTE: for now we would like to cover more cases to also cleanup older repositories - var endDate1 = endDate2.minusYears(1).truncatedTo(ChronoUnit.DAYS); - - // Cleanup all student repos in the REPOS folder (based on the student participations) 8 weeks after the exercise due date - log.info("Search for exercises with due date from {} until {}", endDate1, endDate2); - var programmingExercises = programmingExerciseRepository.findAllWithStudentParticipationByRecentDueDate(endDate1, endDate2); - programmingExercises.addAll(programmingExerciseRepository.findAllWithStudentParticipationByRecentExamEndDate(endDate1, endDate2)); - log.info("Found {} programming exercises {} to clean {} local student repositories", programmingExercises.size(), - programmingExercises.stream().map(ProgrammingExercise::getProjectKey).collect(Collectors.joining(", ")), - programmingExercises.stream().mapToLong(programmingExercise -> programmingExercise.getStudentParticipations().size()).sum()); - for (var programmingExercise : programmingExercises) { - for (var studentParticipation : programmingExercise.getStudentParticipations()) { - var programmingExerciseParticipation = (ProgrammingExerciseStudentParticipation) studentParticipation; - gitService.deleteLocalRepository(programmingExerciseParticipation.getVcsRepositoryUri()); - } - } + var earliestDate = latestDate.minusYears(1).truncatedTo(ChronoUnit.DAYS); + + // Cleanup all student repos in the REPOS folder (based on the student participations) 8 weeks after the exercise due date or exam end date + cleanStudentParticipationsRepositories(earliestDate, latestDate); // Cleanup template, tests and solution repos in the REPOS folder 8 weeks after the course or exam is over - log.info("Search for exercises with course or exam date from {} until {}", endDate1, endDate2); - programmingExercises = programmingExerciseRepository.findAllByRecentCourseEndDate(endDate1, endDate2); - programmingExercises.addAll(programmingExerciseRepository.findAllByRecentExamEndDate(endDate1, endDate2)); + log.info("Search for exercises with course or exam date from {} until {}", earliestDate, latestDate); + var programmingExercises = programmingExerciseRepository.findAllByRecentCourseEndDate(earliestDate, latestDate); + programmingExercises.addAll(programmingExerciseRepository.findAllByRecentExamEndDate(earliestDate, latestDate)); log.info("Found {} programming exercise to clean local template, test and solution: {}", programmingExercises.size(), programmingExercises.stream().map(ProgrammingExercise::getProjectKey).collect(Collectors.joining(", "))); - for (var programmingExercise : programmingExercises) { - gitService.deleteLocalRepository(programmingExercise.getVcsTemplateRepositoryUri()); - gitService.deleteLocalRepository(programmingExercise.getVcsSolutionRepositoryUri()); - gitService.deleteLocalRepository(programmingExercise.getVcsTestRepositoryUri()); - gitService.deleteLocalProgrammingExerciseReposFolder(programmingExercise); + if (!programmingExercises.isEmpty()) { + for (var programmingExercise : programmingExercises) { + gitService.deleteLocalRepository(programmingExercise.getVcsTemplateRepositoryUri()); + gitService.deleteLocalRepository(programmingExercise.getVcsSolutionRepositoryUri()); + gitService.deleteLocalRepository(programmingExercise.getVcsTestRepositoryUri()); + gitService.deleteLocalProgrammingExerciseReposFolder(programmingExercise); + } + log.info("Finished cleaning local template, test and solution repositories"); + } + } + + private void cleanStudentParticipationsRepositories(ZonedDateTime earliestDate, ZonedDateTime latestDate) { + log.info("Search for exercises with due date from {} until {}", earliestDate, latestDate); + // Get all relevant participation ids + Pageable pageable = Pageable.ofSize(STUDENT_PARTICIPATION_CLEANUP_BATCH_SIZE); + Page uriBatch = programmingExerciseStudentParticipationRepository.findRepositoryUrisByRecentDueDateOrRecentExamEndDate(earliestDate, latestDate, pageable); + log.info("Found {} student participations to clean local student repositories in {} batches.", uriBatch.getTotalElements(), uriBatch.getTotalPages()); + if (uriBatch.getTotalElements() > 0) { + uriBatch.forEach(this::deleteLocalRepositoryByUriString); + while (!uriBatch.isLast()) { + uriBatch = programmingExerciseStudentParticipationRepository.findRepositoryUrisByRecentDueDateOrRecentExamEndDate(earliestDate, latestDate, + uriBatch.nextPageable()); + uriBatch.forEach(this::deleteLocalRepositoryByUriString); + } + log.info("Finished cleaning local student repositories"); + } + } + + private void deleteLocalRepositoryByUriString(String uri) { + try { + VcsRepositoryUri vcsRepositoryUrl = new VcsRepositoryUri(uri); + gitService.deleteLocalRepository(vcsRepositoryUrl); + } + catch (URISyntaxException e) { + log.error("Cannot create URI for repositoryUri: {}", uri, e); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java index 7d9a21297e75..23aa653d7301 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.programming.service; +import static de.tum.cit.aet.artemis.core.config.Constants.ALLOWED_CHECKOUT_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; @@ -7,7 +8,6 @@ import java.util.Map; import java.util.Objects; import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -27,8 +27,6 @@ public class AuxiliaryRepositoryService { private static final String AUX_REPO_ENTITY_NAME = "programmingExercise"; - private static final Pattern ALLOWED_CHECKOUT_DIRECTORY = Pattern.compile("[\\w-]+(/[\\w-]+)*$"); - private final AuxiliaryRepositoryRepository auxiliaryRepositoryRepository; public AuxiliaryRepositoryService(AuxiliaryRepositoryRepository auxiliaryRepositoryRepository) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java index db9e37239d9e..487c92b3c21d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java @@ -10,6 +10,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -18,6 +19,8 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -39,14 +42,17 @@ public class BuildScriptProviderService { private final Map scriptCache = new ConcurrentHashMap<>(); + private final ProfileService profileService; + /** * Constructor for BuildScriptProvider, which loads all scripts into the cache to speed up retrieval * during the runtime of the application * * @param resourceLoaderService resourceLoaderService */ - public BuildScriptProviderService(ResourceLoaderService resourceLoaderService) { + public BuildScriptProviderService(ResourceLoaderService resourceLoaderService, ProfileService profileService) { this.resourceLoaderService = resourceLoaderService; + this.profileService = profileService; } /** @@ -69,6 +75,9 @@ public void cacheOnBoot() { String uniqueKey = directory + "_" + filename; byte[] fileContent = IOUtils.toByteArray(resource.getInputStream()); String script = new String(fileContent, StandardCharsets.UTF_8); + if (!profileService.isLocalCiActive()) { + script = replacePlaceholders(script, null, null, null); + } scriptCache.put(uniqueKey, script); } catch (IOException e) { @@ -112,6 +121,9 @@ public String getScriptFor(ProgrammingLanguage programmingLanguage, Optional projectType, Boolean stati } return String.join("_", fileNameComponents) + "." + fileExtension; } + + /** + * Replaces placeholders in the given result paths with the actual paths. + * + * @param resultPaths the result paths to replace the placeholders in + * @param buildConfig the build configuration containing the actual paths + * @return the result paths with the placeholders replaced + */ + public List replaceResultPathsPlaceholders(List resultPaths, ProgrammingExerciseBuildConfig buildConfig) { + List replacedResultPaths = new ArrayList<>(); + for (String resultPath : resultPaths) { + String replacedResultPath = replacePlaceholders(resultPath, buildConfig.getAssignmentCheckoutPath(), buildConfig.getSolutionCheckoutPath(), + buildConfig.getTestCheckoutPath()); + replacedResultPaths.add(replacedResultPath); + } + return replacedResultPaths; + } + + /** + * Replaces placeholders in the given original string with the actual paths. + * + * @param originalString the original string to replace the placeholders in + * @param assignmentRepo the assignment repository name + * @param solutionRepo the solution repository name + * @param testRepo the test repository name + * @return the original string with the placeholders replaced + */ + public String replacePlaceholders(String originalString, String assignmentRepo, String solutionRepo, String testRepo) { + assignmentRepo = !StringUtils.isBlank(assignmentRepo) ? assignmentRepo : Constants.ASSIGNMENT_REPO_NAME; + solutionRepo = solutionRepo != null && !solutionRepo.isBlank() ? solutionRepo : Constants.SOLUTION_REPO_NAME; + testRepo = testRepo != null && !testRepo.isBlank() ? testRepo : Constants.TEST_REPO_NAME; + + String replacedResultPath = originalString.replace(Constants.ASSIGNMENT_REPO_PARENT_PLACEHOLDER, assignmentRepo); + replacedResultPath = replacedResultPath.replace(Constants.ASSIGNMENT_REPO_PLACEHOLDER, "/" + assignmentRepo + "/src"); + replacedResultPath = replacedResultPath.replace(Constants.SOLUTION_REPO_PLACEHOLDER, solutionRepo); + replacedResultPath = replacedResultPath.replace(Constants.TEST_REPO_PLACEHOLDER, testRepo); + return replacedResultPath; + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java index 8c92446d22d0..935a3412b10e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java @@ -4,6 +4,7 @@ import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; +import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -11,6 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -59,6 +61,9 @@ public class ProgrammingExerciseCodeReviewFeedbackService { private final ProgrammingMessagingService programmingMessagingService; + @Value("${artemis.athena.allowed-feedback-attempts:20}") + private int allowedFeedbackAttempts; + public ProgrammingExerciseCodeReviewFeedbackService(GroupNotificationService groupNotificationService, Optional athenaFeedbackSuggestionsService, SubmissionService submissionService, ResultService resultService, ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository, ResultRepository resultRepository, @@ -111,14 +116,14 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici var submissionOptional = programmingExerciseParticipationService.findProgrammingExerciseParticipationWithLatestSubmissionAndResult(participation.getId()) .findLatestSubmission(); if (submissionOptional.isEmpty()) { - throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission"); + throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmissionExists"); } var submission = submissionOptional.get(); // save result and transmit it over websockets to notify the client about the status var automaticResult = this.submissionService.saveNewEmptyResult(submission); automaticResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA); - automaticResult.setRated(false); + automaticResult.setRated(true); // we want to use this feedback to give the grade in the future automaticResult.setScore(100.0); automaticResult.setSuccessful(null); automaticResult.setCompletionDate(ZonedDateTime.now().plusMinutes(5)); // we do not want to show dates without a completion date, but we want the students to know their @@ -127,7 +132,6 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici try { - setIndividualDueDateAndLockRepository(participation, programmingExercise, false); this.programmingMessagingService.notifyUserAboutNewResult(automaticResult, participation); // now the client should be able to see new result @@ -158,9 +162,10 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici feedback.setDetailText(individualFeedbackItem.description()); feedback.setHasLongFeedbackText(false); feedback.setType(FeedbackType.AUTOMATIC); - feedback.setCredits(0.0); + feedback.setCredits(individualFeedbackItem.credits()); return feedback; - }).toList(); + }).sorted(Comparator.comparing(Feedback::getCredits, Comparator.nullsLast(Comparator.naturalOrder()))).toList(); + ; automaticResult.setSuccessful(true); automaticResult.setCompletionDate(ZonedDateTime.now()); @@ -176,9 +181,6 @@ public void generateAutomaticNonGradedFeedback(ProgrammingExerciseStudentPartici this.resultRepository.save(automaticResult); this.programmingMessagingService.notifyUserAboutNewResult(automaticResult, participation); } - finally { - unlockRepository(participation, programmingExercise); - } } /** @@ -225,15 +227,10 @@ private void checkRateLimitOrThrow(ProgrammingExerciseStudentParticipation parti List athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList(); - long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count(); - long countOfSuccessfulRequests = athenaResults.stream().filter(result -> result.isSuccessful() == Boolean.TRUE).count(); - if (countOfAthenaResultsInProcessOrSuccessful >= 3) { - throw new BadRequestAlertException("Cannot send additional AI feedback requests now. Try again later!", "participation", "preconditions not met"); - } - if (countOfSuccessfulRequests >= 20) { - throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "preconditions not met"); + if (countOfSuccessfulRequests >= this.allowedFeedbackAttempts) { + throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "maxAthenaResultsReached", true); } } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java index db7803c21c22..c302c5f147e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java @@ -17,6 +17,7 @@ import java.util.Optional; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.eclipse.jgit.api.errors.GitAPIException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -662,8 +663,32 @@ void replacePlaceholders(final ProgrammingExercise programmingExercise, final Re replacements.put("${exerciseNamePomXml}", programmingExercise.getTitle().replace(" ", "-")); // Used e.g. in artifactId replacements.put("${exerciseName}", programmingExercise.getTitle()); - replacements.put("${studentWorkingDirectory}", Constants.STUDENT_WORKING_DIRECTORY); replacements.put("${packaging}", programmingExercise.getBuildConfig().hasSequentialTestRuns() ? "pom" : "jar"); + + var buildConfig = programmingExercise.getBuildConfig(); + + // replace checkout directory placeholders + String studentWorkingDirectory = !StringUtils.isBlank(buildConfig.getAssignmentCheckoutPath()) ? buildConfig.getAssignmentCheckoutPath() : Constants.ASSIGNMENT_REPO_NAME; + if (studentWorkingDirectory.startsWith("/")) { + studentWorkingDirectory = studentWorkingDirectory.substring(1); + } + String testWorkingDirectory = buildConfig.getTestCheckoutPath() != null && !buildConfig.getTestCheckoutPath().isBlank() ? buildConfig.getTestCheckoutPath() + : Constants.TEST_REPO_NAME; + String solutionWorkingDirectory = buildConfig.getSolutionCheckoutPath() != null && !buildConfig.getSolutionCheckoutPath().isBlank() ? buildConfig.getSolutionCheckoutPath() + : Constants.SOLUTION_REPO_NAME; + + if (programmingLanguage == ProgrammingLanguage.PYTHON) { + replacements.put(Constants.ASSIGNMENT_REPO_PARENT_PLACEHOLDER, studentWorkingDirectory.replace("/", ".")); + } + else { + replacements.put(Constants.ASSIGNMENT_REPO_PARENT_PLACEHOLDER, studentWorkingDirectory); + } + replacements.put(Constants.ASSIGNMENT_REPO_PLACEHOLDER, "/" + studentWorkingDirectory + "/src"); + replacements.put(Constants.TEST_REPO_PLACEHOLDER, testWorkingDirectory); + replacements.put(Constants.SOLUTION_REPO_PLACEHOLDER, solutionWorkingDirectory); + if ((programmingLanguage == ProgrammingLanguage.JAVA && programmingExercise.getProjectType().isGradle()) || programmingLanguage == ProgrammingLanguage.RUST) { + replacements.put(Constants.ASSIGNMENT_REPO_PLACEHOLDER_NO_SLASH, studentWorkingDirectory + "/src"); + } fileService.replaceVariablesInFileRecursive(repository.getLocalPath().toAbsolutePath(), replacements, List.of("gradle-wrapper.jar")); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index 00e854f1d218..0cbf73da21ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.programming.service; +import static de.tum.cit.aet.artemis.core.config.Constants.ALLOWED_CHECKOUT_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION; import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.TEMPLATE; @@ -362,6 +363,7 @@ public void validateNewProgrammingExerciseSettings(ProgrammingExercise programmi programmingExercise.validateGeneralSettings(); programmingExercise.validateProgrammingSettings(); programmingExercise.validateSettingsForFeedbackRequest(); + validateCustomCheckoutPaths(programmingExercise); auxiliaryRepositoryService.validateAndAddAuxiliaryRepositoriesOfProgrammingExercise(programmingExercise, programmingExercise.getAuxiliaryRepositories()); submissionPolicyService.validateSubmissionPolicyCreation(programmingExercise); @@ -427,6 +429,27 @@ private void validatePackageName(ProgrammingExercise programmingExercise, Progra } } + private void validateCustomCheckoutPaths(ProgrammingExercise programmingExercise) { + var buildConfig = programmingExercise.getBuildConfig(); + + boolean assignmentCheckoutPathIsValid = isValidCheckoutPath(buildConfig.getAssignmentCheckoutPath()); + boolean solutionCheckoutPathIsValid = isValidCheckoutPath(buildConfig.getSolutionCheckoutPath()); + boolean testCheckoutPathIsValid = isValidCheckoutPath(buildConfig.getTestCheckoutPath()); + + if (!assignmentCheckoutPathIsValid || !solutionCheckoutPathIsValid || !testCheckoutPathIsValid) { + throw new BadRequestAlertException("The custom checkout paths are invalid", "Exercise", "checkoutDirectoriesInvalid"); + } + } + + private boolean isValidCheckoutPath(String checkoutPath) { + // Checkout paths are optional for the assignment, solution, and test repositories. If not set, the default path is used. + if (checkoutPath == null) { + return true; + } + Matcher matcher = ALLOWED_CHECKOUT_DIRECTORY.matcher(checkoutPath); + return matcher.matches(); + } + /** * Validates static code analysis settings * @@ -438,6 +461,22 @@ public void validateStaticCodeAnalysisSettings(ProgrammingExercise programmingEx programmingExercise.validateStaticCodeAnalysisSettings(programmingLanguageFeature); } + /** + * Validates the settings of an updated programming exercise. Checks if the custom checkout paths have changed. + * + * @param originalProgrammingExercise The original programming exercise + * @param updatedProgrammingExercise The updated programming exercise + */ + public void validateCheckoutDirectoriesUnchanged(ProgrammingExercise originalProgrammingExercise, ProgrammingExercise updatedProgrammingExercise) { + var originalBuildConfig = originalProgrammingExercise.getBuildConfig(); + var updatedBuildConfig = updatedProgrammingExercise.getBuildConfig(); + if (!Objects.equals(originalBuildConfig.getAssignmentCheckoutPath(), updatedBuildConfig.getAssignmentCheckoutPath()) + || !Objects.equals(originalBuildConfig.getSolutionCheckoutPath(), updatedBuildConfig.getSolutionCheckoutPath()) + || !Objects.equals(originalBuildConfig.getTestCheckoutPath(), updatedBuildConfig.getTestCheckoutPath())) { + throw new BadRequestAlertException("The custom checkout paths cannot be changed!", "programmingExercise", "checkoutDirectoriesChanged"); + } + } + /** * Creates build plans for a new programming exercise. * 1. Create the project for the exercise on the CI Server diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java index ed5dd6cbae45..9833a9ae040b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java @@ -250,27 +250,6 @@ public byte[] getFile(Repository repository, String filename) throws IOException return fileInBytes; } - /** - * Get the mimetype of a single file from the repository - * - * @param repository in which the requested file is located. - * @param filename of the file to be probed. - * @return The mimetype of the file if found or throw an exception. - * @throws IOException if the file can't be found, is corrupt, etc. - */ - public String getFileType(Repository repository, String filename) throws IOException { - Optional file = gitService.getFileByName(repository, filename); - if (file.isEmpty()) { - throw new FileNotFoundException(); - } - String type = Files.probeContentType(file.get().toPath()); - // fallback to text/plain in case content type can not be determined - if (type == null) { - return "text/plain"; - } - return type; - } - /** * Gets the files of the repository and checks whether they were changed during a student participation. * Compares the files from the students' repository with the files of the template repository. @@ -519,8 +498,6 @@ public boolean isClean(VcsRepositoryUri repositoryUri, String defaultBranch) thr public ResponseEntity getFileFromRepository(String filename, Repository repository) throws IOException { byte[] out = getFile(repository, filename); HttpHeaders responseHeaders = new HttpHeaders(); - var contentType = getFileType(repository, filename); - responseHeaders.add("Content-Type", contentType); // Prevent the file from being interpreted as HTML by the browser when opened directly: responseHeaders.setContentDisposition(ContentDisposition.builder("attachment").filename(filename).build()); return new ResponseEntity<>(out, responseHeaders, HttpStatus.OK); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradePolicyService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradePolicyService.java index 16285e6a0695..4c73046b1ab0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradePolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradePolicyService.java @@ -32,8 +32,8 @@ public TemplateUpgradePolicyService(JavaTemplateUpgradeService javaRepositoryUpg public TemplateUpgradeService getUpgradeService(ProgrammingLanguage programmingLanguage) { return switch (programmingLanguage) { case JAVA -> javaRepositoryUpgradeService; - case KOTLIN, PYTHON, C, HASKELL, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST, JAVASCRIPT -> defaultRepositoryUpgradeService; - case C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case KOTLIN, PYTHON, C, HASKELL, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST, JAVASCRIPT, R -> defaultRepositoryUpgradeService; + case C_SHARP, C_PLUS_PLUS, SQL, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException("Unsupported programming language: " + programmingLanguage); }; } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java index 14bde3cf26b1..64321ad3b61d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -46,13 +47,16 @@ public class AeolusTemplateService { private final BuildScriptProviderService buildScriptProviderService; + private final ProfileService profileService; + private static final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory()); public AeolusTemplateService(ProgrammingLanguageConfiguration programmingLanguageConfiguration, ResourceLoaderService resourceLoaderService, - BuildScriptProviderService buildScriptProviderService) { + BuildScriptProviderService buildScriptProviderService, ProfileService profileService) { this.programmingLanguageConfiguration = programmingLanguageConfiguration; this.resourceLoaderService = resourceLoaderService; this.buildScriptProviderService = buildScriptProviderService; + this.profileService = profileService; } /** @@ -76,6 +80,9 @@ public void cacheOnBoot() { String uniqueKey = directory + "_" + filename; byte[] fileContent = IOUtils.toByteArray(resource.getInputStream()); String script = new String(fileContent, StandardCharsets.UTF_8); + if (!profileService.isLocalCiActive()) { + script = buildScriptProviderService.replacePlaceholders(script, null, null, null); + } Windfile windfile = readWindfile(script); this.addInstanceVariablesToWindfile(windfile, ProgrammingLanguage.valueOf(directory.toUpperCase()), optionalProjectType); templateCache.put(uniqueKey, windfile); @@ -140,6 +147,9 @@ public Windfile getWindfileFor(ProgrammingLanguage programmingLanguage, Optional log.error("No windfile found for key {}", uniqueKey); return null; } + if (!profileService.isLocalCiActive()) { + scriptCache = buildScriptProviderService.replacePlaceholders(scriptCache, null, null, null); + } Windfile windfile = readWindfile(scriptCache); this.addInstanceVariablesToWindfile(windfile, programmingLanguage, projectType); templateCache.put(uniqueKey, windfile); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java index b4f67794c073..b9050501c67a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java @@ -219,8 +219,8 @@ enum RepositoryCheckoutPath implements CustomizableCheckoutPath { @Override public String forProgrammingLanguage(ProgrammingLanguage language) { return switch (language) { - case JAVA, PYTHON, C, HASKELL, KOTLIN, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST, JAVASCRIPT -> "assignment"; - case C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVA, PYTHON, C, HASKELL, KOTLIN, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST, JAVASCRIPT, R -> "assignment"; + case C_SHARP, C_PLUS_PLUS, SQL, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException("Unsupported programming language: " + language); }; } @@ -230,9 +230,9 @@ public String forProgrammingLanguage(ProgrammingLanguage language) { @Override public String forProgrammingLanguage(ProgrammingLanguage language) { return switch (language) { - case JAVA, PYTHON, HASKELL, KOTLIN, SWIFT, EMPTY, RUST, JAVASCRIPT -> ""; + case JAVA, PYTHON, HASKELL, KOTLIN, SWIFT, EMPTY, RUST, JAVASCRIPT, R -> ""; case C, VHDL, ASSEMBLER, OCAML -> "tests"; - case C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case C_SHARP, C_PLUS_PLUS, SQL, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException("Unsupported programming language: " + language); }; } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIProgrammingLanguageFeatureService.java index 7cd996e35cc4..0c71114e13bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIProgrammingLanguageFeatureService.java @@ -25,7 +25,7 @@ public class GitLabCIProgrammingLanguageFeatureService extends ProgrammingLangua public GitLabCIProgrammingLanguageFeatureService() { programmingLanguageFeatures.put(EMPTY, new ProgrammingLanguageFeature(EMPTY, false, false, false, false, false, List.of(), false, false)); programmingLanguageFeatures.put(JAVA, new ProgrammingLanguageFeature(JAVA, false, false, false, true, false, List.of(PLAIN_MAVEN, MAVEN_MAVEN), false, false)); - programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, false)); - programmingLanguageFeatures.put(JAVASCRIPT, new ProgrammingLanguageFeature(JAVASCRIPT, false, false, false, false, false, List.of(), false, false)); + programmingLanguageFeatures.put(JAVASCRIPT, new ProgrammingLanguageFeature(JAVASCRIPT, false, false, true, false, false, List.of(), false, false)); + programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, true, false, false, List.of(), false, false)); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java index ac73fae28454..f04de8a56db9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java @@ -13,8 +13,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; -import de.tum.cit.aet.artemis.iris.service.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; @@ -29,17 +27,14 @@ public class CodeHintService { private static final Logger log = LoggerFactory.getLogger(CodeHintService.class); - private final Optional irisHestiaSessionService; - private final CodeHintRepository codeHintRepository; private final ProgrammingExerciseTaskRepository taskRepository; private final ProgrammingExerciseSolutionEntryRepository solutionEntryRepository; - public CodeHintService(Optional irisHestiaSessionService, CodeHintRepository codeHintRepository, ProgrammingExerciseTaskRepository taskRepository, + public CodeHintService(CodeHintRepository codeHintRepository, ProgrammingExerciseTaskRepository taskRepository, ProgrammingExerciseSolutionEntryRepository solutionEntryRepository) { - this.irisHestiaSessionService = irisHestiaSessionService; this.codeHintRepository = codeHintRepository; this.taskRepository = taskRepository; this.solutionEntryRepository = solutionEntryRepository; @@ -189,17 +184,4 @@ public void updateSolutionEntriesForCodeHint(CodeHint hint) { codeHintRepository.save(hint); } - - /** - * Generates a description and content for a code hint using the Iris subsystem. - * See {@link IrisHestiaSessionService#executeRequest(IrisHestiaSession)} for more information. - * - * @param codeHint The code hint to be generated - * @return The code hint with description and content - */ - public CodeHint generateDescriptionWithIris(CodeHint codeHint) { - var irisService = irisHestiaSessionService.orElseThrow(); - var session = irisService.getOrCreateSession(codeHint); - return irisService.executeRequest(session); - } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsProgrammingLanguageFeatureService.java index 94e6bf8d27fc..45a473da9148 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsProgrammingLanguageFeatureService.java @@ -7,6 +7,7 @@ import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVASCRIPT; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.KOTLIN; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.R; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.RUST; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.SWIFT; import static de.tum.cit.aet.artemis.programming.domain.ProjectType.FACT; @@ -33,15 +34,16 @@ public class JenkinsProgrammingLanguageFeatureService extends ProgrammingLanguag public JenkinsProgrammingLanguageFeatureService() { // Must be extended once a new programming language is added programmingLanguageFeatures.put(EMPTY, new ProgrammingLanguageFeature(EMPTY, false, false, false, false, false, List.of(), false, false)); + programmingLanguageFeatures.put(C, new ProgrammingLanguageFeature(C, false, false, true, false, false, List.of(FACT, GCC), false, false)); + programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, false, false, false, false, true, List.of(), false, false)); programmingLanguageFeatures.put(JAVA, new ProgrammingLanguageFeature(JAVA, true, true, true, true, false, List.of(PLAIN_GRADLE, GRADLE_GRADLE, PLAIN_MAVEN, MAVEN_MAVEN, MAVEN_BLACKBOX), true, false)); + programmingLanguageFeatures.put(JAVASCRIPT, new ProgrammingLanguageFeature(JAVASCRIPT, false, false, true, false, false, List.of(), false, false)); programmingLanguageFeatures.put(KOTLIN, new ProgrammingLanguageFeature(KOTLIN, true, false, true, true, false, List.of(), true, false)); programmingLanguageFeatures.put(PYTHON, new ProgrammingLanguageFeature(PYTHON, false, false, true, false, false, List.of(), false, false)); + programmingLanguageFeatures.put(R, new ProgrammingLanguageFeature(R, false, false, true, false, false, List.of(), false, false)); + programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, true, false, false, List.of(), false, false)); // Jenkins is not supporting XCODE at the moment programmingLanguageFeatures.put(SWIFT, new ProgrammingLanguageFeature(SWIFT, false, true, true, true, false, List.of(PLAIN), false, false)); - programmingLanguageFeatures.put(C, new ProgrammingLanguageFeature(C, false, false, true, false, false, List.of(FACT, GCC), false, false)); - programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, false, false, false, false, true, List.of(), false, false)); - programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, false)); - programmingLanguageFeatures.put(JAVASCRIPT, new ProgrammingLanguageFeature(JAVASCRIPT, false, false, false, false, false, List.of(), false, false)); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java index 6e904910ca57..f900cc0f6dd1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java @@ -184,8 +184,8 @@ private JenkinsXmlConfigBuilder builderFor(ProgrammingLanguage programmingLangua throw new UnsupportedOperationException("Xcode templates are not available for Jenkins."); } return switch (programmingLanguage) { - case JAVA, KOTLIN, PYTHON, C, HASKELL, SWIFT, EMPTY, RUST, JAVASCRIPT -> jenkinsBuildPlanCreator; - case VHDL, ASSEMBLER, OCAML, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVA, KOTLIN, PYTHON, C, HASKELL, SWIFT, EMPTY, RUST, JAVASCRIPT, R -> jenkinsBuildPlanCreator; + case VHDL, ASSEMBLER, OCAML, C_SHARP, C_PLUS_PLUS, SQL, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException(programmingLanguage + " templates are not available for Jenkins."); }; } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIBuildConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIBuildConfigurationService.java index d8c03392661e..e4803619c97d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIBuildConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIBuildConfigurationService.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.programming.service.aeolus.ScriptAction; import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; @@ -21,8 +22,11 @@ public class LocalCIBuildConfigurationService { private final AeolusTemplateService aeolusTemplateService; - public LocalCIBuildConfigurationService(AeolusTemplateService aeolusTemplateService) { + private final BuildScriptProviderService buildScriptProviderService; + + public LocalCIBuildConfigurationService(AeolusTemplateService aeolusTemplateService, BuildScriptProviderService buildScriptProviderService) { this.aeolusTemplateService = aeolusTemplateService; + this.buildScriptProviderService = buildScriptProviderService; } /** @@ -34,15 +38,15 @@ public LocalCIBuildConfigurationService(AeolusTemplateService aeolusTemplateServ */ public String createBuildScript(ProgrammingExercise programmingExercise) { - StringBuilder buildScript = new StringBuilder(); - buildScript.append("#!/bin/bash\n"); - buildScript.append("cd ").append(LOCALCI_WORKING_DIRECTORY).append("/testing-dir\n"); + StringBuilder buildScriptBuilder = new StringBuilder(); + buildScriptBuilder.append("#!/bin/bash\n"); + buildScriptBuilder.append("cd ").append(LOCALCI_WORKING_DIRECTORY).append("/testing-dir\n"); ProgrammingExerciseBuildConfig buildConfig = programmingExercise.getBuildConfig(); String customScript = buildConfig.getBuildScript(); // Todo: get default script if custom script is null before trying to get actions from windfile if (customScript != null) { - buildScript.append(customScript); + buildScriptBuilder.append(customScript); } else { List actions; @@ -62,16 +66,16 @@ public String createBuildScript(ProgrammingExercise programmingExercise) { actions.forEach(action -> { String workdir = action.getWorkdir(); if (workdir != null) { - buildScript.append("cd ").append(LOCALCI_WORKING_DIRECTORY).append("/testing-dir/").append(workdir).append("\n"); + buildScriptBuilder.append("cd ").append(LOCALCI_WORKING_DIRECTORY).append("/testing-dir/").append(workdir).append("\n"); } - buildScript.append(action.getScript()).append("\n"); + buildScriptBuilder.append(action.getScript()).append("\n"); if (workdir != null) { - buildScript.append("cd ").append(LOCALCI_WORKING_DIRECTORY).append("/testing-dir\n"); + buildScriptBuilder.append("cd ").append(LOCALCI_WORKING_DIRECTORY).append("/testing-dir\n"); } }); } - return buildScript.toString(); + return buildScriptProviderService.replacePlaceholders(buildScriptBuilder.toString(), programmingExercise.getBuildConfig().getAssignmentCheckoutPath(), + programmingExercise.getBuildConfig().getSolutionCheckoutPath(), programmingExercise.getBuildConfig().getTestCheckoutPath()); } - } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java index 967e05604f30..bc8292d407bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java @@ -10,6 +10,7 @@ import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.KOTLIN; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.OCAML; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.R; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.RUST; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.SWIFT; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.VHDL; @@ -39,17 +40,18 @@ public class LocalCIProgrammingLanguageFeatureService extends ProgrammingLanguag public LocalCIProgrammingLanguageFeatureService() { // Must be extended once a new programming language is added programmingLanguageFeatures.put(EMPTY, new ProgrammingLanguageFeature(EMPTY, false, false, false, false, false, List.of(), false, true)); + programmingLanguageFeatures.put(ASSEMBLER, new ProgrammingLanguageFeature(ASSEMBLER, false, false, false, false, false, List.of(), false, true)); + programmingLanguageFeatures.put(C, new ProgrammingLanguageFeature(C, false, true, true, false, false, List.of(FACT, GCC), false, true)); + programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, true, false, false, false, true, List.of(), false, true)); programmingLanguageFeatures.put(JAVA, new ProgrammingLanguageFeature(JAVA, true, true, true, true, false, List.of(PLAIN_GRADLE, GRADLE_GRADLE, PLAIN_MAVEN, MAVEN_MAVEN), false, true)); - programmingLanguageFeatures.put(PYTHON, new ProgrammingLanguageFeature(PYTHON, false, false, true, false, false, List.of(), false, true)); - programmingLanguageFeatures.put(C, new ProgrammingLanguageFeature(C, false, true, true, false, false, List.of(FACT, GCC), false, true)); - programmingLanguageFeatures.put(ASSEMBLER, new ProgrammingLanguageFeature(ASSEMBLER, false, false, false, false, false, List.of(), false, true)); + programmingLanguageFeatures.put(JAVASCRIPT, new ProgrammingLanguageFeature(JAVASCRIPT, false, false, true, false, false, List.of(), false, true)); programmingLanguageFeatures.put(KOTLIN, new ProgrammingLanguageFeature(KOTLIN, false, false, true, true, false, List.of(), false, true)); - programmingLanguageFeatures.put(VHDL, new ProgrammingLanguageFeature(VHDL, false, false, false, false, false, List.of(), false, true)); - programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, true, false, false, false, true, List.of(), false, true)); programmingLanguageFeatures.put(OCAML, new ProgrammingLanguageFeature(OCAML, false, false, false, false, true, List.of(), false, true)); + programmingLanguageFeatures.put(PYTHON, new ProgrammingLanguageFeature(PYTHON, false, false, true, false, false, List.of(), false, true)); + programmingLanguageFeatures.put(R, new ProgrammingLanguageFeature(R, false, false, true, false, false, List.of(), false, true)); + programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, true, false, false, List.of(), false, true)); programmingLanguageFeatures.put(SWIFT, new ProgrammingLanguageFeature(SWIFT, false, false, true, true, false, List.of(PLAIN), false, true)); - programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, true)); - programmingLanguageFeatures.put(JAVASCRIPT, new ProgrammingLanguageFeature(JAVASCRIPT, false, false, false, false, false, List.of(), false, true)); + programmingLanguageFeatures.put(VHDL, new ProgrammingLanguageFeature(VHDL, false, false, false, false, false, List.of(), false, true)); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java index 39bfac28ca0b..4507f1a4e76d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java @@ -113,7 +113,9 @@ public void processResult() { if (resultQueueItem == null) { return; } - log.info("Processing build job result"); + log.info("Processing build job result with id {}", resultQueueItem.buildJobQueueItem().id()); + log.debug("Build jobs waiting in queue: {}", resultQueue.size()); + log.debug("Queued build jobs: {}", resultQueue.stream().map(i -> i.buildJobQueueItem().id()).toList()); BuildJobQueueItem buildJob = resultQueueItem.buildJobQueueItem(); BuildResult buildResult = resultQueueItem.buildResult(); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java index 8a9aa499ea2e..5da2860ba799 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java @@ -42,6 +42,7 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusResult; @@ -75,6 +76,8 @@ public class LocalCITriggerService implements ContinuousIntegrationTriggerServic private final AeolusTemplateService aeolusTemplateService; + private final BuildScriptProviderService buildScriptProviderService; + private final ProgrammingLanguageConfiguration programmingLanguageConfiguration; private final AuxiliaryRepositoryRepository auxiliaryRepositoryRepository; @@ -102,7 +105,7 @@ public LocalCITriggerService(@Qualifier("hazelcastInstance") HazelcastInstance h LocalCIProgrammingLanguageFeatureService programmingLanguageFeatureService, Optional versionControlService, SolutionProgrammingExerciseParticipationRepository solutionProgrammingExerciseParticipationRepository, LocalCIBuildConfigurationService localCIBuildConfigurationService, GitService gitService, ExerciseDateService exerciseDateService, - ProgrammingExerciseBuildConfigRepository programmingExerciseBuildConfigRepository) { + ProgrammingExerciseBuildConfigRepository programmingExerciseBuildConfigRepository, BuildScriptProviderService buildScriptProviderService) { this.hazelcastInstance = hazelcastInstance; this.aeolusTemplateService = aeolusTemplateService; this.programmingLanguageConfiguration = programmingLanguageConfiguration; @@ -114,6 +117,7 @@ public LocalCITriggerService(@Qualifier("hazelcastInstance") HazelcastInstance h this.gitService = gitService; this.programmingExerciseBuildConfigRepository = programmingExerciseBuildConfigRepository; this.exerciseDateService = exerciseDateService; + this.buildScriptProviderService = buildScriptProviderService; } @PostConstruct @@ -149,6 +153,8 @@ public void triggerBuild(ProgrammingExerciseParticipation participation, String private void triggerBuild(ProgrammingExerciseParticipation participation, String commitHashToBuild, RepositoryType triggeredByPushTo, boolean triggerAll) throws LocalCIException { + log.info("Triggering build for participation {} and commit hash {}", participation.getId(), commitHashToBuild); + // Commit hash related to the repository that will be tested String assignmentCommitHash; @@ -302,13 +308,15 @@ private BuildConfig getBuildConfig(ProgrammingExerciseParticipation participatio } List resultPaths = getTestResultPaths(windfile); + resultPaths = buildScriptProviderService.replaceResultPathsPlaceholders(resultPaths, buildConfig); // Todo: If build agent does not have access to filesystem, we need to send the build script to the build agent and execute it there. programmingExercise.setBuildConfig(buildConfig); String buildScript = localCIBuildConfigurationService.createBuildScript(programmingExercise); return new BuildConfig(buildScript, dockerImage, commitHashToBuild, assignmentCommitHash, testCommitHash, branch, programmingLanguage, projectType, - staticCodeAnalysisEnabled, sequentialTestRunsEnabled, testwiseCoverageEnabled, resultPaths); + staticCodeAnalysisEnabled, sequentialTestRunsEnabled, testwiseCoverageEnabled, resultPaths, buildConfig.getTimeoutSeconds(), + buildConfig.getAssignmentCheckoutPath(), buildConfig.getTestCheckoutPath(), buildConfig.getSolutionCheckoutPath()); } private ProgrammingExerciseBuildConfig loadBuildConfig(ProgrammingExercise programmingExercise) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java index f1da13be2453..a55c44871619 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java @@ -86,6 +86,7 @@ * REST controller for managing ProgrammingExercise. */ @Profile(PROFILE_CORE) +@FeatureToggle(Feature.ProgrammingExercises) @RestController @RequestMapping("api/") public class ProgrammingExerciseExportImportResource { @@ -184,7 +185,6 @@ private void validateStaticCodeAnalysisSettings(ProgrammingExercise programmingE */ @PostMapping("programming-exercises/import/{sourceExerciseId}") @EnforceAtLeastEditor - @FeatureToggle(Feature.ProgrammingExercises) public ResponseEntity importProgrammingExercise(@PathVariable long sourceExerciseId, @RequestBody ProgrammingExercise newExercise, @RequestParam(defaultValue = "false") boolean recreateBuildPlans, @RequestParam(defaultValue = "false") boolean updateTemplate, @RequestParam(defaultValue = "false") boolean setTestCaseVisibilityToAfterDueDate) throws JsonProcessingException { @@ -209,7 +209,8 @@ public ResponseEntity importProgrammingExercise(@PathVariab programmingExerciseRepository.validateCourseSettings(newExercise, course); final var originalProgrammingExercise = programmingExerciseRepository - .findByIdWithEagerBuildConfigTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxRepos(sourceExerciseId) + .findByIdWithEagerBuildConfigTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndSolutionEntriesAndBuildConfig( + sourceExerciseId) .orElseThrow(() -> new EntityNotFoundException("ProgrammingExercise", sourceExerciseId)); var consistencyErrors = consistencyCheckService.checkConsistencyOfProgrammingExercise(originalProgrammingExercise); @@ -290,7 +291,6 @@ public ResponseEntity importProgrammingExercise(@PathVariab */ @PostMapping("courses/{courseId}/programming-exercises/import-from-file") @EnforceAtLeastEditor - @FeatureToggle(Feature.ProgrammingExercises) public ResponseEntity importProgrammingExerciseFromFile(@PathVariable long courseId, @RequestPart("programmingExercise") ProgrammingExercise programmingExercise, @RequestPart("file") MultipartFile zipFile) { final var user = userRepository.getUserWithGroupsAndAuthorities(); @@ -317,7 +317,7 @@ public ResponseEntity importProgrammingExerciseFromFile(@Pa */ @GetMapping("programming-exercises/{exerciseId}/export-instructor-exercise") @EnforceAtLeastInstructor - @FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports }) + @FeatureToggle(Feature.Exports) public ResponseEntity exportInstructorExercise(@PathVariable long exerciseId) throws IOException { var programmingExercise = programmingExerciseRepository.findByIdWithPlagiarismDetectionConfigTeamConfigAndBuildConfigElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, programmingExercise, null); @@ -351,7 +351,7 @@ public ResponseEntity exportInstructorExercise(@PathVariable long exer */ @GetMapping("programming-exercises/{exerciseId}/export-instructor-repository/{repositoryType}") @EnforceAtLeastTutor - @FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports }) + @FeatureToggle(Feature.Exports) public ResponseEntity exportInstructorRepository(@PathVariable long exerciseId, @PathVariable RepositoryType repositoryType) throws IOException { var programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.TEACHING_ASSISTANT, programmingExercise, null); @@ -372,7 +372,7 @@ public ResponseEntity exportInstructorRepository(@PathVariable long ex */ @GetMapping("programming-exercises/{exerciseId}/export-instructor-auxiliary-repository/{repositoryId}") @EnforceAtLeastTutor - @FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports }) + @FeatureToggle(Feature.Exports) public ResponseEntity exportInstructorAuxiliaryRepository(@PathVariable long exerciseId, @PathVariable long repositoryId) throws IOException { var programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.TEACHING_ASSISTANT, programmingExercise, null); @@ -418,7 +418,7 @@ private ResponseEntity returnZipFileForRepositoryExport(Optional */ @PostMapping("programming-exercises/{exerciseId}/export-repos-by-participant-identifiers/{participantIdentifiers}") @EnforceAtLeastTutor - @FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports }) + @FeatureToggle(Feature.Exports) public ResponseEntity exportSubmissionsByStudentLogins(@PathVariable long exerciseId, @PathVariable String participantIdentifiers, @RequestBody RepositoryExportOptionsDTO repositoryExportOptions) throws IOException { var programmingExercise = programmingExerciseRepository.findByIdWithStudentParticipationsAndLegalSubmissionsElseThrow(exerciseId); @@ -463,7 +463,7 @@ public ResponseEntity exportSubmissionsByStudentLogins(@PathVariable l */ @PostMapping("programming-exercises/{exerciseId}/export-repos-by-participation-ids/{participationIds}") @EnforceAtLeastTutor - @FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports }) + @FeatureToggle(Feature.Exports) public ResponseEntity exportSubmissionsByParticipationIds(@PathVariable long exerciseId, @PathVariable String participationIds, @RequestBody RepositoryExportOptionsDTO repositoryExportOptions) throws IOException { var programmingExercise = programmingExerciseRepository.findByIdWithStudentParticipationsAndLegalSubmissionsElseThrow(exerciseId); @@ -522,7 +522,7 @@ private ResponseEntity provideZipForParticipations(@NotNull List exportStudentRequestedRepository(@PathVariable long exerciseId, @RequestParam() boolean includeTests) throws IOException { var programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); if (programmingExercise.isExamExercise()) { @@ -549,7 +549,7 @@ public ResponseEntity exportStudentRequestedRepository(@PathVariable l */ @GetMapping("programming-exercises/{exerciseId}/export-student-repository/{participationId}") @EnforceAtLeastStudent - @FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports }) + @FeatureToggle(Feature.Exports) public ResponseEntity exportStudentRepository(@PathVariable long exerciseId, @PathVariable long participationId) throws IOException { var programmingExercise = programmingExerciseRepository.findByIdWithStudentParticipationsAndLegalSubmissionsElseThrow(exerciseId); var studentParticipation = programmingExercise.getStudentParticipations().stream().filter(p -> p.getId().equals(participationId)) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java index 4388e386ab39..95e60a0ec89c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java @@ -40,6 +40,7 @@ * REST controller for managing ProgrammingExercise. */ @Profile(PROFILE_CORE) +@FeatureToggle(Feature.ProgrammingExercises) @RestController @RequestMapping("api/") public class ProgrammingExercisePlagiarismResource { @@ -72,7 +73,6 @@ public ProgrammingExercisePlagiarismResource(ProgrammingExerciseRepository progr */ @GetMapping("programming-exercises/{exerciseId}/plagiarism-result") @EnforceAtLeastEditor - @FeatureToggle(Feature.ProgrammingExercises) public ResponseEntity> getPlagiarismResult(@PathVariable long exerciseId) { log.debug("REST request to get the latest plagiarism result for the programming exercise with id: {}", exerciseId); ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); @@ -95,7 +95,7 @@ public ResponseEntity> getPlagiarismRe */ @GetMapping("programming-exercises/{exerciseId}/check-plagiarism") @EnforceAtLeastEditor - @FeatureToggle({ Feature.ProgrammingExercises, Feature.PlagiarismChecks }) + @FeatureToggle(Feature.PlagiarismChecks) public ResponseEntity> checkPlagiarism(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws ExitException, IOException { ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); @@ -128,7 +128,6 @@ public ResponseEntity> checkPlagiarism */ @GetMapping(value = "programming-exercises/{exerciseId}/check-plagiarism-jplag-report") @EnforceAtLeastEditor - @FeatureToggle(Feature.ProgrammingExercises) public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws IOException { log.debug("REST request to check plagiarism for ProgrammingExercise with id: {}", exerciseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java index 7462f19512c1..2225baa81759 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java @@ -327,6 +327,9 @@ public ResponseEntity updateProgrammingExercise(@RequestBod } } + // Verify that the checkout directories have not been changed. This is required since the buildScript and result paths are determined during the creation of the exercise. + programmingExerciseService.validateCheckoutDirectoriesUnchanged(programmingExerciseBeforeUpdate, updatedProgrammingExercise); + // Verify that a theia image is provided when the online IDE is enabled if (updatedProgrammingExercise.isAllowOnlineIde() && updatedProgrammingExercise.getBuildConfig().getTheiaImage() == null) { throw new BadRequestAlertException("You need to provide a Theia image when the online IDE is enabled", ENTITY_NAME, "noTheiaImageProvided"); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java index 297e784f1e2b..122aa11b7a17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java @@ -1,11 +1,9 @@ package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.Set; import org.slf4j.Logger; @@ -23,8 +21,6 @@ import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; @@ -50,15 +46,12 @@ public class CodeHintResource { private final CodeHintService codeHintService; - private final Optional irisSettingsService; - public CodeHintResource(ProgrammingExerciseRepository programmingExerciseRepository, ProgrammingExerciseSolutionEntryRepository solutionEntryRepository, - CodeHintRepository codeHintRepository, CodeHintService codeHintService, Optional irisSettingsService) { + CodeHintRepository codeHintRepository, CodeHintService codeHintService) { this.programmingExerciseRepository = programmingExerciseRepository; this.solutionEntryRepository = solutionEntryRepository; this.codeHintRepository = codeHintRepository; this.codeHintService = codeHintService; - this.irisSettingsService = irisSettingsService; } /** @@ -98,41 +91,6 @@ public ResponseEntity> generateCodeHintsForExercise(@PathVariable return ResponseEntity.ok(codeHints); } - /** - * {@code POST programming-exercises/:exerciseId/code-hints/:codeHintId/generate-description} : Generate a description for a code hint using Iris. - * - * @param exerciseId The id of the exercise of the code hint - * @param codeHintId The id of the code hint - * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the updated code hint - */ - // TODO: move into some IrisResource - @Profile(PROFILE_IRIS) - @PostMapping("programming-exercises/{exerciseId}/code-hints/{codeHintId}/generate-description") - @EnforceAtLeastEditorInExercise - public ResponseEntity generateDescriptionForCodeHint(@PathVariable Long exerciseId, @PathVariable Long codeHintId) { - log.debug("REST request to generate description with Iris for CodeHint: {}", codeHintId); - - ProgrammingExercise exercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); - irisSettingsService.orElseThrow().isEnabledForElseThrow(IrisSubSettingsType.HESTIA, exercise); - - // Hints for exam exercises are not supported at the moment - if (exercise.isExamExercise()) { - throw new AccessForbiddenException("Code hints for exams are currently not supported"); - } - - var codeHint = codeHintRepository.findByIdWithSolutionEntriesElseThrow(codeHintId); - if (!Objects.equals(codeHint.getExercise().getId(), exercise.getId())) { - throw new ConflictException("The code hint does not belong to the exercise", "CodeHint", "codeHintExerciseConflict"); - } - - if (codeHint.getSolutionEntries().isEmpty()) { - throw new ConflictException("The code hint does not have any solution entries", "CodeHint", "codeHintNoSolutionEntries"); - } - - codeHint = codeHintService.generateDescriptionWithIris(codeHint); - return ResponseEntity.ok(codeHint); - } - /** * {@code DELETE programming-exercises/:exerciseId/code-hints/:codeHintId/solution-entries/:solutionEntryId} : * Removes a solution entry from a code hint. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java index 9919c2440364..9e5530e94813 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java @@ -79,8 +79,8 @@ public ResponseEntity getAeolusTemplate(@PathVariable ProgrammingLanguag } /** - * GET /api/aeolus/templates/:language/:projectType : Get the aeolus template file with the given filename
    - * GET /api/aeolus/templates/:language : Get the aeolus template file with the given filename + * GET /api/aeolus/template-scripts/:language/:projectType : Get the aeolus template file with the given filename
    + * GET /api/aeolus/template-scripts/:language : Get the aeolus template file with the given filename *

    * The windfile contains the default build plan configuration for new programming exercises. * @@ -91,7 +91,7 @@ public ResponseEntity getAeolusTemplate(@PathVariable ProgrammingLanguag * @param testCoverage Whether the test coverage template should be used * @return The requested file, or 404 if the file doesn't exist */ - @GetMapping({ "templateScripts/{language}/{projectType}", "templateScripts/{language}" }) + @GetMapping({ "template-scripts/{language}/{projectType}", "template-scripts/{language}" }) @EnforceAtLeastEditor public ResponseEntity getAeolusTemplateScript(@PathVariable ProgrammingLanguage language, @PathVariable Optional projectType, @RequestParam(value = "staticAnalysis", defaultValue = "false") boolean staticAnalysis, diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropSubmittedAnswer.java index cfc17f0b42ee..7ab065bb4920 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropSubmittedAnswer.java @@ -76,7 +76,6 @@ public DragItem getSelectedDragItemForDropLocation(DropLocation dropLocation) { * @param question the changed question with the changed DragItems and DropLocations */ private void checkAndDeleteMappings(DragAndDropQuestion question) { - if (question != null) { // Check if a dragItem or dropLocation was deleted and delete reference to it in mappings Set selectedMappingsToDelete = new HashSet<>(); @@ -98,7 +97,6 @@ private void checkAndDeleteMappings(DragAndDropQuestion question) { */ @Override public void checkAndDeleteReferences(QuizExercise quizExercise) { - // Delete all references to question, dropLocations and dragItem if the question was deleted if (!quizExercise.getQuizQuestions().contains(getQuizQuestion())) { setQuizQuestion(null); diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java index bcf311e9e31c..e657930b29f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java @@ -109,6 +109,10 @@ public void setInvalid(Boolean invalid) { this.invalid = invalid; } + public void setMappings(Set mappings) { + this.mappings = mappings; + } + /** * This method is called after the entity is saved for the first time. We replace the placeholder in the pictureFilePath with the id of the entity because we don't know it * before creation. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java index 8237750bf7b0..468210dc7cab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java @@ -128,6 +128,10 @@ public void setInvalid(Boolean invalid) { this.invalid = invalid; } + public void setMappings(Set mappings) { + this.mappings = mappings; + } + /** * check if the DropLocation is solved correctly * diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java index f55298937de9..448507563f89 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java @@ -77,6 +77,10 @@ public void setQuestion(ShortAnswerQuestion shortAnswerQuestion) { this.question = shortAnswerQuestion; } + public void setMappings(Set mappings) { + this.mappings = mappings; + } + @Override public String toString() { return "ShortAnswerSolution{" + "id=" + getId() + ", text='" + getText() + "'" + ", invalid='" + isInvalid() + "'" + "}"; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java index 2d428efa5acb..727861554b7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java @@ -94,6 +94,10 @@ public void setQuestion(ShortAnswerQuestion shortAnswerQuestion) { this.question = shortAnswerQuestion; } + public void setMappings(Set shortAnswerMappings) { + this.mappings = shortAnswerMappings; + } + @Override public String toString() { return "ShortAnswerSpot{" + "id=" + getId() + ", width=" + getWidth() + ", spotNr=" + getSpotNr() + ", invalid='" + isInvalid() + "'" + "}"; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java index 5ab0a9bbb1a1..6f31cc005d1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java @@ -6,6 +6,7 @@ import java.time.ZonedDateTime; import java.util.List; import java.util.Optional; +import java.util.Set; import jakarta.validation.constraints.NotNull; @@ -16,6 +17,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.NoUniqueQueryException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -60,8 +62,9 @@ public interface QuizExerciseRepository extends ArtemisJpaRepository findWithEagerQuestionsAndStatisticsById(Long quizExerciseId); - @EntityGraph(type = LOAD, attributePaths = { "quizQuestions", "quizPointStatistic", "quizQuestions.quizQuestionStatistic", "categories", "competencies", "quizBatches" }) - Optional findWithEagerQuestionsAndStatisticsAndCompetenciesById(Long quizExerciseId); + @EntityGraph(type = LOAD, attributePaths = { "quizQuestions", "quizPointStatistic", "quizQuestions.quizQuestionStatistic", "categories", "competencies", "quizBatches", + "gradingCriteria" }) + Optional findWithEagerQuestionsAndStatisticsAndCompetenciesAndBatchesAndGradingCriteriaById(Long quizExerciseId); @EntityGraph(type = LOAD, attributePaths = { "quizQuestions" }) Optional findWithEagerQuestionsById(Long quizExerciseId); @@ -72,6 +75,31 @@ public interface QuizExerciseRepository extends ArtemisJpaRepository findWithEagerBatchesById(Long quizExerciseId); + @Query(""" + SELECT q + FROM QuizExercise q + LEFT JOIN FETCH q.competencies + WHERE q.title = :title + AND q.course.id = :courseId + """) + Set findAllWithCompetenciesByTitleAndCourseId(@Param("title") String title, @Param("courseId") long courseId); + + /** + * Finds a quiz exercise by its title and course id and throws a NoUniqueQueryException if multiple exercises are found. + * + * @param title the title of the exercise + * @param courseId the id of the course + * @return the exercise with the given title and course id + * @throws NoUniqueQueryException if multiple exercises are found with the same title + */ + default Optional findUniqueWithCompetenciesByTitleAndCourseId(String title, long courseId) throws NoUniqueQueryException { + Set allExercises = findAllWithCompetenciesByTitleAndCourseId(title, courseId); + if (allExercises.size() > 1) { + throw new NoUniqueQueryException("Found multiple exercises with title " + title + " in course with id " + courseId); + } + return allExercises.stream().findFirst(); + } + @NotNull default QuizExercise findWithEagerBatchesByIdOrElseThrow(Long quizExerciseId) { return getValueElseThrow(findWithEagerBatchesById(quizExerciseId), quizExerciseId); @@ -116,7 +144,7 @@ default QuizExercise findByIdWithQuestionsAndStatisticsElseThrow(Long quizExerci } @NotNull - default QuizExercise findByIdWithQuestionsAndStatisticsAndCompetenciesElseThrow(Long quizExerciseId) { - return getValueElseThrow(findWithEagerQuestionsAndStatisticsAndCompetenciesById(quizExerciseId), quizExerciseId); + default QuizExercise findByIdWithQuestionsAndStatisticsAndCompetenciesAndBatchesAndGradingCriteriaElseThrow(Long quizExerciseId) { + return getValueElseThrow(findWithEagerQuestionsAndStatisticsAndCompetenciesAndBatchesAndGradingCriteriaById(quizExerciseId), quizExerciseId); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java index d6f432199a27..ffe7989c1e91 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Path; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -128,6 +129,7 @@ private QuizExercise copyQuizExerciseBasis(QuizExercise importedExercise) { private void copyQuizQuestions(QuizExercise sourceExercise, QuizExercise newExercise) { log.debug("Copying the QuizQuestions to new QuizExercise: {}", newExercise); + List newQuestions = new ArrayList<>(); for (QuizQuestion quizQuestion : sourceExercise.getQuizQuestions()) { quizQuestion.setId(null); quizQuestion.setQuizQuestionStatistic(null); @@ -141,15 +143,21 @@ else if (quizQuestion instanceof ShortAnswerQuestion saQuestion) { setUpShortAnswerQuestionForImport(saQuestion); } quizQuestion.setExercise(newExercise); + + newQuestions.add(quizQuestion); } - newExercise.setQuizQuestions(sourceExercise.getQuizQuestions()); + newExercise.setQuizQuestions(newQuestions); } private void setUpMultipleChoiceQuestionForImport(MultipleChoiceQuestion mcQuestion) { + List newAnswerOptions = new ArrayList<>(); for (AnswerOption answerOption : mcQuestion.getAnswerOptions()) { answerOption.setId(null); answerOption.setQuestion(mcQuestion); + + newAnswerOptions.add(answerOption); } + mcQuestion.setAnswerOptions(newAnswerOptions); } private void setUpDragAndDropQuestionForImport(DragAndDropQuestion dndQuestion) { @@ -171,19 +179,29 @@ private void setUpDragAndDropQuestionForImport(DragAndDropQuestion dndQuestion) log.warn("BackgroundFilePath of DragAndDropQuestion {} is null", dndQuestion.getId()); } + List newDropLocations = new ArrayList<>(); for (DropLocation dropLocation : dndQuestion.getDropLocations()) { dropLocation.setId(null); dropLocation.setQuestion(dndQuestion); + dropLocation.setMappings(new HashSet<>()); + + newDropLocations.add(dropLocation); } + dndQuestion.setDropLocations(newDropLocations); setUpDragItemsForImport(dndQuestion); setUpDragAndDropMappingsForImport(dndQuestion); } private void setUpDragItemsForImport(DragAndDropQuestion dndQuestion) { + List newDragItems = new ArrayList<>(); for (DragItem dragItem : dndQuestion.getDragItems()) { dragItem.setId(null); dragItem.setQuestion(dndQuestion); + dragItem.setMappings(new HashSet<>()); + + newDragItems.add(dragItem); + if (dragItem.getPictureFilePath() == null) { continue; } @@ -201,9 +219,11 @@ private void setUpDragItemsForImport(DragAndDropQuestion dndQuestion) { dragItem.setPictureFilePath(FilePathService.publicPathForActualPathOrThrow(newDragItemPath, null).toString()); } } + dndQuestion.setDragItems(newDragItems); } private void setUpDragAndDropMappingsForImport(DragAndDropQuestion dndQuestion) { + List newDragAndDropMappings = new ArrayList<>(); for (DragAndDropMapping dragAndDropMapping : dndQuestion.getCorrectMappings()) { dragAndDropMapping.setId(null); dragAndDropMapping.setQuestion(dndQuestion); @@ -213,18 +233,34 @@ private void setUpDragAndDropMappingsForImport(DragAndDropQuestion dndQuestion) if (dragAndDropMapping.getDropLocationIndex() != null) { dragAndDropMapping.setDropLocation(dndQuestion.getDropLocations().get(dragAndDropMapping.getDropLocationIndex())); } + + newDragAndDropMappings.add(dragAndDropMapping); } + dndQuestion.setCorrectMappings(newDragAndDropMappings); } private void setUpShortAnswerQuestionForImport(ShortAnswerQuestion saQuestion) { + List newShortAnswerSpots = new ArrayList<>(); for (ShortAnswerSpot shortAnswerSpot : saQuestion.getSpots()) { shortAnswerSpot.setId(null); shortAnswerSpot.setQuestion(saQuestion); + shortAnswerSpot.setMappings(new HashSet<>()); + + newShortAnswerSpots.add(shortAnswerSpot); } + saQuestion.setSpots(newShortAnswerSpots); + + List newShortAnswerSolutions = new ArrayList<>(); for (ShortAnswerSolution shortAnswerSolution : saQuestion.getSolutions()) { shortAnswerSolution.setId(null); shortAnswerSolution.setQuestion(saQuestion); + shortAnswerSolution.setMappings(new HashSet<>()); + + newShortAnswerSolutions.add(shortAnswerSolution); } + saQuestion.setSolutions(newShortAnswerSolutions); + + List newShortAnswerMappings = new ArrayList<>(); for (ShortAnswerMapping shortAnswerMapping : saQuestion.getCorrectMappings()) { shortAnswerMapping.setId(null); shortAnswerMapping.setQuestion(saQuestion); @@ -234,7 +270,9 @@ private void setUpShortAnswerQuestionForImport(ShortAnswerQuestion saQuestion) { if (shortAnswerMapping.getShortAnswerSpotIndex() != null) { shortAnswerMapping.setSpot(saQuestion.getSpots().get(shortAnswerMapping.getShortAnswerSpotIndex())); } + newShortAnswerMappings.add(shortAnswerMapping); } + saQuestion.setCorrectMappings(newShortAnswerMappings); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java index 207a84d3220d..0b44382a8de5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java @@ -57,7 +57,7 @@ public QuizExerciseWithSubmissionsExportService(QuizExerciseRepository quizExerc * @return the path to the directory where the quiz exercise was exported to */ public Path exportExerciseWithSubmissions(QuizExercise quizExercise, Path exerciseExportDir, List exportErrors, List reportEntries) { - quizExercise = quizExerciseRepository.findByIdWithQuestionsAndStatisticsAndCompetenciesElseThrow(quizExercise.getId()); + quizExercise = quizExerciseRepository.findByIdWithQuestionsAndStatisticsAndCompetenciesAndBatchesAndGradingCriteriaElseThrow(quizExercise.getId()); // do not store unnecessary information in the JSON file quizExercise.setCourse(null); quizExercise.setExerciseGroup(null); diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java index 2f055ac9bf09..118c5554a1f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java @@ -371,7 +371,7 @@ public ResponseEntity getQuizExercise(@PathVariable Long quizExerc // TODO: Split this route in two: One for normal and one for exam exercises log.info("REST request to get quiz exercise : {}", quizExerciseId); var user = userRepository.getUserWithGroupsAndAuthorities(); - var quizExercise = quizExerciseRepository.findByIdWithQuestionsAndStatisticsAndCompetenciesElseThrow(quizExerciseId); + var quizExercise = quizExerciseRepository.findByIdWithQuestionsAndStatisticsAndCompetenciesAndBatchesAndGradingCriteriaElseThrow(quizExerciseId); if (quizExercise.isExamExercise()) { authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, quizExercise, user); studentParticipationRepository.checkTestRunsExist(quizExercise); diff --git a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java index 6ed0ef96f4a7..3171fa825b63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Optional; +import java.util.Set; import jakarta.validation.constraints.NotNull; @@ -15,6 +16,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.NoUniqueQueryException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; @@ -42,6 +44,20 @@ public interface TextExerciseRepository extends ArtemisJpaRepository findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(long exerciseId); + @Query(""" + SELECT t + FROM TextExercise t + LEFT JOIN FETCH t.exampleSubmissions e + LEFT JOIN FETCH e.submission s + LEFT JOIN FETCH s.results r + LEFT JOIN FETCH r.feedbacks + LEFT JOIN FETCH s.blocks + LEFT JOIN FETCH r.assessor + LEFT JOIN FETCH t.teamAssignmentConfig + WHERE t.id = :exerciseId + """) + Optional findWithExampleSubmissionsAndResultsById(@Param("exerciseId") long exerciseId); + @Query(""" SELECT textExercise FROM TextExercise textExercise @@ -52,9 +68,10 @@ public interface TextExerciseRepository extends ArtemisJpaRepository findWithExampleSubmissionsAndResultsById(@Param("exerciseId") long exerciseId); + Optional findWithExampleSubmissionsAndResultsAndGradingCriteriaById(@Param("exerciseId") long exerciseId); @EntityGraph(type = LOAD, attributePaths = { "studentParticipations", "studentParticipations.submissions", "studentParticipations.submissions.results" }) Optional findWithStudentParticipationsAndSubmissionsById(long exerciseId); @@ -62,6 +79,31 @@ public interface TextExerciseRepository extends ArtemisJpaRepository findWithGradingCriteriaById(long exerciseId); + @Query(""" + SELECT t + FROM TextExercise t + LEFT JOIN FETCH t.competencies + WHERE t.title = :title + AND t.course.id = :courseId + """) + Set findAllWithCompetenciesByTitleAndCourseId(@Param("title") String title, @Param("courseId") long courseId); + + /** + * Finds a text exercise by its title and course id and throws a NoUniqueQueryException if multiple exercises are found. + * + * @param title the title of the exercise + * @param courseId the id of the course + * @return the exercise with the given title and course id + * @throws NoUniqueQueryException if multiple exercises are found with the same title + */ + default Optional findUniqueWithCompetenciesByTitleAndCourseId(String title, long courseId) throws NoUniqueQueryException { + Set allExercises = findAllWithCompetenciesByTitleAndCourseId(title, courseId); + if (allExercises.size() > 1) { + throw new NoUniqueQueryException("Found multiple exercises with title " + title + " in course with id " + courseId); + } + return allExercises.stream().findFirst(); + } + @NotNull default TextExercise findWithGradingCriteriaByIdElseThrow(long exerciseId) { return getValueElseThrow(findWithGradingCriteriaById(exerciseId), exerciseId); @@ -77,6 +119,11 @@ default TextExercise findByIdWithExampleSubmissionsAndResultsElseThrow(long exer return getValueElseThrow(findWithExampleSubmissionsAndResultsById(exerciseId), exerciseId); } + @NotNull + default TextExercise findByIdWithExampleSubmissionsAndResultsAndGradingCriteriaElseThrow(long exerciseId) { + return getValueElseThrow(findWithExampleSubmissionsAndResultsAndGradingCriteriaById(exerciseId), exerciseId); + } + @NotNull default TextExercise findByIdWithStudentParticipationsAndSubmissionsElseThrow(long exerciseId) { return getValueElseThrow(findWithStudentParticipationsAndSubmissionsById(exerciseId), exerciseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/admin/AdminTextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/admin/AdminTextAssessmentEventResource.java index 78b6a9f8871b..acecfb3b1e56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/admin/AdminTextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/admin/AdminTextAssessmentEventResource.java @@ -19,6 +19,7 @@ * REST controller for administrating TextAssessmentEventResource. */ @Profile(PROFILE_CORE) +@EnforceAdmin @RestController @RequestMapping("api/admin/") public class AdminTextAssessmentEventResource { @@ -36,7 +37,6 @@ public AdminTextAssessmentEventResource(TextAssessmentEventRepository textAssess * @return returns a List of TextAssessmentEvent's */ @GetMapping("event-insights/text-assessment/events/{courseId}") - @EnforceAdmin public ResponseEntity> getEventsByCourseId(@PathVariable Long courseId) { List events = textAssessmentEventRepository.findAllByCourseId(courseId); return ResponseEntity.ok().body(events); diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java index 5a4f4c4b2f45..448f97e9ea1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java @@ -104,6 +104,18 @@ public class TutorialGroup extends DomainObject { @Transient private String teachingAssistantName; + /** + * This transient fields is set to the name of the teaching assistant of this tutorial group + */ + @Transient + private Long teachingAssistantId; + + /** + * This transient fields is set to the name of the teaching assistant of this tutorial group + */ + @Transient + private String teachingAssistantImageUrl; + /** * This transient fields is set to the course title to which this tutorial group belongs */ @@ -290,10 +302,30 @@ public String getTeachingAssistantName() { return teachingAssistantName; } + @JsonIgnore(false) + @JsonProperty + public Long getTeachingAssistantId() { + return teachingAssistantId; + } + + @JsonIgnore(false) + @JsonProperty + public String getTeachingAssistantImageUrl() { + return teachingAssistantImageUrl; + } + public void setTeachingAssistantName(String teachingAssistantName) { this.teachingAssistantName = teachingAssistantName; } + public void setTeachingAssistantId(Long teachingAssistantId) { + this.teachingAssistantId = teachingAssistantId; + } + + public void setTeachingAssistantImageUrl(String teachingAssistantImageUrl) { + this.teachingAssistantImageUrl = teachingAssistantImageUrl; + } + @JsonIgnore(false) @JsonProperty public String getCourseTitle() { diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java index e339fc473e52..4f8ef7279c1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java @@ -114,10 +114,14 @@ public void setTransientPropertiesForUser(User user, TutorialGroup tutorialGroup if (getPersistenceUtil().isLoaded(tutorialGroup, "teachingAssistant") && tutorialGroup.getTeachingAssistant() != null) { tutorialGroup.setTeachingAssistantName(tutorialGroup.getTeachingAssistant().getName()); + tutorialGroup.setTeachingAssistantId(tutorialGroup.getTeachingAssistant().getId()); + tutorialGroup.setTeachingAssistantImageUrl(tutorialGroup.getTeachingAssistant().getImageUrl()); tutorialGroup.setIsUserTutor(tutorialGroup.getTeachingAssistant().equals(user)); } else { tutorialGroup.setTeachingAssistantName(null); + tutorialGroup.setTeachingAssistantId(null); + tutorialGroup.setTeachingAssistantImageUrl(null); } if (tutorialGroup.getTutorialGroupChannel() != null) { diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java index d8a59414d71c..791eea50d82e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupFreePeriodService; @Profile(PROFILE_CORE) +@FeatureToggle(Feature.TutorialGroups) @RestController @RequestMapping("api/") public class TutorialGroupFreePeriodResource { @@ -73,7 +74,6 @@ public TutorialGroupFreePeriodResource(TutorialGroupsConfigurationRepository tut */ @GetMapping("courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity getOneOfConfiguration(@PathVariable Long courseId, @PathVariable Long tutorialGroupsConfigurationId, @PathVariable Long tutorialGroupFreePeriodId) { log.debug("REST request to get tutorial group free period: {} of tutorial group configuration {} of course: {}", tutorialGroupFreePeriodId, tutorialGroupsConfigurationId, @@ -96,7 +96,6 @@ public ResponseEntity getOneOfConfiguration(@PathVariab */ @PutMapping("courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity update(@PathVariable Long courseId, @PathVariable Long tutorialGroupsConfigurationId, @PathVariable Long tutorialGroupFreePeriodId, @RequestBody @Valid TutorialGroupFreePeriodDTO tutorialGroupFreePeriod) throws URISyntaxException { log.debug("REST request to update TutorialGroupFreePeriod: {} for tutorial group configuration: {} of course: {}", tutorialGroupFreePeriodId, tutorialGroupsConfigurationId, @@ -144,7 +143,6 @@ public ResponseEntity update(@PathVariable Long courseI */ @PostMapping("courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity create(@PathVariable Long courseId, @PathVariable Long tutorialGroupsConfigurationId, @RequestBody @Valid TutorialGroupFreePeriodDTO tutorialGroupFreePeriod) throws URISyntaxException { log.debug("REST request to create TutorialGroupFreePeriod: {} for tutorial group configuration: {} of course: {}", tutorialGroupFreePeriod, tutorialGroupsConfigurationId, @@ -189,7 +187,6 @@ public ResponseEntity create(@PathVariable Long courseI */ @DeleteMapping("courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity delete(@PathVariable Long courseId, @PathVariable Long tutorialGroupsConfigurationId, @PathVariable Long tutorialGroupFreePeriodId) throws URISyntaxException { log.debug("REST request to delete TutorialGroupFreePeriod: {} of tutorial group configuration {} of course: {}", tutorialGroupFreePeriodId, tutorialGroupsConfigurationId, diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java index daa50435cf94..a82e0c9297ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java @@ -71,6 +71,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; @Profile(PROFILE_CORE) +@FeatureToggle(Feature.TutorialGroups) @RestController @RequestMapping("api/") public class TutorialGroupResource { @@ -131,7 +132,6 @@ public TutorialGroupResource(AuthorizationCheckService authorizationCheckService */ @GetMapping("tutorial-groups/{tutorialGroupId}/title") @EnforceAtLeastStudent - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity getTitle(@PathVariable Long tutorialGroupId) { log.debug("REST request to get title of TutorialGroup : {}", tutorialGroupId); return tutorialGroupRepository.getTutorialGroupTitle(tutorialGroupId).map(ResponseEntity::ok) @@ -147,7 +147,6 @@ public ResponseEntity getTitle(@PathVariable Long tutorialGroupId) { */ @GetMapping("courses/{courseId}/tutorial-groups/campus-values") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity> getUniqueCampusValues(@PathVariable Long courseId) { log.debug("REST request to get unique campus values used for tutorial groups in course : {}", courseId); var course = courseRepository.findByIdElseThrow(courseId); @@ -165,7 +164,6 @@ public ResponseEntity> getUniqueCampusValues(@PathVariable Long cour */ @GetMapping("courses/{courseId}/tutorial-groups/language-values") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity> getUniqueLanguageValues(@PathVariable Long courseId) { log.debug("REST request to get unique language values used for tutorial groups in course : {}", courseId); var course = courseRepository.findByIdElseThrow(courseId); @@ -182,7 +180,6 @@ public ResponseEntity> getUniqueLanguageValues(@PathVariable Long co */ @GetMapping("courses/{courseId}/tutorial-groups") @EnforceAtLeastStudent - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity> getAllForCourse(@PathVariable Long courseId) { log.debug("REST request to get all tutorial groups of course with id: {}", courseId); var course = courseRepository.findByIdElseThrow(courseId); @@ -202,7 +199,6 @@ public ResponseEntity> getAllForCourse(@PathVariable Long co */ @GetMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}") @EnforceAtLeastStudent - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity getOneOfCourse(@PathVariable Long courseId, @PathVariable Long tutorialGroupId) { log.debug("REST request to get tutorial group: {} of course: {}", tutorialGroupId, courseId); var course = courseRepository.findByIdElseThrow(courseId); @@ -221,7 +217,6 @@ public ResponseEntity getOneOfCourse(@PathVariable Long courseId, */ @PostMapping("courses/{courseId}/tutorial-groups") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity create(@PathVariable Long courseId, @RequestBody @Valid TutorialGroup tutorialGroup) throws URISyntaxException { log.debug("REST request to create TutorialGroup: {} in course: {}", tutorialGroup, courseId); if (tutorialGroup.getId() != null) { @@ -282,7 +277,6 @@ public ResponseEntity create(@PathVariable Long courseId, @Reques */ @DeleteMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity delete(@PathVariable Long courseId, @PathVariable Long tutorialGroupId) { log.info("REST request to delete a TutorialGroup: {} of course: {}", tutorialGroupId, courseId); var tutorialGroupFromDatabase = this.tutorialGroupRepository.findByIdWithTeachingAssistantAndRegistrationsElseThrow(tutorialGroupId); @@ -317,7 +311,6 @@ public record TutorialGroupUpdateDTO(@Valid @NotNull TutorialGroup tutorialGroup */ @PutMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity update(@PathVariable long courseId, @PathVariable long tutorialGroupId, @RequestBody @Valid TutorialGroupUpdateDTO tutorialGroupUpdateDTO) { TutorialGroup updatedTutorialGroup = tutorialGroupUpdateDTO.tutorialGroup(); @@ -405,7 +398,6 @@ public ResponseEntity update(@PathVariable long courseId, @PathVa */ @DeleteMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/deregister/{studentLogin:" + Constants.LOGIN_REGEX + "}") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity deregisterStudent(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @PathVariable String studentLogin) { log.debug("REST request to deregister {} student from tutorial group : {}", studentLogin, tutorialGroupId); var tutorialGroupFromDatabase = this.tutorialGroupRepository.findByIdElseThrow(tutorialGroupId); @@ -427,7 +419,6 @@ public ResponseEntity deregisterStudent(@PathVariable Long courseId, @Path */ @PostMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/register/{studentLogin:" + Constants.LOGIN_REGEX + "}") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity registerStudent(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @PathVariable String studentLogin) { log.debug("REST request to register {} student to tutorial group : {}", studentLogin, tutorialGroupId); var tutorialGroupFromDatabase = this.tutorialGroupRepository.findByIdElseThrow(tutorialGroupId); @@ -454,7 +445,6 @@ public ResponseEntity registerStudent(@PathVariable Long courseId, @PathVa */ @PostMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/register-multiple") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity> registerMultipleStudentsToTutorialGroup(@PathVariable long courseId, @PathVariable long tutorialGroupId, @RequestBody Set studentDtos) { log.debug("REST request to register {} to tutorial group {}", studentDtos, tutorialGroupId); @@ -476,7 +466,6 @@ public ResponseEntity> registerMultipleStudentsToTutorialGroup(@ */ @PostMapping("courses/{courseId}/tutorial-groups/import") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity> importRegistrations(@PathVariable Long courseId, @RequestBody @Valid Set importDTOs) { log.debug("REST request to import registrations {} to course {}", importDTOs, courseId); @@ -549,7 +538,6 @@ private void checkEntityIdMatchesPathIds(TutorialGroup tutorialGroup, Optional exportTutorialGroupsToCSV(@PathVariable Long courseId, @RequestParam List fields) { log.debug("REST request to export TutorialGroups to CSV for course: {}", courseId); var course = courseRepository.findByIdElseThrow(courseId); @@ -580,7 +568,6 @@ public ResponseEntity exportTutorialGroupsToCSV(@PathVariable Long cours */ @GetMapping(value = "courses/{courseId}/tutorial-groups/export/json", produces = MediaType.APPLICATION_JSON_VALUE) @EnforceAtLeastInstructorInCourse - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity exportTutorialGroupsToJSON(@PathVariable Long courseId, @RequestParam List fields) { log.debug("REST request to export TutorialGroups to JSON for course: {}", courseId); try { diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java index 54790e628ba9..4d9c9459f65c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java @@ -56,6 +56,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; @Profile(PROFILE_CORE) +@FeatureToggle(Feature.TutorialGroups) @RestController @RequestMapping("api/") public class TutorialGroupSessionResource { @@ -101,7 +102,6 @@ public TutorialGroupSessionResource(TutorialGroupSessionRepository tutorialGroup */ @GetMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}") @EnforceAtLeastStudent - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity getOneOfTutorialGroup(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @PathVariable Long sessionId) { log.debug("REST request to get session: {} of tutorial group: {} of course {}", sessionId, tutorialGroupId, courseId); var session = tutorialGroupSessionRepository.findByIdElseThrow(sessionId); @@ -124,7 +124,6 @@ public ResponseEntity getOneOfTutorialGroup(@PathVariable */ @PutMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity update(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @PathVariable Long sessionId, @RequestBody @Valid TutorialGroupSessionDTO tutorialGroupSessionDTO) { log.debug("REST request to update session: {} of tutorial group: {} of course {}", sessionId, tutorialGroupId, courseId); @@ -170,7 +169,6 @@ public ResponseEntity update(@PathVariable Long courseId, */ @PatchMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/attendance-count") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity updateAttendanceCount(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @PathVariable Long sessionId, @RequestParam(required = false) @Min(0) @Max(3000) Integer attendanceCount) { log.debug("REST request to update attendance count of session: {} of tutorial group: {} of course {} to {}", sessionId, tutorialGroupId, courseId, attendanceCount); @@ -192,7 +190,6 @@ public ResponseEntity updateAttendanceCount(@PathVariable */ @DeleteMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity deleteSession(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @PathVariable Long sessionId) { log.debug("REST request to delete session: {} of tutorial group: {} of course {}", sessionId, tutorialGroupId, courseId); var sessionFromDatabase = this.tutorialGroupSessionRepository.findByIdElseThrow(sessionId); @@ -212,7 +209,6 @@ public ResponseEntity deleteSession(@PathVariable Long courseId, @PathVari */ @PostMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity create(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @RequestBody @Valid TutorialGroupSessionDTO tutorialGroupSessionDTO) throws URISyntaxException { log.debug("REST request to create TutorialGroupSession: {} for tutorial group: {}", tutorialGroupSessionDTO, tutorialGroupId); @@ -255,7 +251,6 @@ private TutorialGroupsConfiguration validateTutorialGroupConfiguration(@PathVari */ @PostMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/cancel") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity cancel(@PathVariable Long courseId, @PathVariable Long tutorialGroupId, @PathVariable Long sessionId, @RequestBody TutorialGroupStatusDTO tutorialGroupStatusDTO) throws URISyntaxException { log.debug("REST request to cancel session: {} of tutorial group: {} of course {}", sessionId, tutorialGroupId, courseId); @@ -283,7 +278,6 @@ public ResponseEntity cancel(@PathVariable Long courseId, */ @PostMapping("courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/activate") @EnforceAtLeastTutor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity activate(@PathVariable long courseId, @PathVariable long tutorialGroupId, @PathVariable long sessionId) throws URISyntaxException { log.debug("REST request to activate session: {} of tutorial group: {} of course {}", sessionId, tutorialGroupId, courseId); var sessionToActivate = tutorialGroupSessionRepository.findByIdElseThrow(sessionId); diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java index 4e9c9212ee4b..dc26c5bd4e09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java @@ -36,6 +36,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; @Profile(PROFILE_CORE) +@FeatureToggle(Feature.TutorialGroups) @RestController @RequestMapping("api/") public class TutorialGroupsConfigurationResource { @@ -68,7 +69,6 @@ public TutorialGroupsConfigurationResource(TutorialGroupsConfigurationRepository */ @GetMapping("courses/{courseId}/tutorial-groups-configuration") @EnforceAtLeastStudent - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity getOneOfCourse(@PathVariable Long courseId) { log.debug("REST request to get tutorial groups configuration of course: {}", courseId); var course = courseRepository.findByIdElseThrow(courseId); @@ -85,7 +85,6 @@ public ResponseEntity getOneOfCourse(@PathVariable */ @PostMapping("courses/{courseId}/tutorial-groups-configuration") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity create(@PathVariable Long courseId, @RequestBody @Valid TutorialGroupsConfiguration tutorialGroupsConfiguration) throws URISyntaxException { log.debug("REST request to create TutorialGroupsConfiguration: {} for course: {}", tutorialGroupsConfiguration, courseId); @@ -120,7 +119,6 @@ public ResponseEntity create(@PathVariable Long cou */ @PutMapping("courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}") @EnforceAtLeastInstructor - @FeatureToggle(Feature.TutorialGroups) public ResponseEntity update(@PathVariable Long courseId, @PathVariable Long tutorialGroupsConfigurationId, @RequestBody @Valid TutorialGroupsConfiguration updatedTutorialGroupConfiguration) { log.debug("REST request to update TutorialGroupsConfiguration: {} of course: {}", updatedTutorialGroupConfiguration, courseId); diff --git a/src/main/resources/config/application-buildagent.yml b/src/main/resources/config/application-buildagent.yml index b013910100e5..1439567b2cc9 100644 --- a/src/main/resources/config/application-buildagent.yml +++ b/src/main/resources/config/application-buildagent.yml @@ -18,7 +18,7 @@ artemis: specify-concurrent-builds: false concurrent-build-size: 1 asynchronous: true - timeout-seconds: 240 + timeout-seconds: 120 build-container-prefix: local-ci- proxies: use-system-proxy: false diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 924d087ec8f2..3924e2d804f9 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -91,6 +91,8 @@ artemis: default: "ghcr.io/ls1intum/artemis-rust-docker:v0.9.70" javascript: default: "ghcr.io/ls1intum/artemis-javascript-docker:v1.0.0" + r: + default: "ghcr.io/ls1intum/artemis-r-docker:v1.0.0" management: endpoints: diff --git a/src/main/resources/config/liquibase/changelog/20240816150000_changelog.xml b/src/main/resources/config/liquibase/changelog/20240816150000_changelog.xml new file mode 100644 index 000000000000..b3fa6c9e1c47 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20240816150000_changelog.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20240825191919_changelog.xml b/src/main/resources/config/liquibase/changelog/20240825191919_changelog.xml new file mode 100644 index 000000000000..3ae7fd7ea038 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20240825191919_changelog.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + DELETE FROM iris_sub_settings WHERE discriminator = 'HESTIA'; + + + + + + + + + + + UPDATE iris_sub_settings + SET allowed_variants = 'default', selected_variant = 'default' + WHERE id IN ( + SELECT iris_chat_settings_id FROM iris_settings WHERE discriminator = 'GLOBAL' + UNION + SELECT iris_competency_generation_settings_id FROM iris_settings WHERE discriminator = 'GLOBAL' + UNION + SELECT iris_lecture_ingestion_settings_id FROM iris_settings WHERE discriminator = 'GLOBAL' + ); + + + + + + + + + + + + + + DELETE FROM iris_json_message_content WHERE id IN ( + SELECT iris_message_content.id FROM iris_message_content + JOIN iris_message ON iris_message_content.message_id = iris_message.id + JOIN iris_session ON iris_message.session_id = iris_session.id + WHERE iris_session.discriminator = 'HESTIA' + ); + DELETE FROM iris_text_message_content WHERE id IN ( + SELECT iris_message_content.id FROM iris_message_content + JOIN iris_message ON iris_message_content.message_id = iris_message.id + JOIN iris_session ON iris_message.session_id = iris_session.id + WHERE iris_session.discriminator = 'HESTIA' + ); + DELETE FROM iris_message_content WHERE message_id IN ( + SELECT iris_message.id FROM iris_message + JOIN iris_session ON iris_message.session_id = iris_session.id + WHERE iris_session.discriminator = 'HESTIA' + ); + DELETE FROM iris_message WHERE session_id IN ( + SELECT id FROM iris_session WHERE discriminator = 'HESTIA' + ); + DELETE FROM iris_session WHERE discriminator = 'HESTIA'; + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20240902175045_changelog.xml b/src/main/resources/config/liquibase/changelog/20240902175045_changelog.xml new file mode 100644 index 000000000000..6344b448df92 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20240902175045_changelog.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20240909090909_changelog.xml b/src/main/resources/config/liquibase/changelog/20240909090909_changelog.xml new file mode 100644 index 000000000000..86b235b1d655 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20240909090909_changelog.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20240924125742_changelog.xml b/src/main/resources/config/liquibase/changelog/20240924125742_changelog.xml new file mode 100644 index 000000000000..c74139c77c6d --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20240924125742_changelog.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 2c204094c0ff..d496528a13ec 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -22,7 +22,12 @@ + + + + + diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index 1b148cca8b2b..0879e526d4f4 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -79,8 +79,6 @@ email.notification.aux.information.release.date=Release Date : {0} email.notification.aux.information.due.date=Due Date : {0} email.notification.aux.information.submission.date=Submission Date : {0} -email.notification.aux.notification.post.content=Content: - # Exercise Types email.notification.aux.exercise.type.quiz=The quiz exercise email.notification.aux.exercise.type.programming=The programming exercise diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties index f1fa989cf5f7..289a66b117a2 100644 --- a/src/main/resources/i18n/messages_de.properties +++ b/src/main/resources/i18n/messages_de.properties @@ -15,7 +15,7 @@ email.activation.text2=Grüße email.signature=Das Artemis Team. # Creation email -email.creation.text1=Dein Artemis Zugang wurde angelegt, bitte klicke auf den Link um dich anzumelden: +email.creation.text1=Dein Artemis Zugang wurde angelegt, bitte klicke auf den Link, um dich anzumelden: # Reset email email.reset.title=Artemis Passwort zurücksetzen @@ -26,7 +26,7 @@ email.reset.text2=Grüße, # SAML2 Account created email.saml.title=Artemis Account angelegt email.saml.greeting=Liebe(r) {0} -email.saml.text1=Dein Artemis Account wurde angelegt. Setze über den Link ein lokales App-Passwort, um auf Artemis und die verknüpften Dienste (Git, Build-Server,...) zuzugreifen. +email.saml.text1=Dein Artemis Account wurde angelegt. Setze über den Link ein lokales App-Passwort, um auf Artemis und die verknüpften Dienste (Git, Build-Server, ...) zuzugreifen. email.saml.text2=Nach Ablauf des Links kann das Passwort weiterhin über die "Passwort vergessen"-Funktion gesetzt werden. email.saml.text3=Grüße, email.saml.username=Nutzername: {0} @@ -48,7 +48,7 @@ email.notification.group.editors="Editor:innen" # Notification Titles (based on originating type) email.notification.title.attachment=Der Anhang "{0}" für die Vorlesung "{1}" in dem Kurs "{2}" wurde aktualisiert. -email.notification.title.file.submission.successful=Die Einreichung der Dateiupload-aufgabe "{0}" in dem Kurs "{1}" war erfolgreich. +email.notification.title.file.submission.successful=Die Einreichung der Dateiupload-Aufgabe "{0}" in dem Kurs "{1}" war erfolgreich. email.notification.title.exercise.submission.assessed=Die eingereichte Lösung für die Aufgabe "{0}" in dem Kurs "{1}" wurde korrigiert. email.notification.title.duplicate.test.cases="{0}" in dem Kurs"{1}" hat mehrere Testfälle mit gleichen Namen! Dieser kritische Fehler sollte so früh wie möglich korrigiert werden, sonst treten Probleme bei der Erstellung von Ergebnissen für Studierende auf! @@ -61,7 +61,7 @@ email.notification.title.exercise.practice="{0}" im Kurs "{1}" wurde zum Üben f # Exercise Info email.notification.title.exercise.information=Informationen zu der Aufgabe: -email.notification.title.exercise.information.difficulty=Schwierigkeitsstufe : {0} +email.notification.title.exercise.information.difficulty=Schwierigkeitsstufe: {0} email.notification.title.exercise.information.max=Anzahl an Punkten: {0} email.notification.title.exercise.information.bonus=Anzahl an Bonus Punkten: {0} email.notification.title.exercise.information.possible=Anzahl maximal erreichbarer Punkte: {0} @@ -69,8 +69,8 @@ email.notification.aux.information.exercise.score=Dein erreichtes Ergebnis: {0}% # Auxiliary -email.notification.aux.notification.text.header.change.message=Änderungsnachricht : -email.notification.aux.footer=Diese und ähnliche Emails können (de)aktiviert werden: +email.notification.aux.notification.text.header.change.message=Änderungsnachricht: +email.notification.aux.footer=Diese und ähnliche E-Mails können (de)aktiviert werden: email.notification.aux.footer.link=Benachrichtigungseinstellungen in Artemis email.notification.aux.open.button=In Artemis öffnen email.notification.aux.emergency.link.text=Alternativ kann auch folgender Link verwendet werden: @@ -79,8 +79,6 @@ email.notification.aux.information.release.date=Veröffentlichungsdatum: {0} email.notification.aux.information.due.date=Abgabezeitpunkt: {0} email.notification.aux.information.submission.date=Einreichungsdatum: {0} -email.notification.aux.notification.post.content=Inhalt: - # Exercise Types email.notification.aux.exercise.type.quiz=Die Quizaufgabe email.notification.aux.exercise.type.programming=Die Programmieraufgabe @@ -95,7 +93,7 @@ email.notification.aux.difficulty.hard=Schwer # Plagiarism email.plagiarism.title=Neuer Plagiatsfall: Übung "{0}" im Kurs "{1}" -email.plagiarism.cpc.title=Neue signifikante bereinstimmung: Aufgabe "{0}" im Kurs "{1}" +email.plagiarism.cpc.title=Neue signifikante ?bereinstimmung: Aufgabe "{0}" im Kurs "{1}" email.notification.title.post.plagiarismVerdict=Entscheidung zum Plagiatsfall in der Aufgabe {0} gefallen email.notification.aux.plagiarismVerdict.plagiarism=Der Fall wird als Plagiat angesehen! email.notification.aux.plagiarismVerdict.point.deduction=Wegen des Plagiatsfalls ziehen wir dir Punkte in der Aufgabe ab! @@ -124,8 +122,8 @@ email.dataExportFailedAdmin.actionItemList = Bitte führe die folgenden beiden A email.dataExportFailedAdmin.actionItem1 = \u2022 Stelle sicher, dass die Konfiguration deiner Artemis Instanz korrekt ist. email.dataExportFailedAdmin.actionItem2 = \u2022 Falls du weitere Hilfe benötigst, kontaktiere das Artemis Entwicklungsteam, indem du mit dem folgenden Link ein Issue auf GitHub erstellst: email.dataExportFailedAdmin.githubLink = Link um ein Issue im Artemis GitHub Projekt anzulegen -email.successfulDataExportCreationsAdmin.title = Angeforderte Datenexporte wurden fr deine Instanz erfolgreich erstellt -email.successfulDataExportCreationsAdmin.text = Datenexporte fr die folgenden Nutzer wurden erfolgreich erstellt als der Job um die Datenexporte zu erstellen zuletzt ausgefhrt wurde: +email.successfulDataExportCreationsAdmin.title = Angeforderte Datenexporte wurden f?r deine Instanz erfolgreich erstellt +email.successfulDataExportCreationsAdmin.text = Datenexporte f?r die folgenden Nutzer wurden erfolgreich erstellt als der Job um die Datenexporte zu erstellen zuletzt ausgef?hrt wurde: email.successfulDataExportCreationsAdmin.userLogin = \u2022 {0} # Email Subjects # The reason for the format artemisApp.{notificationCategory}.title.{notificicationType} is that these placeholders are also used in the client and this is the format used there @@ -138,7 +136,7 @@ artemisApp.groupNotification.title.newAnnouncementPost = Neue Ankündigung artemisApp.singleUserNotification.title.exerciseSubmissionAssessed = Übungsabgabe bewertet artemisApp.singleUserNotification.title.fileSubmissionSuccessful = Dateiabgabe erfolgreich artemisApp.singleUserNotification.title.newPlagiarismCaseStudent = Neuer Plagiatsfall -artemisApp.singleUserNotification.title.newPlagiarismCaseStudentSignificantSimilarity = Neue signifikante bereinstimmung +artemisApp.singleUserNotification.title.newPlagiarismCaseStudentSignificantSimilarity = Neue signifikante ?bereinstimmung artemisApp.singleUserNotification.title.plagiarismCaseVerdictStudent = Urteil zu deinem Plagiatsfall artemisApp.singleUserNotification.title.tutorialGroupRegistrationStudent = Du wurdest für eine Übungsgruppe registriert artemisApp.singleUserNotification.title.tutorialGroupDeregistrationStudent = Du wurdest von einer Übungsgruppe abgemeldet diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties index 8895514a5364..ef2bc15f8c9b 100644 --- a/src/main/resources/i18n/messages_en.properties +++ b/src/main/resources/i18n/messages_en.properties @@ -29,7 +29,7 @@ email.saml.greeting=Dear {0} email.saml.text1=Your Artemis account has been created. A local Artemis password is only needed to access Git and build services. To create your local Artemis password click the link below: email.saml.text2=After expiration of this link you can use the "password-reset" button. email.saml.text3=Regards, -email.saml.username=User name: {0} +email.saml.username=Username: {0} email.saml.email=E-Mail: {0} # Weekly summary email @@ -79,8 +79,6 @@ email.notification.aux.information.release.date=Release Date : {0} email.notification.aux.information.due.date=Due Date : {0} email.notification.aux.information.submission.date=Submission Date : {0} -email.notification.aux.notification.post.content=Content: - # Exercise Types email.notification.aux.exercise.type.quiz=The quiz exercise email.notification.aux.exercise.type.programming=The programming exercise @@ -121,11 +119,11 @@ email.dataExportFailedAdmin.text = The data export for the user with the login email.dataExportFailedAdmin.textFailed = failed. email.dataExportFailedAdmin.reason = The exception message was the following: {0} email.dataExportFailedAdmin.actionItemList = Please complete the following action items: -email.dataExportFailedAdmin.actionItem1 = \u2022 Make sure the configuration for your Artemis instance is correct. +email.dataExportFailedAdmin.actionItem1 = \u2022 Make sure the configuration for your Artemis instance is correct. email.dataExportFailedAdmin.actionItem2 = \u2022 If you need further help, please contact the Artemis developers by opening an issue on GitHub using the link below: email.dataExportFailedAdmin.githubLink = Link to open an issue on the Artemis GitHub project email.successfulDataExportCreationsAdmin.title = Successfully created requested data exports for your instance -email.successfulDataExportCreationsAdmin.text = Data exports for the following users were successfully created when the data export creation job was ran: +email.successfulDataExportCreationsAdmin.text = Data exports for the following users were successfully created when the data export creation job was running: email.successfulDataExportCreationsAdmin.userLogin = \u2022 {0} # Email Subjects diff --git a/src/main/resources/templates/aeolus/assembler/default.sh b/src/main/resources/templates/aeolus/assembler/default.sh index cca62d776297..e5a322facd87 100644 --- a/src/main/resources/templates/aeolus/assembler/default.sh +++ b/src/main/resources/templates/aeolus/assembler/default.sh @@ -8,15 +8,15 @@ provide_environment_information () { python3 --version pip3 --version echo "--------------------Contents of tests repository--------------------" - ls -la tests + ls -la ${testWorkingDirectory} echo "---------------------------------------------" echo "--------------------Contents of assignment repository--------------------" - ls -la assignment + ls -la ${studentParentWorkingDirectoryName} echo "---------------------------------------------" #Fallback in case Docker does not work as intended - REQ_FILE=tests/requirements.txt + REQ_FILE=${testWorkingDirectory}/requirements.txt if [ -f "$REQ_FILE" ]; then - pip3 install --user -r tests/requirements.txt + pip3 install --user -r ${testWorkingDirectory}/requirements.txt else echo "$REQ_FILE does not exist" fi @@ -25,18 +25,18 @@ provide_environment_information () { prepare_makefile () { echo '⚙️ executing prepare_makefile' #!/usr/bin/env bash - rm -f assignment/{GNUmakefile, Makefile, makefile} - rm -f assignment/io.inc - cp -f tests/Makefile assignment/Makefile || exit 2 - cp -f tests/io.inc assignment/io.inc || exit 2 + rm -f ${studentParentWorkingDirectoryName}/{GNUmakefile, Makefile, makefile} + rm -f ${studentParentWorkingDirectoryName}/io.inc + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + cp -f ${testWorkingDirectory}/io.inc ${studentParentWorkingDirectoryName}/io.inc || exit 2 } run_and_compile () { echo '⚙️ executing run_and_compile' - cd tests - python3 compileTest.py ../assignment/ + cd ${testWorkingDirectory} + python3 compileTest.py ../${studentParentWorkingDirectoryName}/ rm compileTest.py - cp result.xml ../assignment/result.xml + cp result.xml ../${studentParentWorkingDirectoryName}/result.xml } junit () { diff --git a/src/main/resources/templates/aeolus/assembler/default.yaml b/src/main/resources/templates/aeolus/assembler/default.yaml index 3017be0a331b..7649ec646a51 100644 --- a/src/main/resources/templates/aeolus/assembler/default.yaml +++ b/src/main/resources/templates/aeolus/assembler/default.yaml @@ -7,15 +7,15 @@ actions: python3 --version pip3 --version echo "--------------------Contents of tests repository--------------------" - ls -la tests + ls -la ${testWorkingDirectory} echo "---------------------------------------------" echo "--------------------Contents of assignment repository--------------------" - ls -la assignment + ls -la ${studentParentWorkingDirectoryName} echo "---------------------------------------------" #Fallback in case Docker does not work as intended - REQ_FILE=tests/requirements.txt + REQ_FILE=${testWorkingDirectory}/requirements.txt if [ -f "$REQ_FILE" ]; then - pip3 install --user -r tests/requirements.txt + pip3 install --user -r ${testWorkingDirectory}/requirements.txt else echo "$REQ_FILE does not exist" fi @@ -23,17 +23,17 @@ actions: - name: prepare_makefile script: |- #!/usr/bin/env bash - rm -f assignment/{GNUmakefile, Makefile, makefile} - rm -f assignment/io.inc - cp -f tests/Makefile assignment/Makefile || exit 2 - cp -f tests/io.inc assignment/io.inc || exit 2 + rm -f ${studentParentWorkingDirectoryName}/{GNUmakefile, Makefile, makefile} + rm -f ${studentParentWorkingDirectoryName}/io.inc + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + cp -f ${testWorkingDirectory}/io.inc ${studentParentWorkingDirectoryName}/io.inc || exit 2 runAlways: false - name: run_and_compile script: |- - cd tests - python3 compileTest.py ../assignment/ + cd ${testWorkingDirectory} + python3 compileTest.py ../${studentParentWorkingDirectoryName}/ rm compileTest.py - cp result.xml ../assignment/result.xml + cp result.xml ../${studentParentWorkingDirectoryName}/result.xml runAlways: false - name: junit script: |- @@ -41,6 +41,6 @@ actions: runAlways: true results: - name: junit_result.xml - path: assignment/result.xml + path: ${studentParentWorkingDirectoryName}/result.xml type: junit before: true diff --git a/src/main/resources/templates/aeolus/c/fact.sh b/src/main/resources/templates/aeolus/c/fact.sh index 3596904b322b..4f7252eefaba 100644 --- a/src/main/resources/templates/aeolus/c/fact.sh +++ b/src/main/resources/templates/aeolus/c/fact.sh @@ -8,8 +8,8 @@ setup_the_build_environment () { # Task Description: # Build and run all tests # ------------------------------ - # Updating assignment and test-reports ownership... - sudo chown artemis_user:artemis_user assignment/ -R || true + # Updating ${studentParentWorkingDirectoryName} and test-reports ownership... + sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R || true sudo mkdir test-reports sudo chown artemis_user:artemis_user test-reports/ -R || true } @@ -22,13 +22,13 @@ build_and_run_all_tests () { # Build and run all tests # ------------------------------ - rm -f assignment/GNUmakefile - rm -f assignment/Makefile - cp -f tests/Makefile assignment/Makefile || exit 2 - cd tests + rm -f ${studentParentWorkingDirectoryName}/GNUmakefile + rm -f ${studentParentWorkingDirectoryName}/Makefile + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + cd ${testWorkingDirectory} python3 Tests.py rm Tests.py - rm -rf ./tests || true + rm -rf ./${testWorkingDirectory} || true } main () { diff --git a/src/main/resources/templates/aeolus/c/fact.yaml b/src/main/resources/templates/aeolus/c/fact.yaml index 2cca1f9526b3..9d3527e65503 100644 --- a/src/main/resources/templates/aeolus/c/fact.yaml +++ b/src/main/resources/templates/aeolus/c/fact.yaml @@ -8,7 +8,7 @@ actions: # Build and run all tests # ------------------------------ # Updating assignment and test-reports ownership... - sudo chown artemis_user:artemis_user assignment/ -R || true + sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R || true sudo mkdir test-reports sudo chown artemis_user:artemis_user test-reports/ -R || true runAlways: false @@ -20,13 +20,13 @@ actions: # Build and run all tests # ------------------------------ - rm -f assignment/GNUmakefile - rm -f assignment/Makefile - cp -f tests/Makefile assignment/Makefile || exit 2 - cd tests + rm -f ${studentParentWorkingDirectoryName}/GNUmakefile + rm -f ${studentParentWorkingDirectoryName}/Makefile + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + cd ${testWorkingDirectory} python3 Tests.py rm Tests.py - rm -rf ./tests || true + rm -rf ./${testWorkingDirectory} || true runAlways: false results: - name: junit_test-reports/tests-results.xml diff --git a/src/main/resources/templates/aeolus/c/gcc.sh b/src/main/resources/templates/aeolus/c/gcc.sh index 259f0bd886e0..3272660657a1 100644 --- a/src/main/resources/templates/aeolus/c/gcc.sh +++ b/src/main/resources/templates/aeolus/c/gcc.sh @@ -10,13 +10,13 @@ setup_the_build_environment () { # Build and run all tests # ------------------------------ - # Updating assignment and test-reports ownership... - sudo chown artemis_user:artemis_user assignment/ -R + # Updating ${studentParentWorkingDirectoryName} and test-reports ownership... + sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R mkdir test-reports chown artemis_user:artemis_user test-reports/ -R # assignment - cd tests + cd ${testWorkingDirectory} REQ_FILE=requirements.txt if [ -f "$REQ_FILE" ]; then pip3 install --user -r requirements.txt || true @@ -35,18 +35,18 @@ setup_makefile () { # Setup makefile # ------------------------------ - shadowFilePath="../tests/testUtils/c/shadow_exec.c" + shadowFilePath="../${testWorkingDirectory}/testUtils/c/shadow_exec.c" - foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' assignment/Makefile` + foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' ${studentParentWorkingDirectoryName}/Makefile` - foundSource=`grep -m 1 'SOURCE\s*=' assignment/Makefile` + foundSource=`grep -m 1 'SOURCE\s*=' ${studentParentWorkingDirectoryName}/Makefile` foundSource="$foundSource $shadowFilePath" - rm -f assignment/GNUmakefile - rm -f assignment/makefile + rm -f ${studentParentWorkingDirectoryName}/GNUmakefile + rm -f ${studentParentWorkingDirectoryName}/makefile - cp -f tests/Makefile assignment/Makefile || exit 2 - sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" assignment/Makefile + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" ${studentParentWorkingDirectoryName}/Makefile } build_and_run_all_tests () { @@ -58,10 +58,10 @@ build_and_run_all_tests () { # Build and run all tests if the compilation succeeds # ------------------------------ sudo chown artemis_user:artemis_user . - gcc -c -Wall assignment/*.c || error=true + gcc -c -Wall ${studentParentWorkingDirectoryName}/*.c || error=true if [ ! $error ] then - cd tests || exit 0 + cd ${testWorkingDirectory} || exit 0 python3 Tests.py || true fi } diff --git a/src/main/resources/templates/aeolus/c/gcc.yaml b/src/main/resources/templates/aeolus/c/gcc.yaml index 622b2148279d..29b2e2c635ec 100644 --- a/src/main/resources/templates/aeolus/c/gcc.yaml +++ b/src/main/resources/templates/aeolus/c/gcc.yaml @@ -10,12 +10,12 @@ actions: # ------------------------------ # Updating assignment and test-reports ownership... - sudo chown artemis_user:artemis_user assignment/ -R + sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R mkdir test-reports chown artemis_user:artemis_user test-reports/ -R # assignment - cd tests + cd ${testWorkingDirectory} REQ_FILE=requirements.txt if [ -f "$REQ_FILE" ]; then pip3 install --user -r requirements.txt || true @@ -33,18 +33,18 @@ actions: # Setup makefile # ------------------------------ - shadowFilePath="../tests/testUtils/c/shadow_exec.c" + shadowFilePath="../${testWorkingDirectory}/testUtils/c/shadow_exec.c" - foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' assignment/Makefile` + foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' ${studentParentWorkingDirectoryName}/Makefile` - foundSource=`grep -m 1 'SOURCE\s*=' assignment/Makefile` + foundSource=`grep -m 1 'SOURCE\s*=' ${studentParentWorkingDirectoryName}/Makefile` foundSource="$foundSource $shadowFilePath" - rm -f assignment/GNUmakefile - rm -f assignment/makefile + rm -f ${studentParentWorkingDirectoryName}/GNUmakefile + rm -f ${studentParentWorkingDirectoryName}/makefile - cp -f tests/Makefile assignment/Makefile || exit 2 - sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" assignment/Makefile + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" ${studentParentWorkingDirectoryName}/Makefile runAlways: false - name: build_and_run_all_tests script: |- @@ -55,10 +55,10 @@ actions: # Build and run all tests if the compilation succeeds # ------------------------------ sudo chown artemis_user:artemis_user . - gcc -c -Wall assignment/*.c || error=true + gcc -c -Wall ${studentParentWorkingDirectoryName}/*.c || error=true if [ ! $error ] then - cd tests || exit 0 + cd ${testWorkingDirectory} || exit 0 python3 Tests.py || true fi runAlways: false diff --git a/src/main/resources/templates/aeolus/c/gcc_static.sh b/src/main/resources/templates/aeolus/c/gcc_static.sh index 96847a3bbc92..2dfa84c2a569 100644 --- a/src/main/resources/templates/aeolus/c/gcc_static.sh +++ b/src/main/resources/templates/aeolus/c/gcc_static.sh @@ -10,13 +10,13 @@ setup_the_build_environment () { # Build and run all tests # ------------------------------ - # Updating assignment and test-reports ownership... - sudo chown artemis_user:artemis_user assignment/ -R + # Updating ${studentParentWorkingDirectoryName} and test-reports ownership... + sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R mkdir test-reports chown artemis_user:artemis_user test-reports/ -R # assignment - cd tests + cd ${testWorkingDirectory} REQ_FILE=requirements.txt if [ -f "$REQ_FILE" ]; then pip3 install --user -r requirements.txt || true @@ -35,18 +35,18 @@ setup_makefile () { # Setup makefile # ------------------------------ - shadowFilePath="../tests/testUtils/c/shadow_exec.c" + shadowFilePath="../${testWorkingDirectory}/testUtils/c/shadow_exec.c" - foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' assignment/Makefile` + foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' ${studentParentWorkingDirectoryName}/Makefile` - foundSource=`grep -m 1 'SOURCE\s*=' assignment/Makefile` + foundSource=`grep -m 1 'SOURCE\s*=' ${studentParentWorkingDirectoryName}/Makefile` foundSource="$foundSource $shadowFilePath" - rm -f assignment/GNUmakefile - rm -f assignment/makefile + rm -f ${studentParentWorkingDirectoryName}/GNUmakefile + rm -f ${studentParentWorkingDirectoryName}/makefile - cp -f tests/Makefile assignment/Makefile || exit 2 - sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" assignment/Makefile + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" ${studentParentWorkingDirectoryName}/Makefile } build_and_run_all_tests () { @@ -58,10 +58,10 @@ build_and_run_all_tests () { # Build and run all tests if the compilation succeeds # ------------------------------ sudo chown artemis_user:artemis_user . - gcc -c -Wall assignment/*.c || error=true + gcc -c -Wall ${studentParentWorkingDirectoryName}/*.c || error=true if [ ! $error ] then - cd tests || exit 0 + cd ${testWorkingDirectory} || exit 0 python3 Tests.py || true else exit 1 diff --git a/src/main/resources/templates/aeolus/c/gcc_static.yaml b/src/main/resources/templates/aeolus/c/gcc_static.yaml index be9e9eb1dc2f..21c0b506f179 100644 --- a/src/main/resources/templates/aeolus/c/gcc_static.yaml +++ b/src/main/resources/templates/aeolus/c/gcc_static.yaml @@ -10,12 +10,12 @@ actions: # ------------------------------ # Updating assignment and test-reports ownership... - sudo chown artemis_user:artemis_user assignment/ -R + sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R mkdir test-reports chown artemis_user:artemis_user test-reports/ -R # assignment - cd tests + cd ${testWorkingDirectory} REQ_FILE=requirements.txt if [ -f "$REQ_FILE" ]; then pip3 install --user -r requirements.txt || true @@ -33,18 +33,18 @@ actions: # Setup makefile # ------------------------------ - shadowFilePath="../tests/testUtils/c/shadow_exec.c" + shadowFilePath="../${testWorkingDirectory}/testUtils/c/shadow_exec.c" - foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' assignment/Makefile` + foundIncludeDirs=`grep -m 1 'INCLUDEDIRS\s*=' ${studentParentWorkingDirectoryName}/Makefile` - foundSource=`grep -m 1 'SOURCE\s*=' assignment/Makefile` + foundSource=`grep -m 1 'SOURCE\s*=' ${studentParentWorkingDirectoryName}/Makefile` foundSource="$foundSource $shadowFilePath" - rm -f assignment/GNUmakefile - rm -f assignment/makefile + rm -f ${studentParentWorkingDirectoryName}/GNUmakefile + rm -f ${studentParentWorkingDirectoryName}/makefile - cp -f tests/Makefile assignment/Makefile || exit 2 - sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" assignment/Makefile + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 + sed -i "s~\bINCLUDEDIRS\s*=.*~${foundIncludeDirs}~; s~\bSOURCE\s*=.*~${foundSource}~" ${studentParentWorkingDirectoryName}/Makefile runAlways: false - name: build_and_run_all_tests script: |- @@ -55,10 +55,10 @@ actions: # Build and run all tests if the compilation succeeds # ------------------------------ sudo chown artemis_user:artemis_user . - gcc -c -Wall assignment/*.c || error=true + gcc -c -Wall ${studentParentWorkingDirectoryName}/*.c || error=true if [ ! $error ] then - cd tests || exit 0 + cd ${testWorkingDirectory} || exit 0 python3 Tests.py || true else exit 1 diff --git a/src/main/resources/templates/aeolus/java/plain_maven_blackbox.sh b/src/main/resources/templates/aeolus/java/plain_maven_blackbox.sh index 46186cf50311..190bc88c4831 100644 --- a/src/main/resources/templates/aeolus/java/plain_maven_blackbox.sh +++ b/src/main/resources/templates/aeolus/java/plain_maven_blackbox.sh @@ -9,9 +9,9 @@ build () { checkers () { echo '⚙️ executing checkers' # all java files in the assignment folder should have maximal line length 80 - pipeline-helper line-length -l 80 -s assignment/ -e java + pipeline-helper line-length -l 80 -s ${studentParentWorkingDirectoryName}/ -e java # checks that the file exists and is not empty for non gui programs - pipeline-helper file-exists assignment/Tests.txt + pipeline-helper file-exists ${studentParentWorkingDirectoryName}/Tests.txt main_checker_output=$(pipeline-helper main-method -s target/classes) diff --git a/src/main/resources/templates/aeolus/java/plain_maven_blackbox.yaml b/src/main/resources/templates/aeolus/java/plain_maven_blackbox.yaml index 2b4428a585d1..02d0ff15b7ad 100644 --- a/src/main/resources/templates/aeolus/java/plain_maven_blackbox.yaml +++ b/src/main/resources/templates/aeolus/java/plain_maven_blackbox.yaml @@ -5,9 +5,9 @@ actions: - name: checkers script: |- # all java files in the assignment folder should have maximal line length 80 - pipeline-helper line-length -l 80 -s assignment/ -e java + pipeline-helper line-length -l 80 -s ${studentParentWorkingDirectoryName}/ -e java # checks that the file exists and is not empty for non gui programs - pipeline-helper file-exists assignment/Tests.txt + pipeline-helper file-exists ${studentParentWorkingDirectoryName}/Tests.txt main_checker_output=$(pipeline-helper main-method -s target/classes) diff --git a/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.sh b/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.sh index 9a6be87561a0..3a1af9d0d213 100644 --- a/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.sh +++ b/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.sh @@ -9,9 +9,9 @@ build () { checkers () { echo '⚙️ executing checkers' # all java files in the assignment folder should have maximal line length 80 - pipeline-helper line-length -l 80 -s assignment/ -e java + pipeline-helper line-length -l 80 -s ${studentParentWorkingDirectoryName}/ -e java # checks that the file exists and is not empty for non gui programs - pipeline-helper file-exists assignment/Tests.txt + pipeline-helper file-exists ${studentParentWorkingDirectoryName}/Tests.txt main_checker_output=$(pipeline-helper main-method -s target/classes) diff --git a/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.yaml b/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.yaml index 68c71c046d3d..7cd6a6c07773 100644 --- a/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.yaml +++ b/src/main/resources/templates/aeolus/java/plain_maven_blackbox_static.yaml @@ -5,9 +5,9 @@ actions: - name: checkers script: |- # all java files in the assignment folder should have maximal line length 80 - pipeline-helper line-length -l 80 -s assignment/ -e java + pipeline-helper line-length -l 80 -s ${studentParentWorkingDirectoryName}/ -e java # checks that the file exists and is not empty for non gui programs - pipeline-helper file-exists assignment/Tests.txt + pipeline-helper file-exists ${studentParentWorkingDirectoryName}/Tests.txt main_checker_output=$(pipeline-helper main-method -s target/classes) diff --git a/src/main/resources/templates/aeolus/ocaml/default.sh b/src/main/resources/templates/aeolus/ocaml/default.sh index ac1cf8b65b8d..f5b5f595b38d 100644 --- a/src/main/resources/templates/aeolus/ocaml/default.sh +++ b/src/main/resources/templates/aeolus/ocaml/default.sh @@ -3,7 +3,7 @@ set -e export AEOLUS_INITIAL_DIRECTORY=${PWD} build_and_test_the_code () { echo '⚙️ executing build_and_test_the_code' - cd "tests" + cd "${testWorkingDirectory}" # the build process is specified in `run.sh` in the test repository chmod +x run.sh ./run.sh -s diff --git a/src/main/resources/templates/aeolus/ocaml/default.yaml b/src/main/resources/templates/aeolus/ocaml/default.yaml index df5aef046d3a..70cdfcad1b9f 100644 --- a/src/main/resources/templates/aeolus/ocaml/default.yaml +++ b/src/main/resources/templates/aeolus/ocaml/default.yaml @@ -5,7 +5,7 @@ actions: # the build process is specified in `run.sh` in the test repository chmod +x run.sh ./run.sh -s - workdir: tests + workdir: ${testWorkingDirectory} runAlways: false - name: junit script: '#empty script action, just for the results' diff --git a/src/main/resources/templates/aeolus/r/default.sh b/src/main/resources/templates/aeolus/r/default.sh new file mode 100644 index 000000000000..1d0b32e87105 --- /dev/null +++ b/src/main/resources/templates/aeolus/r/default.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +set -e +export AEOLUS_INITIAL_DIRECTORY=${PWD} +install () { + echo '⚙️ executing install' + R CMD INSTALL assignment +} + +run_all_tests () { + echo '⚙️ executing run_all_tests' + Rscript -e 'library("testthat"); options(testthat.output_file = "junit.xml"); test_local(".", reporter = "junit")' +} + +main () { + if [[ "${1}" == "aeolus_sourcing" ]]; then + return 0 # just source to use the methods in the subshell, no execution + fi + local _script_name + _script_name=${BASH_SOURCE[0]:-$0} + cd "${AEOLUS_INITIAL_DIRECTORY}" + bash -c "source ${_script_name} aeolus_sourcing; install" + cd "${AEOLUS_INITIAL_DIRECTORY}" + bash -c "source ${_script_name} aeolus_sourcing; run_all_tests" +} + +main "${@}" diff --git a/src/main/resources/templates/aeolus/r/default.yaml b/src/main/resources/templates/aeolus/r/default.yaml new file mode 100644 index 000000000000..a41d23c6f012 --- /dev/null +++ b/src/main/resources/templates/aeolus/r/default.yaml @@ -0,0 +1,14 @@ +api: v0.0.1 +metadata: + name: R + id: r + description: Test package using testthat +actions: + - name: install + script: R CMD INSTALL assignment + - name: run_all_tests + script: Rscript -e 'library("testthat"); options(testthat.output_file = "junit.xml"); test_local(".", reporter = "junit")' + results: + - name: junit + path: tests/testthat/junit.xml + type: junit diff --git a/src/main/resources/templates/aeolus/swift/plain.sh b/src/main/resources/templates/aeolus/swift/plain.sh index 2673e861d564..71387b392783 100644 --- a/src/main/resources/templates/aeolus/swift/plain.sh +++ b/src/main/resources/templates/aeolus/swift/plain.sh @@ -4,12 +4,12 @@ set -e build_and_test_the_code () { echo '⚙️ executing build_and_test_the_code' # copy test files - cp -R Tests assignment - cp Package.swift assignment + cp -R Tests ${studentParentWorkingDirectoryName} + cp Package.swift ${studentParentWorkingDirectoryName} - # In order to get the correct console output we need to execute the command within the assignment directory + # In order to get the correct console output we need to execute the command within the ${studentParentWorkingDirectoryName} directory # swift build - cd assignment + cd ${studentParentWorkingDirectoryName} swift build || error=true if [ ! $error ] diff --git a/src/main/resources/templates/aeolus/swift/plain.yaml b/src/main/resources/templates/aeolus/swift/plain.yaml index c90994ea4c4a..48211dee715a 100644 --- a/src/main/resources/templates/aeolus/swift/plain.yaml +++ b/src/main/resources/templates/aeolus/swift/plain.yaml @@ -3,12 +3,12 @@ actions: - name: build_and_test_the_code script: |- # copy test files - cp -R Tests assignment - cp Package.swift assignment + cp -R Tests ${studentParentWorkingDirectoryName} + cp Package.swift ${studentParentWorkingDirectoryName} # In order to get the correct console output we need to execute the command within the assignment directory # swift build - cd assignment + cd ${studentParentWorkingDirectoryName} swift build || error=true if [ ! $error ] @@ -24,6 +24,6 @@ actions: runAlways: false results: - name: junit_tests.xml - path: assignment/tests.xml + path: ${studentParentWorkingDirectoryName}/tests.xml type: junit before: true diff --git a/src/main/resources/templates/aeolus/swift/plain_static.sh b/src/main/resources/templates/aeolus/swift/plain_static.sh index 835494ff5454..3bbaa9fe0662 100644 --- a/src/main/resources/templates/aeolus/swift/plain_static.sh +++ b/src/main/resources/templates/aeolus/swift/plain_static.sh @@ -3,14 +3,14 @@ set -e export AEOLUS_INITIAL_DIRECTORY=${PWD} build_and_test_the_code () { echo '⚙️ executing build_and_test_the_code' - cp -R Sources assignment + cp -R Sources ${studentParentWorkingDirectoryName} # copy test files - cp -R Tests assignment - cp Package.swift assignment + cp -R Tests ${studentParentWorkingDirectoryName} + cp Package.swift ${studentParentWorkingDirectoryName} - # In order to get the correct console output we need to execute the command within the assignment directory + # In order to get the correct console output we need to execute the command within the ${studentParentWorkingDirectoryName} directory # swift build - cd assignment + cd ${studentParentWorkingDirectoryName} swift build || error=true if [ ! $error ] @@ -28,10 +28,10 @@ build_and_test_the_code () { run_static_code_analysis () { echo '⚙️ executing run_static_code_analysis' # Copy SwiftLint rules - cp .swiftlint.yml assignment || true + cp .swiftlint.yml ${studentParentWorkingDirectoryName} || true # create target directory for SCA Parser mkdir target - cd assignment + cd ${studentParentWorkingDirectoryName} # Execute static code analysis swiftlint > ../target/swiftlint-result.xml } diff --git a/src/main/resources/templates/aeolus/swift/plain_static.yaml b/src/main/resources/templates/aeolus/swift/plain_static.yaml index c900edc82d44..72f683141903 100644 --- a/src/main/resources/templates/aeolus/swift/plain_static.yaml +++ b/src/main/resources/templates/aeolus/swift/plain_static.yaml @@ -2,14 +2,14 @@ api: v0.0.1 actions: - name: build_and_test_the_code script: |- - cp -R Sources assignment + cp -R Sources ${studentParentWorkingDirectoryName} # copy test files - cp -R Tests assignment - cp Package.swift assignment + cp -R Tests ${studentParentWorkingDirectoryName} + cp Package.swift ${studentParentWorkingDirectoryName} # In order to get the correct console output we need to execute the command within the assignment directory # swift build - cd assignment + cd ${studentParentWorkingDirectoryName} swift build || error=true if [ ! $error ] @@ -26,10 +26,10 @@ actions: - name: run_static_code_analysis script: |- # Copy SwiftLint rules - cp .swiftlint.yml assignment || true + cp .swiftlint.yml ${studentParentWorkingDirectoryName} || true # create target directory for SCA Parser mkdir target - cd assignment + cd ${studentParentWorkingDirectoryName} # Execute static code analysis swiftlint > ../target/swiftlint-result.xml runAlways: true @@ -39,6 +39,6 @@ actions: before: false type: static-code-analysis - name: junit_tests.xml - path: assignment/tests.xml + path: ${studentParentWorkingDirectoryName}/tests.xml type: junit before: true diff --git a/src/main/resources/templates/aeolus/vhdl/default.sh b/src/main/resources/templates/aeolus/vhdl/default.sh index f4f5a3f3f609..747c1b20c58f 100644 --- a/src/main/resources/templates/aeolus/vhdl/default.sh +++ b/src/main/resources/templates/aeolus/vhdl/default.sh @@ -9,16 +9,16 @@ provide_environment_information () { pip3 --version echo "--------------------Contents of tests repository--------------------" - ls -la tests + ls -la ${testWorkingDirectory} echo "---------------------------------------------" echo "--------------------Contents of assignment repository--------------------" - ls -la assignment + ls -la ${studentParentWorkingDirectoryName} echo "---------------------------------------------" #Fallback in case Docker does not work as intended - REQ_FILE=tests/requirements.txt + REQ_FILE=${testWorkingDirectory}/requirements.txt if [ -f "$REQ_FILE" ]; then - pip3 install --user -r tests/requirements.txt || true + pip3 install --user -r ${testWorkingDirectory}/requirements.txt || true else echo "$REQ_FILE does not exist" fi @@ -26,16 +26,16 @@ provide_environment_information () { prepare_makefile () { echo '⚙️ executing prepare_makefile' - rm -f assignment/{GNUmakefile, Makefile, makefile} - cp -f tests/Makefile assignment/Makefile || exit 2 + rm -f ${studentParentWorkingDirectoryName}/{GNUmakefile, Makefile, makefile} + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 } run_and_compile () { echo '⚙️ executing run_and_compile' - cd "tests" - python3 compileTest.py ../assignment/ + cd "${testWorkingDirectory}" + python3 compileTest.py ../${studentParentWorkingDirectoryName}/ rm compileTest.py - cp result.xml ../assignment/result.xml + cp result.xml ../${studentParentWorkingDirectoryName}/result.xml } junit () { diff --git a/src/main/resources/templates/aeolus/vhdl/default.yaml b/src/main/resources/templates/aeolus/vhdl/default.yaml index 872f94622916..64bcb4365fc5 100644 --- a/src/main/resources/templates/aeolus/vhdl/default.yaml +++ b/src/main/resources/templates/aeolus/vhdl/default.yaml @@ -8,37 +8,37 @@ actions: pip3 --version echo "--------------------Contents of tests repository--------------------" - ls -la tests + ls -la ${testWorkingDirectory} echo "---------------------------------------------" echo "--------------------Contents of assignment repository--------------------" - ls -la assignment + ls -la ${studentParentWorkingDirectoryName} echo "---------------------------------------------" #Fallback in case Docker does not work as intended - REQ_FILE=tests/requirements.txt + REQ_FILE=${testWorkingDirectory}/requirements.txt if [ -f "$REQ_FILE" ]; then - pip3 install --user -r tests/requirements.txt || true + pip3 install --user -r ${testWorkingDirectory}/requirements.txt || true else echo "$REQ_FILE does not exist" fi runAlways: false - name: prepare_makefile script: |- - rm -f assignment/{GNUmakefile, Makefile, makefile} - cp -f tests/Makefile assignment/Makefile || exit 2 + rm -f ${studentParentWorkingDirectoryName}/{GNUmakefile, Makefile, makefile} + cp -f ${testWorkingDirectory}/Makefile ${studentParentWorkingDirectoryName}/Makefile || exit 2 runAlways: false - name: run_and_compile script: |- - python3 compileTest.py ../assignment/ + python3 compileTest.py ../${studentParentWorkingDirectoryName}/ rm compileTest.py - cp result.xml ../assignment/result.xml - workdir: tests + cp result.xml ../${studentParentWorkingDirectoryName}/result.xml + workdir: ${testWorkingDirectory} runAlways: false - name: junit script: '#empty script action, just for the results' runAlways: true results: - name: assignment_junit_results - path: assignment/result.xml + path: ${studentParentWorkingDirectoryName}/result.xml type: junit before: true diff --git a/src/main/resources/templates/haskell/test/.gitignore b/src/main/resources/templates/haskell/test/.gitignore index 38ce398dd22a..39312aeed502 100755 --- a/src/main/resources/templates/haskell/test/.gitignore +++ b/src/main/resources/templates/haskell/test/.gitignore @@ -3,10 +3,10 @@ test-reports/ # Subdirectories containing other repositories template/ -solution/ +${solutionWorkingDirectory}/ # Subdirectories with test submission -assignment/ +${studentParentWorkingDirectoryName}/ # Taken from https://github.com/github/gitignore diff --git a/src/main/resources/templates/haskell/test/readme.md b/src/main/resources/templates/haskell/test/readme.md index 7ab5dcefbf25..45ac2724c923 100644 --- a/src/main/resources/templates/haskell/test/readme.md +++ b/src/main/resources/templates/haskell/test/readme.md @@ -6,8 +6,8 @@ Tests are run using [stack](https://docs.haskellstack.org/en/stable/README/) in ## Setup -The executables specified in `test.cabal` expect the solution repository checked out in the `solution` subdirectory and -the submission checked out in the `assignment` subdirectory. +The executables specified in `test.cabal` expect the solution repository checked out in the `${solutionWorkingDirectory}` subdirectory and +the submission checked out in the `${studentParentWorkingDirectoryName}` subdirectory. Moreover, `test.cabal` provides an executable to test the template repository locally. For this, it expects the template repository in the `template` subdirectory. diff --git a/src/main/resources/templates/haskell/test/run.sh b/src/main/resources/templates/haskell/test/run.sh index 06169da575a2..562c1139cf0f 100755 --- a/src/main/resources/templates/haskell/test/run.sh +++ b/src/main/resources/templates/haskell/test/run.sh @@ -13,20 +13,20 @@ done shift $((OPTIND-1)) # check for symlinks as they might be abused to link to the sample solution -$safe && find assignment/ -type l | grep -q . && echo "Cannot build with symlinks in submission." && exit 1 +$safe && find ${studentParentWorkingDirectoryName}/ -type l | grep -q . && echo "Cannot build with symlinks in submission." && exit 1 # check for unsafe OPTIONS and OPTIONS_GHC pragma as they allow to overwrite command line arguments $safe && \ while IFS= read file; do cat $file | tr -d '\n' | grep -qim 1 "{-#[[:space:]]*options" && \ echo "Cannot build with \"{-# OPTIONS..\" pragma in source." && exit 1 -done < <(find assignment/src -type f) +done < <(find ${studentParentWorkingDirectoryName}/src -type f) # build the libraries - do not forget to set the right compilation flag (Prod) stack build --allow-different-user --flag test:Prod && \ # delete the solution and tests (so that students cannot access it) when in safe mode ($safe && \ - (rm -rf solution && rm -rf test) \ + (rm -rf ${solutionWorkingDirectory} && rm -rf test) \ ) \ # run the test executable and return 0 # Note: as a convention, a failed haskell tasty test suite returns 1, but this stops the JUnit Parser from running. diff --git a/src/main/resources/templates/haskell/test/test.cabal b/src/main/resources/templates/haskell/test/test.cabal index 7cf429c106e3..16977cf154b8 100644 --- a/src/main/resources/templates/haskell/test/test.cabal +++ b/src/main/resources/templates/haskell/test/test.cabal @@ -56,7 +56,7 @@ library submission -- by setting it to a non-existent program called `nonExistentCPP`. See -- https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/phases.html ghc-options: -fpackage-trust -trust base -pgmP nonExistentCPP - hs-source-dirs: assignment/src + hs-source-dirs: ${studentParentWorkingDirectoryName}/src exposed-modules: Exercise -- build the local template @@ -74,7 +74,7 @@ library template -- build the solution library solution import: common-all - hs-source-dirs: solution/src + hs-source-dirs: ${solutionWorkingDirectory}/src exposed-modules: Exercise -- run tests for a submission diff --git a/src/main/resources/templates/java/test/blackbox/projectTemplate/.gitignore b/src/main/resources/templates/java/test/blackbox/projectTemplate/.gitignore index 44c742ee253c..2bb4fca67c4f 100644 --- a/src/main/resources/templates/java/test/blackbox/projectTemplate/.gitignore +++ b/src/main/resources/templates/java/test/blackbox/projectTemplate/.gitignore @@ -1,4 +1,4 @@ -assignment/ +${studentParentWorkingDirectoryName}/ # Taken from https://github.com/github/gitignore diff --git a/src/main/resources/templates/java/test/gradle/projectTemplate/.gitignore b/src/main/resources/templates/java/test/gradle/projectTemplate/.gitignore index bde9056a0f14..964ec2319a13 100644 --- a/src/main/resources/templates/java/test/gradle/projectTemplate/.gitignore +++ b/src/main/resources/templates/java/test/gradle/projectTemplate/.gitignore @@ -1,5 +1,5 @@ .gradle -assignment/ +${studentParentWorkingDirectoryName}/ **/build/ !src/**/build/ target/ diff --git a/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle b/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle index c6d2e5f6689a..97be1ab67bfd 100644 --- a/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle +++ b/src/main/resources/templates/java/test/gradle/projectTemplate/build.gradle @@ -28,7 +28,7 @@ dependencies { // testImplementation(':${exerciseNamePomXml}-Solution') } -def assignmentSrcDir = "assignment/src" +def assignmentSrcDir = "${studentWorkingDirectoryNoSlash}" def studentOutputDir = sourceSets.main.java.destinationDirectory.get() // %static-code-analysis-start% def scaConfigDirectory = "$projectDir/staticCodeAnalysisConfig" diff --git a/src/main/resources/templates/java/test/maven/projectTemplate/.gitignore b/src/main/resources/templates/java/test/maven/projectTemplate/.gitignore index dd177405a0d3..dbf843d6c857 100644 --- a/src/main/resources/templates/java/test/maven/projectTemplate/.gitignore +++ b/src/main/resources/templates/java/test/maven/projectTemplate/.gitignore @@ -1,4 +1,4 @@ -assignment/ +${studentParentWorkingDirectoryName}/ target/ # Taken from https://github.com/github/gitignore diff --git a/src/main/resources/templates/java/test/stagePom.xml b/src/main/resources/templates/java/test/stagePom.xml index fea2492362ef..18cfa54fc39f 100644 --- a/src/main/resources/templates/java/test/stagePom.xml +++ b/src/main/resources/templates/java/test/stagePom.xml @@ -8,7 +8,7 @@ 4.0.0 ${exerciseNamePomXml}-Tests - ${project.basedir}/../assignment/src + ${project.basedir}/..${studentWorkingDirectory} org.apache.maven.plugins diff --git a/src/main/resources/templates/javascript/test/.gitignore b/src/main/resources/templates/javascript/test/.gitignore index d81d793eaed4..0d3cf4874427 100644 --- a/src/main/resources/templates/javascript/test/.gitignore +++ b/src/main/resources/templates/javascript/test/.gitignore @@ -1,4 +1,4 @@ node_modules/ -/assignment +/${studentParentWorkingDirectoryName} /junit.xml diff --git a/src/main/resources/templates/javascript/test/package-lock.json b/src/main/resources/templates/javascript/test/package-lock.json index b18c57c3b694..79830909997b 100644 --- a/src/main/resources/templates/javascript/test/package-lock.json +++ b/src/main/resources/templates/javascript/test/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "artemis-test", "workspaces": [ - "assignment" + "${studentParentWorkingDirectoryName}" ], "devDependencies": { "@babel/core": "^7.24.7", @@ -17,7 +17,7 @@ "jest-junit": "^16.0.0" } }, - "assignment": { + "${studentParentWorkingDirectoryName}": { "name": "artemis-exercise" }, "node_modules/@ampproject/remapping": { @@ -2499,7 +2499,7 @@ } }, "node_modules/artemis-exercise": { - "resolved": "assignment", + "resolved": "${studentParentWorkingDirectoryName}", "link": true }, "node_modules/babel-jest": { diff --git a/src/main/resources/templates/javascript/test/package.json b/src/main/resources/templates/javascript/test/package.json index 3971d2b0f3c6..782e6c431492 100644 --- a/src/main/resources/templates/javascript/test/package.json +++ b/src/main/resources/templates/javascript/test/package.json @@ -6,7 +6,7 @@ "test:ci": "jest --ci --reporters=default --reporters=jest-junit" }, "workspaces": [ - "assignment" + "${studentParentWorkingDirectoryName}" ], "devDependencies": { "@babel/core": "^7.24.7", diff --git a/src/main/resources/templates/jenkins/r/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/r/regularRuns/pipeline.groovy new file mode 100644 index 000000000000..9a2ec97b5843 --- /dev/null +++ b/src/main/resources/templates/jenkins/r/regularRuns/pipeline.groovy @@ -0,0 +1,59 @@ +/* + * This file configures the actual build steps for the automatic grading. + * + * !!! + * For regular exercises, there is no need to make changes to this file. + * Only this base configuration is actively supported by the Artemis maintainers + * and/or your Artemis instance administrators. + * !!! + */ + +dockerImage = '#dockerImage' +dockerFlags = '#dockerArgs' + +/** + * Main function called by Jenkins. + */ +void testRunner() { + docker.image(dockerImage).inside(dockerFlags) { c -> + runTestSteps() + } +} + +private void runTestSteps() { + test() +} + +/** + * Run unit tests + */ +private void test() { + stage('Test') { + sh ''' + R CMD INSTALL assignment + Rscript -e 'library("testthat"); options(testthat.output_file = "junit.xml"); test_local(".", reporter = "junit")' + ''' + } +} + +/** + * Script of the post build tasks aggregating all JUnit files in $WORKSPACE/results. + * + * Called by Jenkins. + */ +void postBuildTasks() { + sh ''' + rm -rf results + mkdir results + if [ -e tests/testthat/junit.xml ] + then + sed -i 's/]*>//g ; s/<\\/testsuites>/<\\/testsuite>/g' tests/testthat/junit.xml + fi + cp tests/testthat/junit.xml $WORKSPACE/results/ || true + sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true + ''' +} + +// very important, do not remove +// required so that Jenkins finds the methods defined in this script +return this diff --git a/src/main/resources/templates/kotlin/test/maven/projectTemplate/.gitignore b/src/main/resources/templates/kotlin/test/maven/projectTemplate/.gitignore index bff99bd68dc5..5c7928c0bc37 100644 --- a/src/main/resources/templates/kotlin/test/maven/projectTemplate/.gitignore +++ b/src/main/resources/templates/kotlin/test/maven/projectTemplate/.gitignore @@ -1,4 +1,4 @@ -assignment/ +${studentParentWorkingDirectoryName}/ target/ # Taken from https://github.com/github/gitignore diff --git a/src/main/resources/templates/kotlin/test/stagePom.xml b/src/main/resources/templates/kotlin/test/stagePom.xml index 89bcbda7d484..d525536c92f6 100644 --- a/src/main/resources/templates/kotlin/test/stagePom.xml +++ b/src/main/resources/templates/kotlin/test/stagePom.xml @@ -8,7 +8,7 @@ 4.0.0 ${exerciseNamePomXml}-Tests - ${project.basedir}/../assignment/src + ${project.basedir}/..${studentWorkingDirectory} ${project.basedir}/test diff --git a/src/main/resources/templates/ocaml/test/.gitignore b/src/main/resources/templates/ocaml/test/.gitignore index e477e6e6a9b6..fdad97ced9bf 100644 --- a/src/main/resources/templates/ocaml/test/.gitignore +++ b/src/main/resources/templates/ocaml/test/.gitignore @@ -1,6 +1,6 @@ # Things generated by the test framework -/solution/*.ml -/assignment/*.ml +/${solutionWorkingDirectory}/*.ml +/${studentParentWorkingDirectoryName}/*.ml /test/runHidden.ml /checker/checker.exe diff --git a/src/main/resources/templates/ocaml/test/checker/checker.ml b/src/main/resources/templates/ocaml/test/checker/checker.ml index b13edbad4032..daa6d48b56fa 100644 --- a/src/main/resources/templates/ocaml/test/checker/checker.ml +++ b/src/main/resources/templates/ocaml/test/checker/checker.ml @@ -96,7 +96,7 @@ let checkFile fn = violation := true; Location.report_exception Format.err_formatter exn -let studentDir = "assignment" +let studentDir = "${studentParentWorkingDirectoryName}" (** check all student files for violations *) let _ = diff --git a/src/main/resources/templates/ocaml/test/run.sh b/src/main/resources/templates/ocaml/test/run.sh index fe73a2830c98..3dc4af3ff7cd 100755 --- a/src/main/resources/templates/ocaml/test/run.sh +++ b/src/main/resources/templates/ocaml/test/run.sh @@ -3,6 +3,7 @@ # copy code from the assignment or solution to the appropriate test folder cp_code() { + mv "$2" "$1" cd "$1" || exit rm ./*.ml >/dev/null 2>&1 # shellcheck disable=SC2086 @@ -44,13 +45,13 @@ else fi # check for symlink is the submission -find ../assignment/ -type l | grep -q . && echo "Cannot build with symlinks in submission." && exit 0 +find ../${studentParentWorkingDirectoryName}/ -type l | grep -q . && echo "Cannot build with symlinks in submission." && exit 0 # include solution and assignment in the tests # this will only pick up *.ml files in the /src folders if other files are required for the tests this needs to be adjusted -cp_code solution -echo 'include Assignment' > solution/solution.ml -cp_code assignment +cp_code ${solutionWorkingDirectory} solution +echo 'include Assignment' > ${solutionWorkingDirectory}/solution.ml +cp_code ${studentParentWorkingDirectoryName} assignment # select if tests are run by generated source code as student toplevel code may run before the tests and be able to spoof a runtime signal echo "let runHidden = $RUN_HIDDEN" > test/runHidden.ml @@ -71,7 +72,7 @@ if ! timeout -s SIGTERM $BUILD_TIMEOUT checker/checker.exe; then fi # build the student submission # don't reference the tests or solution, so that we can show the build output to the student and not leak test / solution code -if ! timeout -s SIGTERM $BUILD_TIMEOUT dune build --force assignment; then +if ! timeout -s SIGTERM $BUILD_TIMEOUT dune build --force ${solutionWorkingDirectory}; then echo "Unable to build submission, please ensure that your code builds and matches the provided interface" >&2 exit 0 fi @@ -85,13 +86,13 @@ fi cd "$BUILD_ROOT" || exit # copy the test executable into the project root -mv -f tests/test/test.exe ./ +mv -f ${testWorkingDirectory}/test/test.exe ./ # to then delete all source code, to prevent access to it while running the code if $SAFE; then - rm -rf assignment - rm -rf solution - rm -rf tests + rm -rf ${studentParentWorkingDirectoryName} + rm -rf ${solutionWorkingDirectory} + rm -rf ${testWorkingDirectory} fi; # running the test executable without arguments to cause them to exit without actually running any tests diff --git a/src/main/resources/templates/python/test/behavior/behavior_test.py b/src/main/resources/templates/python/test/behavior/behavior_test.py index 15ad384df904..31c0491b0a9c 100644 --- a/src/main/resources/templates/python/test/behavior/behavior_test.py +++ b/src/main/resources/templates/python/test/behavior/behavior_test.py @@ -1,7 +1,7 @@ import unittest -from assignment.sorting_algorithms import * -from assignment.context import Context -from assignment.policy import Policy +from ${studentParentWorkingDirectoryName}.sorting_algorithms import * +from ${studentParentWorkingDirectoryName}.context import Context +from ${studentParentWorkingDirectoryName}.policy import Policy class TestSortingBehavior(unittest.TestCase): diff --git a/src/main/resources/templates/python/test/structural/structural_test.py b/src/main/resources/templates/python/test/structural/structural_test.py index 24ed0f758476..96c30edd118e 100644 --- a/src/main/resources/templates/python/test/structural/structural_test.py +++ b/src/main/resources/templates/python/test/structural/structural_test.py @@ -1,8 +1,8 @@ import unittest -from assignment import sorting_algorithms -from assignment import sort_strategy -from assignment import context -from assignment import policy +from ${studentParentWorkingDirectoryName} import sorting_algorithms +from ${studentParentWorkingDirectoryName} import sort_strategy +from ${studentParentWorkingDirectoryName} import context +from ${studentParentWorkingDirectoryName} import policy from structural import structural_helpers diff --git a/src/main/resources/templates/r/exercise/DESCRIPTION b/src/main/resources/templates/r/exercise/DESCRIPTION new file mode 100644 index 000000000000..2933cb767621 --- /dev/null +++ b/src/main/resources/templates/r/exercise/DESCRIPTION @@ -0,0 +1,7 @@ +Package: assignment +Title: Artemis R Student Assignment +Version: 0.0.0.9000 +Author: Artemis +Description: This is an assignment to be solved by students. +License: MIT +Encoding: UTF-8 diff --git a/src/main/resources/templates/r/exercise/NAMESPACE b/src/main/resources/templates/r/exercise/NAMESPACE new file mode 100644 index 000000000000..9c9f9ac2d917 --- /dev/null +++ b/src/main/resources/templates/r/exercise/NAMESPACE @@ -0,0 +1 @@ +exportPattern("^[^\\.]") diff --git a/src/main/resources/templates/r/exercise/R/convert.R b/src/main/resources/templates/r/exercise/R/convert.R new file mode 100644 index 000000000000..28e787cf2967 --- /dev/null +++ b/src/main/resources/templates/r/exercise/R/convert.R @@ -0,0 +1,3 @@ +matrix_to_column_list <- function(mat) { + # TODO: implement +} diff --git a/src/main/resources/templates/r/readme b/src/main/resources/templates/r/readme new file mode 100644 index 000000000000..73377139d293 --- /dev/null +++ b/src/main/resources/templates/r/readme @@ -0,0 +1,6 @@ +# Matrix Columns + +Write a function `matrix_to_column_list` in R that takes a matrix of any shape and converts it into a list of +column-vectors. Each element of the list should represent a column of the matrix. + +1. [task][Convert to column-vectors](converts_3x3_matrix_to_vectors,converts_4x2_matrix_to_vectors,converts_1x5_matrix_to_scalars,converts_5x1_matrix_to_vector) diff --git a/src/main/resources/templates/r/solution/DESCRIPTION b/src/main/resources/templates/r/solution/DESCRIPTION new file mode 100644 index 000000000000..2933cb767621 --- /dev/null +++ b/src/main/resources/templates/r/solution/DESCRIPTION @@ -0,0 +1,7 @@ +Package: assignment +Title: Artemis R Student Assignment +Version: 0.0.0.9000 +Author: Artemis +Description: This is an assignment to be solved by students. +License: MIT +Encoding: UTF-8 diff --git a/src/main/resources/templates/r/solution/NAMESPACE b/src/main/resources/templates/r/solution/NAMESPACE new file mode 100644 index 000000000000..9c9f9ac2d917 --- /dev/null +++ b/src/main/resources/templates/r/solution/NAMESPACE @@ -0,0 +1 @@ +exportPattern("^[^\\.]") diff --git a/src/main/resources/templates/r/solution/R/convert.R b/src/main/resources/templates/r/solution/R/convert.R new file mode 100644 index 000000000000..7d701772ab7b --- /dev/null +++ b/src/main/resources/templates/r/solution/R/convert.R @@ -0,0 +1,17 @@ +matrix_to_column_list <- function(mat) { + if (!is.matrix(mat)) { + stop("Input must be a matrix") + } + + n_cols <- ncol(mat) + + # Initialize an empty list to store column-vectors + column_list <- vector("list", length = n_cols) + + # Loop through each column and store it in the list + for (i in 1:n_cols) { + column_list[[i]] <- mat[, i] + } + + return(column_list) +} diff --git a/src/main/resources/templates/r/test/DESCRIPTION b/src/main/resources/templates/r/test/DESCRIPTION new file mode 100644 index 000000000000..e19a2b735419 --- /dev/null +++ b/src/main/resources/templates/r/test/DESCRIPTION @@ -0,0 +1,14 @@ +Package: test +Title: Artemis R Tests +Version: 0.0.0.9000 +Author: Artemis +Description: This package tests the student assignment. +License: MIT +Encoding: UTF-8 +Imports: + assignment +Remotes: + local::./assignment +Suggests: + testthat (>= 3.0.0) +Config/testthat/edition: 3 diff --git a/src/main/resources/templates/r/test/tests/testthat.R b/src/main/resources/templates/r/test/tests/testthat.R new file mode 100644 index 000000000000..388438828173 --- /dev/null +++ b/src/main/resources/templates/r/test/tests/testthat.R @@ -0,0 +1,12 @@ +# This file is part of the standard setup for testthat. +# It is recommended that you do not modify it. +# +# Where should you do additional test configuration? +# Learn more about the roles of various files in: +# * https://r-pkgs.org/testing-design.html#sec-tests-files-overview +# * https://testthat.r-lib.org/articles/special-files.html + +library(testthat) +library(tests) + +test_check("tests") diff --git a/src/main/resources/templates/r/test/tests/testthat/test-convert.R b/src/main/resources/templates/r/test/tests/testthat/test-convert.R new file mode 100644 index 000000000000..a84a0e879711 --- /dev/null +++ b/src/main/resources/templates/r/test/tests/testthat/test-convert.R @@ -0,0 +1,47 @@ +test_that("converts_3x3_matrix_to_vectors", { + mat <- matrix(c(5, 8, 11, 6, 9, 12, 7, 10, 13), nrow = 3, ncol = 3) + + result <- assignment::matrix_to_column_list(mat) + + # Make sure to only use exactly one "expect_" function per test + expect_equal(result, list( + c(5, 8, 11), + c(6, 9, 12), + c(7, 10, 13) + )) +}) + +test_that("converts_4x2_matrix_to_vectors", { + mat <- matrix(c(13, 13, 5, 18, 11, 4, 7, 10), nrow = 4, ncol = 2) + + result <- assignment::matrix_to_column_list(mat) + + expect_equal(result, list( + c(13, 13, 5, 18), + c(11, 4, 7, 10) + )) +}) + +test_that("converts_1x5_matrix_to_scalars", { + mat <- matrix(c(16, 10, 15, 8, 7), nrow = 1, ncol = 5) + + result <- assignment::matrix_to_column_list(mat) + + expect_equal(result, list( + 16, + 10, + 15, + 8, + 7 + )) +}) + +test_that("converts_5x1_matrix_to_vector", { + mat <- matrix(c(14, 9, 1, 3, 4), nrow = 5, ncol = 1) + + result <- assignment::matrix_to_column_list(mat) + + expect_equal(result, list( + c(14, 9, 1, 3, 4) + )) +}) diff --git a/src/main/resources/templates/rust/test/.gitignore b/src/main/resources/templates/rust/test/.gitignore index a37c5236a444..aecf1e1c91fa 100644 --- a/src/main/resources/templates/rust/test/.gitignore +++ b/src/main/resources/templates/rust/test/.gitignore @@ -1,2 +1,2 @@ /target -/assignment +/${studentParentWorkingDirectoryName} diff --git a/src/main/resources/templates/rust/test/Cargo.toml b/src/main/resources/templates/rust/test/Cargo.toml index 07f82b3f09f0..f7f39b905be0 100644 --- a/src/main/resources/templates/rust/test/Cargo.toml +++ b/src/main/resources/templates/rust/test/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] chrono = { version = "0.4.38", default-features = false } -rust-template-exercise = { path = "assignment" } +rust-template-exercise = { path = "${studentParentWorkingDirectoryName}" } syn = { version = "2.0.72", features = ["full"] } rust_template_test_macros = { path = "./rust_template_test_macros" } diff --git a/src/main/resources/templates/rust/test/build.rs b/src/main/resources/templates/rust/test/build.rs index 850fcb846cce..947f4783dbd7 100644 --- a/src/main/resources/templates/rust/test/build.rs +++ b/src/main/resources/templates/rust/test/build.rs @@ -6,7 +6,7 @@ use std::{fs, io}; use syn::{parse_file, FnArg, ImplItem, Item, TraitItem, Type, TypeParamBound}; -const SRC_DIR: &str = "assignment/src"; +const SRC_DIR: &str = "${studentWorkingDirectoryNoSlash}"; fn main() { println!("cargo::rerun-if-changed={SRC_DIR}"); diff --git a/src/main/resources/templates/rust/test/tests/structural.rs b/src/main/resources/templates/rust/test/tests/structural.rs index 70b0d19c9131..cf0bef375605 100644 --- a/src/main/resources/templates/rust/test/tests/structural.rs +++ b/src/main/resources/templates/rust/test/tests/structural.rs @@ -4,14 +4,14 @@ use structural_helpers::*; #[test] fn test_sort_strategy_trait() { - let ast = parse_file("./assignment/src/sort_strategy.rs"); + let ast = parse_file(".${studentWorkingDirectory}/sort_strategy.rs"); check_trait_names(&ast.items, ["SortStrategy"]) .unwrap_or_else(|name| panic!("A trait named \"{name}\" should be defined")); } #[test] fn test_sort_strategy_supertrait() { - let ast = parse_file("./assignment/src/sort_strategy.rs"); + let ast = parse_file(".${studentWorkingDirectory}/sort_strategy.rs"); let sort_strategy = find_trait(&ast.items, "SortStrategy") .expect("A trait named \"SortStrategy\" should be defined"); check_trait_supertrait(sort_strategy, "Any") @@ -20,7 +20,7 @@ fn test_sort_strategy_supertrait() { #[test] fn test_sort_strategy_methods() { - let ast = parse_file("./assignment/src/sort_strategy.rs"); + let ast = parse_file(".${studentWorkingDirectory}/sort_strategy.rs"); let sort_strategy = find_trait(&ast.items, "SortStrategy") .expect("A trait named \"SortStrategy\" should be defined"); check_trait_function_names(&sort_strategy.items, ["perform_sort"]) @@ -29,7 +29,7 @@ fn test_sort_strategy_methods() { #[test] fn test_context_fields() { - let ast = parse_file("./assignment/src/context.rs"); + let ast = parse_file(".${studentWorkingDirectory}/context.rs"); let context = find_struct(&ast.items, "Context").expect("A struct named \"Context\" should be defined"); check_struct_field_names(&context.fields, ["sort_algorithm"]) @@ -38,7 +38,7 @@ fn test_context_fields() { #[test] fn test_context_methods() { - let ast = parse_file("./assignment/src/context.rs"); + let ast = parse_file(".${studentWorkingDirectory}/context.rs"); let context_impl = find_impl(&ast.items, "Context").expect("SortStrategy should implement functions"); check_impl_function_names(&context_impl.items, ["new", "sort", "sort_algorithm"]) @@ -47,7 +47,7 @@ fn test_context_methods() { #[test] fn test_policy_fields() { - let ast = parse_file("./assignment/src/policy.rs"); + let ast = parse_file(".${studentWorkingDirectory}/policy.rs"); let policy = find_struct(&ast.items, "Policy").expect("A struct named \"Policy\" should be defined"); check_struct_field_names(&policy.fields, ["context"]) @@ -56,7 +56,7 @@ fn test_policy_fields() { #[test] fn test_policy_methods() { - let ast = parse_file("./assignment/src/policy.rs"); + let ast = parse_file(".${studentWorkingDirectory}/policy.rs"); let policy_impl = find_impl(&ast.items, "Policy").expect("Policy should implement functions"); check_impl_function_names(&policy_impl.items, ["new", "configure"]) .unwrap_or_else(|name| panic!("Policy should implement the function \"{name}\"")); @@ -64,7 +64,7 @@ fn test_policy_methods() { #[test] fn test_bubble_sort_struct() { - let ast = parse_file("./assignment/src/bubble_sort.rs"); + let ast = parse_file(".${studentWorkingDirectory}/bubble_sort.rs"); find_struct(&ast.items, "BubbleSort").expect("A struct named \"BubbleSort\" should be defined"); find_impl_for(&ast.items, "BubbleSort", "SortStrategy") .expect("BubbleSort should implement the trait \"SortStrategy\""); @@ -72,7 +72,7 @@ fn test_bubble_sort_struct() { #[test] fn test_merge_sort_struct() { - let ast = parse_file("./assignment/src/merge_sort.rs"); + let ast = parse_file("./${studentWorkingDirectory}/merge_sort.rs"); find_struct(&ast.items, "MergeSort").expect("A struct named \"MergeSort\" should be defined"); find_impl_for(&ast.items, "MergeSort", "SortStrategy") .expect("MergeSort should implement the trait \"SortStrategy\""); diff --git a/src/main/resources/templates/swift/Swift-Server-Setup.md b/src/main/resources/templates/swift/Swift-Server-Setup.md index 425f7244566c..58cc83d1a18b 100644 --- a/src/main/resources/templates/swift/Swift-Server-Setup.md +++ b/src/main/resources/templates/swift/Swift-Server-Setup.md @@ -55,7 +55,7 @@ Append following to ~/.bashrc: # Bamboo Build Plan ## Create Tasks Go to Plan Configuration > Default Job > Tasks -- Create default task to checkout repos "tests and assignment" +- Create default task to checkout repos "tests and ${studentParentWorkingDirectoryName}" - Create a task to build the swift project - Name the task `Build swift`. - Interpreter: `Shell` diff --git a/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}Test.xcscheme b/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}Test.xcscheme index fa4508ce15ce..1d83b9c00883 100644 --- a/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}Test.xcscheme +++ b/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}Test.xcscheme @@ -41,7 +41,7 @@ BlueprintIdentifier = "4F4474F426BD8F87004E6064" BuildableName = "${appName}.app" BlueprintName = "${appName}" - ReferencedContainer = "container:assignment/${appName}.xcodeproj"> + ReferencedContainer = "container:${studentParentWorkingDirectoryName}/${appName}.xcodeproj"> @@ -57,7 +57,7 @@ BlueprintIdentifier = "4F4474F426BD8F87004E6064" BuildableName = "${appName}.app" BlueprintName = "${appName}" - ReferencedContainer = "container:assignment/${appName}.xcodeproj"> + ReferencedContainer = "container:${studentParentWorkingDirectoryName}/${appName}.xcodeproj"> diff --git a/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}UITest.xcscheme b/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}UITest.xcscheme index 11353953efa7..86d626978f97 100644 --- a/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}UITest.xcscheme +++ b/src/main/resources/templates/swift/xcode/test/${appName}Test.xcodeproj/xcshareddata/xcschemes/${appName}UITest.xcscheme @@ -41,7 +41,7 @@ ${appName} BlueprintIdentifier = "4F4474F426BD8F87004E6064" BuildableName = "${appName}.app" BlueprintName = "${appName}" - ReferencedContainer = "container:assignment/${appName}.xcodeproj"> + ReferencedContainer = "container:${studentParentWorkingDirectoryName}/${appName}.xcodeproj"> @@ -57,7 +57,7 @@ ${appName} BlueprintIdentifier = "4F4474F426BD8F87004E6064" BuildableName = "${appName}.app" BlueprintName = "${appName}" - ReferencedContainer = "container:assignment/${appName}.xcodeproj"> + ReferencedContainer = "container:${studentParentWorkingDirectoryName}/${appName}.xcodeproj"> diff --git a/src/main/resources/templates/swift/xcode/test/${appName}Test.xcworkspace/contents.xcworkspacedata b/src/main/resources/templates/swift/xcode/test/${appName}Test.xcworkspace/contents.xcworkspacedata index 70fc7ea09f74..bcc06bae07c6 100644 --- a/src/main/resources/templates/swift/xcode/test/${appName}Test.xcworkspace/contents.xcworkspacedata +++ b/src/main/resources/templates/swift/xcode/test/${appName}Test.xcworkspace/contents.xcworkspacedata @@ -5,6 +5,6 @@ location = "group:${appName}Test.xcodeproj"> + location = "group:${studentParentWorkingDirectoryName}/${appName}.xcodeproj"> - \ No newline at end of file + diff --git a/src/main/resources/templates/swift/xcode/test/.swiftlint.yml b/src/main/resources/templates/swift/xcode/test/.swiftlint.yml index 5c35904fd2e7..39604f106d66 100644 --- a/src/main/resources/templates/swift/xcode/test/.swiftlint.yml +++ b/src/main/resources/templates/swift/xcode/test/.swiftlint.yml @@ -292,7 +292,7 @@ only_rules: # An XCTFail call should include a description of the assertion. included: # paths to include during linting. `--path` is ignored if present. - - assignment + - ${studentParentWorkingDirectoryName} excluded: # paths to ignore during linting. Takes precedence over `included`. - Carthage diff --git a/src/main/resources/templates/swift/xcode/test/README.md b/src/main/resources/templates/swift/xcode/test/README.md index 61991fee8ef8..d0093037df8c 100644 --- a/src/main/resources/templates/swift/xcode/test/README.md +++ b/src/main/resources/templates/swift/xcode/test/README.md @@ -1,7 +1,7 @@ This is the combined repo that will be produced on the build agent by cloning two repos -1) exercise --> everything in the assignment folder -2) tests --> everything except the assignment folder +1) exercise --> everything in the ${studentParentWorkingDirectoryName} folder +2) tests --> everything except the ${studentParentWorkingDirectoryName} folder The tests can be executed as follows diff --git a/src/main/webapp/app/admin/metrics/metrics.model.ts b/src/main/webapp/app/admin/metrics/metrics.model.ts index 1e006405c805..dbed33af6fc7 100644 --- a/src/main/webapp/app/admin/metrics/metrics.model.ts +++ b/src/main/webapp/app/admin/metrics/metrics.model.ts @@ -84,6 +84,7 @@ export enum HttpMethod { Post = 'POST', Get = 'GET', Delete = 'DELETE', + Patch = 'PATCH', } export interface ProcessMetrics { diff --git a/src/main/webapp/app/core/auth/account.service.ts b/src/main/webapp/app/core/auth/account.service.ts index 93b66699ebba..8c22990b2a17 100644 --- a/src/main/webapp/app/core/auth/account.service.ts +++ b/src/main/webapp/app/core/auth/account.service.ts @@ -224,6 +224,10 @@ export class AccountService implements IAccountService { return this.hasAnyAuthorityDirect([Authority.ADMIN]); } + isAtLeastTutor(): boolean { + return this.hasAnyAuthorityDirect([Authority.ADMIN, Authority.EDITOR, Authority.INSTRUCTOR, Authority.TA]); + } + isAuthenticated(): boolean { return this.authenticated; } diff --git a/src/main/webapp/app/core/config/monaco.config.ts b/src/main/webapp/app/core/config/monaco.config.ts index aa40e47c177c..f37dfe5a4069 100644 --- a/src/main/webapp/app/core/config/monaco.config.ts +++ b/src/main/webapp/app/core/config/monaco.config.ts @@ -1,19 +1,23 @@ /** * Sets up the MonacoEnvironment for the monaco editor's service worker. + * See https://github.com/microsoft/monaco-editor/blob/main/samples/browser-esm-esbuild/index.js */ export function MonacoConfig() { self.MonacoEnvironment = { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - getWorkerUrl: function (workerId: string, label: string) { - /* - * This is the AMD-based service worker, which comes bundled with a few special workers for selected languages. - * (e.g.: javascript, typescript, html, css) - * - * It is also possible to use an ESM-based approach, which requires a little more setup and case distinctions in this method. - * At the moment, it seems that the ESM-based approaches are incompatible with the Artemis client, as they would require custom builders. - * Support for custom builders was removed in #6546. - */ - return 'vs/base/worker/workerMain.js'; + getWorkerUrl: (_moduleId: string, label: string): string => { + if (label === 'json') { + return './vs/language/json/json.worker.js'; + } + if (label === 'css' || label === 'scss' || label === 'less') { + return './vs/language/css/css.worker.js'; + } + if (label === 'html' || label === 'handlebars' || label === 'razor') { + return './vs/language/html/html.worker.js'; + } + if (label === 'typescript' || label === 'javascript') { + return './vs/language/typescript/ts.worker.js'; + } + return './vs/editor/editor.worker.js'; }, }; } diff --git a/src/main/webapp/app/core/user/admin-user.service.ts b/src/main/webapp/app/core/user/admin-user.service.ts index 0614e9229d3b..73e14d154597 100644 --- a/src/main/webapp/app/core/user/admin-user.service.ts +++ b/src/main/webapp/app/core/user/admin-user.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http'; +import { HttpClient, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { createRequestOption } from 'app/shared/util/request.util'; @@ -94,11 +94,7 @@ export class AdminUserService { * @return Observable> */ deleteUsers(logins: string[]): Observable> { - let params = new HttpParams(); - for (const login of logins) { - params = params.append('login', login); - } - return this.http.delete(`${this.resourceUrl}`, { params, observe: 'response' }); + return this.http.delete(`${this.resourceUrl}`, { body: logins, observe: 'response' }); } /** diff --git a/src/main/webapp/app/core/user/user.model.ts b/src/main/webapp/app/core/user/user.model.ts index 816cf4fc9a9c..f793581b21a3 100644 --- a/src/main/webapp/app/core/user/user.model.ts +++ b/src/main/webapp/app/core/user/user.model.ts @@ -16,6 +16,7 @@ export class User extends Account { public vcsAccessToken?: string; public vcsAccessTokenExpiryDate?: string; public sshPublicKey?: string; + public sshKeyHash?: string; public irisAccepted?: dayjs.Dayjs; constructor( @@ -66,6 +67,7 @@ export class UserPublicInfoDTO { public firstName?: string; public lastName?: string; public email?: string; + public imageUrl?: string; public isInstructor?: boolean; public isEditor?: boolean; public isTeachingAssistant?: boolean; diff --git a/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html b/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html index ffddb7b4643a..27038983513a 100644 --- a/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html +++ b/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html @@ -1,19 +1,19 @@

    - @if (courseId && !isPrerequisite) { - + @if (courseId() && !isPrerequisite()) { + }
    @@ -22,45 +22,47 @@

    - +

    - {{ competency.title }} + {{ competency()?.title }} @if (isMastered) { } - @if (competency.optional) { + @if (competency()?.optional) { }

    - @if (competency.description) { -

    + @if (competency()?.description) { +

    } - @if (isPrerequisite && competency.linkedCourseCompetency?.course) { + @if (isPrerequisite() && competency()?.linkedCourseCompetency?.course) {
    - @if (competency.linkedCourseCompetency!.course!.title) { - {{ competency.linkedCourseCompetency!.course!.title! }} + @if (competency()!.linkedCourseCompetency!.course!.title) { + {{ competency()!.linkedCourseCompetency!.course!.title! }} } - @if (competency.linkedCourseCompetency!.course!.semester) { - {{ competency.linkedCourseCompetency!.course!.semester! }} + @if (competency()!.linkedCourseCompetency!.course!.semester) { + {{ competency()!.linkedCourseCompetency!.course!.semester! }} }
    }
    - @if (competency.softDueDate) { + @if (competency()?.softDueDate) {
    - {{ competency.softDueDate! | artemisTimeAgo }} + {{ competency()!.softDueDate! | artemisTimeAgo }}
    } -
    - -
    + @if (!noProgressRings()) { +
    + +
    + }
    diff --git a/src/main/webapp/app/course/competencies/competency-card/competency-card.component.ts b/src/main/webapp/app/course/competencies/competency-card/competency-card.component.ts index e7e8829c0680..462369931d12 100644 --- a/src/main/webapp/app/course/competencies/competency-card/competency-card.component.ts +++ b/src/main/webapp/app/course/competencies/competency-card/competency-card.component.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs/esm'; -import { Component, Input } from '@angular/core'; +import { Component, input } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Competency, CompetencyProgress, getIcon, getMastery, getProgress } from 'app/entities/competency.model'; +import { CompetencyProgress, CourseCompetency, getIcon, getMastery, getProgress } from 'app/entities/competency.model'; @Component({ selector: 'jhi-competency-card', @@ -9,22 +9,20 @@ import { Competency, CompetencyProgress, getIcon, getMastery, getProgress } from styleUrls: ['../../../overview/course-exercises/course-exercise-row.scss'], }) export class CompetencyCardComponent { - @Input() - courseId: number | undefined; - @Input() - competency: Competency; - @Input() - isPrerequisite: boolean; - @Input() - hideProgress = false; + courseId = input(); + competency = input(); + isPrerequisite = input(); + hideProgress = input(false); + noProgressRings = input(false); - getIcon = getIcon; + protected readonly getIcon = getIcon; constructor(public translateService: TranslateService) {} getUserProgress(): CompetencyProgress { - if (this.competency.userProgress?.length) { - return this.competency.userProgress.first()!; + const userProgress = this.competency()?.userProgress?.first(); + if (userProgress) { + return userProgress; } return { progress: 0, confidence: 1 } as CompetencyProgress; } @@ -42,6 +40,6 @@ export class CompetencyCardComponent { } get softDueDatePassed(): boolean { - return dayjs().isAfter(this.competency.softDueDate); + return dayjs().isAfter(this.competency()?.softDueDate); } } diff --git a/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts b/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts index 76db9f9fba09..ca7ce5bdd1d7 100644 --- a/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts +++ b/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit, inject } from '@angular/core'; +import { Component, OnDestroy, OnInit, inject, signal } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { AlertService } from 'app/core/util/alert.service'; import { @@ -11,14 +11,11 @@ import { dtoToCompetencyRelation, getIcon, } from 'app/entities/competency.model'; -import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { filter, map } from 'rxjs/operators'; import { onError } from 'app/shared/util/global.utils'; -import { Subject, Subscription, forkJoin } from 'rxjs'; +import { Subject, Subscription } from 'rxjs'; import { faFileImport, faPencilAlt, faPlus, faRobot, faTrash } from '@fortawesome/free-solid-svg-icons'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; -import { ImportAllCompetenciesComponent, ImportAllFromCourseResult } from 'app/course/competencies/competency-management/import-all-competencies.component'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { PROFILE_IRIS } from 'app/app.constants'; @@ -26,7 +23,11 @@ import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-au import { TranslateService } from '@ngx-translate/core'; import { FeatureToggle, FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service'; import { Prerequisite } from 'app/entities/prerequisite.model'; -import { CourseCompetencyService } from 'app/course/competencies/course-competency.service'; +import { + ImportAllCourseCompetenciesModalComponent, + ImportAllCourseCompetenciesResult, +} from 'app/course/competencies/components/import-all-course-competencies-modal/import-all-course-competencies-modal.component'; +import { CourseCompetencyApiService } from 'app/course/competencies/services/course-competency-api.service'; @Component({ selector: 'jhi-competency-management', @@ -60,7 +61,7 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { // Injected services private readonly activatedRoute: ActivatedRoute = inject(ActivatedRoute); - private readonly courseCompetencyService: CourseCompetencyService = inject(CourseCompetencyService); + private readonly courseCompetencyApiService: CourseCompetencyApiService = inject(CourseCompetencyApiService); private readonly alertService: AlertService = inject(AlertService); private readonly modalService: NgbModal = inject(NgbModal); private readonly profileService: ProfileService = inject(ProfileService); @@ -69,12 +70,10 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { private readonly featureToggleService: FeatureToggleService = inject(FeatureToggleService); ngOnInit(): void { - this.activatedRoute.parent!.params.subscribe((params) => { - this.courseId = params['courseId']; - if (this.courseId) { - this.loadData(); - this.loadIrisEnabled(); - } + this.activatedRoute.parent!.params.subscribe(async (params) => { + this.courseId = Number(params['courseId']); + await this.loadData(); + this.loadIrisEnabled(); }); this.standardizedCompetencySubscription = this.featureToggleService.getFeatureToggleActive(FeatureToggle.StandardizedCompetencies).subscribe((isActive) => { this.standardizedCompetenciesEnabled = isActive; @@ -107,54 +106,48 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { /** * Loads all data for the competency management: Prerequisites, competencies (with average course progress) and competency relations */ - loadData() { - this.isLoading = true; - const relationsObservable = this.courseCompetencyService.getCompetencyRelations(this.courseId); - const courseCompetenciesObservable = this.courseCompetencyService.getAllForCourse(this.courseId); - - forkJoin([relationsObservable, courseCompetenciesObservable]).subscribe({ - next: ([competencyRelations, courseCompetencies]) => { - const courseCompetenciesResponse = courseCompetencies.body ?? []; - this.competencies = courseCompetenciesResponse.filter((competency) => competency.type === CourseCompetencyType.COMPETENCY); - this.prerequisites = courseCompetenciesResponse.filter((competency) => competency.type === CourseCompetencyType.PREREQUISITE); - this.courseCompetencies = courseCompetenciesResponse; - this.relations = (competencyRelations.body ?? []).map((relationDTO) => dtoToCompetencyRelation(relationDTO)); - - this.isLoading = false; - }, - error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse), - }); + async loadData() { + try { + this.isLoading = true; + this.relations = (await this.courseCompetencyApiService.getCourseCompetencyRelations(this.courseId)).map(dtoToCompetencyRelation); + this.courseCompetencies = await this.courseCompetencyApiService.getCourseCompetenciesByCourseId(this.courseId); + this.competencies = this.courseCompetencies.filter((competency) => competency.type === CourseCompetencyType.COMPETENCY); + this.prerequisites = this.courseCompetencies.filter((competency) => competency.type === CourseCompetencyType.PREREQUISITE); + } catch (error) { + onError(this.alertService, error); + } finally { + this.isLoading = false; + } } /** * Opens a modal for selecting a course to import all competencies from. */ - openImportAllModal() { - const modalRef = this.modalService.open(ImportAllCompetenciesComponent, { size: 'lg', backdrop: 'static' }); - //unary operator is necessary as otherwise courseId is seen as a string and will not match. - modalRef.componentInstance.disabledIds = [+this.courseId]; - modalRef.componentInstance.competencyType = 'courseCompetency'; - modalRef.result.then((result: ImportAllFromCourseResult) => { - const courseTitle = result.courseForImportDTO.title ?? ''; - - this.courseCompetencyService - .importAll(this.courseId, result.courseForImportDTO.id!, result.importRelations) - .pipe( - filter((res: HttpResponse>) => res.ok), - map((res: HttpResponse>) => res.body), - ) - .subscribe({ - next: (res: Array) => { - if (res.length > 0) { - this.alertService.success(`artemisApp.courseCompetency.importAll.success`, { noOfCompetencies: res.length, courseTitle: courseTitle }); - this.updateDataAfterImportAll(res); - } else { - this.alertService.warning(`artemisApp.courseCompetency.importAll.warning`, { courseTitle: courseTitle }); - } - }, - error: (res: HttpErrorResponse) => onError(this.alertService, res), - }); + async openImportAllModal() { + const modalRef = this.modalService.open(ImportAllCourseCompetenciesModalComponent, { + size: 'lg', + backdrop: 'static', }); + modalRef.componentInstance.courseId = signal(this.courseId); + const importResults: ImportAllCourseCompetenciesResult | undefined = await modalRef.result; + if (!importResults) { + return; + } + const courseTitle = importResults.course.title ?? ''; + try { + const importedCompetencies = await this.courseCompetencyApiService.importAllByCourseId(this.courseId, importResults.courseCompetencyImportOptions); + if (importedCompetencies.length) { + this.alertService.success(`artemisApp.courseCompetency.importAll.success`, { + noOfCompetencies: importedCompetencies.length, + courseTitle: courseTitle, + }); + this.updateDataAfterImportAll(importedCompetencies); + } else { + this.alertService.warning(`artemisApp.courseCompetency.importAll.warning`, { courseTitle: courseTitle }); + } + } catch (error) { + onError(this.alertService, error); + } } /** @@ -169,7 +162,7 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { .map((dto) => dto.tailRelations) .flat() .filter((element): element is CompetencyRelationDTO => !!element) - .map((dto) => dtoToCompetencyRelation(dto)); + .map(dtoToCompetencyRelation); this.competencies = this.competencies.concat(importedCompetencies); this.prerequisites = this.prerequisites.concat(importedPrerequisites); @@ -182,21 +175,17 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { * * @param relation the given competency relation */ - createRelation(relation: CompetencyRelation) { - this.courseCompetencyService - .createCompetencyRelation(relation, this.courseId) - .pipe( - filter((res) => res.ok), - map((res) => res.body), - ) - .subscribe({ - next: (relation) => { - if (relation) { - this.relations = this.relations.concat(dtoToCompetencyRelation(relation)); - } - }, - error: (res: HttpErrorResponse) => onError(this.alertService, res), + async createRelation(relation: CompetencyRelation) { + try { + const createdRelation = await this.courseCompetencyApiService.createCourseCompetencyRelation(this.courseId, { + headCompetencyId: relation.headCompetency?.id, + tailCompetencyId: relation.tailCompetency?.id, + relationType: relation.type, }); + this.relations = this.relations.concat(dtoToCompetencyRelation(createdRelation)); + } catch (error) { + onError(this.alertService, error); + } } /** @@ -225,13 +214,13 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { * * @param relationId the given id */ - private removeRelation(relationId: number) { - this.courseCompetencyService.removeCompetencyRelation(relationId, this.courseId).subscribe({ - next: () => { - this.relations = this.relations.filter((relation) => relation.id !== relationId); - }, - error: (res: HttpErrorResponse) => onError(this.alertService, res), - }); + private async removeRelation(relationId: number) { + try { + await this.courseCompetencyApiService.deleteCourseCompetencyRelation(this.courseId, relationId); + this.relations = this.relations.filter((relation) => relation.id !== relationId); + } catch (error) { + onError(this.alertService, error); + } } onRemoveCompetency(competencyId: number) { diff --git a/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html b/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html index 1be5b1aa75c3..c16d5c6bd2d9 100644 --- a/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html +++ b/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html @@ -38,6 +38,7 @@ > @for (relationType of competencyRelationType | keyvalue: keepOrder; track relationType) {
+ - -
- @if (courseActionItems?.length && !anyItemHidden) { -
-
  • - @for (courseActionItem of courseActionItems; track courseActionItem) { - - - - } -
    • -
    - } - + + + @if (course) {
    -
    - - +
    + @if (hasSidebar) { + + } +
    {{ 'artemisApp.courseOverview.menu.' + pageTitle | artemisTranslate }}
    +
    +
    + @if (isNotManagementView && course.isAtLeastTutor) { +
    + +
    + } + @if (showRefreshButton) { + + }
    -
    -
    - - - @if (course) { -
    -
    - @if (hasSidebar) { - - } -
    {{ 'artemisApp.courseOverview.menu.' + pageTitle | artemisTranslate }}
    -
    -
    - @if (isNotManagementView && course.isAtLeastTutor) { -
    - -
    - } - @if (showRefreshButton) { - +
    + @if (!hasSidebar) { + } + +
    + +
    -
    -
    - @if (!hasSidebar) { - - } - -
    - -
    -
    - } - - + } + + +
    + +} @else { +
    + @if (!hasSidebar) { + + } + +
    + +
    - +} diff --git a/src/main/webapp/app/overview/course-overview.component.scss b/src/main/webapp/app/overview/course-overview.component.scss index b9bf10ecf997..872969c33810 100644 --- a/src/main/webapp/app/overview/course-overview.component.scss +++ b/src/main/webapp/app/overview/course-overview.component.scss @@ -2,6 +2,13 @@ $menu-width-closed: 64px; $menu-width-open: 220px; $breadcrumb-height: 45px; // needed to make the exam fullscreen +// Sidebar Button Transition Variables +$transition-delay: 0.3s; +$transition-in-between-delay: 0.2s; +$transition-chevron-rotate-length: 0.2s; +$transition-chevron-max-width-length: 0.2s; +$transition-color-length: 0.2s; + .sidebar-container { width: $menu-width-open; &.collapsed { @@ -189,12 +196,12 @@ jhi-secured-image { } .double-arrow.menu-closed { - transform: translate(16px) rotate(0deg); + transform: translate(16px); } .double-arrow { - transform: translate(180px) rotate(180deg); - transition: all ease 0.3s; + transform: translate(180px); + transition: transform ease 0.3s; cursor: pointer; width: 30px; align-items: center; @@ -202,6 +209,16 @@ jhi-secured-image { display: flex; } +.menu-closed .double-arrow-icon { + transform: rotate(0deg); +} + +.double-arrow-icon { + transform: rotate(180deg); + + transition: transform ease 0.3s 0.3s; +} + .me-negative { margin-right: -5px; } @@ -242,14 +259,87 @@ jhi-secured-image { } .btn-sidebar-collapse { - background-color: var(--link-item-bg); + position: relative; + overflow: hidden; + display: inline-flex; + align-items: center; + justify-content: start; + background-color: transparent; &:hover { - background-color: var(--sidebar-card-selected-bg); color: var(--primary); } &:focus { border-color: transparent; } + + transition: border-color $transition-color-length $transition-delay + $transition-chevron-rotate-length * 2 ease-in-out; +} + +.btn-sidebar-collapse::after, +.btn-sidebar-collapse::before { + content: ''; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: -2; + position: absolute; + + transition: background-color $transition-color-length ease-in-out; +} + +.btn-sidebar-collapse::after { + background-color: var(--link-item-bg); +} + +.btn-sidebar-collapse::before { + opacity: 0; + z-index: -1; + background-color: var(--module-bg); + + transition: opacity $transition-color-length $transition-delay + $transition-chevron-rotate-length * 2 ease-in-out; +} + +.btn-sidebar-collapse:hover::after { + background-color: var(--sidebar-card-selected-bg); +} + +.btn-sidebar-collapse:hover::before { + background-color: var(--link-item-bg); +} + +.btn-sidebar-collapse:active::after { + background-color: var(--link-item-bg); +} + +.btn-sidebar-collapse:active::before { + background-color: var(--sidebar-card-selected-bg); +} + +.btn-sidebar-collapse.is-collapsed { + border-color: var(--bs-secondary); +} + +.is-collapsed.btn-sidebar-collapse::before { + opacity: 1; +} + +.btn-sidebar-collapse-chevron-start { + margin-right: -0.7rem; +} + +.btn-sidebar-collapse-chevron { + transform: rotateZ(-180deg); + display: inline-block; + overflow: hidden; + margin-left: 0.3rem; + + transition: transform $transition-chevron-rotate-length $transition-delay ease-in-out; +} + +.is-collapsed .btn-sidebar-collapse-chevron { + transform: rotateZ(0deg); + transition: transform $transition-chevron-rotate-length $transition-delay ease-in-out; } .three-dots { diff --git a/src/main/webapp/app/overview/course-overview.component.ts b/src/main/webapp/app/overview/course-overview.component.ts index 7cf4c805712e..86d8e31f26d3 100644 --- a/src/main/webapp/app/overview/course-overview.component.ts +++ b/src/main/webapp/app/overview/course-overview.component.ts @@ -18,6 +18,7 @@ import { IconDefinition, faChalkboardUser, faChartBar, + faChevronLeft, faChevronRight, faCircleNotch, faClipboard, @@ -31,6 +32,7 @@ import { faListCheck, faNetworkWired, faPersonChalkboard, + faQuestion, faSync, faTable, faTimes, @@ -64,6 +66,7 @@ import { ExamParticipationService } from 'app/exam/participate/exam-participatio import { CourseConversationsComponent } from 'app/overview/course-conversations/course-conversations.component'; import { sortCourses } from 'app/shared/util/course.util'; import { CourseUnenrollmentModalComponent } from './course-unenrollment-modal.component'; +import { LtiService } from 'app/shared/service/lti.service'; interface CourseActionItem { title: string; @@ -116,11 +119,14 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit isNotManagementView: boolean; canUnenroll: boolean; isNavbarCollapsed = false; + isSidebarCollapsed = false; profileSubscription?: Subscription; showRefreshButton: boolean = false; isExamStarted = false; private examStartedSubscription: Subscription; readonly MIN_DISPLAYED_COURSES: number = 6; + isLti: boolean = false; + private ltiSubscription: Subscription; // Properties to track hidden items for dropdown menu dropdownOpen: boolean = false; @@ -169,8 +175,10 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit faSync = faSync; faCircleNotch = faCircleNotch; faChevronRight = faChevronRight; + faChevronLeft = faChevronLeft; facSidebar = facSidebar; faEllipsis = faEllipsis; + faQuestion = faQuestion; FeatureToggle = FeatureToggle; CachingStrategy = CachingStrategy; @@ -194,6 +202,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit private profileService: ProfileService, private modalService: NgbModal, private examParticipationService: ExamParticipationService, + private ltiService: LtiService, ) {} async ngOnInit() { @@ -228,13 +237,19 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit this.courseActionItems = this.getCourseActionItems(); this.updateVisibleNavbarItems(window.innerHeight); await this.updateRecentlyAccessedCourses(); + this.isSidebarCollapsed = this.activatedComponentReference?.isCollapsed ?? false; + this.ltiSubscription = this.ltiService.isLti$.subscribe((isLti) => { + this.isLti = isLti; + }); } /** Listen window resize event by height */ @HostListener('window: resize', ['$event']) onResize() { - this.updateVisibleNavbarItems(window.innerHeight); - if (!this.anyItemHidden) this.itemsDrop.close(); + if (this.itemsDrop) { + this.updateVisibleNavbarItems(window.innerHeight); + if (!this.anyItemHidden) this.itemsDrop.close(); + } } /** Update sidebar item's hidden property based on the window height to display three-dots */ @@ -329,6 +344,12 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit sidebarItems.push(learningPathItem); } } + + if (this.course?.faqEnabled) { + const faqItem: SidebarItem = this.getFaqItem(); + sidebarItems.push(faqItem); + } + return sidebarItems; } @@ -437,6 +458,19 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit return dashboardItem; } + getFaqItem() { + const faqItem: SidebarItem = { + routerLink: 'faq', + icon: faQuestion, + title: 'FAQs', + translation: 'artemisApp.courseOverview.menu.faq', + hasInOrionProperty: false, + showInOrionWindow: false, + hidden: false, + }; + return faqItem; + } + getDefaultItems() { const items = []; if (this.course?.studentCourseAnalyticsDashboardEnabled) { @@ -560,6 +594,8 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit // Since we change the pageTitle + might be pulling data upwards during a render cycle, we need to re-run change detection this.changeDetectorRef.detectChanges(); + + this.isSidebarCollapsed = this.activatedComponentReference?.isCollapsed ?? false; } toggleSidebar() { @@ -568,6 +604,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit } const childRouteComponent = this.activatedComponentReference; childRouteComponent.toggleSidebar(); + this.isSidebarCollapsed = childRouteComponent.isCollapsed; } @HostListener('window:keydown.Control.Shift.b', ['$event']) @@ -712,6 +749,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit this.dashboardSubscription?.unsubscribe(); this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); + this.ltiSubscription?.unsubscribe(); } subscribeForQuizChanges() { diff --git a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html index 3e4ef9383be6..c023ccafe635 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html @@ -13,7 +13,7 @@

    } @else {
    @for (prerequisite of prerequisites; track prerequisite.id; let i = $index) { - + }
    } diff --git a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html index c2acc5bebdc0..c6f3864b47b7 100644 --- a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html +++ b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html @@ -1,4 +1,4 @@ -
    +
    @if (course) {
    diff --git a/src/main/webapp/app/overview/courses-routing.module.ts b/src/main/webapp/app/overview/courses-routing.module.ts index 8b011de2206c..4cb31090febf 100644 --- a/src/main/webapp/app/overview/courses-routing.module.ts +++ b/src/main/webapp/app/overview/courses-routing.module.ts @@ -255,6 +255,16 @@ const routes: Routes = [ pageTitle: 'overview.plagiarismCases', }, }, + { + path: 'faq', + loadComponent: () => import('../overview/course-faq/course-faq.component').then((m) => m.CourseFaqComponent), + data: { + authorities: [Authority.USER], + pageTitle: 'overview.faq', + hasSidebar: false, + showRefreshButton: true, + }, + }, { path: '', redirectTo: 'dashboard', // dashboard will redirect to exercises if not enabled diff --git a/src/main/webapp/app/overview/courses.component.html b/src/main/webapp/app/overview/courses.component.html index 92381c38c62b..5836c04911c3 100644 --- a/src/main/webapp/app/overview/courses.component.html +++ b/src/main/webapp/app/overview/courses.component.html @@ -1,8 +1,8 @@ @if (nextRelevantExam && nextRelevantCourseForExam) { -
    +

    -
    -
    +
    +

    {{ nextRelevantExam.title }}

    @@ -19,43 +19,66 @@

    {{ nextRelevantExam.title }}

    } -
    -
    -

    -
    - - @if (regularCourses.length) { -
    - +
    +
    +

    {{ 'artemisApp.studentDashboard.title' | artemisTranslate }} ({{ regularCourses.length + recentlyAccessedCourses.length }})

    +
    +
    + + + + +
    + + @if (regularCourses.length) { +
    + + + + +
    + }
    - } -
    -@if (recentlyAccessedCourses.length > 0) { -
    -

    -
    - @for (course of recentlyAccessedCourses; track course) { - - } -
    - @if (regularCourses.length > 0) { + @if (recentlyAccessedCourses.length) {
    -

    +

    + + @if (regularCourses.length) { +
    +

    +
    + } } -} -@if (coursesLoaded && !regularCourses.length && !recentlyAccessedCourses.length) { -
    -

    -
    - + @if (coursesLoaded && !regularCourses.length && !recentlyAccessedCourses.length) { +
    +

    +
    + +
    -
    -} @else { -
    - @for (course of regularCourses; track course) { - + } @else { + + } +
    + + + @if ((courses | searchFilter: ['title'] : searchCourseText).length > 0) { +
    +
    + @for (course of courses | searchFilter: ['title'] : searchCourseText; track course) { +
    + +
    + } +
    +
    + } @else { + @if (coursesLoaded) { +
    + +
    } -
    -} + } +     diff --git a/src/main/webapp/app/overview/courses.component.scss b/src/main/webapp/app/overview/courses.component.scss index 93bd4a898edf..90047d3652c4 100644 --- a/src/main/webapp/app/overview/courses.component.scss +++ b/src/main/webapp/app/overview/courses.component.scss @@ -14,25 +14,24 @@ opacity: 1; } -.col-12 { - width: 100% !important; -} - -@media screen and (min-width: 992px) { - .col-lg-6 { - width: 50% !important; +.course-grid { + display: grid; + // cards can shrink to 350px + grid-template-columns: repeat(auto-fill, minmax(350px, 1fr)); + grid-gap: 1rem; + justify-items: center; + // for 4 or less cards, we let each card shrink to 325px to display more cards in smaller screens, 1751px is the breakpoint for 4 cards + @media screen and (max-width: 1751px) { + grid-template-columns: repeat(auto-fill, minmax(325px, 1fr)); } } -@media screen and (min-width: 1200px) { - .col-xl-4 { - width: 33.33% !important; - } +.course-card-wrapper { + width: 100%; + max-width: 400px; } -@media screen and (min-width: 1900px) { - .col-xl-4 { - flex: 0 0 25; - width: 25% !important; - } +.container-fluid { + // ensure that horizontal spacing in container is consistent + --bs-gutter-x: 2rem; } diff --git a/src/main/webapp/app/overview/courses.component.ts b/src/main/webapp/app/overview/courses.component.ts index 0d5218bb21b0..2ad16cae7fcd 100644 --- a/src/main/webapp/app/overview/courses.component.ts +++ b/src/main/webapp/app/overview/courses.component.ts @@ -10,7 +10,7 @@ import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import dayjs from 'dayjs/esm'; import { Exam } from 'app/entities/exam/exam.model'; import { Router } from '@angular/router'; -import { faPenAlt } from '@fortawesome/free-solid-svg-icons'; +import { faArrowDownAZ, faArrowUpAZ, faDoorOpen, faPenAlt } from '@fortawesome/free-solid-svg-icons'; import { CourseAccessStorageService } from 'app/course/course-access-storage.service'; import { CourseForDashboardDTO } from 'app/course/manage/course-for-dashboard-dto'; import { sortCourses } from 'app/shared/util/course.util'; @@ -21,6 +21,11 @@ import { sortCourses } from 'app/shared/util/course.util'; styleUrls: ['./courses.component.scss'], }) export class CoursesComponent implements OnInit, OnDestroy { + protected readonly faPenAlt = faPenAlt; + protected readonly faArrowDownAZ = faArrowDownAZ; + protected readonly faArrowUpAZ = faArrowUpAZ; + protected readonly faDoorOpen = faDoorOpen; + courses: Course[]; public nextRelevantCourse?: Course; nextRelevantCourseForExam?: Course; @@ -31,11 +36,10 @@ export class CoursesComponent implements OnInit, OnDestroy { courseForGuidedTour?: Course; quizExercisesChannels: string[] = []; - - // Icons - faPenAlt = faPenAlt; + searchCourseText = ''; coursesLoaded = false; + isSortAscending = true; constructor( private courseService: CourseManagementService, @@ -49,6 +53,7 @@ export class CoursesComponent implements OnInit, OnDestroy { async ngOnInit() { this.loadAndFilterCourses(); (await this.teamService.teamAssignmentUpdates).subscribe(); + this.courseService.enableCourseOverviewBackground(); } /** @@ -58,6 +63,7 @@ export class CoursesComponent implements OnInit, OnDestroy { if (this.quizExercisesChannels) { this.quizExercisesChannels.forEach((channel) => this.jhiWebsocketService.unsubscribe(channel)); } + this.courseService.disableCourseOverviewBackground(); } loadAndFilterCourses() { @@ -123,4 +129,19 @@ export class CoursesComponent implements OnInit, OnDestroy { openExam(): void { this.router.navigate(['courses', this.nextRelevantCourseForExam?.id, 'exams', this.nextRelevantExam!.id]); } + + setSearchValue(searchValue: string): void { + this.searchCourseText = searchValue; + } + + /** + * Sorts the courses in alphabetical order + */ + onSort(): void { + if (this.courses) { + this.isSortAscending = !this.isSortAscending; + this.regularCourses = [...sortCourses(this.regularCourses, this.isSortAscending)]; + this.recentlyAccessedCourses = [...sortCourses(this.recentlyAccessedCourses, this.isSortAscending)]; + } + } } diff --git a/src/main/webapp/app/overview/courses.module.ts b/src/main/webapp/app/overview/courses.module.ts index 01e27a171163..5dbae0d30fde 100644 --- a/src/main/webapp/app/overview/courses.module.ts +++ b/src/main/webapp/app/overview/courses.module.ts @@ -19,6 +19,7 @@ import { ArtemisCourseExerciseRowModule } from 'app/overview/course-exercises/co import { NgxChartsModule, PieChartModule } from '@swimlane/ngx-charts'; import { CourseUnenrollmentModalComponent } from 'app/overview/course-unenrollment-modal.component'; import { ArtemisSidebarModule } from 'app/shared/sidebar/sidebar.module'; +import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; @NgModule({ imports: [ @@ -36,6 +37,7 @@ import { ArtemisSidebarModule } from 'app/shared/sidebar/sidebar.module'; NgxChartsModule, PieChartModule, ArtemisSidebarModule, + SearchFilterComponent, ], declarations: [ CoursesComponent, diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html index a36bbde86268..29582939ece9 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html @@ -241,7 +241,7 @@

    } @if (exercise.type === PROGRAMMING && !exercise.exerciseGroup && irisSettings?.irisChatSettings?.enabled) { - + } { if (participation.results) { - participation.results = participation.results.filter((result: Result) => result.completionDate && result.successful !== undefined); + participation.results = participation.results.filter((result: Result) => result.completionDate); } }); } @@ -254,7 +255,7 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp this.sortedHistoryResults = this.studentParticipations .flatMap((participation) => participation.results ?? []) .sort(this.resultSortFunction) - .filter((result) => !(result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful == undefined)); + .filter((result) => !(result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && dayjs().isBefore(result.completionDate))); } } diff --git a/src/main/webapp/app/overview/exercise-details/exercise-buttons.module.ts b/src/main/webapp/app/overview/exercise-details/exercise-buttons.module.ts index 1b36ab7e6f5d..7b6aab3d5f7c 100644 --- a/src/main/webapp/app/overview/exercise-details/exercise-buttons.module.ts +++ b/src/main/webapp/app/overview/exercise-details/exercise-buttons.module.ts @@ -6,9 +6,10 @@ import { OrionExerciseDetailsStudentActionsComponent } from 'app/orion/participa import { ExerciseDetailsStudentActionsComponent } from 'app/overview/exercise-details/exercise-details-student-actions.component'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ArtemisSharedPipesModule } from 'app/shared/pipes/shared-pipes.module'; +import { RequestFeedbackButtonComponent } from 'app/overview/exercise-details/request-feedback-button/request-feedback-button.component'; @NgModule({ - imports: [ArtemisSharedModule, ArtemisSharedComponentModule, ArtemisSharedPipesModule, OrionModule, FeatureToggleModule], + imports: [ArtemisSharedModule, ArtemisSharedComponentModule, ArtemisSharedPipesModule, OrionModule, FeatureToggleModule, RequestFeedbackButtonComponent], declarations: [ExerciseDetailsStudentActionsComponent, OrionExerciseDetailsStudentActionsComponent], exports: [ExerciseDetailsStudentActionsComponent, OrionExerciseDetailsStudentActionsComponent], }) diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html index 53a99d1f440a..6e2df76cbef9 100644 --- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html +++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html @@ -135,30 +135,8 @@ } - @if (exercise.allowFeedbackRequests) { - @if (athenaEnabled) { - - - Send automatic feedback request - - } @else { - - - Send manual feedback request - - } + @if (exercise.allowFeedbackRequests && gradedParticipation && exercise.type === ExerciseType.PROGRAMMING) { + } } diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts index fcdf131a87c4..2991bac3355f 100644 --- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts +++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts @@ -110,6 +110,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges this.profileService.getProfileInfo().subscribe((profileInfo) => { this.localVCEnabled = profileInfo.activeProfiles?.includes(PROFILE_LOCALVC); this.athenaEnabled = profileInfo.activeProfiles?.includes(PROFILE_ATHENA); + // The online IDE is only available with correct SpringProfile and if it's enabled for this exercise if (profileInfo.activeProfiles?.includes(PROFILE_THEIA) && this.programmingExercise) { this.theiaEnabled = true; @@ -257,6 +258,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges }); } + // TODO remove this method once support of the button component is implemented for text and modeling exercises requestFeedback() { if (!this.assureConditionsSatisfied()) return; if (this.exercise.type === ExerciseType.PROGRAMMING) { @@ -341,6 +343,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges * 3. There is no already pending feedback request. * @returns {boolean} `true` if all conditions are satisfied, otherwise `false`. */ + // TODO remove this method once support of the button component is implemented for text and modeling exercises assureConditionsSatisfied(): boolean { this.updateParticipations(); if (this.exercise.type === ExerciseType.PROGRAMMING) { @@ -378,7 +381,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges } } - if (this.hasAthenaResultForlatestSubmission()) { + if (this.hasAthenaResultForLatestSubmission()) { const submitFirstWarning = this.translateService.instant('artemisApp.exercise.submissionAlreadyHasAthenaResult'); this.alertService.warning(submitFirstWarning); return false; @@ -386,29 +389,14 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges return true; } - hasAthenaResultForlatestSubmission(): boolean { + hasAthenaResultForLatestSubmission(): boolean { if (this.gradedParticipation?.submissions && this.gradedParticipation?.results) { - const sortedSubmissions = this.gradedParticipation.submissions.slice().sort((a, b) => { - const dateA = this.getDateValue(a.submissionDate) ?? -Infinity; - const dateB = this.getDateValue(b.submissionDate) ?? -Infinity; - return dateB - dateA; - }); - - return this.gradedParticipation.results.some((result) => result.submission?.id === sortedSubmissions[0]?.id); + // submissions.results is always undefined so this is necessary + return ( + this.gradedParticipation.submissions.last()?.id === + this.gradedParticipation?.results.filter((result) => result.assessmentType == AssessmentType.AUTOMATIC_ATHENA).first()?.submission?.id + ); } return false; } - - private getDateValue = (date: any): number => { - if (dayjs.isDayjs(date)) { - return date.valueOf(); - } - if (date instanceof Date) { - return date.valueOf(); - } - if (typeof date === 'string') { - return new Date(date).valueOf(); - } - return -Infinity; // fallback for null, undefined, or invalid dates - }; } diff --git a/src/main/webapp/app/overview/exercise-details/request-feedback-button/request-feedback-button.component.html b/src/main/webapp/app/overview/exercise-details/request-feedback-button/request-feedback-button.component.html new file mode 100644 index 000000000000..6d6addcc2b84 --- /dev/null +++ b/src/main/webapp/app/overview/exercise-details/request-feedback-button/request-feedback-button.component.html @@ -0,0 +1,39 @@ +@if (!isExamExercise) { + @if (athenaEnabled) { + @if (exercise().type === ExerciseType.TEXT) { + + } @else { + + + + + } + } @else { + + + + + } +} diff --git a/src/main/webapp/app/overview/exercise-details/request-feedback-button/request-feedback-button.component.ts b/src/main/webapp/app/overview/exercise-details/request-feedback-button/request-feedback-button.component.ts new file mode 100644 index 000000000000..b9aecaec56d5 --- /dev/null +++ b/src/main/webapp/app/overview/exercise-details/request-feedback-button/request-feedback-button.component.ts @@ -0,0 +1,117 @@ +import { Component, OnInit, inject, input, output } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { faPenSquare } from '@fortawesome/free-solid-svg-icons'; +import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { PROFILE_ATHENA } from 'app/app.constants'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { AlertService } from 'app/core/util/alert.service'; +import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; +import { AssessmentType } from 'app/entities/assessment-type.model'; +import { TranslateService } from '@ngx-translate/core'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { isExamExercise } from 'app/shared/util/utils'; +import { ExerciseDetailsType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; + +@Component({ + selector: 'jhi-request-feedback-button', + standalone: true, + imports: [CommonModule, ArtemisSharedCommonModule, NgbTooltipModule, FontAwesomeModule], + templateUrl: './request-feedback-button.component.html', +}) +export class RequestFeedbackButtonComponent implements OnInit { + faPenSquare = faPenSquare; + athenaEnabled = false; + isExamExercise: boolean; + participation?: StudentParticipation; + + isGeneratingFeedback = input(); + smallButtons = input(false); + exercise = input.required(); + generatingFeedback = output(); + + private feedbackSent = false; + private profileService = inject(ProfileService); + private alertService = inject(AlertService); + private courseExerciseService = inject(CourseExerciseService); + private translateService = inject(TranslateService); + private exerciseService = inject(ExerciseService); + private participationService = inject(ParticipationService); + + protected readonly ExerciseType = ExerciseType; + + ngOnInit() { + this.profileService.getProfileInfo().subscribe((profileInfo) => { + this.athenaEnabled = profileInfo.activeProfiles?.includes(PROFILE_ATHENA); + }); + this.isExamExercise = isExamExercise(this.exercise()); + if (this.isExamExercise || !this.exercise().id) { + return; + } + this.updateParticipation(); + } + + private updateParticipation() { + if (this.exercise().id) { + this.exerciseService.getExerciseDetails(this.exercise().id!).subscribe({ + next: (exerciseResponse: HttpResponse) => { + this.participation = this.participationService.getSpecificStudentParticipation(exerciseResponse.body!.exercise.studentParticipations ?? [], false); + }, + error: (error: HttpErrorResponse) => { + this.alertService.error(`artemisApp.${error.error.entityName}.errors.${error.error.errorKey}`); + }, + }); + } + } + + requestFeedback() { + if (!this.assureConditionsSatisfied()) { + return; + } + + this.courseExerciseService.requestFeedback(this.exercise().id!).subscribe({ + next: (participation: StudentParticipation) => { + if (participation) { + this.generatingFeedback.emit(); + this.feedbackSent = true; + this.alertService.success('artemisApp.exercise.feedbackRequestSent'); + } + }, + error: (error: HttpErrorResponse) => { + this.alertService.error(`artemisApp.exercise.${error.error.errorKey}`); + }, + }); + } + + /** + * Checks if the conditions for requesting automatic non-graded feedback are satisfied. + * The student can request automatic non-graded feedback under the following conditions: + * 1. They have a graded submission. + * 2. The deadline for the exercise has not been exceeded. + * 3. There is no already pending feedback request. + * @returns {boolean} `true` if all conditions are satisfied, otherwise `false`. + */ + assureConditionsSatisfied(): boolean { + if (this.exercise().type === ExerciseType.PROGRAMMING || !this.hasAthenaResultForLatestSubmission()) { + return true; + } + const submitFirstWarning = this.translateService.instant('artemisApp.exercise.submissionAlreadyHasAthenaResult'); + this.alertService.warning(submitFirstWarning); + return false; + } + + hasAthenaResultForLatestSubmission(): boolean { + if (this.participation?.submissions && this.participation?.results) { + // submissions.results is always undefined so this is neccessary + return ( + this.participation.submissions?.last()?.id === + this.participation.results?.filter((result) => result.assessmentType == AssessmentType.AUTOMATIC_ATHENA).first()?.submission?.id + ); + } + return false; + } +} diff --git a/src/main/webapp/app/shared/category-selector/category-selector.component.ts b/src/main/webapp/app/shared/category-selector/category-selector.component.ts index d899a7b034b3..4214f340ffca 100644 --- a/src/main/webapp/app/shared/category-selector/category-selector.component.ts +++ b/src/main/webapp/app/shared/category-selector/category-selector.component.ts @@ -7,6 +7,7 @@ import { FormControl } from '@angular/forms'; import { MatChipInputEvent } from '@angular/material/chips'; import { Observable, map, startWith } from 'rxjs'; import { faTimes } from '@fortawesome/free-solid-svg-icons'; +import { FaqCategory } from 'app/entities/faq-category.model'; const DEFAULT_COLORS = ['#6ae8ac', '#9dca53', '#94a11c', '#691b0b', '#ad5658', '#1b97ca', '#0d3cc2', '#0ab84f']; @@ -22,12 +23,12 @@ export class CategorySelectorComponent implements OnChanges { /** * the selected categories, which can be manipulated by the user in the UI */ - @Input() categories: ExerciseCategory[]; + @Input() categories: ExerciseCategory[] | FaqCategory[]; /** * the existing categories used for auto-completion, might include duplicates */ - @Input() existingCategories: ExerciseCategory[]; + @Input() existingCategories: ExerciseCategory[] | FaqCategory[]; @Output() selectedCategories = new EventEmitter(); diff --git a/src/main/webapp/app/shared/components/documentation-button/documentation-button.component.ts b/src/main/webapp/app/shared/components/documentation-button/documentation-button.component.ts index f598865bb6a6..7724361d798e 100644 --- a/src/main/webapp/app/shared/components/documentation-button/documentation-button.component.ts +++ b/src/main/webapp/app/shared/components/documentation-button/documentation-button.component.ts @@ -12,7 +12,7 @@ const DocumentationLinks = { Quiz: 'exercises/quiz/', Model: 'exercises/modeling/', Programming: 'exercises/programming/', - SshSetup: 'exercises/programming.html#repository-access', + SshSetup: 'icl/ssh-intro', Text: 'exercises/textual/', FileUpload: 'exercises/file-upload/', Notifications: 'notifications/', diff --git a/src/main/webapp/app/shared/components/documentation-link/documentation-link.component.html b/src/main/webapp/app/shared/components/documentation-link/documentation-link.component.html new file mode 100644 index 000000000000..b3e990001b2f --- /dev/null +++ b/src/main/webapp/app/shared/components/documentation-link/documentation-link.component.html @@ -0,0 +1,5 @@ +@if (displayString() && documentationType()) { + + + +} diff --git a/src/main/webapp/app/shared/components/documentation-link/documentation-link.component.ts b/src/main/webapp/app/shared/components/documentation-link/documentation-link.component.ts new file mode 100644 index 000000000000..86f5d19aafb6 --- /dev/null +++ b/src/main/webapp/app/shared/components/documentation-link/documentation-link.component.ts @@ -0,0 +1,25 @@ +import { Component, input } from '@angular/core'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; + +// The routes here are used to build the link to the documentation. +// Therefore, it's important that they exactly match the url to the subpage of the documentation. +// Additionally, the case names must match the keys in documentationLinks.json for the tooltip. +const DocumentationLinks: { [key: string]: string } = { + SshSetup: 'icl/ssh-intro', +}; + +export type DocumentationType = keyof typeof DocumentationLinks; + +@Component({ + selector: 'jhi-documentation-link', + standalone: true, + templateUrl: './documentation-link.component.html', + imports: [TranslateDirective], +}) +export class DocumentationLinkComponent { + readonly BASE_URL = 'https://docs.artemis.cit.tum.de/user/'; + readonly DocumentationLinks = DocumentationLinks; + + documentationType = input(); + displayString = input(); +} diff --git a/src/main/webapp/app/shared/constants/file-extensions.constants.ts b/src/main/webapp/app/shared/constants/file-extensions.constants.ts index 363f41e6b19b..3d1797cb308d 100644 --- a/src/main/webapp/app/shared/constants/file-extensions.constants.ts +++ b/src/main/webapp/app/shared/constants/file-extensions.constants.ts @@ -1,16 +1,16 @@ /** * The list of file extensions that are allowed to be uploaded in a Markdown editor. * Extensions must be lower-case without leading dots. - * NOTE: Has to be kept in sync with the server-side definitions in FileResource.java + * NOTE: Has to be kept in sync with the server-side definitions in FileService.java */ -export const MARKDOWN_FILE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif', 'svg', 'pdf']; +export const UPLOAD_MARKDOWN_FILE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif', 'svg', 'pdf']; /** * The global list of file extensions that are allowed to be uploaded. * Extensions must be lower-case without leading dots. - * NOTE: Has to be kept in sync with the server-side definitions in FileResource.java + * NOTE: Has to be kept in sync with the server-side definitions in FileService.java */ -export const FILE_EXTENSIONS = [ +export const UPLOAD_FILE_EXTENSIONS = [ 'png', 'jpg', 'jpeg', @@ -44,3 +44,302 @@ export const FILE_EXTENSIONS = [ 'odi', 'odf', ]; + +/** + * The list of file extensions that are readable in a file editor. + * Extensions are case-sensitive. + * Extensions are the part of the filename after the last dot. + * Files without dots are represented with their full filename. + */ +export const TEXT_FILE_EXTENSIONS = [ + 'Makefile', + 'R', + 'Rakefile', + 'ada', + 'adb', + 'ads', + 'applescript', + 'as', + 'ascx', + 'asm', + 'asmx', + 'asp', + 'aspx', + 'atom', + 'bas', + 'bash', + 'bashrc', + 'bat', + 'bbcolors', + 'bdsgroup', + 'bdsproj', + 'bib', + 'bowerrc', + 'c', + 'cbl', + 'cc', + 'cfc', + 'cfg', + 'cfm', + 'cfml', + 'cgi', + 'clj', + 'cls', + 'cmake', + 'cmd', + 'cnf', + 'cob', + 'coffee', + 'coffeekup', + 'conf', + 'cpp', + 'cpt', + 'cpy', + 'crt', + 'cs', + 'csh', + 'cson', + 'csr', + 'css', + 'csslintrc', + 'csv', + 'ctl', + 'curlrc', + 'cxx', + 'dart', + 'dfm', + 'diff', + 'dof', + 'dpk', + 'dproj', + 'dtd', + 'eco', + 'editorconfig', + 'ejs', + 'el', + 'emacs', + 'eml', + 'ent', + 'erb', + 'erl', + 'eslintignore', + 'eslintrc', + 'ex', + 'exp', + 'exs', + 'f', + 'f03', + 'f77', + 'f90', + 'f95', + 'fish', + 'for', + 'fpp', + 'frm', + 'ftn', + 'gemrc', + 'gitattributes', + 'gitconfig', + 'gitignore', + 'gitkeep', + 'gitmodules', + 'go', + 'gpp', + 'gradle', + 'groovy', + 'groupproj', + 'grunit', + 'gtmpl', + 'gvimrc', + 'h', + 'haml', + 'hbs', + 'hgignore', + 'hh', + 'hpp', + 'hrl', + 'hs', + 'hta', + 'htaccess', + 'htc', + 'htm', + 'html', + 'htpasswd', + 'hxx', + 'iced', + 'inc', + 'ini', + 'ino', + 'int', + 'irbrc', + 'itcl', + 'itermcolors', + 'itk', + 'jade', + 'java', + 'jhtm', + 'jhtml', + 'js', + 'jscsrc', + 'jshintignore', + 'jshintrc', + 'json', + 'json5', + 'jsonld', + 'jsp', + 'jspx', + 'jsx', + 'ksh', + 'kt', + 'less', + 'lhs', + 'lisp', + 'log', + 'ls', + 'lsp', + 'lua', + 'm', + 'mak', + 'map', + 'markdown', + 'master', + 'md', + 'mdown', + 'mdwn', + 'mdx', + 'metadata', + 'mht', + 'mhtml', + 'mjs', + 'mk', + 'mkd', + 'mkdn', + 'mkdown', + 'ml', + 'mli', + 'mm', + 'mxml', + 'nfm', + 'nfo', + 'noon', + 'npmignore', + 'npmrc', + 'nvmrc', + 'ops', + 'pas', + 'pasm', + 'patch', + 'pbxproj', + 'pch', + 'pem', + 'pg', + 'php', + 'php3', + 'php4', + 'php5', + 'phpt', + 'phtml', + 'pir', + 'pl', + 'pm', + 'pmc', + 'pod', + 'pot', + 'properties', + 'props', + 'pt', + 'pug', + 'py', + 'r', + 'rake', + 'rb', + 'rdoc', + 'rdoc_options', + 'resx', + 'rhtml', + 'rjs', + 'rlib', + 'ron', + 'rs', + 'rss', + 'rst', + 'rtf', + 'rvmrc', + 'rxml', + 's', + 'sass', + 'scala', + 'scm', + 'scss', + 'seestyle', + 'sh', + 'shtml', + 'sls', + 'spec', + 'sql', + 'sqlite', + 'ss', + 'sss', + 'st', + 'strings', + 'sty', + 'styl', + 'stylus', + 'sub', + 'sublime-build', + 'sublime-commands', + 'sublime-completions', + 'sublime-keymap', + 'sublime-macro', + 'sublime-menu', + 'sublime-project', + 'sublime-settings', + 'sublime-workspace', + 'sv', + 'svc', + 'svg', + 'swift', + 't', + 'tcl', + 'tcsh', + 'terminal', + 'tex', + 'text', + 'textile', + 'tg', + 'tmLanguage', + 'tmTheme', + 'tmpl', + 'tpl', + 'ts', + 'tsv', + 'tsx', + 'tt', + 'tt2', + 'ttml', + 'txt', + 'v', + 'vb', + 'vbs', + 'vh', + 'vhd', + 'vhdl', + 'vim', + 'viminfo', + 'vimrc', + 'vue', + 'webapp', + 'wxml', + 'x-php', + 'xht', + 'xhtml', + 'xml', + 'xs', + 'xsd', + 'xsl', + 'xslt', + 'yaml', + 'yml', + 'zsh', + 'zshrc', +]; diff --git a/src/main/webapp/app/shared/constants/input.constants.ts b/src/main/webapp/app/shared/constants/input.constants.ts index 8b97589a59d6..1b1045b7f56f 100644 --- a/src/main/webapp/app/shared/constants/input.constants.ts +++ b/src/main/webapp/app/shared/constants/input.constants.ts @@ -22,3 +22,5 @@ export const MAX_QUIZ_QUESTION_POINTS = 9999; export const MAX_QUIZ_QUESTION_LENGTH_THRESHOLD = 250; export const MAX_QUIZ_QUESTION_EXPLANATION_LENGTH_THRESHOLD = 500; export const MAX_QUIZ_QUESTION_HINT_LENGTH_THRESHOLD = 255; +export const ASSIGNMENT_REPO_NAME = 'assignment'; +export const TEST_REPO_NAME = 'tests'; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts index 4f1476ae508b..6fe508245dc8 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts @@ -1,7 +1,7 @@ import { DeleteDialogService } from 'app/shared/delete-dialog/delete-dialog.service'; import { Directive, ElementRef, EventEmitter, HostListener, Input, OnInit, Output, Renderer2 } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { ActionType, DeleteDialogData } from 'app/shared/delete-dialog/delete-dialog.model'; +import { ActionType, DeleteDialogData, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; import { Observable } from 'rxjs'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; @@ -9,6 +9,8 @@ import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; export class DeleteButtonDirective implements OnInit { @Input() entityTitle?: string; @Input() deleteQuestion: string; + @Input() entitySummaryTitle?: string; + @Input() fetchEntitySummary?: Observable; @Input() translateValues: { [key: string]: unknown } = {}; @Input() deleteConfirmationText: string; @Input() buttonSize: ButtonSize = ButtonSize.SMALL; @@ -73,6 +75,8 @@ export class DeleteButtonDirective implements OnInit { translateValues: this.translateValues, deleteConfirmationText: this.deleteConfirmationText, additionalChecks: this.additionalChecks, + entitySummaryTitle: this.entitySummaryTitle, + fetchEntitySummary: this.fetchEntitySummary, actionType: this.actionType, buttonType: this.buttonType, delete: this.delete, diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html index eaadd2bb1acd..47e8a7fd5b6c 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html @@ -29,6 +29,22 @@

    Are you sure you want to delete?

    + + @if (entitySummaryTitle) { + + } + @if (entitySummary) { +
      + @for (summaryKey of objectKeys(entitySummary); track summaryKey; let i = $index) { + @if (entitySummary[summaryKey] !== undefined) { +
    • + : {{ entitySummary[summaryKey] }} +
      • + } + } +
    + } + @if (additionalChecks) {
    @for (checkKey of objectKeys(additionalChecks); track checkKey; let i = $index) { diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts index 6ce26216abf0..0a85965d0b38 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { mapValues } from 'lodash-es'; -import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; +import { ActionType, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; import { Observable, Subscription } from 'rxjs'; import { AlertService } from 'app/core/util/alert.service'; import { faBan, faCheck, faSpinner, faTimes, faTrash, faUndo } from '@fortawesome/free-solid-svg-icons'; @@ -24,6 +24,8 @@ export class DeleteDialogComponent implements OnInit, OnDestroy { @ViewChild('deleteForm', { static: true }) deleteForm: NgForm; deleteQuestion: string; + entitySummaryTitle?: string; + entitySummary?: EntitySummary = {}; translateValues: { [key: string]: unknown } = {}; deleteConfirmationText: string; requireConfirmationOnlyForAdditionalChecks: boolean; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts index c6fc632b98a4..9920bcd69fdf 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts @@ -15,6 +15,14 @@ export enum ActionType { EndNow = 'endNow', } +/** + * Summary of the entity that will be deleted. + * Key is i18n key, value is the value that will be displayed + */ +export interface EntitySummary { + [key: string]: number | boolean | undefined; +} + /** * Data that will be passed to the delete dialog component */ @@ -29,6 +37,12 @@ export class DeleteDialogData { // i18n key, that will be translated deleteQuestion: string; + // i18n key, that will be translated + entitySummaryTitle?: string; + + // observable that will fetch the entity summary + fetchEntitySummary?: Observable; + // parameters used for the delete question translateValues: { [key: string]: unknown }; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts index 5062a19518d6..02ab549f82a8 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts @@ -1,9 +1,10 @@ import { Injectable } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; -import { DeleteDialogData } from 'app/shared/delete-dialog/delete-dialog.model'; -import { from } from 'rxjs'; +import { DeleteDialogData, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; +import { Observable, from } from 'rxjs'; import { AlertService } from 'app/core/util/alert.service'; +import { HttpErrorResponse } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) export class DeleteDialogService { @@ -27,12 +28,30 @@ export class DeleteDialogService { this.modalRef.componentInstance.translateValues = { ...deleteDialogData.translateValues, title: deleteDialogData.entityTitle }; this.modalRef.componentInstance.deleteConfirmationText = deleteDialogData.deleteConfirmationText; this.modalRef.componentInstance.additionalChecks = deleteDialogData.additionalChecks; + this.modalRef.componentInstance.entitySummaryTitle = deleteDialogData.entitySummaryTitle; + this.modalRef.componentInstance.fetchEntitySummary = deleteDialogData.fetchEntitySummary; this.modalRef.componentInstance.actionType = deleteDialogData.actionType; this.modalRef.componentInstance.buttonType = deleteDialogData.buttonType; this.modalRef.componentInstance.delete = deleteDialogData.delete; this.modalRef.componentInstance.dialogError = deleteDialogData.dialogError; this.modalRef.componentInstance.requireConfirmationOnlyForAdditionalChecks = deleteDialogData.requireConfirmationOnlyForAdditionalChecks; + if (deleteDialogData.fetchEntitySummary !== undefined) { + this.fetchAndSetEntitySummary(deleteDialogData.fetchEntitySummary, this.modalRef.componentInstance); + } + from(this.modalRef.result).subscribe(() => (this.modalRef = null)); } + + /** + * Fetches and sets entity summary by subscribing to fetchEntitySummary. + * @param fetchEntitySummary observable that fetches entity summary + * @param componentInstance instance of DeleteDialogComponent + */ + fetchAndSetEntitySummary(fetchEntitySummary: Observable, componentInstance: DeleteDialogComponent): void { + fetchEntitySummary.subscribe({ + next: (entitySummary: EntitySummary) => (componentInstance.entitySummary = entitySummary), + error: (error: HttpErrorResponse) => this.alertService.error('error.unexpectedError', { error: error.message }), + }); + } } diff --git a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts index 8ba41f96ba8b..aec203a26946 100644 --- a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts +++ b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts @@ -3,6 +3,7 @@ import type { ExerciseCategory } from 'app/entities/exercise-category.model'; import { CommonModule } from '@angular/common'; import { faTimes } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { FaqCategory } from 'app/entities/faq-category.model'; type CategoryFontSize = 'default' | 'small'; @@ -16,7 +17,7 @@ type CategoryFontSize = 'default' | 'small'; export class CustomExerciseCategoryBadgeComponent { protected readonly faTimes = faTimes; - @Input({ required: true }) category: ExerciseCategory; + @Input({ required: true }) category: ExerciseCategory | FaqCategory; @Input() displayRemoveButton: boolean = false; @Input() onClick: () => void = () => {}; @Input() fontSize: CategoryFontSize = 'default'; diff --git a/src/main/webapp/app/shared/http/file-uploader.service.ts b/src/main/webapp/app/shared/http/file-uploader.service.ts index fcdc203ea935..a6378198302a 100644 --- a/src/main/webapp/app/shared/http/file-uploader.service.ts +++ b/src/main/webapp/app/shared/http/file-uploader.service.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants'; import { lastValueFrom } from 'rxjs'; -import { MARKDOWN_FILE_EXTENSIONS } from 'app/shared/constants/file-extensions.constants'; +import { UPLOAD_MARKDOWN_FILE_EXTENSIONS } from 'app/shared/constants/file-extensions.constants'; export interface FileUploadResponse { path?: string; @@ -14,7 +14,7 @@ type Options = { @Injectable({ providedIn: 'root' }) export class FileUploaderService { - readonly acceptedMarkdownFileExtensions = MARKDOWN_FILE_EXTENSIONS; + readonly acceptedMarkdownFileExtensions = UPLOAD_MARKDOWN_FILE_EXTENSIONS; constructor(private http: HttpClient) {} /** diff --git a/src/main/webapp/app/shared/icon-card/icon-card.component.html b/src/main/webapp/app/shared/icon-card/icon-card.component.html new file mode 100644 index 000000000000..11aabaa71cdc --- /dev/null +++ b/src/main/webapp/app/shared/icon-card/icon-card.component.html @@ -0,0 +1,12 @@ +
    +
    +
    + + +
    + +
    + + +
    +
    diff --git a/src/main/webapp/app/shared/icon-card/icon-card.component.scss b/src/main/webapp/app/shared/icon-card/icon-card.component.scss new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/main/webapp/app/shared/icon-card/icon-card.component.ts b/src/main/webapp/app/shared/icon-card/icon-card.component.ts new file mode 100644 index 000000000000..dc0c603000a2 --- /dev/null +++ b/src/main/webapp/app/shared/icon-card/icon-card.component.ts @@ -0,0 +1,18 @@ +import { Component, input } from '@angular/core'; +import { faCircleInfo } from '@fortawesome/free-solid-svg-icons'; +import { IconDefinition } from '@fortawesome/fontawesome-common-types'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { ArtemisSharedPipesModule } from 'app/shared/pipes/shared-pipes.module'; + +@Component({ + selector: 'jhi-icon-card', + templateUrl: './icon-card.component.html', + styleUrl: './icon-card.component.scss', + standalone: true, + imports: [ArtemisSharedCommonModule, ArtemisSharedPipesModule], +}) +export class IconCardComponent { + headerIcon = input(faCircleInfo); + + headline = input('Title'); +} diff --git a/src/main/webapp/app/shared/import-list/import-table.component.html b/src/main/webapp/app/shared/import-list/import-table.component.html new file mode 100644 index 000000000000..7f4b437f8e9c --- /dev/null +++ b/src/main/webapp/app/shared/import-list/import-table.component.html @@ -0,0 +1,84 @@ +
    +
    +
    +
    + @if (isLoading()) { + + } + +
    +
    +
    +
    +
    + + + + + @for (column of columns(); track column) { + + } + + + + + @for (entity of resultsOnPage(); track entity.id) { + + + @for (column of columns(); track column) { + + } + + + } @empty { + + + + } + +
    +
    + # + +
    +     		+
    + + +
    +
    + {{ entity.id }} + + + + +
    +
    + + + + @if (sortedColumn !== currentSortedColumn) { + + } @else { + + } + diff --git a/src/main/webapp/app/shared/import-list/import-table.component.scss b/src/main/webapp/app/shared/import-list/import-table.component.scss new file mode 100644 index 000000000000..569a62f640f9 --- /dev/null +++ b/src/main/webapp/app/shared/import-list/import-table.component.scss @@ -0,0 +1,14 @@ +.import-table-container { + height: 280px; + overflow-y: scroll; + + table { + thead th { + position: sticky; + top: 0; + // z-index is required that the table rows scroll under the header + z-index: 1; + background-color: var(--bs-modal-bg); + } + } +} diff --git a/src/main/webapp/app/shared/import-list/import-table.component.ts b/src/main/webapp/app/shared/import-list/import-table.component.ts new file mode 100644 index 000000000000..2a0a3ee92269 --- /dev/null +++ b/src/main/webapp/app/shared/import-list/import-table.component.ts @@ -0,0 +1,121 @@ +import { Component, computed, effect, inject, input, output, signal, untracked } from '@angular/core'; +import { BaseEntity } from 'app/shared/model/base-entity'; +import { PagingService } from 'app/exercises/shared/manage/paging.service'; +import { SearchResult, SearchTermPageableSearch, SortingOrder } from 'app/shared/table/pageable-table'; +import { lastValueFrom } from 'rxjs'; +import { AlertService } from 'app/core/util/alert.service'; +import { onError } from 'app/shared/util/global.utils'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { faSort, faSortDown, faSortUp, faSpinner } from '@fortawesome/free-solid-svg-icons'; +import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; + +/** + * An abstract component intended for cases where a resource needs to be imported from one course into another. + * + * @template T generic class parameter of the entity that gets imported + */ +export type Column = { + name: string; + getProperty(entity: T): string | undefined; +}; + +@Component({ + selector: 'jhi-import-table', + standalone: true, + imports: [ArtemisSharedCommonModule], + templateUrl: './import-table.component.html', + styleUrl: './import-table.component.scss', +}) +export class ImportTableComponent { + protected readonly SortingOrder = SortingOrder; + + protected readonly faSort = faSort; + protected readonly faSortUp = faSortUp; + protected readonly faSortDown = faSortDown; + protected readonly faSpinner = faSpinner; + + private readonly alertService = inject(AlertService); + private readonly pagingService = inject(PagingService); + + readonly columns = input.required[]>(); + readonly columnBaseTranslationKey = input.required(); + readonly disabledIds = input([]); + readonly numberOfColumns = computed(() => this.columns().length + 2); + + readonly onRowSelection = output(); + + readonly isLoading = signal(false); + private readonly searchResult = signal | undefined>(undefined); + readonly resultsOnPage = computed(() => this.searchResult()?.resultsOnPage ?? []); + + private readonly DEFAULT_SORTING_ORDER = SortingOrder.ASCENDING; + private readonly PAGE_SIZE = 10; + + readonly searchTerm = signal(''); + readonly sortingOrder = signal(this.DEFAULT_SORTING_ORDER); + readonly sortedColumn = signal('ID'); + readonly page = signal(1); + readonly pageSize = signal(this.PAGE_SIZE).asReadonly(); + readonly collectionSize = computed(() => { + const numberOfPages = this.searchResult()?.numberOfPages ?? 1; + return numberOfPages === 1 ? this.resultsOnPage().length : numberOfPages * this.pageSize(); + }); + + constructor() { + effect(() => { + untracked(async () => await this.loadData()); + }); + } + + private async loadData(): Promise { + try { + this.isLoading.set(true); + const searchState = { + searchTerm: this.searchTerm(), + page: this.page(), + sortedColumn: this.sortedColumn(), + sortingOrder: this.sortingOrder(), + pageSize: this.pageSize(), + }; + const result = await lastValueFrom(this.pagingService.search(searchState)); + const filteredResults = this.filterSearchResult(result); + this.searchResult.set(filteredResults); + } catch (error) { + onError(this.alertService, error); + } finally { + this.isLoading.set(false); + } + } + + /* + * Debounce the data load to prevent unnecessary requests while typing. + */ + private readonly debouncedDataLoad = BaseApiHttpService.debounce(this.loadData.bind(this), 300); + + private filterSearchResult(searchResults: SearchResult): SearchResult { + return >{ + ...searchResults, + resultsOnPage: searchResults.resultsOnPage?.filter((entity) => !this.disabledIds().includes(entity.id!)), + }; + } + + protected async setSortedColumn(sortedColumn: string): Promise { + const sortingOrder = this.sortingOrder() === SortingOrder.ASCENDING ? SortingOrder.DESCENDING : SortingOrder.ASCENDING; + this.sortingOrder.set(this.sortedColumn() === sortedColumn ? sortingOrder : this.DEFAULT_SORTING_ORDER); + this.sortedColumn.set(sortedColumn); + await this.loadData(); + } + + protected async setPage(page: number): Promise { + this.page.set(page); + await this.loadData(); + } + + protected search(): void { + this.debouncedDataLoad(); + } + + protected selectRow(item: T): void { + this.onRowSelection.emit(item); + } +} diff --git a/src/main/webapp/app/shared/layouts/main/main.component.html b/src/main/webapp/app/shared/layouts/main/main.component.html index 683aff8d541e..b50cac65becc 100644 --- a/src/main/webapp/app/shared/layouts/main/main.component.html +++ b/src/main/webapp/app/shared/layouts/main/main.component.html @@ -2,19 +2,19 @@
    - @if (showSkeleton) { + @if (showSkeleton && !isLti) {
    } @if (showSkeleton) {
    -
    +
    @@ -23,7 +23,7 @@ } - @if (showSkeleton) { + @if (showSkeleton && !isLti) {
    @if (isTestRunExam || !isExamStarted) { diff --git a/src/main/webapp/app/shared/layouts/main/main.component.scss b/src/main/webapp/app/shared/layouts/main/main.component.scss new file mode 100644 index 000000000000..b4ac86dfa9d5 --- /dev/null +++ b/src/main/webapp/app/shared/layouts/main/main.component.scss @@ -0,0 +1,3 @@ +.course-overview { + background-color: var(--bs-body-bg); +} diff --git a/src/main/webapp/app/shared/layouts/main/main.component.ts b/src/main/webapp/app/shared/layouts/main/main.component.ts index 5d8368c7e90a..5aa240c26df6 100644 --- a/src/main/webapp/app/shared/layouts/main/main.component.ts +++ b/src/main/webapp/app/shared/layouts/main/main.component.ts @@ -8,10 +8,13 @@ import { DOCUMENT } from '@angular/common'; import { AnalyticsService } from 'app/core/posthog/analytics.service'; import { Subscription } from 'rxjs'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; +import { CourseManagementService } from 'app/course/manage/course-management.service'; +import { LtiService } from 'app/shared/service/lti.service'; @Component({ selector: 'jhi-main', templateUrl: './main.component.html', + styleUrls: ['./main.component.scss'], }) export class JhiMainComponent implements OnInit, OnDestroy { /** @@ -22,11 +25,15 @@ export class JhiMainComponent implements OnInit, OnDestroy { public showSkeleton = true; profileSubscription: Subscription; examStartedSubscription: Subscription; + courseOverviewSubscription: Subscription; testRunSubscription: Subscription; + ltiSubscription: Subscription; isProduction: boolean = true; isTestServer: boolean = false; isExamStarted: boolean = false; isTestRunExam: boolean = false; + isCourseOverview: boolean = false; + isLti: boolean = false; constructor( private jhiLanguageHelper: JhiLanguageHelper, @@ -39,6 +46,8 @@ export class JhiMainComponent implements OnInit, OnDestroy { @Inject(DOCUMENT) private document: Document, private renderer: Renderer2, + private courseService: CourseManagementService, + private ltiService: LtiService, ) { this.setupErrorHandling().then(undefined); this.setupAnalytics().then(undefined); @@ -111,6 +120,14 @@ export class JhiMainComponent implements OnInit, OnDestroy { this.isTestRunExam = isStarted; }); + this.courseOverviewSubscription = this.courseService.isCourseOverview$.subscribe((isPresent) => { + this.isCourseOverview = isPresent; + }); + + this.ltiSubscription = this.ltiService.isLti$.subscribe((isLti) => { + this.isLti = isLti; + }); + this.themeService.initialize(); } @@ -128,5 +145,7 @@ export class JhiMainComponent implements OnInit, OnDestroy { this.profileSubscription?.unsubscribe(); this.examStartedSubscription?.unsubscribe(); this.testRunSubscription?.unsubscribe(); + this.courseOverviewSubscription?.unsubscribe(); + this.ltiSubscription?.unsubscribe(); } } diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts b/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts index 198dad328789..a911ddf74ceb 100644 --- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts +++ b/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts @@ -5,11 +5,11 @@ import { ArtemisSharedModule } from 'app/shared/shared.module'; import { MatMenuModule } from '@angular/material/menu'; import { MatButtonModule } from '@angular/material/button'; import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; +import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; @NgModule({ - imports: [ArtemisSharedModule, MonacoEditorModule, FormsModule, ArtemisColorSelectorModule, MatMenuModule, MatButtonModule, DragDropModule], + imports: [ArtemisSharedModule, MonacoEditorComponent, FormsModule, ArtemisColorSelectorModule, MatMenuModule, MatButtonModule, DragDropModule], declarations: [MarkdownEditorMonacoComponent], exports: [MarkdownEditorMonacoComponent], }) diff --git a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts index 71e197dc5ead..e11c4c6fb5ed 100644 --- a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts +++ b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts @@ -8,6 +8,8 @@ import { faUser, faUserCheck, faUserGraduate } from '@fortawesome/free-solid-svg import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; import { tap } from 'rxjs'; +import { getBackgroundColorHue } from 'app/utils/color.utils'; +import { getInitialsFromString } from 'app/utils/text.utils'; @Directive() export abstract class PostingHeaderDirective implements OnInit { @@ -79,8 +81,8 @@ export abstract class PostingHeaderDirective implements OnIni setUserAuthorityIconAndTooltip(): void { const toolTipTranslationPath = 'artemisApp.metis.userAuthorityTooltips.'; const roleBadgeTranslationPath = 'artemisApp.metis.userRoles.'; - this.userProfilePictureInitials = this.posting.author?.name === undefined ? 'NA' : this.getInitials(this.posting.author?.name); - this.userProfilePictureBackgroundColor = this.getBackgroundColor(this.posting.author?.id?.toString()); + this.userProfilePictureInitials = this.posting.author?.name === undefined ? 'NA' : getInitialsFromString(this.posting.author?.name); + this.userProfilePictureBackgroundColor = getBackgroundColorHue(this.posting.author?.id?.toString()); this.userAuthorityIcon = faUser; if (this.posting.authorRole === UserRole.USER) { this.userAuthority = 'student'; @@ -99,63 +101,5 @@ export abstract class PostingHeaderDirective implements OnIni } } - /** - * Returns a pseudo-random numeric value for a given string using a simple hash function. - * @param {string} str - The string used for the hash function. - */ - private deterministicRandomValueFromString(str: string): number { - let seed = 0; - for (let i = 0; i < str.length; i++) { - seed = str.charCodeAt(i) + ((seed << 5) - seed); - } - const m = 0x80000000; - const a = 1103515245; - const c = 42718; - - seed = (a * seed + c) % m; - - return seed / (m - 1); - } - - /** - * Returns a background color hue for a given string. - * @param {string | undefined} seed - The string used to determine the random value. - */ - private getBackgroundColor(seed: string | undefined): string { - if (seed === undefined) { - seed = Math.random().toString(); - } - const hue = this.deterministicRandomValueFromString(seed) * 360; - return `hsl(${hue}, 50%, 50%)`; // Return an HSL color string - } - - /** - * Returns 2 capitalized initials of a given string. - * If it has multiple names, it takes the first and last (Albert Berta Muster -> AM) - * If it has one name, it'll return a deterministic random other string (Albert -> AB) - * If it consists of a single letter it will return the single letter. - * @param {string} username - The string used to generate the initials. - */ - private getInitials(username: string): string { - const parts = username.trim().split(/\s+/); - - let initials = ''; - - if (parts.length > 1) { - // Takes first and last word in string and returns their initials. - initials = parts[0][0] + parts[parts.length - 1][0]; - } else { - // If only one single word, it will take the first letter and a random second. - initials = parts[0][0]; - const remainder = parts[0].slice(1); - const secondInitial = remainder.match(/[a-zA-Z0-9]/); - if (secondInitial) { - initials += secondInitial[Math.floor(this.deterministicRandomValueFromString(username) * secondInitial.length)]; - } - } - - return initials.toUpperCase(); - } - abstract deletePosting(): void; } diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/monaco-text-editor.adapter.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/monaco-text-editor.adapter.ts index 7bd630b7d479..f55bbfe3e3f1 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/monaco-text-editor.adapter.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/monaco-text-editor.adapter.ts @@ -152,8 +152,8 @@ export class MonacoTextEditorAdapter implements TextEditor { return this.editor.getDomNode() ?? undefined; } - typeText(text: string) { - this.editor.trigger('MonacoTextEditorAdapter::typeText', 'type', { text }); + triggerCompletion(): void { + this.editor.trigger('MonacoTextEditorAdapter::triggerCompletion', 'editor.action.triggerSuggest', {}); } getTextAtRange(range: TextEditorRange): string { diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/text-editor.interface.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/text-editor.interface.ts index b3403c274b64..b847645a2efd 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/text-editor.interface.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/adapter/text-editor.interface.ts @@ -42,10 +42,9 @@ export interface TextEditor { getDomNode(): HTMLElement | undefined; /** - * Types the given text into the editor as if the user had typed it, e.g. to trigger a completer registered in the editor. - * @param text The text to type into the editor. + * Triggers the completion in the editor, e.g. by showing a widget. */ - typeText(text: string): void; + triggerCompletion(): void; /** * Retrieves the text at the given range in the editor. diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/channel-reference.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/channel-reference.action.ts index f3bc053b43da..5afefaf5275d 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/channel-reference.action.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/channel-reference.action.ts @@ -44,11 +44,12 @@ export class ChannelReferenceAction extends TextEditorAction { } /** - * Types the text '#' into the editor and focuses it. This will trigger the completion provider to show the available channels. + * Inserts the text '#' into the editor and focuses it. This method will trigger the completion provider to show the available channels. * @param editor The editor to type the text into. */ run(editor: TextEditor) { - this.typeText(editor, ChannelReferenceAction.DEFAULT_INSERT_TEXT); + this.replaceTextAtCurrentSelection(editor, ChannelReferenceAction.DEFAULT_INSERT_TEXT); + editor.triggerCompletion(); editor.focus(); } diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/exercise-reference.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/exercise-reference.action.ts index 84fe668e955e..44b72e0f8724 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/exercise-reference.action.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/exercise-reference.action.ts @@ -52,11 +52,12 @@ export class ExerciseReferenceAction extends TextEditorDomainActionWithOptions { } /** - * Types the text '/exercise' into the editor and focuses it. This will trigger the completion provider to show the available exercises. - * @param editor The editor to type the text into. + * Inserts the text '/exercise' into the editor and focuses it. This method will trigger the completion provider to show the available exercises. + * @param editor The editor to insert the text into. */ run(editor: TextEditor): void { - this.typeText(editor, ExerciseReferenceAction.DEFAULT_INSERT_TEXT); + this.replaceTextAtCurrentSelection(editor, ExerciseReferenceAction.DEFAULT_INSERT_TEXT); + editor.triggerCompletion(); editor.focus(); } diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/user-mention.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/user-mention.action.ts index e6fa9b208397..240805b4adda 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/user-mention.action.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/user-mention.action.ts @@ -45,11 +45,12 @@ export class UserMentionAction extends TextEditorAction { } /** - * Types the text '@' into the editor and focuses it. This will trigger the completion provider to show the available users. - * @param editor The editor to type the text into. + * Inserts the text '@' into the editor and focuses it. This method will trigger the completion provider to show the available users. + * @param editor The editor to insert the text into. */ run(editor: TextEditor) { - this.typeText(editor, UserMentionAction.DEFAULT_INSERT_TEXT); + this.replaceTextAtCurrentSelection(editor, UserMentionAction.DEFAULT_INSERT_TEXT); + editor.triggerCompletion(); editor.focus(); } diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/text-editor-action.model.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/text-editor-action.model.ts index 96a8e6549b9c..62e037868ce0 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/text-editor-action.model.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/text-editor-action.model.ts @@ -148,15 +148,6 @@ export abstract class TextEditorAction implements Disposable { return text.startsWith(openDelimiter) && text.endsWith(closeDelimiter) && text.length >= openDelimiter.length + closeDelimiter.length; } - /** - * Types the given text in the editor at the current cursor position. You can use this e.g. to trigger a suggestion. - * @param editor The editor to type the text in. - * @param text The text to type. - */ - typeText(editor: TextEditor, text: string): void { - editor.typeText(text); - } - /** * Replaces the text at the current selection with the given text. If there is no selection, the text is inserted at the current cursor position. * @param editor The editor to replace the text in. diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.scss b/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.scss index 85f7d08ca87a..34b221d82d90 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.scss +++ b/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.scss @@ -1,3 +1,12 @@ +.diff-editor-container { + .monaco-diff-editor { + .monaco-editor { + // Disables the focus border around the editor. + outline: none; + } + } +} + /* * Hide the drag handles of the hidden lines, as this feature would result in unintuitive behavior. */ diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.ts index dd5b624d6554..bd234e45cdec 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-diff-editor.component.ts @@ -1,81 +1,58 @@ -import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, Renderer2, ViewEncapsulation } from '@angular/core'; -import { Theme, ThemeService } from 'app/core/theme/theme.service'; +import { ChangeDetectionStrategy, Component, ElementRef, OnDestroy, Renderer2, ViewEncapsulation, effect, inject, input, output } from '@angular/core'; import * as monaco from 'monaco-editor'; -import { Subscription } from 'rxjs'; import { Disposable } from 'app/shared/monaco-editor/model/actions/monaco-editor.util'; +import { MonacoEditorService } from './monaco-editor.service'; export type MonacoEditorDiffText = { original: string; modified: string }; @Component({ selector: 'jhi-monaco-diff-editor', template: '', + standalone: true, styleUrls: ['monaco-diff-editor.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, }) -export class MonacoDiffEditorComponent implements OnInit, OnDestroy { +export class MonacoDiffEditorComponent implements OnDestroy { private _editor: monaco.editor.IStandaloneDiffEditor; monacoDiffEditorContainerElement: HTMLElement; - themeSubscription?: Subscription; - listeners: Disposable[] = []; - resizeObserver?: ResizeObserver; - @Input() - set allowSplitView(value: boolean) { - this._editor.updateOptions({ - renderSideBySide: value, - }); - } + allowSplitView = input(true); + onReadyForDisplayChange = output(); - @Output() - onReadyForDisplayChange = new EventEmitter(); + /* + * Subscriptions and listeners that need to be disposed of when this component is destroyed. + */ + listeners: Disposable[] = []; - constructor( - private themeService: ThemeService, - elementRef: ElementRef, - renderer: Renderer2, - ) { + /* + * Injected services and elements. + */ + private readonly elementRef = inject(ElementRef); + private readonly renderer = inject(Renderer2); + private readonly monacoEditorService = inject(MonacoEditorService); + + constructor() { /* * The constructor injects the editor along with its container into the empty template of this component. * This makes the editor available immediately (not just after ngOnInit), preventing errors when the methods * of this component are called. */ - this.monacoDiffEditorContainerElement = renderer.createElement('div'); - this._editor = monaco.editor.createDiffEditor(this.monacoDiffEditorContainerElement, { - glyphMargin: true, - minimap: { enabled: false }, - readOnly: true, - renderSideBySide: true, - scrollBeyondLastLine: false, - stickyScroll: { - enabled: false, - }, - renderOverviewRuler: false, - scrollbar: { - vertical: 'hidden', - handleMouseWheel: true, - alwaysConsumeMouseWheel: false, - }, - hideUnchangedRegions: { - enabled: true, - }, - fontSize: 12, - }); - renderer.appendChild(elementRef.nativeElement, this.monacoDiffEditorContainerElement); + this.monacoDiffEditorContainerElement = this.renderer.createElement('div'); + this._editor = this.monacoEditorService.createStandaloneDiffEditor(this.monacoDiffEditorContainerElement); + this.renderer.appendChild(this.elementRef.nativeElement, this.monacoDiffEditorContainerElement); + this.renderer.addClass(this.monacoDiffEditorContainerElement, 'diff-editor-container'); this.setupDiffListener(); this.setupContentHeightListeners(); - } - ngOnInit(): void { - this.resizeObserver = new ResizeObserver(() => { - this.layout(); + effect(() => { + this._editor.updateOptions({ + renderSideBySide: this.allowSplitView(), + }); }); - this.resizeObserver.observe(this.monacoDiffEditorContainerElement); - this.themeSubscription = this.themeService.getCurrentThemeObservable().subscribe((theme) => this.changeTheme(theme)); } ngOnDestroy(): void { - this.themeSubscription?.unsubscribe(); - this.resizeObserver?.disconnect(); this.listeners.forEach((listener) => { listener.dispose(); }); @@ -88,7 +65,7 @@ export class MonacoDiffEditorComponent implements OnInit, OnDestroy { */ setupDiffListener(): void { const diffListener = this._editor.onDidUpdateDiff(() => { - this.adjustHeightAndLayout(this.getMaximumContentHeight()); + this.adjustContainerHeight(this.getMaximumContentHeight()); this.onReadyForDisplayChange.emit(true); }); @@ -106,13 +83,13 @@ export class MonacoDiffEditorComponent implements OnInit, OnDestroy { const contentSizeListener = editor.onDidContentSizeChange((e: monaco.editor.IContentSizeChangedEvent) => { if (e.contentHeightChanged) { // Using the content height of the larger editor here ensures that neither of the editors break out of the container. - this.adjustHeightAndLayout(this.getMaximumContentHeight()); + this.adjustContainerHeight(this.getMaximumContentHeight()); } }); // Called when the user reveals or collapses a hidden region. const hiddenAreaListener = editor.onDidChangeHiddenAreas(() => { - this.adjustHeightAndLayout(this.getContentHeightOfEditor(editor)); + this.adjustContainerHeight(this.getContentHeightOfEditor(editor)); }); this.listeners.push(contentSizeListener, hiddenAreaListener); @@ -120,30 +97,11 @@ export class MonacoDiffEditorComponent implements OnInit, OnDestroy { } /** - * Adjusts the height of the editor to fit the new content height. + * Adjusts the height of the editor's container to fit the new content height. * @param newContentHeight The new content height of the editor. */ - adjustHeightAndLayout(newContentHeight: number) { + adjustContainerHeight(newContentHeight: number) { this.monacoDiffEditorContainerElement.style.height = newContentHeight + 'px'; - this.layout(); - } - - /** - * Adjusts this editor to fit its container. - */ - layout(): void { - const width = this.monacoDiffEditorContainerElement.clientWidth; - const height = this.monacoDiffEditorContainerElement.clientHeight; - this._editor.layout({ width, height }); - } - - /** - * Sets the theme of all Monaco editors according to the Artemis theme. - * As of now, it is not possible to have two editors with different themes. - * @param artemisTheme The active Artemis theme. - */ - changeTheme(artemisTheme: Theme): void { - monaco.editor.setTheme(artemisTheme === Theme.DARK ? 'vs-dark' : 'vs-light'); } /** diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts index a0e28544e914..b9138398fcee 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts @@ -1,7 +1,5 @@ -import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, Renderer2, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ElementRef, OnDestroy, OnInit, Renderer2, ViewEncapsulation, effect, inject, input, output } from '@angular/core'; import * as monaco from 'monaco-editor'; -import { Subscription } from 'rxjs'; -import { Theme, ThemeService } from 'app/core/theme/theme.service'; import { MonacoEditorLineWidget } from 'app/shared/monaco-editor/model/monaco-editor-inline-widget.model'; import { MonacoEditorBuildAnnotation, MonacoEditorBuildAnnotationType } from 'app/shared/monaco-editor/model/monaco-editor-build-annotation.model'; import { MonacoEditorLineHighlight } from 'app/shared/monaco-editor/model/monaco-editor-line-highlight.model'; @@ -12,107 +10,98 @@ import { TranslateService } from '@ngx-translate/core'; import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model'; import { Disposable, EditorPosition, EditorRange, MonacoEditorTextModel } from 'app/shared/monaco-editor/model/actions/monaco-editor.util'; import { MonacoTextEditorAdapter } from 'app/shared/monaco-editor/model/actions/adapter/monaco-text-editor.adapter'; +import { MonacoEditorService } from 'app/shared/monaco-editor/monaco-editor.service'; export const MAX_TAB_SIZE = 8; @Component({ selector: 'jhi-monaco-editor', template: '', + standalone: true, styleUrls: ['monaco-editor.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, }) export class MonacoEditorComponent implements OnInit, OnDestroy { - private _editor: monaco.editor.IStandaloneCodeEditor; - private textEditorAdapter: MonacoTextEditorAdapter; - private monacoEditorContainerElement: HTMLElement; - themeSubscription?: Subscription; + /** + * The default width of the line decoration button in the editor. We use the ch unit to avoid fixed pixel sizes. + * @private + */ + private static readonly DEFAULT_LINE_DECORATION_BUTTON_WIDTH = '2.3ch'; + private static readonly SHRINK_TO_FIT_CLASS = 'monaco-shrink-to-fit'; + + private readonly _editor: monaco.editor.IStandaloneCodeEditor; + private readonly textEditorAdapter: MonacoTextEditorAdapter; + private readonly monacoEditorContainerElement: HTMLElement; + + /* + * Elements, models, and actions of the editor. + */ models: MonacoEditorTextModel[] = []; lineWidgets: MonacoEditorLineWidget[] = []; - editorBuildAnnotations: MonacoEditorBuildAnnotation[] = []; + buildAnnotations: MonacoEditorBuildAnnotation[] = []; lineHighlights: MonacoEditorLineHighlight[] = []; actions: TextEditorAction[] = []; lineDecorationsHoverButton?: MonacoEditorLineDecorationsHoverButton; - /** - * The default width of the line decoration button in the editor. We use the ch unit to avoid fixed pixel sizes. - * @private + /* + * Inputs and outputs. */ - private static readonly DEFAULT_LINE_DECORATION_BUTTON_WIDTH = '2.3ch'; + textChangedEmitDelay = input(); + shrinkToFit = input(true); + stickyScroll = input(false); + readOnly = input(false); - constructor( - private readonly themeService: ThemeService, - elementRef: ElementRef, - private readonly renderer: Renderer2, - private readonly translateService: TranslateService, - ) { + textChanged = output(); + contentHeightChanged = output(); + onBlurEditor = output(); + + /* + * Disposable listeners, subscriptions, and timeouts. + */ + private contentHeightListener?: Disposable; + private textChangedListener?: Disposable; + private blurEditorWidgetListener?: Disposable; + private textChangedEmitTimeout?: NodeJS.Timeout; + + /* + * Injected services and elements. + */ + private readonly renderer = inject(Renderer2); + private readonly translateService = inject(TranslateService); + private readonly elementRef = inject(ElementRef); + private readonly monacoEditorService = inject(MonacoEditorService); + + constructor() { /* * The constructor injects the editor along with its container into the empty template of this component. * This makes the editor available immediately (not just after ngOnInit), preventing errors when the methods * of this component are called. */ - this.monacoEditorContainerElement = renderer.createElement('div'); - renderer.addClass(this.monacoEditorContainerElement, 'monaco-editor-container'); - renderer.addClass(this.monacoEditorContainerElement, 'monaco-shrink-to-fit'); - this._editor = monaco.editor.create(this.monacoEditorContainerElement, { - value: '', - glyphMargin: true, - minimap: { enabled: false }, - readOnly: this._readOnly, - lineNumbersMinChars: 4, - scrollBeyondLastLine: false, - scrollbar: { - alwaysConsumeMouseWheel: false, // Prevents the editor from consuming the mouse wheel event, allowing the parent element to scroll. - }, - }); - this._editor.getModel()?.setEOL(monaco.editor.EndOfLineSequence.LF); + this.monacoEditorContainerElement = this.renderer.createElement('div'); + this.renderer.addClass(this.monacoEditorContainerElement, 'monaco-editor-container'); + this.renderer.addClass(this.monacoEditorContainerElement, MonacoEditorComponent.SHRINK_TO_FIT_CLASS); + this._editor = this.monacoEditorService.createStandaloneCodeEditor(this.monacoEditorContainerElement); this.textEditorAdapter = new MonacoTextEditorAdapter(this._editor); - renderer.appendChild(elementRef.nativeElement, this.monacoEditorContainerElement); - } - - @Input() - textChangedEmitDelay?: number; - - // TODO: The CSS class below allows the editor to shrink in the CodeEditorContainerComponent. We should eventually remove this class and handle the editor size differently in the code editor grid. - @Input() - set shrinkToFit(value: boolean) { - if (value) { - this.renderer.addClass(this.monacoEditorContainerElement, 'monaco-shrink-to-fit'); - } else { - this.renderer.removeClass(this.monacoEditorContainerElement, 'monaco-shrink-to-fit'); - } - } - - @Input() - set stickyScroll(value: boolean) { - this._editor.updateOptions({ - stickyScroll: { enabled: value }, + this.renderer.appendChild(this.elementRef.nativeElement, this.monacoEditorContainerElement); + + effect(() => { + // TODO: The CSS class below allows the editor to shrink in the CodeEditorContainerComponent. We should eventually remove this class and handle the editor size differently in the code editor grid. + if (this.shrinkToFit()) { + this.renderer.addClass(this.monacoEditorContainerElement, MonacoEditorComponent.SHRINK_TO_FIT_CLASS); + } else { + this.renderer.removeClass(this.monacoEditorContainerElement, MonacoEditorComponent.SHRINK_TO_FIT_CLASS); + } }); - } - @Input() - set readOnly(value: boolean) { - this._readOnly = value; - this._editor.updateOptions({ - readOnly: value, + effect(() => { + this._editor.updateOptions({ + stickyScroll: { enabled: this.stickyScroll() }, + readOnly: this.readOnly(), + }); }); } - private _readOnly: boolean = false; - - @Output() - textChanged = new EventEmitter(); - - @Output() - contentHeightChanged = new EventEmitter(); - - @Output() - onBlurEditor = new EventEmitter(); - - private contentHeightListener?: Disposable; - private textChangedListener?: Disposable; - private blurEditorWidgetListener?: Disposable; - private textChangedEmitTimeout?: NodeJS.Timeout; - ngOnInit(): void { const resizeObserver = new ResizeObserver(() => { this._editor.layout(); @@ -132,14 +121,11 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { this.blurEditorWidgetListener = this._editor.onDidBlurEditorWidget(() => { this.onBlurEditor.emit(); }); - - this.themeSubscription = this.themeService.getCurrentThemeObservable().subscribe((theme) => this.changeTheme(theme)); } ngOnDestroy() { this.reset(); this._editor.dispose(); - this.themeSubscription?.unsubscribe(); this.textChangedListener?.dispose(); this.contentHeightListener?.dispose(); this.blurEditorWidgetListener?.dispose(); @@ -147,7 +133,8 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { private emitTextChangeEvent() { const newValue = this.getText(); - if (!this.textChangedEmitDelay) { + const delay = this.textChangedEmitDelay(); + if (!delay) { this.textChanged.emit(newValue); } else { if (this.textChangedEmitTimeout) { @@ -156,7 +143,7 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { } this.textChangedEmitTimeout = setTimeout(() => { this.textChanged.emit(newValue); - }, this.textChangedEmitDelay); + }, delay); } } @@ -268,10 +255,10 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { } disposeAnnotations() { - this.editorBuildAnnotations.forEach((o) => { + this.buildAnnotations.forEach((o) => { o.dispose(); }); - this.editorBuildAnnotations = []; + this.buildAnnotations = []; } disposeLineHighlights(): void { @@ -288,10 +275,6 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { this.actions = []; } - changeTheme(artemisTheme: Theme): void { - monaco.editor.setTheme(artemisTheme === Theme.DARK ? 'vs-dark' : 'vs-light'); - } - layout(): void { this._editor.layout(); } @@ -325,7 +308,7 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { ); editorBuildAnnotation.addToEditor(); editorBuildAnnotation.setOutdatedAndUpdate(outdated); - this.editorBuildAnnotations.push(editorBuildAnnotation); + this.buildAnnotations.push(editorBuildAnnotation); } } diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.module.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.module.ts deleted file mode 100644 index 88f841d9407a..000000000000 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; -import { MonacoDiffEditorComponent } from 'app/shared/monaco-editor/monaco-diff-editor.component'; -import { CUSTOM_MARKDOWN_CONFIG, CUSTOM_MARKDOWN_LANGUAGE, CUSTOM_MARKDOWN_LANGUAGE_ID } from 'app/shared/monaco-editor/model/languages/monaco-custom-markdown.language'; - -import * as monaco from 'monaco-editor'; - -monaco.languages.register({ id: CUSTOM_MARKDOWN_LANGUAGE_ID }); -monaco.languages.setLanguageConfiguration(CUSTOM_MARKDOWN_LANGUAGE_ID, CUSTOM_MARKDOWN_CONFIG); -monaco.languages.setMonarchTokensProvider(CUSTOM_MARKDOWN_LANGUAGE_ID, CUSTOM_MARKDOWN_LANGUAGE); - -@NgModule({ - declarations: [MonacoEditorComponent, MonacoDiffEditorComponent], - exports: [MonacoEditorComponent, MonacoDiffEditorComponent], -}) -export class MonacoEditorModule {} diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.service.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.service.ts new file mode 100644 index 000000000000..b16cb7cf6b18 --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.service.ts @@ -0,0 +1,85 @@ +import { Injectable, effect, inject } from '@angular/core'; +import * as monaco from 'monaco-editor'; +import { CUSTOM_MARKDOWN_CONFIG, CUSTOM_MARKDOWN_LANGUAGE, CUSTOM_MARKDOWN_LANGUAGE_ID } from 'app/shared/monaco-editor/model/languages/monaco-custom-markdown.language'; +import { Theme, ThemeService } from 'app/core/theme/theme.service'; +import { toSignal } from '@angular/core/rxjs-interop'; + +/** + * Service providing shared functionality for the Monaco editor. + * This service is intended to be used by components that need to create and manage Monaco editors. + * It also ensures that the editor's theme matches the current theme of Artemis. + */ +@Injectable({ providedIn: 'root' }) +export class MonacoEditorService { + static readonly LIGHT_THEME_ID = 'vs'; + static readonly DARK_THEME_ID = 'vs-dark'; + + private readonly themeService: ThemeService = inject(ThemeService); + private readonly currentTheme = toSignal(this.themeService.getCurrentThemeObservable(), { requireSync: true }); + + constructor() { + monaco.languages.register({ id: CUSTOM_MARKDOWN_LANGUAGE_ID }); + monaco.languages.setLanguageConfiguration(CUSTOM_MARKDOWN_LANGUAGE_ID, CUSTOM_MARKDOWN_CONFIG); + monaco.languages.setMonarchTokensProvider(CUSTOM_MARKDOWN_LANGUAGE_ID, CUSTOM_MARKDOWN_LANGUAGE); + + effect(() => { + this.applyTheme(this.currentTheme()); + }); + } + + /** + * Applies the given theme to the Monaco editor. + * @param artemisTheme The theme to apply. + * @private + */ + private applyTheme(artemisTheme: Theme): void { + monaco.editor.setTheme(artemisTheme === Theme.LIGHT ? MonacoEditorService.LIGHT_THEME_ID : MonacoEditorService.DARK_THEME_ID); + } + + /** + * Creates a standalone code editor (see {@link MonacoEditorComponent}) with sensible default settings and inserts it into the given DOM element. + * @param domElement The DOM element to insert the editor into. + */ + createStandaloneCodeEditor(domElement: HTMLElement): monaco.editor.IStandaloneCodeEditor { + const editor = monaco.editor.create(domElement, { + value: '', + glyphMargin: true, + minimap: { enabled: false }, + lineNumbersMinChars: 4, + scrollBeyondLastLine: false, + scrollbar: { + alwaysConsumeMouseWheel: false, // Prevents the editor from consuming the mouse wheel event, allowing the parent element to scroll. + }, + }); + editor.getModel()?.setEOL(monaco.editor.EndOfLineSequence.LF); + return editor; + } + + /** + * Creates a standalone diff editor (see {@link MonacoDiffEditorComponent}) with sensible default settings and inserts it into the given DOM element. + * @param domElement The DOM element to insert the editor into. + */ + createStandaloneDiffEditor(domElement: HTMLElement): monaco.editor.IStandaloneDiffEditor { + return monaco.editor.createDiffEditor(domElement, { + automaticLayout: true, + glyphMargin: true, + minimap: { enabled: false }, + readOnly: true, + renderSideBySide: true, + scrollBeyondLastLine: false, + stickyScroll: { + enabled: false, + }, + renderOverviewRuler: false, + scrollbar: { + vertical: 'hidden', + handleMouseWheel: true, + alwaysConsumeMouseWheel: false, + }, + hideUnchangedRegions: { + enabled: true, + }, + fontSize: 12, + }); + } +} diff --git a/src/main/webapp/app/shared/search-filter/search-filter.component.ts b/src/main/webapp/app/shared/search-filter/search-filter.component.ts index b71bb54f850e..941017433864 100644 --- a/src/main/webapp/app/shared/search-filter/search-filter.component.ts +++ b/src/main/webapp/app/shared/search-filter/search-filter.component.ts @@ -1,11 +1,14 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { faMagnifyingGlass, faTimes } from '@fortawesome/free-solid-svg-icons'; +import { ArtemisSharedModule } from 'app/shared/shared.module'; @Component({ selector: 'jhi-search-filter', templateUrl: './search-filter.component.html', styleUrls: ['./search-filter.component.scss'], + standalone: true, + imports: [ArtemisSharedModule], }) export class SearchFilterComponent { faMagnifyingGlass = faMagnifyingGlass; diff --git a/src/main/webapp/app/shared/service/lti.service.ts b/src/main/webapp/app/shared/service/lti.service.ts new file mode 100644 index 000000000000..a493fffdd939 --- /dev/null +++ b/src/main/webapp/app/shared/service/lti.service.ts @@ -0,0 +1,15 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +@Injectable({ + providedIn: 'root', +}) +export class LtiService { + constructor() {} + private ltiSubject = new BehaviorSubject(false); + isLti$ = this.ltiSubject.asObservable(); + + setLti(isLti: boolean) { + this.ltiSubject.next(isLti); + } +} diff --git a/src/main/webapp/app/shared/shared.module.ts b/src/main/webapp/app/shared/shared.module.ts index ed2bf4cc9dfd..9c0e71a1bc90 100644 --- a/src/main/webapp/app/shared/shared.module.ts +++ b/src/main/webapp/app/shared/shared.module.ts @@ -27,7 +27,6 @@ import { StickyPopoverDirective } from 'app/shared/sticky-popover/sticky-popover import { ConfirmEntityNameComponent } from 'app/shared/confirm-entity-name/confirm-entity-name.component'; import { DetailOverviewNavigationBarComponent } from 'app/shared/detail-overview-navigation-bar/detail-overview-navigation-bar.component'; import { ScienceDirective } from 'app/shared/science/science.directive'; -import { SearchFilterComponent } from './search-filter/search-filter.component'; @NgModule({ imports: [ArtemisSharedLibsModule, ArtemisSharedCommonModule, ArtemisSharedPipesModule, RouterModule], @@ -56,7 +55,6 @@ import { SearchFilterComponent } from './search-filter/search-filter.component'; AssessmentWarningComponent, StickyPopoverDirective, ScienceDirective, - SearchFilterComponent, ], exports: [ ArtemisSharedLibsModule, @@ -87,7 +85,6 @@ import { SearchFilterComponent } from './search-filter/search-filter.component'; CompetencySelectionComponent, StickyPopoverDirective, ScienceDirective, - SearchFilterComponent, ], }) export class ArtemisSharedModule {} diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.html b/src/main/webapp/app/shared/sidebar/sidebar.component.html index ea513b48174e..a70e2a9e604f 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar.component.html +++ b/src/main/webapp/app/shared/sidebar/sidebar.component.html @@ -1,74 +1,76 @@ -
    -
    -
    - @if (searchFieldEnabled) { -
    - - @if (showFilter) { -
    - - @if (isFilterActive) { - - } @else { - - } - - -
    - } -
    - } - @if (!sidebarData?.ungroupedData || !(sidebarData?.ungroupedData | searchFilter: ['title', 'type'] : searchValue)?.length) { -
    - } @else { -
    - @if (sidebarData?.groupByCategory && sidebarData.groupedData) { - - } @else { - @for (sidebarItem of sidebarData?.ungroupedData | searchFilter: ['title', 'type'] : searchValue; track sidebarItem; let last = $last) { -
    -
    +
    +
    +
    +
    + @if (searchFieldEnabled) { +
    + + @if (showFilter) { +
    + + @if (isFilterActive) { + + } @else { + + } + +
    } - } -
    - } +
    + } + @if (!sidebarData?.ungroupedData || !(sidebarData?.ungroupedData | searchFilter: ['title', 'type'] : searchValue)?.length) { +
    + } @else { +
    + @if (sidebarData?.groupByCategory && sidebarData.groupedData) { + + } @else { + @for (sidebarItem of sidebarData?.ungroupedData | searchFilter: ['title', 'type'] : searchValue; track sidebarItem; let last = $last) { +
    +
    +
    + } + } +
    + } +
    diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.scss b/src/main/webapp/app/shared/sidebar/sidebar.component.scss index 7aa6c10477b1..ac8a40b229b1 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar.component.scss +++ b/src/main/webapp/app/shared/sidebar/sidebar.component.scss @@ -32,10 +32,6 @@ background-color: var(--module-bg); } -.sidebar-width { - width: 275px !important; -} - @media print { .hide-on_print { display: none !important; diff --git a/src/main/webapp/app/shared/sidebar/sidebar.module.ts b/src/main/webapp/app/shared/sidebar/sidebar.module.ts index cc34473eb48f..fdb5efb40bff 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar.module.ts +++ b/src/main/webapp/app/shared/sidebar/sidebar.module.ts @@ -16,6 +16,7 @@ import { SidebarCardDirective } from 'app/shared/sidebar/sidebar-card.directive' import { ConversationOptionsComponent } from 'app/shared/sidebar/conversation-options/conversation-options.component'; import { AccordionAddOptionsComponent } from 'app/shared/sidebar/accordion-add-options/accordion-add-options.component'; import { ArtemisExamSharedModule } from 'app/exam/shared/exam-shared.module'; +import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; @NgModule({ imports: [ @@ -28,6 +29,7 @@ import { ArtemisExamSharedModule } from 'app/exam/shared/exam-shared.module'; SubmissionResultStatusModule, SidebarCardDirective, ArtemisExamSharedModule, + SearchFilterComponent, ], declarations: [ SidebarAccordionComponent, diff --git a/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.html b/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.html index 8899797a2e8c..7372a07ac241 100644 --- a/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.html +++ b/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.html @@ -3,80 +3,153 @@

    @if (currentUser) {
    -
    -
    - - -
    -
    - @if (storedSshKey === '' && !editSshKey) { -
    - -
    - } - @if (storedSshKey !== '' && !editSshKey) { -
    -
    - {{ sshKey }} -
    -
    -
    + + @if (keyCount === 0 && !showSshKey) { +
    +
    +

    +
    +

    + + + +

    +
    + +
    -
    - -
    } - @if (editSshKey) { -
    -
    + + + @if (keyCount > 0 && !showSshKey) { +
    +

    + +
    +

    + + + +

    +
    + + + + + + + + + + + + + + + +
    +
    +
    + {{ sshKeyHash }} +
    +     		+
    +
    + + + + +
    + + +
    +
    +
    +
    + } + + + @if (showSshKey) {
    + @if (isKeyReadonly) { +

    + } @else { +

    + } + +
    +

    + + + +

    +
    +
    - +

    +
    -
    -
    - + +
    +

    + + {{ copyInstructions }} +

    +
    + + @if (!isKeyReadonly) { +
    +
    + +
    +
    + +
    -
    - + } @else { +
    +
    + +
    -
    + }
    }
    diff --git a/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.scss b/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.scss new file mode 100644 index 000000000000..8255e6ade0f4 --- /dev/null +++ b/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.scss @@ -0,0 +1,134 @@ +textarea { + width: 600px; + height: 150px; + font-size: small; + font-family: + Bitstream Vera Sans Mono, + Courier New, + monospace; +} + +table { + width: 100%; + border-collapse: collapse; + margin: 20px 0; + font-size: 16px; + text-align: left; +} + +th, +td { + padding: 15px 15px; +} + +/* Button styling */ + +.btn { + border-radius: 0; +} + +.container { + position: relative; +} + +.narrower-box { + max-width: 500px; + margin: 0 auto; +} + +.font-medium { + font-size: medium; +} + +.icon-column { + width: auto; + margin-right: 15px; +} + +.vertical-center { + margin: 0; + position: absolute; + top: 50%; + left: 50%; + -ms-transform: translateY(-50%); + transform: translateY(-50%); +} + +tbody tr:hover { + background-color: var(--ssh-key-table-hover-background); +} + +/* dd container */ +.dropdown { + display: inline-block; + position: relative; + outline: none; + margin: 0; +} + +/* button */ +.dropbtn { + padding: 0; + color: grey; + cursor: pointer; + transition: 0.35s ease-out; +} + +/* dd content */ +.dropdown .dropdown-content { + position: absolute; + top: 50%; + min-width: 120%; + box-shadow: 0 8px 16px var(--ssh-key-settings-shadow); + z-index: 100000; // makes sure the drop down menu is always shown at the highest view plane + visibility: hidden; + opacity: 1; + transition: 0.35s ease-out; + width: 80px; +} + +/* show dd content */ +.dropdown:focus .dropdown-content { + outline: none; + transform: translateY(20px); + visibility: visible; + opacity: 1; + background-color: var(--light); +} + +/* mask to close menu by clicking on the button */ +.dropdown .db2 { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + opacity: 0; + cursor: pointer; + z-index: 10; + display: none; +} + +.dropdown:focus .db2 { + display: inline-block; +} + +.dropdown .db2:focus .dropdown-content { + outline: none; + visibility: hidden; + margin-right: 15px; + opacity: 0; +} + +.dropdown-button { + margin: auto; + color: var(--ssh-key-settings-text-color); + background-color: var(--dropdown-bg); + border-color: var(--dropdown-bg); + width: 80px; +} + +.dropdown-button:hover { + background-color: var(--ssh-key-settings-dropdown-buttons-hover); + border-color: var(--ssh-key-settings-dropdown-buttons-hover); +} diff --git a/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.ts b/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.ts index 808fe99b016c..6fa6fbc9336e 100644 --- a/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.ts +++ b/src/main/webapp/app/shared/user-settings/ssh-settings/ssh-user-settings.component.ts @@ -4,27 +4,34 @@ import { AccountService } from 'app/core/auth/account.service'; import { Subject, Subscription, tap } from 'rxjs'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_LOCALVC } from 'app/app.constants'; -import { faEdit, faSave, faTrash } from '@fortawesome/free-solid-svg-icons'; +import { faEdit, faEllipsis, faSave, faTrash } from '@fortawesome/free-solid-svg-icons'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; import { AlertService } from 'app/core/util/alert.service'; +import { getOS } from 'app/shared/util/os-detector.util'; @Component({ selector: 'jhi-account-information', templateUrl: './ssh-user-settings.component.html', - styleUrls: ['../user-settings.scss'], + styleUrls: ['../user-settings.scss', './ssh-user-settings.component.scss'], }) export class SshUserSettingsComponent implements OnInit { readonly documentationType: DocumentationType = 'SshSetup'; currentUser?: User; localVCEnabled = false; sshKey = ''; + sshKeyHash = ''; storedSshKey = ''; - editSshKey = false; + showSshKey = false; + keyCount = 0; + isKeyReadonly = true; + copyInstructions = ''; readonly faEdit = faEdit; readonly faSave = faSave; readonly faTrash = faTrash; + readonly faEllipsis = faEllipsis; + private authStateSubscription: Subscription; private dialogErrorSource = new Subject(); @@ -40,14 +47,18 @@ export class SshUserSettingsComponent implements OnInit { this.profileService.getProfileInfo().subscribe((profileInfo) => { this.localVCEnabled = profileInfo.activeProfiles.includes(PROFILE_LOCALVC); }); - + this.setMessageBasedOnOS(getOS()); this.authStateSubscription = this.accountService .getAuthenticationState() .pipe( tap((user: User) => { this.storedSshKey = user.sshPublicKey || ''; this.sshKey = this.storedSshKey; + this.sshKeyHash = user.sshKeyHash || ''; this.currentUser = user; + // currently only 0 or 1 key are supported + this.keyCount = this.sshKey ? 1 : 0; + this.isKeyReadonly = !!this.sshKey; return this.currentUser; }), ) @@ -58,8 +69,10 @@ export class SshUserSettingsComponent implements OnInit { this.accountService.addSshPublicKey(this.sshKey).subscribe({ next: () => { this.alertService.success('artemisApp.userSettings.sshSettingsPage.saveSuccess'); - this.editSshKey = false; + this.showSshKey = false; this.storedSshKey = this.sshKey; + this.keyCount = this.keyCount + 1; + this.isKeyReadonly = true; }, error: () => { this.alertService.error('artemisApp.userSettings.sshSettingsPage.saveFailure'); @@ -68,12 +81,14 @@ export class SshUserSettingsComponent implements OnInit { } deleteSshKey() { - this.editSshKey = false; + this.showSshKey = false; this.accountService.deleteSshPublicKey().subscribe({ next: () => { this.alertService.success('artemisApp.userSettings.sshSettingsPage.deleteSuccess'); this.sshKey = ''; this.storedSshKey = ''; + this.keyCount = this.keyCount - 1; + this.isKeyReadonly = false; }, error: () => { this.alertService.error('artemisApp.userSettings.sshSettingsPage.deleteFailure'); @@ -83,10 +98,29 @@ export class SshUserSettingsComponent implements OnInit { } cancelEditingSshKey() { - this.editSshKey = !this.editSshKey; + this.showSshKey = !this.showSshKey; this.sshKey = this.storedSshKey; } protected readonly ButtonType = ButtonType; protected readonly ButtonSize = ButtonSize; + + private setMessageBasedOnOS(os: string): void { + switch (os) { + case 'Windows': + this.copyInstructions = 'cat ~/.ssh/id_ed25519.pub | clip'; + break; + case 'MacOS': + this.copyInstructions = 'pbcopy < ~/.ssh/id_ed25519.pub'; + break; + case 'Linux': + this.copyInstructions = 'xclip -selection clipboard < ~/.ssh/id_ed25519.pub'; + break; + case 'Android': + this.copyInstructions = 'termux-clipboard-set < ~/.ssh/id_ed25519.pub'; + break; + default: + this.copyInstructions = 'Ctrl + C'; + } + } } diff --git a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html index ae5e4598aa04..6f0b0f4d68cd 100644 --- a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html +++ b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html @@ -31,13 +31,15 @@ @if (localVCEnabled) { - - + @if (isAtLeastTutor) { + + + } } diff --git a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts index 77068b598121..46e74ca30b07 100644 --- a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts +++ b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts @@ -1,10 +1,13 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, inject } from '@angular/core'; import { faUser } from '@fortawesome/free-solid-svg-icons'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_LOCALVC } from 'app/app.constants'; import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; import { tap } from 'rxjs'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { RouterModule } from '@angular/router'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; /** * UserSettingsContainerComponent serves as the common ground for different settings @@ -12,19 +15,20 @@ import { tap } from 'rxjs'; @Component({ selector: 'jhi-user-settings', templateUrl: 'user-settings-container.component.html', + standalone: true, styleUrls: ['user-settings-container.component.scss'], + imports: [TranslateDirective, RouterModule, FontAwesomeModule], }) export class UserSettingsContainerComponent implements OnInit { + private readonly profileService = inject(ProfileService); + private readonly accountService = inject(AccountService); + // Icons faUser = faUser; currentUser?: User; localVCEnabled = false; - - constructor( - private profileService: ProfileService, - private accountService: AccountService, - ) {} + isAtLeastTutor = false; ngOnInit() { this.profileService.getProfileInfo().subscribe((profileInfo) => { @@ -33,7 +37,12 @@ export class UserSettingsContainerComponent implements OnInit { this.accountService .getAuthenticationState() - .pipe(tap((user: User) => (this.currentUser = user))) + .pipe( + tap((user: User) => { + this.currentUser = user; + this.isAtLeastTutor = this.accountService.isAtLeastTutor(); + }), + ) .subscribe(); } } diff --git a/src/main/webapp/app/shared/user-settings/user-settings.module.ts b/src/main/webapp/app/shared/user-settings/user-settings.module.ts index bc91e586ecb2..cd87f408b5a9 100644 --- a/src/main/webapp/app/shared/user-settings/user-settings.module.ts +++ b/src/main/webapp/app/shared/user-settings/user-settings.module.ts @@ -1,5 +1,4 @@ import { NgModule } from '@angular/core'; -import { UserSettingsContainerComponent } from 'app/shared/user-settings/user-settings-container/user-settings-container.component'; import { AccountInformationComponent } from 'app/shared/user-settings/account-information/account-information.component'; import { NotificationSettingsComponent } from 'app/shared/user-settings/notification-settings/notification-settings.component'; import { ArtemisSharedModule } from 'app/shared/shared.module'; @@ -12,11 +11,11 @@ import { VcsAccessTokensSettingsComponent } from 'app/shared/user-settings/vcs-a import { ClipboardModule } from '@angular/cdk/clipboard'; import { FormDateTimePickerModule } from 'app/shared/date-time-picker/date-time-picker.module'; import { IdeSettingsComponent } from 'app/shared/user-settings/ide-preferences/ide-settings.component'; +import { DocumentationLinkComponent } from 'app/shared/components/documentation-link/documentation-link.component'; @NgModule({ - imports: [RouterModule.forChild(userSettingsState), ArtemisSharedModule, ArtemisSharedComponentModule, ClipboardModule, FormDateTimePickerModule], + imports: [RouterModule.forChild(userSettingsState), ArtemisSharedModule, ArtemisSharedComponentModule, ClipboardModule, FormDateTimePickerModule, DocumentationLinkComponent], declarations: [ - UserSettingsContainerComponent, AccountInformationComponent, NotificationSettingsComponent, ScienceSettingsComponent, diff --git a/src/main/webapp/app/shared/user-settings/user-settings.scss b/src/main/webapp/app/shared/user-settings/user-settings.scss index 02a29cc3ae86..15bc60da27ed 100644 --- a/src/main/webapp/app/shared/user-settings/user-settings.scss +++ b/src/main/webapp/app/shared/user-settings/user-settings.scss @@ -19,11 +19,6 @@ dd { font-size: larger; } -span { - color: gray; - font-size: smaller; -} - .userSettings-info { span { font-style: italic; diff --git a/src/main/webapp/app/shared/util/course.util.ts b/src/main/webapp/app/shared/util/course.util.ts index ae49c6318b8c..ce1d2f00c2af 100644 --- a/src/main/webapp/app/shared/util/course.util.ts +++ b/src/main/webapp/app/shared/util/course.util.ts @@ -4,8 +4,12 @@ import { Course } from 'app/entities/course.model'; * Sorts an array of Course objects alphabetically by their title. * * @param {Course[]} courses - The array of Course objects to be sorted. + * @param {boolean} isSortAscending - Sort direction, it is ascending by default. * @returns {Course[]} The sorted array of Course objects. */ -export function sortCourses(courses: Course[]): Course[] { - return courses.sort((courseA, courseB) => (courseA.title ?? '').localeCompare(courseB.title ?? '')); +export function sortCourses(courses: Course[], isSortAscending: boolean = true): Course[] { + return courses.sort((courseA, courseB) => { + const sortOrder = (courseA.title ?? '').localeCompare(courseB.title ?? ''); + return isSortAscending ? sortOrder : -sortOrder; + }); } diff --git a/src/main/webapp/app/shared/util/os-detector.util.ts b/src/main/webapp/app/shared/util/os-detector.util.ts new file mode 100644 index 000000000000..59ef5027b69b --- /dev/null +++ b/src/main/webapp/app/shared/util/os-detector.util.ts @@ -0,0 +1,17 @@ +export function getOS(): string { + const userAgent = window.navigator.userAgent; + + if (userAgent.indexOf('Win') !== -1) { + return 'Windows'; + } else if (userAgent.indexOf('Mac') !== -1) { + return 'MacOS'; + } else if (/Android/.test(userAgent)) { + return 'Android'; + } else if (userAgent.indexOf('Linux') !== -1) { + return 'Linux'; + } else if (/iPhone|iPad|iPod/.test(userAgent)) { + return 'iOS'; + } else { + return 'Unknown'; + } +} diff --git a/src/main/webapp/app/utils/color.utils.ts b/src/main/webapp/app/utils/color.utils.ts new file mode 100644 index 000000000000..022f83b0dbdf --- /dev/null +++ b/src/main/webapp/app/utils/color.utils.ts @@ -0,0 +1,13 @@ +import { deterministicRandomValueFromString } from 'app/utils/text.utils'; + +/** + * Returns a background color hue for a given string. + * @param {string | undefined} seed - The string used to determine the random value. + */ +export const getBackgroundColorHue = (seed: string | undefined): string => { + if (seed === undefined) { + seed = Math.random().toString(); + } + const hue = deterministicRandomValueFromString(seed) * 360; + return `hsl(${hue}, 50%, 50%)`; // Return an HSL color string +}; diff --git a/src/main/webapp/app/utils/text.utils.ts b/src/main/webapp/app/utils/text.utils.ts index f473eb89a655..43bcc0c53719 100644 --- a/src/main/webapp/app/utils/text.utils.ts +++ b/src/main/webapp/app/utils/text.utils.ts @@ -10,3 +10,49 @@ export const convertToHtmlLinebreaks = (input: string): string => input.replace( export const abbreviateString = (input: string, maxLength: number): string => { return input.length > maxLength ? input.substring(0, maxLength) + '…' : input; }; + +/** + * Returns a pseudo-random numeric value for a given string using a simple hash function. + * @param {string} str - The string used for the hash function. + */ +export const deterministicRandomValueFromString = (str: string): number => { + let seed = 0; + for (let i = 0; i < str.length; i++) { + seed = str.charCodeAt(i) + ((seed << 5) - seed); + } + const m = 0x80000000; + const a = 1103515245; + const c = 42718; + + seed = (a * seed + c) % m; + + return seed / (m - 1); +}; + +/** + * Returns 2 capitalized initials of a given string. + * If it has multiple names, it takes the first and last (Albert Berta Muster -> AM) + * If it has one name, it'll return a deterministic random other string (Albert -> AB) + * If it consists of a single letter it will return the single letter. + * @param {string} username - The string used to generate the initials. + */ +export const getInitialsFromString = (username: string): string => { + const parts = username.trim().split(/\s+/); + + let initials = ''; + + if (parts.length > 1) { + // Takes first and last word in string and returns their initials. + initials = parts[0][0] + parts[parts.length - 1][0]; + } else { + // If only one single word, it will take the first letter and a random second. + initials = parts[0][0]; + const remainder = parts[0].slice(1); + const secondInitial = remainder.match(/[a-zA-Z0-9]/); + if (secondInitial) { + initials += secondInitial[Math.floor(deterministicRandomValueFromString(username) * secondInitial.length)]; + } + } + + return initials.toUpperCase(); +}; diff --git a/src/main/webapp/content/scss/_artemis-variables.scss b/src/main/webapp/content/scss/_artemis-variables.scss index e06a4772e431..7771e583d3bd 100644 --- a/src/main/webapp/content/scss/_artemis-variables.scss +++ b/src/main/webapp/content/scss/_artemis-variables.scss @@ -17,6 +17,7 @@ $grid-gutter-width: 1rem; // Define common padding and border radius sizes and more. $border-radius: 0.15rem; $border-radius-lg: 0.25rem; +$border-radius-xl: 0.5rem; $border-radius-sm: 0.1rem; // Typography: diff --git a/src/main/webapp/content/scss/global.scss b/src/main/webapp/content/scss/global.scss index c449f7402ef4..cced06761869 100644 --- a/src/main/webapp/content/scss/global.scss +++ b/src/main/webapp/content/scss/global.scss @@ -139,7 +139,6 @@ a.btn { .form-control-sm, .form-select, .form-check-input, -.form-control:not(.ace_editor):hover, .form-control:focus, .form-control:focus-visible, textarea { @@ -827,14 +826,12 @@ Course Info Bar } } -.warning-modal-window .modal-dialog { - width: 50%; +.diff-view-modal .modal-dialog { + max-width: 80vw; } -/* additional style to overwrite form-control style from parent components */ -.form-control.ace_editor { - font-size: 12px; - line-height: normal; +.warning-modal-window .modal-dialog { + width: 50%; } .connection-status { @@ -1092,10 +1089,49 @@ body.transparent-background { } } -.sidebar-collapsed { +.sidebar-collapsed-course-overview { display: none; } +$transition-sidebar-content-opacity-length: 0.1s; +$transition-sidebar-width-length: 0.1s; +$transition-in-between-delay: 0.05s; + +.sidebar-content { + opacity: 1; + + transition: opacity $transition-sidebar-content-opacity-length 0s ease-in-out; +} + +.sidebar-collapsed .sidebar-content { + opacity: 0; + + transition: opacity $transition-sidebar-content-opacity-length 0s ease-in-out; +} + +.sidebar-wrap { + overflow: hidden; + max-width: $sidebar-width; + margin-right: $spacer; + + transition: + max-width $transition-sidebar-width-length 0s ease-in-out, + margin-right $transition-sidebar-width-length 0s ease-in-out; +} + +.sidebar-collapsed .sidebar-wrap { + max-width: 0; + margin-right: 0; + + transition: + max-width $transition-sidebar-width-length 0s ease-in-out, + margin-right $transition-sidebar-width-length 0s ease-in-out; +} + +.sidebar-width { + width: $sidebar-width !important; +} + .fs-xx-small { font-size: 0.625rem; } diff --git a/src/main/webapp/content/scss/themes/_dark-variables.scss b/src/main/webapp/content/scss/themes/_dark-variables.scss index b972c760771a..daa039c0e167 100644 --- a/src/main/webapp/content/scss/themes/_dark-variables.scss +++ b/src/main/webapp/content/scss/themes/_dark-variables.scss @@ -129,6 +129,9 @@ $neutral-dark-l-20: lighten($neutral-dark, 20%); $footer-bg: $neutral-dark; $footer-height-dev: 3rem; $footer-height-prod: 2rem; + +// Sidebar +$sidebar-width: 275px; $sidebar-footer-height-dev: 134px; $sidebar-footer-height-prod: 118px; @@ -659,3 +662,10 @@ $iris-rate-background: var(--neutral-dark-l-15); // Image Cropper $cropper-overlay-color: transparent; + +// Settings +$ssh-key-table-hover-background: $gray-900; +$ssh-key-settings-dropdown-buttons: $gray-800; +$ssh-key-settings-dropdown-buttons-hover: $gray-700; +$ssh-key-settings-text-color: $white; +$ssh-key-settings-shadow: rgba(0, 0, 0, 0.5); diff --git a/src/main/webapp/content/scss/themes/_default-variables.scss b/src/main/webapp/content/scss/themes/_default-variables.scss index 4490f3ad7ac4..337a58ed3316 100644 --- a/src/main/webapp/content/scss/themes/_default-variables.scss +++ b/src/main/webapp/content/scss/themes/_default-variables.scss @@ -51,8 +51,11 @@ $border-color: #dee2e6; $footer-bg: $white; $footer-height-dev: 3rem; $footer-height-prod: 2rem; + +// Sidebar $sidebar-footer-height-dev: 134px; $sidebar-footer-height-prod: 118px; +$sidebar-width: 275px; //Module and Navigationbar $module-bg: $white; @@ -587,3 +590,10 @@ $iris-rate-background: var(--gray-300); // Image Cropper $cropper-overlay-color: transparent; + +// Settings +$ssh-key-settings-table-hover-background: $gray-200; +$ssh-key-settings-dropdown-buttons: $light; +$ssh-key-settings-dropdown-buttons-hover: $gray-200; +$ssh-key-settings-text-color: $black; +$ssh-key-settings-shadow: rgba(0, 0, 0, 0.2); diff --git a/src/main/webapp/content/scss/themes/theme-dark.scss b/src/main/webapp/content/scss/themes/theme-dark.scss index 5103959f50cb..403832650f6d 100644 --- a/src/main/webapp/content/scss/themes/theme-dark.scss +++ b/src/main/webapp/content/scss/themes/theme-dark.scss @@ -218,22 +218,6 @@ html { } } -.ace_editor.ace_dark.ace-dracula { - background-color: $neutral-dark !important; - - .ace_gutter { - background-color: #242724; - } - - .ace_comment { - color: #8497ce; - } - - .ace_active-line { - background: transparentize(#44475a, 0.7); - } -} - // ================== // NGX CHARTS STYLING // ================== diff --git a/src/main/webapp/i18n/de/aboutUs.json b/src/main/webapp/i18n/de/aboutUs.json index 58c6daa59491..97811e2e0b5d 100644 --- a/src/main/webapp/i18n/de/aboutUs.json +++ b/src/main/webapp/i18n/de/aboutUs.json @@ -24,7 +24,7 @@ "text": "Prüfungsmodus: Lehrende können Online-Prüfungen mit Aufgabenvarianten, integrierter Plagiatsprüfung, Testläufen und Studierendenbewertungen erstellen. Studierende nehmen problemlos teil." }, "grading": { - "text": "Benotung: Berechnen/Anzeigen von Noten mit konfigurierbaren Notenschlüsseln für Kurse/Prüfungen. Export als csv-Dateien zu Hochschulsysteme (z.B. CAMPUSonline)." + "text": "Benotung: Berechnen/Anzeigen von Noten mit konfigurierbaren Notenschlüsseln für Kurse/Prüfungen. Export als CSV-Dateien zu Hochschulsysteme (z.B. CAMPUSonline)." }, "assessment": { "text": "Bewertung: Doppelblind-Bewertung mit strukturierten Bewertungskriterien, Ranglisten sowie Bewertungen/Beschwerden verbessert die Konsistenz/Fairness." diff --git a/src/main/webapp/i18n/de/answerCounter.json b/src/main/webapp/i18n/de/answerCounter.json index 3e576a103916..f0e5755d6dc7 100644 --- a/src/main/webapp/i18n/de/answerCounter.json +++ b/src/main/webapp/i18n/de/answerCounter.json @@ -2,20 +2,20 @@ "artemisApp": { "answerCounter": { "home": { - "title": "Answer Counters", - "createLabel": "Answer Counter erstellen" + "title": "Antwortzähler", + "createLabel": "Antwortzähler erstellen" }, - "created": "Answer Counter erstellt mit ID {{ param }}", - "updated": "Answer Counter aktualisiert mit ID {{ param }}", - "deleted": "Answer Counter gelöscht mit ID {{ param }}", + "created": "Antwortzähler erstellt mit ID {{ param }}", + "updated": "Antwortzähler aktualisiert mit ID {{ param }}", + "deleted": "Antwortzähler gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Answer Counter {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Antwortzähler {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Answer Counter" + "title": "Antwortzähler" }, - "answer": "Answer", - "multipleChoiceQuestionStatistic": "Multiple-Choice Question Statistic" + "answer": "Antwort", + "multipleChoiceQuestionStatistic": "Multiple-Choice Fragestatistik" } } } diff --git a/src/main/webapp/i18n/de/answerOption.json b/src/main/webapp/i18n/de/answerOption.json index 1000c5e42f76..c9867d44c31b 100644 --- a/src/main/webapp/i18n/de/answerOption.json +++ b/src/main/webapp/i18n/de/answerOption.json @@ -2,24 +2,24 @@ "artemisApp": { "answerOption": { "home": { - "title": "Answer Options", - "createLabel": "Answer Option erstellen" + "title": "Antwortmöglichkeiten", + "createLabel": "Antwortmöglichkeit erstellen" }, - "created": "Answer Option erstellt mit ID {{ param }}", - "updated": "Answer Option aktualisiert mit ID {{ param }}", - "deleted": "Answer Option gelöscht mit ID {{ param }}", + "created": "Antwortmöglichkeit erstellt mit ID {{ param }}", + "updated": "Antwortmöglichkeit aktualisiert mit ID {{ param }}", + "deleted": "Antwortmöglichkeit gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Answer Option {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Antwortmöglichkeit {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Answer Option" + "title": "Antwortmöglichkeit" }, "text": "Text", "hint": "Hint", - "explanation": "Explanation", - "isCorrect": "Is Correct", - "invalid": "Invalid", - "question": "Question" + "explanation": "Erklärung", + "isCorrect": "Ist korrekt", + "invalid": "Ungültig", + "question": "Frage" } } } diff --git a/src/main/webapp/i18n/de/apollonDiagram.json b/src/main/webapp/i18n/de/apollonDiagram.json index eaf6a911394b..d61407d2dad6 100644 --- a/src/main/webapp/i18n/de/apollonDiagram.json +++ b/src/main/webapp/i18n/de/apollonDiagram.json @@ -8,9 +8,9 @@ "loading": "Es ist ein Fehler beim Laden der Diagramme aufgetreten" } }, - "updated": "Apollon Diagram '{{ title }}' aktualisiert", + "updated": "Apollon Diagramm '{{ title }}' aktualisiert", "create": { - "success": "Apollon Diagram mit Titel {{ title }} wurde erfolgreich generiert", + "success": "Apollon Diagramm mit Titel {{ title }} wurde erfolgreich generiert", "error": "Fehler beim Erstellen des Apollon Diagramms", "validationError": "Validierungsfehler: Interaktive Elemente werden zum Generieren benötigt." }, @@ -18,8 +18,8 @@ "error": "Fehler beim Aktualisieren des Apollon Diagramms" }, "delete": { - "question": "Soll Apollon Diagram '{{ title }}' wirklich dauerhaft gelöscht werden?", - "success": "Apollon Diagram mit Titel {{ title }} wurde erfolgreich gelöscht", + "question": "Soll Apollon Diagramm '{{ title }}' wirklich dauerhaft gelöscht werden?", + "success": "Apollon Diagramm mit Titel {{ title }} wurde erfolgreich gelöscht", "error": "Fehler beim Löschen des Apollon Diagramms mit Titel {{ title }} aufgetreten" }, "detail": { @@ -30,12 +30,12 @@ "createLabel": "Erstelle eine Quizaufgabe", "generate": "Erstellen", "error": { - "loading": "Es ist ein Fehler beim Laden des Diagrams aufgetreten" + "loading": "Es ist ein Fehler beim Laden des Diagramms aufgetreten" }, "quizExercise": "Erstelle eine Quizaufgabe für den Kurs {{ title }}.", "exitConfirm": { - "title": "Diagram Editor Verlassen", - "question": "Dein Diagram hat ungespeicherte Änderungen. Bist du dir sicher, dass du den Editor verlassen möchtest?" + "title": "Diagramm Editor Verlassen", + "question": "Dein Diagramm hat ungespeicherte Änderungen. Bist du dir sicher, dass du den Editor verlassen möchtest?" } }, "title": "Titel", diff --git a/src/main/webapp/i18n/de/assessment.json b/src/main/webapp/i18n/de/assessment.json index 373c60598f44..406f8dafdc2b 100644 --- a/src/main/webapp/i18n/de/assessment.json +++ b/src/main/webapp/i18n/de/assessment.json @@ -73,7 +73,7 @@ "useAsExampleSubmissionVerificationQuestion": "Bist du dir sicher, dass du diese Abgabe als Beispielabgabe importieren möchtest?", "messages": { "confirmCancel": "Bist du sicher, dass du die Bewertung abbrechen möchtest? Dein aktueller Bewertungsfortschritt wird gelöscht und die Abgabe steht anderen Tutor:innen wieder zur Verfügung.", - "acceptComplaintWithoutMoreScore": "Bist du sicher, dass du diesen Complaint annehmen willst, ohne dem Studenten mehr Punkte zu geben?", + "acceptComplaintWithoutMoreScore": "Bist du sicher, dass du diese Beschwerde annehmen willst, ohne dem Studenten mehr Punkte zu geben?", "loadSubmissionFailed": "Laden der angefragten Abgabe ist fehlgeschlagen.", "submitSuccessful": "Deine Bewertung wurde erfolgreich abgesendet!", "saveSuccessful": "Deine Bewertung wurde erfolgreich gespeichert!", @@ -124,7 +124,7 @@ "activeFilter": "Aktiver Filter", "unassessedSubmissions": "Zeige nur nicht bewertete Abgaben", "manuallyAssessedSubmissions": "Zeige nur manuell bewertete Abgaben", - "semiAutomaticallyAssessedSubmissions": "Zeige nur Abgaben, die mit automatischer Assisstenz bewertet wurden" + "semiAutomaticallyAssessedSubmissions": "Zeige nur Abgaben, die mit automatischer Assistenz bewertet wurden" }, "locks": { "home": { diff --git a/src/main/webapp/i18n/de/assessmentInstructions.json b/src/main/webapp/i18n/de/assessmentInstructions.json index 94d41f645eb3..a75e020a9870 100644 --- a/src/main/webapp/i18n/de/assessmentInstructions.json +++ b/src/main/webapp/i18n/de/assessmentInstructions.json @@ -21,7 +21,7 @@ "usageCount": "Anzahl Verwendung", "trainingEvaluationCriteria": { "title": "Bewertungskriterien für das Beurteilungstraining", - "description": "Um das Beurteilungstraining erfolgreich abzuschließen, sollte die Bewertung alle folgenden Kriterien erfüllen:
     1. Die Menge deines Feedbacks sollte der Menge in der Bespielbewertung entsprechen.
     2. Jedes Feedback sollte die gleiche Bewertungsanweisung und Punktzahl aufweisen.
     3. Für Feedback mit negativer Punktzahl muss eine Begründung angegeben werden." + "description": "Um das Beurteilungstraining erfolgreich abzuschließen, sollte die Bewertung alle folgenden Kriterien erfüllen:
     1. Die Menge deines Feedbacks sollte der Menge in der Beispielbewertung entsprechen.
     2. Jedes Feedback sollte die gleiche Bewertungsanweisung und Punktzahl aufweisen.
     3. Für Feedback mit negativer Punktzahl muss eine Begründung angegeben werden." } } } diff --git a/src/main/webapp/i18n/de/bonus.json b/src/main/webapp/i18n/de/bonus.json index 53ead85ba293..8ffa5710a4a3 100644 --- a/src/main/webapp/i18n/de/bonus.json +++ b/src/main/webapp/i18n/de/bonus.json @@ -3,7 +3,7 @@ "bonus": { "bonusStrategy": { "title": "Wähle eine Bonusstrategie", - "helpText": "Noten: Berechnet zunächst die Prüfungsnote anhand des Notenschlüssel. Dann wird der Bonus auf diese Note angewandt, um die Endnote zu erhalten.
    Punkte: Wendet zunächst den Bonus auf die Punkte des Studierenden an. Danach wird die Endnote berechnet, indem die resultierenden Punkte mit dem Notenschlüssel für die Prüfung umgerechnet werden.", + "helpText": "Noten: Berechnet zunächst die Prüfungsnote anhand des Notenschlüssels. Dann wird der Bonus auf diese Note angewandt, um die Endnote zu erhalten.
    Punkte: Wendet zunächst den Bonus auf die Punkte des Studierenden an. Danach wird die Endnote berechnet, indem die resultierenden Punkte mit dem Notenschlüssel für die Prüfung umgerechnet werden.", "grades": "Noten", "points": "Punkte" }, @@ -19,9 +19,9 @@ }, "bonusSource": { "title": "Wähle die Quelle für den Bonus", - "helpText": "Prüfungen und Kurse mit einem \"Bonus\"-Notenschlüssel sind unten aufgeführt. Die Note der Studierenden für den gewählten Kurs/Prüfung bestimmt die Höhe des Bonuses.", + "helpText": "Prüfungen und Kurse mit einem \"Bonus\"-Notenschlüssel sind unten aufgeführt. Die Note der Studierenden für den gewählten Kurs/Prüfung bestimmt die Höhe des Bonus.", "maxPoints": "Max Punkte", - "maxPointsCourseHelpText": "Die im Notenschlüssel des Kurses angegebene maximale Punktzahl. Dieser Wert wird nur für die Berechnung von Beispielen verwendet und nicht für die Bonusberechnung. Stattdessen wird der Bonus mit Hilfe der im Kurs erreichbaren Punkte berechnet." + "maxPointsCourseHelpText": "Die im Notenschlüssel des Kurses angegebene maximale Punktzahl. Dieser Wert wird nur für die Berechnung von Beispielen verwendet und nicht für die Bonusberechnung. Stattdessen wird der Bonus mithilfe der im Kurs erreichbaren Punkte berechnet." }, "examples": { "title": "Beispiele", diff --git a/src/main/webapp/i18n/de/codeHint.json b/src/main/webapp/i18n/de/codeHint.json index 23c982b8c3ee..93f2b508fea0 100644 --- a/src/main/webapp/i18n/de/codeHint.json +++ b/src/main/webapp/i18n/de/codeHint.json @@ -36,7 +36,7 @@ }, "step3": { "name": "Lösungs-Fragmente", - "description": "In diesem Schritt kannst du die einzelnen Fragment bearbeiten, aus denen Code-Hinweise erstellt werden.", + "description": "In diesem Schritt kannst du die einzelnen Fragmente bearbeiten, aus denen Code-Hinweise erstellt werden.", "notGenerated": "Bisher wurden keine Fragmente generiert.", "createManualFragmentButton": { "label": "Erstelle manuelles Fragment", @@ -69,12 +69,12 @@ "notGenerated": "Bisher wurden keine Code-Hinweise generiert.", "updateHintsButton": { "label": "Code-Hinweise aktualisieren", - "tooltip": "Erstellt neue Code-Hinweise, indem die existierenden Lösungs Codeschnipsel neu zugewiesen werden. Titel, Beschreibung und Inhalt bleiben unverändert beim ursprünglichen Hinweis.", + "tooltip": "Erstellt neue Code-Hinweise, indem die existierenden Lösungs-Codeschnipsel neu zugewiesen werden. Titel, Beschreibung und Inhalt bleiben unverändert beim ursprünglichen Hinweis.", "success": "Code-Hinweise erfolgreich aktualisiert. Die Hinweise sind direkt sichtbar für teilnehmende Studierende." }, "createHintsButton": { "label": "Code-Hinweise erstellen", - "tooltip": "Erstellt Code-Hinweise aus den existierenden Lösungs Codeschnipseln.", + "tooltip": "Erstellt Code-Hinweise aus den existierenden Lösungs-Codeschnipseln.", "success": "Code-Hinweise erfolgreich erstellt. Die Hinweise sind direkt sichtbar für teilnehmende Studierende." }, "recreateHintsButton": { @@ -85,17 +85,17 @@ "iris": { "generateDescription": { "label": "Beschreibungen generieren", - "tooltip": "Generiert eine kurze und lange Beschreibung basierend auf dem Lösungs Codeschnipseln mit Hilfe von Iris." + "tooltip": "Generiert eine kurze und lange Beschreibung basierend auf dem Lösungs-Codeschnipseln mithilfe von Iris." } } } } }, "programmingExerciseSolutionEntry": { - "simplifiedName": "Lösungs Codeschnipsel", - "created": "Neues Lösungs Codeschnipsel erstellt mit ID {{ param }}", - "updated": "Lösungs Codeschnipsel aktualisiert mit ID {{ param }}", - "deleted": "Lösungs Codeschnipsel gelöscht mit ID {{ param }}", + "simplifiedName": "Lösungs-Codeschnipsel", + "created": "Neues Lösungs-Codeschnipsel erstellt mit ID {{ param }}", + "updated": "Lösungs-Codeschnipsel aktualisiert mit ID {{ param }}", + "deleted": "Lösungs-Codeschnipsel gelöscht mit ID {{ param }}", "test": "Test", "testOnlyForCurrentTask": "Du kannst nur Tests auswählen, die in der aktuellen Task enthalten sind.", "file": "Datei", diff --git a/src/main/webapp/i18n/de/competency.json b/src/main/webapp/i18n/de/competency.json index f8c8630389e2..40c540dad5cb 100644 --- a/src/main/webapp/i18n/de/competency.json +++ b/src/main/webapp/i18n/de/competency.json @@ -10,7 +10,7 @@ "taxonomy": "Taxonomie", "softDueDate": "Empfohlen bis", "optional": "Optional", - "optionalDescription": "Optionale Kompetenzen müssen nicht absolviert werden um den Lernpfad zu vervollständigen. Sie dienen entweder als zusätzliche Übung oder gehen über die erwarteten Inhalte des Kurses hinaus.", + "optionalDescription": "Optionale Kompetenzen müssen nicht absolviert werden, um den Lernpfad zu vervollständigen. Sie dienen entweder als zusätzliche Übung oder gehen über die erwarteten Inhalte des Kurses hinaus.", "course": "Kurs", "progress": "Fortschritt", "progressDescription": "Der Fortschritt basiert auf dem Prozentsatz an abgeschlossenen Vorlesungseinheiten und den erreichten Punkten in den Übungen.", @@ -108,7 +108,7 @@ "titleMaxLengthValidationError": "Der Titel einer Kompetenz ist auf maximal {{max}} Symbole beschränkt", "descriptionMaxLengthValidationError": "Die Beschreibung der Kompetenz ist auf maximal {{max}} Symbole beschränkt", "softDueDate": "Empfohlenes Fertigstellungsdatum", - "softDueDateHint": "Empfehle einen Zeitpunkt zu dem die Studierenden diese Kompetenz gemeistert haben sollten. Dies ist keine harte Frist.", + "softDueDateHint": "Empfehle einen Zeitpunkt, zu dem die Studierenden diese Kompetenz gemeistert haben sollten. Dies ist keine harte Frist.", "connectWithLectureUnits": "Verbinde die Kompetenz mit Vorlesungseinheiten" }, "edit": { @@ -174,6 +174,36 @@ "manage": { "importAllButton": "Alles eines Kurses importieren" }, + "importSettings": { + "importRelationsLabel": "Beziehungen importieren", + "importRelationsTooltip": "Alle Beziehungen zwischen den importierten Kompetenzen werden ebenfalls importiert", + "importExercisesLabel": "Aufgaben importieren", + "importExercisesTooltip": "Importiert alle Aufgaben, die mit den importierten Kompetenzen verknüpft sind oder verknüpft sie, wenn eine Aufgabe mit diesem Namen bereits existiert", + "importLecturesLabel": "Vorlesungen importieren", + "importLecturesTooltip": "Importiert alle Vorlesungen, die mit den importierten Kompetenzen verknüpft sind oder verknüpft sie, wenn eine Vorlesung mit diesem Namen bereits existiert", + "referenceDateLabel": "Referenzdatum", + "referenceDateTooltip": "Das Referenzdatum wird verwendet, um alle Daten der importierten Resourcen zu setzen. Das früheste Datum dieses Typs wird auf das Referenzdatum gesetzt und alle anderen Daten werden relativ dazu gesetzt.", + "referenceDateTypeLabel": "Referenzdatumstyp", + "referenceDateTypeTooltip": "'Veröffentlichungsdatum' bezieht sich auf das Veröffentlichungsdatum von Aufgaben und Vorlesungseinheiten sowie das Sichtbarkeitsdatum von Vorlesungen. 'Fälligkeitsdatum' bezieht sich auf das Fälligkeitsdatum von Aufgaben und Kompetenzen sowie Das Enddatum von Vorlesungen.", + "referenceDateType": { + "noSelection": "-- Wähle zuerst ein Referenzdatum --", + "releaseDate": "Veröffentlichungsdatum", + "dueDate": "Fälligkeitsdatum" + } + }, + "importAll": { + "title": "Alle Kompetenzen eines Kurses importieren", + "success": "{{ noOfCompetencies }} Kompetenzen aus dem Kurs \"{{ courseTitle }}\" importiert.", + "warning": "Es wurden keine Kompetenzen für den Kurs \"{{ courseTitle }}\" gefunden.", + "table": { + "title": "Kurse", + "columns": { + "TITLE": "Titel", + "SHORT_NAME": "Kurzname", + "SEMESTER": "Semester" + } + } + }, "taxonomies": { "REMEMBER": "Erinnern", "UNDERSTAND": "Verstehen", @@ -217,7 +247,7 @@ "deleted": "Voraussetzungen gelöscht", "updated": "Voraussetzungen bearbeitet", "optional": "Optional", - "optionalDescription": "Optionale Voraussetzungen müssen nicht absolviert werden um den Lernpfad zu vervollständigen. Sie dienen entweder als zusätzliche Übung oder gehen über die erwarteten Inhalte des Kurses hinaus.", + "optionalDescription": "Optionale Voraussetzungen müssen nicht absolviert werden, um den Lernpfad zu vervollständigen. Sie dienen entweder als zusätzliche Übung oder gehen über die erwarteten Inhalte des Kurses hinaus.", "manage": { "title": "Voraussetzungsmanagement", "createButton": "Voraussetzung erstellen", @@ -245,7 +275,7 @@ "titleMaxLengthValidationError": "Der Titel einer Voraussetzung ist auf maximal {{max}} Symbole beschränkt", "descriptionMaxLengthValidationError": "Die Beschreibung der Voraussetzung ist auf maximal {{max}} Symbole beschränkt", "softDueDate": "Empfohlenes Fertigstellungsdatum", - "softDueDateHint": "Empfehle einen Zeitpunkt zu dem die Studierenden diese Voraussetzung gemeistert haben sollten. Dies ist keine harte Frist.", + "softDueDateHint": "Empfehle einen Zeitpunkt, zu dem die Studierenden diese Voraussetzung gemeistert haben sollten. Dies ist keine harte Frist.", "connectWithLectureUnits": "Verbinde die Voraussetzung mit Vorlesungseinheiten" }, "edit": { @@ -269,19 +299,19 @@ "health": { "missing": { "title": "Fehlende Lernpfade", - "body": "Für einige Studierende wurde noch kein Lernpfad erstellt. Dies ist nicht kritisch. Ihre Lernpfade werden generiert, wenn sie ihren Lernpfad das erste mal anfragen.", + "body": "Für einige Studierende wurde noch kein Lernpfad erstellt. Dies ist nicht kritisch. Ihre Lernpfade werden generiert, wenn sie ihren Lernpfad das erste Mal anfragen.", "action": "Erstellen", "hint": "Erstellen der fehlenden Lernpfade" }, "noCompetencies": { "title": "Keine Kompetenzen", - "body": "Es wurden noch keine Kompetenzen erstellt. Lernpfade setzen sich aus den Kompetenzen zusammen, die Studierende erreichen müssen. Gehe zum Kompetenzmanagement um neue Kompetenzen zu erstellen oder bestehende zu importieren.", + "body": "Es wurden noch keine Kompetenzen erstellt. Lernpfade setzen sich aus den Kompetenzen zusammen, die Studierende erreichen müssen. Gehe zum Kompetenzmanagement, um neue Kompetenzen zu erstellen oder bestehende zu importieren.", "action": "Kompetenzmanagement", "hint": "Gehe zum Kompetenzmanagement" }, "noRelations": { "title": "Keine Beziehungen", - "body": "Es wurden noch keine Beziehungen zwischen Kompetenzen konfiguriert. Lernpfade nutzen die Informationen über die Struktur der Lerninhalte um zuverlässig qualitiv hochwertige Empfehlungen für Studierende zu generieren. Gehe zum Kompetenzmanagement um die Beziehungen zwischen Kompetenzen zu konfigurieren.", + "body": "Es wurden noch keine Beziehungen zwischen Kompetenzen konfiguriert. Lernpfade nutzen die Informationen über die Struktur der Lerninhalte, um zuverlässig qualitativ hochwertige Empfehlungen für Studierende zu generieren. Gehe zum Kompetenzmanagement, um die Beziehungen zwischen Kompetenzen zu konfigurieren.", "action": "Kompetenzmanagement", "hint": "Gehe zum Kompetenzmanagement" } @@ -316,7 +346,7 @@ "legend": { "competencyEnd": { "title": "Kompetenzende", - "tooltip": "Hier endet eine Kompetenz. Die Knoten zwischen Kompetenzbeginn und -ende sind Inhalte die dir beim erreichen dieser Kompetenz helfen." + "tooltip": "Hier endet eine Kompetenz. Die Knoten zwischen Kompetenzbeginn und -ende sind Inhalte, die dir beim Erreichen dieser Kompetenz helfen." }, "matchStart": { "title": "Verzweigung", diff --git a/src/main/webapp/i18n/de/complaint.json b/src/main/webapp/i18n/de/complaint.json index d2b92489c7cc..ec3e55fd229c 100644 --- a/src/main/webapp/i18n/de/complaint.json +++ b/src/main/webapp/i18n/de/complaint.json @@ -82,7 +82,7 @@ "showAnsweredRequests": "Beantwortete Feedbackanfragen anzeigen", "hideAnsweredRequests": "Beantwortete Feedbackanfragen ausblenden", "loadAllRequests": "Alle Feedbackanfragen laden", - "loadAllRequestsExplanation": "Die Liste zeigt nur eingerechte Feedbackanfragen über deine Bewertungen an. Mittels des Buttons können alle Feedbackanfragen über alle Reviewer:innen geladen werden: ", + "loadAllRequestsExplanation": "Die Liste zeigt nur eingereichte Feedbackanfragen über deine Bewertungen an. Mittels des Buttons können alle Feedbackanfragen über alle Reviewer:innen geladen werden: ", "allRequestsLoaded": "Alle Feedbackanfragen geladen", "noRequestsToShow": "Es gibt im Moment keine Feedbackanfragen zu zeigen." } diff --git a/src/main/webapp/i18n/de/complaintResponse.json b/src/main/webapp/i18n/de/complaintResponse.json index 75aafbeb32ed..073a31cb5e14 100644 --- a/src/main/webapp/i18n/de/complaintResponse.json +++ b/src/main/webapp/i18n/de/complaintResponse.json @@ -14,7 +14,7 @@ "title": "Antwort auf die Beschwerde", "created": "Deine Antwort auf die Beschwerde wurde eingereicht", "updateAssessment": "Bewertung aktualisieren", - "updateAssessmentTooltip": "Antwort senden and Bewertung aktualisieren", + "updateAssessmentTooltip": "Antwort senden und Bewertung aktualisieren", "rejectComplaint": "Beschwerde zurückweisen", "rejectComplaintTooltip": "Antwort senden und Beschwerde zurückweisen", "noText": "Bitte gib eine Antwort auf die Beschwerde ein" diff --git a/src/main/webapp/i18n/de/consistencyCheck.json b/src/main/webapp/i18n/de/consistencyCheck.json index c7e5b5691f5b..4c77baff0971 100644 --- a/src/main/webapp/i18n/de/consistencyCheck.json +++ b/src/main/webapp/i18n/de/consistencyCheck.json @@ -9,7 +9,7 @@ "type": "Fehlertyp", "VCS_PROJECT_MISSING": "Fehlendes VCS Projekt", "TEMPLATE_REPO_MISSING": "Fehlendes Vorlagen-Repository", - "SOLUTION_REPO_MISSING": "Fehlendes Lösung-Repository", + "SOLUTION_REPO_MISSING": "Fehlendes Lösungs-Repository", "AUXILIARY_REPO_MISSING": "Fehlendes Hilfs-Repository", "TEST_REPO_MISSING": "Fehlendes Test-Repository", "TEMPLATE_BUILD_PLAN_MISSING": "Fehlender Build-Plan für die Vorlage", diff --git a/src/main/webapp/i18n/de/conversation.json b/src/main/webapp/i18n/de/conversation.json index ce02d61019c9..7a07b66d408b 100644 --- a/src/main/webapp/i18n/de/conversation.json +++ b/src/main/webapp/i18n/de/conversation.json @@ -45,7 +45,7 @@ "examChannels": "Klausuren", "createChannel": "Kanal erstellen", "browseChannels": "Kanäle durchsuchen", - "groupChats": "Gruppen-Chats", + "groupChats": "Gruppenchats", "directMessages": "Direktnachrichten", "filterConversationPlaceholder": "Konversationen filtern", "sideBarSection": { @@ -71,7 +71,7 @@ "unArchiveChannel": { "title": "Archivierung des Kanals {{ channelName }} rückgängig machen?", "question": "Möchtest du die Archivierung des Kanals {{ channelName }} wirklich rückgängig machen?", - "description": "Mitglieder:innen können wieder Nachrichten senden. Du kannst den Kanal jederzeit wieder archivieren.", + "description": "Mitglieder können wieder Nachrichten senden. Du kannst den Kanal jederzeit wieder archivieren.", "confirmButton": "Archivierung rückgängig machen" }, "deleteChannel": { @@ -81,7 +81,7 @@ "grantChannelModerator": { "title": "{{ userName }} zu einem/einer Moderator:in von {{ channelName }} machen?", "question": "Möchtest du wirklich {{ userName }} zu einem/einer Moderator:in von {{ channelName }} machen?", - "description": "Dies ermöglicht es {{ userName }}, den Kanal und seine Mitglieder:innen zu verwalten. Er oder sie kann auch Nachrichten bearbeiten oder löschen.", + "description": "Dies ermöglicht es {{ userName }}, den Kanal und seine Mitglieder zu verwalten. Er oder sie kann auch Nachrichten bearbeiten oder löschen.", "confirmButton": "Zum/Zur Moderator:in machen" }, "revokeChannelModerator": { @@ -118,23 +118,23 @@ }, "conversationDetail": { "tabs": { - "members": "Mitglieder:innen", + "members": "Mitglieder", "info": "Informationen", "settings": "Einstellungen" }, "memberTab": { - "findMembers": "Mitglieder:innen finden", + "findMembers": "Mitglieder finden", "searching": "Suche ...", "addUsers": "Nutzer:innen hinzufügen", "filter": "Filter", - "allFilter": "Alle Mitglieder:innen", + "allFilter": "Alle Mitglieder", "instructorFilter": "Lehrende", "editorFilter": "Editor:innen", "tutorFilter": "Tutor:innen", "studentFilter": "Studierende", "channelModeratorFilter": "Kanalmoderator:innen", "memberRow": { - "channelModeratorTooltip": "Moderator:in, der/die den Kanal und seine Mitglieder:innen verwalten kann", + "channelModeratorTooltip": "Moderator:in, der/die den Kanal und seine Mitglieder verwalten kann", "removeUser": "Nutzer:in entfernen", "grantModeratorRole": "Zum/Zur Moderator:in machen", "revokeModeratorRole": "Als Moderator:in entfernen" @@ -202,7 +202,7 @@ "createChannelButton": "Erstelle einen neuen Kanal", "channelItem": { "joined:": "Beigetreten", - "members": "Mitglieder:innen" + "members": "Mitglieder" }, "actions": { "view": "Ansehen", diff --git a/src/main/webapp/i18n/de/course.json b/src/main/webapp/i18n/de/course.json index 7bc9274e7461..16c8ee6ae832 100644 --- a/src/main/webapp/i18n/de/course.json +++ b/src/main/webapp/i18n/de/course.json @@ -13,7 +13,26 @@ "delete": { "question": "Soll der Kurs {{ title }} wirklich dauerhaft gelöscht werden? Alle zugehörigen Elemente, inklusive der Klausuren, Aufgaben sowie Repositories und Build-Pläne werden gelöscht. Diese Aktion kann NICHT rückgängig gemacht werden!", "typeNameToConfirm": "Bitte gib den Namen des Kurses zur Bestätigung ein.", - "icon": "Kursicon löschen" + "icon": "Kursicon löschen", + "summary": { + "title": "Kurszusammenfassung", + "numberExams": "Anzahl der Klausuren", + "numberLectures": "Anzahl der Vorlesungen", + "numberStudents": "Anzahl der Studierenden", + "numberTutors": "Anzahl der Tutor:innen", + "numberEditors": "Anzahl der Editor:innen", + "numberInstructors": "Anzahl der Lehrenden", + "numberProgrammingExercises": "Anzahl der Programmieraufgaben", + "numberModelingExercises": "Anzahl der Modellierungsaufgaben", + "numberTextExercises": "Anzahl der Textaufgaben", + "numberFileUploadExercises": "Anzahl der Dateiupload-Aufgaben", + "numberQuizExercises": "Anzahl der Quizaufgaben", + "numberRepositories": "Anzahl der Repositories", + "numberBuilds": "Anzahl der Builds", + "numberCommunicationPosts": "Anzahl der Kommunikationsbeiträge", + "numberAnswerPosts": "Anzahl der Antwortbeiträge", + "isTestCourse": "Testkurs" + } }, "showActive": "Nur aktive Kurse anzeigen", "totalScore": "Gesamtergebnis:", @@ -70,7 +89,7 @@ "recentlyAccessed": "Zuletzt verwendet", "maxPoints": { "title": "Maximale Punktzahl", - "info": "Dieser Wert wird für die Berechnung von Beispielen (z.B. im Notenschlüssel) verwendet und hat keinen Einfluss auf die Noten der Studierenden. Die Noten werden mit Hilfe der im Kurs erreichbaren Punkte berechnet." + "info": "Dieser Wert wird für die Berechnung von Beispielen (z.B. im Notenschlüssel) verwendet und hat keinen Einfluss auf die Noten der Studierenden. Die Noten werden mithilfe der im Kurs erreichbaren Punkte berechnet." }, "accuracyOfScores": "Anzahl der Nachkommastellen bei der Berechnung von Punktzahlen", "defaultProgrammingLanguage": "Standard-Programmiersprache", @@ -103,17 +122,21 @@ "tooltip": "Ermöglicht die Kommunikation zwischen Nutzer:innen in privaten oder öffentlichen Kanälen, die nur von Lehrenden und Tutor:innen erstellt werden können. Die Studierenden können mit anderen Studierenden interagieren und Fragen stellen, während Moderator:innen Kursinformationen bereitstellen und inhaltliche Fragen beantworten können. Die Kommunikation kann direkt auf der Seite der jeweiligen Übung oder Vorlesung oder im speziellen Kommunikationsbereich des Kurses erfolgen." }, "messagingEnabled": { - "label": "Direktnachrichten / Gruppen-Chats aktiviert", - "tooltip": "Ermöglicht den Nachrichtenaustausch in Gruppenchats oder Direktnachrichten. Alle Nutzer:innen können Direktnachrichten oder einen privaten Gruppenchat starten und andere Nutzer:innen hinzufügen. Ein Gruppenchat ist auf zehn Mitglieder:innen begrenzt. Die Chats finden im Kommunikationbereich des Kurses statt.", + "label": "Direktnachrichten / Gruppenchats aktiviert", + "tooltip": "Ermöglicht den Nachrichtenaustausch in Gruppenchats oder Direktnachrichten. Alle Nutzer:innen können Direktnachrichten oder einen privaten Gruppenchat starten und andere Nutzer:innen hinzufügen. Ein Gruppenchat ist auf zehn Mitglieder begrenzt. Die Chats finden im Kommunikationbereich des Kurses statt.", "codeOfConduct": "Nachrichten: Code of Conduct" + }, + "faqEnabled": { + "label": "FAQs aktivieren", + "tooltip": "Ermöglicht das Anlegen von FAQ-Einträgen, in denen Lehrende häufig gestellte Fragen übersichtlich sammeln. Studierende können auf diese Wissensbasis zugreifen, um selbstständig Themen nachzuarbeiten und offene Fragen eigenständig zu klären." } }, "enrollmentEnabled": { "title": "Kurseinschreibung für Studierende aktiviert", - "description": "Aktiviere diese Checkbox, damit sich Studierende selbständig im Kurs einschreiben können, sofern dieser aktiv ist (zwischen Start und Ende des Kurses). Du kannst optional eine Nachricht eingeben, die Studierende bei der Einschreibung bestätigen müssen." + "description": "Aktiviere diese Checkbox, damit sich Studierende selbstständig im Kurs einschreiben können, sofern dieser aktiv ist (zwischen Start und Ende des Kurses). Du kannst optional eine Nachricht eingeben, die Studierende bei der Einschreibung bestätigen müssen." }, - "enrollmentStartDate": "Einschreibungs Start", - "enrollmentEndDate": "Einschreibungs Ende", + "enrollmentStartDate": "Einschreibungsstart", + "enrollmentEndDate": "Einschreibungsende", "enrollmentConfirmationMessage": "Nachricht zur Bestätigung der Einschreibung", "unenrollmentEnabled": { "title": "Austragen aus dem Kurs für Studierende aktiviert", diff --git a/src/main/webapp/i18n/de/courseExamArchive.json b/src/main/webapp/i18n/de/courseExamArchive.json index 7f209529303d..e9c687c85088 100644 --- a/src/main/webapp/i18n/de/courseExamArchive.json +++ b/src/main/webapp/i18n/de/courseExamArchive.json @@ -24,8 +24,8 @@ "question": "Möchtest du die Prüfung {{title}} wirklich archivieren?", "statement1": "Der Prozess komprimiert alle Repositories, Übungen zum Hochladen von Dateien, Modellierungsübungen und Textübungen der Prüfung." }, - "statement2": "This process can take several hours depending on the number of students and programming exercises and will take up many server resources. Please start this process only once when the server load is low (e.g. early in the morning)", - "footerStatement": "You will receive a notification when the process is finished. Then you can download the archive as zip file on this page." + "statement2": "Dieser Vorgang kann einige Stunden dauern, abhängig von der Anzahl an Studierenden und Programmieraufgaben, und wird viele Serverkapazitäten in Anspruch nehmen. Bitte starte diesen Vorgang nur wenn die Serverauslastung gering ist (z.B. in den frühen Morgenstunden).", + "footerStatement": "Du wirst eine Benachrichtigung erhalten, wenn der Prozess abgeschlossen ist. Dann kannst du das Archiv als Zip-Datei von dieser Seite herunterladen." }, "confirmArchive": { "title": "Achtung: Ein Archiv existiert bereits!", diff --git a/src/main/webapp/i18n/de/dataExport.json b/src/main/webapp/i18n/de/dataExport.json index bb82eb2604da..1b86403325c9 100644 --- a/src/main/webapp/i18n/de/dataExport.json +++ b/src/main/webapp/i18n/de/dataExport.json @@ -22,7 +22,7 @@ "isBeingCreated": "Dein angeforderter Datenexport wird aktuell noch erstellt.", "lastRequestDate": "Du hast deinen letzten Datenexport angefordert am ", "nextRequestDate": "Du kannst wieder einen Datenexport anfordern am ", - "typeUserLoginToConfirm": "Bitte gib die Benutzerkennung des Nutzers ein, für den du den Datenexport anfordern möchtest um den Datenexport zu bestätigen", + "typeUserLoginToConfirm": "Bitte gib die Benutzerkennung des Nutzers ein, für den du den Datenexport anfordern möchtest, um den Datenexport zu bestätigen.", "loginOrName": "Benutzerkennung oder Name des Nutzers", "searchQueryTooShort": "Bitte gib mindestens {{ length }} Zeichen ein" } diff --git a/src/main/webapp/i18n/de/dragAndDropMapping.json b/src/main/webapp/i18n/de/dragAndDropMapping.json index b75fb4c046ef..bbb0b2f4bc24 100644 --- a/src/main/webapp/i18n/de/dragAndDropMapping.json +++ b/src/main/webapp/i18n/de/dragAndDropMapping.json @@ -2,25 +2,25 @@ "artemisApp": { "dragAndDropMapping": { "home": { - "title": "Drag-And-Drop Mappings", - "createLabel": "Drag-And-Drop Mapping erstellen" + "title": "Drag-and-Drop Zuordnungen", + "createLabel": "Drag-and-Drop Zuordnung erstellen" }, - "created": "Drag-And-Drop Mapping erstellt mit ID {{ param }}", - "updated": "Drag-And-Drop Mapping aktualisiert mit ID {{ param }}", - "deleted": "Drag-And-Drop Mapping gelöscht mit ID {{ param }}", + "created": "Drag-and-Drop Zuordnung erstellt mit ID {{ param }}", + "updated": "Drag-and-Drop Zuordnung aktualisiert mit ID {{ param }}", + "deleted": "Drag-and-Drop Zuordnung gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Drag-And-Drop Mapping {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Drag-and-Drop Zuordnung {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Drag-And-Drop Mapping" + "title": "Drag-and-Drop Zuordnung" }, "dragItemIndex": "Drag Item Index", "dropLocationIndex": "Drop Location Index", - "invalid": "Invalid", + "invalid": "Ungültig", "dragItem": "Drag Item", "dropLocation": "Drop Location", - "submittedAnswer": "Submitted Answer", - "question": "Question" + "submittedAnswer": "Eingereichte Antwort", + "question": "Frage" } } } diff --git a/src/main/webapp/i18n/de/dragAndDropQuestion.json b/src/main/webapp/i18n/de/dragAndDropQuestion.json index a2e7c947fb34..e240dd9ba44f 100644 --- a/src/main/webapp/i18n/de/dragAndDropQuestion.json +++ b/src/main/webapp/i18n/de/dragAndDropQuestion.json @@ -2,17 +2,17 @@ "artemisApp": { "dragAndDropQuestion": { "home": { - "title": "Drag-And-Drop Questions", - "createLabel": "Drag-And-Drop Question erstellen" + "title": "Drag-and-Drop Fragen", + "createLabel": "Drag-and-Drop Frage erstellen" }, - "created": "Drag-And-Drop Question erstellt mit ID {{ param }}", - "updated": "Drag-And-Drop Question aktualisiert mit ID {{ param }}", - "deleted": "Drag-And-Drop Question gelöscht mit ID {{ param }}", + "created": "Drag-and-Drop Frage erstellt mit ID {{ param }}", + "updated": "Drag-and-Drop Frage aktualisiert mit ID {{ param }}", + "deleted": "Drag-and-Drop Frage gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Drag-And-Drop Question {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Drag-and-Drop Frage {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Drag-And-Drop Question" + "title": "Drag-and-Drop Frage" }, "backgroundFilePath": "Background File Path", "dropLocations": "Drop Locations", @@ -32,7 +32,7 @@ "addDragItemText": "Drag Item mit Text Hinzufügen", "cutImagesFromDropLocation": "Bilder aus Drop Locations ausschneiden", "cutImagesFromDropLocationTip": "Das Hintergrundbild wird verändert. Dies kann nicht rückgängig gemacht werden.", - "studentInstructions": "Drag & Drop: Platziere die passenden Elemente auf die zugehörigen Flächen.", + "studentInstructions": "Drag-and-Drop: Platziere die passenden Elemente auf die zugehörigen Flächen.", "showingYourAnswer": "Deine Abgabe:", "showingSampleSolution": "Musterlösung:", "changeBackgroundPicture": "Hintergrund ändern", diff --git a/src/main/webapp/i18n/de/dragAndDropQuestionStatistic.json b/src/main/webapp/i18n/de/dragAndDropQuestionStatistic.json index bd9209bea8f9..6335b5c704f2 100644 --- a/src/main/webapp/i18n/de/dragAndDropQuestionStatistic.json +++ b/src/main/webapp/i18n/de/dragAndDropQuestionStatistic.json @@ -2,19 +2,19 @@ "artemisApp": { "dragAndDropQuestionStatistic": { "home": { - "title": "Drag-And-Drop Question Statistics", - "createLabel": "Drag-And-Drop Question Statistic erstellen" + "title": "Drag-and-Drop Fragestatistiken", + "createLabel": "Drag-and-Drop Fragestatistik erstellen" }, - "created": "Drag-And-Drop Question Statistic erstellt mit ID {{ param }}", - "updated": "Drag-And-Drop Question Statistic aktualisiert mit ID {{ param }}", - "deleted": "Drag-And-Drop Question Statistic gelöscht mit ID {{ param }}", + "created": "Drag-and-Drop Fragestatistik erstellt mit ID {{ param }}", + "updated": "Drag-and-Drop Fragestatistik aktualisiert mit ID {{ param }}", + "deleted": "Drag-and-Drop Fragestatistik gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Drag-And-Drop Question Statistic {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Drag-and-Drop Fragestatistik {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Drag-And-Drop Question Statistic" + "title": "Drag-and-Drop Fragestatistik" }, - "dropLocationCounters": "Drop Location Counters" + "dropLocationCounters": "Drop Location Counter" } } } diff --git a/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json b/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json index 8f3b057c19fc..21bb95afa9a7 100644 --- a/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json +++ b/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json @@ -2,19 +2,19 @@ "artemisApp": { "dragAndDropSubmittedAnswer": { "home": { - "title": "Drag-And-Drop Submitted Answers", - "createLabel": "Drag-And-Drop Submitted Answer erstellen" + "title": "Drag-and-Drop eingereichte Antworten", + "createLabel": "Drag-and-Drop eingereichte Antwort erstellen" }, - "created": "Drag-And-Drop Submitted Answer erstellt mit ID {{ param }}", - "updated": "Drag-And-Drop Submitted Answer aktualisiert mit ID {{ param }}", - "deleted": "Drag-And-Drop Submitted Answer gelöscht mit ID {{ param }}", + "created": "Drag-and-Drop eingereichte Antwort erstellt mit ID {{ param }}", + "updated": "Drag-and-Drop eingereichte Antwort aktualisiert mit ID {{ param }}", + "deleted": "Drag-and-Drop eingereichte Antwort gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Drag-And-Drop Submitted Answer {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Drag-and-Drop eingereichte Antwort {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Drag-And-Drop Submitted Answer" + "title": "Drag-and-Drop eingereichte Antwort" }, - "mappings": "Mappings" + "mappings": "Zuordnungen" } } } diff --git a/src/main/webapp/i18n/de/dragItem.json b/src/main/webapp/i18n/de/dragItem.json index c5827cd64aec..187dc7c74661 100644 --- a/src/main/webapp/i18n/de/dragItem.json +++ b/src/main/webapp/i18n/de/dragItem.json @@ -16,10 +16,10 @@ }, "pictureFilePath": "Picture File Path", "text": "Text", - "correctScore": "Correct Score", - "incorrectScore": "Incorrect Score", - "correctLocation": "Correct Location", - "question": "Question" + "correctScore": "Korrekter Score", + "incorrectScore": "Inkorrekter Score", + "correctLocation": "Korrekte Location", + "question": "Frage" } } } diff --git a/src/main/webapp/i18n/de/dropLocation.json b/src/main/webapp/i18n/de/dropLocation.json index 4089a2561234..a86c9f8470bf 100644 --- a/src/main/webapp/i18n/de/dropLocation.json +++ b/src/main/webapp/i18n/de/dropLocation.json @@ -16,10 +16,10 @@ }, "posX": "Pos X", "posY": "Pos Y", - "width": "Width", - "height": "Height", - "invalid": "Invalid", - "question": "Question" + "width": "Breite", + "height": "Höhe", + "invalid": "Ungültig", + "question": "Frage" } } } diff --git a/src/main/webapp/i18n/de/dropLocationCounter.json b/src/main/webapp/i18n/de/dropLocationCounter.json index 3039462a9fde..629d4c61cef2 100644 --- a/src/main/webapp/i18n/de/dropLocationCounter.json +++ b/src/main/webapp/i18n/de/dropLocationCounter.json @@ -15,7 +15,7 @@ "title": "Drop Location Counter" }, "dropLocation": "Drop Location", - "dragAndDropQuestionStatistic": "Drag-And-Drop Question Statistic" + "dragAndDropQuestionStatistic": "Drag-and-Drop Fragestatistik" } } } diff --git a/src/main/webapp/i18n/de/editor.json b/src/main/webapp/i18n/de/editor.json index d548da95d0f2..1c1db6d76147 100644 --- a/src/main/webapp/i18n/de/editor.json +++ b/src/main/webapp/i18n/de/editor.json @@ -118,7 +118,7 @@ "solutionRepo": "Solution-Repository", "testRepo": "Test-Repository", "loadingExercise": "Aufgabe wird geladen", - "solutionWarning": "Das Solution-Repository erfüllt einen oder mehreren Testfälle nicht. Das könnte auf ein Problem im Solution-Repository hinweisen.", + "solutionWarning": "Das Solution-Repository erfüllt einen oder mehrere Testfälle nicht. Das könnte auf ein Problem im Solution-Repository hinweisen.", "solutionSuccess": "Das Solution-Repository erfüllt alle Testfälle", "solutionInfo": "Kein Ergebnis verfügbar.", "templateWarning": "Das Template-Repository erfüllt bereits einen oder mehrere Testfälle. Das könnte auf ein Problem im Template-Repository hinweisen.", diff --git a/src/main/webapp/i18n/de/error.json b/src/main/webapp/i18n/de/error.json index eb0026d8108a..f86c0ead7372 100644 --- a/src/main/webapp/i18n/de/error.json +++ b/src/main/webapp/i18n/de/error.json @@ -17,11 +17,11 @@ "validation": "Validierungsfehler auf dem Server.", "resultStringNull": "Fehler! Ein Ergebnistext ist erforderlich.", "resultStringTooLong": "Fehler! Der Ergebnistext ist zu lange (max. 255 Zeichen)", - "scoreNull": "Fehler! Eine Bewertung is erforderlich.", + "scoreNull": "Fehler! Eine Bewertung ist erforderlich.", "resultNotRated": "Fehler! Ein Ergebnis muss bewertet sein.", "submissionMissing": "Fehler! Die Abgabe ist nicht mehr mit dem Ergebnis verknüpft. Deine Änderungen wurden abgelehnt.", "resultAlreadyExists": "Es liegt bereits ein Ergebnis für diese Übung vor.", - "scoreAndSuccessfulNotMatching": "Fehler! Nur ein Ergebnis mit 100% kann erfolgreich sein.", + "scoreAndSuccessfulNotMatching": "Fehler! Nur ein Ergebnis mit 100 % kann erfolgreich sein.", "feedbackDetailTextNull": "Fehler! Wenn Feedback vorhanden ist, müssen die Feedback Details ausgefüllt werden.", "quizAlreadyVisible": "Das Quiz ist bereits sichtbar.", "quizAlreadyStarted": "Das Quiz wurde bereits gestartet.", diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index c37bb47baf78..bea5f259ab2a 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -13,8 +13,8 @@ "dialogText": "Jeder Eintrag in der Eingabedatei muss entweder einen Wert für die Matrikelnummer, das Login oder die E-Mail enthalten.\nDie Angaben zu Name und Vorname sind optional.", "pdfExampleText": "Beispiel für ein gültiges PDF-Dateiformat:", "pdfFile": { - "label": ".pdf-Datei auswählen", - "tooltip": "Bitte wähle eine .pdf-Datei aus, die das Bild des registrierten Studenten und seine Matrikelnummer enthält." + "label": "PDF-Datei auswählen", + "tooltip": "Bitte wähle eine PDF-Datei aus, die das Bild des registrierten Studenten und seine Matrikelnummer enthält." }, "dialogTitle": "Bilder hochladen", "allImagesSaved": "Alle Bilder wurden erfolgreich gespeichert.", @@ -150,6 +150,7 @@ "falseName": "Der angegebene Name ist nicht korrekt. Bitte versuche es erneut!", "notSet": "Nicht gesetzt", "startExamToolTip": "Button wird 5 Minuten vor der Klausur aktiviert.", + "yourSolution": "Deine Lösung", "cleanup": { "title": "Aufräumen", "question": "Möchtest du die Prüfung {{title}} wirklich bereinigen? Dadurch werden alle Studierenden-Repositories in der Prüfung gelöscht. Diese Aktion kann NICHT rückgängig gemacht werden!" @@ -157,7 +158,7 @@ "validation": { "startAndEndMustBeSet": "Start- und Enddatum der Klausur müssen festgelegt werden.", "atLeastOneExercisePerExerciseGroup": "Alle Aufgabengruppen müssen mindestens eine Aufgabe haben.", - "allExercisesInExerciseGroupOfSameIncludedType": "Alle Aufgaben in einer Aufgabengruppe müssen alle die selbe Bedeutung haben für das Klausurergebnis (Normale Aufgabe, Bonusaufgabe, Keine Bedeutung).", + "allExercisesInExerciseGroupOfSameIncludedType": "Alle Aufgaben in einer Aufgabengruppe müssen alle dieselbe Bedeutung haben für das Klausurergebnis (Normale Aufgabe, Bonusaufgabe, Keine Bedeutung).", "allExercisesInExerciseGroupGiveSameNumberOfPoints": "Alle Aufgaben in einer Aufgabengruppe müssen dieselbe Anzahl an Punkte oder Bonuspunkte geben", "tooManyMaxPoints": "Überprüfe die maximale Punktzahl in der Klausur! Die maximale Punktzahl, die Studierende in den verpflichtenden Aufgaben erreichen können, ist zu groß.", "tooFewMaxPoints": "Überprüfe die maximale Punktzahl in der Klausur! Die maximale Punktzahl, die Studierende in den Aufgaben erreichen können, ist zu niedrig.", @@ -214,15 +215,15 @@ "xAxesSuffix": " + {Notenname}", "xAxesSuffixBonus": " + {Bonuspunkte}", "yAxes": "Anzahl Teilnehmende", - "highlightPassedMedian": "Hebe Median aller bestandenen Klausuren im Diagram hervor: {{ median }}%", - "highlightOverallMedian": "Hebe Median aller Klausuren im Diagram hervor: {{ median }}%", + "highlightPassedMedian": "Hebe Median aller bestandenen Klausuren im Diagramm hervor: {{ median }}%", + "highlightOverallMedian": "Hebe Median aller Klausuren im Diagramm hervor: {{ median }}%", "criticalPerformance": "Bedenkliche Leistung", "uncriticalPerformance": "Unbedenkliche Leistung", - "noGradingScaleExplanation": "Eine Leistung gilt als bedenklich falls sie unter 40% der maximal zu erreichenden Punktzahl erzielt und somit in den meisten Fällen zum Nichtbestehen einer Klausur führen würde. Andernfalls gilt eine Leistung als unbedenklich.", + "noGradingScaleExplanation": "Eine Leistung gilt als bedenklich, falls sie unter 40 % der maximal zu erreichenden Punktzahl erzielt und somit in den meisten Fällen zum Nichtbestehen einer Klausur führen würde. Andernfalls gilt eine Leistung als unbedenklich.", "sufficientPerformance": "Ausreichende Leistung", "insufficientPerformance": "Ungenügende Leistung", - "gradingScaleExplanationNotBonus": "Eine Leistung gilt als ungenügend falls sie nicht zum Bestehen der Klausur genügt. Andernfalls gilt eine Leistung als ausreichend.", - "gradingScaleExplanationBonus": "Eine Leistung gilt als bedenklich falls sie keine Bonuspunkte erzielt. Andernfalls gilt eine Leistung als unbedenklich.", + "gradingScaleExplanationNotBonus": "Eine Leistung gilt als ungenügend, falls sie nicht zum Bestehen der Klausur genügt. Andernfalls gilt eine Leistung als ausreichend.", + "gradingScaleExplanationBonus": "Eine Leistung gilt als bedenklich, falls sie keine Bonuspunkte erzielt. Andernfalls gilt eine Leistung als unbedenklich.", "maxPoints": "Maximale Punktzahl", "title": "Klausurergebnisse", "examStatisticsTitle": "Klausurstatistik", @@ -592,14 +593,33 @@ "duplicatedProgrammingExerciseTitle": "Mehrere Programmieraufgaben in der Klausur besitzen denselben Titel. Wähle für die betreffende(n) Aufgabe(n) bitte einen anderen Titel", "invalidExerciseConfiguration": "Ein oder mehrere eingegebene Werte liegen außerhalb des zulässigen Bereiches. Bitte passe diese vor dem Import an", "isImporting": "Der Import der Aufgabengruppen und der Aufgaben wird derzeit auf dem Server durchgeführt. Dies kann etwas Zeit in Anspruch nehmen.", - "infoProgrammingExercises": "Programmieraufgaben werden mit der Konfiguration der ursprünglichen importiert. Für eine Änderung der Abgaberichtline, für das Aktivieren / Deaktivieren der Statischen Code Analyse oder dem neu erstellen der Build-Pläne kann diese Import Funktionalität nicht genutzt werden. In diesem Fall bitte die Aufgaben einzeln in die Aufgabengruppen importieren." + "infoProgrammingExercises": "Programmieraufgaben werden mit der Konfiguration der ursprünglichen importiert. Für eine Änderung der Abgaberichtlinie, für das Aktivieren / Deaktivieren der Statischen Code Analyse oder dem neu Erstellen der Build-Pläne kann diese Importfunktionalität nicht genutzt werden. In diesem Fall bitte die Aufgaben einzeln in die Aufgabengruppen importieren." }, "importSuccessful": "Import der Aufgabengruppen erfolgreich!" }, "quizPool": "Quiz Pool", "delete": { "question": "Soll die Klausur {{ title }} wirklich dauerhaft gelöscht werden? Alle zugehörigen Elemente werden gelöscht, inklusive der Klausuren der Studierenden. Diese Aktion kann NICHT rückgängig gemacht werden!", - "typeNameToConfirm": "Bitte gib den Namen der Klausur zur Bestätigung ein." + "typeNameToConfirm": "Bitte gib den Namen der Klausur zur Bestätigung ein.", + "summary": { + "title": "Klausur-Zusammenfassung", + "numberExerciseGroups": "Anzahl der Aufgabengruppen", + "numberProgrammingExercises": "Anzahl der Programmieraufgaben", + "numberModelingExercises": "Anzahl der Modellierungsaufgaben", + "numberTextExercises": "Anzahl der Textaufgaben", + "numberFileUploadExercises": "Anzahl der Datei-Upload-Aufgaben", + "numberQuizExercises": "Anzahl der Quiz-Aufgaben", + "numberRepositories": "Anzahl der Repositories", + "numberBuilds": "Anzahl der Builds", + "numberRegisteredStudents": "Anzahl der angemeldeten Studierenden", + "numberNotStartedExams": "Anzahl der Klausuren (nicht gestartet)", + "numberStartedExams": "Anzahl der Klausuren", + "numberSubmittedExams": "Anzahl der Klausuren (abgegeben)", + "numberCommunicationPosts": "Anzahl der Kommunikationsbeiträge", + "numberAnswerPosts": "Anzahl der Antwortbeiträge", + "isTestExam": "Testklausur", + "isTestCourse": "Testkurs" + } }, "reset": { "question": "Soll die Klausur {{ title }} wirklich dauerhaft zurückgesetzt werden? Alle Klausuren der Studierenden werden gelöscht. Teilnehmende an der Klausur und die Konfigurationen der Aufgaben bleiben erhalten. Diese Aktion kann NICHT rückgängig gemacht werden!", @@ -641,7 +661,7 @@ "suspiciousBehavior": "Überprüfung von verdächtigem Verhalten" }, "descriptionItem": { - "register": "Studierende können auf drei verschiedene Arten registriert werden: einzeln, per .csv Datei oder es können alle zum Kurs der Klausur angemeldeten Studierenden auf einmal angemeldet werden.", + "register": "Studierende können auf drei verschiedene Arten registriert werden: einzeln, per CSV-Datei oder es können alle zum Kurs der Klausur angemeldeten Studierenden auf einmal angemeldet werden.", "exerciseGroups": "Du kannst Übungsgruppen mit mehreren Übungsvarianten erstellen, um Unterschleif für Studierende zu erschweren. Die Punkte aller Aufgaben einer Aufgabengruppe müssen identisch sein. Die Anzahl an Aufgabengruppen muss der Anzahl der Aufgaben in der Klausur entsprechen.", "generateStudentExams": "Du musst die individuellen Klausuren der Studierenden vor Start der Klausur generieren. Die Arbeitszeit kann dabei individuell angepasst werden.\nZudem werden alle Commits des Templates von Programmieraufgaben in einem Commit zusammengefasst.", "prepareExerciseStart": "Du musst die Aufgaben vor Beginn der Klausur vorbereiten.", @@ -652,7 +672,7 @@ "examReview": "Alle relevanten Daten müssen in der Klausur spezifiziert sein.", "resolveComplaints": "Beschwerden können im Bewertungs-Dashboard bearbeitet werden.", "testRun": "Probiere verschiedene Kombinationen von Übungsvarianten aus Sicht der Studierenden aus.", - "exportResults": "Die Klausurergebnisse können in Form einer .csv Datei exportiert werden.", + "exportResults": "Die Klausurergebnisse können in Form einer CSV-Datei exportiert werden.", "editWorkingTime": "Bis zu einer Minute vor dem Ende der Prüfung kannst du deren Dauer verlängern.", "createAnnouncement": "Um wichtige Informationen an alle Studierenden, die gerade an der Klausur arbeiten, zu kommunizieren, kannst du eine Ankündigung machen. Sie wird sofort an alle Studierenden verteilt und angezeigt.", "suspiciousBehavior": "Verdächtiges Verhalten und Plagiatsfälle können in diesem Dashboard eingesehen werden." diff --git a/src/main/webapp/i18n/de/exampleSubmission.json b/src/main/webapp/i18n/de/exampleSubmission.json index 4144f303d8c2..a425c7a32d94 100644 --- a/src/main/webapp/i18n/de/exampleSubmission.json +++ b/src/main/webapp/i18n/de/exampleSubmission.json @@ -26,21 +26,21 @@ "wrong": "Falsche Beurteilung. Es gibt {{mistakeCount}} Fehler.\nBitte überprüfe die Bewertungskriterien und reiche deine verbesserte Bewertung ein." }, "correctTutorAssessment": "Herzlichen Glückwunsch! Das ist eine gute Beurteilung!", - "submitSuccessful": "Deine Beispiel Abgabe wurde eingereicht.", - "saveSuccessful": "Deine Beispiel Abgabe wurde gespeichert.", + "submitSuccessful": "Deine Beispielabgabe wurde eingereicht.", + "saveSuccessful": "Deine Beispielabgabe wurde gespeichert.", "readSuccessfully": "Du hast die Beispielabgabe erfolgreich gelesen und verstanden.", "createNew": "Neu erstellen", "pageHeader": "Beispiel für eine Textvorlage zur Übung", "usedForTutorial": "In Bewertungstraining verwenden", "assessmentTraining": "Bewertungstraining", - "selectModel": "Wähle eine Bewertungstraining-Modus aus", - "selectModelExplanation": "Wähle eine Bewertungstraining-Modus aus. Dieser bestimmt wie die Tutor:innen nachweisen, dass sie die Beispielbewertung verstanden haben.", + "selectModel": "Wähle einen Bewertungstrainings-Modus aus", + "selectModelExplanation": "Wähle einen Bewertungstrainings-Modus aus. Dieser bestimmt wie die Tutor:innen nachweisen, dass sie die Beispielbewertung verstanden haben.", "readAndConfirm": "Lesen und bestätigen", "assessCorrectly": "Richtig bewerten", "createNewSubmission": "Neue Beispielabgabe erstellen", "editExampleSubmission": "Beispielabgabe bearbeiten", "modelElementHint": "Tipp: Fälschlicherweise nicht bewertete Modell-Elemente sind mit einem blauen Hintergrund gekennzeichnet.", - "textHint": "Tipp: Textblöcke die du bewerten musst, sind mit einem blauen Hintergrund gekennzeichnet.", + "textHint": "Tipp: Textblöcke, die du bewerten musst, sind mit einem blauen Hintergrund gekennzeichnet.", "editExampleSubmissionConfirmationQuestion": "Bist du sicher, dass du die Beispielabgabe bearbeiten möchtest? Die aktuelle Bewertung wird dauerhaft gelöscht und du musst die Abgabe erneut bewerten.", "updateExampleSubmission": "Beispielabgabe aktualisieren", "problemStatement": "Problemstellung", diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json index d8801ed0bb5e..3aee88e253c5 100644 --- a/src/main/webapp/i18n/de/exercise.json +++ b/src/main/webapp/i18n/de/exercise.json @@ -73,7 +73,7 @@ "deleteAssessmentInstruction": "Bewertungsanweisung löschen", "addAssessmentInstruction": "Bewertungsanweisung hinzufügen", "limit": "Begrenzung", - "dragDropInstruction": "Drag & Drop Bewertungsanweisung zum Feedback-Element", + "dragDropInstruction": "Drag-and-Drop Bewertungsanweisung zum Feedback-Element", "gradingScale": "Skala", "instructionDescription": "Beschreibung", "credits": "Credits", @@ -81,7 +81,7 @@ "editText": "Als Text bearbeiten", "usageCountHint": "Diese Zahl gibt an, wie oft Punkte für diese Anweisung zur Endbewertung hinzugefügt werden.", "creditsHint": "Diese Zahl gibt die Punktzahl für diese Bewertungsanweisung an.", - "gradingScaleHint": "Die Skala beschreibt das Leistungsniveau für den Anweisung. Einige Beispiele hierfür sind: ausgezeichnet, gut, durchschnittlich, schlecht.", + "gradingScaleHint": "Die Skala beschreibt das Leistungsniveau für die Anweisung. Einige Beispiele hierfür sind: ausgezeichnet, gut, durchschnittlich, schlecht.", "descriptionHint": "Die Beschreibung einer bestimmten Leistungsstufe kann zusätzliche Hinweise dazu enthalten, wann diese Anweisung anzuwenden ist.", "feedbackHint": "Das Feedback ist ein erläuternder Text an Studierende, um ihr Leistungsniveau besser zu verstehen.", "title": "Titel", @@ -114,11 +114,11 @@ "includedInOverallScore": "Miteinbezogen in Ergebnis", "includedCompletely": "Miteinbezogen", "categoriesTooltip": "Es können bis zu zwei Kategorien pro Aufgabe definiert werden, welche frei gewählt werden können (Kategorie eingeben und ENTER drücken). Allerdings wird empfohlen, die gewählten Bezeichnungen konsistent zu nutzen, da sie auch für Studierenden sichtbar sind.", - "includedCompletelyTooltip": "Alle erzielten Punkte und Bonuspunkte in dieser Aufgabe zählen zu dem Kurs- bzw Klausurergebnis!", + "includedCompletelyTooltip": "Alle erzielten Punkte und Bonuspunkte in dieser Aufgabe zählen zu dem Kurs- bzw. Klausurergebnis!", "includedAsBonus": "Bonus", - "includedAsBonusTooltip": "Alle erzielten Punkte in dieser Aufgabe zählen zu dem Kurs- bzw Klausurergebnis als Bonuspunkte!", + "includedAsBonusTooltip": "Alle erzielten Punkte in dieser Aufgabe zählen zu dem Kurs- bzw. Klausurergebnis als Bonuspunkte!", "notIncluded": "Optional", - "notIncludedTooltip": "Keine der in dieser Aufgabe erzielten Punkte zählen zu dem Kurs- bzw Klausurergebnis!", + "notIncludedTooltip": "Keine der in dieser Aufgabe erzielten Punkte zählen zu dem Kurs- bzw. Klausurergebnis!", "yes": "Ja", "bonus": "Bonus", "no": "Nein", @@ -168,14 +168,14 @@ "resumeProgrammingExercise": "Die Aufgabe wurde wieder aufgenommen. Du kannst nun weiterarbeiten!", "feedbackRequestSent": "Deine Feedbackanfrage wurde gesendet.", "feedbackRequestAlreadySent": "Deine Feedbackanfrage wurde bereits gesendet.", - "notEnoughPoints": "Um eine Feedbackanfrage zu senden, brauchst du mindestens eine Abgabe.", + "noSubmissionExists": "Um eine Feedbackanfrage zu senden, brauchst du mindestens eine Abgabe.", "lockRepositoryWarning": "Dein Repository wird gesperrt. Du kannst erst weiterarbeiten wenn deine Feedbackanfrage beantwortet wird.", "feedbackRequestAfterDueDate": "Du kannst nach der Abgabefrist keine weiteren Anfragen einreichen.", "maxAthenaResultsReached": "Du hast die maximale Anzahl an KI-Feedbackanfragen erreicht.", - "athenaFeedbackSuccessful": "AI-Feedback erfolgreich generiert. Klicke auf das Ergenbis, um Details zu sehen.", - "athenaFeedbackFailed": "Etwas ist schief gelaufen... KI-Feedback konnte im Moment nicht generiert werden", + "athenaFeedbackSuccessful": "AI-Feedback erfolgreich generiert. Klicke auf das Ergebnis, um Details zu sehen.", + "athenaFeedbackFailed": "Etwas ist schiefgelaufen... KI-Feedback konnte im Moment nicht generiert werden", "submissionAlreadyHasAthenaResult": "Für diese Abgabe liegt bereits ein KI-Ergebnis vor. Bitte reiche eine neue Abgabe ein, bevor du erneut einreichst.", - "startError": "Uh oh! Etwas ist schief gelaufen... Bitte versuch es in wenigen Minuten noch einmal die Aufgabe zu starten.", + "startError": "Uh oh! Etwas ist schiefgelaufen... Bitte versuch es in wenigen Minuten noch einmal die Aufgabe zu starten.", "name": "Name", "studentId": "Login", "teamShortName": "Kurzname", diff --git a/src/main/webapp/i18n/de/exerciseChatbot.json b/src/main/webapp/i18n/de/exerciseChatbot.json index 771e88203f40..538a4d2e1d93 100644 --- a/src/main/webapp/i18n/de/exerciseChatbot.json +++ b/src/main/webapp/i18n/de/exerciseChatbot.json @@ -15,7 +15,7 @@ "text2_2": "Tutoring-Fähigkeiten: Iris kann dir komplexe Programmierkonzepte erklären und anschauliche Beispiele geben.", "text2_3": "Kontextverständnis: Im Gegensatz zu anderen LLM-basierten Chatbots kennt Iris den Programmcode, die Aufgabenstellung, die Buildresultate und die Logdaten. Das bedeutet, dass sie dir die Aufgabenstellung genauer erklären und dir Feedback zu deinem Code oder möglichen Buildfehlern geben kann.", "text2_4": "Feedback: Dein Feedback ist wichtig, um das Verhalten von Iris zu verbessern. Indem du bestimmte Antworten oder ganze Konversationen beurteilst, trägst du dazu bei, dass sich Leistung mit der Zeit zu verbessert.", - "text2_5": "Kommunikationsfähigkeiten: Iris speichert deinen Chatverlauf, so dass du d eine Interaktion fortsetzen und auf frühere Nachrichten zurückgreifen kannst, wenn du Iris erneut öffnest.", + "text2_5": "Kommunikationsfähigkeiten: Iris speichert deinen Chatverlauf, sodass du d eine Interaktion fortsetzen und auf frühere Nachrichten zurückgreifen kannst, wenn du Iris erneut öffnest.", "subheading3": "Grenzen & Einschränkungen", "text3_1": "Keine Lösung: Iris begleitet dich beim Lösen der Aufgabe und hilft dir, sie besser zu verstehen. Dabei gibt sie dir keine Lösungen, sondern beantwortet konkrete Fragen und gibt kleine Hinweise.", "text3_2": "Keine Diskussionen außerhalb des Themas: Iris' Aufgabe ist es, dir bei deinen Programmierübungen zu helfen. Daher beantwortet sie keine Fragen, die nichts mit dem Thema 'Programmieren' oder mit deiner aktuellen Aufgabe zu tun haben..", @@ -26,7 +26,7 @@ "text4_3": "Vergrößern und Verkleinern des Widgets: Klicke und ziehe die Ränder des Widgets in verschiedene Richtungen, um die Größe zu ändern.", "text4_4": "Vollbildmodus: Du kannst das Widget im Vollbildmodus öffnen, indem du auf den Vollbildmodus-Button (in der oberen rechten Ecke des Widgets) klickst.", "text4_5": "Chatverlauf löschen: Du kannst deinen Chatverlauf löschen, indem du auf den Mülleimer klickst (oben rechts im Widget). Dadurch werden alle vorherigen Nachrichten gelöscht und du kannst einen neuen Chat starten.", - "supportText": "(Wenn du Probleme mit dem Iris-Widget oder bei der Interaktion mit Iris hast, erstelle bitte einen Issue auf GitHub https://github.com/ls1intum/Artemis)", + "supportText": "(Wenn du Probleme mit dem Iris-Widget oder bei der Interaktion mit Iris hast, erstelle bitte ein Issue auf GitHub https://github.com/ls1intum/Artemis.)", "clearSession": { "title": "Chatverlauf löschen", "text": "Bist du sicher, dass du den Chatverlauf löschen möchtest?", diff --git a/src/main/webapp/i18n/de/faq.json b/src/main/webapp/i18n/de/faq.json new file mode 100644 index 000000000000..0cb07d298310 --- /dev/null +++ b/src/main/webapp/i18n/de/faq.json @@ -0,0 +1,26 @@ +{ + "artemisApp": { + "faq": { + "home": { + "title": "FAQ", + "createLabel": "FAQ erstellen", + "filterLabel": "Filter", + "createOrEditLabel": "FAQ erstellen oder bearbeiten" + }, + "created": "Das FAQ wurde erfolgreich erstellt", + "updated": "Das FAQ wurde erfolgreich aktualisiert", + "deleted": "Das FAQ wurde erfolgreich gelöscht", + "delete": { + "question": "Soll die FAQ {{ title }} wirklich dauerhaft gelöscht werden? Diese Aktion kann NICHT rückgängig gemacht werden!", + "typeNameToConfirm": "Bitte gib den Namen des FAQ zur Bestätigung ein." + }, + + "table": { + "questionTitle": "Fragentitel", + "questionAnswer": "Antwort auf die Frage", + "categories": "Kategorien" + }, + "course": "Kurs" + } + } +} diff --git a/src/main/webapp/i18n/de/featureOverview.json b/src/main/webapp/i18n/de/featureOverview.json index abcb1967ce95..d900bb9a85e1 100644 --- a/src/main/webapp/i18n/de/featureOverview.json +++ b/src/main/webapp/i18n/de/featureOverview.json @@ -13,8 +13,8 @@ }, "configuration": { "title": "Vollständig Konfigurierbar", - "shortDescription": "Konfiguriere die Klausur nach Bedürfnis. Studierenden-Import von CSV Dateien.", - "descriptionTextOne": "Artemis ermöglicht es, alle Aspekte einer Klausur zu konfigurieren. Du kannst den Namen der Klausur, die Modulnummer setzen, die prüfende Person und den Kursnamen festlegen. Außerdem kannst du den Zeitplan der Klausur frei nach deinen Bedürfnissen einstellen, indem du entscheidest, wann die Klausur für die Studierenden sichtbar wird, wann die Klausur automatisch beginnen und enden soll, wann die Ergebnisse veröffentlicht werden, sowie den Zeitraum, in dem die Studierenden ihre Ergebnisse überprüfen und sich ggf. beschweren können.\n\nDu kannst Aufgaben aus den Artemis-Aufgabentypen hinzufügen. Klausuraufgaben können mehrere Varianten haben und können als \"nicht obligatorisch\" markiert werden. Dies stellt sicher, dass jeder Studierende eine einzigartige Klausur erhält. Zusätzlich kannst du die Reihenfolge der Aufgaben bei der Klausur jedes Studierenden nach dem Zufallsprinzip festlegen, um die Betrug weiter zu erschweren.\n\nDu kannst Studierende per CSV-Import in großer Anzahl registrieren oder sie einzeln aus allen registrierten Nutzer:innen manuell auszuwählen. Zusätzlich kannst du auch einzelnen Studierenden mehr Zeit zuweisen." + "shortDescription": "Konfiguriere die Klausur nach Bedürfnis. Studierenden-Import von CSV-Dateien.", + "descriptionTextOne": "Artemis ermöglicht es, alle Aspekte einer Klausur zu konfigurieren. Du kannst den Namen der Klausur, die Modulnummer setzen, die prüfende Person und den Kursnamen festlegen. Außerdem kannst du den Zeitplan der Klausur frei nach deinen Bedürfnissen einstellen, indem du entscheidest, wann die Klausur für die Studierenden sichtbar wird, wann die Klausur automatisch beginnen und enden soll, wann die Ergebnisse veröffentlicht werden, sowie den Zeitraum, in dem die Studierenden ihre Ergebnisse überprüfen und sich ggf. beschweren können.\n\nDu kannst Aufgaben aus den Artemis-Aufgabentypen hinzufügen. Klausuraufgaben können mehrere Varianten haben und können als \"nicht obligatorisch\" markiert werden. Dies stellt sicher, dass jeder Studierende eine einzigartige Klausur erhält. Zusätzlich kannst du die Reihenfolge der Aufgaben bei der Klausur jedes Studierenden nach dem Zufallsprinzip festlegen, um den Betrug weiter zu erschweren.\n\nDu kannst Studierende per CSV-Import in großer Anzahl registrieren oder sie einzeln aus allen registrierten Nutzer:innen manuell auszuwählen. Zusätzlich kannst du auch einzelnen Studierenden mehr Zeit zuweisen." }, "examMode": { "title": "Zwei Klausurmodi verfügbar", @@ -24,7 +24,7 @@ "exerciseTypes": { "title": "Verschiedene Aufgabentypen", "shortDescription": "Programmier-, Modellierungs-, Text-, Datei-Upload- und Quizaufgaben.", - "descriptionTextOne": "Artemis unterstützt Programmier-, Modellierungs-, Text-, Datei-Upload- und Quiz-Aufgaben wie Multiple-Choice-, Drag-and-drop- und Lückentextfragen im Klausurmodus.\n\nBei den Programmieraufgaben entscheiden sich die Studierenden zwischen der Arbeit mit dem online Code-Editor oder sie können das Repository klonen und die Aufgabe in der integrierten Entwicklungsumgebung (IDE) ihrer Wahl bearbeiten. Artemis benutzt den integrierten und einfach zu bedienenden Apollon Editor für die Modellierungsaufgaben. Es unterstützt eine Vielzahl von Diagrammen, darunter Klassen-, Aktivitäts-, Objekt-, Anwendungsfall-, Kommunikations-, Komponenten-, Einsatzdiagramme, Petrinetze und Syntaxbäume. Die Studierenden können Modelle erstellen, indem sie Objekte intuitiv in den Editor ziehen und mit den entsprechenden Pfeilen verbinden. Durch die Vielfalt der verfügbaren Aufgabenarten erfüllt Artemis die Anforderungen der meisten Lehrveranstaltungen im Bereich der Softwaretechnik." + "descriptionTextOne": "Artemis unterstützt Programmier-, Modellierungs-, Text-, Datei-Upload- und Quiz-Aufgaben wie Multiple-Choice-, Drag-and-Drop- und Lückentextfragen im Klausurmodus.\n\nBei den Programmieraufgaben entscheiden sich die Studierenden zwischen der Arbeit mit dem online Code-Editor oder sie können das Repository klonen und die Aufgabe in der integrierten Entwicklungsumgebung (IDE) ihrer Wahl bearbeiten. Artemis benutzt den integrierten und einfach zu bedienenden Apollon Editor für die Modellierungsaufgaben. Es unterstützt eine Vielzahl von Diagrammen, darunter Klassen-, Aktivitäts-, Objekt-, Anwendungsfall-, Kommunikations-, Komponenten-, Einsatzdiagramme, Petrinetze und Syntaxbäume. Die Studierenden können Modelle erstellen, indem sie Objekte intuitiv in den Editor ziehen und mit den entsprechenden Pfeilen verbinden. Durch die Vielfalt der verfügbaren Aufgabenarten erfüllt Artemis die Anforderungen der meisten Lehrveranstaltungen im Bereich der Softwaretechnik." }, "exerciseVariants": { "title": "Aufgaben Varianten", @@ -119,13 +119,13 @@ }, "apollonEditor": { "title": "Integrierter Model-Editor", - "shortDescription": "Erstelle komplexe Modelle einfach per Drag & Drop mit dem intuitiven Apollon-Editor.", - "descriptionTextOne": "Angetrieben vom Apollon-Editor unterstützt der Artemis-Klausurmodus das Modellieren von Aufgaben unterschiedlicher Art. Dazu gehören Klassen-, Aktivitäts-, Objekt-, Anwendungsfall-, Kommunikations-, Komponenten-, Verteilungsdiagramme, Petri-Netze und Syntaxbäume. Mit dem integrierten Apollon-Editor kannst du auf einfache Weise komplexe Modelle erstellen, die über eine intuitive Drag-and-drop-Benutzeroberfläche navigierbar sind." + "shortDescription": "Erstelle komplexe Modelle einfach per Drag-and-Drop mit dem intuitiven Apollon-Editor.", + "descriptionTextOne": "Angetrieben vom Apollon-Editor unterstützt der Artemis-Klausurmodus das Modellieren von Aufgaben unterschiedlicher Art. Dazu gehören Klassen-, Aktivitäts-, Objekt-, Anwendungsfall-, Kommunikations-, Komponenten-, Verteilungsdiagramme, Petri-Netze und Syntaxbäume. Mit dem integrierten Apollon-Editor kannst du auf einfache Weise komplexe Modelle erstellen, die über eine intuitive Drag-and-Drop-Benutzeroberfläche navigierbar sind." }, "quizExercises": { "title": "Quizaufgaben", "shortDescription": "Löse Quizaufgaben in Form von Multiple-Choice-, Drag-and-Drop- und Lückentextfragen.", - "descriptionTextOne": "Der Artemis-Klausurmodus unterstützt Quizaufgaben die Multiple-Choice-, Drag-and-drop- und Lückentextfragen enthalten können. Artemis-Multiple-Choice-Fragen können eine oder mehrere Lösungen haben und die Bewertung kann so angepasst werden, dass zum Beispiel bei einer falschen Antwort keine Punkte abgezogen werden. Auf diese Weise kann es den exakten Bewertungsstil eurer Offline-Klausuren imitieren. Für Drag-and-drop-Fragen kannst du einfach das entsprechende Element an die passende Stelle ziehen. Für Lückentexte bekommst du Eingabefelder innerhalb eines Textes, die du mit deinen eigenen Worten ausfüllen kannst." + "descriptionTextOne": "Der Artemis-Klausurmodus unterstützt Quizaufgaben die Multiple-Choice-, Drag-and-Drop- und Lückentextfragen enthalten können. Artemis-Multiple-Choice-Fragen können eine oder mehrere Lösungen haben und die Bewertung kann so angepasst werden, dass zum Beispiel bei einer falschen Antwort keine Punkte abgezogen werden. Auf diese Weise kann es den exakten Bewertungsstil eurer Offline-Klausuren imitieren. Für Drag-and-Drop-Fragen kannst du einfach das entsprechende Element an die passende Stelle ziehen. Für Lückentexte bekommst du Eingabefelder innerhalb eines Textes, die du mit deinen eigenen Worten ausfüllen kannst." }, "login": { "title": "LRZ Login", @@ -134,7 +134,7 @@ }, "userInterface": { "title": "Intuitive UI", - "shortDescription": "Navigiere mit Hilfe der intuitiven Benutzeroberfläche durch die Klausur.", + "shortDescription": "Navigiere mithilfe der intuitiven Benutzeroberfläche durch die Klausur.", "descriptionTextOne": "Du führst die Klausur mit der Benutzeroberfläche des Artemis-Klausurmodus durch. Das Interface verbirgt alle anderen Funktionen von Artemis, um Ablenkungen zu vermeiden, und ermöglicht es dir, dich auf die Klausur selbst zu konzentrieren. Links zeigt eine Seitenleiste den Titel und Status jeder Übung an. Sie verfolgt deinen Fortschritt bei jeder Übung anhand einer Farbcodierung mit Symbolen. Wenn du zum Beispiel ungespeicherte Änderungen vorgenommen hast, zeigt die Seitenleiste ein ungespeichertes Symbol mit einem gelben Ausrufezeichen bei der jeweiligen Übung an. Sobald du deinen Fortschritt speicherst oder er automatisch synchronisiert wird, wird dies entsprechend angezeigt. Du kannst die Seitenleiste auch benutzen, um zwischen den Übungen zu navigieren, indem du einfach auf die Übung klickst. \n\nFür jeden Aufgabentypen wird rechts die Aufgabenstellung angezeigt. Auf der linken Seite findest du den jeweiligen Editor. Damit du im Quiz keine Frage verpasst, wird links eine Übersicht über alle Fragen angezeigt. Du kannst auf jede Frage klicken und die Ansicht wird entsprechend gescrollt. Wenn du die Klausur beendet hast, hast du die Möglichkeit, sie vorzeitig einzureichen. Ansonsten wird die Ansicht nach Ablauf der Zeit automatisch auf die Bestätigungsseite für das Klausurende aktualisiert und deine Änderungen werden automatisch synchronisiert. Nach dem Klausurende bekommst du eine Gnadenfrist von ein paar Minuten, um dein Klausurende zu bestätigen und die Klausur abzuschließen." }, "conduction": { @@ -180,7 +180,7 @@ "exerciseUpdateNotification": { "title": "Benachrichtigung über Aufgabenänderungen", "shortDescription": "Wenn Änderungen an der Aufgabenstellung während einer Klausur notwendig sind, wirst du darüber benachrichtigt.", - "descriptionTextOne": "Während einer Klausur kann es vorkommen, dass Änderungen an der Aufgabenstellung vorgenommen werden müssen. Du wirst über die Änderungen informiert und kannst die aktualisierte Aufgabenstellung einsehen. Es ist möglich zwischen der der Ansicht der aktualisierten Aufgabenstellung und einer Ansicht, die die Änderungen hervorhebt, zu wechseln." + "descriptionTextOne": "Während einer Klausur kann es vorkommen, dass Änderungen an der Aufgabenstellung vorgenommen werden müssen. Du wirst über die Änderungen informiert und kannst die aktualisierte Aufgabenstellung einsehen. Es ist möglich zwischen der Ansicht der aktualisierten Aufgabenstellung und einer Ansicht, die die Änderungen hervorhebt, zu wechseln." } } } diff --git a/src/main/webapp/i18n/de/feedback.json b/src/main/webapp/i18n/de/feedback.json index 6d3d2892b286..3888d19597c5 100644 --- a/src/main/webapp/i18n/de/feedback.json +++ b/src/main/webapp/i18n/de/feedback.json @@ -18,7 +18,7 @@ "detailText": "Detailtext", "type": "Type", "result": "Ergebnis", - "truncatedInfo": "Das Feedback is zu lang, um komplett angezeigt zu werden, und wurde gekürzt.", + "truncatedInfo": "Das Feedback ist zu lang, um komplett angezeigt zu werden, und wurde gekürzt.", "downloadFullFeedback": "Vollständiges Feedback herunterladen", "modal": { "submitted": "Abgegeben", diff --git a/src/main/webapp/i18n/de/fileUploadAssessment.json b/src/main/webapp/i18n/de/fileUploadAssessment.json index f7e8888ce37b..399557b68206 100644 --- a/src/main/webapp/i18n/de/fileUploadAssessment.json +++ b/src/main/webapp/i18n/de/fileUploadAssessment.json @@ -7,7 +7,7 @@ "addFeedback": "Neues Feedback hinzufügen", "assessInstruction": "Bitte klicke auf \"Neues Feedback hinzufügen\".", "assessInstructionWithDropOption": "Bitte klicke auf \"Neues Feedback hinzufügen\" oder ziehe eine Bewertungsanweisung und lege sie hier ab.", - "deleteAssessment": "Bewertung {{ index }} löschen ?", + "deleteAssessment": "Bewertung {{ index }} löschen?", "dashboard": { "heading": "Einreichungen und Bewertungen der Datei-Upload-Aufgabe \"{{exerciseTitle}}\"" }, diff --git a/src/main/webapp/i18n/de/global.json b/src/main/webapp/i18n/de/global.json index 9db7bb972f26..b809dec61943 100644 --- a/src/main/webapp/i18n/de/global.json +++ b/src/main/webapp/i18n/de/global.json @@ -15,6 +15,9 @@ "copied": "Kopiert", "new": "Neu" }, + "importTable": { + "searchPlaceholder": "Suchen" + }, "menu": { "home": "Startseite", "overview": "Kursübersicht", @@ -32,45 +35,45 @@ "quizExercise": "Quiz Aufgabe", "lecture": "Vorlesung", "competency": "Kompetenz", - "submittedAnswer": "Submitted Answer", - "quizQuestion": "Question", - "multipleChoiceQuestion": "Multiple-Choice Question", - "answerOption": "Answer Option", - "multipleChoiceSubmittedAnswer": "Multiple-Choice Submitted Answer", - "dragAndDropQuestion": "Drag-And-Drop Question", + "submittedAnswer": "Eingereichte Antwort", + "quizQuestion": "Frage", + "multipleChoiceQuestion": "Multiple-Choice Frage", + "answerOption": "Antwortmöglichkeit", + "multipleChoiceSubmittedAnswer": "Multiple-Choice eingereichte Antwort", + "dragAndDropQuestion": "Drag-and-Drop Frage", "dropLocation": "Drop Location", "dragItem": "Drag Item", - "participation": "Participation", + "participation": "Teilnahme", "exerciseResult": "Ergebnis", "feedback": "Feedback", "submission": "Submission", "modelingSubmission": "Modeling Submission", "quizSubmission": "Quiz Submission", - "dragAndDropSubmittedAnswer": "Drag-And-Drop Submitted Answer", - "dragAndDropAssignment": "Drag-And-Drop Assignment", - "quizStatistic": "Statistics", - "quizPointStatistic": "Quiz Point Statistics", - "quizQuestionStatistic": "Question Statistics", - "multipleChoiceQuestionStatistic": "Multiple-Choice Question Statistics", - "dragAndDropQuestionStatistic": "Drag-And-Drop Question Statistics", - "quizStatisticCounter": "Statistic Counter", - "pointCounter": "Point Counter", - "answerCounter": "Answer Counter", + "dragAndDropSubmittedAnswer": "Drag-and-Drop eingereichte Antwort", + "dragAndDropAssignment": "Drag-and-Drop Assignment", + "quizStatistic": "Statistiken", + "quizPointStatistic": "Quiz Punktestatistiken", + "quizQuestionStatistic": "Fragestatistiken", + "multipleChoiceQuestionStatistic": "Multiple-Choice Fragestatistiken", + "dragAndDropQuestionStatistic": "Drag-and-Drop Fragestatistiken", + "quizStatisticCounter": "Statistikzähler", + "pointCounter": "Punktezähler", + "answerCounter": "Antwortzähler", "dropLocationCounter": "Drop Location Counter", "apollonDiagram": "Apollon-Diagramm", "programmingSubmission": "Programming Submission", - "dragAndDropMapping": "Drag-And-Drop Mapping", + "dragAndDropMapping": "Drag-and-Drop Zuordnung", "textSubmission": "Text Submission", "fileUploadSubmission": "File Upload Submission", - "shortAnswerQuestionStatistic": "Short Answer Question Statistic", - "shortAnswerSpotCounter": "Short Answer Spot Counter", - "shortAnswerQuestion": "Short Answer Question", - "shortAnswerSpot": "Short Answer Spot", - "shortAnswerSolution": "Short Answer Solution", - "shortAnswerSubmittedAnswer": "Short Answer Submitted Answer", - "shortAnswerSubmittedText": "Short Answer Submitted Text", - "shortAnswerMapping": "Short Answer Mapping", - "programmingExerciseTestCase": "Programming Exercise Test Case", + "shortAnswerQuestionStatistic": "Kurzantwort-Fragestatistiken", + "shortAnswerSpotCounter": "Kurzantwort-Spot-Zähler", + "shortAnswerQuestion": "Kurzantwort-Frage", + "shortAnswerSpot": "Kurzantwort-Spot", + "shortAnswerSolution": "Kurzantwort-Lösung", + "shortAnswerSubmittedAnswer": "Kurzantwort eingereichte Antwort", + "shortAnswerSubmittedText": "Kurzantwort eingereichter Text", + "shortAnswerMapping": "Kurzantwort-Zuordnung", + "programmingExerciseTestCase": "Programmingaufgabentestfall", "exerciseHint": "Aufgabenhinweis", "jhipster-needle-menu-add-entry": "JHipster will add additional entities here (do not translate!)", "metis": { @@ -266,7 +269,8 @@ "goBack": "Zurück", "search": "Suchen", "select": "Auswählen", - "sendToIris": "An Iris schicken" + "sendToIris": "An Iris schicken", + "faq": "FAQ" }, "detail": { "field": "Feld", @@ -331,7 +335,7 @@ "releaseNotes": "Versionshinweise", "feedback": "Feedback", "justNow": "gerade eben", - "pendingChanges": "WARNUNG: Du hast nicht gespeicherte Änderungen. Klicke Abbrechen, um zurück zu gehen und deine Änderungen zu speichern oder klicke OK, um die Änderungen zu verwerfen.", + "pendingChanges": "WARNUNG: Du hast nicht gespeicherte Änderungen. Klicke Abbrechen, um zurückzugehen und deine Änderungen zu speichern oder klicke OK, um die Änderungen zu verwerfen.", "overview": { "title": "Kursübersicht", "aboutUs": "Über", @@ -345,7 +349,8 @@ "tutorialGroups": "Übungsgruppen", "statistics": "Kursstatistiken", "exams": "Klausuren", - "communication": "Kommunikation" + "communication": "Kommunikation", + "faq": "FAQ" }, "connectionStatus": { "connected": "Verbunden", diff --git a/src/main/webapp/i18n/de/gradingSystem.json b/src/main/webapp/i18n/de/gradingSystem.json index b6567439467a..5d2fdad8313d 100644 --- a/src/main/webapp/i18n/de/gradingSystem.json +++ b/src/main/webapp/i18n/de/gradingSystem.json @@ -48,14 +48,14 @@ "add": "Notenstufe hinzufügen", "save": "Speichern", "stickyGradeStep": "Der letzte Notenschritt ist immer offen, um Punkte zu verarbeiten, die das Maximum überschreiten. Es klebt am Boden.", - "plagiarismGradeHelp": "Diese Note wird vergeben, wenn bei einen Studierenden in einer beliebigen Übung ein \"Unterschleif\" festgestellt wurde.", + "plagiarismGradeHelp": "Diese Note wird vergeben, wenn bei einem Studierenden in einer beliebigen Übung ein \"Unterschleif\" festgestellt wurde.", "noParticipationGradeHelp": "Diese besondere Note für Nichtbestehen wird vergeben, wenn ein Student nicht teilgenommen hat. Bei Kursen bedeutet dies, dass der Studierende keine Übung begonnen hat. Bei Prüfungen bedeutet dies, dass der Studierende nicht begonnen oder nicht abgegeben hat.", "defaultGradeName": "Standard: {{default}}", "info": { "title": "Hilfe zum Notenschlüssel", "general": { "title": "Allgemeine Informationen", - "explanation": "Ein Notenschlüssel besteht aus Notenstufen, die alle möglichen Prozentwerte von 0 bis 100 abdecken. Alle benachbarten Notenstufen sollten sich an ihren Schranken überschneiden (Beispiel: Notenstufen (60, 70) und (70, 80) überschneiden sich bei 70%). Welche Notenstufe diese Schranke einschließt, wird durch die \"Inklusivität\" bestimmt. Alle Notenstufen haben außerdem entweder einen Namen (1,0, Ausreichend, A,...) oder eine damit verbundene Anzahl an Bonuspunkten (5, 10,..), abhängig von dem \"Notentyp\"" + "explanation": "Ein Notenschlüssel besteht aus Notenstufen, die alle möglichen Prozentwerte von 0 bis 100 abdecken. Alle benachbarten Notenstufen sollten sich an ihren Schranken überschneiden (Beispiel: Notenstufen (60, 70) und (70, 80) überschneiden sich bei 70 %). Welche Notenstufe diese Schranke einschließt, wird durch die \"Inklusivität\" bestimmt. Alle Notenstufen haben außerdem entweder einen Namen (1,0, Ausreichend, A,...) oder eine damit verbundene Anzahl an Bonuspunkten (5, 10,..), abhängig von dem \"Notentyp\"" }, "maxPoints": { "title": "Maximale Punktzahl", @@ -67,7 +67,7 @@ }, "inclusivity": { "title": "Inklusivität", - "explanation": "Legt fest, ob die Min. % einer Notenstufe einbezogen und die Max. % ausgeschlossen wird oder umgekehrt (Ausnahme - 0% und 100% werden immer in der ersten bzw. letzten Notenstufe einbezogen). Beispiel: Ein Wert von 60 % wird einer Notenstufe mit einem Bereich von 60 % - 70 % zugeordnet, wenn \"Untere Schranke inklusiv\" für die Inklusivität eingestellt ist, aber nicht, wenn \"Obere Schranke inklusiv\" für die Inklusivität eingestellt ist (in diesem Fall würde er der vorherigen Notenstufe zugeordnet werden)" + "explanation": "Legt fest, ob die Min. % einer Notenstufe einbezogen und die Max. % ausgeschlossen wird oder umgekehrt (Ausnahme - 0 % und 100 % werden immer in der ersten bzw. letzten Notenstufe einbezogen). Beispiel: Ein Wert von 60 % wird einer Notenstufe mit einem Bereich von 60 % - 70 % zugeordnet, wenn \"Untere Schranke inklusiv\" für die Inklusivität eingestellt ist, aber nicht, wenn \"Obere Schranke inklusiv\" für die Inklusivität eingestellt ist (in diesem Fall würde er der vorherigen Notenstufe zugeordnet werden)" }, "firstPassingGrade": { "title": "Erste bestehende Note", diff --git a/src/main/webapp/i18n/de/guidedTour.json b/src/main/webapp/i18n/de/guidedTour.json index 8729bfb11f24..0d7c9d2d0891 100644 --- a/src/main/webapp/i18n/de/guidedTour.json +++ b/src/main/webapp/i18n/de/guidedTour.json @@ -36,7 +36,7 @@ "text": "Während du dir das Video anschaust, kannst du die dargestellten Schritte nebenbei auf deinem Computer auch ausführen." }, "stepAlreadyExecutedHint": { - "text": "Du hast diesen Tutorialschritt bereits erfolgreich durchgeführt, deswegen brauchst du hier nichts mehr tun. Navigiere einfach zum nächsten Schritt, um mit dem Tutorial fortzufahren." + "text": "Du hast diesen Tutorialschritt bereits erfolgreich durchgeführt, deswegen brauchst du hier nichts mehr zu tun. Navigiere einfach zum nächsten Schritt, um mit dem Tutorial fortzufahren." } } } diff --git a/src/main/webapp/i18n/de/guidedTourCourseExerciseOverview.json b/src/main/webapp/i18n/de/guidedTourCourseExerciseOverview.json index 01ac50b90948..fc15a510654e 100644 --- a/src/main/webapp/i18n/de/guidedTourCourseExerciseOverview.json +++ b/src/main/webapp/i18n/de/guidedTourCourseExerciseOverview.json @@ -32,7 +32,7 @@ }, "upcomingDueDates": { "headline": "Bevorstehende Termine", - "content": "Hier siehst du welche Kursabgaben demnächst fällig sind." + "content": "Hier siehst du, welche Kursabgaben demnächst fällig sind." }, "lectures": { "headline": "Vorlesungen", diff --git a/src/main/webapp/i18n/de/guidedTourModelingEditor.json b/src/main/webapp/i18n/de/guidedTourModelingEditor.json index 8b5ff778fd8f..c3834b0278e3 100644 --- a/src/main/webapp/i18n/de/guidedTourModelingEditor.json +++ b/src/main/webapp/i18n/de/guidedTourModelingEditor.json @@ -7,7 +7,7 @@ }, "addEditUmlElement": { "headline": "UML Elemente hinzufügen und bearbeiten", - "content": "Um UML Elemente hinzuzufügen, musst du eines der aufgelisteten UML Elemente per Drag and Drop auf die Editierfläche ziehen.", + "content": "Um UML Elemente hinzuzufügen, musst du eines der aufgelisteten UML Elemente per Drag-and-Drop auf die Editierfläche ziehen.", "hint": "Du kannst das UML Element per Doppelklick auswählen und editieren." }, "createAssociation": { diff --git a/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json b/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json index 8cfd6706e6b3..8cb94399ac6b 100644 --- a/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json +++ b/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json @@ -3,8 +3,8 @@ "programmingExercise": { "codeEditor": { "fileBrowser": { - "headline": "Datei Browser", - "content": "Im Datei Browser findest die Struktur des Projekts mit allen Ordnern und Dateien. Du kannst hier auch eigene Ordner und Dateien anlegen." + "headline": "Dateibrowser", + "content": "Im Dateibrowser findest du die Struktur des Projekts mit allen Ordnern und Dateien. Du kannst hier auch eigene Ordner und Dateien anlegen." }, "exerciseFile": { "headline": "Klassendatei", @@ -30,7 +30,7 @@ }, "buildStatus": { "headline": "Buildstatus", - "content": "Hier kannst jetzt den Buildstatus einsehen, und erkennen, wie hoch der Anteil an bestandenen Tests ist und somit welche (Teil-)Aufgaben erfolgreich gelöst wurden und welche nicht.", + "content": "Hier kannst du jetzt den Buildstatus einsehen, und erkennen, wie hoch der Anteil an bestandenen Tests ist und somit welche (Teil-)Aufgaben erfolgreich gelöst wurden und welche nicht.", "hint": "Es können zusätzliche Tests nach der Einreichungsfrist ausgeführt werden. Das heißt, auch wenn alle aktuell angezeigten Tests erfolgreich durchgelaufen sind, wird die Aufgabe nicht zwangsläufig mit voller Punktzahl bewertet. Überprüfe deine Implementierung daher genau, bevor du sie final einreichst." }, "testCases": { @@ -46,11 +46,11 @@ "content": "Hier kannst du die Testfälle der einzelnen Aufgaben einsehen, die noch nicht erfolgreich durchgelaufen sind." }, "umlSuccess": { - "headline": "Überprüfe deine Implementierung anhand des UML Diagramms", + "headline": "Überprüfe deine Implementierung anhand des UML-Diagramms", "content": "Nun kannst du einsehen, ob du das UML Klassendiagramm erfolgreich implementiert hast!" }, "umlFailure": { - "headline": "Überprüfe die fehlgeschlagenen Tests in deinem UML Diagramm", + "headline": "Überprüfe die fehlgeschlagenen Tests in deinem UML-Diagramm", "content": "Nun kannst du einsehen, welche Tests erfolgreich durchgelaufen sind und welche noch fehlschlagen." }, "resolveTasks": { diff --git a/src/main/webapp/i18n/de/importUsers.json b/src/main/webapp/i18n/de/importUsers.json index 9178ff7571f8..c150395b79ae 100644 --- a/src/main/webapp/i18n/de/importUsers.json +++ b/src/main/webapp/i18n/de/importUsers.json @@ -5,15 +5,15 @@ "dialogTitle": "Nutzer Importieren nach:", "introText": "Mit diesem Dialog können Nutzer importiert werden.", "dialogText": "Jeder Eintrag in der Datei muss einen Wert für die Matrikelnummer, den Login oder die E-Mail beinhalten.
    Werte für Vor- und Nachnamen sind optional.", - "csvExampleText": "Beispiel für eine gültige CSV Datei:", + "csvExampleText": "Beispiel für eine gültige CSV-Datei:", "csvFile": { - "label": ".csv Datei auswählen", - "tooltip": "Bitte wähle die .csv Datei mit den Nutzern zum Import aus. Pro Eintrag muss entweder die 'LOGIN', 'REGISTRATION_NUMBER' oder 'E-MAIL' Spalte ausgefüllt sein. Folgendes Format muss dabei beachtet werden: Login, Matrikelnummer, E-Mail, Vorname, Nachname. Du musst diese in der obersten Spalte angeben!" + "label": "CSV-Datei auswählen", + "tooltip": "Bitte wähle die CSV-Datei mit den Nutzern zum Import aus. Pro Eintrag muss entweder die 'LOGIN', 'REGISTRATION_NUMBER' oder 'E-MAIL' Spalte ausgefüllt sein. Folgendes Format muss dabei beachtet werden: Login, Matrikelnummer, E-Mail, Vorname, Nachname. Du musst diese in der obersten Spalte angeben!" }, "usersForImport": { "label": "Nutzer zum Importieren", "tooltip": "Diese Nutzer werden importiert beim Klicken auf \"Importieren\".", - "importFailed": "Bitte versuche es nach dem reparieren der Datei erneut, die Datei konnte wegen folgendem Fehler nicht gelesen werden:", + "importFailed": "Bitte versuche es nach dem Reparieren der Datei erneut, die Datei konnte wegen folgendem Fehler nicht gelesen werden:", "failedRows": "Die folgenden Reihen in deiner CSV sind ungültig und müssen entweder den Login, eine Matrikelnummer oder eine E-Mail enthalten:", "noUsersFound": "Es wurden keine Benutzer zum Importieren gefunden" }, diff --git a/src/main/webapp/i18n/de/instructorDashboard.json b/src/main/webapp/i18n/de/instructorDashboard.json index 09576a33510e..e12dfd3258a2 100644 --- a/src/main/webapp/i18n/de/instructorDashboard.json +++ b/src/main/webapp/i18n/de/instructorDashboard.json @@ -19,8 +19,8 @@ "average": "Durchschnitt", "students": "Studierende", "courseScoreChart": { - "noGradingScaleExplanation": "Eine Leistung gilt als bedenklich falls sie unter 40% der maximal zu erreichenden Punktzahl erzielt und somit in den meisten Fällen zum Nichtbestehen eines Kurses führen würde. Andernfalls gilt eine Leistung als unbedenklich.", - "gradingScaleExplanationNotBonus": "Eine Leistung gilt als ungenügend falls sie nicht zum Bestehen des Kurses genügt. Andernfalls gilt eine Leistung als ausreichend.", + "noGradingScaleExplanation": "Eine Leistung gilt als bedenklich, falls sie unter 40 % der maximal zu erreichenden Punktzahl erzielt und somit in den meisten Fällen zum Nichtbestehen eines Kurses führen würde. Andernfalls gilt eine Leistung als unbedenklich.", + "gradingScaleExplanationNotBonus": "Eine Leistung gilt als ungenügend, falls sie nicht zum Bestehen des Kurses genügt. Andernfalls gilt eine Leistung als ausreichend.", "scoreDistribution": "Verteilung des Kursergebnisses" }, "statisticsTable": { diff --git a/src/main/webapp/i18n/de/iris.json b/src/main/webapp/i18n/de/iris.json index 34572e7581bd..0a687f629ebe 100644 --- a/src/main/webapp/i18n/de/iris.json +++ b/src/main/webapp/i18n/de/iris.json @@ -10,6 +10,10 @@ "button": { "reload": "Einstellungen neu laden", "save": "Einstellungen speichern", + "textExercise": { + "title": "Iris", + "tooltip": "Bearbeite die Iris Einstellungen für diese Textaufgabe" + }, "programmingExercise": { "title": "Iris", "tooltip": "Bearbeite die Iris Einstellungen für diese Programmieraufgabe" @@ -21,6 +25,7 @@ }, "subSettings": { "chatSettings": "Chat Einstellungen", + "textExerciseChatSettings": "Textaufgaben Chat Einstellungen", "lectureIngestionSettings": { "title": "Vorlesungen Erfassung Einstellungen", "autoIngestOnAttachmentUpload": "Vorlesungen automatisch an Pyris senden" @@ -28,14 +33,14 @@ "hestiaSettings": "Hestia Einstellungen", "competencyGenerationSettings": "Kompetenzgenerierung Einstellungen", "enabled-disabled": "Aktiviert/Deaktiviert", - "models": { - "title": "Modelle", - "allowedModels": { - "title": "Erlaubte Modelle", - "inheritSwitch": "Erbe erlaubte Modelle" + "variants": { + "title": "Varianten", + "allowedVariants": { + "title": "Erlaubte Varianten", + "inheritSwitch": "Erbe erlaubte Varianten" }, - "preferredModel": { - "title": "Präferiertes Modell", + "selectedVariant": { + "title": "Genuzte Variante", "inherit": "Erben" } }, @@ -62,22 +67,14 @@ "breadcrumb": "Iris Einstellungen", "global": "Globale Iris Einstellungen", "course": "Kurs Iris Einstellungen", - "programmingExercise": "Programmieraufgabe Iris Einstellungen" - }, - "autoUpdate": { - "title": "Auto Update Einstellungen", - "tooltip": "Wenn aktiviert, werden die spezifischen globalen Iris Einstellungen automatisch aktualisiert, wenn eine neue Version von Artemis neue Iris Einstellungen bereitstellt.", - "chatLabel": "Auto Update der Chat Einstellungen", - "hestiaLabel": "Auto Update der Hestia Einstellungen", - "lectureIngestionLabel": "Auto Update der Vorlesungen Erfassung Einstellungen", - "competencyGenerationLabel": "Auto Update der Kompetenzgenerierung Einstellungen" + "exercise": "Programmieraufgabe Iris Einstellungen" } }, "error": { "forbidden": "Artemis ist nicht konfiguriert, um Iris zu verwenden. (Ungültiges Token)", "internalPyrisError": "Ein interner Fehler beim Kommunizieren mit dem LLM ist aufgetreten. Die Fehlermeldung lautet: {{ pyrisErrorMessage }}.", "invalidTemplate": "Die Vorlage ist ungültig. Die Fehlermeldung lautet: {{ pyrisErrorMessage }}.", - "noModelAvailable": "Das Modell {{ model }} steht nicht zur Verfügung. Bitte kontaktiere einen Administrator, wenn das Problem weiterhin besteht.", + "noVariantAvailable": "Die Variante {{ variant }} steht nicht zur Verfügung. Bitte kontaktiere einen Administrator, wenn das Problem weiterhin besteht.", "noResponse": "Es wurde keine Antwort von Iris empfangen. Bitte kontaktiere einen Administrator, wenn das Problem weiterhin besteht.", "parseResponse": "Ein Fehler ist beim Parsen der Antwort von Iris aufgetreten. Ursache: {{ cause }}" }, diff --git a/src/main/webapp/i18n/de/learningPath.json b/src/main/webapp/i18n/de/learningPath.json index f8ee7e720963..e876df596e46 100644 --- a/src/main/webapp/i18n/de/learningPath.json +++ b/src/main/webapp/i18n/de/learningPath.json @@ -20,7 +20,7 @@ "generation": { "title": "Willkommen bei deinem Lernpfad!", "description": "Der Lernpfad ermöglicht es dir, in deinem eigenen Tempo zu lernen, mit einer personalisierten Lernreise, die auf deine Leistung zugeschnitten ist. Sie passt sich dynamisch an und stellt sicher, dass du immer die relevantesten Inhalte und Herausforderungen erhältst. Starte jetzt und erlebe deinen individuellen Weg zum Erfolg!", - "generateButton": "Meinen Lernfpad starten" + "generateButton": "Meinen Lernpfad starten" }, "completion": { "title": "Herzlichen Glückwunsch!", diff --git a/src/main/webapp/i18n/de/lecture.json b/src/main/webapp/i18n/de/lecture.json index c5d76e7c292d..5c1dd797824e 100644 --- a/src/main/webapp/i18n/de/lecture.json +++ b/src/main/webapp/i18n/de/lecture.json @@ -55,7 +55,7 @@ "notificationText": "Mitteilungstext", "notificationPlaceholder": "Was wurde geändert?", "chooseFile": "Datei auswählen", - "error": "Die Datei {{ fileName }} ist zu groß. Die maximale Dateigröße beträgt 20MB.", + "error": "Die Datei {{ fileName }} ist zu groß. Die maximale Dateigröße beträgt 20 MB.", "fileLimitation": "(max. Größe 20 MB)", "fileLimitationTooltip": "Unterstützte Formate: {{ extensions }}" }, diff --git a/src/main/webapp/i18n/de/lectureUnit.json b/src/main/webapp/i18n/de/lectureUnit.json index aff8999839ee..41fe6c3255fd 100644 --- a/src/main/webapp/i18n/de/lectureUnit.json +++ b/src/main/webapp/i18n/de/lectureUnit.json @@ -67,7 +67,7 @@ "sourceRequiredValidationError": "Video URL ist ein Pflichtfeld", "sourceURLValidationError": "Keine valide URL", "urlVideoHelper": "Umwandlung in einbettbares Format ", - "urlHelperPlaceholder": "Du kannst hier eine Video URL eingeben und den Pfeil benutzen, um sie in die korrekte einbettbare URL umzuwandeln", + "urlHelperPlaceholder": "Du kannst hier eine Video-URL eingeben und den Pfeil benutzen, um sie in die korrekte einbettbare URL umzuwandeln", "urlHelperValidationError": "Automatische Formatumwandlung ist nicht möglich für diese URL" }, "editVideoUnit": { @@ -154,7 +154,7 @@ "startPage": "Startseite", "endPage": "Letzte Seite" }, - "lectureFileToolTip": "Bitte auswählen, um die automatischen Trennung von Vorlesungseinheiten zu aktivieren.", + "lectureFileToolTip": "Bitte auswählen, um die automatische Trennung von Vorlesungseinheiten zu aktivieren.", "processTimeInfo": "Die Verarbeitung der Vortragseinheiten kann einige Sekunden dauern. Habe bitte etwas Geduld." }, "createAttachmentUnit": { @@ -171,7 +171,7 @@ "descriptionMaxLengthValidationError": "Die Beschreibung kann maximal 1000 Zeichen lang sein.", "file": "Datei", "version": "Version", - "fileRequiredValidationError": "Du musst eine Datei zum uploaden auswählen.", + "fileRequiredValidationError": "Du musst eine Datei zum Uploaden auswählen.", "chooseFile": "Datei auswählen", "fileTooBig": "Die Datei ist zu groß! Die maximale Dateigröße beträgt 20 MB.", "fileLimitation": "(max. Größe 20 MB)", diff --git a/src/main/webapp/i18n/de/lti.json b/src/main/webapp/i18n/de/lti.json index 102afd4fd241..3d004f52d5e9 100644 --- a/src/main/webapp/i18n/de/lti.json +++ b/src/main/webapp/i18n/de/lti.json @@ -4,14 +4,14 @@ "home": { "title": "LTI-Konfiguration" }, - "initializationError": "Die Initialisierung deines Benutzers wurde gestartet aber dein LTI-Konto wurde möglicherweise nicht korrekt erstellt. Bitte benachrichtige deine Übungsleitung falls du dein Artemis-Passwort bisher nicht erhalten hast.", + "initializationError": "Die Initialisierung deines Benutzers wurde gestartet aber dein LTI-Konto wurde möglicherweise nicht korrekt erstellt. Bitte benachrichtige deine Übungsleitung, falls du dein Artemis-Passwort bisher nicht erhalten hast.", "initialization": { "header": "LTI Benutzer Initialisierung", "body": { - "welcome": "Herzlich Willkommen bei Artemis! Wir haben automatisch ein Konto für dich erstellt.", + "welcome": "Herzlich willkommen bei Artemis! Wir haben automatisch ein Konto für dich erstellt.", "loginLabel": "Dein Login-Name", "passwordLabel": "Dein Passwort", - "passwordHint": "Merk dir das Passwort gut. Du wirst es benötigen um dich manuell einzuloggen oder für unsere Programmieraufgaben.
    Wenn du dein Passwort vergessen hast oder ändern möchtest kannst du es auf der Login-Seite zurücksetzen. Du kannst das Passwort auch sofort ändern:", + "passwordHint": "Merk dir das Passwort gut. Du wirst es benötigen, um dich manuell einzuloggen oder für unsere Programmieraufgaben.
    Wenn du dein Passwort vergessen hast oder ändern möchtest, kannst du es auf der Login-Seite zurücksetzen. Du kannst das Passwort auch sofort ändern:", "passwordChange": "Passwort ändern", "readAndUnderstood": "Ich habe die obigen Informationen gelesen und verstehe, dass ich das oben angezeigte Passwort speichern muss.", "confirm": "Bestätigen" @@ -19,7 +19,7 @@ }, "version13": "LTI 1.3", "dynamicRegistrationUrl": "Dynamic Registration URL", - "deepLinkingUrl": "Deep Linking URL", + "deepLinkingUrl": "Deep-Linking URL", "toolUrl": "Tool URL", "keysetUrl": "Keyset URL", "initiateLoginUrl": "Initiate Login URL", @@ -37,7 +37,7 @@ "jwkSetUri": "JWKSet URI", "customName": "Benutzerdefinierter Name", "exercises": "Aufgaben", - "startExercise": "Herzlich Willkommen bei Artemis! Klicke auf den Button Aufgabe starten!", + "startExercise": "Herzlich willkommen bei Artemis! Klicke auf den Button Aufgabe starten!", "ltiSuccessLoginRequired": "LTI Übung erfolgreich gestartet. Bitte melde dich als Nutzer:in {{user}} an.", "lti": "LTI", "configurationForCourse": "LTI Konfiguration des Kurses {{ title }}", @@ -72,17 +72,17 @@ "lti13": { "launch": { "title": "Aufgabe starten", - "launching": "Am starten...", + "launching": "Am Starten...", "launchFailed": "Die Übung konnte nicht gestartet werden. Bitte versuche es später noch einmal oder kontaktiere den Administrator." }, "dynamicRegistration": { "title": "Dynamische Registrierung", - "registering": "Am registrieren", + "registering": "Am Registrieren", "registeredSuccessfully": "Kurs erfolgreich registriert", "registerFailed": "Fehler bei der dynamischen Registrierung" }, "deepLinking": { - "title": "Deep Linking", + "title": "Deep-Linking", "linking": "Verlinkung", "linkedSuccessfully": "Verknüpfung der Übungen erfolgreich", "linkedFailed": "Fehler beim Deep-Linking", diff --git a/src/main/webapp/i18n/de/markdownEditor.json b/src/main/webapp/i18n/de/markdownEditor.json index 00c22411fcaa..36624131822c 100644 --- a/src/main/webapp/i18n/de/markdownEditor.json +++ b/src/main/webapp/i18n/de/markdownEditor.json @@ -5,7 +5,7 @@ "katex": "Formel", "fullscreen": "Vollbild" }, - "fileUpload": "Füge Dateien durch Drag & Drop oder durch Auswählen hinzu.", + "fileUpload": "Füge Dateien durch Drag-and-Drop oder durch Auswählen hinzu.", "guide": "Formatierungen mit Markdown sind möglich", "color": "Farbe", "preview": { diff --git a/src/main/webapp/i18n/de/metis.json b/src/main/webapp/i18n/de/metis.json index 5eabc98efd9e..8a669a9c8c8c 100644 --- a/src/main/webapp/i18n/de/metis.json +++ b/src/main/webapp/i18n/de/metis.json @@ -29,7 +29,7 @@ "edited": "(bearbeitet)", "markAsResolvingAnswerTooltip": "Bestätige, dass die ursprüngliche Nachricht durch diese Antwort geklärt wird", "resolvingAnswerTooltip": "Die ursprüngliche Nachricht wird durch diese Antwort geklärt", - "unmarkAsResolvingAnswerTooltip": "Widerrufe dass die ursprüngliche Nachricht durch diese Antwort geklärt wird", + "unmarkAsResolvingAnswerTooltip": "Widerrufe, dass die ursprüngliche Nachricht durch diese Antwort geklärt wird", "today": "Heute", "pinnedPostTooltip": "Diese Nachricht wurde angeheftet", "pinPostTooltip": "Klicke, um diese Nachricht anzuheften", @@ -66,7 +66,7 @@ }, "overview": { "title": "Nachrichten", - "searchBarDefault": "Suche nach Nachrichten in allen Kanälen (Ctrl/Cmd + K)", + "searchBarDefault": "Suche nach Nachrichten in allen Kanälen (Strg/Cmd + K)", "sortedByDate": "Sortiert nach Datum", "postContextFilter": "Zeige Nachrichten in:", "one_extra_context": "weiterer", @@ -90,7 +90,9 @@ "TECH_SUPPORT": "Technische Hilfe", "ORGANIZATION": "Organisation", "RANDOM": "Sonstiges", - "ANNOUNCEMENT": "Ankündigung" + "ANNOUNCEMENT": "Ankündigung", + "allPublicMessages": "Alle öffentlichen Nachrichten", + "searchResults": "Suchergebnisse für {{ search }}" }, "post": { "context": "Kontext", diff --git a/src/main/webapp/i18n/de/modelingAssessmentEditor.json b/src/main/webapp/i18n/de/modelingAssessmentEditor.json index ea907e036f13..175eafa293e2 100644 --- a/src/main/webapp/i18n/de/modelingAssessmentEditor.json +++ b/src/main/webapp/i18n/de/modelingAssessmentEditor.json @@ -30,7 +30,7 @@ }, "automaticAssessmentAvailable": "Herzlichen Glückwunsch! Um dir etwas Zeit zu sparen, wurden Teile dieses Modells bereits automatisch bewertet. Bitte überprüfe die automatische Bewertung und bewerte anschließend den Rest des Modells. Mit der Abgabe der Bewertung bestätigst du auch die automatische Bewertung. Bitte beachte, dass du für die gesamte Bewertung verantwortlich bist.", "automaticAssessmentLoading": "Automatisch generierte Feedback-Vorschläge werden geladen...", - "generativeAIAssessmentAvailable": "Artemis hat erstes Feedback mit Hilfe von von generativer KI erstellt, kann dabei aber Fehler machen. Bitte überprüfe wichtige Informationen.", + "generativeAIAssessmentAvailable": "Artemis hat erstes Feedback mithilfe von generativer KI erstellt, kann dabei aber Fehler machen. Bitte überprüfe wichtige Informationen.", "generativeAIAssessmentInfo": "Artemis verwendet generative KI, um auf der Grundlage der Aufgabenstellung und der Bewertungsanweisungen Feedback-Vorschläge für Abgaben zu erstellen. Auch wenn diese Vorschläge dir hoffentlich helfen, die Abgaben effizienter zu bewerten, ist es wichtig, sich bewusst zu sein, dass KI nicht immer korrekte Ergebnisse liefert. Bitte überprüfe die Vorschläge und passe sie wenn nötig an. Du bist für die gesamte Bewertung verantwortlich, einschließlich der per KI generierten Vorschläge.", "highlightingColors": { "title": "Hervorhebungsfarbe(n)", diff --git a/src/main/webapp/i18n/de/modelingEditor.json b/src/main/webapp/i18n/de/modelingEditor.json index 8c95ae33452c..4f7b530cd673 100644 --- a/src/main/webapp/i18n/de/modelingEditor.json +++ b/src/main/webapp/i18n/de/modelingEditor.json @@ -31,7 +31,7 @@ "title": "So verwendet man den Modellierungseditor", "createElement": { "title": "Elemente hinzufügen", - "text": "Um ein Element hinzuzufügen, ziehe es einfach von der rechten Seite per Drag & Drop in den Editorbereich auf der linken Seite." + "text": "Um ein Element hinzuzufügen, ziehe es einfach von der rechten Seite per Drag-and-Drop in den Editorbereich auf der linken Seite." }, "createRelationship": { "title": "Beziehungen hinzufügen", @@ -47,15 +47,15 @@ }, "moveElement": { "title": "Elemente verschieben", - "text": "Um ein Element zu verschieben, wähle dieses mit einem Klick aus und verwende entweder die Pfeiltasten der Tastatur oder bewege es per Drag & Drop." + "text": "Um ein Element zu verschieben, wähle dieses mit einem Klick aus und verwende entweder die Pfeiltasten der Tastatur oder bewege es per Drag-and-Drop." }, "resizeElement": { "title": "Größe von Elementen verändern", - "text": "Um die Größe eines Elements zu verändern, bewege per Drag & Drop die rechte, untere Ecke des Elements." + "text": "Um die Größe eines Elements zu verändern, bewege per Drag-and-Drop die rechte, untere Ecke des Elements." }, "reconnectRelationship": { "title": "Beziehungen neu verbinden", - "text": "Um eine Beziehung neu zu verbinden, bewege per Drag & Drop eine der Beziehungsenden." + "text": "Um eine Beziehung neu zu verbinden, bewege per Drag-and-Drop eine der Beziehungsenden." }, "select": { "title": "Multi-Selektion", diff --git a/src/main/webapp/i18n/de/multipleChoiceQuestion.json b/src/main/webapp/i18n/de/multipleChoiceQuestion.json index f9630721cc83..35c48898f228 100644 --- a/src/main/webapp/i18n/de/multipleChoiceQuestion.json +++ b/src/main/webapp/i18n/de/multipleChoiceQuestion.json @@ -48,8 +48,8 @@ "color": "Farbe" }, "visualEditor": { - "hintTooltip": "Füge hier einen Hinweis hinzu (sichtbar während des Quizzes über den ?-Button)", - "explanationTooltip": "Füge hier eine Erklärung hinzu (nur sichtbar im Feedback nachdem das Quiz beended ist)", + "hintTooltip": "Füge hier einen Hinweis hinzu (sichtbar während des Quiz über den ?-Button)", + "explanationTooltip": "Füge hier eine Erklärung hinzu (nur sichtbar im Feedback nachdem das Quiz beendet ist)", "hintPlaceholder": "Hinweis ...", "explanationPlaceholder": "Erklärung ...", "textPlaceholder": "Text ...", diff --git a/src/main/webapp/i18n/de/multipleChoiceQuestionStatistic.json b/src/main/webapp/i18n/de/multipleChoiceQuestionStatistic.json index 83153e305221..797140da6b4b 100644 --- a/src/main/webapp/i18n/de/multipleChoiceQuestionStatistic.json +++ b/src/main/webapp/i18n/de/multipleChoiceQuestionStatistic.json @@ -2,19 +2,19 @@ "artemisApp": { "multipleChoiceQuestionStatistic": { "home": { - "title": "Multiple-Choice Question Statistics", - "createLabel": "Multiple-Choice Question Statistic erstellen" + "title": "Multiple-Choice Fragestatistiken", + "createLabel": "Multiple-Choice Fragestatistik erstellen" }, - "created": "Multiple-Choice Question Statistic erstellt mit ID {{ param }}", - "updated": "Multiple-Choice Question Statistic aktualisiert mit ID {{ param }}", - "deleted": "Multiple-Choice Question Statistic gelöscht mit ID {{ param }}", + "created": "Multiple-Choice Fragestatistik erstellt mit ID {{ param }}", + "updated": "Multiple-Choice Fragestatistik aktualisiert mit ID {{ param }}", + "deleted": "Multiple-Choice Fragestatistik gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Multiple-Choice Question Statistic {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Multiple-Choice Fragestatistik {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Multiple-Choice Question Statistic" + "title": "Multiple-Choice Fragestatistik" }, - "answerCounters": "Answer Counters" + "answerCounters": "Antwortzähler" } } } diff --git a/src/main/webapp/i18n/de/multipleChoiceSubmittedAnswer.json b/src/main/webapp/i18n/de/multipleChoiceSubmittedAnswer.json index b5ab3cd9892e..402997c94772 100644 --- a/src/main/webapp/i18n/de/multipleChoiceSubmittedAnswer.json +++ b/src/main/webapp/i18n/de/multipleChoiceSubmittedAnswer.json @@ -2,19 +2,19 @@ "artemisApp": { "multipleChoiceSubmittedAnswer": { "home": { - "title": "Multiple-Choice Submitted Answers", - "createLabel": "Multiple-Choice Submitted Answer erstellen" + "title": "Multiple-Choice eingereichte Antwort", + "createLabel": "Multiple-Choice eingereichte Antwort erstellen" }, - "created": "Multiple-Choice Submitted Answer erstellt mit ID {{ param }}", - "updated": "Multiple-Choice Submitted Answer aktualisiert mit ID {{ param }}", - "deleted": "Multiple-Choice Submitted Answer gelöscht mit ID {{ param }}", + "created": "Multiple-Choice eingereichte Antwort erstellt mit ID {{ param }}", + "updated": "Multiple-Choice eingereichte Antwort aktualisiert mit ID {{ param }}", + "deleted": "Multiple-Choice eingereichte Antwort gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Multiple-Choice Submitted Answer {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Multiple-Choice eingereichte Antwort {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Multiple-Choice Submitted Answer" + "title": "Multiple-Choice eingereichte Antwort" }, - "selectedOptions": "Selected Options" + "selectedOptions": "Ausgewählte Optionen" } } } diff --git a/src/main/webapp/i18n/de/organizationManagement.json b/src/main/webapp/i18n/de/organizationManagement.json index a4ea52a18802..a838d55db96d 100644 --- a/src/main/webapp/i18n/de/organizationManagement.json +++ b/src/main/webapp/i18n/de/organizationManagement.json @@ -34,9 +34,9 @@ "patternChangeWarning": "Beim Ändern des E-Mail-Musters wird eine Neuzuweisung der Nutzer:innen zu dieser Organisation ausgeführt" }, "organization": { - "updated": "Organization updated!", - "deleted": "Organization deleted!", - "created": "Organization created!" + "updated": "Organisation aktualisiert!", + "deleted": "Organisation gelöscht!", + "created": "Organisation angelegt!" } } } diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index 25fedc860c71..2e8f1d30798f 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -36,7 +36,7 @@ "open": "{{ amount }} offen", "portionOfAllCases": "{{ percentage }}% aller Fälle", "similarityThreshold": "Ähnlichkeitsschwelle in %", - "similarityThresholdTooltip": "Ignoriere Vergleiche, deren Ähnlichkeit unter dieser Schwelle liegt. Eine Ähnlichkeit von 0% bedeutet, dass es keinerlei Überschneidung zwischen zwei Einreichungen gibt, eine Ähnlichkeit von 50% bedeutet, dass in etwa die Hälfte zweier Einreichungen identisch ist. Eine Ähnlichkeit von 100% bedeutet, dass zwei Einreichungen komplett identisch sind", + "similarityThresholdTooltip": "Ignoriere Vergleiche, deren Ähnlichkeit unter dieser Schwelle liegt. Eine Ähnlichkeit von 0 % bedeutet, dass es keinerlei Überschneidung zwischen zwei Einreichungen gibt, eine Ähnlichkeit von 50 % bedeutet, dass in etwa die Hälfte zweier Einreichungen identisch ist. Eine Ähnlichkeit von 100 % bedeutet, dass zwei Einreichungen komplett identisch sind", "minimumScore": "Minimale Bewertung in %", "minimumScoreTooltip": "Berücksichtige nur Einreichungen mit einer Bewertung, die mindestens diesem Wert entspricht", "minimumSize": "Plagiatskontrolle: Minimale Größe", @@ -58,13 +58,13 @@ "hideContinuousPlagiarismControl": "Verstecke Kontinuierliche Plagiatskontrolle", "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus. Aufgedeckte Fälle werden als Plagiat gekennzeichnet und die Studierenden werden darüber behutsam informiert.", "continuousPlagiarismControlEnabled": "Aktiviere Kontinuierliche Plagiatskontrolle", - "continuousPlagiarismControlPostDueDateChecksEnabled": "Führe die Überprüfung der Abgaben nach der Einreichungsfrist ein weiteres mal durch.", + "continuousPlagiarismControlPostDueDateChecksEnabled": "Führe die Überprüfung der Abgaben nach der Einreichungsfrist ein weiteres Mal durch.", "cleanUp": { "confirmDialog": { "title": "Plagiatsvergleiche aufräumen", "question": "Bist du sicher, dass du alle unbenutzten Plagiatsvergleiche löschen willst? Dies kann nicht rückgängig gemacht werden.", "deleteAll": "Lösche alle Plagiatsvergleiche", - "warning": "Es werden ALLE plagiatsvergleiche gelöscht, einschließlich des Ergebnisses der Plagiatskontrolle und der Statistiken.", + "warning": "Es werden ALLE Plagiatsvergleiche gelöscht, einschließlich des Ergebnisses der Plagiatskontrolle und der Statistiken.", "submit": "Aufräumen" } }, @@ -120,7 +120,7 @@ "pageTitle": "Plagiatsfälle", "plagiarismReview": "Plagiate Prüfen", "plagiarismCases": "Plagiatsfälle", - "pageSubtitle": "Bestätigte plagiatsfälle verwalten, Studierende benachrichtigen und Stellungnahmen bearbeiten.", + "pageSubtitle": "Bestätigte Plagiatsfälle verwalten, Studierende benachrichtigen und Stellungnahmen bearbeiten.", "affectedExercise": "Betroffene Aufgabe:", "assess": "Öffnen", "close": "Schließen", diff --git a/src/main/webapp/i18n/de/pointCounter.json b/src/main/webapp/i18n/de/pointCounter.json index e1f94334daab..9f2ce50be783 100644 --- a/src/main/webapp/i18n/de/pointCounter.json +++ b/src/main/webapp/i18n/de/pointCounter.json @@ -2,20 +2,20 @@ "artemisApp": { "pointCounter": { "home": { - "title": "Point Counters", - "createLabel": "Point Counter erstellen" + "title": "Punktzähler", + "createLabel": "Punktzähler erstellen" }, - "created": "Point Counter erstellt mit ID {{ param }}", - "updated": "Point Counter aktualisiert mit ID {{ param }}", - "deleted": "Point Counter gelöscht mit ID {{ param }}", + "created": "Punktzähler erstellt mit ID {{ param }}", + "updated": "Punktzähler aktualisiert mit ID {{ param }}", + "deleted": "Punktzähler gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Point Counter {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Punktzähler {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Point Counter" + "title": "Punktezähler" }, - "points": "Points", - "quizPointStatistic": "Quiz Point Statistic" + "points": "Punkte", + "quizPointStatistic": "Quiz Punktestatistik" } } } diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 9d67c6853e90..d1bf21030478 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -92,7 +92,7 @@ "noReleaseDateWarning": "Du hast kein Veröffentlichungsdatum definiert, daher wird die Aufgabe sofort veröffentlicht und sichtbar für die Studierenden sein. Du kannst aber erst nach dem Startdatum an der Aufgabe teilnehmen.", "noReleaseAndStartDateWarning": "Du hast kein Veröffentlichungs- und Startdatum definiert, daher wird die Aufgabe sofort veröffentlicht und Studierende können direkt an der Aufgabe teilnehmen.", "unsavedChangesLanguageChange": "Die Aufgabenstellung enthält noch nicht gespeicherte Änderungen. Soll die Programmiersprache wirklich geändert werden?", - "unsavedChangesProjectTypeChange": "Die Aufgabenstellung enthält noch nicht gespeicherte Änderungen. Soll der Projekt Typ wirklich geändert werden?", + "unsavedChangesProjectTypeChange": "Die Aufgabenstellung enthält noch nicht gespeicherte Änderungen. Soll der Projekttyp wirklich geändert werden?", "templateRepositoryUri": "Vorlagen-Repository-Url", "testRepositoryUri": "Test-Repository-Url", "solutionRepositoryUri": "Lösungs-Repository-Url", @@ -106,7 +106,7 @@ "buildplan": "Build-Plan", "buildConfiguration": "Build Konfiguration", "buildPlanEditor": "Build-Plan-Editor", - "buildPlanFetchError": "Konnte keinen Build-Plan für diese Aufgabe finden. Das ist normal für ältere Aufgaben. Du kannst den Build-Plan im CI-System bearbeiten oder den Build-Plan in Artemis zurücksetzen, um einen neuen Build-Plan zu erstellen der hier bearbeitet werden kann.", + "buildPlanFetchError": "Konnte keinen Build-Plan für diese Aufgabe finden. Das ist normal für ältere Aufgaben. Du kannst den Build-Plan im CI-System bearbeiten oder den Build-Plan in Artemis zurücksetzen, um einen neuen Build-Plan zu erstellen, der hier bearbeitet werden kann.", "customizeBuildPlan": "Build Skript anpassen", "customizeBuildPlanWithAeolus": "Build Skript anpassen", "revertToTemplateBuildPlan": "Artemis führt das folgende Build-Skript für jede Einreichung in einem Docker-Container aus. Du kannst das Build Skript anpassen und auf seinen Standardwert zurücksetzen, indem du die Schaltfläche Zurücksetzen oben verwendest.", @@ -115,6 +115,23 @@ "customizeDockerImage": "Du kannst das Docker-Image anpassen. Stelle sicher, dass du es in amd64 und arm64 bereitstellst und alle Build Abhängigkeiten enthalten sind, um eine kurze Build Dauer zu gewährleisten.", "parameters": "Parameter", "dockerImage": "Docker Image", + "checkoutPath": { + "title": "Checkout-Pfad", + "customize": "Sie können den Checkout-Pfad anpassen, in dem die Repositories im Docker-Container geklont werden. Stellen Sie sicher, dass Sie einen gültigen absoluten UNIX-Pfad angeben. Der Standardpfad ist /var/tmp.", + "alert": "Checkout-Pfade dürfen nur Wörter, '_', '-', und '/' enthalten, dürfen jedoch nicht mit einem '/' beginnen oder enden. Die Pfade müssen für jedes Repository unterschiedlich sein.", + "edit": "Checkout-Pfad der Repositories bearbeiten", + "assignment": "Checkout-Pfad für das Aufgaben-Repository. Das kann nach der Erstellung nicht bearbeitet werden.", + "solution": "Checkout-Pfad für das Lösungs-Repository. Das kann nach der Erstellung nicht bearbeitet werden.", + "tests": "Checkout-Pfad für das Tests-Repository. Das kann nach der Erstellung nicht bearbeitet werden.", + "invalid": "Ungültige Checkout-Pfade", + "warning": "Das Ändern der Checkout-Pfade kann zu Build-Fehlern führen. Einige Programmiersprachen verlassen sich auf Docker-Images, die bestimmte Verzeichnisstrukturen für den Code voraussetzen.", + "warningBuildScript": "Stellen Sie sicher, dass Sie das Build-Skript und die Repositories entsprechend anpassen." + }, + "timeout": { + "title": "Maximale Build-Dauer in Sekunden ", + "customize": "Setze den Wert auf 0, um den Standardwert zu verwenden. Stelle sicher, dass du einen gültigen ganzzahligen Wert angibst. Die Einheit ist Sekunden. Beachte, dass dieser Wert durch das von den Administratoren festgelegte maximale Limit (Standard ist 240s) überschrieben werden kann.", + "alert": "Das Timeout muss ein gültiger ganzzahliger Wert sein." + }, "workdir": "Verzeichnis", "allowOnlineEditor": { "title": "Online-Editor erlauben", @@ -134,7 +151,7 @@ "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein" }, "onlineIde": "Online IDE", - "showTestNamesToStudents": "Zeige die Test Namen den Studierenden", + "showTestNamesToStudents": "Zeige die Testnamen den Studierenden", "showTestNamesToStudentsTooltip": "Durch Aktivierung dieser Option werden die Namen der automatischen Tests den Studierenden angezeigt. Lasse die Option deaktiviert, um keine visuelle Unterscheidung zwischen manuellem und automatischem Feedback für die Studierenden vorzunehmen.", "participationMode": "Teilnahmemodus", "noVersionControlAndContinuousIntegrationAvailable": "Setup ohne Verbindung zur VCS und CI", @@ -152,7 +169,7 @@ }, "maxStaticCodeAnalysisPenalty": { "title": "Max Strafe bei statischer Code-Analyse", - "description": "Wähle einen Wert zwischen 0 und 100 Prozent oder fülle das Feld nicht aus. Wenn für eine zehn-Punkte-Aufgabe die maximale Strafe 20% beträgt, werden maximal zwei Punkte durch Probleme, die von der statischen Analyse gefunden wurden, abgezogen. Wenn kein Wert angegeben wird existiert kein Limit für den Punkteabzug." + "description": "Wähle einen Wert zwischen 0 und 100 Prozent oder fülle das Feld nicht aus. Wenn für eine zehn-Punkte-Aufgabe die maximale Strafe 20 % beträgt, werden maximal zwei Punkte durch Probleme, die von der statischen Analyse gefunden wurden, abgezogen. Wenn kein Wert angegeben wird existiert kein Limit für den Punkteabzug." }, "recreateBuildPlans": { "title": "Build-Pläne neu erstellen", @@ -166,11 +183,11 @@ }, "importFromFile": { "title": "Programmieraufgabe aus Datei importieren", - "description": "Die Datei muss ein Zip-Archiv sein, das die Aufgabenkonfiguration im JSON Format auf der obersten Ebene enthält und für jedes Repository (template, solution, tests) ein Zip Archiv enthält. Eine solche Datei kann mit dem Aufgabenexport erstellt werden.", + "description": "Die Datei muss ein Zip-Archiv sein, das die Aufgabenkonfiguration im JSON-Format auf der obersten Ebene enthält und für jedes Repository (template, solution, tests) ein Zip-Archiv enthält. Eine solche Datei kann mit dem Aufgabenexport erstellt werden.", "uploadForImport": "Programmieraufgabe für den Import hochladen", "fileTooBigError": "Die Datei {{ fileName }} ist zu groß. Die maximale Dateigröße beträgt 20 MB.", "fileTypeNotSupportedError": "Der Dateityp wird nicht unterstützt. Bitte wähle eine Datei mit der Endung .zip.", - "noExerciseDetailsJsonAtRootLevel": "Es konnte keine .json-Datei im Wurzelverzeichnis des Zip-Archivs gefunden werden, die die Aufgabendetails enthält.", + "noExerciseDetailsJsonAtRootLevel": "Es konnte keine JSON-Datei im Wurzelverzeichnis des Zip-Archivs gefunden werden, die die Aufgabendetails enthält.", "notSupportedProgrammingLanguage": "Die Programmiersprache {{ programmingLanguage }} wird noch nicht für den Import aus einer Datei unterstützt.", "GccNotSupportedForC": "Der Projekttyp GCC wird noch nicht für den Import aus einer Datei unterstützt." }, @@ -197,18 +214,18 @@ "extractTasksFromProblemStatementWarning": "Nur zu Testzwecken: Extrahiere alle Aufgaben und Tests aus der Aufgabenstellung.", "extractTasksFromProblemStatementSuccess": "{{numberTasks}} extrahierte Aufgaben mit {{numberTestCases}} Tests geladen:\n{{detailedResult}}", "extractTasksFromProblemStatementTitle": "Lade extrahierte Aufgaben", - "deleteTasksAndSolutionEntriesSuccess": "Alle Aufgaben und Lösungs Codeschnipsel wurden gelöscht.", - "deleteTasksAndSolutionEntriesWarning": "Nur zu Testzwecken: Lösche alle Aufgaben und Lösungs Codeschnipsel.", + "deleteTasksAndSolutionEntriesSuccess": "Alle Aufgaben und Lösungs-Codeschnipsel wurden gelöscht.", + "deleteTasksAndSolutionEntriesWarning": "Nur zu Testzwecken: Lösche alle Aufgaben und Lösungs-Codeschnipsel.", "deleteTasksAndSolutionEntriesTitle": "Lösche Aufgaben", - "generateCodeHintsTooltip": "Generiert Code Hinweise für alle Tasks dieser Aufgabe unter Verwendung der bereits erstellten Lösungs Codeschnipsel", + "generateCodeHintsTooltip": "Generiert Code Hinweise für alle Tasks dieser Aufgabe unter Verwendung der bereits erstellten Lösungs-Codeschnipsel", "generateCodeHintsTitle": "Generiere Code Hinweise", "generateCodeHintsSuccess": "Code Hinweise wurden erfolgreich generiert", - "createStructuralSolutionEntriesTooltip": "Erstellt Lösungs Codeschnipsel für alle strukturellen Tests dieser Aufgabe.", - "createStructuralSolutionEntriesTitle": "Erstelle strukturelle Lösungs Codeschnipsel", - "createStructuralSolutionEntriesSuccess": "Strukturelle Lösungs Codeschnipsel wurden erfolgreich erstellt", - "createBehavioralSolutionEntriesTooltip": "Erstellt Lösungs Codeschnipsel für alle Verhaltenstests dieser Aufgabe.", - "createBehavioralSolutionEntriesTitle": "Erstelle verhaltensweise Lösungs Codeschnipsel", - "createBehavioralSolutionEntriesSuccess": "Verhaltensweise Lösungs Codeschnipsel wurden erfolgreich erstellt", + "createStructuralSolutionEntriesTooltip": "Erstellt Lösungs-Codeschnipsel für alle strukturellen Tests dieser Aufgabe.", + "createStructuralSolutionEntriesTitle": "Erstelle strukturelle Lösungs-Codeschnipsel", + "createStructuralSolutionEntriesSuccess": "Strukturelle Lösungs-Codeschnipsel wurden erfolgreich erstellt", + "createBehavioralSolutionEntriesTooltip": "Erstellt Lösungs-Codeschnipsel für alle Verhaltenstests dieser Aufgabe.", + "createBehavioralSolutionEntriesTitle": "Erstelle verhaltensweise Lösungs-Codeschnipsel", + "createBehavioralSolutionEntriesSuccess": "Verhaltensweise Lösungs-Codeschnipsel wurden erfolgreich erstellt", "editable": { "unsaved": "Ungespeichert.", "unsavedTooltip": "Es gibt ungespeicherte Änderungen in der Aufgabenstellung.", @@ -228,7 +245,7 @@ "templateFulfillsTest": "Das Template-Repository erfüllt bereits einen oder mehrere Testfälle. Das könnte auf ein Problem mit dem Template-Repository oder den Testfällen hinweisen." }, "testCaseAnalysis": { - "invalidTestCases": "{{number}} Testfälle sind Teil des Aufgabenstellung aber können nicht im Test-Repository gefunden werden:", + "invalidTestCases": "{{number}} Testfälle sind Teil der Aufgabenstellung aber können nicht im Test-Repository gefunden werden:", "missingTestCases": "{{number}} Testfälle wurde im Test-Repository gefunden, die nicht Teil der Aufgabenstellung sind:", "issues": "Testfallprobleme.", "ok": "Testfälle ok.", @@ -301,7 +318,7 @@ }, "testCasePoints": { "title": "Punkte-Verteilung", - "description": "Der prozentuale Anteil von verteilten Punkten für ein bestimmten Testfall. 100% in dem Diagramm steht für volle Punktzahl (100%) bei allen Studierenden. Das Diagramm zeigt nur die positiven Punkte erzielt durch erfüllte Testfälle, ungeachtet möglicher Punktabzüge durch statische Code-Analyse.
    Bewege die Maus über einen farbigen Abschnitt, um mehr Details zu sehen.", + "description": "Der prozentuale Anteil von verteilten Punkten für einen bestimmten Testfall. 100 % in dem Diagramm steht für volle Punktzahl (100 %) bei allen Studierenden. Das Diagramm zeigt nur die positiven Punkte erzielt durch erfüllte Testfälle, ungeachtet möglicher Punktabzüge durch statische Code-Analyse.
    Bewege die Maus über einen farbigen Abschnitt, um mehr Details zu sehen.", "points": "Punkte", "pointsTooltip": "Punkte: {{ percentage }}% aller Punkte." }, @@ -329,7 +346,7 @@ "testcase": "Testfall", "errorCategory": "Fehlerkategorie", "totalItems": "Insgesamt {{count}} Elemente", - "error": "Beim Laden des Feedback ist ein Fehler aufgetreten." + "error": "Beim Laden des Feedbacks ist ein Fehler aufgetreten." }, "help": { "name": "Aufgabennamen werden fett geschrieben, während Testnamen normal sind. Ob es ein Aufgabenname oder Testname ist hängt davon ab, ob die Reihe eine Aufgabe oder einen Test darstellt.", @@ -338,8 +355,8 @@ "maxPenalty": "Der maximale Punktabzug über alle Issues einer/s Studierenden in dieser Kategorie.", "detectedIssues": "Zeigt die Anzahl an Studierenden je Höhe der erkannten Issues in einer Kategorie, beginnend bei einem Issue. Die Balken werden rot, sobald der durch maxPenalty definierte Grenzwert der Kategorie überschritten wird.", "weight": "Gewichtung: Die Gewichtung eines Testfalls bestimmt die Punkte, die Studierende für das Bestehen des Testfalls erhält. Die verteilten Punkte eines Testfalls sind proportional zu dessen Gewichtung und werden als ein Anteil der vollen Punktzahl der Aufgabe berechnet.", - "bonusMultiplier": "Bonusmultiplikator: Dies multipliziert die Punkte für das Bestehen eines Testfalls, ohne dabei die Anteile der anderen Testfälle zu beeinflussen. Multiplikatoren größer als 1 können zu Ergebnissen von mehr als 100% führen.", - "bonusPoints": "Bonuspunkte: Zusätzliche Punkte, die zu den regulären Punkten für das Bestehen eines Testfalls hinzuaddiert werden. Das Setzen von Bonuspunkten kann zu Ergebnissen von mehr als 100% führen.", + "bonusMultiplier": "Bonusmultiplikator: Dies multipliziert die Punkte für das Bestehen eines Testfalls, ohne dabei die Anteile der anderen Testfälle zu beeinflussen. Multiplikatoren größer als 1 können zu Ergebnissen von mehr als 100 % führen.", + "bonusPoints": "Bonuspunkte: Zusätzliche Punkte, die zu den regulären Punkten für das Bestehen eines Testfalls hinzuaddiert werden. Das Setzen von Bonuspunkten kann zu Ergebnissen von mehr als 100 % führen.", "visibility": "Feedback und Punkte für Testfälle, die mit „Nach Einreichungsfrist“ markiert sind, werden erst danach für Studierende angezeigt. Nie sichtbare Tests werden nicht in die Punktebewertung einbezogen.", "visibilityExam": "Feedback und Punkte für Testfälle, die mit „Nach Veröffentlichung der Ergebnisse“ markiert sind, werden erst nach der Veröffentlichung der Klausurergebnisse angezeigt. Nie sichtbare Tests werden nicht in die Punktebewertung einbezogen.", "points": "Die Menge an Punkten, die die Studierenden für das Bestehen dieses Tests bekommen. Dieser Wert wird wie in den Kurseinstellungen festgelegt gerundet.", diff --git a/src/main/webapp/i18n/de/programmingExerciseTestCase.json b/src/main/webapp/i18n/de/programmingExerciseTestCase.json index 650a9dab549a..ff110e9b50c6 100644 --- a/src/main/webapp/i18n/de/programmingExerciseTestCase.json +++ b/src/main/webapp/i18n/de/programmingExerciseTestCase.json @@ -2,22 +2,22 @@ "artemisApp": { "programmingExerciseTestCase": { "home": { - "title": "Programming Exercise Test Cases", - "createLabel": "Programming Exercise Test Case erstellen" + "title": "Testfälle für Programmieraufgabe", + "createLabel": "Programmingaufgabentestfall erstellen" }, - "created": "Programming Exercise Test Case erstellt mit ID {{ param }}", - "updated": "Programming Exercise Test Case aktualisiert mit ID {{ param }}", - "deleted": "Programming Exercise Test Case gelöscht mit ID {{ param }}", + "created": "Programmingaufgabentestfall erstellt mit ID {{ param }}", + "updated": "Programmingaufgabentestfall aktualisiert mit ID {{ param }}", + "deleted": "Programmingaufgabentestfall gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Programming Exercise Test Case {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Programmingaufgabentestfall {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Programming Exercise Test Case" + "title": "Programmingaufgabentestfall" }, - "testName": "Test Name", - "weight": "Weight", - "active": "Active", - "exercise": "Exercise", + "testName": "Testname", + "weight": "Breite", + "active": "Aktiv", + "exercise": "Aufgabe", "visibility": { "Always": "Immer", "AfterDueDate": "Nach Einreichungsfrist", diff --git a/src/main/webapp/i18n/de/quizExercise.json b/src/main/webapp/i18n/de/quizExercise.json index 3ede02b8ae3e..aa444778ac1c 100644 --- a/src/main/webapp/i18n/de/quizExercise.json +++ b/src/main/webapp/i18n/de/quizExercise.json @@ -3,7 +3,7 @@ "quizWarning": { "title": "Achtung!", "question": "Mögliche Leistungsprobleme", - "description": "Du verwendest in dieser Quizaufgabe eine sehr große Anzahl an Short-Answer Elementen und/oder Drag-and-Drop Elementen. Dies kann zu erheblichen Performancebeeinträchtigungen führen. Bist du sicher, dass du die Aufgabe so speichern möchtest?", + "description": "Du verwendest in dieser Quizaufgabe eine sehr große Anzahl an Kurzantwortelementen und/oder Drag-and-Drop Elementen. Dies kann zu erheblichen Performancebeeinträchtigungen führen. Bist du sicher, dass du die Aufgabe so speichern möchtest?", "confirmButton": "Trotzdem speichern" }, "quizExercise": { @@ -12,14 +12,14 @@ "createLabel": "Quiz erstellen", "editLabel": "Quiz bearbeiten", "importLabel": "Quiz importieren", - "createModelDragAndDrop": "Drag-And-Drop Model Quiz erstellen", + "createModelDragAndDrop": "Drag-and-Drop Model Quiz erstellen", "exportLabel": "Quizübungen exportieren" }, "detail": { "title": "Quiz Aufgabe", "questionCount": { "title": "Fragenanzahl", - "value": "Multiple Choice: {{ mcCount }}, Drag And Drop: {{ dndCount }}, Kurz Antwort: {{ shortCount }}" + "value": "Multiple Choice: {{ mcCount }}, Drag-and-Drop: {{ dndCount }}, Kurzantwort: {{ shortCount }}" } }, "created": "Quiz erstellt mit ID {{ param }}", @@ -55,8 +55,8 @@ }, "filter": { "mcq": "Multiple-Choice Frage", - "dnd": "Drag-And-Drop Frage", - "sa": "Short-Answer Frage", + "dnd": "Drag-and-Drop Frage", + "sa": "Kurzantwort-Frage", "applyFilter": "Filter anwenden" }, "quizStatus": { @@ -89,12 +89,12 @@ "noQuestionsFoundExam": "Keine Fragen in Klausur gefunden", "noMatchingQuestionsFound": "Keine Fragen des Kurses entsprechen den Suchkriterien", "multipleChoiceQuestion": "Multiple-Choice Frage", - "dragAndDropQuestion": "Drag-And-Drop Frage", - "shortAnswerQuestion": "Short-Answer Frage", + "dragAndDropQuestion": "Drag-and-Drop Frage", + "shortAnswerQuestion": "Kurzantwort-Frage", "addMultipleChoiceQuestion": "Multiple-Choice Frage hinzufügen", - "addDragAndDropQuestion": "Drag-And-Drop Frage hinzufügen", - "addShortAnswerQuestion": "Short-Answer Frage hinzufügen", - "addApollonDragAndDropQuestion": "Apollon Drag-And-Drop Frage hinzufügen", + "addDragAndDropQuestion": "Drag-and-Drop Frage hinzufügen", + "addShortAnswerQuestion": "Kurzantwort-Frage hinzufügen", + "addApollonDragAndDropQuestion": "Apollon Drag-and-Drop Frage hinzufügen", "addExistingQuestions": "Vorhandene Fragen hinzufügen", "fromAFile": "Aus einer Datei", "fromACourse": "Von einem Kurs", @@ -157,8 +157,8 @@ "resetQuestion": "Frage zurücksetzen", "resetQuestionTitle": "Fragentitel zurücksetzen", "resetQuestionText": "Fragentext zurücksetzen", - "resetAnswer": "Reset Answer", - "deleteAnswer": "Delete Answer", + "resetAnswer": "Antwort zurücksetzen", + "deleteAnswer": "Antwort löschen", "moveUp": "Frage nach oben verschieben", "moveDown": "Frage nach unten verschieben", "warning": { @@ -175,7 +175,7 @@ "question_invalid": "Frage ungültig gesetzt:", "scoring_change": "Bewertungsart verändert:", "no_changes": "Keine Änderungen, welche die bestehenden Ergebnisse beeinflussen", - "quizStatistic": "Die bestehende Statistiken müssen neu berechnet werden!", + "quizStatistic": "Die bestehenden Statistiken müssen neu berechnet werden!", "results": "Die bestehenden Ergebnisse müssen neu berechnet werden!", "exam": "Dieses Quiz ist eine Klausuraufgabe. Stelle sicher, dass das Quiz bereits evaluiert wurde bevor eine Überarbeitung vorgenommen wird!", "resulttext": { @@ -230,7 +230,7 @@ }, "scoringTypeExplanation": { "title": "Bewertungstypen", - "all_or_nothing": "Alle richtigen Auswahlmöglichkeiten müssen ausgewählt werden und alle falschen Auswahlmöglichkeiten müssen leer bleiben, um die volle Punktzahl zu erreichen. Wird eine falsche Antwortmöglichkeit ausgewählt gibt es 0 Punkte. Es gibt keine Punktzahl dazwischen.", + "all_or_nothing": "Alle richtigen Auswahlmöglichkeiten müssen ausgewählt werden und alle falschen Auswahlmöglichkeiten müssen leer bleiben, um die volle Punktzahl zu erreichen. Wird eine falsche Antwortmöglichkeit ausgewählt, gibt es 0 Punkte. Es gibt keine Punktzahl dazwischen.", "proportional_with_penalty": "Jede richtige Antwort führt zu einem Bruchteil der Gesamtpunktzahl. Um Rätselraten zu vermeiden, wird für jeden Fehler der gleiche Anteil von den erreichten Punkten abgezogen. Beispiel: Wenn die Punktzahl der Frage 3 ist und es 5 Optionen gibt, ergibt jede richtige Antwortmöglichkeit 0,6 Punkte. Jede falsche Antwortmöglichkeit zieht 0,6 Punkte ab. Studierende mit 3 richtigen und 2 falschen Antworten erhalten dann 0,6 Punkte.", "proportional_without_penalty": "Jede richtige Antwort führt zu einem Bruchteil der Gesamtpunktzahl. Bei falschen Antworten werden keine Punkte abgezogen. Beispiel: Wenn die Punktzahl der Frage 3 ist und es 5 Optionen gibt, ergibt jede richtige Antwortmöglichkeit 0,6 Punkte. Studierende mit 3 richtigen und 2 falschen Antworten erhalten dann 1,8 Punkte." }, diff --git a/src/main/webapp/i18n/de/quizPointStatistic.json b/src/main/webapp/i18n/de/quizPointStatistic.json index c1d649f82ea6..1b78b3db05c5 100644 --- a/src/main/webapp/i18n/de/quizPointStatistic.json +++ b/src/main/webapp/i18n/de/quizPointStatistic.json @@ -2,19 +2,19 @@ "artemisApp": { "quizPointStatistic": { "home": { - "title": "Quiz Point Statistics", - "createLabel": "Quiz Point Statistic erstellen" + "title": "Quiz Punktestatistiken", + "createLabel": "Quiz Punktestatistik erstellen" }, - "created": "Quiz Point Statistic erstellt mit ID {{ param }}", - "updated": "Quiz Point Statistic aktualisiert mit ID {{ param }}", - "deleted": "Quiz Point Statistic gelöscht mit ID {{ param }}", + "created": "Quiz Punktestatistik erstellt mit ID {{ param }}", + "updated": "Quiz Punktestatistik aktualisiert mit ID {{ param }}", + "deleted": "Quiz Punktestatistik gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Quiz Point Statistic {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Quiz Punktestatistik {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Quiz Point Statistic" + "title": "Quiz Punktestatistik " }, - "pointCounters": "Point Counters", + "pointCounters": "Punktzähler", "quiz": "Quiz" } } diff --git a/src/main/webapp/i18n/de/quizQuestionStatistic.json b/src/main/webapp/i18n/de/quizQuestionStatistic.json index 377ee1dfaa27..7339e309143d 100644 --- a/src/main/webapp/i18n/de/quizQuestionStatistic.json +++ b/src/main/webapp/i18n/de/quizQuestionStatistic.json @@ -2,21 +2,21 @@ "artemisApp": { "quizQuestionStatistic": { "home": { - "title": "Question Statistics", - "createLabel": "Question Statistic erstellen" + "title": "Fragestatistiken", + "createLabel": "Fragestatistik erstellen" }, - "created": "Question Statistic erstellt mit ID {{ param }}", - "updated": "Question Statistic aktualisiert mit ID {{ param }}", - "deleted": "Question Statistic gelöscht mit ID {{ param }}", + "created": "Fragestatistik erstellt mit ID {{ param }}", + "updated": "Fragestatistik aktualisiert mit ID {{ param }}", + "deleted": "Fragestatistik gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Question Statistic {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Fragestatistik {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Question Statistic" + "title": "Fragestatistik" }, "ratedCorrectCounter": "Rated Correct Counter", "unRatedCorrectCounter": "Un-Rated Correct Counter", - "question": "Question" + "question": "Frage" } } } diff --git a/src/main/webapp/i18n/de/quizStatistic.json b/src/main/webapp/i18n/de/quizStatistic.json index 793526c2fc01..639487fe8eae 100644 --- a/src/main/webapp/i18n/de/quizStatistic.json +++ b/src/main/webapp/i18n/de/quizStatistic.json @@ -2,17 +2,17 @@ "artemisApp": { "quizStatistic": { "home": { - "title": "Statistics", - "createLabel": "Statistic erstellen" + "title": "Statistiken", + "createLabel": "Statistik erstellen" }, - "created": "Statistic erstellt mit ID {{ param }}", - "updated": "Statistic aktualisiert mit ID {{ param }}", - "deleted": "Statistic gelöscht mit ID {{ param }}", + "created": "Statistik erstellt mit ID {{ param }}", + "updated": "Statistik aktualisiert mit ID {{ param }}", + "deleted": "Statistik gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Statistic {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Statistik {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Statistic" + "title": "Statistik" }, "released": "Released", "participantsRated": "Participants Rated", diff --git a/src/main/webapp/i18n/de/quizStatisticCounter.json b/src/main/webapp/i18n/de/quizStatisticCounter.json index ff08a868de50..4c2c67796f24 100644 --- a/src/main/webapp/i18n/de/quizStatisticCounter.json +++ b/src/main/webapp/i18n/de/quizStatisticCounter.json @@ -2,17 +2,17 @@ "artemisApp": { "quizStatisticCounter": { "home": { - "title": "Statistic Counters", - "createLabel": "Statistic Counter erstellen" + "title": "Statistikzähler", + "createLabel": "Statistikzähler erstellen" }, - "created": "Statistic Counter erstellt mit ID {{ param }}", - "updated": "Statistic Counter aktualisiert mit ID {{ param }}", - "deleted": "Statistic Counter gelöscht mit ID {{ param }}", + "created": "Statistikzähler erstellt mit ID {{ param }}", + "updated": "Statistikzähler aktualisiert mit ID {{ param }}", + "deleted": "Statistikzähler gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Statistic Counter {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Statistikzähler {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Statistic Counter" + "title": "Statistikzähler" }, "ratedCounter": "Rated Counter", "unRatedCounter": "Un Rated Counter" diff --git a/src/main/webapp/i18n/de/reset.json b/src/main/webapp/i18n/de/reset.json index 572a8f89811c..11f9b1835351 100644 --- a/src/main/webapp/i18n/de/reset.json +++ b/src/main/webapp/i18n/de/reset.json @@ -8,11 +8,11 @@ }, "messages": { "info": "Gib die E-Mail-Adresse ein, die du bei der Registrierung verwendest hast oder deinen Login.", - "success": "Eine E-Mail mit weiteren Instruktionen für das Zurücksetzen des Passworts wurde gesendet. Aus Sicherheitsgründen erscheint dieser Hinweis auch wenn der angegebene Account nicht existiert. Überprüfe deine Eingabe, wenn du keine E-Mail erhältst." + "success": "Eine E-Mail mit weiteren Instruktionen für das Zurücksetzen des Passworts wurde gesendet. Aus Sicherheitsgründen erscheint dieser Hinweis, auch wenn der angegebene Account nicht existiert. Überprüfe deine Eingabe, wenn du keine E-Mail erhältst." }, "external": { - "explanation": "Deine Zugangsdaten sind nicht in Artemis sondern in {{provider}} gespeichert.", - "noLink": "Die Links zur Passwortzurücksetzung für {{provider}} wurden nicht eingestellt. Bitte benachrichtige den Administrator. Wenn du weißt wie du dein Passwort für {{provider}} zurücksetzen kannst, kannst du es selbst machen.", + "explanation": "Deine Zugangsdaten sind nicht in Artemis, sondern in {{provider}} gespeichert.", + "noLink": "Die Links zur Passwortzurücksetzung für {{provider}} wurden nicht eingestellt. Bitte benachrichtige den Administrator. Wenn du weißt, wie du dein Passwort für {{provider}} zurücksetzen kannst, kannst du es selbst machen.", "hint": "Bitte setz dein Passwort über diesen Link zurück:", "generalHint": "Wenn du Zugangsdaten von {{provider}} nutzt statt von Artemis, bitte setz dein Passwort hier zurück:", "linkTitle": "Passwort Zurücksetzen", diff --git a/src/main/webapp/i18n/de/result.json b/src/main/webapp/i18n/de/result.json index e414943fe65e..933db7e69593 100644 --- a/src/main/webapp/i18n/de/result.json +++ b/src/main/webapp/i18n/de/result.json @@ -13,7 +13,7 @@ "question2": "Soll die Bewertung wirklich gelöscht werden? Es kann nicht rückgängig gemacht werden!", "buttonText": "Löschen", "error": { - "hasComplaint": "Eine Bewertung kann nicht gelöscht werden wenn es zu ihr eine Beschwerde gibt!" + "hasComplaint": "Eine Bewertung kann nicht gelöscht werden, wenn es zu ihr eine Beschwerde gibt!" } }, "detail": { @@ -92,13 +92,14 @@ "preliminary": "vorläufig", "preliminaryTooltip": "Dein Ergebnis ist noch nicht endgültig, weil weitere Tests nach der Einreichungsfrist ausgeführt werden.", "preliminaryTooltipSemiAutomatic": "Dein Ergebnis ist noch nicht endgültig, weil weitere Tests nach der Einreichungsfrist ausgeführt werden oder eine manuelle Bewertung aussteht.", + "preliminaryTooltipAthena": "Dies ist eine KI-Bewertung. Das tatsächliche Ergebnis kann abweichen.", "codeIssuesTooltip": "Die automatische Codeanalyse hat Codeissues gefunden.", "noResultDetails": "Keine weiteren Informationen verfügbar für dieses Ergebnis.", "onlyCompilationTested": "Dein Code kompiliert erfolgreich. Derzeit sind keine Testfälle sichtbar.", "chart": { "points": "Punkte", "deductions": "Abzüge", - "tooltip": "Deine Punktabzüge werden begrenzt um den Einfluss von Folgefehlern durch Code-Issues abzuschwächen. Beachte, dass du gegebenenfalls mehrere Code-Issues lösen musst, bevor sich deine Punkte erhöhen.", + "tooltip": "Deine Punktabzüge werden begrenzt, um den Einfluss von Folgefehlern durch Code-Issues abzuschwächen. Beachte, dass du gegebenenfalls mehrere Code-Issues lösen musst, bevor sich deine Punkte erhöhen.", "filterApplied": "Das Feedback ist gefiltert.", "reset": "Zurücksetzen" }, @@ -114,7 +115,7 @@ "notLatestSubmission": "Hinweis: Dieses Ergebnis und Feedback bezieht sich nicht auf die letzte Einreichung.", "seeMore": "Mehr anzeigen", "noFeedback": "Kein Feedback verfügbar", - "afterDueDateFeedbackHidden": "Auch nach der Einreichungsfrist werden Detailfeedbacks nicht zu allen Testfällen angezeigt. Dies ist etwa der Fall wenn für andere Studierende eine spätere Einreichungsfrist gesetzt ist (z.B. zum Ausgleich von Krankheitstagen). Alle Feedbacks werden automatisch am {{date}} sichtbar sein.", + "afterDueDateFeedbackHidden": "Auch nach der Einreichungsfrist werden Detailfeedbacks nicht zu allen Testfällen angezeigt. Dies ist etwa der Fall, wenn für andere Studierende eine spätere Einreichungsfrist gesetzt ist (z.B. zum Ausgleich von Krankheitstagen). Alle Feedbacks werden automatisch am {{date}} sichtbar sein.", "testCount": "Du hast {{passed}} von {{total}} Tests bestanden.", "notExecutedTests": "{{numberOfNotExecutedTests}} Tests wurden nicht ausgeführt.", "notExecutedTestsTooltip": "Diese Tests werden eventuell nur nach der Einreichungsfrist ausgeführt oder es gab ein Problem während der Ausführung der Tests.", diff --git a/src/main/webapp/i18n/de/shortAnswerMapping.json b/src/main/webapp/i18n/de/shortAnswerMapping.json index 2963047b55c5..ffb4ff79ef54 100644 --- a/src/main/webapp/i18n/de/shortAnswerMapping.json +++ b/src/main/webapp/i18n/de/shortAnswerMapping.json @@ -2,24 +2,24 @@ "artemisApp": { "shortAnswerMapping": { "home": { - "title": "Short Answer Mappings", - "createLabel": "Short Answer Mapping erstellen" + "title": "Kurzantwort-Zuordnungen", + "createLabel": "Kurzantwort-Zuordnung erstellen" }, - "created": "Short Answer Mapping erstellt mit ID {{ param }}", - "updated": "Short Answer Mapping aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Mapping gelöscht mit ID {{ param }}", + "created": "Kurzantwort-Zuordnung erstellt mit ID {{ param }}", + "updated": "Kurzantwort-Zuordnung aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort-Zuordnung gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Mapping {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort-Zuordnung {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Mapping" + "title": "Kurzantwort-Zuordnung" }, - "shortAnswerSpotIndex": "Short Answer Spot Index", - "shortAnswerSolutionIndex": "Short Answer Solution Index", - "invalid": "Invalid", + "shortAnswerSpotIndex": "Kurzantwort-Spot-Index", + "shortAnswerSolutionIndex": "Kurzantwort-Lösungsindex", + "invalid": "Ungültig", "solution": "Lösung", "spot": "Spot", - "question": "Question" + "question": "Frage" } } } diff --git a/src/main/webapp/i18n/de/shortAnswerQuestion.json b/src/main/webapp/i18n/de/shortAnswerQuestion.json index 38cce8e53cf6..302f50fb4a40 100644 --- a/src/main/webapp/i18n/de/shortAnswerQuestion.json +++ b/src/main/webapp/i18n/de/shortAnswerQuestion.json @@ -2,21 +2,21 @@ "artemisApp": { "shortAnswerQuestion": { "home": { - "title": "Short Answer Questions", - "createLabel": "Short Answer Question erstellen" + "title": "Kurzantwort-Fragen", + "createLabel": "Kurzantwort-Frage erstellen" }, - "created": "Short Answer Question erstellt mit ID {{ param }}", - "updated": "Short Answer Question aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Question gelöscht mit ID {{ param }}", + "created": "Kurzantwort-Frage erstellt mit ID {{ param }}", + "updated": "Kurzantwort-Frage aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort-Frage gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Question {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort-Frage {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Question" + "title": "Kurzantwort-Frage" }, "spots": "Spots", "solutions": "Lösungen", - "correctMappings": "Korrekte Mappings", + "correctMappings": "Korrekte Zuordnung", "editor": { "addHint": "[hint] Hinweis", diff --git a/src/main/webapp/i18n/de/shortAnswerQuestionStatistic.json b/src/main/webapp/i18n/de/shortAnswerQuestionStatistic.json index ca9ab059a80b..145a1bb2ae28 100644 --- a/src/main/webapp/i18n/de/shortAnswerQuestionStatistic.json +++ b/src/main/webapp/i18n/de/shortAnswerQuestionStatistic.json @@ -2,19 +2,19 @@ "artemisApp": { "shortAnswerQuestionStatistic": { "home": { - "title": "Short Answer Question Statistics", - "createLabel": "Short Answer Question Statistic erstellen" + "title": "Kurzantwort-Fragestatistiken", + "createLabel": "Kurzantwort-Fragestatistik erstellen" }, - "created": "Short Answer Question Statistic erstellt mit ID {{ param }}", - "updated": "Short Answer Question Statistic aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Question Statistic gelöscht mit ID {{ param }}", + "created": "Kurzantwort-Fragestatistik erstellt mit ID {{ param }}", + "updated": "Kurzantwort-Fragestatistik aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort-Fragestatistik gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Question Statistic {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort-Fragestatistik {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Question Statistic" + "title": "Kurzantwort-Fragestatistik" }, - "shortAnswerSpotCounters": "Short Answer Spot Counters" + "shortAnswerSpotCounters": "Kurzantwort-Spot-Zähler" } } } diff --git a/src/main/webapp/i18n/de/shortAnswerSolution.json b/src/main/webapp/i18n/de/shortAnswerSolution.json index 61e3a2b38bc7..2dd93863f922 100644 --- a/src/main/webapp/i18n/de/shortAnswerSolution.json +++ b/src/main/webapp/i18n/de/shortAnswerSolution.json @@ -2,21 +2,21 @@ "artemisApp": { "shortAnswerSolution": { "home": { - "title": "Short Answer Solutions", - "createLabel": "Short Answer Solution erstellen" + "title": "Kurzantwort-Lösungen", + "createLabel": "Kurzantwort-Lösung erstellen" }, - "created": "Short Answer Solution erstellt mit ID {{ param }}", - "updated": "Short Answer Solution aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Solution gelöscht mit ID {{ param }}", + "created": "Kurzantwort-Lösung erstellt mit ID {{ param }}", + "updated": "Kurzantwort-Lösung aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort-Lösung gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Solution {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort-Lösung {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Solution" + "title": "Kurzantwort-Lösung " }, "text": "Text", - "invalid": "Invalid", - "question": "Question" + "invalid": "Ungültig", + "question": "Frage" } } } diff --git a/src/main/webapp/i18n/de/shortAnswerSpot.json b/src/main/webapp/i18n/de/shortAnswerSpot.json index aefc63a128eb..7de7eace932f 100644 --- a/src/main/webapp/i18n/de/shortAnswerSpot.json +++ b/src/main/webapp/i18n/de/shortAnswerSpot.json @@ -2,21 +2,21 @@ "artemisApp": { "shortAnswerSpot": { "home": { - "title": "Short Answer Spots", - "createLabel": "Short Answer Spot erstellen" + "title": "Kurzantwort-Spots", + "createLabel": "Kurzantwort-Spot erstellen" }, - "created": "Short Answer Spot erstellt mit ID {{ param }}", - "updated": "Short Answer Spot aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Spot gelöscht mit ID {{ param }}", + "created": "Kurzantwort-Spot erstellt mit ID {{ param }}", + "updated": "Kurzantwort-Spot aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort-Spot gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Spot {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort-Spot {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Spot" + "title": "Kurzantwort-Spot" }, - "width": "Width", - "invalid": "Invalid", - "question": "Question", + "width": "Breite", + "invalid": "Ungültig", + "question": "Frage", "invalidSpot": "Dieses Eingabefeld wurde als ungültig markiert. Die eingesetzte Lösung wird als korrekt gewertet." } } diff --git a/src/main/webapp/i18n/de/shortAnswerSpotCounter.json b/src/main/webapp/i18n/de/shortAnswerSpotCounter.json index 0579bc18f785..9ee324d7d110 100644 --- a/src/main/webapp/i18n/de/shortAnswerSpotCounter.json +++ b/src/main/webapp/i18n/de/shortAnswerSpotCounter.json @@ -2,20 +2,20 @@ "artemisApp": { "shortAnswerSpotCounter": { "home": { - "title": "Short Answer Spot Counters", - "createLabel": "Short Answer Spot Counter erstellen" + "title": "Kurzantwort-Spot-Zähler", + "createLabel": "Kurzantwort-Spot-Zähler erstellen" }, - "created": "Short Answer Spot Counter erstellt mit ID {{ param }}", - "updated": "Short Answer Spot Counter aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Spot Counter gelöscht mit ID {{ param }}", + "created": "Kurzantwort-Spot-Zähler erstellt mit ID {{ param }}", + "updated": "Kurzantwort-Spot-Zähler aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort-Spot-Zähler gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Spot Counter {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort-Spot-Zähler {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Spot Counter" + "title": "Kurzantwort-Spot-Zähler" }, "spot": "Spot", - "shortAnswerQuestionStatistic": "Short Answer Question Statistic" + "shortAnswerQuestionStatistic": "Kurzantwort-Fragestatistik" } } } diff --git a/src/main/webapp/i18n/de/shortAnswerSubmittedAnswer.json b/src/main/webapp/i18n/de/shortAnswerSubmittedAnswer.json index 079ad2cf35ba..f033640cf562 100644 --- a/src/main/webapp/i18n/de/shortAnswerSubmittedAnswer.json +++ b/src/main/webapp/i18n/de/shortAnswerSubmittedAnswer.json @@ -2,19 +2,19 @@ "artemisApp": { "shortAnswerSubmittedAnswer": { "home": { - "title": "Short Answer Submitted Answers", - "createLabel": "Short Answer Submitted Answer erstellen" + "title": "Kurzantwort eingereichte Antworten", + "createLabel": "Kurzantwort eingereichte Antwort erstellen" }, - "created": "Short Answer Submitted Answer erstellt mit ID {{ param }}", - "updated": "Short Answer Submitted Answer aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Submitted Answer gelöscht mit ID {{ param }}", + "created": "Kurzantwort eingereichte Antwort erstellt mit ID {{ param }}", + "updated": "Kurzantwort eingereichte Antwort aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort eingereichte Antwort gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Submitted Answer {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort eingereichte Antwort {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Submitted Answer" + "title": "Kurzantwort eingereichte Antwort " }, - "submittedTexts": "Submitted Texts" + "submittedTexts": "Eingereichte Texte" } } } diff --git a/src/main/webapp/i18n/de/shortAnswerSubmittedText.json b/src/main/webapp/i18n/de/shortAnswerSubmittedText.json index beb1e63991c3..fd72ab3c789f 100644 --- a/src/main/webapp/i18n/de/shortAnswerSubmittedText.json +++ b/src/main/webapp/i18n/de/shortAnswerSubmittedText.json @@ -2,21 +2,21 @@ "artemisApp": { "shortAnswerSubmittedText": { "home": { - "title": "Short Answer Submitted Texts", - "createLabel": "Short Answer Submitted Text erstellen" + "title": "Kurzantwort eingereichte Texte", + "createLabel": "Kurzantwort eingereichten Text erstellen" }, - "created": "Short Answer Submitted Text erstellt mit ID {{ param }}", - "updated": "Short Answer Submitted Text aktualisiert mit ID {{ param }}", - "deleted": "Short Answer Submitted Text gelöscht mit ID {{ param }}", + "created": "Kurzantwort eingereichten Text erstellt mit ID {{ param }}", + "updated": "Kurzantwort eingereichten Text aktualisiert mit ID {{ param }}", + "deleted": "Kurzantwort eingereichten Text gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Short Answer Submitted Text {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Kurzantwort eingereichten Text {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Short Answer Submitted Text" + "title": "Kurzantwort eingereichten Text" }, "text": "Text", "spot": "Spot", - "submittedAnswer": "Submitted Answer" + "submittedAnswer": "Eingreichte Antwort" } } } diff --git a/src/main/webapp/i18n/de/standardizedCompetency.json b/src/main/webapp/i18n/de/standardizedCompetency.json index 756e2169167c..38f72affdf8d 100644 --- a/src/main/webapp/i18n/de/standardizedCompetency.json +++ b/src/main/webapp/i18n/de/standardizedCompetency.json @@ -52,15 +52,15 @@ }, "format": { "title": "Benötigtes Dateiformat", - "text1": "Standardisierte Kompetenzen können aus einer .json-Datei in Artemis hinein importiert werden. Nachdem du eine Datei ausgewählt hast, kannst du noch überprüfen, ob die Wissensgebiete und Kompetenzen korrekt ausgelesen wurden.", - "text2": "Die .json-Datei muss ein Objekt mit den Schlüsseln knowledgeAreas und sources enthalten. Ersteres enthält alle zu importierenden Wissensgebiete und standardisierten Kompetenzen, letzteres alle Quellen der importierten Kompetenzen.", + "text1": "Standardisierte Kompetenzen können aus einer JSON-Datei in Artemis hinein importiert werden. Nachdem du eine Datei ausgewählt hast, kannst du noch überprüfen, ob die Wissensgebiete und Kompetenzen korrekt ausgelesen wurden.", + "text2": "Die JSON-Datei muss ein Objekt mit den Schlüsseln knowledgeAreas und sources enthalten. Ersteres enthält alle zu importierenden Wissensgebiete und standardisierten Kompetenzen, letzteres alle Quellen der importierten Kompetenzen.", "text3": "Beispiel für eine gültige Importdatei ( bis auf die Kommentare):" }, "error": { "fileCount": "Bitte lade nur eine Datei hoch", "fileTooBig": "Die Datei ist zu groß. Bitte lade eine Datei mit maximal 20 MB hoch", - "fileExtension": "Falscher Dateityp. Bitte lade eine .json Datei hoch", - "fileSyntax": "Die Datei kann nicht verarbeitet werden. Bitte lade eine Datei mit gültiger .json-Syntax hoch", + "fileExtension": "Falscher Dateityp. Bitte lade eine JSON-Datei hoch", + "fileSyntax": "Die Datei kann nicht verarbeitet werden. Bitte lade eine Datei mit gültiger JSON-Syntax hoch", "fileStructure": "Die Datei kann nicht verarbeitet werden. Bitte überprüfe, ob die erforderliche Dateistruktur eingehalten wird" }, "success": "Erfolgreich alle standardisierte Kompetenzen und Wissensgebiete importiert" diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json index 89729023ff10..5906220b4d8a 100644 --- a/src/main/webapp/i18n/de/student-dashboard.json +++ b/src/main/webapp/i18n/de/student-dashboard.json @@ -4,6 +4,7 @@ "title": "Deine aktuellen Kurse", "recentlyAccessed": "Zuletzt besuchte Kurse", "otherCourses": "Andere Kurse", + "sort": "Sortieren", "noCourses": "Du bist in keinem Kurs eingeschrieben. Schreibe dich manuell ein oder kontaktiere die Lehrenden.", "exerciseTitle": "Aktuelle aktive Übung von \"{{ course }}\"", "exerciseTitleWithoutDueDate": "Aktuelle Übung von \"{{ course }}\":", @@ -11,7 +12,11 @@ "cardTitle": "Deine insgesamte Punktzahl:", "noStatistics": "Keine Statistik verfügbar", "cardNoExerciseLabel": "Keine Übung geplant", - "cardExerciseLabel": "Nächste Übung:", + "cardExerciseLabel": "Nächste Übung", + "points": "{{ totalAbsoluteScore }} / {{ totalReachableScore }} Punkte", + "cardScore": "Punktzahl", + "cardManageCourse": "Kurs Verwalten", + "noCoursesFound": "Keine Kurse gefunden", "enroll": { "title": "Kurseinschreibung", "enrollSuccessful": "Einschreibung erfolgreich", @@ -65,7 +70,7 @@ "examChannels": "Klausuren", "createChannel": "Kanal erstellen", "browseChannels": "Kanäle durchsuchen", - "groupChats": "Gruppen-Chats", + "groupChats": "Gruppenchats", "directMessages": "Direktnachrichten", "filterConversationPlaceholder": "Konversationen filtern" }, @@ -88,7 +93,8 @@ "testExam": "Testklausur", "communication": "Kommunikation", "plagiarismCases": "Plagiatsfälle", - "gradingSystem": "Notenschlüssel" + "gradingSystem": "Notenschlüssel", + "faq": "FAQ" }, "exerciseFilter": { "filter": "Filter", diff --git a/src/main/webapp/i18n/de/studentAnalyticsDashboard.json b/src/main/webapp/i18n/de/studentAnalyticsDashboard.json index e51b33208111..7829714b8372 100644 --- a/src/main/webapp/i18n/de/studentAnalyticsDashboard.json +++ b/src/main/webapp/i18n/de/studentAnalyticsDashboard.json @@ -10,7 +10,7 @@ "progress": "Fortschritt: {{ progress }}%", "lectureProgress": "Vorlesungsfortschritt: {{ progress }}%", "exerciseProgress": "Aufgabenfortschritt: {{ progress }}%", - "congratulations": "Herzlichen Glückwunsch! Du hast alle freigegebenen Aktivitäten in dieser Kompetenz zu mindestens 80% abgeschlossen 🎉" + "congratulations": "Herzlichen Glückwunsch! Du hast alle freigegebenen Aktivitäten in dieser Kompetenz zu mindestens 80 % abgeschlossen 🎉." }, "button": { "showLearningPath": "Lernpfad anzeigen", diff --git a/src/main/webapp/i18n/de/submittedAnswer.json b/src/main/webapp/i18n/de/submittedAnswer.json index 8ee1f3f3eb26..1f1e7cedb8a8 100644 --- a/src/main/webapp/i18n/de/submittedAnswer.json +++ b/src/main/webapp/i18n/de/submittedAnswer.json @@ -2,21 +2,21 @@ "artemisApp": { "submittedAnswer": { "home": { - "title": "Submitted Answers", - "createLabel": "Submitted Answer erstellen" + "title": "Eingereichte Antworten", + "createLabel": "Eingereichte Antwort erstellen" }, - "created": "Submitted Answer erstellt mit ID {{ param }}", - "updated": "Submitted Answer aktualisiert mit ID {{ param }}", - "deleted": "Submitted Answer gelöscht mit ID {{ param }}", + "created": "Eingereichte Antwort erstellt mit ID {{ param }}", + "updated": "Eingereichte Antwort aktualisiert mit ID {{ param }}", + "deleted": "Eingereichte Antwort gelöscht mit ID {{ param }}", "delete": { - "question": "Soll Submitted Answer {{ id }} wirklich dauerhaft gelöscht werden?" + "question": "Soll Eingereichte Antwort {{ id }} wirklich dauerhaft gelöscht werden?" }, "detail": { - "title": "Submitted Answer" + "title": "Eingereichte Antwort" }, - "scoreInPoints": "Score In Points", - "question": "Question", - "submission": "Submission" + "scoreInPoints": "Ergebnis in Punkten", + "question": "Frage", + "submission": "Einreichung" } } } diff --git a/src/main/webapp/i18n/de/team.json b/src/main/webapp/i18n/de/team.json index 14cec92c1407..0b2b537a43f4 100644 --- a/src/main/webapp/i18n/de/team.json +++ b/src/main/webapp/i18n/de/team.json @@ -62,8 +62,8 @@ "all": "Alle Teams", "own": "Eigene Teams" }, - "invalidFileType": "Ungültiger Dateityp für den Team Import: {{ fileType }}", - "invalidCsvHeader": "Die CSV Datei muss folgende Kopfzeile haben: {{ expectedHeader }}", + "invalidFileType": "Ungültiger Dateityp für den Team-Import: {{ fileType }}", + "invalidCsvHeader": "Die CSV-Datei muss folgende Kopfzeile haben: {{ expectedHeader }}", "invalidCsvLine": "Zeile {{ line }} ist falsch formatiert", "missingUserNameOrId": "Der/Die Studierende in Eintrag {{ entryNr }} hat weder einen Login noch eine Matrikelnummer.", "noStudentsAddedYet": "Noch keine Studierenden hinzugefügt.", @@ -106,7 +106,7 @@ "buttonLabel": "Importiere Teams", "dialogTitle": "Importiere Teams nach:", "introTextExercise": "Dieser Dialog kann dazu verwendet werden, Teams einer anderen Übung dieses Kurses in diese Übung zu importieren.", - "introTextFile": "Dieser Dialog kann dazu verwendet werden, Teams aus einer .json oder .csv Datei in diese Übung zu importieren.", + "introTextFile": "Dieser Dialog kann dazu verwendet werden, Teams aus einer JSON- oder CSV-Datei in diese Übung zu importieren.", "error": "Teams konnten nicht importiert werden. Bitte versuche es nochmal.", "fromAnExercise": "Von einer Übung", "fromAFile": "Aus einer Datei" diff --git a/src/main/webapp/i18n/de/textExercise.json b/src/main/webapp/i18n/de/textExercise.json index a4dae8698f68..a2dba2feae76 100644 --- a/src/main/webapp/i18n/de/textExercise.json +++ b/src/main/webapp/i18n/de/textExercise.json @@ -28,11 +28,11 @@ "assessmentPending": "Bewertung ausstehend", "createExampleSubmissions": "Beispielabgabe erstellen", "checkPlagiarism": "Plagiatsprüfung", - "saveSuccessful": "Dein Antwort wurde erfolgreich gespeichert!", + "saveSuccessful": "Deine Antwort wurde erfolgreich gespeichert!", "error": "Ein Fehler ist aufgetreten. Bitte versuche es später noch einmal.", "tutorEffortStatistics": { "title": "Tutor Aufwand Statistik", - "titleDescription": "Verteilung des Tutor Aufwands: Zeigt wie viele Tutor:innen wie viele Minuten damit verbracht haben, Abgaben dieser Aufgabe zu korrigieren. Das Interval, das den Median dieser Verteilung beinhaltet, ist in dunkelblau gekennzeichnet, falls mindestens ein/e Tutor:in in dieses Intervall fällt.", + "titleDescription": "Verteilung des Tutor-Aufwands: Zeigt wie viele Tutor:innen wie viele Minuten damit verbracht haben, Abgaben dieser Aufgabe zu korrigieren. Das Intervall, das den Median dieser Verteilung beinhaltet, ist in dunkelblau gekennzeichnet, falls mindestens ein/e Tutor:in in dieses Intervall fällt.", "numberOfSubmissionsAssessed": "Anzahl der bewerteten Einreichungen", "totalTimeSpent": "Gesamtdauer der Benotung (in Minuten)", "averageTime": "Bewertungsgeschwindigkeit (Einreichungen/Minuten)", diff --git a/src/main/webapp/i18n/de/tutorialGroupImport.json b/src/main/webapp/i18n/de/tutorialGroupImport.json index a2603a6aa870..939e4cb27afd 100644 --- a/src/main/webapp/i18n/de/tutorialGroupImport.json +++ b/src/main/webapp/i18n/de/tutorialGroupImport.json @@ -10,7 +10,7 @@ "requirements": "Die oberste Zeile der CSV-Datei muss die Spaltennamen angeben. Jede Zeile muss den Titel der Tutoriumsgruppe enthalten. Um Studenten zu registrieren, muss jede Zeile zusätzlich entweder eine Matrikelnummer oder einen Anmeldenamen enthalten. Vor- und Nachname sind optional." }, "supportedHeaderNames": { - "label": "Unterstützte Spaltennamen (Versionen mit Leerzeichen, Unterstrichen, Bindestrichen und Grossbuchstaben werden ebenfalls unterstützt): ", + "label": "Unterstützte Spaltennamen (Versionen mit Leerzeichen, Unterstrichen, Bindestrichen und Großbuchstaben werden ebenfalls unterstützt): ", "format": "Diese werden unten mit Pfeile illustriert. Die linke Seite zeigt die kompatiblen Spaltennamen und die rechte Seite zeigt den Spaltennamen nach dem Parsen einer CSV.", "alwaysRequired": "Eins von den folgenden ist als Spaltennamen immer erforderlich um die Übungsgruppe zu identifizieren: ", "requiredIfStudentRegistration": "Eins von den folgenden ist als Spaltennamen erforderlich, wenn Studierende identifiziert und registriert werden sollen: ", @@ -41,7 +41,7 @@ "multipleregistrations": "Mehrere Registrierungen in CSV für Studierenden" }, "csvFile": { - "label": "Wähle eine .csv-Datei aus", + "label": "Wähle eine CSV-Datei aus", "validationFailed": "Bitte die Datei reparieren, sie wird aufgrund des folgenden Fehlers nicht als gültig angesehen: ", "parseCSVButton": "CSV einlesen" }, diff --git a/src/main/webapp/i18n/de/tutorialGroups.json b/src/main/webapp/i18n/de/tutorialGroups.json index 5ef10d3b12bb..6ba6bf79b1ef 100644 --- a/src/main/webapp/i18n/de/tutorialGroups.json +++ b/src/main/webapp/i18n/de/tutorialGroups.json @@ -51,9 +51,14 @@ "attendance": "Anwesenheit", "utilizationHelp": "Durchschnittliche Anwesenheit geteilt durch Kapazität (falls definiert). Die durchschnittliche Anwesenheit bezieht sich auf die letzten drei Sitzungen. Falls keine Anwesenheit eingetragen wurde, wird die entsprechende Sitzung ignoriert und die Berechnung mit zwei, bzw. einer Sitzung durchgeführt.", "utilizationHelpDetail": "Durchschnittliche Anwesenheit geteilt durch Kapazität", - "averageAttendance": "Duchschnittliche Anwesenheit: {{ averageAttendance }}", + "averageAttendance": "Durchschnittliche Anwesenheit: {{ averageAttendance }}", "averageAttendanceDetail": "Durchschnittliche Anwesenheit", - "averageAttendanceHelpDetail": "Durchschnittliche Anwesenheit in den letzten drei Sitzungen. Falls keine Anwesenheit eingetragen wurde, wird die entsprechende Sitzung ignoriert und die Berechnung mit zwei, bzw. einer Sitzung durchgeführt." + "averageAttendanceHelpDetail": "Durchschnittliche Anwesenheit in den letzten drei Sitzungen. Falls keine Anwesenheit eingetragen wurde, wird die entsprechende Sitzung ignoriert und die Berechnung mit zwei, bzw. einer Sitzung durchgeführt.", + "profilePicture": "Tutor:in Profilbild", + "profilePictureAlt": "Profilbild von {{ user }}", + "name": "Name", + "information": "Information", + "isNotOnline": "Nicht Online" }, "tutorialGroupSchedule": { "dayOfWeek": "Wochentag", @@ -108,7 +113,7 @@ "placeholder": "Wähle einen Campus, auf dem sich diese Übungsgruppe trifft.", "loadingText": "Campus laden ...", "notFoundText": "Kein Campus gefunden.", - "campusHelp": "In das Feld tippen um nach einem Campus zu suchen.", + "campusHelp": "In das Feld tippen, um nach einem Campus zu suchen.", "maxLengthValidationError": "Der Campus ist auf {{ max }} Zeichen beschränkt!" }, "additionalInformationInput": { @@ -126,17 +131,17 @@ "placeholder": "Wähle eine Sprache", "loadingText": "Sprachen laden ...", "notFoundText": "Keine Sprachen gefunden.", - "languageHelp": "In das Feld tippen um nach einer Sprache zu suchen.", + "languageHelp": "In das Feld tippen, um nach einer Sprache zu suchen.", "maxLengthValidationError": "Die Sprache ist auf {{ max }} Zeichen beschränkt!", "requiredValidationError": "Eine Sprache ist erforderlich!" }, "isOnlineInput": { - "label": "Trifft sich sich diese Übungsgruppe online oder offline?" + "label": "Trifft sich diese Übungsgruppe online oder offline?" }, "notificationInput": { "label": "Optional: Benachrichtigung über Änderungen", "placeholder": "Benachrichtigungstext", - "maxLengthValidationError": "Der Benachrichtigungstext is limitiert auf {{ max }} Zeichen!", + "maxLengthValidationError": "Der Benachrichtigungstext ist limitiert auf {{ max }} Zeichen!", "help": "Wenn du die eingeschriebenen Studierenden und den zugewiesenen Tutor über Änderungen in dieser Übungsgruppe informieren möchtest, kannst du hier einen Benachrichtigungstext eingeben. Es wird eine Benachrichtigung mit dem Text versendet." } }, @@ -194,7 +199,7 @@ "parseError": "Das Datum muss im Format 'YYYY-MM-DD' sein" }, "reasonInput": { - "label": "Grund für keine Übunsgruppen an diesem Tag", + "label": "Grund für keine Übungsgruppen an diesem Tag", "placeholder": "Nationalfeiertag", "maxLengthValidationError": "Die Vernunft beschränkt sich auf {{ max }} Zeichen!" } @@ -223,7 +228,7 @@ "beta": "Die Zeitzone wird momentan nur in Verbindung mit dem Übungsgruppen-Feature verwendet. Sie hat momentan keinen Einfluss auf andere Bereiche von Artemis", "changeWarning": "Die Zeitzone wurde geändert. Alle individuell erstellten Sitzungen und freien Tage werden gelöscht. In der neuen Zeitzone werden nur Sitzungen, die einem Zeitplan folgen neu erstellt. Soll das wirklich gemacht werden?", "placeholder": "Wähle eine Zeitzone aus", - "explanation": "Die Zeitzone, in der die Übungsgruppen auftreten. Dies wird verwendet, um die Start- und Endzeiten der Übungsgruppen zu interpretieren. In das Feld tippen um nach einer Zeitzone zu suchen.", + "explanation": "Die Zeitzone, in der die Übungsgruppen auftreten. Dies wird verwendet, um die Start- und Endzeiten der Übungsgruppen zu interpretieren. In das Feld tippen, um nach einer Zeitzone zu suchen.", "requiredValidationError": "Eine Zeitzone muss ausgewählt werden!" }, "periodInput": { @@ -242,7 +247,7 @@ }, "pages": { "tutorialGroupsManagement": { - "intro": "Willkommen auf der Seite zur Verwaltung der Übungsgrupen! Eine Beta-Funktion von Artemis, die es ermöglicht, wöchentliche Online- und Offline-Übungsgruppen zu verwalten. Du kannst damit beginnen, Übungsgruppen aus einer CSV-Datei zu importieren oder manuell eine neue Übungsgruppe zu erstellen.", + "intro": "Willkommen auf der Seite zur Verwaltung der Übungsgruppen! Eine Beta-Funktion von Artemis, die es ermöglicht, wöchentliche Online- und Offline-Übungsgruppen zu verwalten. Du kannst damit beginnen, Übungsgruppen aus einer CSV-Datei zu importieren oder manuell eine neue Übungsgruppe zu erstellen.", "title": "Übungsgruppen-Verwaltung", "freePeriodsButtons": "Freie Tage", "creatTutorialGroupButton": "Neue Übungsgruppe", @@ -265,7 +270,7 @@ "configurationExplanation": "Der Kurs benötigt eine kursweite Konfiguration für die Übungsgruppen. Diese Konfiguration enthält Standardeinstellungen für alle Übungsgruppen.", "configuration": "Der Kurs hat eine Konfiguration für die Übungsgruppen", "createConfiguration": "Konfiguration erstellen", - "continueToManagement": "Weiter zur Übungsgruppenverwaltung" + "continueToManagement": "Weiter zur Übungsgruppen-Verwaltung" }, "createTutorialGroup": { "title": "Übungsgruppe erstellen" diff --git a/src/main/webapp/i18n/de/user-management.json b/src/main/webapp/i18n/de/user-management.json index 3ae2fa7a3954..365abf875684 100644 --- a/src/main/webapp/i18n/de/user-management.json +++ b/src/main/webapp/i18n/de/user-management.json @@ -11,7 +11,7 @@ }, "notEnrolled": { "delete": { - "cancel": "Keine nicht eingeschriebenen Nutzer:innen zum löschen gefunden.", + "cancel": "Keine nicht eingeschriebenen Nutzer:innen zum Löschen gefunden.", "caption": "Nicht eingeschriebene Nutzer:innen löschen", "question": "Sollen diese Nutzer:innen wirklich dauerhaft gelöscht werden?
    {{ users }}
    Das sind {{ title }} Nutzer:innen! Diese Aktion kann NICHT rückgängig gemacht werden!" } @@ -24,7 +24,7 @@ }, "authority": { "title": "Rolle ({{ num }})", - "tooltip": "Filter die Nutzer:innen anhand ihrere Berechtigungen", + "tooltip": "Filter die Nutzer:innen anhand ihrer Berechtigungen", "admin": "Administrator", "instructor": "Lehrende", "editor": "Editor:in", diff --git a/src/main/webapp/i18n/de/userSettings.json b/src/main/webapp/i18n/de/userSettings.json index ef02074780ea..6a2ebecc1763 100644 --- a/src/main/webapp/i18n/de/userSettings.json +++ b/src/main/webapp/i18n/de/userSettings.json @@ -27,11 +27,22 @@ "deleteFailure": "SSH-Schlüssel konnte nicht gelöscht werden.", "deleteSuccess": "SSH-Schlüssel erfolgreich gelöscht.", "cancelSavingSshKey": "Abbrechen", - "editExistingSshKey": "SSH-Schlüssel bearbeiten", - "addNewSshKey": "Neuer SSH-Schlüssel", + "editExistingSshKey": "Bearbeiten", + "viewExistingSshKey": "Ansehen", + "addNewSshKey": "SSH-Schlüssel hinzufügen", + "sshKeyDetails": "SSH-Schlüssel Informationen", "deleteSshKey": "Löschen", "sshKeyDisplayedInformation": "Das ist dein aktuell konfigurierter SSH-Schlüssel:", - "key": "SSH Schlüssel" + "key": "Schlüssel", + "noKeysHaveBeenAdded": "Es wurden noch keine SSH-Schlüssel hinzugefügt", + "whatToUseSSHForInfo": "Verwende SSH-Schlüssel, um einfach und sicher eine Verbindung zu Repositories herzustellen.", + "learnMore": "Erfahre mehr über SSH-Schlüssel", + "alreadyHaveKey": "Du hast bereits einen Schlüssel? Kopiere deinen Schlüssel in die Zwischenablage:", + "back": "Zurück", + "keysTablePageTitle": "SSH-Schlüssel", + "keys": "Schlüssel", + "actions": "Aktionen", + "keyName": "Key 1 (Aktuell wird nur ein Schlüssel unterstützt)" }, "vcsAccessTokensSettingsPage": { "addTokenTitle": "Neues Zugriffstoken erzeugen", @@ -56,7 +67,7 @@ "joinedArtemis": "Artemis beigetreten am", "profilePicture": "Profilbild", "addProfilePicture": "Profilbild hinzufügen", - "sshKey": "Öffentlicher SSH Schlüssel" + "sshKey": "Öffentlicher SSH-Schlüssel" }, "categories": { "NOTIFICATION_SETTINGS": "Benachrichtigungseinstellungen", @@ -107,7 +118,7 @@ }, "settingDescriptions": { "basicWeeklySummaryDescription": "Erhalte jeden Freitag um 17:00 Uhr eine einfache wöchentliche Zusammenfassung (bsp. welche neuen Aufgaben diese Woche veröffentlicht wurden und noch bearbeitbar sind)", - "exerciseCreatedOrStartedDescription": "Erhalte eine Mitteilung wenn eine neue Aufgabe veröffentlicht wurde", + "exerciseCreatedOrStartedDescription": "Erhalte eine Mitteilung, wenn eine neue Aufgabe veröffentlicht wurde", "exerciseOpenForPracticeDescription": "Erhalte eine Mitteilung, wenn eine Aufgabe zum Üben freigeschaltet wurde (z.B. ein Quiz)", "exerciseSubmissionAssessedDescription": "Erhalte eine Mitteilung, wenn deine eingereichten Aufgaben bewertet wurden", "newExercisePostDescription": "Erhalte eine Mitteilung, wenn eine neue Nachricht zu einer Aufgabe erstellt wurde", diff --git a/src/main/webapp/i18n/en/aboutUs.json b/src/main/webapp/i18n/en/aboutUs.json index 0e582d2793cf..b5487328404a 100644 --- a/src/main/webapp/i18n/en/aboutUs.json +++ b/src/main/webapp/i18n/en/aboutUs.json @@ -24,7 +24,7 @@ "text": "Exam mode: Instructors create exams with variants, integrated plagiarism checks, test runs and student reviews. Students participate with ease." }, "grading": { - "text": "Grading: Calculate and display grades using configurable grade keys for courses and exams. Export as csv files to university systems (e.g. CAMPUSonline)." + "text": "Grading: Calculate and display grades using configurable grade keys for courses and exams. Export as CSV files to university systems (e.g. CAMPUSonline)." }, "assessment": { "text": "Assessment: Double-blind grading with structured criteria, integrated training, a leader board, ratings, and complaints improve consistency and fairness." diff --git a/src/main/webapp/i18n/en/assessment.json b/src/main/webapp/i18n/en/assessment.json index 40f9d4ee523d..460f0cc0197e 100644 --- a/src/main/webapp/i18n/en/assessment.json +++ b/src/main/webapp/i18n/en/assessment.json @@ -72,7 +72,7 @@ }, "useAsExampleSubmissionVerificationQuestion": "Are you sure to import this submission as an example submission?", "messages": { - "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted and the submission will be available for assessment to other tutors again.", + "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted, and the submission will be available for assessment to other tutors again.", "acceptComplaintWithoutMoreScore": "Are you sure you want to accept the complaint without giving the student more points?", "loadSubmissionFailed": "Retrieving requested submission failed.", "submitSuccessful": "Your assessment was submitted successfully!", @@ -84,7 +84,7 @@ }, "dashboard": { "warning": "Warning: The submission period is not over yet and students are still allowed to submit their solutions. Please do not start with the assessment yet!", - "warningIndividual": "Warning: The general submission period is over but some students with individual due dates are still allowed to submit their solutions. Please check if that is the case for the participation you want to assess.", + "warningIndividual": "Warning: The general submission period is over, but some students with individual due dates are still allowed to submit their solutions. Please check if that is the case for the participation you want to assess.", "empty": "No Submissions found!", "emptySearch": "Please enter a student name to find submissions.", "loading": "Loading...", diff --git a/src/main/webapp/i18n/en/assessmentInstructions.json b/src/main/webapp/i18n/en/assessmentInstructions.json index 7585ce033747..a472ba0afada 100644 --- a/src/main/webapp/i18n/en/assessmentInstructions.json +++ b/src/main/webapp/i18n/en/assessmentInstructions.json @@ -21,7 +21,7 @@ "usageCount": "Usage Count", "trainingEvaluationCriteria": { "title": "Assessment Training Evaluation Criteria", - "description": "In order to successfully complete the training, your assessment should match all of the following criteria:
     1. The number of feedback that you provide should be the same as the instructor's.
     2. Every feedback should have the same usage of assessment instructions and score.
     3. A reason should be provided for feedback with a negative score." + "description": "In order to successfully complete the training, your assessment should match all the following criteria:
     1. The number of feedback that you provide should be the same as the instructor's.
     2. Every feedback should have the same usage of assessment instructions and score.
     3. A reason should be provided for feedback with a negative score." } } } diff --git a/src/main/webapp/i18n/en/bonus.json b/src/main/webapp/i18n/en/bonus.json index 6ffff351fd0c..61cbe6b7437e 100644 --- a/src/main/webapp/i18n/en/bonus.json +++ b/src/main/webapp/i18n/en/bonus.json @@ -33,7 +33,7 @@ "finalPoints": "Final Points", "finalGrade": "Final Grade", "any": "(Any)", - "exceedsMax": "The final value exceeds the best possible value so it is capped there. If that is not intended, double check −/+ selection." + "exceedsMax": "The final value exceeds the best possible value, so it is capped there. If that is not intended, double check −/+ selection." }, "formula": { "title": "Formula", diff --git a/src/main/webapp/i18n/en/buildQueue.json b/src/main/webapp/i18n/en/buildQueue.json index 9378aecbee22..aa065f3617df 100644 --- a/src/main/webapp/i18n/en/buildQueue.json +++ b/src/main/webapp/i18n/en/buildQueue.json @@ -28,7 +28,7 @@ }, "cancelAll": "Cancel All", "filter": { - "title": "BuildJobs Filter", + "title": "Build Jobs Filter", "buildStatus": { "title": "Build Status", "cancelled": "Cancelled", diff --git a/src/main/webapp/i18n/en/codeHint.json b/src/main/webapp/i18n/en/codeHint.json index 7d4006d0aa55..e0c014bbc557 100644 --- a/src/main/webapp/i18n/en/codeHint.json +++ b/src/main/webapp/i18n/en/codeHint.json @@ -36,7 +36,7 @@ }, "step3": { "name": "Solution Code Snippets", - "description": "This steps allows to edit the individual Solution Code Snippets from which code hints are generated.", + "description": "This steps allows editing the individual Solution Code Snippets from which code hints are generated.", "notGenerated": "No Solution Code Snippets have been generated yet.", "createManualFragmentButton": { "label": "Create manual fragment", @@ -63,7 +63,7 @@ }, "step4": { "name": "Code Hints", - "description": "This step allows to generate the code hints.", + "description": "This step allows generating the code hints.", "title": "Title", "task": "Task", "notGenerated": "No code hints have been generated yet.", diff --git a/src/main/webapp/i18n/en/competency.json b/src/main/webapp/i18n/en/competency.json index 54e4cd928076..9baf2d9d4975 100644 --- a/src/main/webapp/i18n/en/competency.json +++ b/src/main/webapp/i18n/en/competency.json @@ -174,10 +174,35 @@ "manage": { "importAllButton": "Import all of a course" }, + "importSettings": { + "importRelationsLabel": "Import relations", + "importRelationsTooltip": "Imports all relations between the course competencies", + "importExercisesLabel": "Import exercises", + "importExercisesTooltip": "Imports all exercises of the course competencies or links them to the imported course competency if an exercise with that name already exists", + "importLecturesLabel": "Import lectures", + "importLecturesTooltip": "Imports all related lecture units of the course competencies or links them to the imported course competency if a lecture unit with that name already exists", + "referenceDateLabel": "Reference date", + "referenceDateTooltip": "The reference date is used to calculate the dates of the imported resources. The earliest date of this type is set to the reference date and all other dates are set relative to this date.", + "referenceDateTypeLabel": "Reference date type", + "referenceDateTypeTooltip": "'Release date' refers to the release date of exercises and lecture units as well as the visible date of lectures. 'Due date' refers to the due date of exercises and competencies as well as the end date of lectures.", + "referenceDateType": { + "noSelection": "-- Choose a reference date first --", + "releaseDate": "Release date", + "dueDate": "Due date" + } + }, "importAll": { "title": "Import all Competencies and Prerequisites from another course", "success": "Imported {{ noOfCompetencies }} competencies and prerequisites from course \"{{ courseTitle }}\".", - "warning": "No competencies or prerequisites were found for course \"{{ courseTitle }}\"." + "warning": "No competencies or prerequisites were found for course \"{{ courseTitle }}\".", + "table": { + "title": "Courses", + "columns": { + "TITLE": "Title", + "SHORT_NAME": "Short Name", + "SEMESTER": "Semester" + } + } }, "create": { "titleUniqueValidationError": "There already exists a competency/prerequisite with this title in the course", diff --git a/src/main/webapp/i18n/en/complaint.json b/src/main/webapp/i18n/en/complaint.json index 0da2734360e2..2d879e4213de 100644 --- a/src/main/webapp/i18n/en/complaint.json +++ b/src/main/webapp/i18n/en/complaint.json @@ -60,8 +60,8 @@ }, "moreFeedback": { "title": "More Feedback Request", - "description": "If something is not clear enough and you need more explanation, you can request the tutor to provide more feedback.", - "descriptionTeam": "If something is not clear enough and you need more explanation, you can request your tutor to provide more feedback.", + "description": "If something is not clear enough, and you need more explanation, you can request the tutor to provide more feedback.", + "descriptionTeam": "If something is not clear enough, and you need more explanation, you can request your tutor to provide more feedback.", "beDescriptive": "Please describe in detail what is unclear to you about the assessment. Your request will then be evaluated by the same reviewer.", "beDescriptiveTeam": "Please describe in detail what is unclear to you about the assessment. Your tutor will then clarify their assessment.", "created": "Your More Feedback Request has been submitted!", diff --git a/src/main/webapp/i18n/en/course.json b/src/main/webapp/i18n/en/course.json index e977ca0d3f3f..d4246b664a54 100644 --- a/src/main/webapp/i18n/en/course.json +++ b/src/main/webapp/i18n/en/course.json @@ -13,7 +13,26 @@ "delete": { "question": "Are you sure you want to permanently delete the course {{ title }}? All associated elements will be deleted, including exams, exercises, repositories and build plans. This action can NOT be undone!", "typeNameToConfirm": "Please type in the name of the course to confirm.", - "icon": "Remove Icon" + "icon": "Remove Icon", + "summary": { + "title": "Course Summary", + "numberExams": "Number of Exams", + "numberLectures": "Number of Lectures", + "numberStudents": "Number of Students", + "numberTutors": "Number of Tutors", + "numberEditors": "Number of Editors", + "numberInstructors": "Number of Instructors", + "numberProgrammingExercises": "Number of Programming Exercises", + "numberModelingExercises": "Number of Modeling Exercises", + "numberTextExercises": "Number of Text Exercises", + "numberFileUploadExercises": "Number of File Upload Exercises", + "numberQuizExercises": "Number of Quiz Exercises", + "numberRepositories": "Number of Repositories", + "numberBuilds": "Number of Builds", + "numberCommunicationPosts": "Number of Communication Posts", + "numberAnswerPosts": "Number of Answer Posts", + "isTestCourse": "Test Course" + } }, "showActive": "Show only active courses", "totalScore": "Total Score:", @@ -104,8 +123,12 @@ }, "messagingEnabled": { "label": "Direct Messages / Group Chats Enabled", - "tooltip": "Enables messaging between course users in group chats or direct messages. Every user can start a direct message, private group chat and add other users. A group chat is limited to 10 members. The chats happens in the communication space of the course.", + "tooltip": "Enables messaging between course users in group chats or direct messages. Every user can start a direct message, private group chat and add other users. A group chat is limited to 10 members. The chats happen in the communication space of the course.", "codeOfConduct": "Messaging Code of Conduct" + }, + "faqEnabled": { + "label": "FAQ enabled", + "tooltip": "Enables the creation of FAQ entries where instructors can compile frequently asked questions in an organized manner. Students can access this knowledge base to independently review topics and resolve their questions on their own." } }, "enrollmentEnabled": { diff --git a/src/main/webapp/i18n/en/editor.json b/src/main/webapp/i18n/en/editor.json index 95c2a8b5cbb7..266ce0333d74 100644 --- a/src/main/webapp/i18n/en/editor.json +++ b/src/main/webapp/i18n/en/editor.json @@ -91,7 +91,7 @@ "fileExists": "File/Directory name already exists. Please choose a different name.", "unsupportedFile": "File with this extension not supported.", "fileOperationFailed": "File operation could not be executed. Please try again later.", - "participationCouldNotBeDeleted": "Participation could not be deleted and might now be corrupted .", + "participationCouldNotBeDeleted": "Participation could not be deleted and might now be corrupted.", "participationCouldNotBeCreated": "Participation could not be created.", "couldNotBeRetrieved": "The repository status could not be retrieved.", "problemStatementCouldNotBeUpdated": "The problem statement of this exercise could not be updated.", diff --git a/src/main/webapp/i18n/en/error.json b/src/main/webapp/i18n/en/error.json index 087d1b49a519..33691ef892a3 100644 --- a/src/main/webapp/i18n/en/error.json +++ b/src/main/webapp/i18n/en/error.json @@ -35,7 +35,7 @@ "emptyFile": "The uploaded file {{ fileName }} is empty. Please check the file and try again.", "externalSubmissionBeforeDueDate": "External submissions are not supported before the exercise due date.", "externalSubmissionForQuizExercise": "External submissions are not supported for Quiz exercises.", - "noSubmissions": "No existing user was specified or no submission exists.", + "noSubmissions": "No existing user was specified, or no submission exists.", "feedbackCreditsNull": "Error! If feedback is present, all elements must contain points.", "invalidGradeStepFormat": "One or more grade steps are not following the correct format. Click on the \"?\" for more information.", "examExerciseNotIncludedInScore": "An exam exercise must be included in the score!", @@ -83,9 +83,9 @@ }, "idNull": "Invalid ID", "unexpectedError": "An unexpected error occurred: {{error}}", - "manualCodeHintOperation": "This endpoint does not allow to change code hints manually.", + "manualCodeHintOperation": "This endpoint does not allow changing code hints manually.", "exerciseNotDefined": "The exercise is not defined.", - "exerciseIdMismatch": "The exercise ids do not match.", + "exerciseIdMismatch": "The exercise IDs do not match.", "solutionEntryError": "An error occurred while retrieving the extracted tasks from the problem statement.", "systemNotificationNeedsBothDates": "Both notification date and expiration date must be set.", "systemNotificationNeedsNotificationBeforeExpiration": "The expiration date must be after the notification date.", @@ -96,7 +96,7 @@ "shortnameAlreadyExists": "A programming exercise with the same short name already exists. Please choose a different short name.", "courseTitleTooLong": "The course title is too long (max. 255 characters). Please choose a shorter title.", "notAllowedInExam": "This operation is not allowed in an exam.", - "profilePictureFilesizeTooBig": "The filesize of your image is too big, please upload a smaller one.", + "profilePictureFilesizeTooBig": "The file size of your image is too big, please upload a smaller one.", "profilePictureFileFormatNotSupported": "The file format is not supported, please make sure to upload a .png or .jpg file." } } diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index f3ff109e335d..cb75f38dece0 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -9,12 +9,12 @@ "examUsers": { "uploadImage": "Upload images", "uploadImageTooltip": "Upload images for the registered students", - "introText": "This dialog can be used to upload pdf file and extract images for registered students.", + "introText": "This dialog can be used to upload PDF file and extract images for registered students.", "dialogText": "Each entry in the input file must contain a value for either matriculation number, login or email.\nValues for last and first name are optional.", "pdfExampleText": "Example of a valid PDF file format:", "pdfFile": { - "label": "Select .pdf file", - "tooltip": "Please select a .pdf file containing registered students image and matriculation number." + "label": "Select PDF file", + "tooltip": "Please select a PDF file containing registered students image and matriculation number." }, "dialogTitle": "Upload images", "allImagesSaved": "All images were saved successfully.", @@ -150,6 +150,7 @@ "falseName": "Entered name is incorrect. Please try again!", "notSet": "Not set", "startExamToolTip": "Button will be activated 5 minutes before the exam start.", + "yourSolution": "Your Solution", "cleanup": { "title": "Cleanup", "question": "Are you sure you want to clean up the exam {{ title }}? This will delete all student programming exercise repositories in the exam. This action can NOT be undone!" @@ -493,7 +494,7 @@ "realExam": "Exam", "testExam": "Test Exam", "examMode": "Mode", - "examModeTooltip": "Students can start working on a Test Exam once within the working window, the selected working time will be available during the conduction. Students recieve automated feedback after submitting. NOTE: This cannot be changed later on!", + "examModeTooltip": "Students can start working on a Test Exam once within the working window, the selected working time will be available during the conduction. Students receive automated feedback after submitting. NOTE: This cannot be changed later on!", "startDate": "Start of working window", "endDate": "End of working window", "workingTimeTooltip": "The working time allowed to the students per run" @@ -599,7 +600,26 @@ "quizPool": "Quiz Pool", "delete": { "question": "Are you sure you want to permanently delete the Exam {{ title }}? All associated elements will be deleted including the Student Exams. This action can NOT be undone!", - "typeNameToConfirm": "Please type in the name of the exam to confirm." + "typeNameToConfirm": "Please type in the name of the exam to confirm.", + "summary": { + "title": "Exam Summary", + "numberExerciseGroups": "Number of Exercise Groups", + "numberProgrammingExercises": "Number of Programming Exercises", + "numberModelingExercises": "Number of Modeling Exercises", + "numberTextExercises": "Number of Text Exercises", + "numberFileUploadExercises": "Number of File Upload Exercises", + "numberQuizExercises": "Number of Quiz Exercises", + "numberRepositories": "Number of Repositories", + "numberBuilds": "Number of Builds", + "numberRegisteredStudents": "Number of Registered Students", + "numberNotStartedExams": "Number of Exams (not started)", + "numberStartedExams": "Number of Exams", + "numberSubmittedExams": "Number of Exams (submitted)", + "numberCommunicationPosts": "Number of Communication Posts", + "numberAnswerPosts": "Number of Answer Posts", + "isTestExam": "Test Exam", + "isTestCourse": "Test Course" + } }, "reset": { "question": "Are you sure you want to permanently reset the Exam {{ title }}? All Student Exams will be deleted. Registered students and the exercise configurations will remain. This action can NOT be undone!", @@ -641,7 +661,7 @@ "suspiciousBehavior": "Check for suspicious behaviour" }, "descriptionItem": { - "register": "You can register students for the exam in three different ways: via a .csv file, manually, or by importing all students registered in the course.", + "register": "You can register students for the exam in three different ways: via a CSV file, manually, or by importing all students registered in the course.", "exerciseGroups": "You can create exercise groups with multiple exercise variants to make cheating for students more difficult. The points in all exercises within a given exercise group must be identical, and the number of exercise groups must equal the exam's number of exercises.", "generateStudentExams": "You need to generate exams for all registered students before starting the exam. Their working time can be adjusted individually.\nAdditionally, the commits of the templates in programming exercises will be combined into one commit.", "prepareExerciseStart": "You need to prepare the exercises before the exam starts.", @@ -652,7 +672,7 @@ "examReview": "Make sure to have all dates specified correctly.", "resolveComplaints": "Complaints can be resolved from the Assessment Dashboard.", "testRun": "Try out different combinations of exercise variants from the student perspective.", - "exportResults": "Exports the exam results as a .csv file.", + "exportResults": "Exports the exam results as a CSV file.", "editWorkingTime": "Until one minute before the end of the exam, you can extend its duration.", "createAnnouncement": "To communicate important information to all students working on the exam right now, you can make an announcement. It will be distributed and displayed to all students immediately.", "suspiciousBehavior": "Check for suspicious behaviour and plagiarism in the suspicious behavior dashboard." diff --git a/src/main/webapp/i18n/en/exampleSubmission.json b/src/main/webapp/i18n/en/exampleSubmission.json index 00e41bffc97e..d63e75979fd0 100644 --- a/src/main/webapp/i18n/en/exampleSubmission.json +++ b/src/main/webapp/i18n/en/exampleSubmission.json @@ -10,13 +10,13 @@ "title": "Legend", "positiveScore": "Positive score", "negativeScore": "Negative score", - "incorrectAssessment": "Incorrect assessment️", + "incorrectAssessment": "Incorrect assessment", "feedbackWithoutScore": "Feedback without score" }, "feedback": { "CORRECT": "Correct assessment 👍", "INCORRECT_SCORE": "Incorrect score", - "UNNECESSARY_FEEDBACK": "Unneccessary feedback", + "UNNECESSARY_FEEDBACK": "Unnecessary feedback", "MISSING_GRADING_INSTRUCTION": "Missing assessment instruction", "INCORRECT_GRADING_INSTRUCTION": "Incorrect assessment instruction", "EMPTY_NEGATIVE_FEEDBACK": "Feedback is required for negative score" @@ -40,7 +40,7 @@ "editExampleSubmission": "Edit example submission", "modelElementHint": "Hint: Model elements which assessment you missed are highlighted in blue.", "textHint": "Hint: Text blocks that you need to assess are highlighted in blue.", - "editExampleSubmissionConfirmationQuestion": "Are you sure you want to edit the example submission? The current assessment will be permanently deleted and you have to assess the submission again.", + "editExampleSubmissionConfirmationQuestion": "Are you sure you want to edit the example submission? The current assessment will be permanently deleted, and you have to assess the submission again.", "updateExampleSubmission": "Update example submission", "problemStatement": "Problem Statement", "sampleSolution": "Example Solution", diff --git a/src/main/webapp/i18n/en/exercise-actions.json b/src/main/webapp/i18n/en/exercise-actions.json index b4e6d608a717..b44b8590d10a 100644 --- a/src/main/webapp/i18n/en/exercise-actions.json +++ b/src/main/webapp/i18n/en/exercise-actions.json @@ -26,7 +26,7 @@ "practiceMode": { "title": "Practice Mode", "explanation": "The practice mode allows you to keep working on the exercise after the submission due date for self-practice. This will not affect your grading! Artemis will setup a separate repository for you to clone as usual.", - "repositoryChoice": "You already have a graded participation from before the due date. Therefore you can choose if the code in the separate repository should be the template repository of this exercise or your graded participation.", + "repositoryChoice": "You already have a graded participation from before the due date. Therefore, you can choose if the code in the separate repository should be the template repository of this exercise or your graded participation.", "practiceWithTemplate": "Practice with template repository", "practiceWithGradedParticipation": "Practice with graded participation" }, @@ -36,7 +36,7 @@ "titlePractice": "Reset practice participation", "explanation": "You can reset your repository back to its initial state and start working again from there. This will override any changes you made so far! But the submitted changes will remain in the history.", "offlineIDEExplanation": "After you reset the repository you have to pull the changes on your local machine in order to start working again.", - "repositoryChoice": "You already have a graded participation from before the due date. Therefore you can choose if you want to reset your practice repository to the template of this exercise or the code of your graded participation.", + "repositoryChoice": "You already have a graded participation from before the due date. Therefore, you can choose if you want to reset your practice repository to the template of this exercise or the code of your graded participation.", "questionGraded": "Are you sure you want to reset the graded repository of exercise {{ title }}?", "questionPractice": "Are you sure you want to reset the practice repository of exercise {{ title }}?", "typeNameToConfirm": "Please type in the name of the exercise to confirm.", @@ -44,7 +44,7 @@ "resetToGradedParticipation": "Reset to graded participation", "success": "Resetting repository was successful. You can start over now." }, - "practiceModeTooltip": "The practice mode allows you to keep working on the exercise after the submission due date for self-practice. This will not affect your grading! Artemis will setup a separate repository for you to clone.", + "practiceModeTooltip": "The practice mode allows you to keep working on the exercise after the submission due date for self-practice. This will not affect your grading! Artemis will set up a separate repository for you to clone.", "code": "Code", "cloneRatedRepository": "Clone your repository for this exercise:", "clonePracticeRepository": "Clone your practice repository for this exercise:", diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json index 6a06631fc343..f50e61efcbb8 100644 --- a/src/main/webapp/i18n/en/exercise.json +++ b/src/main/webapp/i18n/en/exercise.json @@ -168,7 +168,7 @@ "resumeProgrammingExercise": "The exercise has been resumed. You can now continue working on the exercise!", "feedbackRequestSent": "Your feedback request has been sent.", "feedbackRequestAlreadySent": "Your feedback request has already been sent.", - "notEnoughPoints": "You have to submit your work at least once.", + "noSubmissionExists": "You have to submit your work at least once.", "lockRepositoryWarning": "Your repository will be locked. You can only continue working after you receive an answer.", "feedbackRequestAfterDueDate": "You cannot submit feedback requests after the due date.", "maxAthenaResultsReached": "You have reached the maximum number of AI feedback requests.", diff --git a/src/main/webapp/i18n/en/exerciseChatbot.json b/src/main/webapp/i18n/en/exerciseChatbot.json index 3b6918e77bdf..197597af328b 100644 --- a/src/main/webapp/i18n/en/exerciseChatbot.json +++ b/src/main/webapp/i18n/en/exerciseChatbot.json @@ -1,7 +1,7 @@ { "artemisApp": { "exerciseChatbot": { - "popUpMessage": "By choosing to continue, you agree that your interactions with Iris and required context data, such as your code, will be processed by Microsoft and OpenAI, with data processing occurring outside of our university data center.", + "popUpMessage": "By choosing to continue, you agree that your interactions with Iris and required context data, such as your code, will be processed by Microsoft and OpenAI, with data processing occurring outside our university data center.", "inputMessage": "Write a message...", "accept": "Accept", "decline": "Decline", @@ -25,8 +25,8 @@ "text4_2": "Movable Functionality: You have the flexibility to move the widget around. Simply click and hold on the widget and drag it to the desired position.", "text4_3": "Resize the Widget: Click and drag the borders of the widget in different directions to make it smaller or larger, depending on your preference.", "text4_4": "Full Screen Feature: You can expand the widget to full screen mode by clicking on the full screen button (top right corner of the widget).", - "text4_5": "Clear chat history: You can clear your chat history by clicking on the trash can button (top right corner of the widget). Thereby, all previous messages are deleted and you can start a new conversation.", - "supportText": "(If you have any problems using the widget or messaging Iris, please create an issue on GitHub: https://github.com/ls1intum/Artemis)", + "text4_5": "Clear chat history: You can clear your chat history by clicking on the trash can button (top right corner of the widget). Thereby, all previous messages are deleted, and you can start a new conversation.", + "supportText": "(If you have any problems using the widget or messaging Iris, please create an issue on GitHub: https://github.com/ls1intum/Artemis.)", "clearSession": { "title": "Clear chat history", "text": "Are you sure you want to clear the chat history?", diff --git a/src/main/webapp/i18n/en/export.json b/src/main/webapp/i18n/en/export.json index 92dd5d4d70d8..77118d19157b 100644 --- a/src/main/webapp/i18n/en/export.json +++ b/src/main/webapp/i18n/en/export.json @@ -2,7 +2,7 @@ "export": { "dialogTitle": "Export Options", "csvFile": { - "introText": "Select the options used for generating the .csv file.", + "introText": "Select the options used for generating the CSV file.", "buttonText": "Export as CSV", "fieldSeparator": { "label": "Field Separator", diff --git a/src/main/webapp/i18n/en/faq.json b/src/main/webapp/i18n/en/faq.json new file mode 100644 index 000000000000..1a158eb52c40 --- /dev/null +++ b/src/main/webapp/i18n/en/faq.json @@ -0,0 +1,26 @@ +{ + "artemisApp": { + "faq": { + "home": { + "title": "FAQ", + "createLabel": "Create a new FAQ", + "filterLabel": "Filter", + "createOrEditLabel": "Create or edit FAQ" + }, + "created": "The FAQ was successfully created", + "updated": "The FAQ was successfully updated", + "deleted": "The FAQ was successfully deleted", + "delete": { + "question": "Are you sure you want to permanently delete the FAQ {{ title }}? This action can NOT be undone!", + "typeNameToConfirm": "Please type in the name of the FAQ to confirm." + }, + + "table": { + "questionTitle": "Question title", + "questionAnswer": "Question answer", + "categories": "Categories" + }, + "course": "Course" + } + } +} diff --git a/src/main/webapp/i18n/en/featureOverview.json b/src/main/webapp/i18n/en/featureOverview.json index 166700c8976a..b119cf4c97b2 100644 --- a/src/main/webapp/i18n/en/featureOverview.json +++ b/src/main/webapp/i18n/en/featureOverview.json @@ -74,12 +74,12 @@ "statistics": { "title": "Generate Statistics", "shortDescription": "Generate exam statistics to gain insights into the students' performance.", - "descriptionTextOne": "The exam is over, all exams have been assessed and the student complaints are evaluated. Now what?\n\nYou can evaluate the exam outcome using the statistics generated by Artemis. Review the students' performance using various metrics such as average, median, and standard deviation. Review the students' perceived difficulty of every exercise to improve exams in the future. Additionally, you can download all results to a CSV file to export them to external systems and create charts and graphs for further analysis." + "descriptionTextOne": "The exam is over, all exams have been assessed, and the student complaints are evaluated. Now what?\n\nYou can evaluate the exam outcome using the statistics generated by Artemis. Review the students' performance using various metrics such as average, median, and standard deviation. Review the students' perceived difficulty of every exercise to improve exams in the future. Additionally, you can download all results to a CSV file to export them to external systems and create charts and graphs for further analysis." }, "checklist": { "title": "Follow Checklist", "shortDescription": "Use the exam checklist to oversee and ensure every step of the exam is executed correctly.", - "descriptionTextOne": "Carrying out an exam is a long process with multiple points of failure. Artemis provides a checklist that gives you an overview of each step of an exam from creation of the exercises to exporting the results. The exam checklist contains the next action you need to take on a step and summarizes the progress taken so far to help you carry out all tasks correctly and completely. It also has navigation buttons so you can quickly take related actions or examine the progress in detail. Last but not least, it has a more compact overview version in the exam list page to glance over the preparation, conduction and correction status of the exams in the list." + "descriptionTextOne": "Carrying out an exam is a long process with multiple points of failure. Artemis provides a checklist that gives you an overview of each step of an exam from creation of the exercises to exporting the results. The exam checklist contains the next action you need to take on a step and summarizes the progress taken so far to help you carry out all tasks correctly and completely. It also has navigation buttons, so you can quickly take related actions or examine the progress in detail. Last but not least, it has a more compact overview version in the exam list page to glance over the preparation, conduction and correction status of the exams in the list." }, "gradeKey": { "title": "Create Grading Keys", @@ -94,7 +94,7 @@ "examExerciseUpdates": { "title": "Exercise Update during an Exam", "shortDescription": "Update exercises during an exam and notify the students about the changes.", - "descriptionTextOne": "When you have to update the problem statement of an exercise during the exam, you can do this on the exercise edit page and notify the students about it and they will be able to see the updated problem statement." + "descriptionTextOne": "When you have to update the problem statement of an exercise during the exam, you can do this on the exercise edit page and notify the students about it, and they will be able to see the updated problem statement." } } }, @@ -115,7 +115,7 @@ "textEditor": { "title": "Integrated Text Editor", "shortDescription": "Solve text exercises using the integrated text editor.", - "descriptionTextOne": "To work on text exercises, Artemis provides an integrated text editor. The text editor is simple to use and easy to navigate. There is no limit to the length of the submission and it automatically tracks the number of words and characters in your submission." + "descriptionTextOne": "To work on text exercises, Artemis provides an integrated text editor. The text editor is simple to use and easy to navigate. There is no limit to the length of the submission, and it automatically tracks the number of words and characters in your submission." }, "apollonEditor": { "title": "Integrated Model Editor", @@ -130,7 +130,7 @@ "login": { "title": "LRZ Login", "shortDescription": "Log in through your LRZ account. No special account required.", - "descriptionTextOne": "Use the same LRZ credentials you use for all university applications to access Artemis. There is no need to create a new account and maintain another password! Log in using your TUMID and your password and you are ready to go." + "descriptionTextOne": "Use the same LRZ credentials you use for all university applications to access Artemis. There is no need to create a new account and maintain another password! Log in using your TUMID and your password, and you are ready to go." }, "userInterface": { "title": "Intuitive User Interface", @@ -180,7 +180,7 @@ "exerciseUpdateNotification": { "title": "Exercise Update Notification", "shortDescription": "If the instructor of your course has to update the problem statement you will receive a notification.", - "descriptionTextOne": "If the instructor updates the problem statement of an exercise during the exam, you will be notified about it and you will be able to see the updated problem statement. You can switch between the updated version and a view highlighting the changes." + "descriptionTextOne": "If the instructor updates the problem statement of an exercise during the exam, you will be notified about it, and you will be able to see the updated problem statement. You can switch between the updated version and a view highlighting the changes." } } } diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json index 8760c0192b62..623c55bb042b 100644 --- a/src/main/webapp/i18n/en/global.json +++ b/src/main/webapp/i18n/en/global.json @@ -15,6 +15,9 @@ "copied": "Copied", "new": "New" }, + "importTable": { + "searchPlaceholder": "Search" + }, "menu": { "home": "Home", "overview": "Course Overview", @@ -268,7 +271,8 @@ "goBack": "Go back", "search": "Search", "select": "Select", - "sendToIris": "Send To Iris" + "sendToIris": "Send To Iris", + "faq": "FAQ" }, "detail": { "field": "Field", @@ -347,7 +351,8 @@ "exercises": "Exercises", "statistics": "Course statistics", "exams": "Exams", - "communication": "Communication" + "communication": "Communication", + "faq": "FAQ" }, "connectionStatus": { "connected": "Connected", diff --git a/src/main/webapp/i18n/en/gradingSystem.json b/src/main/webapp/i18n/en/gradingSystem.json index 0381c207abb3..e3432845cd84 100644 --- a/src/main/webapp/i18n/en/gradingSystem.json +++ b/src/main/webapp/i18n/en/gradingSystem.json @@ -47,7 +47,7 @@ "deleteQuestion": "Do you really wish to delete the grading key?", "add": "Add Grade Step", "save": "Save", - "stickyGradeStep": "The last grade step is always open ended to handle scores exceeding the maximum. It is stuck to the bottom.", + "stickyGradeStep": "The last grade step is always open-ended to handle scores exceeding the maximum. It is stuck to the bottom.", "plagiarismGradeHelp": "This special failing grade is assigned when a student has a confirmed \"Plagiarism\" verdict in any exercise.", "noParticipationGradeHelp": "This special failing grade is assigned when a student did not participate. For courses, this means the student did not start any exercise. For exams, this means the student did not start or did not submit.", "defaultGradeName": "Default: {{default}}", diff --git a/src/main/webapp/i18n/en/guidedTourCourseExerciseOverview.json b/src/main/webapp/i18n/en/guidedTourCourseExerciseOverview.json index 7d5557037da4..3bedc40c2a95 100644 --- a/src/main/webapp/i18n/en/guidedTourCourseExerciseOverview.json +++ b/src/main/webapp/i18n/en/guidedTourCourseExerciseOverview.json @@ -56,7 +56,7 @@ }, "cloneRepository": { "headline": "Clone repository in IntelliJ", - "content": "Watch the following video to learn how to clone a git repository in IntelliJ. After this step, you should click on the X button in the top right to stop the tutorial and apply the steps you saw in the video. Afterwards, resume the tutorial from your account menu (user name on the top right).", + "content": "Watch the following video to learn how to clone a git repository in IntelliJ. After this step, you should click on the X button in the top right to stop the tutorial and apply the steps you saw in the video. Afterwards, resume the tutorial from your account menu (username on the top right).", "hint": "If you haven't installed the Java JDK 17 version, the video will show you how to do this.", "videoUrl": "https://live.rbg.tum.de/w/artemisintro/25977?video_only=1" }, diff --git a/src/main/webapp/i18n/en/guidedTourCourseOverview.json b/src/main/webapp/i18n/en/guidedTourCourseOverview.json index 234284e6cec1..a7aa069b42ed 100644 --- a/src/main/webapp/i18n/en/guidedTourCourseOverview.json +++ b/src/main/webapp/i18n/en/guidedTourCourseOverview.json @@ -24,7 +24,7 @@ }, "accountMenuClick": { "headline": "Personal settings", - "content": "Click on your user name to view your account menu." + "content": "Click on your username to view your account menu." }, "accountMenu": { "headline": "Personal settings", @@ -45,7 +45,7 @@ "contact": { "headline": "Contact the Artemis team", "content": "Feel free to contact us to leave us some feedback, request features or to report bugs in the application.", - "hint": "If want to contribute to Artemis, then head over to our Github page and submit your first Pull Request." + "hint": "If you want to contribute to Artemis, then head over to our GitHub page and submit your first Pull Request." } } } diff --git a/src/main/webapp/i18n/en/importUsers.json b/src/main/webapp/i18n/en/importUsers.json index 09fe4a2aac1e..b7c105589fb1 100644 --- a/src/main/webapp/i18n/en/importUsers.json +++ b/src/main/webapp/i18n/en/importUsers.json @@ -7,8 +7,8 @@ "dialogText": "Each entry in the input file must contain a value for either matriculation number, login or email.
    Values for last and first name are optional.", "csvExampleText": "Example of a valid CSV file format:", "csvFile": { - "label": "Select .csv file", - "tooltip": "Please select the .csv file containing the students for the import. Either 'LOGIN', 'REGISTRATION_NUMBER' or 'EMAIL' column values must be present per entry. Use the following format: login, matriculation number, email, firstname, lastname. You need to use the header in the top row" + "label": "Select CSV file", + "tooltip": "Please select the CSV file containing the students for the import. Either 'LOGIN', 'REGISTRATION_NUMBER' or 'EMAIL' column values must be present per entry. Use the following format: login, matriculation number, email, firstname, lastname. You need to use the header in the top row" }, "usersForImport": { "label": "Users to import", diff --git a/src/main/webapp/i18n/en/iris.json b/src/main/webapp/i18n/en/iris.json index 6afbb928d5c9..8bf0df8dafdc 100644 --- a/src/main/webapp/i18n/en/iris.json +++ b/src/main/webapp/i18n/en/iris.json @@ -10,6 +10,10 @@ "button": { "reload": "Reload Settings", "save": "Save Settings", + "textExercise": { + "title": "Iris", + "tooltip": "Edit the Iris settings for this text exercise" + }, "programmingExercise": { "title": "Iris", "tooltip": "Edit the Iris settings for this programming exercise" @@ -21,6 +25,7 @@ }, "subSettings": { "chatSettings": "Chat Settings", + "textExerciseChatSettings": "Text Exercise Chat Settings", "lectureIngestionSettings": { "title": "Lecture Ingestion Settings", "autoIngestOnAttachmentUpload": "Send Lectures To Pyris Automatically" @@ -28,14 +33,14 @@ "hestiaSettings": "Hestia Settings", "competencyGenerationSettings": "Competency Generation Settings", "enabled-disabled": "Enabled/Disabled", - "models": { - "title": "Models", - "allowedModels": { - "title": "Allowed Models", - "inheritSwitch": "Inherit Allowed Models" + "variants": { + "title": "Variants", + "allowedVariants": { + "title": "Allowed Variants", + "inheritSwitch": "Inherit Allowed Variants" }, - "preferredModel": { - "title": "Preferred Model", + "selectedVariant": { + "title": "Selected Variant", "inherit": "Inherit" } }, @@ -63,21 +68,13 @@ "global": "Global Iris Settings", "course": "Course Iris Settings", "exercise": "Exercise Iris Settings" - }, - "autoUpdate": { - "title": "Auto Update Settings", - "tooltip": "If enabled, the specific global Iris settings will be automatically updated when a new release of Artemis provides new Iris settings.", - "chatLabel": "Auto Update Chat Settings", - "hestiaLabel": "Auto Update Hestia Settings", - "lectureIngestionLabel": "Auto Update Lecture Ingestion Settings", - "competencyGenerationLabel": "Auto Update Competency Generation Settings" } }, "error": { "forbidden": "Artemis is not configured to use Iris. (Invalid token)", "internalPyrisError": "An internal error when communicating with the LLM occurred. Error message is: {{ pyrisErrorMessage }}.", "invalidTemplate": "The template is invalid. Error message is: {{ pyrisErrorMessage }}.", - "noModelAvailable": "Model {{ model }} is not available to use. Please contact your administrator if this problem persists.", + "noVariantAvailable": "Variant {{ variant }} is not available to use. Please contact your administrator if this problem persists.", "noResponse": "No response from Iris was received.", "parseResponse": "An error occurred while parsing the response from Iris. Cause: {{ cause }}" }, diff --git a/src/main/webapp/i18n/en/lectureUnit.json b/src/main/webapp/i18n/en/lectureUnit.json index 477ddfa2cb4b..d83040554b23 100644 --- a/src/main/webapp/i18n/en/lectureUnit.json +++ b/src/main/webapp/i18n/en/lectureUnit.json @@ -100,7 +100,7 @@ "sourcePlaceHolder": "Enter an URL to an external online resource", "sourceRequiredValidationError": "Link is required", "sourceURLValidationError": "Not a valid URL", - "urlHelperPlaceholder": "Name and description will be loaded from the meta data of the link" + "urlHelperPlaceholder": "Name and description will be loaded from the metadata of the link" }, "editOnlineUnit": { "title": "Edit Online Unit" diff --git a/src/main/webapp/i18n/en/lti.json b/src/main/webapp/i18n/en/lti.json index 47037969f583..94d21201708b 100644 --- a/src/main/webapp/i18n/en/lti.json +++ b/src/main/webapp/i18n/en/lti.json @@ -37,7 +37,7 @@ "jwkSetUri": "JWKSet URI", "customName": "Custom Name", "startExercise": "Welcome to Artemis! Click the button Start Exercise!", - "ltiSuccessLoginRequired": "Successfully launched LTI exercise. Please login as user {{user}}.", + "ltiSuccessLoginRequired": "Successfully launched LTI exercise. Please log in as user {{user}}.", "exercises": "Exercises", "lti": "LTI", "configurationForCourse": "LTI Configuration for course {{ title }}", diff --git a/src/main/webapp/i18n/en/metis.json b/src/main/webapp/i18n/en/metis.json index e6f16bc671fc..9a3ff0977f2b 100644 --- a/src/main/webapp/i18n/en/metis.json +++ b/src/main/webapp/i18n/en/metis.json @@ -90,7 +90,9 @@ "TECH_SUPPORT": "Tech Support", "ORGANIZATION": "Organization", "RANDOM": "Random", - "ANNOUNCEMENT": "Announcement" + "ANNOUNCEMENT": "Announcement", + "allPublicMessages": "All Public Messages", + "searchResults": "Search Results for '{{ search }}'" }, "post": { "context": "Context", @@ -110,7 +112,7 @@ "similarPosts": "Similar Posts", "similarPostsTooltip": "The automatic post comparison has found the following posts that might be similar to your request - please check if your question has already been asked and/or answered. Click on the title or the exercise/lecture name before the title to navigate to a post or the exercise/lecture, respectively.", "content": "Content", - "contentTooltip": "Describe your issue or request as precise as possible. Use markdown formatting where it improves readability.", + "contentTooltip": "Describe your issue or request as precise as possible. Use Markdown formatting where it improves readability.", "created": "New post successfully created", "updated": "Post successfully updated", "deleted": "Post successfully deleted", diff --git a/src/main/webapp/i18n/en/modelingAssessmentEditor.json b/src/main/webapp/i18n/en/modelingAssessmentEditor.json index 05cd294f3c29..9bc65d1b8b36 100644 --- a/src/main/webapp/i18n/en/modelingAssessmentEditor.json +++ b/src/main/webapp/i18n/en/modelingAssessmentEditor.json @@ -22,7 +22,7 @@ "updateAfterComplaintSuccessful": "The assessment was updated successfully.", "updateAfterComplaintFailed": "Updating the assessment failed.", "confirmSubmission": "You have not assessed all model elements. Are you sure you want to submit this assessment? You will not be able to change it afterwards.", - "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted and the submission will be available for assessment to other tutors again.", + "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted, and the submission will be available for assessment to other tutors again.", "noConflicts": "Conflicts could not be loaded", "conflictsResolved": "All conflicts have been processed.", "feedbackTextTooLong": "Failed to save assessment. Feedback text must be no longer than 500 characters.", diff --git a/src/main/webapp/i18n/en/programmingAssessment.json b/src/main/webapp/i18n/en/programmingAssessment.json index 5425de69f994..1cce56d7b7e2 100644 --- a/src/main/webapp/i18n/en/programmingAssessment.json +++ b/src/main/webapp/i18n/en/programmingAssessment.json @@ -4,7 +4,7 @@ "dashboard": { "heading": "Submissions and assessments of programming exercise \"{{exerciseTitle}}\"" }, - "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted and the submission will be available for assessment to other tutors again.", + "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted, and the submission will be available for assessment to other tutors again.", "notFound": "We couldn't find any unassessed programming submissions, please go back.", "penalty": "Penalty", "issues": "Issues", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 30712348289a..9e88733b77e6 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -58,7 +58,7 @@ "uploadForImport": "Upload Programming Exercise for Import", "fileTooBigError": "The file {{ fileName }} is too large. The maximum file size is 20 MB.", "fileTypeNotSupportedError": "The file type is not supported. Please select a file with the extension .zip.", - "noExerciseDetailsJsonAtRootLevel": "The zip file does not contain a .json file at the root level with the exercise details.", + "noExerciseDetailsJsonAtRootLevel": "The zip file does not contain a JSON file at the root level with the exercise details.", "notSupportedProgrammingLanguage": "The programming language {{ programmingLanguage }} is not yet supported for the import from file.", "GccNotSupportedForC": "The project type is not yet supported for the import from file." }, @@ -128,6 +128,23 @@ "dockerImage": "Docker Image", "script": "Build script", "customizeDockerImage": "You can customize the Docker image. Make sure to provide it in amd64 and arm64 and include all build dependencies to guarantee a short build duration.", + "checkoutPath": { + "title": "Checkout Path", + "customize": "You can customize the checkout path where the repositories are cloned inside the Docker container. Make sure to provide a valid absolute UNIX path. The default path is /var/tmp.", + "alert": "Checkout paths must only contain words, '_', '-', and '/' characters, but must not start nor end with a '/' character. The paths must be different for each repository.", + "edit": "Edit repositories checkout path", + "assignment": "Assignment Repository Checkout Path. This can't be edited after creation.", + "solution": "Solution Repository Checkout Path. This can't be edited after creation.", + "tests": "Tests Repository Checkout Path. This can't be edited after creation.", + "invalid": "Invalid checkout paths", + "warning": "Modifying checkout paths may result in build failures. Some programming languages rely on Docker images that assume specific directory structures for the code.", + "warningBuildScript": "Make sure to adjust the build script and repositories accordingly." + }, + "timeout": { + "title": "Maximum build duration in seconds", + "customize": "Set to 0 to use default value. Make sure to provide a valid integer value. The unit is seconds. Note that this value may be overridden by the maximum limit set by the administrators (default is 240s).", + "alert": "The timeout must be a valid integer value." + }, "allowOnlineEditor": { "title": "Allow Online Editor", "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected", @@ -458,7 +475,7 @@ }, "repositoryIsLocked": { "title": "Your repository is locked.", - "tooltip": "You are outside of the participation timeframe or you reached your submission limit, your repository is locked. You may still read the code but you may not make any changes to it." + "tooltip": "You are outside the participation timeframe, or you reached your submission limit, your repository is locked. You may still read the code, but you may not make any changes to it." }, "checkoutDirectories": "Checkout directories", "preview": { diff --git a/src/main/webapp/i18n/en/result.json b/src/main/webapp/i18n/en/result.json index 67bdc0711adb..f8178c0cde1e 100644 --- a/src/main/webapp/i18n/en/result.json +++ b/src/main/webapp/i18n/en/result.json @@ -92,6 +92,7 @@ "preliminary": "preliminary", "preliminaryTooltip": "Your result is not final yet, because more tests will be executed after the due date", "preliminaryTooltipSemiAutomatic": "Your result is not final yet, because more tests will be executed after the due date or a manual assessment will be done.", + "preliminaryTooltipAthena": "This is an AI grading. The actual result may differ", "codeIssuesTooltip": "The automatic code analysis generated some warnings for your code.", "noResultDetails": "No result details available.", "onlyCompilationTested": "Your code compiled successfully. There are currently no tests visible.", diff --git a/src/main/webapp/i18n/en/standardizedCompetency.json b/src/main/webapp/i18n/en/standardizedCompetency.json index d09fb4aaed75..69038c395d26 100644 --- a/src/main/webapp/i18n/en/standardizedCompetency.json +++ b/src/main/webapp/i18n/en/standardizedCompetency.json @@ -51,16 +51,16 @@ }, "format": { "title": "Required File Format", - "text1": "Standardized competencies can be imported from a .json file into Artemis. After selecting a file, you can then verify that the knowledge areas and competencies were read correctly.", - "text2": "The .json file must contain an object with the keys knowledgeAreas and sources. The former contains all knowledge areas and standardized competencies to import and the latter contains all source details of the competencies imported.", + "text1": "Standardized competencies can be imported from a JSON file into Artemis. After selecting a file, you can then verify that the knowledge areas and competencies were read correctly.", + "text2": "The JSON file must contain an object with the keys knowledgeAreas and sources. The former contains all knowledge areas and standardized competencies to import, and the latter contains all source details of the competencies imported.", "text3": "Example of a valid import file (except for the comments):" }, "count": "Read {{competencies}} competencies and {{knowledgeAreas}} knowledge areas from the file", "error": { "fileCount": "Please only upload one file", "fileTooBig": "The file is too big. The maximum file size is 20 MB", - "fileExtension": "Unsupported file extension. Please upload a .json file", - "fileSyntax": "Unable to parse file. Please upload a file with valid .json syntax", + "fileExtension": "Unsupported file extension. Please upload a JSON file", + "fileSyntax": "Unable to parse file. Please upload a file with valid JSON syntax", "fileStructure": "Unable to parse file. Please verify it follows the required file structure" }, "success": "Successfully imported all knowledge areas and standardized competencies" diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json index ae6d54800cd6..b9eddb4ecfa3 100644 --- a/src/main/webapp/i18n/en/student-dashboard.json +++ b/src/main/webapp/i18n/en/student-dashboard.json @@ -5,13 +5,18 @@ "recentlyAccessed": "Recently accessed courses", "otherCourses": "Other courses", "noCourses": "You are not enrolled in any courses. Enroll manually or contact your course instructor.", + "sort": "Sort", "exerciseTitle": "Current active exercise in \"{{ course }}\"", "exerciseTitleWithoutDueDate": "Current exercise in \"{{ course }}\":", "examTitle": "Current exam in \"{{ course }}\":", "cardTitle": "Your overall points:", "noStatistics": "No statistics available", "cardNoExerciseLabel": "No exercise planned", - "cardExerciseLabel": "Next Exercise:", + "cardExerciseLabel": "Next Exercise", + "points": "{{ totalAbsoluteScore }} / {{ totalReachableScore }} Points", + "cardScore": "Score", + "cardManageCourse": "Manage Course", + "noCoursesFound": "No Courses Found", "enroll": { "title": "Course Enrollment", "enrollSuccessful": "Enrollment successful", @@ -88,7 +93,8 @@ "testExam": "Test Exam", "communication": "Communication", "plagiarismCases": "Plagiarism Cases", - "gradingSystem": "Grading System" + "gradingSystem": "Grading System", + "faq": "FAQ" }, "exerciseFilter": { "filter": "Filter", @@ -297,7 +303,7 @@ "assessmentDue": "Assessment due:", "assessmentDueTooltip": "The assessment is due by {{date}}.", "complaintDue": "Complaint due:", - "complaintDueTooltip": "You can write a complain until {{date}}.", + "complaintDueTooltip": "You can write a complaint until {{date}}.", "complaintPossible": "Complaint possible:", "complaintPossibleTooltip": "After receiving an assessment, you will have {{days}} days to file a complaint.", "presented": "Presented:", diff --git a/src/main/webapp/i18n/en/team.json b/src/main/webapp/i18n/en/team.json index 23d292a9dce7..8c4b60a17c69 100644 --- a/src/main/webapp/i18n/en/team.json +++ b/src/main/webapp/i18n/en/team.json @@ -106,7 +106,7 @@ "buttonLabel": "Import teams", "dialogTitle": "Import teams into:", "introTextExercise": "This dialog can be used to import teams from another exercise of this course into this exercise.", - "introTextFile": "This dialog can be used to import teams from a .json or .csv file into this exercise.", + "introTextFile": "This dialog can be used to import teams from a JSON or CSV file into this exercise.", "error": "Could not import teams. Please try again.", "fromAnExercise": "From an exercise", "fromAFile": "From a file" @@ -163,7 +163,7 @@ "purgeExisting": { "label": "Purge existing", "badge": "dangerous", - "explanation": "Before importing all of the teams from the source exercise above, all existing teams and their participation in this exercise will be deleted." + "explanation": "Before importing all the teams from the source exercise above, all existing teams and their participation in this exercise will be deleted." }, "createOnly": { "label": "Create only", diff --git a/src/main/webapp/i18n/en/textAssessment.json b/src/main/webapp/i18n/en/textAssessment.json index 5b709235f3f0..dd9ca1e40cb3 100644 --- a/src/main/webapp/i18n/en/textAssessment.json +++ b/src/main/webapp/i18n/en/textAssessment.json @@ -37,7 +37,7 @@ "updateAfterComplaintSuccessful": "The assessment was updated successfully.", "updateAfterComplaintFailed": "Updating the assessment failed.", "cancel": "Cancel assessment", - "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted and the submission will be available for assessment to other tutors again.", + "confirmCancel": "Are you sure you want to cancel the assessment? Your current assessment progress will be deleted, and the submission will be available for assessment to other tutors again.", "feedbackEditor": { "dismissFeedback": "Do you want to delete this feedback?", "dismissFeedbackConfirmation": "Please confirm that you want to delete this feedback!" diff --git a/src/main/webapp/i18n/en/tutorialGroupImport.json b/src/main/webapp/i18n/en/tutorialGroupImport.json index 0537baae74ef..60212e8295fc 100644 --- a/src/main/webapp/i18n/en/tutorialGroupImport.json +++ b/src/main/webapp/i18n/en/tutorialGroupImport.json @@ -38,10 +38,10 @@ "notitle": "No tutorial group title", "nologinorregistrationnumber": "No login or matriculation number", "nouserfound": "No matching student found in course", - "multipleregistrations": "Multiple registrations in csv for student" + "multipleregistrations": "Multiple registrations in CSV for student" }, "csvFile": { - "label": "Select a .csv file", + "label": "Select a CSV file", "validationFailed": "Please repair the file, it is not considered valid due to the following error: ", "parseCSVButton": "Parse CSV" }, diff --git a/src/main/webapp/i18n/en/tutorialGroups.json b/src/main/webapp/i18n/en/tutorialGroups.json index 76b9f2cd90ba..cc6b966db947 100644 --- a/src/main/webapp/i18n/en/tutorialGroups.json +++ b/src/main/webapp/i18n/en/tutorialGroups.json @@ -53,7 +53,12 @@ "utilizationHelpDetail": "Average attendance divided by capacity", "averageAttendance": "Average attendance: {{ averageAttendance }}", "averageAttendanceDetail": "Average Attendance", - "averageAttendanceHelpDetail": "Average attendance in the last three sessions. If no attendance is entered, the corresponding session is ignored and the calculation is performed with two or one session." + "averageAttendanceHelpDetail": "Average attendance in the last three sessions. If no attendance is entered, the corresponding session is ignored and the calculation is performed with two or one session.", + "profilePicture": "Tutor Profile Picture", + "profilePictureAlt": "Profile picture of {{ user }}", + "name": "Name", + "information": "Information", + "isNotOnline": "Not Online" }, "tutorialGroupSchedule": { "dayOfWeek": "Day of Week", @@ -236,7 +241,7 @@ "useTutorialGroupChannelsInput": { "label": "Use Artemis managed Tutorial Group Channels", "channelDeletionWarning": "You have disabled the use of Artemis managed tutorial group channels. All channels that were created by Artemis will be deleted. Are you sure you want to do this?", - "explanation": "If enabled, Artemis will create a dedicated channel for each tutorial group in the 'Communication' section of the course. The channel can still be managed manually but Artemis automatically performs some common management tasks. Artemis will automatically add and remove students from the channel when they register or unregister for the tutorial group. The assigned tutor of the tutorial group will be made a moderator of the channel. The channel will be deleted when the tutorial group is deleted. It can not be deleted manually. This option can be changed later." + "explanation": "If enabled, Artemis will create a dedicated channel for each tutorial group in the 'Communication' section of the course. The channel can still be managed manually, but Artemis automatically performs some common management tasks. Artemis will automatically add and remove students from the channel when they register or unregister for the tutorial group. The assigned tutor of the tutorial group will be made a moderator of the channel. The channel will be deleted when the tutorial group is deleted. It can not be deleted manually. This option can be changed later." } } }, diff --git a/src/main/webapp/i18n/en/userSettings.json b/src/main/webapp/i18n/en/userSettings.json index 328be05e823a..29afe83a0c3c 100644 --- a/src/main/webapp/i18n/en/userSettings.json +++ b/src/main/webapp/i18n/en/userSettings.json @@ -27,11 +27,22 @@ "deleteFailure": "Failed to delete SSH key.", "deleteSuccess": "Successfully deleted SSH key.", "cancelSavingSshKey": "Cancel", - "editExistingSshKey": "Edit SSH key", - "addNewSshKey": "New SSH key", + "editExistingSshKey": "Edit", + "viewExistingSshKey": "View", + "addNewSshKey": "Add SSH key", + "sshKeyDetails": "SSH key details", "deleteSshKey": "Delete", "sshKeyDisplayedInformation": "This is your currently configured SSH key:", - "key": "SSH Key" + "key": "Key", + "noKeysHaveBeenAdded": "No SSH keys have been added", + "whatToUseSSHForInfo": "Use SSH keys to connect simply and securely to repositories.", + "learnMore": "Learn more about SSH keys", + "alreadyHaveKey": "Already have a key? Copy your key to the clipboard:", + "back": "Back", + "keysTablePageTitle": "SSH keys", + "keys": "Keys", + "actions": "Actions", + "keyName": "Key 1 (at the moment you can only have one key)" }, "vcsAccessTokensSettingsPage": { "addTokenTitle": "Add personal access token", diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index fd48d4a5ace5..8782f11f8593 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -3,10 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import java.time.Instant; import java.time.ZonedDateTime; import java.util.List; -import java.util.Optional; import java.util.Set; import org.junit.jupiter.api.AfterEach; @@ -15,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; @@ -60,11 +57,7 @@ class ExerciseScoresChartIntegrationTest extends AbstractSpringIntegrationIndepe @BeforeEach void setupTestScenario() { - // Prevents the ParticipantScoreScheduleService from scheduling tasks related to prior results - ReflectionTestUtils.setField(participantScoreScheduleService, "lastScheduledRun", Optional.of(Instant.now())); - ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 50; - participantScoreScheduleService.activate(); ZonedDateTime pastTimestamp = ZonedDateTime.now().minusDays(5); userUtilService.addUsers(TEST_PREFIX, 3, 2, 0, 0); Course course = courseUtilService.createCourse(); diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index 85f521f00be5..1313f5147150 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -3,10 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import java.time.Instant; import java.time.ZonedDateTime; import java.util.List; -import java.util.Optional; import java.util.Set; import org.junit.jupiter.api.AfterEach; @@ -15,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; @@ -98,11 +95,7 @@ class ParticipantScoreIntegrationTest extends AbstractSpringIntegrationLocalCILo @BeforeEach void setupTestScenario() { - // Prevents the ParticipantScoreScheduleService from scheduling tasks related to prior results - ReflectionTestUtils.setField(participantScoreScheduleService, "lastScheduledRun", Optional.of(Instant.now())); - ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 200; - participantScoreScheduleService.activate(); ZonedDateTime pastTimestamp = ZonedDateTime.now().minusDays(5); // creating the users student1, tutor1 and instructors1 userUtilService.addUsers(TEST_PREFIX, 1, 1, 0, 1); diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultListenerIntegrationTest.java index 4877e18e8c99..dffe1451edf7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultListenerIntegrationTest.java @@ -4,10 +4,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import java.time.Instant; import java.time.ZonedDateTime; import java.util.List; -import java.util.Optional; import java.util.Set; import org.junit.jupiter.api.AfterEach; @@ -17,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.domain.Result; @@ -84,11 +81,7 @@ void cleanup() { @BeforeEach void setupTestScenario() { - // Prevents the ParticipantScoreScheduleService from scheduling tasks related to prior results - ReflectionTestUtils.setField(participantScoreScheduleService, "lastScheduledRun", Optional.of(Instant.now())); - ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 100; - participantScoreScheduleService.activate(); ZonedDateTime pastReleaseDate = ZonedDateTime.now().minusDays(5); ZonedDateTime pastDueDate = ZonedDateTime.now().minusDays(3); ZonedDateTime pastAssessmentDueDate = ZonedDateTime.now().minusDays(2); diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentRepositoryArchitectureTest.java new file mode 100644 index 000000000000..8dd9f65e908f --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.assessment.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class AssessmentRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".assessment"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentResourceArchitectureTest.java new file mode 100644 index 000000000000..2fdabf0f0ba1 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.assessment.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class AssessmentResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".assessment"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentServiceArchitectureTest.java new file mode 100644 index 000000000000..2416f7230302 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/architecture/AssessmentServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.assessment.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class AssessmentServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".assessment"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationServiceTest.java index 89d594d99982..f6c323c8e798 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationServiceTest.java @@ -35,7 +35,6 @@ import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -45,9 +44,6 @@ class CourseScoreCalculationServiceTest extends AbstractSpringIntegrationIndepen private static final String TEST_PREFIX = "cscservicetest"; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private StudentParticipationTestRepository studentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/util/StudentScoreUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/util/StudentScoreUtilService.java index 409c18fdc45d..a2e9aeee3da1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/util/StudentScoreUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/util/StudentScoreUtilService.java @@ -34,6 +34,23 @@ public void createStudentScore(Exercise exercise, User user, double score) { studentScoreRepository.save(studentScore); } + /** + * Creates rated and normal score (which are set equal) for given exercise and user. + * + * @param exercise the exercise to link the student score to + * @param user the user that is linked to the score + * @param score the score and rated score that the specified user has reached for the given exercise + */ + public void createRatedStudentScore(Exercise exercise, User user, double score) { + final var studentScore = new StudentScore(); + studentScore.setExercise(exercise); + studentScore.setUser(user); + studentScore.setLastScore(score); + studentScore.setLastPoints(exercise.getMaxPoints() * score / 100); + studentScore.setLastRatedScore(score); + studentScoreRepository.save(studentScore); + } + /** * Creates student score for given exercise and user. * diff --git a/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaRepositoryArchitectureTest.java new file mode 100644 index 000000000000..cdfd6b6f5030 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.athena.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class AthenaRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".athena"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaResourceArchitectureTest.java new file mode 100644 index 000000000000..c1f38f97619c --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.athena.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class AthenaResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".athena"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaServiceArchitectureTest.java new file mode 100644 index 000000000000..7ecf7c9953b3 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/athena/architecture/AthenaServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.athena.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class AthenaServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".athena"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/AbstractAtlasIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/AbstractAtlasIntegrationTest.java new file mode 100644 index 000000000000..744c27d2f937 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/AbstractAtlasIntegrationTest.java @@ -0,0 +1,158 @@ +package de.tum.cit.aet.artemis.atlas; + +import org.springframework.beans.factory.annotation.Autowired; + +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.PrerequisiteUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.StandardizedCompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.learningpath.util.LearningPathUtilService; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyJolRepository; +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.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceSettingRepository; +import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.atlas.test_repository.CompetencyProgressTestRepository; +import de.tum.cit.aet.artemis.atlas.test_repository.LearningPathTestRepository; +import de.tum.cit.aet.artemis.atlas.test_repository.ScienceEventTestRepository; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; +import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.test_repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; + +public abstract class AbstractAtlasIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + // Repositories + @Autowired + protected CompetencyRepository competencyRepository; + + @Autowired + protected CourseCompetencyRepository courseCompetencyRepository; + + @Autowired + protected CompetencyRelationRepository competencyRelationRepository; + + @Autowired + protected CompetencyProgressTestRepository competencyProgressRepository; + + @Autowired + protected KnowledgeAreaRepository knowledgeAreaRepository; + + @Autowired + protected StandardizedCompetencyRepository standardizedCompetencyRepository; + + @Autowired + protected SourceRepository sourceRepository; + + @Autowired + protected LearningPathTestRepository learningPathRepository; + + @Autowired + protected ScienceSettingRepository scienceSettingRepository; + + @Autowired + protected ScienceEventTestRepository scienceEventRepository; + + @Autowired + protected PrerequisiteRepository prerequisiteRepository; + + @Autowired + protected CompetencyJolRepository competencyJolRepository; + + // External Repositories + @Autowired + protected LectureRepository lectureRepository; + + @Autowired + protected LectureUnitRepository lectureUnitRepository; + + @Autowired + protected GradingCriterionRepository gradingCriterionRepository; + + @Autowired + protected TextUnitRepository textUnitRepository; + + @Autowired + protected AttachmentUnitRepository attachmentUnitRepository; + + @Autowired + protected ExerciseUnitRepository exerciseUnitRepository; + + @Autowired + protected SubmissionTestRepository submissionRepository; + + @Autowired + protected ProgrammingExerciseTestRepository programmingExerciseRepository; + + @Autowired + protected ProgrammingExerciseBuildConfigRepository programmingExerciseBuildConfigRepository; + + // Services + @Autowired + protected CompetencyProgressService competencyProgressService; + + @Autowired + protected FeatureToggleService featureToggleService; + + // External Services + @Autowired + protected LectureUnitService lectureUnitService; + + @Autowired + protected ParticipationService participationService; + + // Util Services + @Autowired + protected CompetencyProgressUtilService competencyProgressUtilService; + + @Autowired + protected CompetencyUtilService competencyUtilService; + + @Autowired + protected PrerequisiteUtilService prerequisiteUtilService; + + @Autowired + protected StandardizedCompetencyUtilService standardizedCompetencyUtilService; + + @Autowired + protected LearningPathUtilService learningPathUtilService; + + // External Util Services + @Autowired + protected PageableSearchUtilService pageableSearchUtilService; + + @Autowired + protected TextExerciseUtilService textExerciseUtilService; + + @Autowired + protected LectureUtilService lectureUtilService; + + @Autowired + protected StudentScoreUtilService studentScoreUtilService; + + @Autowired + protected ParticipationUtilService participationUtilService; + + @Autowired + protected TeamUtilService teamUtilService; +} diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasRepositoryArchitectureTest.java new file mode 100644 index 000000000000..b2f7d4c4faee --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.atlas.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class AtlasRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".atlas"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasResourceArchitectureTest.java new file mode 100644 index 000000000000..2469bbb9ffd1 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.atlas.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class AtlasResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".atlas"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasServiceArchitectureTest.java new file mode 100644 index 000000000000..85f1f0e7f084 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.atlas.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class AtlasServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".atlas"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasTestArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasTestArchitectureTest.java new file mode 100644 index 000000000000..96bdd6b27d58 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/architecture/AtlasTestArchitectureTest.java @@ -0,0 +1,17 @@ +package de.tum.cit.aet.artemis.atlas.architecture; + +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleTestArchitectureTest; + +class AtlasTestArchitectureTest extends AbstractModuleTestArchitectureTest { + + @Override + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".atlas"; + } + + @Override + protected Class getAbstractModuleIntegrationTestClass() { + return AbstractAtlasIntegrationTest.class; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index 899bcaa60ec7..a9ed4ea6736a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -1,103 +1,61 @@ package de.tum.cit.aet.artemis.atlas.competency; +import static de.tum.cit.aet.artemis.core.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import java.time.ZoneId; import java.time.ZonedDateTime; -import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.PrerequisiteUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.StandardizedCompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; 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.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; -import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; -abstract class AbstractCompetencyPrerequisiteIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { - - @Autowired - protected LectureRepository lectureRepository; - - @Autowired - protected TextUnitRepository textUnitRepository; - - @Autowired - protected AttachmentUnitRepository attachmentUnitRepository; - - @Autowired - protected ExerciseUnitRepository exerciseUnitRepository; - - @Autowired - protected CompetencyRelationRepository competencyRelationRepository; - - @Autowired - protected PrerequisiteRepository prerequisiteRepository; - - @Autowired - protected LectureUnitRepository lectureUnitRepository; - - @Autowired - protected PrerequisiteUtilService prerequisiteUtilService; - - @Autowired - protected CompetencyProgressUtilService competencyProgressUtilService; - - @Autowired - protected LectureUtilService lectureUtilService; - - @Autowired - protected StandardizedCompetencyUtilService standardizedCompetencyUtilService; - - @Autowired - protected CourseCompetencyRepository courseCompetencyRepository; +abstract class AbstractCompetencyPrerequisiteIntegrationTest extends AbstractAtlasIntegrationTest { protected Course course; protected Course course2; - protected CourseCompetency competency; + protected CourseCompetency courseCompetency; protected Lecture lecture; - protected long idOfTextUnitOfLectureOne; + protected TextUnit textUnitOfLectureOne; - protected long idOfAttachmentUnitOfLectureOne; + protected AttachmentUnit attachmentUnitOfLectureOne; protected TextExercise teamTextExercise; @@ -114,16 +72,15 @@ void setupTestScenario(String TEST_PREFIX, Function cr // creating course course = courseUtilService.createCourse(); - course2 = courseUtilService.createCourse(); - competency = createCourseCompetencyForCourse.apply(course); + courseCompetency = createCourseCompetencyForCourse.apply(course); lecture = createLecture(course); - textExercise = createTextExercise(pastTimestamp, pastTimestamp, pastTimestamp, Set.of(competency), false); - teamTextExercise = createTextExercise(pastTimestamp, pastTimestamp, pastTimestamp, Set.of(competency), true); + textExercise = createTextExercise(pastTimestamp, pastTimestamp, pastTimestamp, Set.of(courseCompetency), false); + teamTextExercise = createTextExercise(pastTimestamp, pastTimestamp, pastTimestamp, Set.of(courseCompetency), true); - creatingLectureUnitsOfLecture(competency); + creatingLectureUnitsOfLecture(courseCompetency); } CompetencyRelation createRelation(CourseCompetency tail, CourseCompetency head, RelationType type) { @@ -136,18 +93,17 @@ CompetencyRelation createRelation(CourseCompetency tail, CourseCompetency head, void creatingLectureUnitsOfLecture(CourseCompetency competency) { // creating lecture units for lecture one - TextUnit textUnit = new TextUnit(); textUnit.setName("TextUnitOfLectureOne"); textUnit.setCompetencies(Set.of(competency)); textUnit = textUnitRepository.save(textUnit); - idOfTextUnitOfLectureOne = textUnit.getId(); + textUnitOfLectureOne = textUnit; - AttachmentUnit attachmentUnit = new AttachmentUnit(); + AttachmentUnit attachmentUnit = lectureUtilService.createAttachmentUnit(true); attachmentUnit.setName("AttachmentUnitOfLectureOne"); attachmentUnit.setCompetencies(Set.of(competency)); attachmentUnit = attachmentUnitRepository.save(attachmentUnit); - idOfAttachmentUnitOfLectureOne = attachmentUnit.getId(); + attachmentUnitOfLectureOne = attachmentUnit; ExerciseUnit textExerciseUnit = new ExerciseUnit(); textExerciseUnit.setExercise(textExercise); @@ -179,6 +135,10 @@ TextExercise createTextExercise(ZonedDateTime releaseDate, ZonedDateTime dueDate if (isTeamExercise) { textExercise.setMode(ExerciseMode.TEAM); + TeamAssignmentConfig teamAssignmentConfig = new TeamAssignmentConfig(); + teamAssignmentConfig.setMinTeamSize(1); + teamAssignmentConfig.setMaxTeamSize(2); + textExercise.setTeamAssignmentConfig(teamAssignmentConfig); } textExercise.setMaxPoints(10.0); @@ -188,27 +148,34 @@ TextExercise createTextExercise(ZonedDateTime releaseDate, ZonedDateTime dueDate return exerciseRepository.save(textExercise); } + private ProgrammingExercise createProgrammingExercise(ZonedDateTime releaseDate, ZonedDateTime dueDate) { + ProgrammingExercise programmingExercise = ProgrammingExerciseFactory.generateProgrammingExercise(releaseDate, dueDate, course, ProgrammingLanguage.JAVA); + programmingExercise.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise.getBuildConfig())); + programmingExercise.setCompetencies(Set.of(courseCompetency)); + return exerciseRepository.save(programmingExercise); + } + abstract CourseCompetency getCall(long courseId, long competencyId, HttpStatus expectedStatus) throws Exception; // Test void shouldReturnCompetencyForStudent() throws Exception { - CourseCompetency response = getCall(course.getId(), competency.getId(), HttpStatus.OK); - assertThat(response.getId()).isEqualTo(competency.getId()); + CourseCompetency response = getCall(course.getId(), courseCompetency.getId(), HttpStatus.OK); + assertThat(response.getId()).isEqualTo(courseCompetency.getId()); } // Test void testShouldOnlySendUserSpecificData(String TEST_PREFIX) throws Exception { User student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); - competencyProgressUtilService.createCompetencyProgress(competency, student1, 0, 1); + competencyProgressUtilService.createCompetencyProgress(courseCompetency, student1, 0, 1); User student2 = userUtilService.getUserByLogin(TEST_PREFIX + "student2"); - competencyProgressUtilService.createCompetencyProgress(competency, student2, 10, 1); + competencyProgressUtilService.createCompetencyProgress(courseCompetency, student2, 10, 1); - final var textUnit = textUnitRepository.findById(idOfTextUnitOfLectureOne).get(); + final var textUnit = textUnitRepository.findById(textUnitOfLectureOne.getId()).get(); lectureUtilService.completeLectureUnitForUser(textUnit, student2); - CourseCompetency response = getCall(course.getId(), competency.getId(), HttpStatus.OK); - assertThat(response.getId()).isEqualTo(competency.getId()); + CourseCompetency response = getCall(course.getId(), courseCompetency.getId(), HttpStatus.OK); + assertThat(response.getId()).isEqualTo(courseCompetency.getId()); // only progress of student1 is fetched assertThat(response.getUserProgress()).hasSize(1); @@ -219,18 +186,18 @@ void testShouldOnlySendUserSpecificData(String TEST_PREFIX) throws Exception { // Test void shouldReturnForbiddenForUserNotInCourse() throws Exception { - getCall(course.getId(), competency.getId(), HttpStatus.FORBIDDEN); + getCall(course.getId(), courseCompetency.getId(), HttpStatus.FORBIDDEN); } // Test void shouldReturnBadRequestForWrongCourse() throws Exception { - getCall(course2.getId(), competency.getId(), HttpStatus.BAD_REQUEST); + getCall(course2.getId(), courseCompetency.getId(), HttpStatus.BAD_REQUEST); } abstract List getAllCall(long courseId, HttpStatus expectedStatus) throws Exception; // Test - void shouldReturnCompetenciesForStudentOfCourse(CourseCompetency newCompetency) throws Exception { + void shouldReturnCompetenciesForCourse(CourseCompetency newCompetency) throws Exception { TextUnit unreleasedLectureUnit = new TextUnit(); unreleasedLectureUnit.setName("TextUnitOfLectureOne"); unreleasedLectureUnit.setReleaseDate(ZonedDateTime.now().plusDays(5)); @@ -246,7 +213,7 @@ void shouldReturnCompetenciesForStudentOfCourse(CourseCompetency newCompetency) List competenciesOfCourse = getAllCall(course.getId(), HttpStatus.OK); - assertThat(competenciesOfCourse).anyMatch(c -> c.getId().equals(competency.getId())); + assertThat(competenciesOfCourse).anyMatch(c -> c.getId().equals(courseCompetency.getId())); assertThat(competenciesOfCourse.stream().filter(l -> l.getId().equals(newCompetency.getId())).findFirst().orElseThrow().getLectureUnits()).isEmpty(); } @@ -259,15 +226,15 @@ void testShouldReturnForbiddenForStudentNotInCourse() throws Exception { // Test void shouldDeleteCompetencyWhenInstructor() throws Exception { - deleteCall(course.getId(), competency.getId(), HttpStatus.OK); - getCall(course.getId(), competency.getId(), HttpStatus.NOT_FOUND); + deleteCall(course.getId(), courseCompetency.getId(), HttpStatus.OK); + getCall(course.getId(), courseCompetency.getId(), HttpStatus.NOT_FOUND); } // Test void shouldDeleteCompetencyAndRelations(CourseCompetency competency2) throws Exception { - createRelation(competency, competency2, RelationType.EXTENDS); + createRelation(courseCompetency, competency2, RelationType.EXTENDS); - deleteCall(course.getId(), competency.getId(), HttpStatus.OK); + deleteCall(course.getId(), courseCompetency.getId(), HttpStatus.OK); Set relations = competencyRelationRepository.findAllWithHeadAndTailByCourseId(course.getId()); assertThat(relations).isEmpty(); @@ -275,17 +242,17 @@ void shouldDeleteCompetencyAndRelations(CourseCompetency competency2) throws Exc // Test void shouldReturnForbiddenForInstructorOfOtherCourseForDelete() throws Exception { - deleteCall(course.getId(), competency.getId(), HttpStatus.FORBIDDEN); + deleteCall(course.getId(), courseCompetency.getId(), HttpStatus.FORBIDDEN); } // Test void deleteCourseShouldAlsoDeleteCompetencyAndRelations(CourseCompetency competency2) throws Exception { - CompetencyRelation relation = createRelation(competency, competency2, RelationType.EXTENDS); + CompetencyRelation relation = createRelation(courseCompetency, competency2, RelationType.EXTENDS); Prerequisite prerequisite = prerequisiteUtilService.createPrerequisite(course); request.delete("/api/admin/courses/" + course.getId(), HttpStatus.OK); - assertThat(courseCompetencyRepository.existsById(competency.getId())).isFalse(); + assertThat(courseCompetencyRepository.existsById(courseCompetency.getId())).isFalse(); assertThat(courseCompetencyRepository.existsById(competency2.getId())).isFalse(); assertThat(competencyRelationRepository.existsById(relation.getId())).isFalse(); assertThat(prerequisiteRepository.existsById(prerequisite.getId())).isFalse(); @@ -295,27 +262,27 @@ void deleteCourseShouldAlsoDeleteCompetencyAndRelations(CourseCompetency compete void deleteLectureShouldUpdateCompetency() throws Exception { request.delete("/api/lectures/" + lecture.getId(), HttpStatus.OK); - CourseCompetency result = getCall(course.getId(), competency.getId(), HttpStatus.OK); + CourseCompetency result = getCall(course.getId(), courseCompetency.getId(), HttpStatus.OK); assertThat(result.getLectureUnits()).isEmpty(); } // Test void deleteLectureUnitShouldUpdateCompetency() throws Exception { - request.delete("/api/lectures/" + lecture.getId() + "/lecture-units/" + idOfTextUnitOfLectureOne, HttpStatus.OK); - CourseCompetency result = getCall(course.getId(), competency.getId(), HttpStatus.OK); - assertThat(result.getLectureUnits()).map(LectureUnit::getId).containsExactly(idOfAttachmentUnitOfLectureOne); + request.delete("/api/lectures/" + lecture.getId() + "/lecture-units/" + textUnitOfLectureOne.getId(), HttpStatus.OK); + CourseCompetency result = getCall(course.getId(), courseCompetency.getId(), HttpStatus.OK); + assertThat(result.getLectureUnits()).map(LectureUnit::getId).containsExactly(attachmentUnitOfLectureOne.getId()); } abstract CourseCompetency updateCall(long courseId, CourseCompetency competency, HttpStatus expectedStatus) throws Exception; // Test void shouldUpdateCompetency() throws Exception { - LectureUnit textLectureUnit = lectureUnitRepository.findByIdWithCompetenciesBidirectionalElseThrow(idOfTextUnitOfLectureOne); - competency.setTitle("Updated"); - competency.removeLectureUnit(textLectureUnit); - competency.setDescription("Updated Description"); + LectureUnit textLectureUnit = lectureUnitRepository.findByIdWithCompetenciesBidirectionalElseThrow(textUnitOfLectureOne.getId()); + courseCompetency.setTitle("Updated"); + courseCompetency.removeLectureUnit(textLectureUnit); + courseCompetency.setDescription("Updated Description"); - CourseCompetency result = updateCall(course.getId(), competency, HttpStatus.OK); + CourseCompetency result = updateCall(course.getId(), courseCompetency, HttpStatus.OK); assertThat(result.getTitle()).isEqualTo("Updated"); assertThat(result.getDescription()).isEqualTo("Updated Description"); @@ -324,8 +291,8 @@ void shouldUpdateCompetency() throws Exception { // Test void shouldReturnBadRequestForCompetencyWithoutId() throws Exception { - competency.setId(null); - updateCall(course.getId(), competency, HttpStatus.BAD_REQUEST); + courseCompetency.setId(null); + updateCall(course.getId(), courseCompetency, HttpStatus.BAD_REQUEST); } // Test @@ -333,6 +300,7 @@ void shouldUpdateCompetencyToOptionalWhenSettingOptional(CourseCompetency newCom newCompetency.setTitle("Title"); newCompetency.setDescription("Description"); newCompetency.setCourse(course); + newCompetency.setMasteryThreshold(42); newCompetency = courseCompetencyRepository.save(newCompetency); TextExercise exercise = TextExerciseFactory.generateTextExercise(ZonedDateTime.now(), ZonedDateTime.now(), ZonedDateTime.now(), course); @@ -355,6 +323,7 @@ void shouldCreateValidCompetency(CourseCompetency newCompetency) throws Exceptio newCompetency.setTitle("FreshlyCreatedCompetency"); newCompetency.setDescription("This is an example of a freshly created competency"); newCompetency.setCourse(course); + newCompetency.setMasteryThreshold(42); List allLectureUnits = lectureUnitRepository.findAll(); Set connectedLectureUnits = new HashSet<>(allLectureUnits); newCompetency.setLectureUnits(connectedLectureUnits); @@ -389,26 +358,80 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForCreate(CourseCompetency n createCall(course.getId(), newCompetency, HttpStatus.FORBIDDEN); } - abstract CourseCompetency importCall(long courseId, long competencyId, HttpStatus expectedStatus) throws Exception; + abstract CourseCompetency importCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception; // Test void shouldImportCompetency() throws Exception { - CourseCompetency importedCompetency = importCall(course2.getId(), competency.getId(), HttpStatus.CREATED); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(courseCompetency.getId()), Optional.empty(), false, false, false, Optional.empty(), false); + CourseCompetency importedCompetency = importCall(course2.getId(), importOptions, HttpStatus.CREATED); assertThat(courseCompetencyRepository.findById(importedCompetency.getId())).isNotEmpty(); - assertThat(importedCompetency.getTitle()).isEqualTo(competency.getTitle()); - assertThat(importedCompetency.getDescription()).isEqualTo(competency.getDescription()); - assertThat(importedCompetency.getMasteryThreshold()).isEqualTo(competency.getMasteryThreshold()); - assertThat(importedCompetency.getTaxonomy()).isEqualTo(competency.getTaxonomy()); + assertThat(importedCompetency.getTitle()).isEqualTo(courseCompetency.getTitle()); + assertThat(importedCompetency.getDescription()).isEqualTo(courseCompetency.getDescription()); + assertThat(importedCompetency.getMasteryThreshold()).isEqualTo(courseCompetency.getMasteryThreshold()); + assertThat(importedCompetency.getTaxonomy()).isEqualTo(courseCompetency.getTaxonomy()); assertThat(importedCompetency.getExercises()).isEmpty(); assertThat(importedCompetency.getLectureUnits()).isEmpty(); assertThat(importedCompetency.getUserProgress()).isEmpty(); verify(competencyProgressService, never()).updateProgressByCompetencyAsync(importedCompetency); } + // Test + void shouldImportExerciseAndLectureWithCompetency() throws Exception { + ZonedDateTime releaseDate = ZonedDateTime.of(2022, 2, 21, 23, 45, 0, 0, ZoneId.of("UTC")); + textExercise.setReleaseDate(releaseDate); + exerciseRepository.save(textExercise); + + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(courseCompetency.getId()), Optional.empty(), false, true, true, Optional.empty(), false); + importCall(course2.getId(), importOptions, HttpStatus.CREATED); + + course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId()); + assertThat(course2.getExercises()).hasSize(2); + assertThat(course2.getLectures()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits()).hasSize(2); + } + + // Test + void shouldImportExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + teamTextExercise.setCompetencies(null); + exerciseRepository.save(teamTextExercise); + attachmentUnitOfLectureOne.setCompetencies(null); + attachmentUnitRepository.save(attachmentUnitOfLectureOne); + + ZonedDateTime releaseDate = ZonedDateTime.of(2022, 2, 21, 23, 45, 0, 0, ZoneId.of("UTC")); + textExercise.setReleaseDate(releaseDate); + exerciseRepository.save(textExercise); + + ZonedDateTime visibleDate = ZonedDateTime.of(2022, 7, 10, 14, 0, 0, 0, ZoneId.of("UTC")); + long visibleDateDiff = visibleDate.toEpochSecond() - releaseDate.toEpochSecond(); + lecture.setVisibleDate(visibleDate); + lectureRepository.save(lecture); + + ZonedDateTime releaseDateTextUnit = ZonedDateTime.of(2022, 7, 10, 20, 0, 0, 0, ZoneId.of("UTC")); + long releaseDateDiff = releaseDateTextUnit.toEpochSecond() - releaseDate.toEpochSecond(); + textUnitOfLectureOne.setReleaseDate(releaseDateTextUnit); + textUnitRepository.save(textUnitOfLectureOne); + + ZonedDateTime newReleaseDate = ZonedDateTime.of(2024, 7, 14, 8, 0, 0, 0, ZoneId.of("UTC")); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(courseCompetency.getId()), Optional.empty(), false, true, true, + Optional.of(newReleaseDate), true); + importCall(course2.getId(), importOptions, HttpStatus.CREATED); + + course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId()); + assertThat(course2.getExercises()).hasSize(1); + assertThat(course2.getExercises().stream().findFirst().get().getReleaseDate()).isCloseTo(newReleaseDate, HalfSecond()); + assertThat(course2.getLectures()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getVisibleDate()).isCloseTo(newReleaseDate.plusSeconds(visibleDateDiff), HalfSecond()); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits().stream().findFirst().get().getReleaseDate()) + .isCloseTo(newReleaseDate.plusSeconds(releaseDateDiff), HalfSecond()); + } + // Test void shouldReturnForbiddenForInstructorOfOtherCourseForImport() throws Exception { - importCall(course.getId(), 42, HttpStatus.FORBIDDEN); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(42L), Optional.empty(), false, false, false, Optional.empty(), false); + + importCall(course.getId(), importOptions, HttpStatus.FORBIDDEN); } abstract List createBulkCall(long courseId, List competencies, HttpStatus expectedStatus) throws Exception; @@ -419,10 +442,12 @@ void shouldCreateCompetencies(CourseCompetency competency1, CourseCompetency com competency1.setDescription("This is an example competency"); competency1.setTaxonomy(CompetencyTaxonomy.UNDERSTAND); competency1.setCourse(course); + competency1.setMasteryThreshold(42); competency2.setTitle("Competency2"); competency2.setDescription("This is another example competency"); competency2.setTaxonomy(CompetencyTaxonomy.REMEMBER); competency2.setCourse(course); + competency2.setMasteryThreshold(84); var competenciesToCreate = List.of(competency1, competency2); @@ -454,13 +479,14 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForCreateBulk() throws Excep createBulkCall(course.getId(), List.of(), HttpStatus.FORBIDDEN); } - abstract List importAllCall(long courseId, long sourceCourseId, boolean importRelations, HttpStatus expectedStatus) throws Exception; + abstract List importAllCall(long sourceCourseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception; // Test void shouldImportAllCompetencies(Function createCourseCompetencyForCourse) throws Exception { var course3 = courseUtilService.createCourse(); - var competencyDTOList = importAllCall(course.getId(), course3.getId(), false, HttpStatus.CREATED); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course3.getId()), false, false, false, Optional.empty(), false); + var competencyDTOList = importAllCall(course.getId(), importOptions, HttpStatus.CREATED); assertThat(competencyDTOList).isEmpty(); @@ -468,7 +494,8 @@ void shouldImportAllCompetencies(Function createCourse CourseCompetency tail = createCourseCompetencyForCourse.apply(course3); createRelation(tail, head, RelationType.ASSUMES); - competencyDTOList = importAllCall(course.getId(), course3.getId(), true, HttpStatus.CREATED); + importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course3.getId()), true, false, false, Optional.empty(), false); + competencyDTOList = importAllCall(course.getId(), importOptions, HttpStatus.CREATED); assertThat(competencyDTOList).hasSize(2); // assert that only one of the DTOs has the relation connected @@ -479,21 +506,72 @@ void shouldImportAllCompetencies(Function createCourse assertThat(competencyDTOList.get(1).tailRelations()).isNull(); } - competencyDTOList = importAllCall(course.getId(), course3.getId(), false, HttpStatus.CREATED); + importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course3.getId()), false, false, false, Optional.empty(), false); + competencyDTOList = importAllCall(course.getId(), importOptions, HttpStatus.CREATED); assertThat(competencyDTOList).hasSize(2); // relations should be empty when not importing them assertThat(competencyDTOList.getFirst().tailRelations()).isNull(); assertThat(competencyDTOList.get(1).tailRelations()).isNull(); } + // Test + void shouldImportAllExerciseAndLectureWithCompetency() throws Exception { + createProgrammingExercise(ZonedDateTime.now(), ZonedDateTime.now()); + + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course.getId()), false, true, true, Optional.empty(), false); + importAllCall(course2.getId(), importOptions, HttpStatus.CREATED); + + course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId()); + assertThat(course2.getExercises()).hasSize(2); + assertThat(course2.getLectures()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits()).hasSize(2); + } + + // Test + void shouldImportAllExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + teamTextExercise.setCompetencies(null); + exerciseRepository.save(teamTextExercise); + attachmentUnitOfLectureOne.setCompetencies(null); + attachmentUnitRepository.save(attachmentUnitOfLectureOne); + + ZonedDateTime releaseDate = ZonedDateTime.of(2022, 2, 21, 23, 45, 0, 0, ZoneId.of("UTC")); + textExercise.setReleaseDate(releaseDate); + exerciseRepository.save(textExercise); + + ZonedDateTime visibleDate = ZonedDateTime.of(2022, 7, 10, 14, 0, 0, 0, ZoneId.of("UTC")); + long visibleDateDiff = visibleDate.toEpochSecond() - releaseDate.toEpochSecond(); + lecture.setVisibleDate(visibleDate); + lectureRepository.save(lecture); + + ZonedDateTime releaseDateTextUnit = ZonedDateTime.of(2022, 7, 10, 20, 0, 0, 0, ZoneId.of("UTC")); + long releaseDateDiff = releaseDateTextUnit.toEpochSecond() - releaseDate.toEpochSecond(); + textUnitOfLectureOne.setReleaseDate(releaseDateTextUnit); + textUnitRepository.save(textUnitOfLectureOne); + + ZonedDateTime newReleaseDate = ZonedDateTime.of(2024, 7, 14, 8, 0, 0, 0, ZoneId.of("UTC")); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course.getId()), false, true, true, Optional.of(newReleaseDate), true); + importAllCall(course2.getId(), importOptions, HttpStatus.CREATED); + + course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId()); + assertThat(course2.getExercises()).hasSize(1); + assertThat(course2.getExercises().stream().findFirst().get().getReleaseDate()).isCloseTo(newReleaseDate, HalfSecond()); + assertThat(course2.getLectures()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getVisibleDate()).isCloseTo(newReleaseDate.plusSeconds(visibleDateDiff), HalfSecond()); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits().stream().findFirst().get().getReleaseDate()) + .isCloseTo(newReleaseDate.plusSeconds(releaseDateDiff), HalfSecond()); + } + // Test void shouldReturnForbiddenForInstructorNotInCourse() throws Exception { - importAllCall(course.getId(), course2.getId(), false, HttpStatus.FORBIDDEN); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course2.getId()), false, false, false, Optional.empty(), false); + importAllCall(course.getId(), importOptions, HttpStatus.FORBIDDEN); } // Test void shouldReturnBadRequestForImportFromSameCourse() throws Exception { - importAllCall(course.getId(), course.getId(), false, HttpStatus.BAD_REQUEST); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course.getId()), false, false, false, Optional.empty(), false); + importAllCall(course.getId(), importOptions, HttpStatus.BAD_REQUEST); } abstract List importStandardizedCall(long courseId, List idList, HttpStatus expectedStatus) throws Exception; @@ -529,24 +607,23 @@ void shouldReturnNotFoundForNotExistingIds() throws Exception { importStandardizedCall(course.getId(), idList, HttpStatus.NOT_FOUND); } - abstract List importBulkCall(long courseId, Set competencyIds, boolean importRelations, HttpStatus expectedStatus) throws Exception; + abstract List importBulkCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception; // Test void shouldReturnForbiddenForInstructorOfOtherCourseForBulkImport() throws Exception { - importBulkCall(course.getId(), Set.of(), false, HttpStatus.FORBIDDEN); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.empty(), false, false, false, Optional.empty(), false); + importBulkCall(course.getId(), importOptions, HttpStatus.FORBIDDEN); } // Test void shouldImportCompetencies(Function createCourseCompetencyForCourse) throws Exception { - var competencyDTOList = importBulkCall(course.getId(), Collections.emptySet(), false, HttpStatus.CREATED); - assertThat(competencyDTOList).isEmpty(); - CourseCompetency head = createCourseCompetencyForCourse.apply(course2); CourseCompetency tail = createCourseCompetencyForCourse.apply(course2); createRelation(tail, head, RelationType.ASSUMES); Set competencyIds = Set.of(head.getId(), tail.getId()); - competencyDTOList = importBulkCall(course.getId(), competencyIds, true, HttpStatus.CREATED); + var importOptions = new CompetencyImportOptionsDTO(competencyIds, Optional.empty(), true, false, false, Optional.empty(), false); + var competencyDTOList = importBulkCall(course.getId(), importOptions, HttpStatus.CREATED); assertThat(competencyDTOList).hasSize(2); // competency 2 should be the tail of one relation @@ -559,10 +636,62 @@ void shouldImportCompetencies(Function createCourseCom assertThat(competencyDTOList.get(1).tailRelations()).hasSize(1); } - competencyDTOList = importBulkCall(course.getId(), competencyIds, false, HttpStatus.CREATED); + importOptions = new CompetencyImportOptionsDTO(competencyIds, Optional.empty(), false, false, false, Optional.empty(), false); + competencyDTOList = importBulkCall(course.getId(), importOptions, HttpStatus.CREATED); assertThat(competencyDTOList).hasSize(2); // relations should be empty when not importing them assertThat(competencyDTOList.getFirst().tailRelations()).isNull(); assertThat(competencyDTOList.get(1).tailRelations()).isNull(); } + + // Test + void shouldImportCompetenciesExerciseAndLectureWithCompetency() throws Exception { + ZonedDateTime releaseDate = ZonedDateTime.of(2022, 2, 21, 23, 45, 0, 0, ZoneId.of("UTC")); + textExercise.setReleaseDate(releaseDate); + exerciseRepository.save(textExercise); + + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(courseCompetency.getId()), Optional.empty(), false, true, true, Optional.empty(), false); + importBulkCall(course2.getId(), importOptions, HttpStatus.CREATED); + + course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId()); + assertThat(course2.getExercises()).hasSize(2); + assertThat(course2.getLectures()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits()).hasSize(2); + } + + // Test + void shouldImportCompetenciesExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + teamTextExercise.setCompetencies(null); + exerciseRepository.save(teamTextExercise); + attachmentUnitOfLectureOne.setCompetencies(null); + attachmentUnitRepository.save(attachmentUnitOfLectureOne); + + ZonedDateTime releaseDate = ZonedDateTime.of(2022, 2, 21, 23, 45, 0, 0, ZoneId.of("UTC")); + textExercise.setReleaseDate(releaseDate); + exerciseRepository.save(textExercise); + + ZonedDateTime visibleDate = ZonedDateTime.of(2022, 7, 10, 14, 0, 0, 0, ZoneId.of("UTC")); + long visibleDateDiff = visibleDate.toEpochSecond() - releaseDate.toEpochSecond(); + lecture.setVisibleDate(visibleDate); + lectureRepository.save(lecture); + + ZonedDateTime releaseDateTextUnit = ZonedDateTime.of(2022, 7, 10, 20, 0, 0, 0, ZoneId.of("UTC")); + long releaseDateDiff = releaseDateTextUnit.toEpochSecond() - releaseDate.toEpochSecond(); + textUnitOfLectureOne.setReleaseDate(releaseDateTextUnit); + textUnitRepository.save(textUnitOfLectureOne); + + ZonedDateTime newReleaseDate = ZonedDateTime.of(2024, 7, 14, 8, 0, 0, 0, ZoneId.of("UTC")); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(courseCompetency.getId()), Optional.empty(), false, true, true, + Optional.of(newReleaseDate), true); + importBulkCall(course2.getId(), importOptions, HttpStatus.CREATED); + + course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId()); + assertThat(course2.getExercises()).hasSize(1); + assertThat(course2.getExercises().stream().findFirst().get().getReleaseDate()).isCloseTo(newReleaseDate, HalfSecond()); + assertThat(course2.getLectures()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getVisibleDate()).isCloseTo(newReleaseDate.plusSeconds(visibleDateDiff), HalfSecond()); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits()).hasSize(1); + assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits().stream().findFirst().get().getReleaseDate()) + .isCloseTo(newReleaseDate.plusSeconds(releaseDateDiff), HalfSecond()); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java index 291f4065211c..e4e59099d9e5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java @@ -2,20 +2,18 @@ import java.util.Collections; import java.util.List; -import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; @@ -24,9 +22,6 @@ class CompetencyIntegrationTest extends AbstractCompetencyPrerequisiteIntegratio private static final String TEST_PREFIX = "competencyintegrationtest"; - @Autowired - private CompetencyUtilService competencyUtilService; - @BeforeEach void setupTestScenario() { super.setupTestScenario(TEST_PREFIX, competencyUtilService::createCompetency); @@ -36,18 +31,21 @@ void setupTestScenario() { class PreAuthorize { private void testAllPreAuthorizeEditor() throws Exception { - request.post("/api/courses/" + course.getId() + "/competencies/import/bulk", Collections.emptyList(), HttpStatus.FORBIDDEN); + request.post("/api/courses/" + course.getId() + "/competencies/import/bulk", new CompetencyImportOptionsDTO(null, null, false, false, false, null, false), + HttpStatus.FORBIDDEN); request.post("/api/courses/" + course.getId() + "/competencies/import-standardized", Collections.emptyList(), HttpStatus.FORBIDDEN); } private void testAllPreAuthorizeInstructor() throws Exception { request.put("/api/courses/" + course.getId() + "/competencies", new Competency(), HttpStatus.FORBIDDEN); request.post("/api/courses/" + course.getId() + "/competencies", new Competency(), HttpStatus.FORBIDDEN); - request.delete("/api/courses/" + course.getId() + "/competencies/" + competency.getId(), HttpStatus.FORBIDDEN); + request.delete("/api/courses/" + course.getId() + "/competencies/" + courseCompetency.getId(), HttpStatus.FORBIDDEN); request.post("/api/courses/" + course.getId() + "/competencies/bulk", Collections.emptyList(), HttpStatus.FORBIDDEN); // import - request.post("/api/courses/" + course.getId() + "/competencies/import-all/1", null, HttpStatus.FORBIDDEN); - request.post("/api/courses/" + course.getId() + "/competencies/import", competency.getId(), HttpStatus.FORBIDDEN); + request.post("/api/courses/" + course.getId() + "/competencies/import-all", new CompetencyImportOptionsDTO(null, null, false, false, false, null, false), + HttpStatus.FORBIDDEN); + request.post("/api/courses/" + course.getId() + "/competencies/import", new CompetencyImportOptionsDTO(null, null, false, false, false, null, false), + HttpStatus.FORBIDDEN); } @Test @@ -108,7 +106,7 @@ List getAllCall(long courseId, HttpStatus expectedSt @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void shouldReturnCompetenciesForStudentOfCourse() throws Exception { - super.shouldReturnCompetenciesForStudentOfCourse(new Competency()); + super.shouldReturnCompetenciesForCourse(new Competency()); } @Test @@ -214,8 +212,8 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForCreate() throws Exception super.shouldReturnForbiddenForInstructorOfOtherCourseForCreate(new Competency()); } - CourseCompetency importCall(long courseId, long competencyId, HttpStatus expectedStatus) throws Exception { - return request.postWithResponseBody("/api/courses/" + courseId + "/competencies/import", competencyId, Competency.class, expectedStatus); + CourseCompetency importCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception { + return request.postWithResponseBody("/api/courses/" + courseId + "/competencies/import", importOptions, Competency.class, expectedStatus); } @Test @@ -224,6 +222,18 @@ void shouldImportCompetency() throws Exception { super.shouldImportCompetency(); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportExerciseAndLectureWithCompetency() throws Exception { + super.shouldImportExerciseAndLectureWithCompetency(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + super.shouldImportExerciseAndLectureWithCompetencyAndChangeDates(); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor42", roles = "INSTRUCTOR") void shouldReturnForbiddenForInstructorOfOtherCourseForImport() throws Exception { @@ -264,9 +274,8 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForCreateBulk() throws Excep super.shouldReturnForbiddenForInstructorOfOtherCourseForCreateBulk(); } - List importAllCall(long courseId, long sourceCourseId, boolean importRelations, HttpStatus expectedStatus) throws Exception { - return request.postListWithResponseBody("/api/courses/" + courseId + "/competencies/import-all/" + sourceCourseId + (importRelations ? "?importRelations=true" : ""), null, - CompetencyWithTailRelationDTO.class, expectedStatus); + List importAllCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception { + return request.postListWithResponseBody("/api/courses/" + courseId + "/competencies/import-all", importOptions, CompetencyWithTailRelationDTO.class, expectedStatus); } @Test @@ -275,6 +284,18 @@ void shouldImportAllCompetencies() throws Exception { super.shouldImportAllCompetencies(competencyUtilService::createCompetency); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllExerciseAndLectureWithCompetency() throws Exception { + super.shouldImportAllExerciseAndLectureWithCompetency(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + super.shouldImportAllExerciseAndLectureWithCompetencyAndChangeDates(); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor42", roles = "INSTRUCTOR") void shouldReturnForbiddenForInstructorNotInCourse() throws Exception { @@ -303,9 +324,8 @@ void shouldReturnNotFoundForNotExistingIds() throws Exception { super.shouldReturnNotFoundForNotExistingIds(); } - List importBulkCall(long courseId, Set competencyIds, boolean importRelations, HttpStatus expectedStatus) throws Exception { - return request.postListWithResponseBody("/api/courses/" + courseId + "/competencies/import/bulk" + (importRelations ? "?importRelations=true" : ""), competencyIds, - CompetencyWithTailRelationDTO.class, expectedStatus); + List importBulkCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception { + return request.postListWithResponseBody("/api/courses/" + courseId + "/competencies/import/bulk", importOptions, CompetencyWithTailRelationDTO.class, expectedStatus); } @Test @@ -319,4 +339,16 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForBulkImport() throws Excep void shouldImportCompetencies() throws Exception { super.shouldImportCompetencies(competencyUtilService::createCompetency); } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportCompetenciesExerciseAndLectureWithCompetency() throws Exception { + super.shouldImportCompetenciesExerciseAndLectureWithCompetency(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportCompetenciesExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + super.shouldImportCompetenciesExerciseAndLectureWithCompetencyAndChangeDates(); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java index 2df138a71271..214b743f5367 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java @@ -9,32 +9,19 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyJolRepository; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class CompetencyJolIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "competencyjolintegrationtest"; - @Autowired - private CompetencyUtilService competencyUtilService; - - @Autowired - private CompetencyProgressUtilService competencyProgressUtilService; - - @Autowired - private CompetencyJolRepository competencyJOLRepository; - private final Competency[] competency = new Competency[3]; private CompetencyProgress competencyProgress; @@ -63,7 +50,7 @@ void setup() { @AfterEach void tearDown() { - competencyJOLRepository.deleteAll(); + competencyJolRepository.deleteAll(); } @Nested @@ -100,7 +87,7 @@ void shouldReturnForbiddenForStudentNotInCourse() throws Exception { void shouldCreateJOL() throws Exception { short jolValue = 3; sendRequest(competency[0].getId(), jolValue, HttpStatus.OK); - final var jol = competencyJOLRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); + final var jol = competencyJolRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); assertThat(jol).isPresent(); assertThat(jol.get().getValue()).isEqualTo(jolValue); assertThat(jol.get().getCompetencyConfidence()).isEqualTo(competencyProgress.getConfidence()); @@ -113,7 +100,7 @@ void shouldUpdateJOL() throws Exception { competencyUtilService.createJol(competency[0], student, (short) 123, ZonedDateTime.now().minusDays(1), 0.0, 0.0); short jolValue = 3; sendRequest(competency[0].getId(), jolValue, HttpStatus.OK); - final var jol = competencyJOLRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); + final var jol = competencyJolRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); assertThat(jol).isPresent(); assertThat(jol.get().getValue()).isEqualTo(jolValue); assertThat(jol.get().getCompetencyConfidence()).isEqualTo(competencyProgress.getConfidence()); diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java index 36c66c335239..df2c561bda7e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java @@ -5,7 +5,6 @@ import static org.awaitility.Awaitility.await; import java.time.ZonedDateTime; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.IntStream; @@ -15,256 +14,45 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.assessment.domain.Result; -import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.PrerequisiteUtilService; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; -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.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.user.util.UserUtilService; -import de.tum.cit.aet.artemis.core.util.CourseUtilService; -import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; -import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.exercise.service.ParticipationService; -import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; -import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; -import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; -import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; -import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.lecture.domain.TextUnit; -import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseFactory; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; -class CourseCompetencyIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { +class CourseCompetencyIntegrationTest extends AbstractCompetencyPrerequisiteIntegrationTest { private static final String TEST_PREFIX = "coursecompetencyintegrationtest"; - @Autowired - private LectureRepository lectureRepository; - - @Autowired - private ExerciseRepository exerciseRepository; - - @Autowired - private TextUnitRepository textUnitRepository; - - @Autowired - private AttachmentUnitRepository attachmentUnitRepository; - - @Autowired - private ExerciseUnitRepository exerciseUnitRepository; - - @Autowired - private CompetencyRepository competencyRepository; - - @Autowired - private UserUtilService userUtilService; - - @Autowired - private CourseUtilService courseUtilService; - - @Autowired - private PrerequisiteRepository prerequisiteRepository; - - @Autowired - private CompetencyRelationRepository competencyRelationRepository; - - @Autowired - private CompetencyUtilService competencyUtilService; - - @Autowired - private PageableSearchUtilService pageableSearchUtilService; - - @Autowired - private SubmissionTestRepository submissionRepository; - - @Autowired - private ParticipationService participationService; - - @Autowired - private TeamUtilService teamUtilService; - - @Autowired - private ParticipationUtilService participationUtilService; - - @Autowired - private LectureUnitService lectureUnitService; - - @Autowired - private StudentScoreUtilService studentScoreUtilService; - - @Autowired - private CourseCompetencyRepository courseCompetencyRepository; - - @Autowired - private PrerequisiteUtilService prerequisiteUtilService; - - @Autowired - protected CompetencyProgressUtilService competencyProgressUtilService; - - @Autowired - protected LectureUtilService lectureUtilService; - - private Course course; - - private Competency competency; - - private Prerequisite prerequisite; - - private Lecture lecture; - - private long idOfTextUnitOfLectureOne; - - private long idOfAttachmentUnitOfLectureOne; - - private TextExercise teamTextExercise; - - private TextExercise textExercise; - @BeforeEach void setupTestScenario() { - participantScoreScheduleService.activate(); - - ZonedDateTime pastTimestamp = ZonedDateTime.now().minusDays(5); - userUtilService.addUsers(TEST_PREFIX, 2, 1, 1, 1); - - // Add users that are not in the course - userUtilService.createAndSaveUser(TEST_PREFIX + "student42"); - userUtilService.createAndSaveUser(TEST_PREFIX + "instructor42"); - - // creating course - course = courseUtilService.createCourse(); - - competency = createCompetency(course); - prerequisite = createPrerequisite(course); - lecture = createLecture(course); - - textExercise = createTextExercise(pastTimestamp, pastTimestamp, pastTimestamp, Set.of(competency), false); - teamTextExercise = createTextExercise(pastTimestamp, pastTimestamp, pastTimestamp, Set.of(prerequisite), true); - - creatingLectureUnitsOfLecture(prerequisite); - creatingLectureUnitsOfLecture(competency); - } - - private Competency createCompetency(Course course) { - Competency competency = new Competency(); - competency.setTitle("Competency" + course.getId()); - competency.setDescription("This is an example competency"); - competency.setTaxonomy(CompetencyTaxonomy.UNDERSTAND); - competency.setCourse(course); - competency = competencyRepository.save(competency); - - return competency; + super.setupTestScenario(TEST_PREFIX, course -> competencyUtilService.createCompetency(course, "penguin")); } - private Prerequisite createPrerequisite(Course course) { - Prerequisite prerequisite = new Prerequisite(); - prerequisite.setTitle("Prerequisite" + course.getId()); - prerequisite.setDescription("This is an example prerequisite"); - prerequisite.setTaxonomy(CompetencyTaxonomy.UNDERSTAND); - prerequisite.setCourse(course); - prerequisite = prerequisiteRepository.save(prerequisite); - - return prerequisite; - } - - private void creatingLectureUnitsOfLecture(CourseCompetency competency) { - // creating lecture units for lecture one - - TextUnit textUnit = new TextUnit(); - textUnit.setName("TextUnitOfLectureOne"); - textUnit.setCompetencies(Set.of(competency)); - textUnit = textUnitRepository.save(textUnit); - idOfTextUnitOfLectureOne = textUnit.getId(); - - AttachmentUnit attachmentUnit = new AttachmentUnit(); - attachmentUnit.setName("AttachmentUnitOfLectureOne"); - attachmentUnit.setCompetencies(Set.of(competency)); - attachmentUnit = attachmentUnitRepository.save(attachmentUnit); - idOfAttachmentUnitOfLectureOne = attachmentUnit.getId(); - - ExerciseUnit textExerciseUnit = new ExerciseUnit(); - textExerciseUnit.setExercise(textExercise); - exerciseUnitRepository.save(textExerciseUnit); - - ExerciseUnit teamTextExerciseUnit = new ExerciseUnit(); - teamTextExerciseUnit.setExercise(teamTextExercise); - exerciseUnitRepository.save(teamTextExerciseUnit); - - for (LectureUnit lectureUnit : List.of(textUnit, attachmentUnit, textExerciseUnit, teamTextExerciseUnit)) { - lecture.addLectureUnit(lectureUnit); - } - - lectureRepository.save(lecture); - } - - private Lecture createLecture(Course course) { - Lecture lecture = new Lecture(); - lecture.setTitle("LectureOne"); - lecture.setCourse(course); - lectureRepository.save(lecture); - - return lecture; - } - - private TextExercise createTextExercise(ZonedDateTime releaseDate, ZonedDateTime dueDate, ZonedDateTime assassmentDueDate, Set competencies, - boolean isTeamExercise) { - // creating text exercise with Result - TextExercise textExercise = TextExerciseFactory.generateTextExercise(releaseDate, dueDate, assassmentDueDate, course); - - if (isTeamExercise) { - textExercise.setMode(ExerciseMode.TEAM); - } - - textExercise.setMaxPoints(10.0); - textExercise.setBonusPoints(0.0); - textExercise.setCompetencies(competencies); - - return exerciseRepository.save(textExercise); - } - - private Result createExerciseParticipationSubmissionAndResult(Exercise exercise, StudentParticipation studentParticipation, Participant participant, double pointsOfExercise, + private Result createExerciseParticipationSubmissionAndResult(Exercise exercise, StudentParticipation studentParticipation, double pointsOfExercise, double bonusPointsOfExercise, long scoreAwarded, boolean rated, Producer submissionConstructor, int numberOfSubmissions) { if (!exercise.getMaxPoints().equals(pointsOfExercise)) { exercise.setMaxPoints(pointsOfExercise); @@ -299,8 +87,7 @@ private Result createExerciseParticipationSubmissionAndResult(Exercise exercise, private Result createTextExerciseParticipationSubmissionAndResult(TextExercise exercise, Participant participant, double pointsOfExercise, double bonusPointsOfExercise, long scoreAwarded, boolean rated) { StudentParticipation studentParticipation = participationService.startExercise(exercise, participant, false); - return createExerciseParticipationSubmissionAndResult(exercise, studentParticipation, participant, pointsOfExercise, bonusPointsOfExercise, scoreAwarded, rated, - TextSubmission::new, 1); + return createExerciseParticipationSubmissionAndResult(exercise, studentParticipation, pointsOfExercise, bonusPointsOfExercise, scoreAwarded, rated, TextSubmission::new, 1); } private ProgrammingExercise createProgrammingExercise(int i, Set competencies) { @@ -316,48 +103,124 @@ private ProgrammingExercise createProgrammingExercise(int i, Set(List.of(unreleasedLectureUnit))); - newCompetency = competencyRepository.save(newCompetency); - - List competenciesOfCourse = request.getList("/api/courses/" + course.getId() + "/course-competencies", HttpStatus.OK, CourseCompetency.class); - - assertThat(competenciesOfCourse).map(CourseCompetency::getId).containsExactlyInAnyOrder(competency.getId(), prerequisite.getId(), newCompetency.getId()); - } + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testShouldOnlySendUserSpecificData() throws Exception { + super.testShouldOnlySendUserSpecificData(TEST_PREFIX); + } - @Test - @WithMockUser(username = TEST_PREFIX + "student42", roles = "USER") - void testShouldReturnForbiddenForStudentNotInCourse() throws Exception { - request.getList("/api/courses/" + course.getId() + "/course-competencies", HttpStatus.FORBIDDEN, CourseCompetency.class); - } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor42", roles = "INSTRUCTOR") + void shouldReturnForbiddenForUserNotInCourse() throws Exception { + super.shouldReturnForbiddenForUserNotInCourse(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void shouldReturnBadRequestForWrongCourse() throws Exception { + super.shouldReturnBadRequestForWrongCourse(); + } + + @Override + List getAllCall(long courseId, HttpStatus expectedStatus) throws Exception { + return request.getList("/api/courses/" + courseId + "/course-competencies", expectedStatus, CourseCompetency.class); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void shouldReturnCompetenciesForStudentOfCourse() throws Exception { + super.shouldReturnCompetenciesForCourse(new Competency()); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student42", roles = "USER") + void testShouldReturnForbiddenForStudentNotInCourse() throws Exception { + super.testShouldReturnForbiddenForStudentNotInCourse(); + } + + @Override + void deleteCall(long courseId, long competencyId, HttpStatus expectedStatus) { + throw new UnsupportedOperationException("Not provided"); + } + + @Override + CourseCompetency updateCall(long courseId, CourseCompetency competency, HttpStatus expectedStatus) { + throw new UnsupportedOperationException("Not provided"); + } + + @Override + CourseCompetency createCall(long courseId, CourseCompetency competency, HttpStatus expectedStatus) { + throw new UnsupportedOperationException("Not provided"); + } + + @Override + CourseCompetency importCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) { + throw new UnsupportedOperationException("Not provided"); + } + + @Override + List createBulkCall(long courseId, List competencies, HttpStatus expectedStatus) { + throw new UnsupportedOperationException("Not provided"); + } + + @Override + List importAllCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception { + return request.postListWithResponseBody("/api/courses/" + courseId + "/course-competencies/import-all", importOptions, CompetencyWithTailRelationDTO.class, expectedStatus); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllCompetencies() throws Exception { + super.shouldImportAllCompetencies(competencyUtilService::createCompetency); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllExerciseAndLectureWithCompetency() throws Exception { + super.shouldImportAllExerciseAndLectureWithCompetency(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + super.shouldImportAllExerciseAndLectureWithCompetencyAndChangeDates(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor42", roles = "INSTRUCTOR") + void shouldReturnForbiddenForInstructorNotInCourse() throws Exception { + super.shouldReturnForbiddenForInstructorNotInCourse(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldReturnBadRequestForImportFromSameCourse() throws Exception { + super.shouldReturnBadRequestForImportFromSameCourse(); + } + + @Override + List importStandardizedCall(long courseId, List idList, HttpStatus expectedStatus) { + throw new UnsupportedOperationException("Not provided"); + } + + @Override + List importBulkCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) { + throw new UnsupportedOperationException("Not provided"); } @Nested @@ -376,8 +239,8 @@ void shouldGetCompetencyCourseProgressWhenTeamExercise() throws Exception { await().until(() -> participantScoreScheduleService.isIdle()); - CourseCompetencyProgressDTO courseCompetencyProgress = request - .get("/api/courses/" + course.getId() + "/course-competencies/" + prerequisite.getId() + "/course-progress", HttpStatus.OK, CourseCompetencyProgressDTO.class); + CourseCompetencyProgressDTO courseCompetencyProgress = request.get( + "/api/courses/" + course.getId() + "/course-competencies/" + courseCompetency.getId() + "/course-progress", HttpStatus.OK, CourseCompetencyProgressDTO.class); assertThat(courseCompetencyProgress.averageStudentScore()).isEqualTo(30); } @@ -397,8 +260,8 @@ void shouldGetCompetencyCourseProgress() throws Exception { await().until(() -> participantScoreScheduleService.isIdle()); - CourseCompetencyProgressDTO courseCompetencyProgress = request.get("/api/courses/" + course.getId() + "/course-competencies/" + competency.getId() + "/course-progress", - HttpStatus.OK, CourseCompetencyProgressDTO.class); + CourseCompetencyProgressDTO courseCompetencyProgress = request.get( + "/api/courses/" + course.getId() + "/course-competencies/" + courseCompetency.getId() + "/course-progress", HttpStatus.OK, CourseCompetencyProgressDTO.class); assertThat(courseCompetencyProgress.averageStudentScore()).isEqualTo(53.3); } @@ -411,14 +274,14 @@ class GetCompetencyStudentProgress { @BeforeEach void setupTestScenario() { - programmingExercises = IntStream.range(1, 4).mapToObj(i -> createProgrammingExercise(i, Set.of(competency))).toArray(ProgrammingExercise[]::new); + programmingExercises = IntStream.range(1, 4).mapToObj(i -> createProgrammingExercise(i, Set.of(courseCompetency))).toArray(ProgrammingExercise[]::new); } @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void getCompetencyStudentProgressShouldReturnProgress() throws Exception { User student1 = userTestRepository.findOneByLogin(TEST_PREFIX + "student1").orElseThrow(); - lectureUnitService.setLectureUnitCompletion(textUnitRepository.findById(idOfTextUnitOfLectureOne).orElseThrow(), student1, true); + lectureUnitService.setLectureUnitCompletion(textUnitRepository.findById(textUnitOfLectureOne.getId()).orElseThrow(), student1, true); createTextExerciseParticipationSubmissionAndResult(textExercise, student1, 10.0, 0.0, 90, true); createTextExerciseParticipationSubmissionAndResult(textExercise, student1, 10.0, 0.0, 85, false); @@ -426,17 +289,19 @@ void getCompetencyStudentProgressShouldReturnProgress() throws Exception { await().until(() -> participantScoreScheduleService.isIdle()); CompetencyProgress studentCompetencyProgress1 = request.get( - "/api/courses/" + course.getId() + "/course-competencies/" + competency.getId() + "/student-progress?refresh=true", HttpStatus.OK, CompetencyProgress.class); + "/api/courses/" + course.getId() + "/course-competencies/" + courseCompetency.getId() + "/student-progress?refresh=true", HttpStatus.OK, + CompetencyProgress.class); - assertThat(studentCompetencyProgress1.getProgress()).isEqualTo(25); + assertThat(studentCompetencyProgress1.getProgress()).isEqualTo(22); assertThat(studentCompetencyProgress1.getConfidence()).isEqualTo(0.75); - lectureUnitService.setLectureUnitCompletion(attachmentUnitRepository.findById(idOfAttachmentUnitOfLectureOne).orElseThrow(), student1, true); + lectureUnitService.setLectureUnitCompletion(attachmentUnitRepository.findById(attachmentUnitOfLectureOne.getId()).orElseThrow(), student1, true); CompetencyProgress studentCompetencyProgress2 = request.get( - "/api/courses/" + course.getId() + "/course-competencies/" + competency.getId() + "/student-progress?refresh=false", HttpStatus.OK, CompetencyProgress.class); + "/api/courses/" + course.getId() + "/course-competencies/" + courseCompetency.getId() + "/student-progress?refresh=false", HttpStatus.OK, + CompetencyProgress.class); - assertThat(studentCompetencyProgress2.getProgress()).isEqualTo(25); + assertThat(studentCompetencyProgress2.getProgress()).isEqualTo(22); assertThat(studentCompetencyProgress2.getConfidence()).isEqualTo(0.75); } @@ -459,12 +324,13 @@ void getCompetencyStudentProgressMultipleExercises() throws Exception { studentScoreUtilService.createStudentScore(programmingExercises[2], student1, programming3Result); CompetencyProgress studentCompetencyProgress = request.get( - "/api/courses/" + course.getId() + "/course-competencies/" + competency.getId() + "/student-progress?refresh=true", HttpStatus.OK, CompetencyProgress.class); + "/api/courses/" + course.getId() + "/course-competencies/" + courseCompetency.getId() + "/student-progress?refresh=true", HttpStatus.OK, + CompetencyProgress.class); // No lecture units are completed and no participation in team exercise - assertThat(studentCompetencyProgress.getProgress()).isEqualTo(58); + assertThat(studentCompetencyProgress.getProgress()).isEqualTo(54); // Slightly more points in an easy exercise but solved one programming exercise quickly - assertThat(studentCompetencyProgress.getConfidence()).isCloseTo(1.292, within(0.001)); + assertThat(studentCompetencyProgress.getConfidence()).isCloseTo(1.327, within(0.001)); } } @@ -483,7 +349,7 @@ void shouldNotGetCompetenciesForInstructorOfOtherCourse() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void shouldGetCompetenciesFromOwnCourses() throws Exception { - final var search = pageableSearchUtilService.configureCompetencySearch(competency.getTitle(), "", "", ""); + final var search = pageableSearchUtilService.configureCompetencySearch(courseCompetency.getTitle(), "", course.getTitle(), ""); var result = request.getSearchResult("/api/course-competencies/for-import", HttpStatus.OK, CourseCompetency.class, pageableSearchUtilService.searchMapping(search)); assertThat(result.getResultsOnPage()).hasSize(1); } @@ -491,68 +357,21 @@ void shouldGetCompetenciesFromOwnCourses() throws Exception { @Test @WithMockUser(username = "admin", roles = "ADMIN") void shouldGetCompetenciesAsAdmin() throws Exception { - final var search = pageableSearchUtilService.configureCompetencySearch(competency.getTitle(), "", "", ""); + final var search = pageableSearchUtilService.configureCompetencySearch(courseCompetency.getTitle(), "", course.getTitle(), ""); final var result = request.getSearchResult("/api/course-competencies/for-import", HttpStatus.OK, CourseCompetency.class, pageableSearchUtilService.searchMapping(search)); assertThat(result.getResultsOnPage()).hasSize(1); } } - @Nested - class ImportAll { - - List importAllCall(long courseId, long sourceCourseId, boolean importRelations, HttpStatus expectedStatus) throws Exception { - return request.postListWithResponseBody( - "/api/courses/" + courseId + "/course-competencies/import-all/" + sourceCourseId + (importRelations ? "?importRelations=true" : ""), null, - CompetencyWithTailRelationDTO.class, expectedStatus); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void shouldImportAllCompetencies() throws Exception { - var course3 = courseUtilService.createCourse(); - - var competencyDTOList = importAllCall(course.getId(), course3.getId(), false, HttpStatus.CREATED); - - assertThat(competencyDTOList).isEmpty(); - - CourseCompetency head = competencyUtilService.createCompetency(course3); - CourseCompetency tail = prerequisiteUtilService.createPrerequisite(course3); - createRelation(tail, head, RelationType.ASSUMES); - - competencyDTOList = importAllCall(course.getId(), course3.getId(), true, HttpStatus.CREATED); - - assertThat(competencyDTOList).hasSize(2); - // assert that only one of the DTOs has the relation connected - if (competencyDTOList.getFirst().tailRelations() == null) { - assertThat(competencyDTOList.get(1).tailRelations()).hasSize(1); - } - else { - assertThat(competencyDTOList.get(1).tailRelations()).isNull(); - } - - competencyDTOList = importAllCall(course.getId(), course3.getId(), false, HttpStatus.CREATED); - assertThat(competencyDTOList).hasSize(2); - // relations should be empty when not importing them - assertThat(competencyDTOList.getFirst().tailRelations()).isNull(); - assertThat(competencyDTOList.get(1).tailRelations()).isNull(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void shouldReturnBadRequestForImportFromSameCourse() throws Exception { - importAllCall(course.getId(), course.getId(), false, HttpStatus.BAD_REQUEST); - } - } - @Nested class GetTitle { @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void shouldReturnCompetencyTitleWhenCompetencyExists() throws Exception { - String title = request.get("/api/course-competencies/" + competency.getId() + "/title", HttpStatus.OK, String.class); - assertThat(title).isEqualTo(competency.getTitle()); + String title = request.get("/api/course-competencies/" + courseCompetency.getId() + "/title", HttpStatus.OK, String.class); + assertThat(title).isEqualTo(courseCompetency.getTitle()); } @Test @@ -580,43 +399,6 @@ void shouldGetCourseCompetencyTitles() throws Exception { } } - @Nested - class GetAllOfCourse { - - List getAllCall(long courseId, HttpStatus expectedStatus) throws Exception { - return request.getList("/api/courses/" + courseId + "/course-competencies", expectedStatus, CourseCompetency.class); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void shouldReturnCompetenciesForStudentOfCourse() throws Exception { - TextUnit unreleasedLectureUnit = new TextUnit(); - unreleasedLectureUnit.setName("TextUnitOfLectureOne"); - unreleasedLectureUnit.setReleaseDate(ZonedDateTime.now().plusDays(5)); - unreleasedLectureUnit = textUnitRepository.save(unreleasedLectureUnit); - lecture.addLectureUnit(unreleasedLectureUnit); - lectureRepository.save(lecture); - - Competency newCompetency = new Competency(); - newCompetency.setTitle("Title"); - newCompetency.setDescription("Description"); - newCompetency.setCourse(course); - newCompetency.setLectureUnits(new HashSet<>(List.of(unreleasedLectureUnit))); - courseCompetencyRepository.save(newCompetency); - - List competenciesOfCourse = getAllCall(course.getId(), HttpStatus.OK); - - assertThat(competenciesOfCourse).anyMatch(c -> c.getId().equals(competency.getId())); - assertThat(competenciesOfCourse.stream().filter(l -> l.getId().equals(newCompetency.getId())).findFirst().orElseThrow().getLectureUnits()).isEmpty(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student42", roles = "USER") - void testShouldReturnForbiddenForStudentNotInCourse() throws Exception { - getAllCall(course.getId(), HttpStatus.FORBIDDEN); - } - } - @Nested class CreateCompetencyRelation { @@ -625,7 +407,7 @@ class CreateCompetencyRelation { void shouldCreateForInstructor() throws Exception { var headCompetency = competencyUtilService.createCompetency(course); var relationToCreate = new CompetencyRelation(); - relationToCreate.setTailCompetency(competency); + relationToCreate.setTailCompetency(courseCompetency); relationToCreate.setHeadCompetency(headCompetency); relationToCreate.setType(RelationType.EXTENDS); @@ -661,7 +443,7 @@ void shouldReturnBadRequestWhenCompetencyNotExists() throws Exception { void shouldReturnBadRequestWhenTypeNotPresent() throws Exception { var headCompetency = competencyUtilService.createCompetency(course); var relationToCreate = new CompetencyRelation(); - relationToCreate.setTailCompetency(competency); + relationToCreate.setTailCompetency(courseCompetency); relationToCreate.setHeadCompetency(headCompetency); // relation type must be set relationToCreate.setType(null); @@ -675,12 +457,12 @@ void shouldReturnBadRequestForCircularRelations() throws Exception { Competency competency2 = competencyUtilService.createCompetency(course); Competency competency3 = competencyUtilService.createCompetency(course); - createRelation(competency, competency2, RelationType.EXTENDS); + createRelation(courseCompetency, competency2, RelationType.EXTENDS); createRelation(competency2, competency3, RelationType.MATCHES); var relation = new CompetencyRelation(); relation.setTailCompetency(competency3); - relation.setHeadCompetency(competency); + relation.setHeadCompetency(courseCompetency); relation.setType(RelationType.ASSUMES); request.post("/api/courses/" + course.getId() + "/course-competencies/relations", CompetencyRelationDTO.of(relation), HttpStatus.BAD_REQUEST); @@ -693,7 +475,7 @@ void getCompetencyRelationsShouldGetRelations() throws Exception { Competency competency2 = competencyUtilService.createCompetency(course); Competency competency3 = competencyUtilService.createCompetency(course); - var relation = createRelation(competency, competency2, RelationType.EXTENDS); + var relation = createRelation(courseCompetency, competency2, RelationType.EXTENDS); var relation2 = createRelation(competency2, competency3, RelationType.EXTENDS); var expectedRelations = Set.of(new CompetencyRelationDTO(relation.getId(), relation.getTailCompetency().getId(), relation.getHeadCompetency().getId(), relation.getType()), new CompetencyRelationDTO(relation2.getId(), relation2.getTailCompetency().getId(), relation2.getHeadCompetency().getId(), relation2.getType())); @@ -709,7 +491,7 @@ void getCompetencyRelationsShouldGetRelations() throws Exception { void deleteCompetencyRelationShouldDeleteRelation() throws Exception { Competency competency2 = competencyUtilService.createCompetency(course); - var relation = createRelation(competency, competency2, RelationType.EXTENDS); + var relation = createRelation(courseCompetency, competency2, RelationType.EXTENDS); request.delete("/api/courses/" + course.getId() + "/course-competencies/relations/" + relation.getId(), HttpStatus.OK); @@ -717,49 +499,6 @@ void deleteCompetencyRelationShouldDeleteRelation() throws Exception { assertThat(relations).isEmpty(); } - @Nested - class GetCourseCompetency { - - CourseCompetency getCall(long courseId, long competencyId, HttpStatus expectedStatus) throws Exception { - return request.get("/api/courses/" + courseId + "/course-competencies/" + competencyId, expectedStatus, CourseCompetency.class); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void shouldReturnCompetencyForStudent() throws Exception { - CourseCompetency response = getCall(course.getId(), competency.getId(), HttpStatus.OK); - assertThat(response.getId()).isEqualTo(competency.getId()); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testShouldOnlySendUserSpecificData() throws Exception { - User student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); - competencyProgressUtilService.createCompetencyProgress(competency, student1, 0, 1); - - User student2 = userUtilService.getUserByLogin(TEST_PREFIX + "student2"); - competencyProgressUtilService.createCompetencyProgress(competency, student2, 10, 1); - - final var textUnit = textUnitRepository.findById(idOfTextUnitOfLectureOne).get(); - lectureUtilService.completeLectureUnitForUser(textUnit, student2); - - CourseCompetency response = getCall(course.getId(), competency.getId(), HttpStatus.OK); - assertThat(response.getId()).isEqualTo(competency.getId()); - - // only progress of student1 is fetched - assertThat(response.getUserProgress()).hasSize(1); - - // only student2 has completed the textUnit - assertThat(response.getLectureUnits().stream().findFirst().get().getCompletedUsers()).isEmpty(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor42", roles = "INSTRUCTOR") - void shouldReturnForbiddenForUserNotInCourse() throws Exception { - getCall(course.getId(), competency.getId(), HttpStatus.FORBIDDEN); - } - } - @Nested class PreAuthorize { @@ -770,8 +509,8 @@ private void testAllPreAuthorizeEditor() throws Exception { private void testAllPreAuthorizeInstructor() throws Exception { // relations CompetencyRelation relation = new CompetencyRelation(); - relation.setHeadCompetency(competency); - relation.setTailCompetency(competency); + relation.setHeadCompetency(courseCompetency); + relation.setTailCompetency(courseCompetency); relation.setType(RelationType.EXTENDS); request.post("/api/courses/" + course.getId() + "/course-competencies/relations", CompetencyRelationDTO.of(relation), HttpStatus.FORBIDDEN); request.getSet("/api/courses/" + course.getId() + "/course-competencies/relations", HttpStatus.FORBIDDEN, CompetencyRelationDTO.class); diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java index d67697afba9c..42293964287f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java @@ -2,20 +2,18 @@ import java.util.Collections; import java.util.List; -import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.atlas.competency.util.PrerequisiteUtilService; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; @@ -24,9 +22,6 @@ class PrerequisiteIntegrationTest extends AbstractCompetencyPrerequisiteIntegrat private static final String TEST_PREFIX = "prerequisiteintegrationtest"; - @Autowired - private PrerequisiteUtilService prerequisiteUtilService; - @BeforeEach void setupTestScenario() { super.setupTestScenario(TEST_PREFIX, prerequisiteUtilService::createPrerequisite); @@ -36,18 +31,21 @@ void setupTestScenario() { class PreAuthorize { private void testAllPreAuthorizeEditor() throws Exception { - request.post("/api/courses/" + course.getId() + "/prerequisites/import/bulk", Collections.emptyList(), HttpStatus.FORBIDDEN); + request.post("/api/courses/" + course.getId() + "/prerequisites/import/bulk", new CompetencyImportOptionsDTO(null, null, false, false, false, null, false), + HttpStatus.FORBIDDEN); request.post("/api/courses/" + course.getId() + "/prerequisites/import-standardized", Collections.emptyList(), HttpStatus.FORBIDDEN); } private void testAllPreAuthorizeInstructor() throws Exception { request.put("/api/courses/" + course.getId() + "/prerequisites", new Prerequisite(), HttpStatus.FORBIDDEN); request.post("/api/courses/" + course.getId() + "/prerequisites", new Prerequisite(), HttpStatus.FORBIDDEN); - request.delete("/api/courses/" + course.getId() + "/prerequisites/" + competency.getId(), HttpStatus.FORBIDDEN); + request.delete("/api/courses/" + course.getId() + "/prerequisites/" + courseCompetency.getId(), HttpStatus.FORBIDDEN); request.post("/api/courses/" + course.getId() + "/prerequisites/bulk", Collections.emptyList(), HttpStatus.FORBIDDEN); // import - request.post("/api/courses/" + course.getId() + "/prerequisites/import-all/1", null, HttpStatus.FORBIDDEN); - request.post("/api/courses/" + course.getId() + "/prerequisites/import", competency.getId(), HttpStatus.FORBIDDEN); + request.post("/api/courses/" + course.getId() + "/prerequisites/import-all", new CompetencyImportOptionsDTO(null, null, false, false, false, null, false), + HttpStatus.FORBIDDEN); + request.post("/api/courses/" + course.getId() + "/prerequisites/import", new CompetencyImportOptionsDTO(null, null, false, false, false, null, false), + HttpStatus.FORBIDDEN); } @Test @@ -108,13 +106,13 @@ List getAllCall(long courseId, HttpStatus expectedSt @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void shouldReturnCompetenciesForStudentOfCourse() throws Exception { - super.shouldReturnCompetenciesForStudentOfCourse(new Prerequisite()); + super.shouldReturnCompetenciesForCourse(new Prerequisite()); } @Test @WithMockUser(username = TEST_PREFIX + "student42", roles = "USER") - void testShouldReturnForbiddenForStudentNotInCourse() throws Exception { - super.testShouldReturnForbiddenForStudentNotInCourse(); + void shouldReturnCompetenciesForStudentNotInCourse() throws Exception { + super.shouldReturnCompetenciesForCourse(new Prerequisite()); } void deleteCall(long courseId, long competencyId, HttpStatus expectedStatus) throws Exception { @@ -214,8 +212,8 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForCreate() throws Exception super.shouldReturnForbiddenForInstructorOfOtherCourseForCreate(new Prerequisite()); } - CourseCompetency importCall(long courseId, long competencyId, HttpStatus expectedStatus) throws Exception { - return request.postWithResponseBody("/api/courses/" + courseId + "/prerequisites/import", competencyId, Prerequisite.class, expectedStatus); + CourseCompetency importCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception { + return request.postWithResponseBody("/api/courses/" + courseId + "/prerequisites/import", importOptions, Prerequisite.class, expectedStatus); } @Test @@ -224,6 +222,12 @@ void shouldImportCompetency() throws Exception { super.shouldImportCompetency(); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportExerciseAndLectureWithCompetency() throws Exception { + super.shouldImportExerciseAndLectureWithCompetency(); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor42", roles = "INSTRUCTOR") void shouldReturnForbiddenForInstructorOfOtherCourseForImport() throws Exception { @@ -264,9 +268,8 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForCreateBulk() throws Excep super.shouldReturnForbiddenForInstructorOfOtherCourseForCreateBulk(); } - List importAllCall(long courseId, long sourceCourseId, boolean importRelations, HttpStatus expectedStatus) throws Exception { - return request.postListWithResponseBody("/api/courses/" + courseId + "/prerequisites/import-all/" + sourceCourseId + (importRelations ? "?importRelations=true" : ""), null, - CompetencyWithTailRelationDTO.class, expectedStatus); + List importAllCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception { + return request.postListWithResponseBody("/api/courses/" + courseId + "/prerequisites/import-all", importOptions, CompetencyWithTailRelationDTO.class, expectedStatus); } @Test @@ -275,6 +278,18 @@ void shouldImportAllCompetencies() throws Exception { super.shouldImportAllCompetencies(prerequisiteUtilService::createPrerequisite); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllExerciseAndLectureWithCompetency() throws Exception { + super.shouldImportAllExerciseAndLectureWithCompetency(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + super.shouldImportAllExerciseAndLectureWithCompetencyAndChangeDates(); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor42", roles = "INSTRUCTOR") void shouldReturnForbiddenForInstructorNotInCourse() throws Exception { @@ -303,9 +318,8 @@ void shouldReturnNotFoundForNotExistingIds() throws Exception { super.shouldReturnNotFoundForNotExistingIds(); } - List importBulkCall(long courseId, Set competencyIds, boolean importRelations, HttpStatus expectedStatus) throws Exception { - return request.postListWithResponseBody("/api/courses/" + courseId + "/prerequisites/import/bulk" + (importRelations ? "?importRelations=true" : ""), competencyIds, - CompetencyWithTailRelationDTO.class, expectedStatus); + List importBulkCall(long courseId, CompetencyImportOptionsDTO importOptions, HttpStatus expectedStatus) throws Exception { + return request.postListWithResponseBody("/api/courses/" + courseId + "/prerequisites/import/bulk", importOptions, CompetencyWithTailRelationDTO.class, expectedStatus); } @Test @@ -319,4 +333,16 @@ void shouldReturnForbiddenForInstructorOfOtherCourseForBulkImport() throws Excep void shouldImportCompetencies() throws Exception { super.shouldImportCompetencies(prerequisiteUtilService::createPrerequisite); } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportCompetenciesExerciseAndLectureWithCompetency() throws Exception { + super.shouldImportCompetenciesExerciseAndLectureWithCompetency(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportCompetenciesExerciseAndLectureWithCompetencyAndChangeDates() throws Exception { + super.shouldImportCompetenciesExerciseAndLectureWithCompetencyAndChangeDates(); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java index 09c050bce269..48ba9e4a1d31 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java @@ -12,11 +12,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.competency.util.StandardizedCompetencyUtilService; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; @@ -29,13 +29,8 @@ import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyResultDTO; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; -import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class StandardizedCompetencyIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class StandardizedCompetencyIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "stdcompetencyintegrationtest"; @@ -47,21 +42,6 @@ class StandardizedCompetencyIntegrationTest extends AbstractSpringIntegrationInd private Source source; - @Autowired - private KnowledgeAreaRepository knowledgeAreaRepository; - - @Autowired - private StandardizedCompetencyRepository standardizedCompetencyRepository; - - @Autowired - private SourceRepository sourceRepository; - - @Autowired - private StandardizedCompetencyUtilService standardizedCompetencyUtilService; - - @Autowired - private CompetencyRepository competencyRepository; - @BeforeEach void setupTestScenario() { userUtilService.addUsers(TEST_PREFIX, 1, 1, 1, 1); diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/CompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/CompetencyUtilService.java index cd5121642ce2..bca2072b19d0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/CompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/CompetencyUtilService.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; @@ -35,7 +35,7 @@ public class CompetencyUtilService { private LectureUnitRepository lectureUnitRepository; @Autowired - private ExerciseRepository exerciseRepository; + private ExerciseTestRepository exerciseRepository; @Autowired private CompetencyRelationRepository competencyRelationRepository; @@ -50,12 +50,13 @@ public class CompetencyUtilService { * @param suffix The suffix that will be added to the title of the Competency * @return The created Competency */ - private Competency createCompetency(Course course, String suffix) { + public Competency createCompetency(Course course, String suffix) { Competency competency = new Competency(); competency.setTitle("Example Competency" + suffix); competency.setDescription("Magna pars studiorum, prodita quaerimus."); competency.setTaxonomy(CompetencyTaxonomy.UNDERSTAND); competency.setCourse(course); + competency.setMasteryThreshold(42); return competencyRepo.save(competency); } diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/PrerequisiteUtilService.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/PrerequisiteUtilService.java index e23ce52e6579..edf6e9378286 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/PrerequisiteUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/PrerequisiteUtilService.java @@ -30,6 +30,7 @@ public Prerequisite createPrerequisite(Course course) { prerequisite.setTitle("Example Prerequisite"); prerequisite.setDescription("Magna pars studiorum, prodita quaerimus."); prerequisite.setCourse(course); + prerequisite.setMasteryThreshold(42); return prerequisiteRepository.save(prerequisite); } diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java index fb0bf6dcb286..9c55add49a9d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java @@ -8,6 +8,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.function.Function; import java.util.stream.Stream; @@ -19,96 +20,42 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; -import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; -import de.tum.cit.aet.artemis.atlas.learningpath.util.LearningPathUtilService; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.atlas.test_repository.CompetencyProgressTestRepository; -import de.tum.cit.aet.artemis.atlas.test_repository.LearningPathTestRepository; import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; -import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; -class LearningPathIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class LearningPathIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "learningpathintegration"; - @Autowired - private CompetencyUtilService competencyUtilService; - - @Autowired - private PageableSearchUtilService pageableSearchUtilService; - - @Autowired - private LearningPathTestRepository learningPathRepository; - - @Autowired - private TextExerciseUtilService textExerciseUtilService; - - @Autowired - private LectureRepository lectureRepository; - - @Autowired - private LectureUtilService lectureUtilService; - - @Autowired - private GradingCriterionRepository gradingCriterionRepository; - - @Autowired - private LectureUnitService lectureUnitService; - - @Autowired - private CompetencyProgressService competencyProgressService; - - @Autowired - private LearningPathUtilService learningPathUtilService; - - @Autowired - private CompetencyProgressTestRepository competencyProgressRepository; - - @Autowired - private CompetencyRelationRepository competencyRelationRepository; - - @Autowired - private StudentScoreUtilService studentScoreUtilService; - - @Autowired - private LectureUnitRepository lectureUnitRepository; - private Course course; private Competency[] competencies; @@ -121,7 +68,9 @@ class LearningPathIntegrationTest extends AbstractSpringIntegrationIndependentTe private static final int NUMBER_OF_STUDENTS = 5; - private static final String STUDENT_OF_COURSE = TEST_PREFIX + "student1"; + private static final String STUDENT1_OF_COURSE = TEST_PREFIX + "student1"; + + private static final String STUDENT2_OF_COURSE = TEST_PREFIX + "student2"; private static final String TUTOR_OF_COURSE = TEST_PREFIX + "tutor1"; @@ -158,7 +107,7 @@ void setupTestScenario() throws Exception { lecture.setCourse(course); lectureRepository.save(lecture); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); textUnit = createAndLinkTextUnit(student, competencies[0], true); textExercise = createAndLinkTextExercise(competencies[1], false); @@ -193,13 +142,16 @@ private Competency createCompetencyRESTCall() throws Exception { competencyToCreate.setTitle("CompetencyToCreateTitle"); competencyToCreate.setCourse(course); competencyToCreate.setLectureUnits(Set.of(textUnit)); + competencyToCreate.setMasteryThreshold(42); return request.postWithResponseBody("/api/courses/" + course.getId() + "/competencies", competencyToCreate, Competency.class, HttpStatus.CREATED); } private Competency importCompetencyRESTCall() throws Exception { final var course2 = courseUtilService.createCourse(); final var competencyToImport = competencyUtilService.createCompetency(course2); - return request.postWithResponseBody("/api/courses/" + course.getId() + "/competencies/import", competencyToImport.getId(), Competency.class, HttpStatus.CREATED); + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(competencyToImport.getId()), Optional.empty(), false, false, false, Optional.empty(), + false); + return request.postWithResponseBody("/api/courses/" + course.getId() + "/competencies/import", importOptions, Competency.class, HttpStatus.CREATED); } private List importCompetenciesRESTCall(int numberOfCompetencies) throws Exception { @@ -207,7 +159,8 @@ private List importCompetenciesRESTCall(int numbe for (int i = 0; i < numberOfCompetencies; i++) { competencyUtilService.createCompetency(course2); } - return request.postListWithResponseBody("/api/courses/" + course.getId() + "/competencies/import-all/" + course2.getId(), null, CompetencyWithTailRelationDTO.class, + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course2.getId()), false, false, false, Optional.empty(), false); + return request.postListWithResponseBody("/api/courses/" + course.getId() + "/competencies/import-all", importOptions, CompetencyWithTailRelationDTO.class, HttpStatus.CREATED); } @@ -216,10 +169,10 @@ private void deleteCompetencyRESTCall(Competency competency) throws Exception { } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testAll_asStudent() throws Exception { this.testAllPreAuthorize(); - request.get("/api/courses/" + course.getId() + "/learning-path-id", HttpStatus.BAD_REQUEST, Long.class); + request.get("/api/courses/" + course.getId() + "/learning-path/me", HttpStatus.BAD_REQUEST, LearningPathDTO.class); } @Test @@ -315,7 +268,7 @@ void testGetLearningPathsOnPageForCourseLearningPathsDisabled() throws Exception @WithMockUser(username = INSTRUCTOR_OF_COURSE, roles = "INSTRUCTOR") void testGetLearningPathsOnPageForCourseEmpty() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var search = pageableSearchUtilService.configureSearch(STUDENT_OF_COURSE + "SuffixThatAllowsTheResultToBeEmpty"); + final var search = pageableSearchUtilService.configureSearch(STUDENT1_OF_COURSE + "SuffixThatAllowsTheResultToBeEmpty"); final var result = request.getSearchResult("/api/courses/" + course.getId() + "/learning-paths", HttpStatus.OK, LearningPathInformationDTO.class, pageableSearchUtilService.searchMapping(search)); assertThat(result.getResultsOnPage()).isNullOrEmpty(); @@ -325,7 +278,7 @@ void testGetLearningPathsOnPageForCourseEmpty() throws Exception { @WithMockUser(username = INSTRUCTOR_OF_COURSE, roles = "INSTRUCTOR") void testGetLearningPathsOnPageForCourseExactlyStudent() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var search = pageableSearchUtilService.configureSearch(STUDENT_OF_COURSE); + final var search = pageableSearchUtilService.configureSearch(STUDENT1_OF_COURSE); final var result = request.getSearchResult("/api/courses/" + course.getId() + "/learning-paths", HttpStatus.OK, LearningPathInformationDTO.class, pageableSearchUtilService.searchMapping(search)); assertThat(result.getResultsOnPage()).hasSize(1); @@ -359,7 +312,7 @@ void addCompetencyToLearningPaths(Function competencyProgressService.updateCompetencyProgress(competency.getId(), student)); @@ -488,10 +441,10 @@ void testGetLearningPathCompetencyGraph() throws Exception { @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") @EnumSource(LearningPathResource.NgxRequestType.class) - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningPathNgxForLearningPathsDisabled(LearningPathResource.NgxRequestType type) throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); course.setLearningPathsEnabled(false); courseRepository.save(course); @@ -503,7 +456,7 @@ void testGetLearningPathNgxForLearningPathsDisabled(LearningPathResource.NgxRequ @WithMockUser(username = TEST_PREFIX + "student2", roles = "USER") void testGetLearningPathNgxForOtherStudent(LearningPathResource.NgxRequestType type) throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); request.get("/api/learning-path/" + learningPath.getId() + "/" + type, HttpStatus.FORBIDDEN, NgxLearningPathDTO.class); } @@ -516,10 +469,10 @@ void testGetLearningPathNgxForOtherStudent(LearningPathResource.NgxRequestType t */ @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") @EnumSource(LearningPathResource.NgxRequestType.class) - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningPathNgxAsStudent(LearningPathResource.NgxRequestType type) throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); request.get("/api/learning-path/" + learningPath.getId() + "/" + type, HttpStatus.OK, NgxLearningPathDTO.class); } @@ -567,33 +520,33 @@ void testGetLearningPathNgxAsEditor(LearningPathResource.NgxRequestType type) th @WithMockUser(username = INSTRUCTOR_OF_COURSE, roles = "INSTRUCTOR") void testGetLearningPathNgxAsInstructor(LearningPathResource.NgxRequestType type) throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); request.get("/api/learning-path/" + learningPath.getId() + "/" + type, HttpStatus.OK, NgxLearningPathDTO.class); } @Nested - class GetLearningPathId { + class GetLearningPath { @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") - void shouldReturnExistingId() throws Exception { + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") + void shouldReturnExisting() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); - final var result = request.get("/api/courses/" + course.getId() + "/learning-path-id", HttpStatus.OK, Long.class); - assertThat(result).isEqualTo(learningPath.getId()); + final var result = request.get("/api/courses/" + course.getId() + "/learning-path/me", HttpStatus.OK, LearningPathDTO.class); + assertThat(result).isEqualTo(LearningPathDTO.of(learningPath)); } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void shouldReturnNotFoundIfNotExists() throws Exception { course.setLearningPathsEnabled(true); course = courseRepository.save(course); - var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); student = userTestRepository.findWithLearningPathsByIdElseThrow(student.getId()); learningPathRepository.deleteAll(student.getLearningPaths()); - request.get("/api/courses/" + course.getId() + "/learning-path-id", HttpStatus.NOT_FOUND, Long.class); + request.get("/api/courses/" + course.getId() + "/learning-path/me", HttpStatus.NOT_FOUND, LearningPathDTO.class); } } @@ -601,42 +554,79 @@ void shouldReturnNotFoundIfNotExists() throws Exception { class GenerateLearningPath { @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void shouldReturnForbiddenIfNotEnabled() throws Exception { - request.postWithResponseBody("/api/courses/" + course.getId() + "/learning-path", null, Long.class, HttpStatus.BAD_REQUEST); + request.postWithResponseBody("/api/courses/" + course.getId() + "/learning-path", null, LearningPathDTO.class, HttpStatus.BAD_REQUEST); } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void shouldReturnBadRequestIfAlreadyExists() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - request.postWithResponseBody("/api/courses/" + course.getId() + "/learning-path", null, Long.class, HttpStatus.BAD_REQUEST); + request.postWithResponseBody("/api/courses/" + course.getId() + "/learning-path", null, LearningPathDTO.class, HttpStatus.CONFLICT); } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void shouldGenerateLearningPath() throws Exception { course.setLearningPathsEnabled(true); course = courseRepository.save(course); - final var response = request.postWithResponseBody("/api/courses/" + course.getId() + "/learning-path", null, Long.class, HttpStatus.CREATED); + final var response = request.postWithResponseBody("/api/courses/" + course.getId() + "/learning-path", null, LearningPathDTO.class, HttpStatus.CREATED); assertThat(response).isNotNull(); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); assertThat(learningPath).isNotNull(); } } + @Nested + class StartLearningPath { + + @BeforeEach + void setup() { + course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); + } + + @Test + @WithMockUser(username = STUDENT2_OF_COURSE, roles = "USER") + void shouldReturnForbiddenIfNotOwn() throws Exception { + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); + final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); + request.patch("/api/learning-path/" + learningPath.getId() + "/start", null, HttpStatus.FORBIDDEN); + } + + @Test + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") + void shouldReturnBadRequestIfAlreadyStarted() throws Exception { + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); + final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); + learningPath.setStartedByStudent(true); + learningPathRepository.save(learningPath); + request.patch("/api/learning-path/" + learningPath.getId() + "/start", null, HttpStatus.CONFLICT); + } + + @Test + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") + void shouldStartLearningPath() throws Exception { + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); + final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); + request.patch("/api/learning-path/" + learningPath.getId() + "/start", null, HttpStatus.NO_CONTENT); + final var updatedLearningPath = learningPathRepository.findByIdElseThrow(learningPath.getId()); + assertThat(updatedLearningPath.isStartedByStudent()).isTrue(); + } + } + @Test @WithMockUser(username = TEST_PREFIX + "student2", roles = "USER") void testGetCompetencyProgressForLearningPathByOtherStudent() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); request.get("/api/learning-path/" + learningPath.getId() + "/competency-progress", HttpStatus.FORBIDDEN, Set.class); } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetCompetencyProgressForLearningPathByOwner() throws Exception { testGetCompetencyProgressForLearningPath(); } @@ -648,10 +638,10 @@ void testGetCompetencyProgressForLearningPathByInstructor() throws Exception { } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningPathNavigation() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); competencyProgressService.updateProgressByLearningObjectSync(textUnit, Set.of(student)); @@ -663,10 +653,10 @@ void testGetLearningPathNavigation() throws Exception { } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningPathNavigationEmptyCompetencies() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); textExercise.setCompetencies(Set.of()); @@ -688,10 +678,10 @@ void testGetLearningPathNavigationEmptyCompetencies() throws Exception { } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningPathNavigationDoesNotLeakUnreleasedLearningObjects() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); textExercise.setCompetencies(Set.of()); @@ -736,10 +726,10 @@ private void verifyNavigationObjectResult(LearningObject expectedObject, Learnin } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetRelativeLearningPathNavigation() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); final var result = request.get("/api/learning-path/" + learningPath.getId() + "/relative-navigation?learningObjectId=" + textUnit.getId() + "&learningObjectType=" + LearningPathNavigationObjectDTO.LearningObjectType.LECTURE + "&competencyId=" + competencies[0].getId(), HttpStatus.OK, LearningPathNavigationDTO.class); @@ -753,16 +743,16 @@ void testGetRelativeLearningPathNavigation() throws Exception { @WithMockUser(username = TEST_PREFIX + "student1337", roles = "USER") void testGetLearningPathNavigationForOtherStudent() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); request.get("/api/learning-path/" + learningPath.getId() + "/navigation", HttpStatus.FORBIDDEN, LearningPathNavigationDTO.class); } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningPathNavigationOverview() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); final var result = request.get("/api/learning-path/" + learningPath.getId() + "/navigation-overview", HttpStatus.OK, LearningPathNavigationOverviewDTO.class); @@ -776,26 +766,26 @@ void testGetLearningPathNavigationOverview() throws Exception { @WithMockUser(username = TEST_PREFIX + "student1337", roles = "USER") void testGetLearningPathNavigationOverviewForOtherStudent() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); request.get("/api/learning-path/" + learningPath.getId() + "/navigation-overview", HttpStatus.FORBIDDEN, LearningPathNavigationOverviewDTO.class); } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetCompetencyOrderForLearningPath() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); final var result = request.getList("/api/learning-path/" + learningPath.getId() + "/competencies", HttpStatus.OK, CompetencyNameDTO.class); assertThat(result).containsExactlyElementsOf(Arrays.stream(competencies).map(CompetencyNameDTO::of).toList()); } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningObjectsForCompetency() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); var result = request.getList("/api/learning-path/" + learningPath.getId() + "/competencies/" + competencies[0].getId() + "/learning-objects", HttpStatus.OK, LearningPathNavigationObjectDTO.class); @@ -809,10 +799,10 @@ void testGetLearningObjectsForCompetency() throws Exception { } @Test - @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + @WithMockUser(username = STUDENT1_OF_COURSE, roles = "USER") void testGetLearningObjectsForCompetencyMultipleObjects() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); List completedLectureUnits = List.of(createAndLinkTextUnit(student, competencies[4], true), createAndLinkTextUnit(student, competencies[4], true)); @@ -843,7 +833,7 @@ void testGetLearningObjectsForCompetencyMultipleObjects() throws Exception { void testGetCompetencyProgressForLearningPath() throws Exception { course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course); - final var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + final var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId()); final var result = request.get("/api/learning-path/" + learningPath.getId() + "/competency-progress", HttpStatus.OK, Set.class); assertThat(result).hasSize(5); @@ -854,7 +844,7 @@ private TextExercise createAndLinkTextExercise(Competency competency, boolean wi Set gradingCriteria = exerciseUtilService.addGradingInstructionsToExercise(textExercise); gradingCriterionRepository.saveAll(gradingCriteria); if (withAssessment) { - var student = userTestRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow(); + var student = userTestRepository.findOneByLogin(STUDENT1_OF_COURSE).orElseThrow(); studentScoreUtilService.createStudentScore(textExercise, student, 100.0); } competencyUtilService.linkExerciseToCompetency(competency, textExercise); diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java index a4ac82d52470..2ab78b575e78 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java @@ -6,25 +6,16 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.atlas.dto.ScienceEventDTO; -import de.tum.cit.aet.artemis.atlas.test_repository.ScienceEventTestRepository; import de.tum.cit.aet.artemis.core.service.feature.Feature; -import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class ScienceIntegrationTest extends AbstractSpringIntegrationIndependentTest { - - @Autowired - private ScienceEventTestRepository scienceEventRepository; - - @Autowired - private FeatureToggleService featureToggleService; +class ScienceIntegrationTest extends AbstractAtlasIntegrationTest { @BeforeEach void enableFeatureToggle() { diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java index c1657bd2a391..bf186724f0f3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java @@ -7,22 +7,17 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; -import de.tum.cit.aet.artemis.atlas.repository.ScienceSettingRepository; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class ScienceSettingsIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class ScienceSettingsIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "sciencesettingsintegration"; - @Autowired - private ScienceSettingRepository scienceSettingRepository; - private ScienceSetting settingA; private ScienceSetting settingB; diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java index 6717bbd6b508..65143ebdf769 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java @@ -41,7 +41,6 @@ import de.tum.cit.aet.artemis.core.util.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; @@ -80,9 +79,6 @@ class LearningPathServiceTest extends AbstractSpringIntegrationIndependentTest { @Autowired private CompetencyProgressUtilService competencyProgressUtilService; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private StudentScoreUtilService studentScoreUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentRepositoryArchitectureTest.java new file mode 100644 index 000000000000..29294ffdeddf --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.buildagent.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class BuildAgentRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".buildagent"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentResourceArchitectureTest.java new file mode 100644 index 000000000000..937d9abcb386 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.buildagent.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class BuildAgentResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".buildagent"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentServiceArchitectureTest.java new file mode 100644 index 000000000000..2e577accf146 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/buildagent/architecture/BuildAgentServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.buildagent.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class BuildAgentServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".buildagent"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java index 1da83f9c87c3..b4012d1f7a6f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java @@ -91,7 +91,7 @@ void testPullDockerImage() { InspectImageCmd inspectImageCmd = mock(InspectImageCmd.class); doReturn(inspectImageCmd).when(dockerClient).inspectImageCmd(anyString()); doThrow(new NotFoundException("")).when(inspectImageCmd).exec(); - BuildConfig buildConfig = new BuildConfig("echo 'test'", "test-image-name", "test", "test", "test", "test", null, null, false, false, false, null); + BuildConfig buildConfig = new BuildConfig("echo 'test'", "test-image-name", "test", "test", "test", "test", null, null, false, false, false, null, 0, null, null, null); var build = new BuildJobQueueItem("1", "job1", "address1", 1, 1, 1, 1, 1, BuildStatus.SUCCESSFUL, null, null, buildConfig, null); // Pull image try { diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index 80fb86f7e167..c0aa140ae963 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -35,8 +35,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupTestRepository; -import de.tum.cit.aet.artemis.tutorialgroups.util.TutorialGroupUtilService; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.util.TutorialGroupUtilService; class ChannelIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/FaqFactory.java b/src/test/java/de/tum/cit/aet/artemis/communication/FaqFactory.java new file mode 100644 index 000000000000..0f8436326876 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/communication/FaqFactory.java @@ -0,0 +1,28 @@ +package de.tum.cit.aet.artemis.communication; + +import java.util.HashSet; +import java.util.Set; + +import de.tum.cit.aet.artemis.communication.domain.Faq; +import de.tum.cit.aet.artemis.communication.domain.FaqState; +import de.tum.cit.aet.artemis.core.domain.Course; + +public class FaqFactory { + + public static Faq generateFaq(Course course, FaqState state, String title, String answer) { + Faq faq = new Faq(); + faq.setCourse(course); + faq.setFaqState(state); + faq.setQuestionTitle(title); + faq.setQuestionAnswer(answer); + faq.setCategories(generateFaqCategories()); + return faq; + } + + public static Set generateFaqCategories() { + Set categories = new HashSet<>(); + categories.add("this is a category"); + categories.add("this is also a category"); + return categories; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/FaqIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/FaqIntegrationTest.java new file mode 100644 index 000000000000..5f226f52d4dc --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/communication/FaqIntegrationTest.java @@ -0,0 +1,164 @@ +package de.tum.cit.aet.artemis.communication; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.test.context.support.WithMockUser; + +import de.tum.cit.aet.artemis.communication.domain.Faq; +import de.tum.cit.aet.artemis.communication.domain.FaqState; +import de.tum.cit.aet.artemis.communication.repository.FaqRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; + +class FaqIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + private static final String TEST_PREFIX = "faqintegrationtest"; + + @Autowired + private FaqRepository faqRepository; + + private Course course1; + + private Faq faq; + + @BeforeEach + void initTestCase() throws Exception { + int numberOfTutors = 2; + userUtilService.addUsers(TEST_PREFIX, 1, numberOfTutors, 0, 1); + List courses = courseUtilService.createCoursesWithExercisesAndLectures(TEST_PREFIX, true, true, numberOfTutors); + this.course1 = this.courseRepository.findByIdWithExercisesAndExerciseDetailsAndLecturesElseThrow(courses.getFirst().getId()); + this.faq = FaqFactory.generateFaq(course1, FaqState.ACCEPTED, "answer", "title"); + faqRepository.save(this.faq); + // Add users that are not in the course + userUtilService.createAndSaveUser(TEST_PREFIX + "student42"); + userUtilService.createAndSaveUser(TEST_PREFIX + "instructor42"); + + } + + private void testAllPreAuthorize() throws Exception { + request.postWithResponseBody("/api/courses/" + faq.getCourse().getId() + "/faqs", new Faq(), Faq.class, HttpStatus.FORBIDDEN); + request.putWithResponseBody("/api/courses/" + faq.getCourse().getId() + "/faqs/" + this.faq.getId(), this.faq, Faq.class, HttpStatus.FORBIDDEN); + request.delete("/api/courses/" + faq.getCourse().getId() + "/faqs/" + this.faq.getId(), HttpStatus.FORBIDDEN); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "tutor1", roles = "TA") + void testAll_asTutor() throws Exception { + this.testAllPreAuthorize(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testAll_asStudent() throws Exception { + this.testAllPreAuthorize(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void createFaq_correctRequestBody_shouldCreateFaq() throws Exception { + Faq newFaq = FaqFactory.generateFaq(course1, FaqState.ACCEPTED, "title", "answer"); + Faq returnedFaq = request.postWithResponseBody("/api/courses/" + course1.getId() + "/faqs", newFaq, Faq.class, HttpStatus.CREATED); + assertThat(returnedFaq).isNotNull(); + assertThat(returnedFaq.getId()).isNotNull(); + assertThat(returnedFaq.getQuestionTitle()).isEqualTo(newFaq.getQuestionTitle()); + assertThat(returnedFaq.getQuestionAnswer()).isEqualTo(newFaq.getQuestionAnswer()); + assertThat(returnedFaq.getCategories()).isEqualTo(newFaq.getCategories()); + assertThat(returnedFaq.getFaqState()).isEqualTo(newFaq.getFaqState()); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void createFaq_alreadyId_shouldReturnBadRequest() throws Exception { + Faq newFaq = FaqFactory.generateFaq(course1, FaqState.ACCEPTED, "title", "answer"); + newFaq.setId(this.faq.getId()); + request.postWithResponseBody("/api/courses/" + course1.getId() + "/faqs", newFaq, Faq.class, HttpStatus.BAD_REQUEST); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void createFaq_courseId_noMatch_shouldReturnBadRequest() throws Exception { + Faq newFaq = FaqFactory.generateFaq(course1, FaqState.ACCEPTED, "title", "answer"); + request.postWithResponseBody("/api/courses/" + course1.getId() + 1 + "/faqs", newFaq, Faq.class, HttpStatus.BAD_REQUEST); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void updateFaq_correctRequestBody_shouldUpdateFaq() throws Exception { + Faq faq = faqRepository.findById(this.faq.getId()).orElseThrow(); + faq.setQuestionTitle("Updated"); + faq.setQuestionAnswer("Update"); + faq.setFaqState(FaqState.PROPOSED); + Set newCategories = new HashSet<>(); + newCategories.add("Test"); + faq.setCategories(newCategories); + Faq updatedFaq = request.putWithResponseBody("/api/courses/" + faq.getCourse().getId() + "/faqs/" + faq.getId(), faq, Faq.class, HttpStatus.OK); + assertThat(updatedFaq.getQuestionTitle()).isEqualTo("Updated"); + assertThat(updatedFaq.getQuestionAnswer()).isEqualTo("Update"); + assertThat(updatedFaq.getFaqState()).isEqualTo(FaqState.PROPOSED); + assertThat(updatedFaq.getCategories()).isEqualTo(newCategories); + assertThat(updatedFaq.getCreatedDate()).isNotNull(); + assertThat(updatedFaq.getLastModifiedDate()).isNotNull(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void updateFaq_IdsDoNotMatch_shouldNotUpdateFaq() throws Exception { + Faq faq = faqRepository.findById(this.faq.getId()).orElseThrow(); + faq.setQuestionTitle("Updated"); + faq.setFaqState(FaqState.PROPOSED); + Faq updatedFaq = request.putWithResponseBody("/api/courses/" + faq.getCourse().getId() + 1 + "/faqs/" + faq.getId(), faq, Faq.class, HttpStatus.BAD_REQUEST); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetFaqCategoriesByCourseId() throws Exception { + Faq faq = faqRepository.findById(this.faq.getId()).orElseThrow(EntityNotFoundException::new); + Set categories = faq.getCategories(); + Set returnedCategories = request.get("/api/courses/" + faq.getCourse().getId() + "/faq-categories", HttpStatus.OK, Set.class); + assertThat(categories).isEqualTo(returnedCategories); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetFaqByFaqId() throws Exception { + Faq faq = faqRepository.findById(this.faq.getId()).orElseThrow(EntityNotFoundException::new); + Faq returnedFaq = request.get("/api/courses/" + faq.getCourse().getId() + "/faqs/" + faq.getId(), HttpStatus.OK, Faq.class); + assertThat(faq).isEqualTo(returnedFaq); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetFaqByFaqId_shouldNotGet_IdMismatch() throws Exception { + Faq faq = faqRepository.findById(this.faq.getId()).orElseThrow(EntityNotFoundException::new); + Faq returnedFaq = request.get("/api/courses/" + faq.getCourse().getId() + 1 + "/faqs/" + faq.getId(), HttpStatus.BAD_REQUEST, Faq.class); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void deleteFaq_shouldDeleteFAQ() throws Exception { + Faq faq = faqRepository.findById(this.faq.getId()).orElseThrow(EntityNotFoundException::new); + request.delete("/api/courses/" + faq.getCourse().getId() + "/faqs/" + faq.getId(), HttpStatus.OK); + Optional faqOptional = faqRepository.findById(faq.getId()); + assertThat(faqOptional).isEmpty(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void deleteFaq_IdsDoNotMatch_shouldNotDeleteFAQ() throws Exception { + Faq faq = faqRepository.findById(this.faq.getId()).orElseThrow(EntityNotFoundException::new); + request.delete("/api/courses/" + faq.getCourse().getId() + 1 + "/faqs/" + faq.getId(), HttpStatus.BAD_REQUEST); + Optional faqOptional = faqRepository.findById(faq.getId()); + assertThat(faqOptional).isPresent(); + } + +} diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationRepositoryArchitectureTest.java new file mode 100644 index 000000000000..819247fc09dd --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.communication.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class CommunicationRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".communication"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationResourceArchitectureTest.java new file mode 100644 index 000000000000..4711c8f827d2 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.communication.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class CommunicationResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".communication"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationServiceArchitectureTest.java new file mode 100644 index 000000000000..9b7f383c7d49 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/communication/architecture/CommunicationServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.communication.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class CommunicationServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".communication"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notification/GroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notification/GroupNotificationServiceTest.java index 88dbd05d6ccb..4ccf0116d463 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/notification/GroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/notification/GroupNotificationServiceTest.java @@ -61,7 +61,6 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.util.ExamUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -82,9 +81,6 @@ class GroupNotificationServiceTest extends AbstractSpringIntegrationIndependentT @Autowired private NotificationSettingRepository notificationSettingRepository; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private ExamRepository examRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationPlaceholderSignatureTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationPlaceholderSignatureTest.java index 6bfbdffadc3b..2c6639cac9e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationPlaceholderSignatureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationPlaceholderSignatureTest.java @@ -66,7 +66,7 @@ void testSignatureHasNotChanged() throws URISyntaxException, IOException { } private String readPlaceholderText(URL url) throws URISyntaxException, IOException { - return Files.readString(Paths.get(url.toURI())); + return Files.readString(Paths.get(url.toURI())).strip(); } private record ClassSignature(String notificationType, List fieldDescriptions) implements Comparable { diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationScheduleServiceTest.java index f3dc650315c9..c49163742ba4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationScheduleServiceTest.java @@ -6,7 +6,6 @@ import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anySet; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -32,7 +31,6 @@ import de.tum.cit.aet.artemis.core.util.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; @@ -44,9 +42,6 @@ class NotificationScheduleServiceTest extends AbstractSpringIntegrationLocalCILo @Autowired private InstanceMessageReceiveService instanceMessageReceiveService; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private NotificationRepository notificationRepository; @@ -85,7 +80,6 @@ void init() { exercise.setMaxPoints(5.0); exerciseRepository.saveAndFlush(exercise); - doNothing().when(javaMailSender).send(any(MimeMessage.class)); sizeBefore = notificationRepository.count(); } diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notification/PushNotificationResourceTest.java index 2a310e068f7c..65a2496efcf9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/notification/PushNotificationResourceTest.java @@ -8,7 +8,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; @@ -24,7 +23,6 @@ import de.tum.cit.aet.artemis.core.user.util.UserUtilService; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -@TestInstance(TestInstance.Lifecycle.PER_CLASS) class PushNotificationResourceTest extends AbstractSpringIntegrationIndependentTest { @Autowired diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notification/SingleUserNotificationServiceTest.java index 9faaf7d03bc3..347438c89a97 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/notification/SingleUserNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/notification/SingleUserNotificationServiceTest.java @@ -22,12 +22,14 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_CREATED; import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_FAILED; @@ -40,7 +42,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anySet; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.timeout; @@ -63,6 +64,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; @@ -90,7 +92,6 @@ import de.tum.cit.aet.artemis.core.util.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; @@ -118,9 +119,6 @@ class SingleUserNotificationServiceTest extends AbstractSpringIntegrationIndepen @Autowired private NotificationSettingRepository notificationSettingRepository; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private ResultTestRepository resultRepository; @@ -136,6 +134,12 @@ class SingleUserNotificationServiceTest extends AbstractSpringIntegrationIndepen @Autowired private ParticipationUtilService participationUtilService; + @Captor + private ArgumentCaptor appleNotificationCaptor; + + @Captor + private ArgumentCaptor firebaseNotificationCaptor; + private User user; private User userTwo; @@ -267,8 +271,6 @@ void setUp() { dataExport = new DataExport(); dataExport.setUser(user); - - doNothing().when(javaMailSender).send(any(MimeMessage.class)); } /** @@ -277,8 +279,10 @@ void setUp() { * @param expectedNotificationTitle is the title (NotificationTitleTypeConstants) of the expected notification */ private void verifyRepositoryCallWithCorrectNotification(String expectedNotificationTitle) { - Notification capturedNotification = notificationRepository.findAll().getFirst(); - assertThat(capturedNotification.getTitle()).as("Title of the captured notification should be equal to the expected one").isEqualTo(expectedNotificationTitle); + List capturedNotifications = notificationRepository.findAll(); + assertThat(capturedNotifications).isNotEmpty(); + List relevantNotifications = capturedNotifications.stream().filter(e -> e.getTitle().equals(expectedNotificationTitle)).toList(); + assertThat(relevantNotifications).as("Title of the captured notification should be equal to the expected one").hasSize(1); } /// General notify Tests @@ -535,24 +539,24 @@ void testTutorialGroupNotifications_tutorDeregistration() { @Test void testTutorialGroupNotifications_groupAssigned() { notificationSettingRepository.deleteAll(); - notificationSettingRepository - .save(new NotificationSetting(tutorialGroup.getTeachingAssistant(), true, true, true, NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN)); + User teachingAssistant = tutorialGroup.getTeachingAssistant(); + notificationSettingRepository.save(new NotificationSetting(teachingAssistant, true, true, true, NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN)); singleUserNotificationService.notifyTutorAboutAssignmentToTutorialGroup(tutorialGroup, tutorialGroup.getTeachingAssistant(), userThree); verifyRepositoryCallWithCorrectNotification(TUTORIAL_GROUP_ASSIGNED_TITLE); verifyEmail(); - verifyPush(1); + verifyPush(1, TUTORIAL_GROUP_ASSIGNED_TEXT, teachingAssistant); } @Test void testTutorialGroupNotifications_groupUnassigned() { notificationSettingRepository.deleteAll(); - notificationSettingRepository - .save(new NotificationSetting(tutorialGroup.getTeachingAssistant(), true, true, true, NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN)); + User teachingAssistant = tutorialGroup.getTeachingAssistant(); + notificationSettingRepository.save(new NotificationSetting(teachingAssistant, true, true, true, NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN)); singleUserNotificationService.notifyTutorAboutUnassignmentFromTutorialGroup(tutorialGroup, tutorialGroup.getTeachingAssistant(), userThree); verifyRepositoryCallWithCorrectNotification(TUTORIAL_GROUP_UNASSIGNED_TITLE); verifyEmail(); - verifyPush(1); + verifyPush(1, TUTORIAL_GROUP_UNASSIGNED_TEXT, teachingAssistant); } @Test @@ -583,9 +587,20 @@ private void verifyEmail() { * * @param times how often the email should have been sent */ - private void verifyPush(int times) { - verify(applePushNotificationService, timeout(1500).times(times)).sendNotification(any(Notification.class), anySet(), any(Object.class)); - verify(firebasePushNotificationService, timeout(1500).times(times)).sendNotification(any(Notification.class), anySet(), any(Object.class)); + private void verifyPush(int times, String text, User recipient) { + verify(applePushNotificationService, timeout(1500).atLeast(times)).sendNotification(appleNotificationCaptor.capture(), anySet(), any(Object.class)); + verify(firebasePushNotificationService, timeout(1500).atLeast(times)).sendNotification(firebaseNotificationCaptor.capture(), anySet(), any(Object.class)); + + List appleNotifications = filterRelevantNotifications(appleNotificationCaptor.getAllValues(), text, recipient); + assertThat(appleNotifications).as(times + " Apple notifications should have been sent").hasSize(times); + + List firebaseNotifications = filterRelevantNotifications(firebaseNotificationCaptor.getAllValues(), text, recipient); + assertThat(firebaseNotifications).as(times + " Firebase notifications should have been sent").hasSize(times); + } + + private List filterRelevantNotifications(List notifications, String title, User recipient) { + return notifications.stream().filter(notification -> notification instanceof SingleUserNotification).map(notification -> (SingleUserNotification) notification) + .filter(notification -> title.equals(notification.getText()) && recipient.getId().equals(notification.getRecipient().getId())).toList(); } private static Stream getNotificationTypesAndTitlesParametersForGroupChat() { diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/TutorialGroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/TutorialGroupNotificationServiceTest.java index fb484c37a99d..26816a87c239 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/TutorialGroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/TutorialGroupNotificationServiceTest.java @@ -4,8 +4,6 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_DELETE_UPDATE; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -15,8 +13,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -40,8 +36,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupRegistrationTestRepository; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupRegistrationTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupTestRepository; class TutorialGroupNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { @@ -86,7 +82,6 @@ void setUp() { userRepository.findOneByLogin(TEST_PREFIX + "tutor1").orElseThrow(), IntStream.range(1, STUDENT_COUNT + 1) .mapToObj((studentId) -> userRepository.findOneByLogin(TEST_PREFIX + "student" + studentId).orElseThrow()).collect(Collectors.toSet())); - doNothing().when(javaMailSender).send(any(MimeMessage.class)); tutorialGroupNotificationRepository.deleteAll(); notificationSettingRepository.deleteAll(); } diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryServiceTest.java index 3e83e09a225c..a54be369017e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryServiceTest.java @@ -3,7 +3,6 @@ import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -29,7 +28,6 @@ import de.tum.cit.aet.artemis.core.util.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; @@ -40,9 +38,6 @@ class EmailSummaryServiceTest extends AbstractSpringIntegrationIndependentTest { @Autowired private EmailSummaryService weeklyEmailSummaryService; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private NotificationSettingRepository notificationSettingRepository; @@ -122,8 +117,6 @@ void setUp() { exerciseRepository.saveAll(allTestExercises); weeklyEmailSummaryService.setScheduleInterval(Duration.ofDays(7)); - - doNothing().when(javaMailSender).send(any(MimeMessage.class)); } /** diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/service/PushNotificationDeviceConfigurationCleanupServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/service/PushNotificationDeviceConfigurationCleanupServiceTest.java index dc59407ff76b..c8b142c4dc59 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/service/PushNotificationDeviceConfigurationCleanupServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/service/PushNotificationDeviceConfigurationCleanupServiceTest.java @@ -1,10 +1,9 @@ package de.tum.cit.aet.artemis.communication.service; -import static org.springframework.test.util.AssertionErrors.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; import java.time.temporal.ChronoUnit; -import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Set; @@ -54,6 +53,7 @@ void cleanupTest() { List result = deviceConfigurationRepository.findByUserIn(Set.of(user), PushNotificationDeviceType.FIREBASE); - assertEquals("The result is not correct", Collections.singletonList(valid), result); + assertThat(result).contains(valid); + assertThat(result).doesNotContain(expired); } } diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationUtilService.java index 46a2adbe005e..1a1855651224 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationUtilService.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.core.user.util.UserUtilService; import de.tum.cit.aet.artemis.core.util.CourseFactory; import de.tum.cit.aet.artemis.core.util.CourseUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; @@ -64,7 +64,7 @@ public class ConversationUtilService { private CourseTestRepository courseRepo; @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepo; @Autowired private LectureRepository lectureRepo; @@ -660,6 +660,7 @@ private Post createMessageWithReactionForUser(String login, String messageText, message.setAuthor(userUtilService.getUserByLogin(login)); message.setContent(messageText); message.setCreationDate(ZonedDateTime.now()); + message.setCourse(conversation.getCourse()); conversation.setCreator(message.getAuthor()); addReactionForUserToPost(login, message); conversationRepository.save(conversation); diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index b1c21105fbb9..5fc135207c5f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -55,7 +55,7 @@ import de.tum.cit.aet.artemis.core.test_repository.UserTestRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; @@ -78,7 +78,7 @@ class Lti13ServiceTest { private UserTestRepository userRepository; @Mock - private ExerciseRepository exerciseRepository; + private ExerciseTestRepository exerciseRepository; @Mock private CourseTestRepository courseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/core/MetricsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/core/MetricsIntegrationTest.java index aa126be537b7..4aefa856aef2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/MetricsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/MetricsIntegrationTest.java @@ -1,36 +1,44 @@ package de.tum.cit.aet.artemis.core; +import static de.tum.cit.aet.artemis.core.config.Constants.MIN_SCORE_GREEN; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toRelativeTime; import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; -import java.time.Instant; import java.util.Comparator; import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.function.Function; import java.util.stream.Collectors; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.util.ReflectionTestUtils; -import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; class MetricsIntegrationTest extends AbstractSpringIntegrationIndependentTest { @@ -40,18 +48,41 @@ class MetricsIntegrationTest extends AbstractSpringIntegrationIndependentTest { @Autowired private ExerciseMetricsRepository exerciseMetricsRepository; + @Autowired + private CompetencyRepository competencyRepository; + + @Autowired + private ExerciseTestRepository exerciseTestRepository; + + @Autowired + private LectureUnitRepository lectureUnitRepository; + + @Autowired + private StudentScoreRepository studentScoreRepository; + + @Autowired + protected StudentScoreUtilService studentScoreUtilService; + + @Autowired + protected LectureUtilService lectureUtilService; + + @Autowired + protected CompetencyUtilService competencyUtilService; + + @Autowired + protected LectureUnitService lectureUnitService; + private Course course; private Course courseWithTestRuns; + private long userID; + private static final String STUDENT_OF_COURSE = TEST_PREFIX + "student1"; @BeforeEach - void setupTestScenario() { - // Prevents the ParticipantScoreScheduleService from scheduling tasks related to prior results - ReflectionTestUtils.setField(participantScoreScheduleService, "lastScheduledRun", Optional.of(Instant.now())); + void setupTestScenario() throws Exception { ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 100; - participantScoreScheduleService.activate(); userUtilService.addUsers(TEST_PREFIX, 3, 1, 1, 1); @@ -59,6 +90,7 @@ void setupTestScenario() { courseWithTestRuns = courseUtilService.createCourseWithAllExerciseTypesAndParticipationsAndSubmissionsAndResultsAndTestRunsAndTwoUsers(TEST_PREFIX, true); userUtilService.createAndSaveUser(TEST_PREFIX + "user1337"); + userID = userUtilService.getUserByLogin(TEST_PREFIX + "student1").getId(); } @AfterEach @@ -94,25 +126,56 @@ void shouldReturnExerciseInformation() throws Exception { assertThat(exerciseInformation).allSatisfy((id, dto) -> assertThat(id).isEqualTo(dto.id())); } - @Disabled // TODO: reduce jacoco missing by one after enabled @Test @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") - void shouldReturnAverageScores() throws Exception { - // Wait for the scheduler to execute its task - participantScoreScheduleService.executeScheduledTasks(); - await().until(() -> participantScoreScheduleService.isIdle()); + void shouldReturnCategories() throws Exception { + final var result = request.get("/api/metrics/course/" + course.getId() + "/student", HttpStatus.OK, StudentMetricsDTO.class); + assertThat(result).isNotNull(); + assertThat(result.exerciseMetrics()).isNotNull(); + final var categories = result.exerciseMetrics().categories(); + + final var expectedCategories = exerciseTestRepository.findAllWithCategoriesByCourseId(course.getId()).stream() + .collect(Collectors.toMap(Exercise::getId, Exercise::getCategories)); + + assertThat(categories).isEqualTo(expectedCategories); + } + @Test + @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + void shouldReturnAverageScores() throws Exception { + final var exercises = exerciseTestRepository.findAllExercisesByCourseIdWithEagerParticipation(course.getId()); + exercises.forEach(exercise -> studentScoreUtilService.createRatedStudentScore(exercise, userUtilService.getUserByLogin(STUDENT_OF_COURSE), 5)); final var result = request.get("/api/metrics/course/" + course.getId() + "/student", HttpStatus.OK, StudentMetricsDTO.class); assertThat(result).isNotNull(); assertThat(result.exerciseMetrics()).isNotNull(); final var averageScores = result.exerciseMetrics().averageScore(); + final var expectedAverageScores = exercises.stream().collect(Collectors.toMap(Exercise::getId, + exercise -> exercise.getStudentParticipations().stream().flatMap(participation -> participation.getStudents().stream()).mapToDouble( + student -> studentScoreRepository.findByExercise_IdAndUser_Id(exercise.getId(), student.getId()).map(ParticipantScore::getLastRatedScore).orElse(0.0)) + .average().orElse(0.0))); + + assertThat(averageScores).isEqualTo(expectedAverageScores); + } + + @Test + @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + void shouldReturnScore() throws Exception { final var exercises = exerciseRepository.findAllExercisesByCourseId(course.getId()); - final var expectedMap = exercises.stream().map(Exercise::getId).collect( - Collectors.toMap(Function.identity(), id -> resultRepository.findAllByParticipationExerciseId(id).stream().mapToDouble(Result::getScore).average().orElse(0))); + exercises.forEach(exercise -> studentScoreUtilService.createRatedStudentScore(exercise, userUtilService.getUserByLogin(STUDENT_OF_COURSE), 0.5)); - assertThat(averageScores).isEqualTo(expectedMap); + final var result = request.get("/api/metrics/course/" + course.getId() + "/student", HttpStatus.OK, StudentMetricsDTO.class); + assertThat(result).isNotNull(); + assertThat(result.exerciseMetrics()).isNotNull(); + final var score = result.exerciseMetrics().score(); + + var expectedScores = exercises.stream() + .map(exercise -> studentScoreRepository.findByExercise_IdAndUser_Id(exercise.getId(), userID) + .map(studentScore -> Map.entry(exercise.getId(), studentScore.getLastRatedScore()))) + .filter(Optional::isPresent).map(Optional::get).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + assertThat(score).isEqualTo(expectedScores); } @Test @@ -196,5 +259,72 @@ void shouldFindLatestSubmissionDatesByUser() throws Exception { Set result = exerciseMetricsRepository.findLatestSubmissionDatesForUser(exerciseIds, userID); assertThat(result).isEqualTo(expectedSet); } + + @Test + @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + void shouldReturnCompleted() throws Exception { + final var exercises = exerciseRepository.findAllExercisesByCourseId(course.getId()); + exercises.forEach(exercise -> studentScoreUtilService.createRatedStudentScore(exercise, userUtilService.getUserByLogin(STUDENT_OF_COURSE), MIN_SCORE_GREEN)); + + final var result = request.get("/api/metrics/course/" + course.getId() + "/student", HttpStatus.OK, StudentMetricsDTO.class); + assertThat(result).isNotNull(); + assertThat(result.exerciseMetrics()).isNotNull(); + final var completed = result.exerciseMetrics().completed(); + + final var expectedCompleted = exercises.stream().map(Exercise::getId).filter( + id -> studentScoreRepository.findByExercise_IdAndUser_Id(id, userID).map(studentScore -> studentScore.getLastRatedScore() >= MIN_SCORE_GREEN).orElse(false)) + .collect(Collectors.toSet()); + + assertThat(completed).isEqualTo(expectedCompleted); + } + } + + @Nested + class CompetencyMetrics { + + @Test + @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + void shouldReturnCompetencyInformation() throws Exception { + course.setCompetencies(Set.of(competencyUtilService.createCompetency(course))); + + final var result = request.get("/api/metrics/course/" + course.getId() + "/student", HttpStatus.OK, StudentMetricsDTO.class); + assertThat(result).isNotNull(); + assertThat(result.competencyMetrics()).isNotNull(); + + final var competencyInformation = result.competencyMetrics().competencyInformation(); + + final var competencies = competencyRepository.findAllForCourseWithExercisesAndLectureUnitsAndLecturesAndAttachments(course.getId()); + final var expectedDTOs = competencies.stream().map(CompetencyInformationDTO::of).collect(Collectors.toSet()); + + assertThat(competencyInformation.values()).containsExactlyInAnyOrderElementsOf(expectedDTOs); + assertThat(competencyInformation).allSatisfy((id, dto) -> assertThat(id).isEqualTo(dto.id())); + } + } + + @Nested + class LectureMetrics { + + @Test + @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER") + void shouldReturnLectureUnitInformation() throws Exception { + + final var lectureUnit = lectureUtilService.createTextUnit(); + lectureUnitService.linkLectureUnitsToCompetency(competencyUtilService.createCompetency(course), Set.of(lectureUnit), Set.of()); + + final var testLecture = lectureUtilService.createLecture(course, null); + lectureUtilService.addLectureUnitsToLecture(testLecture, List.of(lectureUnit)); + course.addLectures(testLecture); + + final var result = request.get("/api/metrics/course/" + course.getId() + "/student", HttpStatus.OK, StudentMetricsDTO.class); + assertThat(result).isNotNull(); + assertThat(result.lectureUnitStudentMetricsDTO()).isNotNull(); + final var lectureUnitInformation = result.lectureUnitStudentMetricsDTO().lectureUnitInformation(); + + final var lectureUnits = lectureUnitRepository.findAllById(Set.of(lectureUnit.getId())); + final var expectedDTOs = lectureUnits.stream().map(LectureUnitInformationDTO::of).collect(Collectors.toSet()); + + assertThat(lectureUnitInformation.values()).containsExactlyInAnyOrderElementsOf(expectedDTOs); + assertThat(lectureUnitInformation).allSatisfy((id, dto) -> assertThat(id).isEqualTo(dto.id())); + } } } diff --git a/src/test/java/de/tum/cit/aet/artemis/core/StatisticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/core/StatisticsIntegrationTest.java index bcd5a8d5c8ae..3a483ba5b736 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/StatisticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/StatisticsIntegrationTest.java @@ -95,7 +95,6 @@ class StatisticsIntegrationTest extends AbstractSpringIntegrationIndependentTest @BeforeEach void initTestCase() { - participantScoreScheduleService.activate(); userUtilService.addUsers(TEST_PREFIX, NUMBER_OF_STUDENTS, 1, 0, 1); course = modelingExerciseUtilService.addCourseWithOneModelingExercise(); diff --git a/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreRepositoryArchitectureTest.java new file mode 100644 index 000000000000..62b81e022085 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.core.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class CoreRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".core"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreResourceArchitectureTest.java new file mode 100644 index 000000000000..50c63c5cc8fe --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.core.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class CoreResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".core"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreServiceArchitectureTest.java new file mode 100644 index 000000000000..9761e37f3df5 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/core/architecture/CoreServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.core.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class CoreServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".core"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/core/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/core/authentication/InternalAuthenticationIntegrationTest.java index 84ba3d693707..7ade409a5287 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/authentication/InternalAuthenticationIntegrationTest.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.programming.test_repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.tutorialgroups.util.TutorialGroupUtilService; +import de.tum.cit.aet.artemis.tutorialgroup.util.TutorialGroupUtilService; class InternalAuthenticationIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/core/authorization/AuthorizationArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/core/authorization/AuthorizationArchitectureTest.java index f1bce920c4ef..a5426daad3b8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/authorization/AuthorizationArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/authorization/AuthorizationArchitectureTest.java @@ -47,7 +47,7 @@ void testNoPreAuthorizeOnRestEndpoints() { void testEnforceAdminAnnotations() { ArchRule rule = methods().that().areAnnotatedWith(EnforceAdmin.class).and().areNotAnnotatedWith(ManualConfig.class).should().beDeclaredInClassesThat() .resideInAPackage(REST_ADMIN_PACKAGE + ".."); - rule.check(productionClasses); + rule.allowEmptyShould(true).check(productionClasses); } @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/core/config/MetricsBeanTest.java b/src/test/java/de/tum/cit/aet/artemis/core/config/MetricsBeanTest.java index 969dcba1d7f8..f2f97b9ffe74 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/config/MetricsBeanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/config/MetricsBeanTest.java @@ -24,7 +24,6 @@ import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -70,9 +69,6 @@ class MetricsBeanTest extends AbstractSpringIntegrationIndependentTest { @Autowired private UserTestRepository userRepository; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private ExamUserRepository examUserRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/core/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/core/connector/IrisRequestMockProvider.java index 4c7146242014..3d394d2c9734 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/connector/IrisRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/connector/IrisRequestMockProvider.java @@ -28,9 +28,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisHealthStatusDTO; -import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisVariantDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.textexercise.PyrisTextExerciseChatPipelineExecutionDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; @@ -52,8 +54,8 @@ public class IrisRequestMockProvider { @Value("${artemis.iris.url}/api/v1/webhooks") private URL webhooksApiURL; - @Value("${artemis.iris.url}/api/v1/models") - private URL modelsApiURL; + @Value("${artemis.iris.url}/api/v1/pipelines/") + private String variantsApiBaseURL; @Value("${artemis.iris.url}/api/v1/health/") private URL healthApiURL; @@ -84,7 +86,7 @@ public void reset() throws Exception { } } - public void mockRunResponse(Consumer responseConsumer) { + public void mockProgrammingExerciseChatResponse(Consumer responseConsumer) { // @formatter:off mockServer .expect(ExpectedCount.once(), requestTo(pipelinesApiURL + "/tutor-chat/default/run")) @@ -98,6 +100,20 @@ public void mockRunResponse(Consumer resp // @formatter:on } + public void mockTextExerciseChatResponse(Consumer responseConsumer) { + // @formatter:off + mockServer + .expect(ExpectedCount.once(), requestTo(pipelinesApiURL + "/text-exercise-chat/default/run")) + .andExpect(method(HttpMethod.POST)) + .andRespond(request -> { + var mockRequest = (MockClientHttpRequest) request; + var dto = mapper.readValue(mockRequest.getBodyAsString(), PyrisTextExerciseChatPipelineExecutionDTO.class); + responseConsumer.accept(dto); + return MockRestResponseCreators.withRawStatus(HttpStatus.ACCEPTED.value()).createResponse(request); + }); + // @formatter:on + } + public void mockRunCompetencyExtractionResponseAnd(Consumer executionDTOConsumer) { // @formatter:off mockServer @@ -139,11 +155,11 @@ public void mockIngestionWebhookRunError(int httpStatus) { // @formatter:on } - public void mockModelsResponse() throws JsonProcessingException { - var irisModelDTO = new PyrisModelDTO("TEST_MODEL", "Test model", "Test description"); - var irisModelDTOArray = new PyrisModelDTO[] { irisModelDTO }; + public void mockVariantsResponse(IrisSubSettingsType feature) throws JsonProcessingException { + var irisModelDTO = new PyrisVariantDTO("TEST_MODEL", "Test model", "Test description"); + var irisModelDTOArray = new PyrisVariantDTO[] { irisModelDTO }; // @formatter:off - mockServer.expect(ExpectedCount.once(), requestTo(modelsApiURL.toString())) + mockServer.expect(ExpectedCount.once(), requestTo(variantsApiBaseURL + feature.name() + "/variants")) .andExpect(method(HttpMethod.GET)) .andRespond(withSuccess(mapper.writeValueAsString(irisModelDTOArray), MediaType.APPLICATION_JSON)); // @formatter:on @@ -169,9 +185,9 @@ public void mockStatusResponses() throws JsonProcessingException { /** * Mocks a get model error from the Pyris models endpoint */ - public void mockModelsError() { + public void mockVariantsError(IrisSubSettingsType feature) { // @formatter:off - mockServer.expect(ExpectedCount.once(), requestTo(modelsApiURL.toString())) + mockServer.expect(ExpectedCount.once(), requestTo(variantsApiBaseURL + feature.name() + "/variants")) .andExpect(method(HttpMethod.GET)) .andRespond(withRawStatus(418)); // @formatter:on diff --git a/src/test/java/de/tum/cit/aet/artemis/core/management/ManagementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/core/management/ManagementResourceIntegrationTest.java index af2b1996a62f..02c92f6ea6f5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/management/ManagementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/management/ManagementResourceIntegrationTest.java @@ -102,7 +102,7 @@ void toggleFeatures() throws Exception { // Try to access 5 different endpoints with programming feature toggle enabled request.put("/api/exercises/" + programmingExercise1.getId() + "/resume-programming-participation/" + participation.getId(), null, HttpStatus.OK); - request.put("/api/participations/" + participation.getId() + "/cleanupBuildPlan", null, HttpStatus.OK); + request.put("/api/participations/" + participation.getId() + "/cleanup-build-plan", null, HttpStatus.OK); request.postWithoutLocation("/api/programming-submissions/" + participation.getId() + "/trigger-failed-build", null, HttpStatus.OK, null); programmingExercise2.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise2.getBuildConfig())); programmingExercise2 = programmingExerciseRepository.save(programmingExercise2); @@ -116,7 +116,7 @@ void toggleFeatures() throws Exception { // Try to access 5 different endpoints with programming feature toggle disabled request.put("/api/exercises/" + programmingExercise1.getId() + "/resume-programming-participation/" + participation.getId(), null, HttpStatus.FORBIDDEN); - request.put("/api/participations/" + participation.getId() + "/cleanupBuildPlan", null, HttpStatus.FORBIDDEN); + request.put("/api/participations/" + participation.getId() + "/cleanup-build-plan", null, HttpStatus.FORBIDDEN); request.postWithoutLocation("/api/programming-submissions/" + participation.getId() + "/trigger-failed-build", null, HttpStatus.FORBIDDEN, null); programmingExercise2.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise2.getBuildConfig())); programmingExercise2 = programmingExerciseRepository.save(programmingExercise2); diff --git a/src/test/java/de/tum/cit/aet/artemis/core/service/AssessmentServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/core/service/AssessmentServiceTest.java index 673f3c13f07c..07be65439250 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/service/AssessmentServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/service/AssessmentServiceTest.java @@ -30,7 +30,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.test_repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; @@ -49,9 +48,6 @@ class AssessmentServiceTest extends AbstractSpringIntegrationIndependentTest { private static final String TEST_PREFIX = "assessmentservice"; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private ResultTestRepository resultRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/core/service/CourseExamExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/core/service/CourseExamExportServiceTest.java index 719f1b47a0d9..77915abba5d3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/service/CourseExamExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/service/CourseExamExportServiceTest.java @@ -20,7 +20,6 @@ import de.tum.cit.aet.artemis.core.user.util.UserUtilService; import de.tum.cit.aet.artemis.core.util.CourseUtilService; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; class CourseExamExportServiceTest extends AbstractSpringIntegrationIndependentTest { @@ -39,9 +38,6 @@ class CourseExamExportServiceTest extends AbstractSpringIntegrationIndependentTe @Autowired private UserUtilService userUtilService; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private UserTestRepository userRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java index b6483580a761..9f17c65b4cc8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java @@ -20,6 +20,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.util.ConversationUtilService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.dto.StudentDTO; @@ -28,10 +30,16 @@ import de.tum.cit.aet.artemis.core.test_repository.UserTestRepository; import de.tum.cit.aet.artemis.core.user.util.UserUtilService; import de.tum.cit.aet.artemis.core.util.CourseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.test_repository.BuildJobTestRepository; +import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; @@ -53,7 +61,7 @@ class CourseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { private StudentParticipationTestRepository studentParticipationRepo; @Autowired - private ExerciseRepository exerciseRepo; + private BuildJobTestRepository buildJobRepo; @Autowired private UserUtilService userUtilService; @@ -61,6 +69,12 @@ class CourseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { @Autowired private CourseUtilService courseUtilService; + @Autowired + private ParticipationUtilService participationUtilService; + + @Autowired + private ConversationUtilService conversationUtilService; + @BeforeEach void initTestCase() { userUtilService.addUsers(TEST_PREFIX, 2, 0, 0, 1); @@ -79,7 +93,7 @@ void testGetActiveStudents(long weeks) { var course = courseUtilService.addEmptyCourse(); var exercise = TextExerciseFactory.generateTextExercise(date, date, date, course); course.addExercises(exercise); - exercise = exerciseRepo.save(exercise); + exercise = exerciseRepository.save(exercise); var student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); var participation1 = new StudentParticipation(); @@ -140,7 +154,7 @@ void testGetActiveStudents_UTCConversion() { var course = courseUtilService.addEmptyCourse(); var exercise = TextExerciseFactory.generateTextExercise(date, date, date, course); course.addExercises(exercise); - exercise = exerciseRepo.save(exercise); + exercise = exerciseRepository.save(exercise); var student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); var participation1 = new StudentParticipation(); @@ -309,9 +323,43 @@ else if (dto1.email() != null) { assertThat(registrationFailures).containsExactly(dto2); } + @Test + void testDeletionSummary() { + SecurityUtils.setAuthorizationObject(); + Course course = courseUtilService.addEmptyCourse(); + + var programmingExercise = ProgrammingExerciseFactory.generateProgrammingExercise(ZonedDateTime.now(), ZonedDateTime.now().plusDays(7), course); + programmingExercise.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise.getBuildConfig())); + programmingExerciseRepository.save(programmingExercise); + + var student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + + conversationUtilService.addMessageInChannelOfCourseForUser(student1.getLogin(), course, TEST_PREFIX + "message"); + + ProgrammingExerciseStudentParticipation participation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, student1.getLogin()); + Result result = participationUtilService.createSubmissionAndResult(participation, 1L, true); + createBuildJob(programmingExercise, course, participation, result); + + course = courseRepository.findByIdWithEagerExercisesElseThrow(course.getId()); + var summary = courseService.getDeletionSummary(course); + assertThat(summary.numberOfCommunicationPosts()).isEqualTo(1L); + assertThat(summary.numberOfAnswerPosts()).isEqualTo(1L); + assertThat(summary.numberOfBuilds()).isEqualTo(1L); + } + private void setEnrollmentConfiguration(Course course, ZonedDateTime start, ZonedDateTime end) { course.setEnrollmentEnabled(true); course.setEnrollmentStartDate(start); course.setEnrollmentEndDate(end); } + + private void createBuildJob(ProgrammingExercise programmingExercise, Course course, Participation participation, Result result) { + var buildJob = new BuildJob(); + buildJob.setExerciseId(programmingExercise.getId()); + buildJob.setCourseId(course.getId()); + buildJob.setParticipationId(participation.getId()); + buildJob.setResult(result); + + buildJobRepo.save(buildJob); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/core/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/core/service/DataExportCreationServiceTest.java index d4f16c93604a..73382100b910 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/service/DataExportCreationServiceTest.java @@ -67,7 +67,6 @@ import de.tum.cit.aet.artemis.exam.util.ExamUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService; import de.tum.cit.aet.artemis.fileupload.util.ZipFileTestUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -118,9 +117,6 @@ class DataExportCreationServiceTest extends AbstractSpringIntegrationJenkinsGitl @Autowired private StudentExamTestRepository studentExamRepository; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private DataExportTestRepository dataExportRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/core/service/TitleCacheEvictionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/core/service/TitleCacheEvictionServiceTest.java index f9991fa36fc4..30f880543785 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/service/TitleCacheEvictionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/service/TitleCacheEvictionServiceTest.java @@ -15,7 +15,6 @@ import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.util.ExamUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; @@ -39,9 +38,6 @@ class TitleCacheEvictionServiceTest extends AbstractSpringIntegrationIndependent @Autowired private CacheManager cacheManager; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private LectureRepository lectureRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java index 527230b8c446..77ea61f417ee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java @@ -217,10 +217,8 @@ public void deleteUsers(String currentUserLogin) throws Exception { var users = Set.of(userUtilService.getUserByLogin(TEST_PREFIX + "student1"), userUtilService.getUserByLogin(TEST_PREFIX + "tutor1"), userUtilService.getUserByLogin(TEST_PREFIX + "editor1"), userUtilService.getUserByLogin(TEST_PREFIX + "instructor1")); - LinkedMultiValueMap params = new LinkedMultiValueMap<>(); - users.stream().map(User::getLogin).forEach(login -> params.add("login", login)); - - request.delete("/api/admin/users", HttpStatus.OK, params); + var logins = users.stream().map(User::getLogin).toList(); + request.delete("/api/admin/users", HttpStatus.OK, logins); for (var user : users) { final var deletedUser = userTestRepository.findById(user.getId()).orElseThrow(); diff --git a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java index a66e6d5adc6a..3b8ce269954b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseTestService.java @@ -126,7 +126,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; import de.tum.cit.aet.artemis.exercise.test_repository.ParticipationTestRepository; @@ -175,7 +175,7 @@ public class CourseTestService { private CourseTestRepository courseRepo; @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepo; @Autowired private LectureRepository lectureRepo; @@ -1954,7 +1954,7 @@ public void testGetLockedSubmissionsForCourseAsTutor() throws Exception { Course course = modelingExerciseUtilService.addCourseWithDifferentModelingExercises(); ModelingExercise classExercise = exerciseUtilService.findModelingExerciseWithTitle(course.getExercises(), "ClassDiagram"); - List lockedSubmissions = request.getList("/api/courses/" + course.getId() + "/lockedSubmissions", HttpStatus.OK, Submission.class); + List lockedSubmissions = request.getList("/api/courses/" + course.getId() + "/locked-submissions", HttpStatus.OK, Submission.class); assertThat(lockedSubmissions).as("Locked Submissions is not null").isNotNull(); assertThat(lockedSubmissions).as("Locked Submissions length is 0").isEmpty(); @@ -1969,14 +1969,14 @@ public void testGetLockedSubmissionsForCourseAsTutor() throws Exception { submission = ParticipationFactory.generateModelingSubmission(validModel, true); modelingExerciseUtilService.addModelingSubmissionWithResultAndAssessor(classExercise, submission, userPrefix + "student3", userPrefix + "tutor1"); - lockedSubmissions = request.getList("/api/courses/" + course.getId() + "/lockedSubmissions", HttpStatus.OK, Submission.class); + lockedSubmissions = request.getList("/api/courses/" + course.getId() + "/locked-submissions", HttpStatus.OK, Submission.class); assertThat(lockedSubmissions).as("Locked Submissions is not null").isNotNull(); assertThat(lockedSubmissions).as("Locked Submissions length is 3").hasSize(3); } // Test public void testGetLockedSubmissionsForCourseAsStudent() throws Exception { - List lockedSubmissions = request.getList("/api/courses/1/lockedSubmissions", HttpStatus.FORBIDDEN, Submission.class); + List lockedSubmissions = request.getList("/api/courses/1/locked-submissions", HttpStatus.FORBIDDEN, Submission.class); assertThat(lockedSubmissions).as("Locked Submissions is null").isNull(); } @@ -3338,7 +3338,7 @@ public void testEditCourseRemoveExistingIcon() throws Exception { } private String getUpdateOnlineCourseConfigurationPath(String courseId) { - return "/api/courses/" + courseId + "/onlineCourseConfiguration"; + return "/api/courses/" + courseId + "/online-course-configuration"; } // Test diff --git a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java index 02d8d55a6231..93e7856af38e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/util/CourseUtilService.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService; @@ -110,7 +110,7 @@ public class CourseUtilService { private AttachmentRepository attachmentRepo; @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepository; @Autowired private TutorParticipationTestRepository tutorParticipationRepo; @@ -390,12 +390,12 @@ public List createCoursesWithExercisesAndLectures(String userPrefix, boo attachmentRepo.save(attachment1); attachmentRepo.save(attachment2); - modelingExercise = exerciseRepo.save(modelingExercise); - textExercise = exerciseRepo.save(textExercise); - exerciseRepo.save(fileUploadExercise); + modelingExercise = exerciseRepository.save(modelingExercise); + textExercise = exerciseRepository.save(textExercise); + exerciseRepository.save(fileUploadExercise); programmingExercise.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise.getBuildConfig())); - exerciseRepo.save(programmingExercise); - exerciseRepo.save(quizExercise); + exerciseRepository.save(programmingExercise); + exerciseRepository.save(quizExercise); if (withParticipations) { @@ -521,12 +521,12 @@ public Course createCourseWithAllExerciseTypesAndParticipationsAndSubmissionsAnd // Save course and exercises to database Course courseSaved = courseRepo.save(course); - modelingExercise = exerciseRepo.save(modelingExercise); - textExercise = exerciseRepo.save(textExercise); - fileUploadExercise = exerciseRepo.save(fileUploadExercise); + modelingExercise = exerciseRepository.save(modelingExercise); + textExercise = exerciseRepository.save(textExercise); + fileUploadExercise = exerciseRepository.save(fileUploadExercise); programmingExercise.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise.getBuildConfig())); - programmingExercise = exerciseRepo.save(programmingExercise); - quizExercise = exerciseRepo.save(quizExercise); + programmingExercise = exerciseRepository.save(programmingExercise); + quizExercise = exerciseRepository.save(quizExercise); // Get user and setup participations User user = (userRepo.findOneByLogin(userPrefix + "student1")).orElseThrow(); @@ -630,11 +630,11 @@ public Course createCourseWithAllExerciseTypesAndParticipationsAndSubmissionsAnd programmingSubmission = submissionRepository.save(programmingSubmission); // Save exercises - exerciseRepo.save(modelingExercise); - exerciseRepo.save(textExercise); - exerciseRepo.save(fileUploadExercise); - exerciseRepo.save(programmingExercise); - exerciseRepo.save(quizExercise); + exerciseRepository.save(modelingExercise); + exerciseRepository.save(textExercise); + exerciseRepository.save(fileUploadExercise); + exerciseRepository.save(programmingExercise); + exerciseRepository.save(quizExercise); // Connect participations with submissions participationModeling.setSubmissions(Set.of(modelingSubmission)); @@ -687,12 +687,12 @@ public Course createCourseWithAllExerciseTypesAndParticipationsAndSubmissionsAnd // Save course and exercises to database Course courseSaved = courseRepo.save(course); - modelingExercise = exerciseRepo.save(modelingExercise); - textExercise = exerciseRepo.save(textExercise); - fileUploadExercise = exerciseRepo.save(fileUploadExercise); + modelingExercise = exerciseRepository.save(modelingExercise); + textExercise = exerciseRepository.save(textExercise); + fileUploadExercise = exerciseRepository.save(fileUploadExercise); programmingExercise.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise.getBuildConfig())); - programmingExercise = exerciseRepo.save(programmingExercise); - quizExercise = exerciseRepo.save(quizExercise); + programmingExercise = exerciseRepository.save(programmingExercise); + quizExercise = exerciseRepository.save(quizExercise); // Get user and setup participations User user = (userRepo.findOneByLogin(userPrefix + "student1")).orElseThrow(); @@ -811,11 +811,11 @@ public Course createCourseWithAllExerciseTypesAndParticipationsAndSubmissionsAnd programmingSubmission = submissionRepository.save(programmingSubmission); // Save exercises - exerciseRepo.save(modelingExercise); - exerciseRepo.save(textExercise); - exerciseRepo.save(fileUploadExercise); - exerciseRepo.save(programmingExercise); - exerciseRepo.save(quizExercise); + exerciseRepository.save(modelingExercise); + exerciseRepository.save(textExercise); + exerciseRepository.save(fileUploadExercise); + exerciseRepository.save(programmingExercise); + exerciseRepository.save(quizExercise); // Connect participations with submissions participationModeling.setSubmissions(Set.of(modelingSubmission)); @@ -898,7 +898,7 @@ else if ("Text".equals(title)) { textExercise.setTitle("Text"); course.addExercises(textExercise); courseRepo.save(course); - exerciseRepo.save(textExercise); + exerciseRepository.save(textExercise); } else if (title.startsWith("ClassDiagram")) { ModelingExercise modelingExercise = ModelingExerciseFactory.generateModelingExercise(PAST_TIMESTAMP, FUTURE_TIMESTAMP, FUTURE_FUTURE_TIMESTAMP, @@ -906,7 +906,7 @@ else if (title.startsWith("ClassDiagram")) { modelingExercise.setTitle(title); course.addExercises(modelingExercise); courseRepo.save(course); - exerciseRepo.save(modelingExercise); + exerciseRepository.save(modelingExercise); } return course; @@ -927,8 +927,8 @@ public Course addCourseWithModelingAndTextExercise() { textExercise.setTitle("Text"); course.addExercises(textExercise); course = courseRepo.save(course); - exerciseRepo.save(modelingExercise); - exerciseRepo.save(textExercise); + exerciseRepository.save(modelingExercise); + exerciseRepository.save(textExercise); return course; } @@ -954,9 +954,9 @@ public Course addCourseWithModelingAndTextAndFileUploadExercise() { course.addExercises(fileUploadExercise); course = courseRepo.save(course); - exerciseRepo.save(modelingExercise); - exerciseRepo.save(textExercise); - exerciseRepo.save(fileUploadExercise); + exerciseRepository.save(modelingExercise); + exerciseRepository.save(textExercise); + exerciseRepository.save(fileUploadExercise); return course; } @@ -1056,7 +1056,7 @@ public Course addCourseWithExercisesAndSubmissions(String courseShortName, Strin ModelingExercise modelingExercise = ModelingExerciseFactory.generateModelingExercise(releaseDate, dueDate, assessmentDueDate, DiagramType.ClassDiagram, course); modelingExercise.setTitle("Modeling" + i); modelingExercise.setCourse(course); - modelingExercise = exerciseRepo.save(modelingExercise); + modelingExercise = exerciseRepository.save(modelingExercise); course.addExercises(modelingExercise); for (int j = 1; j <= numberOfSubmissionPerExercise; j++) { StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(modelingExercise, userPrefix + "student" + j); @@ -1079,7 +1079,7 @@ else if ((i % 3) == 1) { TextExercise textExercise = TextExerciseFactory.generateTextExercise(releaseDate, dueDate, assessmentDueDate, course); textExercise.setTitle("Text" + i); textExercise.setCourse(course); - textExercise = exerciseRepo.save(textExercise); + textExercise = exerciseRepository.save(textExercise); course.addExercises(textExercise); for (int j = 1; j <= numberOfSubmissionPerExercise; j++) { TextSubmission submission = ParticipationFactory.generateTextSubmission("submissionText", Language.ENGLISH, true); @@ -1097,7 +1097,7 @@ else if ((i % 3) == 1) { FileUploadExercise fileUploadExercise = FileUploadExerciseFactory.generateFileUploadExercise(releaseDate, dueDate, assessmentDueDate, "png,pdf", course); fileUploadExercise.setTitle("FileUpload" + i); fileUploadExercise.setCourse(course); - fileUploadExercise = exerciseRepo.save(fileUploadExercise); + fileUploadExercise = exerciseRepository.save(fileUploadExercise); course.addExercises(fileUploadExercise); for (int j = 1; j <= numberOfSubmissionPerExercise; j++) { FileUploadSubmission submission = ParticipationFactory.generateFileUploadSubmissionWithFile(true, null); @@ -1175,7 +1175,7 @@ public Course createCourseWithExamExercisesAndSubmissions(String userPrefix) thr // Create a file upload exercise with a dummy submission file var exerciseGroup1 = exerciseGroupRepository.save(new ExerciseGroup()); var fileUploadExercise = FileUploadExerciseFactory.generateFileUploadExerciseForExam(".png", exerciseGroup1); - fileUploadExercise = exerciseRepo.save(fileUploadExercise); + fileUploadExercise = exerciseRepository.save(fileUploadExercise); fileUploadExerciseUtilService.createFileUploadSubmissionWithFile(userPrefix, fileUploadExercise, "uploaded-file.png"); exerciseGroup1.addExercise(fileUploadExercise); exerciseGroup1 = exerciseGroupRepository.save(exerciseGroup1); @@ -1183,7 +1183,7 @@ public Course createCourseWithExamExercisesAndSubmissions(String userPrefix) thr // Create a text exercise with a dummy submission file var exerciseGroup2 = exerciseGroupRepository.save(new ExerciseGroup()); var textExercise = TextExerciseFactory.generateTextExerciseForExam(exerciseGroup2); - textExercise = exerciseRepo.save(textExercise); + textExercise = exerciseRepository.save(textExercise); var textSubmission = ParticipationFactory.generateTextSubmission("example text", Language.ENGLISH, true); textExerciseUtilService.saveTextSubmission(textExercise, textSubmission, userPrefix + "student1"); exerciseGroup2.addExercise(textExercise); @@ -1192,7 +1192,7 @@ public Course createCourseWithExamExercisesAndSubmissions(String userPrefix) thr // Create a modeling exercise with a dummy submission file var exerciseGroup3 = exerciseGroupRepository.save(new ExerciseGroup()); var modelingExercise = ModelingExerciseFactory.generateModelingExerciseForExam(DiagramType.ClassDiagram, exerciseGroup2); - modelingExercise = exerciseRepo.save(modelingExercise); + modelingExercise = exerciseRepository.save(modelingExercise); String emptyActivityModel = TestResourceUtils.loadFileFromResources("test-data/model-submission/empty-activity-diagram.json"); var modelingSubmission = ParticipationFactory.generateModelingSubmission(emptyActivityModel, true); participationUtilService.addSubmission(modelingExercise, modelingSubmission, userPrefix + "student1"); diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamDeletionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamDeletionIntegrationTest.java new file mode 100644 index 000000000000..77896ce4b74e --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamDeletionIntegrationTest.java @@ -0,0 +1,146 @@ +package de.tum.cit.aet.artemis.exam; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.ZonedDateTime; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.test.context.support.WithMockUser; + +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamDeletionSummaryDTO; +import de.tum.cit.aet.artemis.exam.service.ExamSessionService; +import de.tum.cit.aet.artemis.exam.test_repository.StudentExamTestRepository; +import de.tum.cit.aet.artemis.exam.util.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.test_repository.BuildJobTestRepository; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class ExamDeletionIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + private static final String TEST_PREFIX = "examdeletion"; + + @Autowired + private ExamUtilService examUtilService; + + @Autowired + private ExamSessionService examSessionService; + + @Autowired + private StudentExamTestRepository studentExamRepository; + + @Autowired + private ParticipationUtilService participationUtilService; + + @Autowired + private BuildJobTestRepository buildJobRepository; + + private static final int NUMBER_OF_STUDENTS = 4; + + private static final int NUMBER_OF_TUTORS = 1; + + private Course course; + + private Exam exam; + + private ProgrammingExercise programmingExercise; + + private User student1; + + private User student2; + + private User student3; + + private User student4; + + @BeforeAll + void setup() { + // setup users + userUtilService.addUsers(TEST_PREFIX, NUMBER_OF_STUDENTS, NUMBER_OF_TUTORS, 0, 1); + + student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + student2 = userUtilService.getUserByLogin(TEST_PREFIX + "student2"); + student3 = userUtilService.getUserByLogin(TEST_PREFIX + "student3"); + student4 = userUtilService.getUserByLogin(TEST_PREFIX + "student4"); + User instructor = userUtilService.getUserByLogin(TEST_PREFIX + "instructor1"); + + // reset courses + course = courseUtilService.addEmptyCourse(); + + exam = examUtilService.addExam(course); + exam = examUtilService.registerUsersForExamAndSaveExam(exam, TEST_PREFIX, NUMBER_OF_STUDENTS); + + Channel channel = examUtilService.addExamChannel(exam, "exam1 channel"); + Post instructorPost = examUtilService.createPost(channel, "Instructor Post", instructor); + examUtilService.createAnswerPost(instructorPost, "Student Answer", student1); + examUtilService.createAnswerPost(instructorPost, "Instructor Answer", instructor); + + exam = examUtilService.addTextModelingProgrammingExercisesToExam(exam, true, true); + programmingExercise = (ProgrammingExercise) exam.getExerciseGroups().stream().flatMap(exerciseGroup -> exerciseGroup.getExercises().stream()) + .filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())).findFirst().orElseThrow(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testDeletionSummary() throws Exception { + addStudentExam(student1, false, false); + addStudentExam(student2, false, false); + + addStudentExam(student3, true, false); + ProgrammingExerciseStudentParticipation participation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, student3.getLogin()); + Result result = participationUtilService.createSubmissionAndResult(participation, 1L, true); + createBuildJob(participation, result); + + addStudentExam(student4, true, true); + + var response = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/deletion-summary", HttpStatus.OK, ExamDeletionSummaryDTO.class); + assertThat(response.numberOfBuilds()).isEqualTo(1); + assertThat(response.numberOfCommunicationPosts()).isEqualTo(1); + assertThat(response.numberOfAnswerPosts()).isEqualTo(2); + assertThat(response.numberNotStartedExams()).isEqualTo(2); + assertThat(response.numberStartedExams()).isEqualTo(2); + assertThat(response.numberSubmittedExams()).isEqualTo(1); + } + + private void addStudentExam(User student, boolean isStarted, boolean isSubmitted) { + StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, student); + examSessionService.startExamSession(studentExam, null, null, null, null); + if (isStarted) { + studentExam.setStartedAndStartDate(ZonedDateTime.now()); + } + if (isSubmitted) { + studentExam.setSubmissionDate(ZonedDateTime.now()); + studentExam.setSubmitted(true); + } + + if (isStarted || isSubmitted) { + studentExamRepository.save(studentExam); + } + } + + private void createBuildJob(Participation participation, Result result) { + var buildJob = new BuildJob(); + buildJob.setExerciseId(programmingExercise.getId()); + buildJob.setCourseId(course.getId()); + buildJob.setParticipationId(participation.getId()); + buildJob.setResult(result); + + buildJobRepository.save(buildJob); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index 99e6b153def6..52f93e2d6741 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -203,7 +203,6 @@ void setup() { userTestRepository.save(instructor10); ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 200; - participantScoreScheduleService.activate(); } @BeforeEach diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index 41cc9016ccac..ec49d8ec78a7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -185,7 +185,6 @@ void initTestCase() { gitlabRequestMockProvider.enableMockingOfRequests(); ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 200; - participantScoreScheduleService.activate(); } @AfterEach @@ -499,7 +498,7 @@ void testGetStatsForExamAssessmentDashboard(int numberOfCorrectionRounds) throws return; } - var lockedSubmissions = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/lockedSubmissions", HttpStatus.OK, List.class); + var lockedSubmissions = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/locked-submissions", HttpStatus.OK, List.class); assertThat(lockedSubmissions).isEmpty(); log.debug("testGetStatsForExamAssessmentDashboard: step 3 done"); @@ -625,7 +624,7 @@ void testGetStatsForExamAssessmentDashboard(int numberOfCorrectionRounds) throws log.debug("testGetStatsForExamAssessmentDashboard: step 10 done"); userUtilService.changeUser(TEST_PREFIX + "instructor1"); - lockedSubmissions = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/lockedSubmissions", HttpStatus.OK, List.class); + lockedSubmissions = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/locked-submissions", HttpStatus.OK, List.class); assertThat(lockedSubmissions).hasSize(studentExams.size() * 5); log.debug("testGetStatsForExamAssessmentDashboard: step 11 done"); @@ -656,7 +655,7 @@ void testGetStatsForExamAssessmentDashboard(int numberOfCorrectionRounds) throws log.debug("testGetStatsForExamAssessmentDashboard: step 13 done"); - lockedSubmissions = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/lockedSubmissions", HttpStatus.OK, List.class); + lockedSubmissions = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/locked-submissions", HttpStatus.OK, List.class); assertThat(lockedSubmissions).isEmpty(); if (numberOfCorrectionRounds == 2) { lockAndAssessForSecondCorrection(exam, course, studentExams, exercisesInExam, numberOfCorrectionRounds); @@ -722,7 +721,7 @@ private void lockAndAssessForSecondCorrection(Exam exam, Course course, List result = request.getList("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/exerciseGroups", HttpStatus.OK, ExerciseGroup.class); + List result = request.getList("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/exercise-groups", HttpStatus.OK, ExerciseGroup.class); verify(examAccessService).checkCourseAndExamAccessForEditorElseThrow(course1.getId(), exam1.getId()); assertThat(result).hasSize(1); assertThat(result.getFirst().getExercises()).hasSize(1); @@ -163,7 +159,7 @@ void testGetExerciseGroupsForExam_asEditor() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testDeleteExerciseGroup_asInstructor() throws Exception { - request.delete("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/exerciseGroups/" + exerciseGroup1.getId(), HttpStatus.OK); + request.delete("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/exercise-groups/" + exerciseGroup1.getId(), HttpStatus.OK); verify(examAccessService).checkCourseAndExamAndExerciseGroupAccessElseThrow(Role.INSTRUCTOR, course1.getId(), exam1.getId(), exerciseGroup1); assertThat(textExerciseRepository.findById(textExercise1.getId())).isEmpty(); } @@ -171,7 +167,7 @@ void testDeleteExerciseGroup_asInstructor() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "editor1", roles = "EDITOR") void testDeleteExerciseGroup_asEditor() throws Exception { - request.delete("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/exerciseGroups/" + exerciseGroup1.getId(), HttpStatus.FORBIDDEN); + request.delete("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/exercise-groups/" + exerciseGroup1.getId(), HttpStatus.FORBIDDEN); } @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java index ef813745a412..a598f6ddbb79 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java @@ -100,7 +100,6 @@ void initTestCase() { gitlabRequestMockProvider.enableMockingOfRequests(); ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 200; - participantScoreScheduleService.activate(); } @AfterEach diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java index 159866350e68..0853bed96f6c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java @@ -74,7 +74,6 @@ void initTestCase() { examUtilService.addStudentExamForTestExam(testExam1, student1); ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 200; - participantScoreScheduleService.activate(); } @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamRepositoryArchitectureTest.java new file mode 100644 index 000000000000..b860e2b71ecf --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamRepositoryArchitectureTest.java @@ -0,0 +1,19 @@ +package de.tum.cit.aet.artemis.exam.architecture; + +import java.util.Set; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class ExamRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".exam"; + } + + // TODO: This method should be removed once all repositories are tested + @Override + protected Set testTransactionalExclusions() { + return Set.of("de.tum.cit.aet.artemis.exam.service.StudentExamService.generateMissingStudentExams(de.tum.cit.aet.artemis.exam.domain.Exam)", + "de.tum.cit.aet.artemis.exam.service.StudentExamService.generateStudentExams(de.tum.cit.aet.artemis.exam.domain.Exam)"); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamResourceArchitectureTest.java new file mode 100644 index 000000000000..e4bd14ec6e00 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.exam.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class ExamResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".exam"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamServiceArchitectureTest.java new file mode 100644 index 000000000000..f58c5b418e55 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exam/architecture/ExamServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.exam.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class ExamServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".exam"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/service/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/service/ExamServiceTest.java index 140deeae34c1..860576490fb0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/service/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/service/ExamServiceTest.java @@ -28,7 +28,6 @@ import de.tum.cit.aet.artemis.exam.util.ExamUtilService; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; @@ -47,9 +46,6 @@ class ExamServiceTest extends AbstractSpringIntegrationIndependentTest { @Autowired private StudentParticipationTestRepository studentParticipationRepository; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private CourseUtilService courseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/util/ExamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exam/util/ExamUtilService.java index ba1fe0c84b8f..d447ba617a5a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/util/ExamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/util/ExamUtilService.java @@ -15,8 +15,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.test_repository.ConversationTestRepository; +import de.tum.cit.aet.artemis.communication.test_repository.PostTestRepository; import de.tum.cit.aet.artemis.communication.util.ConversationFactory; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; @@ -44,7 +48,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; @@ -94,7 +98,7 @@ public class ExamUtilService { private ExamRepository examRepository; @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepo; @Autowired private ProgrammingExerciseBuildConfigRepository programmingExerciseBuildConfigRepository; @@ -132,6 +136,12 @@ public class ExamUtilService { @Autowired private ConversationTestRepository conversationRepository; + @Autowired + private PostTestRepository postRepository; + + @Autowired + private AnswerPostRepository answerPostRepository; + @Autowired private ParticipationUtilService participationUtilService; @@ -521,6 +531,37 @@ public Channel addExamChannel(Exam exam, String channelName) { return conversationRepository.save(channel); } + /** + * Creates and saves a Post for the given Channel. + * + * @param channel The Channel for which the Post should be created + * @param title The title of the Post + * @param author The author of the Post + * @return The newly created Post + */ + public Post createPost(Channel channel, String title, User author) { + Post post = new Post(); + post.setTitle(title); + post.setConversation(channel); + post.setAuthor(author); + return postRepository.save(post); + } + + /** + * Creates and saves an AnswerPost for the given Post. + * + * @param post The Post for which the AnswerPost should be created + * @param content The content of the AnswerPost + * @param author The author of the AnswerPost + */ + public void createAnswerPost(Post post, String content, User author) { + AnswerPost answerPost = new AnswerPost(); + answerPost.setContent(content); + answerPost.setPost(post); + answerPost.setAuthor(author); + answerPostRepository.save(answerPost); + } + /** * Creates and saves an Exam and corresponding StudentExam with a registered User. The Exam started 1 hour ago and ends in 1 hour. * diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseRepositoryArchitectureTest.java new file mode 100644 index 000000000000..a8217f01ddd8 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.exercise.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class ExerciseRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".exercise"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseResourceArchitectureTest.java new file mode 100644 index 000000000000..4bf283ed3743 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.exercise.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class ExerciseResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".exercise"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseServiceArchitectureTest.java new file mode 100644 index 000000000000..82f413701a44 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/architecture/ExerciseServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.exercise.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class ExerciseServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".exercise"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java index 03beb447adad..04df504a5dbb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java @@ -3,7 +3,6 @@ import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; import static de.tum.cit.aet.artemis.core.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.doNothing; @@ -538,7 +537,51 @@ void requestFeedbackAlreadySent() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void requestFeedbackSuccess_withAthenaSuccess() throws Exception { + void requestProgrammingFeedbackIfARequestAlreadySent_withAthenaSuccess() throws Exception { + + var course = programmingExercise.getCourseViaExerciseGroupOrCourseMember(); + course.setRestrictedAthenaModulesAccess(true); + this.courseRepository.save(course); + + this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST); + this.exerciseRepository.save(programmingExercise); + + athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("programming"); + + var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise, + userUtilService.getUserByLogin(TEST_PREFIX + "student1")); + + var localRepo = new LocalRepository(defaultBranch); + localRepo.configureRepos("testLocalRepo", "testOriginRepo"); + + participation.setRepositoryUri(ParticipationFactory.getMockFileRepositoryUri(localRepo).getURI().toString()); + participationRepo.save(participation); + + gitService.getDefaultLocalPathOfRepo(participation.getVcsRepositoryUri()); + + Result result1 = participationUtilService.createSubmissionAndResult(participation, 100, false); + Result result2 = participationUtilService.addResultToParticipation(participation, result1.getSubmission()); + result2.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA); + result2.setSuccessful(null); + resultRepository.save(result2); + + request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, ProgrammingExerciseStudentParticipation.class, HttpStatus.OK); + + verify(programmingMessagingService, timeout(2000).times(2)).notifyUserAboutNewResult(resultCaptor.capture(), any()); + + Result invokedResult = resultCaptor.getAllValues().getFirst(); + assertThat(invokedResult).isNotNull(); + assertThat(invokedResult.getId()).isNotNull(); + assertThat(invokedResult.isSuccessful()).isTrue(); + assertThat(invokedResult.isAthenaBased()).isTrue(); + assertThat(invokedResult.getFeedbacks()).hasSize(1); + + localRepo.resetLocalRepo(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void requestProgrammingFeedbackSuccess_withAthenaSuccess() throws Exception { var course = programmingExercise.getCourseViaExerciseGroupOrCourseMember(); course.setRestrictedAthenaModulesAccess(true); @@ -566,9 +609,6 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception { result2.setCompletionDate(ZonedDateTime.now()); resultRepository.save(result2); - doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(eq(programmingExercise), any()); - doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any()); - request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, ProgrammingExerciseStudentParticipation.class, HttpStatus.OK); verify(programmingMessagingService, timeout(2000).times(2)).notifyUserAboutNewResult(resultCaptor.capture(), any()); @@ -577,7 +617,7 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception { assertThat(invokedResult).isNotNull(); assertThat(invokedResult.getId()).isNotNull(); assertThat(invokedResult.isSuccessful()).isTrue(); - assertThat(invokedResult.isAthenaAutomatic()).isTrue(); + assertThat(invokedResult.isAthenaBased()).isTrue(); assertThat(invokedResult.getFeedbacks()).hasSize(1); localRepo.resetLocalRepo(); @@ -614,7 +654,7 @@ void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception { Result invokedTextResult = resultCaptor.getAllValues().get(1); assertThat(invokedTextResult).isNotNull(); assertThat(invokedTextResult.getId()).isNotNull(); - assertThat(invokedTextResult.isAthenaAutomatic()).isTrue(); + assertThat(invokedTextResult.isAthenaBased()).isTrue(); assertThat(invokedTextResult.getFeedbacks()).hasSize(1); } @@ -649,13 +689,13 @@ void requestModelingFeedbackSuccess_withAthenaSuccess() throws Exception { Result invokedModelingResult = resultCaptor.getAllValues().get(1); assertThat(invokedModelingResult).isNotNull(); assertThat(invokedModelingResult.getId()).isNotNull(); - assertThat(invokedModelingResult.isAthenaAutomatic()).isTrue(); + assertThat(invokedModelingResult.isAthenaBased()).isTrue(); assertThat(invokedModelingResult.getFeedbacks()).hasSize(1); } @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void requestFeedbackSuccess_withAthenaFailure() throws Exception { + void requestProgrammingFeedbackSuccess_withAthenaFailure() throws Exception { var course = programmingExercise.getCourseViaExerciseGroupOrCourseMember(); course.setRestrictedAthenaModulesAccess(true); @@ -682,9 +722,6 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception { result2.setCompletionDate(ZonedDateTime.now()); resultRepository.save(result2); - doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(any(), any()); - doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any()); - request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, ProgrammingExerciseStudentParticipation.class, HttpStatus.OK); verify(programmingMessagingService, timeout(2000).times(2)).notifyUserAboutNewResult(resultCaptor.capture(), any()); @@ -693,7 +730,7 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception { assertThat(invokedResult).isNotNull(); assertThat(invokedResult.getId()).isNotNull(); assertThat(invokedResult.isSuccessful()).isFalse(); - assertThat(invokedResult.isAthenaAutomatic()).isTrue(); + assertThat(invokedResult.isAthenaBased()).isTrue(); assertThat(invokedResult.getFeedbacks()).hasSize(0); localRepo.resetLocalRepo(); @@ -729,7 +766,7 @@ void requestTextFeedbackSuccess_withAthenaFailure() throws Exception { Result invokedTextResult = resultCaptor.getAllValues().getFirst(); assertThat(invokedTextResult).isNotNull(); - assertThat(invokedTextResult.isAthenaAutomatic()).isTrue(); + assertThat(invokedTextResult.isAthenaBased()).isTrue(); assertThat(invokedTextResult.getFeedbacks()).hasSize(0); } @@ -763,7 +800,7 @@ void requestModelingFeedbackSuccess_withAthenaFailure() throws Exception { Result invokedModelingResult = resultCaptor.getAllValues().getFirst(); assertThat(invokedModelingResult).isNotNull(); - assertThat(invokedModelingResult.isAthenaAutomatic()).isTrue(); + assertThat(invokedModelingResult.isAthenaBased()).isTrue(); assertThat(invokedModelingResult.getFeedbacks()).hasSize(0); } @@ -1277,7 +1314,7 @@ void getParticipationWithLatestResult() throws Exception { var result = ParticipationFactory.generateResult(true, 70D); result.participation(participation).setCompletionDate(ZonedDateTime.now().minusHours(2)); resultRepository.save(result); - var actualParticipation = request.get("/api/participations/" + participation.getId() + "/withLatestResult", HttpStatus.OK, StudentParticipation.class); + var actualParticipation = request.get("/api/participations/" + participation.getId() + "/with-latest-result", HttpStatus.OK, StudentParticipation.class); assertThat(actualParticipation).isNotNull(); assertThat(actualParticipation.getResults()).hasSize(1); @@ -1289,7 +1326,7 @@ void getParticipationWithLatestResult() throws Exception { void getParticipationBuildArtifact() throws Exception { var participation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, TEST_PREFIX + "student1"); doReturn(new ResponseEntity<>(null, HttpStatus.OK)).when(continuousIntegrationService).retrieveLatestArtifact(participation); - request.getNullable("/api/participations/" + participation.getId() + "/buildArtifact", HttpStatus.OK, Object.class); + request.getNullable("/api/participations/" + participation.getId() + "/build-artifact", HttpStatus.OK, Object.class); verify(continuousIntegrationService).retrieveLatestArtifact(participation); } @@ -1316,7 +1353,7 @@ void cleanupBuildPlan(boolean practiceMode, boolean afterDueDate) throws Excepti } jenkinsRequestMockProvider.enableMockingOfRequests(jenkinsServer); mockDeleteBuildPlan(programmingExercise.getProjectKey(), participation.getBuildPlanId(), false); - var actualParticipation = request.putWithResponseBody("/api/participations/" + participation.getId() + "/cleanupBuildPlan", null, Participation.class, HttpStatus.OK); + var actualParticipation = request.putWithResponseBody("/api/participations/" + participation.getId() + "/cleanup-build-plan", null, Participation.class, HttpStatus.OK); assertThat(actualParticipation).isEqualTo(participation); assertThat(actualParticipation.getInitializationState()).isEqualTo(!practiceMode && afterDueDate ? InitializationState.FINISHED : InitializationState.INACTIVE); assertThat(((ProgrammingExerciseStudentParticipation) actualParticipation).getBuildPlanId()).isNull(); @@ -1615,7 +1652,7 @@ void whenFeedbackRequestedAndDeadlinePassed_thenFail() throws Exception { result.setCompletionDate(ZonedDateTime.now()); resultRepository.save(result); - request.putAndExpectError("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, HttpStatus.BAD_REQUEST, "preconditions not met"); + request.putAndExpectError("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, HttpStatus.BAD_REQUEST, "feedbackRequestAfterDueDate"); localRepo.resetLocalRepo(); } @@ -1643,50 +1680,14 @@ void whenFeedbackRequestedAndRateLimitExceeded_thenFail() throws Exception { resultRepository.save(result); // generate 5 athena results - for (int i = 0; i < 5; i++) { - var athenaResult = ParticipationFactory.generateResult(false, 100).participation(participation); - athenaResult.setCompletionDate(ZonedDateTime.now()); - athenaResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA); - resultRepository.save(athenaResult); - } - - request.putAndExpectError("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, HttpStatus.BAD_REQUEST, "preconditions not met"); - - localRepo.resetLocalRepo(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void whenFeedbackRequestedAndRateLimitStillUnknownDueRequestsInProgress_thenFail() throws Exception { - - programmingExercise.setDueDate(ZonedDateTime.now().plusDays(100)); - programmingExercise = exerciseRepository.save(programmingExercise); - - var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise, - userUtilService.getUserByLogin(TEST_PREFIX + "student1")); - - var localRepo = new LocalRepository(defaultBranch); - localRepo.configureRepos("testLocalRepo", "testOriginRepo"); - - participation.setRepositoryUri(ParticipationFactory.getMockFileRepositoryUri(localRepo).getURI().toString()); - participationRepo.save(participation); - - gitService.getDefaultLocalPathOfRepo(participation.getVcsRepositoryUri()); - - var result = ParticipationFactory.generateResult(false, 100).participation(participation); - result.setCompletionDate(ZonedDateTime.now()); - resultRepository.save(result); - - // generate 5 athena results - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 20; i++) { var athenaResult = ParticipationFactory.generateResult(false, 100).participation(participation); athenaResult.setCompletionDate(ZonedDateTime.now()); athenaResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA); - athenaResult.setSuccessful(null); resultRepository.save(athenaResult); } - request.putAndExpectError("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, HttpStatus.BAD_REQUEST, "preconditions not met"); + request.putAndExpectError("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, HttpStatus.BAD_REQUEST, "maxAthenaResultsReached"); localRepo.resetLocalRepo(); } diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/participation/util/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/participation/util/ParticipationUtilService.java index 13f049125c0a..ff3ab5f260e6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/participation/util/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/participation/util/ParticipationUtilService.java @@ -47,7 +47,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; @@ -91,7 +91,7 @@ public class ParticipationUtilService { private ParticipationVcsAccessTokenService participationVCSAccessTokenService; @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepository; @Autowired private SubmissionTestRepository submissionRepository; @@ -177,14 +177,14 @@ public Result addProgrammingParticipationWithResultForExercise(ProgrammingExerci * @return The created Result */ public Result createParticipationSubmissionAndResult(long exerciseId, Participant participant, Double points, Double bonusPoints, long scoreAwarded, boolean rated) { - Exercise exercise = exerciseRepo.findById(exerciseId).orElseThrow(); + Exercise exercise = exerciseRepository.findById(exerciseId).orElseThrow(); if (!exercise.getMaxPoints().equals(points)) { exercise.setMaxPoints(points); } if (!exercise.getBonusPoints().equals(bonusPoints)) { exercise.setBonusPoints(bonusPoints); } - exercise = exerciseRepo.saveAndFlush(exercise); + exercise = exerciseRepository.saveAndFlush(exercise); StudentParticipation studentParticipation = participationService.startExercise(exercise, participant, false); return createSubmissionAndResult(studentParticipation, scoreAwarded, rated); } diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseTestRepository.java new file mode 100644 index 000000000000..03332b2f6fc5 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseTestRepository.java @@ -0,0 +1,31 @@ +package de.tum.cit.aet.artemis.exercise.repository; + +import java.util.List; +import java.util.Set; + +import org.springframework.context.annotation.Primary; +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import de.tum.cit.aet.artemis.exercise.domain.Exercise; + +/** + * Spring Data JPA repository for the Exercise entity for Tests. + */ +@Primary +@Repository +public interface ExerciseTestRepository extends ExerciseRepository { + + @EntityGraph(attributePaths = { "studentParticipations", "studentParticipations.student", "studentParticipations.submissions" }) + @Query(""" + SELECT e + FROM Exercise e + WHERE e.course.id = :courseId + """) + Set findAllExercisesByCourseIdWithEagerParticipation(@Param("courseId") Long courseId); + + @EntityGraph(attributePaths = "categories") + List findAllWithCategoriesByCourseId(Long courseId); +} diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/service/PresentationPointsCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/service/PresentationPointsCalculationServiceTest.java index 0592824c6ad7..56aded0df2ae 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/service/PresentationPointsCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/service/PresentationPointsCalculationServiceTest.java @@ -17,7 +17,6 @@ import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; @@ -27,9 +26,6 @@ class PresentationPointsCalculationServiceTest extends AbstractSpringIntegration private static final String TEST_PREFIX = "ppcservicetest"; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private StudentParticipationTestRepository studentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/service/TeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/service/TeamWebsocketServiceTest.java index b73dc55fe396..0e9bca57e218 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/service/TeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/service/TeamWebsocketServiceTest.java @@ -24,7 +24,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.dto.TeamAssignmentPayload; import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -38,9 +37,6 @@ class TeamWebsocketServiceTest extends AbstractSpringIntegrationIndependentTest @Autowired private UserTestRepository userRepo; - @Autowired - private ExerciseRepository exerciseRepo; - @Autowired private TeamRepository teamRepository; @@ -77,11 +73,11 @@ void init() { for (Exercise exercise : course.getExercises()) { if (exercise instanceof ModelingExercise) { exercise.setMode(ExerciseMode.TEAM); - modelingExercise = (ModelingExercise) exerciseRepo.save(exercise); + modelingExercise = (ModelingExercise) exerciseRepository.save(exercise); } if (exercise instanceof TextExercise) { exercise.setMode(ExerciseMode.TEAM); - textExercise = (TextExercise) exerciseRepo.save(exercise); + textExercise = (TextExercise) exerciseRepository.save(exercise); } } assertThat(modelingExercise).isNotNull(); diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/util/ExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/util/ExerciseUtilService.java index fa04fd24ca0d..db92da355b2f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/util/ExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/util/ExerciseUtilService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; @@ -65,7 +65,7 @@ public class ExerciseUtilService { @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseTestRepository; @Autowired private StudentParticipationTestRepository studentParticipationRepo; @@ -122,7 +122,7 @@ public Exercise addMaxScoreAndBonusPointsToExercise(Exercise exercise) { exercise.setIncludedInOverallScore(IncludedInOverallScore.INCLUDED_COMPLETELY); exercise.setMaxPoints(100.0); exercise.setBonusPoints(10.0); - return exerciseRepo.save(exercise); + return exerciseTestRepository.save(exercise); } /** @@ -222,7 +222,7 @@ public Course addCourseWithOneExerciseAndSubmissions(String userPrefix, String e switch (exerciseType) { case "modeling" -> { course = modelingExerciseUtilService.addCourseWithOneModelingExercise(); - exercise = exerciseRepo.findAllExercisesByCourseId(course.getId()).iterator().next(); + exercise = exerciseTestRepository.findAllExercisesByCourseId(course.getId()).iterator().next(); for (int j = 1; j <= numberOfSubmissions; j++) { StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(exercise, userPrefix + "student" + j); assertThat(modelForModelingExercise).isNotEmpty(); @@ -235,7 +235,7 @@ public Course addCourseWithOneExerciseAndSubmissions(String userPrefix, String e } case "programming" -> { course = programmingExerciseUtilService.addCourseWithOneProgrammingExercise(); - exercise = exerciseRepo.findAllExercisesByCourseId(course.getId()).iterator().next(); + exercise = exerciseTestRepository.findAllExercisesByCourseId(course.getId()).iterator().next(); for (int j = 1; j <= numberOfSubmissions; j++) { ProgrammingSubmission submission = new ProgrammingSubmission(); programmingExerciseUtilService.addProgrammingSubmission((ProgrammingExercise) exercise, submission, userPrefix + "student" + j); @@ -244,7 +244,7 @@ public Course addCourseWithOneExerciseAndSubmissions(String userPrefix, String e } case "text" -> { course = textExerciseUtilService.addCourseWithOneFinishedTextExercise(); - exercise = exerciseRepo.findAllExercisesByCourseId(course.getId()).iterator().next(); + exercise = exerciseTestRepository.findAllExercisesByCourseId(course.getId()).iterator().next(); for (int j = 1; j <= numberOfSubmissions; j++) { TextSubmission textSubmission = ParticipationFactory.generateTextSubmission("Text" + j + j, null, true); textExerciseUtilService.saveTextSubmission((TextExercise) exercise, textSubmission, userPrefix + "student" + j); @@ -253,7 +253,7 @@ public Course addCourseWithOneExerciseAndSubmissions(String userPrefix, String e } case "file-upload" -> { course = fileUploadExerciseUtilService.addCourseWithFileUploadExercise(); - exercise = exerciseRepo.findAllExercisesByCourseId(course.getId()).iterator().next(); + exercise = exerciseTestRepository.findAllExercisesByCourseId(course.getId()).iterator().next(); for (int j = 1; j <= numberOfSubmissions; j++) { FileUploadSubmission submission = ParticipationFactory.generateFileUploadSubmissionWithFile(true, "path/to/file.pdf"); fileUploadExerciseUtilService.saveFileUploadSubmission((FileUploadExercise) exercise, submission, userPrefix + "student" + j); @@ -313,12 +313,13 @@ public void addAssessmentToExercise(Exercise exercise, User assessor) { * @param newDueDate The new due date of the exercise. */ public void updateExerciseDueDate(long exerciseId, ZonedDateTime newDueDate) { - Exercise exercise = exerciseRepo.findById(exerciseId).orElseThrow(() -> new IllegalArgumentException("Exercise with given ID " + exerciseId + " could not be found")); + Exercise exercise = exerciseTestRepository.findById(exerciseId) + .orElseThrow(() -> new IllegalArgumentException("Exercise with given ID " + exerciseId + " could not be found")); exercise.setDueDate(newDueDate); if (exercise instanceof ProgrammingExercise) { ((ProgrammingExercise) exercise).setBuildAndTestStudentSubmissionsAfterDueDate(newDueDate); } - exerciseRepo.save(exercise); + exerciseTestRepository.save(exercise); } /** @@ -328,9 +329,10 @@ public void updateExerciseDueDate(long exerciseId, ZonedDateTime newDueDate) { * @param newDueDate The new assessment due date of the exercise. */ public void updateAssessmentDueDate(long exerciseId, ZonedDateTime newDueDate) { - Exercise exercise = exerciseRepo.findById(exerciseId).orElseThrow(() -> new IllegalArgumentException("Exercise with given ID " + exerciseId + " could not be found")); + Exercise exercise = exerciseTestRepository.findById(exerciseId) + .orElseThrow(() -> new IllegalArgumentException("Exercise with given ID " + exerciseId + " could not be found")); exercise.setAssessmentDueDate(newDueDate); - exerciseRepo.save(exercise); + exerciseTestRepository.save(exercise); } /** diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/AbstractFileUploadIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/AbstractFileUploadIntegrationTest.java new file mode 100644 index 000000000000..6c6ff7719640 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/AbstractFileUploadIntegrationTest.java @@ -0,0 +1,81 @@ +package de.tum.cit.aet.artemis.fileupload; + +import org.springframework.beans.factory.annotation.Autowired; + +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.util.ComplaintUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.util.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; +import de.tum.cit.aet.artemis.exercise.test_repository.ParticipationTestRepository; +import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; +import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.util.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; + +public class AbstractFileUploadIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + // Repositories + @Autowired + protected FileUploadExerciseRepository fileUploadExerciseRepository; + + // External Repositories + @Autowired + protected ComplaintRepository complaintRepository; + + @Autowired + protected SubmissionTestRepository submissionRepository; + + @Autowired + protected ExamRepository examRepository; + + @Autowired + protected StudentParticipationTestRepository studentParticipationRepository; + + @Autowired + protected FeedbackRepository feedbackRepository; + + @Autowired + protected GradingCriterionRepository gradingCriterionRepository; + + @Autowired + protected ChannelRepository channelRepository; + + @Autowired + protected ParticipationTestRepository participationRepository; + + // Services + @Autowired + protected FileUploadSubmissionRepository fileUploadSubmissionRepository; + + // Util Services + @Autowired + protected FileUploadExerciseUtilService fileUploadExerciseUtilService; + + // External Util Services + @Autowired + protected ParticipationUtilService participationUtilService; + + @Autowired + protected ExamUtilService examUtilService; + + @Autowired + protected ComplaintUtilService complaintUtilService; + + @Autowired + protected PageableSearchUtilService pageableSearchUtilService; + + @Autowired + protected CompetencyUtilService competencyUtilService; + + @Autowired + protected ModelingExerciseUtilService modelingExerciseUtilService; +} diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadAssessmentIntegrationTest.java index ca1177b834fb..763f80e3be0d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadAssessmentIntegrationTest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; @@ -30,65 +29,28 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.assessment.util.ComplaintUtilService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; -import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.exam.util.ExamUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; -import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; -import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.dto.FileUploadAssessmentDTO; -import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseFactory; -import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.programming.dto.ResultDTO; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class FileUploadAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class FileUploadAssessmentIntegrationTest extends AbstractFileUploadIntegrationTest { private static final String TEST_PREFIX = "fileuploadassessment"; public static final String API_FILE_UPLOAD_SUBMISSIONS = "/api/file-upload-submissions/"; - @Autowired - private ComplaintRepository complaintRepo; - - @Autowired - private FileUploadExerciseRepository fileUploadExerciseRepository; - - @Autowired - private SubmissionTestRepository submissionRepository; - - @Autowired - private ExamRepository examRepository; - - @Autowired - private StudentParticipationTestRepository studentParticipationRepository; - - @Autowired - private FileUploadExerciseUtilService fileUploadExerciseUtilService; - - @Autowired - private ParticipationUtilService participationUtilService; - - @Autowired - private ExamUtilService examUtilService; - - @Autowired - private ComplaintUtilService complaintUtilService; - private FileUploadExercise afterReleaseFileUploadExercise; private Course course; @@ -206,7 +168,7 @@ void testUpdateFileUploadAssessmentAfterComplaint_studentHidden() throws Excepti Result fileUploadAssessment = fileUploadSubmission.getLatestResult(); Complaint complaint = new Complaint().result(fileUploadAssessment).complaintText("This is not fair"); - complaint = complaintRepo.save(complaint); + complaint = complaintRepository.save(complaint); complaint.getResult().setParticipation(null); // Break infinite reference chain ComplaintResponse complaintResponse = complaintUtilService.createInitialEmptyResponse(TEST_PREFIX + "tutor2", complaint); diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadExerciseIntegrationTest.java index 131eeaec747b..d1deb2f81694 100644 --- a/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadExerciseIntegrationTest.java @@ -25,7 +25,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; import org.junit.jupiter.params.provider.NullSource; import org.junit.jupiter.params.provider.ValueSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; @@ -33,68 +32,27 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; import de.tum.cit.aet.artemis.assessment.domain.Result; -import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.util.GradingCriterionUtil; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; -import de.tum.cit.aet.artemis.exam.util.ExamUtilService; import de.tum.cit.aet.artemis.exam.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.exam.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; -import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseFactory; -import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseUtilService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class FileUploadExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class FileUploadExerciseIntegrationTest extends AbstractFileUploadIntegrationTest { private static final String TEST_PREFIX = "fileuploaderxercise"; - @Autowired - private FeedbackRepository feedbackRepository; - - @Autowired - private GradingCriterionRepository gradingCriterionRepository; - - @Autowired - private FileUploadExerciseRepository fileUploadExerciseRepository; - - @Autowired - private StudentParticipationTestRepository studentParticipationRepository; - - @Autowired - private ChannelRepository channelRepository; - - @Autowired - private FileUploadExerciseUtilService fileUploadExerciseUtilService; - - @Autowired - private ExamUtilService examUtilService; - - @Autowired - private ParticipationUtilService participationUtilService; - - @Autowired - private PageableSearchUtilService pageableSearchUtilService; - - @Autowired - private CompetencyUtilService competencyUtilService; - private FileUploadExercise fileUploadExercise; private Course course; diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadSubmissionIntegrationTest.java index 7d88ad1e0b01..645e472b4672 100644 --- a/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/FileUploadSubmissionIntegrationTest.java @@ -19,7 +19,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; @@ -38,36 +37,15 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; -import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.test_repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; -import de.tum.cit.aet.artemis.modeling.util.ModelingExerciseUtilService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class FileUploadSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class FileUploadSubmissionIntegrationTest extends AbstractFileUploadIntegrationTest { private static final String TEST_PREFIX = "fileuploadsubmission"; - @Autowired - private FileUploadSubmissionRepository fileUploadSubmissionRepository; - - @Autowired - private ParticipationTestRepository participationRepository; - - @Autowired - private FileUploadExerciseUtilService fileUploadExerciseUtilService; - - @Autowired - private ParticipationUtilService participationUtilService; - - @Autowired - private ModelingExerciseUtilService modelingExerciseUtilService; - private FileUploadExercise releasedFileUploadExercise; private FileUploadExercise finishedFileUploadExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadRepositoryArchitectureTest.java new file mode 100644 index 000000000000..58d076ffc236 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.fileupload.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class FileUploadRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".fileupload"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadResourceArchitectureTest.java new file mode 100644 index 000000000000..f9840c68c99a --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.fileupload.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class FileUploadResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".fileupload"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadServiceArchitectureTest.java new file mode 100644 index 000000000000..9f5286c323aa --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.fileupload.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class FileUploadServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".fileupload"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadTestArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadTestArchitectureTest.java new file mode 100644 index 000000000000..f67db93f311f --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/architecture/FileUploadTestArchitectureTest.java @@ -0,0 +1,17 @@ +package de.tum.cit.aet.artemis.fileupload.architecture; + +import de.tum.cit.aet.artemis.fileupload.AbstractFileUploadIntegrationTest; +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleTestArchitectureTest; + +class FileUploadTestArchitectureTest extends AbstractModuleTestArchitectureTest { + + @Override + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".fileupload"; + } + + @Override + protected Class getAbstractModuleIntegrationTestClass() { + return AbstractFileUploadIntegrationTest.class; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/fileupload/util/FileUploadExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/fileupload/util/FileUploadExerciseUtilService.java index 4b6084891726..c85b0c3df488 100644 --- a/src/test/java/de/tum/cit/aet/artemis/fileupload/util/FileUploadExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/fileupload/util/FileUploadExerciseUtilService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; @@ -45,9 +45,6 @@ public class FileUploadExerciseUtilService { private static final ZonedDateTime FUTURE_FUTURE_TIMESTAMP = ZonedDateTime.now().plusDays(2); - @Autowired - private ExerciseRepository exerciseRepo; - @Autowired private CourseTestRepository courseRepo; @@ -72,6 +69,9 @@ public class FileUploadExerciseUtilService { @Autowired private UserUtilService userUtilService; + @Autowired + private ExerciseTestRepository exerciseRepository; + /** * Creates and saves a new Course and an Exam with one mandatory FileUploadExercise. * @@ -82,7 +82,7 @@ public class FileUploadExerciseUtilService { public FileUploadExercise addCourseExamExerciseGroupWithOneFileUploadExercise(boolean startDateBeforeCurrentTime) { ExerciseGroup exerciseGroup = examUtilService.addExerciseGroupWithExamAndCourse(true, startDateBeforeCurrentTime); FileUploadExercise fileUploadExercise = FileUploadExerciseFactory.generateFileUploadExerciseForExam("pdf", exerciseGroup); - return exerciseRepo.save(fileUploadExercise); + return exerciseRepository.save(fileUploadExercise); } /** @@ -118,10 +118,10 @@ public List createFileUploadExercisesWithCourse() { public Course addCourseWithThreeFileUploadExercise() { var fileUploadExercises = createFileUploadExercisesWithCourse(); assertThat(fileUploadExercises).as("created three exercises").hasSize(3); - exerciseRepo.saveAll(fileUploadExercises); + exerciseRepository.saveAll(fileUploadExercises); long courseId = fileUploadExercises.getFirst().getCourseViaExerciseGroupOrCourseMember().getId(); Course course = courseRepo.findByIdWithEagerExercisesElseThrow(courseId); - List exercises = exerciseRepo.findAllExercisesByCourseId(courseId).stream().toList(); + List exercises = exerciseRepository.findAllExercisesByCourseId(courseId).stream().toList(); assertThat(exercises).as("three exercises got stored").hasSize(3); assertThat(course.getExercises()).as("course contains the exercises").containsExactlyInAnyOrder(exercises.toArray(new Exercise[] {})); return course; @@ -152,7 +152,7 @@ public Course addCourseWithFourFileUploadExercise() { fileUploadExercises.add(finishedFileUploadExercise); fileUploadExercises.add(assessedFileUploadExercise); fileUploadExercises.add(noDueDateFileUploadExercise); - exerciseRepo.saveAll(fileUploadExercises); + exerciseRepository.saveAll(fileUploadExercises); return courseRepo.findByIdWithEagerExercisesElseThrow(course.getId()); } @@ -168,7 +168,7 @@ public Course addCourseWithFileUploadExercise() { assessedFileUploadExercise.setTitle("assessed"); course.addExercises(assessedFileUploadExercise); courseRepo.save(course); - exerciseRepo.save(assessedFileUploadExercise); + exerciseRepository.save(assessedFileUploadExercise); return course; } diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java index 34337b170baf..c887cffce4d9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java @@ -18,11 +18,10 @@ import de.tum.cit.aet.artemis.core.connector.IrisRequestMockProvider; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.test_repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; @@ -60,9 +59,9 @@ void tearDown() throws Exception { protected void activateIrisGlobally() { var globalSettings = irisSettingsService.getGlobalSettings(); activateSubSettings(globalSettings.getIrisChatSettings()); - activateSubSettings(globalSettings.getIrisHestiaSettings()); activateSubSettings(globalSettings.getIrisLectureIngestionSettings()); activateSubSettings(globalSettings.getIrisCompetencyGenerationSettings()); + activateSubSettings(globalSettings.getIrisTextExerciseChatSettings()); irisSettingsRepository.save(globalSettings); } @@ -73,38 +72,31 @@ protected void activateIrisGlobally() { */ private void activateSubSettings(IrisSubSettings settings) { settings.setEnabled(true); - settings.setPreferredModel(null); - settings.setAllowedModels(new TreeSet<>(Set.of("dummy"))); + settings.setSelectedVariant("default"); + settings.setAllowedVariants(new TreeSet<>(Set.of("default"))); } protected void activateIrisFor(Course course) { var courseSettings = irisSettingsService.getDefaultSettingsFor(course); activateSubSettings(courseSettings.getIrisChatSettings()); - courseSettings.getIrisChatSettings().setTemplate(createDummyTemplate()); - - activateSubSettings(courseSettings.getIrisHestiaSettings()); - courseSettings.getIrisHestiaSettings().setTemplate(createDummyTemplate()); activateSubSettings(courseSettings.getIrisCompetencyGenerationSettings()); - courseSettings.getIrisCompetencyGenerationSettings().setTemplate(createDummyTemplate()); activateSubSettings(courseSettings.getIrisLectureIngestionSettings()); + activateSubSettings(courseSettings.getIrisTextExerciseChatSettings()); + irisSettingsRepository.save(courseSettings); } - protected void activateIrisFor(ProgrammingExercise exercise) { + protected void activateIrisFor(Exercise exercise) { var exerciseSettings = irisSettingsService.getDefaultSettingsFor(exercise); activateSubSettings(exerciseSettings.getIrisChatSettings()); - exerciseSettings.getIrisChatSettings().setTemplate(createDummyTemplate()); + activateSubSettings(exerciseSettings.getIrisTextExerciseChatSettings()); irisSettingsRepository.save(exerciseSettings); } - protected IrisTemplate createDummyTemplate() { - return new IrisTemplate("Hello World"); - } - /** * Verify that the given messages were sent through the websocket for the given user and topic. * diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java index ec5028485504..8cda014838a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java @@ -127,7 +127,7 @@ void sendOneMessage() throws Exception { var messageToSend = createDefaultMockMessage(irisSession); messageToSend.setMessageDifferentiator(1453); - irisRequestMockProvider.mockRunResponse(dto -> { + irisRequestMockProvider.mockProgrammingExerciseChatResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); assertThatNoException().isThrownBy(() -> sendStatus(dto.settings().authenticationToken(), "Hello World", dto.initialStages(), null)); @@ -150,7 +150,7 @@ void sendSuggestions() throws Exception { var messageToSend = createDefaultMockMessage(irisSession); messageToSend.setMessageDifferentiator(1454); - irisRequestMockProvider.mockRunResponse(dto -> { + irisRequestMockProvider.mockProgrammingExerciseChatResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); List suggestions = List.of("suggestion1", "suggestion2", "suggestion3"); @@ -191,7 +191,7 @@ void sendTwoMessages() throws Exception { var irisSession = irisExerciseChatSessionService.createChatSessionForProgrammingExercise(exercise, userUtilService.getUserByLogin(TEST_PREFIX + "student1")); IrisMessage messageToSend1 = createDefaultMockMessage(irisSession); - irisRequestMockProvider.mockRunResponse(dto -> { + irisRequestMockProvider.mockProgrammingExerciseChatResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); assertThatNoException().isThrownBy(() -> sendStatus(dto.settings().authenticationToken(), "Hello World 1", dto.initialStages(), null)); @@ -199,7 +199,7 @@ void sendTwoMessages() throws Exception { pipelineDone.set(true); }); - irisRequestMockProvider.mockRunResponse(dto -> { + irisRequestMockProvider.mockProgrammingExerciseChatResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); assertThatNoException().isThrownBy(() -> sendStatus(dto.settings().authenticationToken(), "Hello World 2", dto.initialStages(), null)); @@ -295,7 +295,7 @@ void resendMessage() throws Exception { var irisSession = irisExerciseChatSessionService.createChatSessionForProgrammingExercise(exercise, userUtilService.getUserByLogin(TEST_PREFIX + "student1")); var messageToSend = createDefaultMockMessage(irisSession); - irisRequestMockProvider.mockRunResponse(dto -> { + irisRequestMockProvider.mockProgrammingExerciseChatResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); assertThatNoException().isThrownBy(() -> sendStatus(dto.settings().authenticationToken(), "Hello World", dto.initialStages(), null)); @@ -318,7 +318,7 @@ void sendMessageRateLimitReached() throws Exception { var messageToSend1 = createDefaultMockMessage(irisSession); var messageToSend2 = createDefaultMockMessage(irisSession); - irisRequestMockProvider.mockRunResponse(dto -> { + irisRequestMockProvider.mockProgrammingExerciseChatResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); assertThatNoException().isThrownBy(() -> sendStatus(dto.settings().authenticationToken(), "Hello World", dto.initialStages(), null)); diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisTextExerciseChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisTextExerciseChatMessageIntegrationTest.java new file mode 100644 index 000000000000..7be2d0e8abc9 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisTextExerciseChatMessageIntegrationTest.java @@ -0,0 +1,404 @@ +package de.tum.cit.aet.artemis.iris; + +import static de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState.DONE; +import static de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState.IN_PROGRESS; +import static de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState.NOT_STARTED; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.awaitility.Awaitility.await; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentMatcher; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.util.LinkedMultiValueMap; + +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageContent; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisTextExerciseChatSession; +import de.tum.cit.aet.artemis.iris.dto.IrisChatWebsocketDTO; +import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; + +class IrisTextExerciseChatMessageIntegrationTest extends AbstractIrisIntegrationTest { + + private static final String TEST_PREFIX = "iristextchatmessageintegration"; + + @Autowired + private IrisMessageService irisMessageService; + + @Autowired + private IrisSessionRepository irisTextExerciseChatSessionRepository; + + @Autowired + private IrisMessageRepository irisMessageRepository; + + @Autowired + private TextExerciseRepository textExerciseRepository; + + @Autowired + private StudentParticipationTestRepository studentParticipationRepository; + + @Autowired + private TextExerciseUtilService exerciseUtilService; + + private TextExercise exercise; + + private AtomicBoolean pipelineDone; + + private IrisTextExerciseChatSession createSessionForUser(String userLogin) { + var user = userUtilService.getUserByLogin(TEST_PREFIX + userLogin); + return irisTextExerciseChatSessionRepository.save(new IrisTextExerciseChatSession(exercise, user)); + } + + @BeforeEach + void initTestCase() { + userUtilService.addUsers(TEST_PREFIX, 2, 0, 0, 0); + + final Course course = exerciseUtilService.addCourseWithOneReleasedTextExercise("Test Exercise Title"); + exercise = (TextExercise) course.getExercises().iterator().next(); + exercise = textExerciseRepository.save(exercise); + + // Add a participation for student1. + StudentParticipation studentParticipation = new StudentParticipation().exercise(exercise); + studentParticipation.setParticipant(userUtilService.getUserByLogin(TEST_PREFIX + "student1")); + studentParticipationRepository.save(studentParticipation); + + activateIrisGlobally(); + activateIrisFor(course); + activateIrisFor(exercise); + pipelineDone = new AtomicBoolean(false); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void sendOneMessage() throws Exception { + var irisSession = createSessionForUser("student1"); + var messageToSend = createDefaultMockMessage(irisSession); + messageToSend.setMessageDifferentiator(1453); + + irisRequestMockProvider.mockTextExerciseChatResponse(dto -> { + assertThat(dto.execution().settings().authenticationToken()).isNotNull(); + + assertThatNoException().isThrownBy(() -> sendStatus(dto.execution().settings().authenticationToken(), "Hello World", dto.execution().initialStages(), null)); + + pipelineDone.set(true); + }); + + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend, HttpStatus.CREATED); + + await().until(pipelineDone::get); + + verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend.getContent()), + statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World")); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void sendOneMessageToWrongSession() throws Exception { + createSessionForUser("student1"); + var irisSession = createSessionForUser("student2"); + IrisMessage messageToSend = createDefaultMockMessage(irisSession); + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend, HttpStatus.FORBIDDEN); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void sendMessageWithoutContent() throws Exception { + var irisSession = createSessionForUser("student1"); + var messageToSend = irisSession.newMessage(); + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend, HttpStatus.BAD_REQUEST); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void sendTwoMessages() throws Exception { + var irisSession = createSessionForUser("student1"); + IrisMessage messageToSend1 = createDefaultMockMessage(irisSession); + + irisRequestMockProvider.mockTextExerciseChatResponse(dto -> { + assertThat(dto.execution().settings().authenticationToken()).isNotNull(); + + assertThatNoException().isThrownBy(() -> sendStatus(dto.execution().settings().authenticationToken(), "Hello World 1", dto.execution().initialStages(), null)); + + pipelineDone.set(true); + }); + + irisRequestMockProvider.mockTextExerciseChatResponse(dto -> { + assertThat(dto.execution().settings().authenticationToken()).isNotNull(); + + assertThatNoException().isThrownBy(() -> sendStatus(dto.execution().settings().authenticationToken(), "Hello World 2", dto.execution().initialStages(), null)); + + pipelineDone.set(true); + }); + + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend1, HttpStatus.CREATED); + + IrisMessage messageToSend2 = createDefaultMockMessage(irisSession); + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend2, HttpStatus.CREATED); + + verify(websocketMessagingService, times(8)).sendMessageToUser(eq(TEST_PREFIX + "student1"), eq("/topic/iris/" + irisSession.getId()), any()); + + var irisSessionFromDb = irisTextExerciseChatSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()); + assertThat(irisSessionFromDb.getMessages()).hasSize(4); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void getMessages() throws Exception { + var irisSession = createSessionForUser("student1"); + + IrisMessage message1 = irisMessageService.saveMessage(createDefaultMockMessage(irisSession), irisSession, IrisMessageSender.USER); + IrisMessage message2 = irisMessageService.saveMessage(createDefaultMockMessage(irisSession), irisSession, IrisMessageSender.LLM); + IrisMessage message3 = irisMessageService.saveMessage(createDefaultMockMessage(irisSession), irisSession, IrisMessageSender.USER); + IrisMessage message4 = irisMessageService.saveMessage(createDefaultMockMessage(irisSession), irisSession, IrisMessageSender.LLM); + + var messages = request.getList("/api/iris/sessions/" + irisSession.getId() + "/messages", HttpStatus.OK, IrisMessage.class); + assertThat(messages).hasSize(4).containsAll(List.of(message1, message2, message3, message4)); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void rateMessageHelpfulTrue() throws Exception { + var irisSession = createSessionForUser("student1"); + var message = irisSession.newMessage(); + message.addContent(createMockTextContent()); + var irisMessage = irisMessageService.saveMessage(message, irisSession, IrisMessageSender.LLM); + request.putWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/helpful", true, IrisMessage.class, HttpStatus.OK); + irisMessage = irisMessageRepository.findById(irisMessage.getId()).orElseThrow(); + assertThat(irisMessage.getHelpful()).isTrue(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void rateMessageHelpfulFalse() throws Exception { + var irisSession = createSessionForUser("student1"); + var message = irisSession.newMessage(); + message.addContent(createMockTextContent()); + var irisMessage = irisMessageService.saveMessage(message, irisSession, IrisMessageSender.LLM); + request.putWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/helpful", false, IrisMessage.class, HttpStatus.OK); + irisMessage = irisMessageRepository.findById(irisMessage.getId()).orElseThrow(); + assertThat(irisMessage.getHelpful()).isFalse(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void rateMessageHelpfulNull() throws Exception { + var irisSession = createSessionForUser("student1"); + var message = irisSession.newMessage(); + message.addContent(createMockTextContent()); + var irisMessage = irisMessageService.saveMessage(message, irisSession, IrisMessageSender.LLM); + request.putWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/helpful", null, IrisMessage.class, HttpStatus.OK); + irisMessage = irisMessageRepository.findById(irisMessage.getId()).orElseThrow(); + assertThat(irisMessage.getHelpful()).isNull(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void rateMessageWrongSender() throws Exception { + var irisSession = createSessionForUser("student1"); + var message = irisSession.newMessage(); + message.addContent(createMockTextContent()); + var irisMessage = irisMessageService.saveMessage(message, irisSession, IrisMessageSender.USER); + request.putWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/helpful", true, IrisMessage.class, HttpStatus.BAD_REQUEST); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void rateMessageWrongSession() throws Exception { + var irisSession1 = createSessionForUser("student1"); + var irisSession2 = createSessionForUser("student2"); + var message = irisSession1.newMessage(); + message.addContent(createMockTextContent()); + var irisMessage = irisMessageService.saveMessage(message, irisSession1, IrisMessageSender.USER); + request.putWithResponseBody("/api/iris/sessions/" + irisSession2.getId() + "/messages/" + irisMessage.getId() + "/helpful", true, IrisMessage.class, HttpStatus.CONFLICT); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void resendMessage() throws Exception { + var irisSession = createSessionForUser("student1"); + var messageToSend = createDefaultMockMessage(irisSession); + + irisRequestMockProvider.mockTextExerciseChatResponse(dto -> { + assertThat(dto.execution().settings().authenticationToken()).isNotNull(); + + assertThatNoException().isThrownBy(() -> sendStatus(dto.execution().settings().authenticationToken(), "Hello World", dto.execution().initialStages(), null)); + + pipelineDone.set(true); + }); + + var irisMessage = irisMessageService.saveMessage(messageToSend, irisSession, IrisMessageSender.USER); + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, HttpStatus.OK); + await().until(() -> irisTextExerciseChatSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()).getMessages().size() == 2); + verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), + messageDTO("Hello World")); + } + + // User needs to be Admin to change settings + @Test + @WithMockUser(username = TEST_PREFIX + "student2", roles = "ADMIN") + void sendMessageRateLimitReached() throws Exception { + var irisSession = createSessionForUser("student2"); + var messageToSend1 = createDefaultMockMessage(irisSession); + var messageToSend2 = createDefaultMockMessage(irisSession); + + irisRequestMockProvider.mockTextExerciseChatResponse(dto -> { + assertThat(dto.execution().settings().authenticationToken()).isNotNull(); + + assertThatNoException().isThrownBy(() -> sendStatus(dto.execution().settings().authenticationToken(), "Hello World", dto.execution().initialStages(), null)); + + pipelineDone.set(true); + }); + + var globalSettings = irisSettingsService.getGlobalSettings(); + globalSettings.getIrisChatSettings().setRateLimit(1); + globalSettings.getIrisChatSettings().setRateLimitTimeframeHours(10); + irisSettingsService.saveIrisSettings(globalSettings); + + try { + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend1, HttpStatus.CREATED); + await().until(() -> irisTextExerciseChatSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()).getMessages().size() == 2); + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend2, HttpStatus.TOO_MANY_REQUESTS); + var irisMessage = irisMessageService.saveMessage(messageToSend2, irisSession, IrisMessageSender.USER); + request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, HttpStatus.TOO_MANY_REQUESTS); + + verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend1.getContent()), + statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World")); + } + finally { + // Reset to not interfere with other tests + globalSettings.getIrisChatSettings().setRateLimit(null); + globalSettings.getIrisChatSettings().setRateLimitTimeframeHours(null); + irisSettingsService.saveIrisSettings(globalSettings); + } + } + + private IrisMessage createDefaultMockMessage(IrisSession irisSession) { + var messageToSend = irisSession.newMessage(); + messageToSend.addContent(createMockTextContent(), createMockTextContent(), createMockTextContent()); + return messageToSend; + } + + private IrisMessageContent createMockTextContent() { + String[] adjectives = { "happy", "sad", "angry", "funny", "silly", "crazy", "beautiful", "smart" }; + String[] nouns = { "dog", "cat", "house", "car", "book", "computer", "phone", "shoe" }; + + var rdm = ThreadLocalRandom.current(); + String randomAdjective = adjectives[rdm.nextInt(adjectives.length)]; + String randomNoun = nouns[rdm.nextInt(nouns.length)]; + + var text = "The " + randomAdjective + " " + randomNoun + " jumped over the lazy dog."; + return new IrisTextMessageContent(text); + } + + private ArgumentMatcher messageDTO(String message) { + return messageDTO(List.of(new IrisTextMessageContent(message))); + } + + private ArgumentMatcher messageDTO(List content) { + return new ArgumentMatcher<>() { + + @Override + public boolean matches(Object argument) { + if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) { + return false; + } + if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.MESSAGE) { + return false; + } + return Objects.equals(websocketDTO.message().getContent().stream().map(IrisMessageContent::getContentAsString).toList(), + content.stream().map(IrisMessageContent::getContentAsString).toList()); + } + + @Override + public String toString() { + return "IrisChatWebsocketService.IrisWebsocketDTO with type MESSAGE and content " + content; + } + }; + } + + private ArgumentMatcher statusDTO(PyrisStageState... stageStates) { + return new ArgumentMatcher<>() { + + @Override + public boolean matches(Object argument) { + if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) { + return false; + } + if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.STATUS) { + return false; + } + if (websocketDTO.stages() == null) { + return stageStates == null; + } + if (websocketDTO.stages().size() != stageStates.length) { + return false; + } + return websocketDTO.stages().stream().map(PyrisStageDTO::state).toList().equals(List.of(stageStates)); + } + + @Override + public String toString() { + return "IrisChatWebsocketService.IrisWebsocketDTO with type STATUS and stage states " + Arrays.toString(stageStates); + } + }; + } + + private ArgumentMatcher suggestionsDTO(String... suggestions) { + return new ArgumentMatcher<>() { + + @Override + public boolean matches(Object argument) { + if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) { + return false; + } + if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.STATUS) { + return false; + } + if (websocketDTO.suggestions() == null) { + return suggestions == null; + } + return websocketDTO.suggestions().equals(List.of(suggestions)); + } + + @Override + public String toString() { + return "IrisChatWebsocketService.IrisWebsocketDTO with type STATUS and suggestions " + Arrays.toString(suggestions); + } + }; + } + + private void sendStatus(String jobId, String result, List stages, List suggestions) throws Exception { + var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobId)))); + request.postWithoutResponseBody("/api/public/pyris/pipelines/text-exercise-chat/runs/" + jobId + "/status", new PyrisChatStatusUpdateDTO(result, stages, suggestions), + HttpStatus.OK, headers); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java index 413b0b77c046..de726729a035 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java @@ -5,12 +5,13 @@ import java.util.stream.Stream; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.exception.IrisForbiddenException; import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorException; @@ -49,20 +50,22 @@ void testExceptionIngestionV2(int httpStatus, Class exceptionClass) { assertThatThrownBy(() -> pyrisConnectorService.executeLectureWebhook("fullIngestion", null)).isInstanceOf(exceptionClass); } - @Test - void testOfferedModels() throws Exception { - irisRequestMockProvider.mockModelsResponse(); + @ParameterizedTest + @EnumSource(IrisSubSettingsType.class) + void testOfferedModels(IrisSubSettingsType feature) throws Exception { + irisRequestMockProvider.mockVariantsResponse(feature); - var offeredModels = pyrisConnectorService.getOfferedModels(); + var offeredModels = pyrisConnectorService.getOfferedVariants(feature); assertThat(offeredModels).hasSize(1); assertThat(offeredModels.getFirst().id()).isEqualTo("TEST_MODEL"); } - @Test - void testOfferedModelsError() { - irisRequestMockProvider.mockModelsError(); + @ParameterizedTest + @EnumSource(IrisSubSettingsType.class) + void testOfferedModelsError(IrisSubSettingsType feature) { + irisRequestMockProvider.mockVariantsError(feature); - assertThatThrownBy(() -> pyrisConnectorService.getOfferedModels()).isInstanceOf(PyrisConnectorException.class); + assertThatThrownBy(() -> pyrisConnectorService.getOfferedVariants(feature)).isInstanceOf(PyrisConnectorException.class); } } diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisRepositoryArchitectureTest.java new file mode 100644 index 000000000000..14e84bf6132a --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.iris.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class IrisRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".iris"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisResourceArchitectureTest.java new file mode 100644 index 000000000000..6fd24efe1676 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.iris.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class IrisResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".iris"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisServiceArchitectureTest.java new file mode 100644 index 000000000000..fd4fd819618e --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/iris/architecture/IrisServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.iris.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class IrisServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".iris"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java index 402f6501a3c0..4ead87fa669a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java @@ -17,7 +17,6 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; -import de.tum.cit.aet.artemis.iris.domain.settings.IrisHestiaSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisLectureIngestionSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; @@ -56,7 +55,7 @@ void getMissingSettingsForCourse() throws Exception { assertThat(loadedSettings2).isNotNull().usingRecursiveComparison().ignoringFieldsOfTypes(HashSet.class, TreeSet.class).ignoringActualNullFields() .isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(course, false)); assertThat(loadedSettings1).isNotNull().usingRecursiveComparison() - .ignoringFields("id", "course", "irisChatSettings.id", "iris_lecture_ingestion_settings_id", "irisHestiaSettings.id", "irisCompetencyGenerationSettings.id") + .ignoringFields("id", "course", "irisChatSettings.id", "iris_lecture_ingestion_settings_id", "irisCompetencyGenerationSettings.id") .isEqualTo(irisSettingsService.getDefaultSettingsFor(course)); } @@ -71,8 +70,8 @@ void getCourseSettings() throws Exception { var loadedSettings2 = request.get("/api/courses/" + course.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); assertThat(loadedSettings1).isNotNull().usingRecursiveComparison() - .ignoringFields("id", "course", "irisChatSettings.id", "irisLectureIngestionSettings.id", "irisHestiaSettings.id", "irisCompetencyGenerationSettings.id") - .ignoringExpectedNullFields().isEqualTo(loadedSettings2); + .ignoringFields("id", "course", "irisChatSettings.id", "irisLectureIngestionSettings.id", "irisCompetencyGenerationSettings.id").ignoringExpectedNullFields() + .isEqualTo(loadedSettings2); assertThat(loadedSettings1).isNotNull().usingRecursiveComparison().ignoringFields("course") .isEqualTo(irisSettingsRepository.findCourseSettings(course.getId()).orElseThrow()); } @@ -87,10 +86,9 @@ void getCourseSettingsAsUser() throws Exception { request.get("/api/courses/" + course.getId() + "/raw-iris-settings", HttpStatus.FORBIDDEN, IrisSettings.class); var loadedSettings = request.get("/api/courses/" + course.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); - assertThat(loadedSettings) - .isNotNull().usingRecursiveComparison().ignoringCollectionOrderInFields("irisChatSettings.allowedModels", "irisLectureIngestionSettings.allowedModels", - "irisCompetencyGenerationSettings.allowedModels", "irisHestiaSettings.allowedModels") - .ignoringFields("id").isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(course, true)); + assertThat(loadedSettings).isNotNull().usingRecursiveComparison().ignoringCollectionOrderInFields("irisChatSettings.allowedVariants", + "irisLectureIngestionSettings.allowedVariants", "irisCompetencyGenerationSettings.allowedVariants").ignoringFields("id") + .isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(course, true)); } @Test @@ -103,7 +101,6 @@ void updateCourseSettings1() throws Exception { var loadedSettings1 = request.get("/api/courses/" + course.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); loadedSettings1.getIrisChatSettings().setEnabled(false); - loadedSettings1.getIrisHestiaSettings().setEnabled(false); loadedSettings1.getIrisCompetencyGenerationSettings().setEnabled(false); loadedSettings1.getIrisLectureIngestionSettings().setEnabled(false); @@ -115,7 +112,6 @@ void updateCourseSettings1() throws Exception { assertThat(updatedSettings.getId()).isEqualTo(loadedSettings1.getId()); assertThat(updatedSettings.getIrisLectureIngestionSettings().getId()).isEqualTo(loadedSettings1.getIrisLectureIngestionSettings().getId()); assertThat(updatedSettings.getIrisChatSettings().getId()).isEqualTo(loadedSettings1.getIrisChatSettings().getId()); - assertThat(updatedSettings.getIrisHestiaSettings().getId()).isEqualTo(loadedSettings1.getIrisHestiaSettings().getId()); assertThat(updatedSettings.getIrisCompetencyGenerationSettings().getId()).isEqualTo(loadedSettings1.getIrisCompetencyGenerationSettings().getId()); } @@ -129,12 +125,10 @@ void updateCourseSettings2() throws Exception { var loadedSettings1 = request.get("/api/courses/" + course.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); var chatSubSettingsId = loadedSettings1.getIrisChatSettings().getId(); - var hestiaSubSettingsId = loadedSettings1.getIrisHestiaSettings().getId(); var competencyGenerationSubSettingsId = loadedSettings1.getIrisCompetencyGenerationSettings().getId(); var lectureIngestionSubSettingsId = loadedSettings1.getIrisLectureIngestionSettings().getId(); loadedSettings1.setIrisLectureIngestionSettings(null); loadedSettings1.setIrisChatSettings(null); - loadedSettings1.setIrisHestiaSettings(null); loadedSettings1.setIrisCompetencyGenerationSettings(null); var updatedSettings = request.putWithResponseBody("/api/courses/" + course.getId() + "/raw-iris-settings", loadedSettings1, IrisSettings.class, HttpStatus.OK); @@ -145,7 +139,6 @@ void updateCourseSettings2() throws Exception { // Original subsettings should not exist anymore assertThat(irisSubSettingsRepository.findById(lectureIngestionSubSettingsId)).isEmpty(); assertThat(irisSubSettingsRepository.findById(chatSubSettingsId)).isEmpty(); - assertThat(irisSubSettingsRepository.findById(hestiaSubSettingsId)).isEmpty(); assertThat(irisSubSettingsRepository.findById(competencyGenerationSubSettingsId)).isEmpty(); } @@ -159,18 +152,11 @@ void updateCourseSettings3() throws Exception { courseSettings.setCourse(course); courseSettings.setIrisChatSettings(new IrisChatSubSettings()); courseSettings.getIrisChatSettings().setEnabled(true); - courseSettings.getIrisChatSettings().setTemplate(createDummyTemplate()); - courseSettings.getIrisChatSettings().setPreferredModel(null); - - courseSettings.setIrisHestiaSettings(new IrisHestiaSubSettings()); - courseSettings.getIrisHestiaSettings().setEnabled(true); - courseSettings.getIrisHestiaSettings().setTemplate(createDummyTemplate()); - courseSettings.getIrisHestiaSettings().setPreferredModel(null); + courseSettings.getIrisChatSettings().setSelectedVariant(null); courseSettings.setIrisCompetencyGenerationSettings(new IrisCompetencyGenerationSubSettings()); courseSettings.getIrisCompetencyGenerationSettings().setEnabled(true); - courseSettings.getIrisCompetencyGenerationSettings().setTemplate(createDummyTemplate()); - courseSettings.getIrisCompetencyGenerationSettings().setPreferredModel(null); + courseSettings.getIrisCompetencyGenerationSettings().setSelectedVariant(null); courseSettings.setIrisLectureIngestionSettings(new IrisLectureIngestionSubSettings()); courseSettings.getIrisLectureIngestionSettings().setEnabled(true); @@ -179,10 +165,8 @@ void updateCourseSettings3() throws Exception { var loadedSettings1 = request.get("/api/courses/" + course.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); assertThat(updatedSettings).usingRecursiveComparison().ignoringFields("course").isEqualTo(loadedSettings1); - assertThat(loadedSettings1) - .usingRecursiveComparison().ignoringFields("id", "course", "irisChatSettings.id", "irisChatSettings.template.id", "irisLectureIngestionSettings.id", - "irisHestiaSettings.id", "irisHestiaSettings.template.id", "irisCompetencyGenerationSettings.id", "irisCompetencyGenerationSettings.template.id") - .isEqualTo(courseSettings); + assertThat(loadedSettings1).usingRecursiveComparison().ignoringFields("id", "course", "irisChatSettings.id", "irisChatSettings.template.id", + "irisLectureIngestionSettings.id", "irisCompetencyGenerationSettings.id", "irisCompetencyGenerationSettings.template.id").isEqualTo(courseSettings); } @Test @@ -190,8 +174,8 @@ void updateCourseSettings3() throws Exception { void getMissingSettingsForProgrammingExercise() throws Exception { activateIrisGlobally(); activateIrisFor(course); - var loadedSettings1 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); - var loadedSettings2 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); + var loadedSettings1 = request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); + var loadedSettings2 = request.get("/api/exercises/" + programmingExercise.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); programmingExercise = programmingExerciseRepository.findByIdElseThrow(programmingExercise.getId()); @@ -209,12 +193,11 @@ void getProgrammingExerciseSettings() throws Exception { activateIrisFor(programmingExercise); programmingExercise = programmingExerciseRepository.findByIdElseThrow(programmingExercise.getId()); - var loadedSettings1 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); - var loadedSettings2 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); + var loadedSettings1 = request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); + var loadedSettings2 = request.get("/api/exercises/" + programmingExercise.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); - assertThat(loadedSettings1).isNotNull().usingRecursiveComparison().ignoringFields("id", "exercise", "irisChatSettings.id").ignoringExpectedNullFields() - .isEqualTo(loadedSettings2); - assertThat(loadedSettings1.getIrisHestiaSettings()).isNull(); + assertThat(loadedSettings1).isNotNull().usingRecursiveComparison().ignoringFields("id", "exercise", "irisChatSettings.id", "irisTextExerciseChatSettings.id") + .ignoringExpectedNullFields().isEqualTo(loadedSettings2); assertThat(loadedSettings1.getIrisCompetencyGenerationSettings()).isNull(); assertThat(loadedSettings1.getIrisLectureIngestionSettings()).isNull(); assertThat(loadedSettings1).isNotNull().usingRecursiveComparison().ignoringFields("exercise") @@ -229,11 +212,11 @@ void getProgrammingExerciseSettingsAsUser() throws Exception { activateIrisFor(programmingExercise); programmingExercise = programmingExerciseRepository.findByIdElseThrow(programmingExercise.getId()); - request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.FORBIDDEN, IrisSettings.class); - var loadedSettings = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); + request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.FORBIDDEN, IrisSettings.class); + var loadedSettings = request.get("/api/exercises/" + programmingExercise.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class); assertThat(loadedSettings).isNotNull().usingRecursiveComparison().ignoringFields("id") - .ignoringCollectionOrderInFields("irisChatSettings.allowedModels", "irisCompetencyGenerationSettings.allowedModels", "irisHestiaSettings.allowedModels") + .ignoringCollectionOrderInFields("irisChatSettings.allowedVariants", "irisCompetencyGenerationSettings.allowedVariants") .isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(programmingExercise, true)); } @@ -245,13 +228,13 @@ void updateProgrammingExerciseSettings1() throws Exception { activateIrisFor(programmingExercise); programmingExercise = programmingExerciseRepository.findByIdElseThrow(programmingExercise.getId()); - var loadedSettings1 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); + var loadedSettings1 = request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); loadedSettings1.getIrisChatSettings().setEnabled(false); - var updatedSettings = request.putWithResponseBody("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", loadedSettings1, IrisSettings.class, + var updatedSettings = request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", loadedSettings1, IrisSettings.class, HttpStatus.OK); - var loadedSettings2 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); + var loadedSettings2 = request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); assertThat(updatedSettings).isNotNull().isEqualTo(loadedSettings2); // Ids of settings should not have changed @@ -267,15 +250,14 @@ void updateProgrammingExerciseSettings2() throws Exception { activateIrisFor(programmingExercise); programmingExercise = programmingExerciseRepository.findByIdElseThrow(programmingExercise.getId()); - var loadedSettings1 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); + var loadedSettings1 = request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); var chatSubSettingsId = loadedSettings1.getIrisChatSettings().getId(); loadedSettings1.setIrisChatSettings(null); - loadedSettings1.setIrisHestiaSettings(null); - var updatedSettings = request.putWithResponseBody("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", loadedSettings1, IrisSettings.class, + var updatedSettings = request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", loadedSettings1, IrisSettings.class, HttpStatus.OK); - var loadedSettings2 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); + var loadedSettings2 = request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); assertThat(updatedSettings).isNotNull().usingRecursiveComparison().ignoringFields("exercise").isEqualTo(loadedSettings1); assertThat(updatedSettings).isNotNull().usingRecursiveComparison().ignoringFields("exercise").isEqualTo(loadedSettings2); @@ -294,12 +276,11 @@ void updateProgrammingExerciseSettings3() throws Exception { exerciseSettings.setExercise(programmingExercise); exerciseSettings.setIrisChatSettings(new IrisChatSubSettings()); exerciseSettings.getIrisChatSettings().setEnabled(true); - exerciseSettings.getIrisChatSettings().setTemplate(createDummyTemplate()); - exerciseSettings.getIrisChatSettings().setPreferredModel(null); + exerciseSettings.getIrisChatSettings().setSelectedVariant(null); - var updatedSettings = request.putWithResponseBody("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", exerciseSettings, IrisSettings.class, + var updatedSettings = request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", exerciseSettings, IrisSettings.class, HttpStatus.OK); - var loadedSettings1 = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); + var loadedSettings1 = request.get("/api/exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.OK, IrisSettings.class); assertThat(updatedSettings).isNotNull().isEqualTo(loadedSettings1); assertThat(loadedSettings1).usingRecursiveComparison().ignoringFields("id", "exercise", "irisChatSettings.id", "irisChatSettings.template.id").isEqualTo(exerciseSettings); diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureRepositoryArchitectureTest.java new file mode 100644 index 000000000000..44822b7ce77a --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureRepositoryArchitectureTest.java @@ -0,0 +1,19 @@ +package de.tum.cit.aet.artemis.lecture.architecture; + +import java.util.Set; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class LectureRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".lecture"; + } + + // TODO: This method should be removed once all repositories are tested + @Override + protected Set testTransactionalExclusions() { + return Set.of( + "de.tum.cit.aet.artemis.lecture.service.LectureImportService.importLecture(de.tum.cit.aet.artemis.lecture.domain.Lecture, de.tum.cit.aet.artemis.core.domain.Course, boolean)"); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureResourceArchitectureTest.java new file mode 100644 index 000000000000..60c18b0c859a --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.lecture.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class LectureResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".lecture"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureServiceArchitectureTest.java new file mode 100644 index 000000000000..9a95336a0014 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/architecture/LectureServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.lecture.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class LectureServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".lecture"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/service/LectureImportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/service/LectureImportServiceTest.java index 9b653c6c38cf..f300b75c8012 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/service/LectureImportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/service/LectureImportServiceTest.java @@ -68,7 +68,9 @@ void tearDown() { void testImportLectureToCourse() { int lectureCount = this.course2.getLectures().size(); - lectureImportService.importLecture(this.lecture1, this.course2); + lectureImportService.importLecture(this.lecture1, this.course2, true); + + this.course2 = courseRepository.findByIdWithLecturesElseThrow(course2.getId()); assertThat(this.course2.getLectures()).hasSize(lectureCount + 1); diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/AbstractLtiIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/AbstractLtiIntegrationTest.java new file mode 100644 index 000000000000..25ae4e707239 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lti/AbstractLtiIntegrationTest.java @@ -0,0 +1,50 @@ +package de.tum.cit.aet.artemis.lti; + +import org.springframework.beans.factory.annotation.Autowired; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import de.tum.cit.aet.artemis.core.util.RequestUtilService; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; +import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; +import de.tum.cit.aet.artemis.lti.test_repository.OnlineCourseConfigurationTestRepository; +import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; +import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; +import de.tum.cit.aet.artemis.quiz.test_repository.QuizExerciseTestRepository; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; + +public abstract class AbstractLtiIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + // Repositories + @Autowired + protected OnlineCourseConfigurationTestRepository onlineCourseConfigurationRepository; + + // External Repositories + @Autowired + protected QuizExerciseTestRepository quizExerciseTestRepository; + + @Autowired + protected SubmissionTestRepository submissionRepository; + + // External Services + @Autowired + protected QuizExerciseService quizExerciseService; + + @Autowired + protected QuizSubmissionService quizSubmissionService; + + // External Util Services + @Autowired + protected ProgrammingExerciseUtilService programmingExerciseUtilService; + + @Autowired + protected ParticipationUtilService participationUtilService; + + @Autowired + protected RequestUtilService request; + + // Misc + @Autowired + protected ObjectMapper objectMapper; +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/Lti13LaunchIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/Lti13LaunchIntegrationTest.java index cf1b7c35814a..8c861c676c48 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lti/Lti13LaunchIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lti/Lti13LaunchIntegrationTest.java @@ -21,7 +21,6 @@ import org.springframework.security.test.context.support.WithAnonymousUser; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; import io.jsonwebtoken.Jwts; /** @@ -35,7 +34,7 @@ * see LTI message general details * see OpenId Connect launch flow */ -class Lti13LaunchIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class Lti13LaunchIntegrationTest extends AbstractLtiIntegrationTest { private static final SecretKey SIGNING_KEY = Jwts.SIG.HS256.key().build(); diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/LtiDeepLinkingIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/LtiDeepLinkingIntegrationTest.java index e1da79c21df6..071b410e7449 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lti/LtiDeepLinkingIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lti/LtiDeepLinkingIntegrationTest.java @@ -20,7 +20,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; @@ -31,17 +30,12 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.dto.Claims; -import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; import io.jsonwebtoken.Jwts; -class LtiDeepLinkingIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class LtiDeepLinkingIntegrationTest extends AbstractLtiIntegrationTest { private static final String TEST_PREFIX = "ltideeplinkingintegrationtest"; - @Autowired - private ProgrammingExerciseUtilService programmingExerciseUtilService; - private Course course; @BeforeEach diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/LtiIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/LtiIntegrationTest.java index aa8fa6d64241..5536be067a6e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lti/LtiIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lti/LtiIntegrationTest.java @@ -18,7 +18,6 @@ import org.hibernate.Hibernate; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -28,19 +27,14 @@ import org.springframework.util.LinkedMultiValueMap; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class LtiIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class LtiIntegrationTest extends AbstractLtiIntegrationTest { private static final String TEST_PREFIX = "ltiintegrationtest"; - @Autowired - ObjectMapper objectMapper; - @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void dynamicRegistrationFailsAsStudent() throws Exception { diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/LtiQuizIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/LtiQuizIntegrationTest.java index 022dfa6f946d..80ede40edfb2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lti/LtiQuizIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lti/LtiQuizIntegrationTest.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.parallel.Isolated; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -26,50 +25,20 @@ import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import com.fasterxml.jackson.databind.ObjectMapper; - import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.util.RequestUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; -import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.quiz.test_repository.QuizExerciseTestRepository; import de.tum.cit.aet.artemis.quiz.util.QuizExerciseFactory; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; @Isolated -class LtiQuizIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class LtiQuizIntegrationTest extends AbstractLtiIntegrationTest { private static final String TEST_PREFIX = "ltiquizsubmissiontest"; - @Autowired - private QuizExerciseService quizExerciseService; - - @Autowired - private QuizExerciseTestRepository quizExerciseTestRepository; - - @Autowired - private SubmissionTestRepository submissionRepository; - - @Autowired - private ParticipationUtilService participationUtilService; - - @Autowired - private ObjectMapper objectMapper; - - @Autowired - protected RequestUtilService request; - - @Autowired - private QuizSubmissionService quizSubmissionService; - @BeforeEach void init() { doNothing().when(lti13Service).onNewResult(any()); diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/OAuth2JWKSIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/OAuth2JWKSIntegrationTest.java index 86aaf9fc33f9..7523e20af5b5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lti/OAuth2JWKSIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lti/OAuth2JWKSIntegrationTest.java @@ -3,7 +3,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithAnonymousUser; @@ -14,16 +13,11 @@ import de.tum.cit.aet.artemis.core.util.CourseFactory; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.lti.test_repository.OnlineCourseConfigurationTestRepository; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class OAuth2JWKSIntegrationTest extends AbstractLtiIntegrationTest { private static final String TEST_PREFIX = "oauth2jwksintegrationtest"; - @Autowired - private OnlineCourseConfigurationTestRepository onlineCourseConfigurationRepository; - @Test @WithAnonymousUser void getKeysetIsPublicAndReturnsJson() throws Exception { diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiRepositoryArchitectureTest.java new file mode 100644 index 000000000000..ee39f5bea551 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.lti.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class LtiRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".lti"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiResourceArchitectureTest.java new file mode 100644 index 000000000000..424d98b40240 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.lti.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class LtiResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".lti"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiServiceArchitectureTest.java new file mode 100644 index 000000000000..a8851799c808 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.lti.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class LtiServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".lti"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiTestArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiTestArchitectureTest.java new file mode 100644 index 000000000000..ceb15210ada3 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/lti/architecture/LtiTestArchitectureTest.java @@ -0,0 +1,17 @@ +package de.tum.cit.aet.artemis.lti.architecture; + +import de.tum.cit.aet.artemis.lti.AbstractLtiIntegrationTest; +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleTestArchitectureTest; + +class LtiTestArchitectureTest extends AbstractModuleTestArchitectureTest { + + @Override + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".lti"; + } + + @Override + protected Class getAbstractModuleIntegrationTestClass() { + return AbstractLtiIntegrationTest.class; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingServiceTest.java index de205dc54fb1..9c597bbc1cbd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingServiceTest.java @@ -35,7 +35,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.text.domain.TextExercise; @@ -44,7 +44,7 @@ class LtiDeepLinkingServiceTest { @Mock - private ExerciseRepository exerciseRepository; + private ExerciseTestRepository exerciseRepository; @Mock private Lti13TokenRetriever tokenRetriever; diff --git a/src/test/java/de/tum/cit/aet/artemis/modeling/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/modeling/ModelingExerciseIntegrationTest.java index 95087f641584..ed0fd1106333 100644 --- a/src/test/java/de/tum/cit/aet/artemis/modeling/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/modeling/ModelingExerciseIntegrationTest.java @@ -511,7 +511,8 @@ void importModelingExerciseWithExampleSubmissionFromCourseToCourse() throws Exce HttpStatus.CREATED); assertThat(modelingExerciseRepository.findById(importedModelingExercise.getId())).isPresent(); - importedModelingExercise = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(modelingExercise.getId()).orElseThrow(); + importedModelingExercise = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigAndGradingCriteria(modelingExercise.getId()) + .orElseThrow(); var importedExampleSubmission = importedModelingExercise.getExampleSubmissions().stream().findFirst().orElseThrow(); assertThat(importedExampleSubmission.getId()).isEqualTo(exampleSubmission.getId()); @@ -1137,8 +1138,8 @@ void testImportModelingExercise_setGradingInstructionForCopiedFeedback() throws assertThat(importedFeedbackGradingInstruction.getCredits()).isEqualTo(gradingInstruction.getCredits()); assertThat(importedFeedbackGradingInstruction.getUsageCount()).isEqualTo(gradingInstruction.getUsageCount()); - var importedModelingExerciseFromDb = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(importedModelingExercise.getId()) - .orElseThrow(); + var importedModelingExerciseFromDb = modelingExerciseRepository + .findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigAndGradingCriteria(importedModelingExercise.getId()).orElseThrow(); var importedFeedbackGradingInstructionFromDb = importedModelingExerciseFromDb.getExampleSubmissions().stream().findFirst().orElseThrow().getSubmission().getLatestResult() .getFeedbacks().getFirst().getGradingInstruction(); diff --git a/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingRepositoryArchitectureTest.java new file mode 100644 index 000000000000..b4521cef376f --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.modeling.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class ModelingRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".modeling"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingResourceArchitectureTest.java new file mode 100644 index 000000000000..b04c2bd7cffe --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.modeling.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class ModelingResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".modeling"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingServiceArchitectureTest.java new file mode 100644 index 000000000000..51c955064864 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/modeling/architecture/ModelingServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.modeling.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class ModelingServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".modeling"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/modeling/util/ModelingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/modeling/util/ModelingExerciseUtilService.java index 8b8c4c18be85..2fe018ff8f5f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/modeling/util/ModelingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/modeling/util/ModelingExerciseUtilService.java @@ -36,7 +36,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -62,9 +62,6 @@ public class ModelingExerciseUtilService { @Autowired private CourseTestRepository courseRepo; - @Autowired - private ExerciseRepository exerciseRepo; - @Autowired private ModelingExerciseRepository modelingExerciseRepository; @@ -98,6 +95,9 @@ public class ModelingExerciseUtilService { @Autowired private ModelingSubmissionService modelSubmissionService; + @Autowired + private ExerciseTestRepository exerciseRepository; + /** * Creates and saves a Course with a ModelingExercise. The ModelingExercise's DiagramType is set to ClassDiagram. * @@ -112,7 +112,7 @@ public Course addCourseWithOneModelingExercise(String title) { course.addExercises(modelingExercise); course.setMaxComplaintTimeDays(14); course = courseRepo.save(course); - modelingExercise = exerciseRepo.save(modelingExercise); + modelingExercise = exerciseRepository.save(modelingExercise); assertThat(course.getExercises()).as("course contains the exercise").containsExactlyInAnyOrder(modelingExercise); assertThat(modelingExercise.getPresentationScoreEnabled()).as("presentation score is enabled").isTrue(); return course; @@ -219,17 +219,17 @@ public Course addCourseWithDifferentModelingExercises() { course.addExercises(finishedExercise); course = courseRepo.save(course); - exerciseRepo.save(classExercise); - exerciseRepo.save(activityExercise); - exerciseRepo.save(objectExercise); - exerciseRepo.save(useCaseExercise); - exerciseRepo.save(communicationExercise); - exerciseRepo.save(componentExercise); - exerciseRepo.save(deploymentExercise); - exerciseRepo.save(petriNetExercise); - exerciseRepo.save(syntaxTreeExercise); - exerciseRepo.save(flowchartExercise); - exerciseRepo.save(finishedExercise); + exerciseRepository.save(classExercise); + exerciseRepository.save(activityExercise); + exerciseRepository.save(objectExercise); + exerciseRepository.save(useCaseExercise); + exerciseRepository.save(communicationExercise); + exerciseRepository.save(componentExercise); + exerciseRepository.save(deploymentExercise); + exerciseRepository.save(petriNetExercise); + exerciseRepository.save(syntaxTreeExercise); + exerciseRepository.save(flowchartExercise); + exerciseRepository.save(finishedExercise); Course storedCourse = courseRepo.findByIdWithExercisesAndExerciseDetailsAndLecturesElseThrow(course.getId()); Set exercises = storedCourse.getExercises(); assertThat(exercises).as("eleven exercises got stored").hasSize(11); diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java index bba2832d362d..1986d792856d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; @@ -51,7 +51,7 @@ class ContinuousPlagiarismControlServiceTest { - private final ExerciseRepository exerciseRepository = mock(); + private final ExerciseTestRepository exerciseRepository = mock(); private final PlagiarismDetectionService plagiarismChecksService = mock(); diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java index 67208a1bfabe..d08bda49304e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; @@ -47,7 +47,7 @@ public class PlagiarismUtilService { private CourseTestRepository courseRepo; @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepository; @Autowired private StudentParticipationTestRepository studentParticipationRepo; @@ -76,7 +76,7 @@ private TextExercise createTextExercise(String userPrefix, int studentsAmount, E exercise.setMode(mode); course.addExercises(exercise); courseRepo.save(course); - return exerciseRepo.save(exercise); + return exerciseRepository.save(exercise); } private ModelingExercise createModelingExercise(String userPrefix, int studentsAmount, ExerciseMode mode) { @@ -85,7 +85,7 @@ private ModelingExercise createModelingExercise(String userPrefix, int studentsA exercise.setMode(mode); course.addExercises(exercise); courseRepo.save(course); - return exerciseRepo.save(exercise); + return exerciseRepository.save(exercise); } private StudentParticipation saveParticipationAndAddSubmission(StudentParticipation participation, Submission submission) { @@ -115,7 +115,7 @@ public long createTextExerciseAndSimilarSubmissions(String userPrefix, String si saveParticipationAndAddSubmission(participation, submission); exercise.addParticipation(participation); } - exerciseRepo.save(exercise); + exerciseRepository.save(exercise); return exercise.getId(); } @@ -137,7 +137,7 @@ public long createTeamTextExerciseAndSimilarSubmissions(String userPrefix, Strin saveParticipationAndAddSubmission(participation, submission); exercise.addParticipation(participation); } - exerciseRepo.save(exercise); + exerciseRepository.save(exercise); return exercise.getId(); } @@ -159,7 +159,7 @@ public long createModelingExerciseAndSimilarSubmissionsToTheCourse(String userPr saveParticipationAndAddSubmission(participation, submission); exercise.addParticipation(participation); } - exerciseRepo.save(exercise); + exerciseRepository.save(exercise); return exercise.getId(); } @@ -181,7 +181,7 @@ public long createTeamModelingExerciseAndSimilarSubmissionsToTheCourse(String us saveParticipationAndAddSubmission(participation, submission); exercise.addParticipation(participation); } - exerciseRepo.save(exercise); + exerciseRepository.save(exercise); return exercise.getId(); } diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismRepositoryArchitectureTest.java new file mode 100644 index 000000000000..8de1d5770b6a --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.plagiarism.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class PlagiarismRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".plagiarism"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismResourceArchitectureTest.java new file mode 100644 index 000000000000..2011aeb12af9 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.plagiarism.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class PlagiarismResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".plagiarism"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismServiceArchitectureTest.java new file mode 100644 index 000000000000..92dddeb24e65 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/architecture/PlagiarismServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.plagiarism.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class PlagiarismServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".plagiarism"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java index 50e46b7e57db..f23887c80d43 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/CourseGitlabJenkinsIntegrationTest.java @@ -46,7 +46,6 @@ class CourseGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkin @BeforeEach void setup() { - participantScoreScheduleService.activate(); courseTestService.setup(TEST_PREFIX, this); gitlabRequestMockProvider.enableMockingOfRequests(); jenkinsRequestMockProvider.enableMockingOfRequests(jenkinsServer); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java index 3b7b0bad36c8..b38a7248ae5f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java @@ -47,7 +47,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -84,9 +83,6 @@ abstract class ProgrammingExerciseGradingServiceTest extends AbstractSpringInteg @Autowired private ProgrammingExerciseTestCaseTestRepository testCaseRepository; - @Autowired - private ExerciseRepository exerciseRepository; - @Autowired private StudentParticipationTestRepository studentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java index 2d985741a637..cf293bf0740c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -4,7 +4,6 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collections; @@ -95,7 +94,7 @@ void shouldResetExamExerciseTestCases() { private void testResetTestCases(ProgrammingExercise programmingExercise, Visibility expectedVisibility) { String dummyHash = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d"; - when(gitService.getLastCommitHash(any())).thenReturn(ObjectId.fromString(dummyHash)); + doReturn(ObjectId.fromString(dummyHash)).when(gitService).getLastCommitHash(any()); participationUtilService.addProgrammingParticipationWithResultForExercise(programmingExercise, TEST_PREFIX + "student1"); new ArrayList<>(testCaseRepository.findByExerciseId(programmingExercise.getId())).getFirst().weight(50.0); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingRepositoryArchitectureTest.java new file mode 100644 index 000000000000..0a84a5b32363 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingRepositoryArchitectureTest.java @@ -0,0 +1,19 @@ +package de.tum.cit.aet.artemis.programming.architecture; + +import java.util.Set; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class ProgrammingRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".programming"; + } + + // TODO: This method should be removed once all repositories are tested + @Override + protected Set testTransactionalExclusions() { + return Set.of( + "de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportBasicService.importProgrammingExerciseBasis(de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise, de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise)"); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingResourceArchitectureTest.java new file mode 100644 index 000000000000..35bb64028401 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.programming.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class ProgrammingResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".programming"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingServiceArchitectureTest.java new file mode 100644 index 000000000000..0076830b06a1 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/programming/architecture/ProgrammingServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.programming.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class ProgrammingServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".programming"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java index 5ade087731f1..6d5bf267139a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.hestia.util.HestiaUtilTestService; -import de.tum.cit.aet.artemis.programming.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.icl.AbstractLocalCILocalVCIntegrationTest; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.programming.util.LocalRepository; import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseFactory; @@ -53,6 +53,11 @@ void initTestCase() throws Exception { exercise = ProgrammingExerciseFactory.generateProgrammingExercise(ZonedDateTime.now().minusDays(1), ZonedDateTime.now().plusDays(7), course); } + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + @AfterEach void cleanup() throws Exception { solutionRepo.resetLocalRepo(); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportServiceTest.java index 983859d19a09..70e3c6fb8301 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/ProgrammingExerciseGitDiffReportServiceTest.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.hestia.util.HestiaUtilTestService; -import de.tum.cit.aet.artemis.programming.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.icl.AbstractLocalCILocalVCIntegrationTest; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.programming.util.LocalRepository; @@ -58,6 +58,11 @@ class ProgrammingExerciseGitDiffReportServiceTest extends AbstractLocalCILocalVC @Autowired private ProgrammingExerciseGitDiffReportRepository reportRepository; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + @BeforeEach void initTestCase() { userUtilService.addUsers(TEST_PREFIX, 1, 1, 1, 1); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/StructuralTestCaseServiceTest.java index 88b8bef4921d..08d6f5994ac7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/StructuralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/StructuralTestCaseServiceTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.hestia.util.HestiaUtilTestService; -import de.tum.cit.aet.artemis.programming.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.icl.AbstractLocalCILocalVCIntegrationTest; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralTestCaseService; import de.tum.cit.aet.artemis.programming.test_repository.ProgrammingExerciseTestCaseTestRepository; @@ -56,6 +56,11 @@ class StructuralTestCaseServiceTest extends AbstractLocalCILocalVCIntegrationTes private ProgrammingExercise exercise; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + @BeforeEach void initTestCase() { Course course = courseUtilService.addEmptyCourse(); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/TestwiseCoverageReportServiceTest.java index 607ecd3c496f..ba89b52dc804 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/TestwiseCoverageReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/TestwiseCoverageReportServiceTest.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.programming.hestia.util.HestiaUtilTestService; import de.tum.cit.aet.artemis.programming.hestia.util.TestwiseCoverageTestUtil; -import de.tum.cit.aet.artemis.programming.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.icl.AbstractLocalCILocalVCIntegrationTest; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; @@ -69,6 +69,11 @@ class TestwiseCoverageReportServiceTest extends AbstractLocalCILocalVCIntegratio private final LocalRepository solutionRepo = new LocalRepository("main"); + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + @BeforeEach void setup() throws Exception { userUtilService.addUsers(TEST_PREFIX, 1, 0, 0, 1); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/behavioral/BehavioralTestCaseServiceTest.java index 76b08ffd4600..f646dd652ded 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/hestia/behavioral/BehavioralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/hestia/behavioral/BehavioralTestCaseServiceTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.programming.hestia.util.HestiaUtilTestService; -import de.tum.cit.aet.artemis.programming.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.icl.AbstractLocalCILocalVCIntegrationTest; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; @@ -78,6 +78,11 @@ class BehavioralTestCaseServiceTest extends AbstractLocalCILocalVCIntegrationTes private ProgrammingExercise exercise; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + @BeforeEach void initTestCase() { userUtilService.addUsers(TEST_PREFIX, 0, 0, 0, 1); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/AbstractLocalCILocalVCIntegrationTest.java similarity index 92% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/AbstractLocalCILocalVCIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/AbstractLocalCILocalVCIntegrationTest.java index 225208431d5e..0f559f0c3a50 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/AbstractLocalCILocalVCIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import java.time.ZonedDateTime; import java.util.List; @@ -30,9 +30,7 @@ import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; -public class AbstractLocalCILocalVCIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { - - protected static final String TEST_PREFIX = "localvclocalciintegration"; +public abstract class AbstractLocalCILocalVCIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { @Autowired protected TeamRepository teamRepository; @@ -112,20 +110,23 @@ public class AbstractLocalCILocalVCIntegrationTest extends AbstractSpringIntegra protected String auxiliaryRepositorySlug; + protected abstract String getTestPrefix(); + @BeforeEach void initUsersAndExercise() throws JsonProcessingException { // The port cannot be injected into the LocalVCLocalCITestService because {local.server.port} is not available when the class is instantiated. // Thus, "inject" the port from here. localVCLocalCITestService.setPort(port); - List users = userUtilService.addUsers(TEST_PREFIX, 2, 1, 0, 2); - student1Login = TEST_PREFIX + "student1"; + String testPrefix = getTestPrefix(); + List users = userUtilService.addUsers(testPrefix, 2, 1, 0, 2); + student1Login = testPrefix + "student1"; student1 = users.stream().filter(user -> student1Login.equals(user.getLogin())).findFirst().orElseThrow(); - student2Login = TEST_PREFIX + "student2"; - tutor1Login = TEST_PREFIX + "tutor1"; - instructor1Login = TEST_PREFIX + "instructor1"; + student2Login = testPrefix + "student2"; + tutor1Login = testPrefix + "tutor1"; + instructor1Login = testPrefix + "instructor1"; instructor1 = users.stream().filter(user -> instructor1Login.equals(user.getLogin())).findFirst().orElseThrow(); - instructor2Login = TEST_PREFIX + "instructor2"; + instructor2Login = testPrefix + "instructor2"; instructor2 = users.stream().filter(user -> instructor2Login.equals(user.getLogin())).findFirst().orElseThrow(); // Remove instructor2 from the instructor group of the course. instructor2.setGroups(Set.of()); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIIntegrationTest.java index 70d024bab294..7d17a712b4ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; @@ -36,6 +36,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; import org.mockito.ArgumentMatcher; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; @@ -66,9 +68,21 @@ import de.tum.cit.aet.artemis.programming.test_repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.programming.util.LocalRepository; +// TestInstance.Lifecycle.PER_CLASS allows all test methods in this class to share the same instance of the test class. +// This reduces the overhead of repeatedly creating and tearing down a new Spring application context for each test method. +// This is especially useful when the test setup is expensive or when we want to share resources, such as database connections or mock objects, across multiple tests. +// In this case, we want to share the same GitService and UsernamePasswordCredentialsProvider. @TestInstance(TestInstance.Lifecycle.PER_CLASS) + +// ExecutionMode.SAME_THREAD ensures that all tests within this class are executed sequentially in the same thread, rather than in parallel or in a different thread. +// This is important in the context of LocalCI because it avoids potential race conditions or inconsistencies that could arise if multiple test methods are executed +// concurrently. For example, it prevents overloading the LocalCI's result processing system with too many build job results at the same time, which could lead to flaky tests +// or timeouts. By keeping everything in the same thread, we maintain more predictable and stable test behavior, while not increasing the test execution time significantly. +@Execution(ExecutionMode.SAME_THREAD) class LocalCIIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { + private static final String TEST_PREFIX = "localciint"; + @Autowired private LocalVCServletService localVCServletService; @@ -81,18 +95,23 @@ class LocalCIIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { @Autowired private BuildLogEntryService buildLogEntryService; - private LocalRepository studentAssignmentRepository; - - private LocalRepository testsRepository; - - private String commitHash; - @Value("${artemis.user-management.internal-admin.username}") private String localVCUsername; @Value("${artemis.user-management.internal-admin.password}") private String localVCPassword; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + + private LocalRepository studentAssignmentRepository; + + private LocalRepository testsRepository; + + private String commitHash; + @BeforeAll void setupAll() { CredentialsProvider.setDefault(new UsernamePasswordCredentialsProvider(localVCUsername, localVCPassword)); @@ -250,7 +269,8 @@ void testCommitHashNull() { // Should still work because in that case the latest commit should be retrieved from the repository. localVCServletService.processNewPush(null, studentAssignmentRepository.originGit.getRepository()); - localVCLocalCITestService.testLatestSubmission(studentParticipation.getId(), commitHash, 1, false); + // ToDo: Investigate why specifically this test requires so much time (all other << 5s) + localVCLocalCITestService.testLatestSubmission(studentParticipation.getId(), commitHash, 1, false, 120); } @Test @@ -279,7 +299,7 @@ void testProjectTypeIsNull() { @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testCannotFindResults() { + void testResultsNotFound() { ProgrammingExerciseStudentParticipation studentParticipation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login); // Should return a build result that indicates that the build failed. @@ -470,4 +490,16 @@ private void verifyUserNotification(ProgrammingExerciseStudentParticipation part return true; }), Mockito.eq(participation))); } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testCustomCheckoutPaths() { + var buildConfig = programmingExercise.getBuildConfig(); + buildConfig.setAssignmentCheckoutPath("customAssignmentPath"); + ProgrammingExerciseStudentParticipation participation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login); + programmingExerciseBuildConfigRepository.save(programmingExercise.getBuildConfig()); + + localVCServletService.processNewPush(commitHash, studentAssignmentRepository.originGit.getRepository()); + localVCLocalCITestService.testLatestSubmission(participation.getId(), commitHash, 1, false); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java index fe61f9efed96..3b7ced720320 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static org.assertj.core.api.Assertions.assertThat; @@ -42,6 +42,21 @@ class LocalCIResourceIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { + private static final String TEST_PREFIX = "localciresourceint"; + + @Autowired + @Qualifier("hazelcastInstance") + private HazelcastInstance hazelcastInstance; + + @Autowired + private SharedQueueProcessingService sharedQueueProcessingService; + + @Autowired + private BuildLogEntryService buildLogEntryService; + + @Autowired + private PageableSearchUtilService pageableSearchUtilService; + protected BuildJobQueueItem job1; protected BuildJobQueueItem job2; @@ -56,24 +71,16 @@ class LocalCIResourceIntegrationTest extends AbstractLocalCILocalVCIntegrationTe protected BuildJob finishedJobForLogs; - @Autowired - @Qualifier("hazelcastInstance") - private HazelcastInstance hazelcastInstance; - - @Autowired - private SharedQueueProcessingService sharedQueueProcessingService; - - @Autowired - private BuildLogEntryService buildLogEntryService; - protected IQueue queuedJobs; protected IMap processingJobs; protected IMap buildAgentInformation; - @Autowired - private PageableSearchUtilService pageableSearchUtilService; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } @BeforeEach void createJobs() { @@ -84,7 +91,7 @@ void createJobs() { JobTimingInfo jobTimingInfo2 = new JobTimingInfo(ZonedDateTime.now(), ZonedDateTime.now().plusMinutes(1), ZonedDateTime.now().plusMinutes(2)); JobTimingInfo jobTimingInfo3 = new JobTimingInfo(ZonedDateTime.now().minusMinutes(10), ZonedDateTime.now().minusMinutes(9), ZonedDateTime.now().plusSeconds(150)); - BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", "test", "test", null, null, false, false, false, null); + BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", "test", "test", null, null, false, false, false, null, 0, null, null, null); RepositoryInfo repositoryInfo = new RepositoryInfo("test", null, RepositoryType.USER, "test", "test", "test", null, null); job1 = new BuildJobQueueItem("1", "job1", "address1", 1, course.getId(), 1, 1, 1, BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo1, buildConfig, null); @@ -136,11 +143,10 @@ void clearDataStructures() { @WithMockUser(username = TEST_PREFIX + "admin", roles = "ADMIN") void testGetQueuedBuildJobs_returnsJobs() throws Exception { var retrievedJobs = request.get("/api/admin/queued-jobs", HttpStatus.OK, List.class); - assertThat(retrievedJobs).isEmpty(); // Adding a lot of jobs as they get processed very quickly due to mocking queuedJobs.addAll(List.of(job1, job2)); var retrievedJobs1 = request.get("/api/admin/queued-jobs", HttpStatus.OK, List.class); - assertThat(retrievedJobs1).hasSize(2); + assertThat(retrievedJobs1).hasSize(retrievedJobs.size() + 2); } @Test @@ -277,7 +283,7 @@ void testGetFinishedBuildJobs_returnsFilteredJobs() throws Exception { // Create a failed job to filter for JobTimingInfo jobTimingInfo = new JobTimingInfo(ZonedDateTime.now().plusDays(1), ZonedDateTime.now().plusDays(1).plusMinutes(2), ZonedDateTime.now().plusDays(1).plusMinutes(10)); - BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", "test", "test", null, null, false, false, false, null); + BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", "test", "test", null, null, false, false, false, null, 0, null, null, null); RepositoryInfo repositoryInfo = new RepositoryInfo("test", null, RepositoryType.USER, "test", "test", "test", null, null); var failedJob1 = new BuildJobQueueItem("5", "job5", "address1", 1, course.getId(), 1, 1, 1, BuildStatus.FAILED, repositoryInfo, jobTimingInfo, buildConfig, null); var jobResult = new Result().successful(false).rated(true).score(0D).assessmentType(AssessmentType.AUTOMATIC).completionDate(ZonedDateTime.now()); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResultServiceTest.java similarity index 85% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIResultServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResultServiceTest.java index d5d4c75af8fe..a951d065e0cc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResultServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -14,9 +14,16 @@ class LocalCIResultServiceTest extends AbstractLocalCILocalVCIntegrationTest { + private static final String TEST_PREFIX = "localciresultservice"; + @Autowired private LocalCIResultService localCIResultService; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + @Test void testThrowsExceptionWhenResultIsNotLocalCIBuildResult() { var wrongBuildResult = ProgrammingExerciseFactory.generateTestResultDTO("some-name", "some-repository", ZonedDateTime.now().minusSeconds(10), diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIServiceTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIServiceTest.java index 5c723326dcfb..040aef91d87e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static org.assertj.core.api.Assertions.assertThat; @@ -101,7 +101,7 @@ void testReturnCorrectBuildStatus() { ProgrammingExerciseStudentParticipation participation = participationUtilService.addStudentParticipationForProgrammingExercise(exercise, TEST_PREFIX + "student1"); JobTimingInfo jobTimingInfo = new JobTimingInfo(ZonedDateTime.now(), ZonedDateTime.now().plusMinutes(1), ZonedDateTime.now().plusMinutes(2)); - BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", "test", "test", null, null, false, false, false, null); + BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", "test", "test", null, null, false, false, false, null, 0, null, null, null); RepositoryInfo repositoryInfo = new RepositoryInfo("test", null, RepositoryType.USER, "test", "test", "test", null, null); BuildJobQueueItem job1 = new BuildJobQueueItem("1", "job1", "address1", participation.getId(), course.getId(), 1, 1, 1, diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCInfoContributorTest.java similarity index 95% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCInfoContributorTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCInfoContributorTest.java index f5e68ec19d27..decc71dbdaf1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCInfoContributorTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ARTEMIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCIntegrationTest.java index 37358ed515a6..1531a4e2649a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.user.util.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; @@ -26,12 +26,10 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.programming.test_repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.programming.util.LocalRepository; /** @@ -39,8 +37,7 @@ */ class LocalVCIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { - @Autowired - ProgrammingSubmissionTestRepository programmingSubmissionRepository; + private static final String TEST_PREFIX = "localvcint"; private LocalRepository assignmentRepository; @@ -65,6 +62,11 @@ void initRepositories() throws GitAPIException, IOException, URISyntaxException testsRepository = localVCLocalCITestService.createAndConfigureLocalRepository(projectKey1, projectKey1.toLowerCase() + "-tests"); } + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + @AfterEach void removeRepositories() throws IOException { assignmentRepository.resetLocalRepo(); @@ -82,7 +84,16 @@ void testFetchPush_repositoryDoesNotExist() throws IOException, GitAPIException, // Delete the remote repository. someRepository.originGit.close(); - FileUtils.deleteDirectory(someRepository.originRepoFile); + try { + FileUtils.deleteDirectory(someRepository.originRepoFile); + } + catch (IOException exception) { + // JGit creates a lock file in each repository that could cause deletion problems. + if (exception.getMessage().contains("gc.log.lock")) { + return; + } + throw exception; + } // Try to fetch from the remote repository. localVCLocalCITestService.testFetchThrowsException(someRepository.localGit, student1Login, USER_PASSWORD, projectKey, repositorySlug, InvalidRemoteException.class, ""); @@ -127,7 +138,7 @@ void testFetchPush_usingVcsAccessToken() { @Test void testFetchPush_wrongCredentials() throws InvalidNameException { - var student1 = new LdapUserDto().login(TEST_PREFIX + "student1"); + var student1 = new LdapUserDto().login(getTestPrefix() + "student1"); student1.setUid(new LdapName("cn=student1,ou=test,o=lab")); var fakeUser = new LdapUserDto().login(localVCBaseUsername); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCIIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCIIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCIIntegrationTest.java index c171a3f60cca..877ccd6493e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCIIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; @@ -19,7 +19,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.concurrent.TimeUnit; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; @@ -32,15 +31,24 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import com.hazelcast.collection.IQueue; +import com.hazelcast.core.HazelcastInstance; + +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.service.SharedQueueProcessingService; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -55,20 +63,54 @@ import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.service.localci.LocalCITriggerService; +import de.tum.cit.aet.artemis.programming.test_repository.BuildJobTestRepository; import de.tum.cit.aet.artemis.programming.util.LocalRepository; /** * This class contains integration tests for the base repositories (template, solution, tests) and the different types of assignment repositories (student assignment, teaching * assistant assignment, instructor assignment). */ + +// TestInstance.Lifecycle.PER_CLASS allows all test methods in this class to share the same instance of the test class. +// This reduces the overhead of repeatedly creating and tearing down a new Spring application context for each test method. +// This is especially useful when the test setup is expensive or when we want to share resources, such as database connections or mock objects, across multiple tests. +// In this case, we want to share the same GitService and UsernamePasswordCredentialsProvider. @TestInstance(TestInstance.Lifecycle.PER_CLASS) + +// ExecutionMode.SAME_THREAD ensures that all tests within this class are executed sequentially in the same thread, rather than in parallel or in a different thread. +// This is important in the context of LocalCI because it avoids potential race conditions or inconsistencies that could arise if multiple test methods are executed +// concurrently. For example, it prevents overloading the LocalCI's result processing system with too many build job results at the same time, which could lead to flaky tests +// or timeouts. By keeping everything in the same thread, we maintain more predictable and stable test behavior, while not increasing the test execution time significantly. +@Execution(ExecutionMode.SAME_THREAD) class LocalVCLocalCIIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { private static final Logger log = LoggerFactory.getLogger(LocalVCLocalCIIntegrationTest.class); + private static final String TEST_PREFIX = "localvcciint"; + @Autowired private ExamUtilService examUtilService; + @Autowired + private BuildJobTestRepository buildJobRepository; + + @Autowired + protected LocalCITriggerService localCITriggerService; + + @Autowired + private SharedQueueProcessingService sharedQueueProcessingService; + + @Autowired + @Qualifier("hazelcastInstance") + private HazelcastInstance hazelcastInstance; + + @Value("${artemis.user-management.internal-admin.username}") + private String localVCUsername; + + @Value("${artemis.user-management.internal-admin.password}") + private String localVCPassword; + // ---- Repository handles ---- private LocalRepository templateRepository; @@ -82,11 +124,12 @@ class LocalVCLocalCIIntegrationTest extends AbstractLocalCILocalVCIntegrationTes private String teamRepositorySlug; - @Value("${artemis.user-management.internal-admin.username}") - private String localVCUsername; + protected IQueue queuedJobs; - @Value("${artemis.user-management.internal-admin.password}") - private String localVCPassword; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } @BeforeAll void setupAll() { @@ -137,6 +180,8 @@ void initRepositories() throws GitAPIException, IOException, URISyntaxException, doReturn(true).when(ldapTemplate).compare(anyString(), anyString(), any()); localVCLocalCITestService.mockInspectImage(dockerClient); + + queuedJobs = hazelcastInstance.getQueue("buildJobQueue"); } @AfterEach @@ -925,75 +970,93 @@ void testFetchPush_instructorPracticeRepository() throws Exception { practiceRepository.resetLocalRepo(); } - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testBuildPriorityAfterDueDate() throws Exception { - // Set dueDate before now - programmingExercise.setDueDate(ZonedDateTime.now().minusMinutes(1)); - programmingExerciseRepository.save(programmingExercise); - - testPriority(instructor1Login, PRIORITY_OPTIONAL_EXERCISE); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testBuildPriorityBeforeDueDate() throws Exception { - testPriority(student1Login, PRIORITY_NORMAL); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testPriorityRunningExam() throws Exception { - Exam exam = examUtilService.addExamWithExerciseGroup(course, true); - ExerciseGroup exerciseGroup = exam.getExerciseGroups().getFirst(); - - programmingExercise.setCourse(null); - programmingExercise.setExerciseGroup(exerciseGroup); - programmingExercise = programmingExerciseRepository.save(programmingExercise); - - // Exam is running - var now = ZonedDateTime.now(); - exam.setStartDate(now.minusHours(1)); - exam.setEndDate(now.plusHours(1)); - exam.setWorkingTime(2 * 60 * 60); - exam = examRepository.save(exam); - - // Create StudentExam. - StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, student1); - studentExam.setExercises(List.of(programmingExercise)); - studentExam.setWorkingTime(exam.getWorkingTime()); - studentExam.setStartedAndStartDate(now.minusHours(1)); - studentExamRepository.save(studentExam); - - testPriority(student1Login, PRIORITY_EXAM_CONDUCTION); - } - - private void testPriority(String login, int expectedPriority) throws Exception { - ProgrammingExerciseStudentParticipation studentParticipation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login); - - localVCLocalCITestService.testFetchSuccessful(assignmentRepository.localGit, login, projectKey1, assignmentRepositorySlug); - String commitHash = localVCLocalCITestService.commitFile(assignmentRepository.localRepoFile.toPath(), assignmentRepository.localGit); - localVCLocalCITestService.mockInputStreamReturnedFromContainer(dockerClient, LOCALCI_WORKING_DIRECTORY + "/testing-dir/assignment/.git/refs/heads/[^/]+", - Map.of("commitHash", commitHash), Map.of("commitHash", commitHash)); - localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, LOCALCI_WORKING_DIRECTORY + LOCALCI_RESULTS_DIRECTORY); - localVCLocalCITestService.testPushSuccessful(assignmentRepository.localGit, login, projectKey1, assignmentRepositorySlug); - - log.info("Push done"); - - await().atMost(15, TimeUnit.SECONDS).until(() -> { - log.info("Search for a build job for participation id: {}", studentParticipation.getId()); - Optional buildJobOptional = buildJobRepository.findFirstByParticipationIdOrderByBuildStartDateDesc(studentParticipation.getId()); - if (buildJobOptional.isPresent()) { - return true; - } - else { - var allBuildJobs = buildJobRepository.findAll(); - log.info("All found build jobs: {}", allBuildJobs); - return false; - } - }); - - BuildJob buildJob = buildJobRepository.findFirstByParticipationIdOrderByBuildStartDateDesc(studentParticipation.getId()).orElseThrow(); - assertThat(buildJob.getPriority()).isEqualTo(expectedPriority); + @Nested + class BuildJobPriorityTest { + + @BeforeEach + void setUp() { + sharedQueueProcessingService.removeListener(); + } + + @AfterEach + void tearDown() { + queuedJobs.clear(); + log.info("Clear queued jobs done"); + + sharedQueueProcessingService.init(); + log.info("Cleanup queue processing service done"); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testBuildPriorityBeforeDueDate() throws Exception { + testPriority(student1Login, PRIORITY_NORMAL); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testBuildPriorityAfterDueDate() throws Exception { + // Set dueDate before now + programmingExercise.setDueDate(ZonedDateTime.now().minusMinutes(1)); + programmingExerciseRepository.save(programmingExercise); + + testPriority(instructor1Login, PRIORITY_OPTIONAL_EXERCISE); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testPriorityRunningExam() throws Exception { + Exam exam = examUtilService.addExamWithExerciseGroup(course, true); + ExerciseGroup exerciseGroup = exam.getExerciseGroups().getFirst(); + + programmingExercise.setCourse(null); + programmingExercise.setExerciseGroup(exerciseGroup); + programmingExercise = programmingExerciseRepository.save(programmingExercise); + + // Exam is running + var now = ZonedDateTime.now(); + exam.setStartDate(now.minusHours(1)); + exam.setEndDate(now.plusHours(1)); + exam.setWorkingTime(2 * 60 * 60); + exam = examRepository.save(exam); + + // Create StudentExam. + StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, student1); + studentExam.setExercises(List.of(programmingExercise)); + studentExam.setWorkingTime(exam.getWorkingTime()); + studentExam.setStartedAndStartDate(now.minusHours(1)); + studentExamRepository.save(studentExam); + + testPriority(student1Login, PRIORITY_EXAM_CONDUCTION); + } + + private void testPriority(String login, int expectedPriority) throws Exception { + log.info("Creating participation"); + ProgrammingExerciseStudentParticipation studentParticipation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login); + + localVCLocalCITestService.testFetchSuccessful(assignmentRepository.localGit, login, projectKey1, assignmentRepositorySlug); + String commitHash = localVCLocalCITestService.commitFile(assignmentRepository.localRepoFile.toPath(), assignmentRepository.localGit); + localVCLocalCITestService.mockInputStreamReturnedFromContainer(dockerClient, LOCALCI_WORKING_DIRECTORY + "/testing-dir/assignment/.git/refs/heads/[^/]+", + Map.of("commitHash", commitHash), Map.of("commitHash", commitHash)); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, LOCALCI_WORKING_DIRECTORY + LOCALCI_RESULTS_DIRECTORY); + + localCITriggerService.triggerBuild(studentParticipation, false); + log.info("Trigger build done"); + + await().until(() -> { + BuildJobQueueItem buildJobQueueItem = queuedJobs.peek(); + log.info("Poll queue jobs: is null %s".formatted(buildJobQueueItem == null ? "true" : "false")); + if (buildJobQueueItem == null) { + queuedJobs.forEach(item -> log.info("Item in Queue: %s".formatted(item.toString()))); + } + return buildJobQueueItem != null && buildJobQueueItem.participationId() == studentParticipation.getId(); + }); + BuildJobQueueItem buildJobQueueItem = queuedJobs.poll(); + log.info("Polled queue item"); + + assertThat(buildJobQueueItem).isNotNull(); + assertThat(buildJobQueueItem.priority()).isEqualTo(expectedPriority); + log.info("Assertions done"); + } } } diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCIParticipationIntegrationTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCIParticipationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCIParticipationIntegrationTest.java index 449c56a3003c..7552efe686e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCIParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCIParticipationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCITestService.java similarity index 97% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCITestService.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCITestService.java index 313ba5295850..c6d7556e3766 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCITestService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.user.util.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; @@ -54,6 +54,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.assessment.test_repository.ResultTestRepository; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; @@ -91,6 +92,9 @@ public class LocalVCLocalCITestService { @Autowired private ParticipationVcsAccessTokenService participationVcsAccessTokenService; + @Autowired + private ParticipantScoreScheduleService participantScoreScheduleService; + @Autowired private ResultTestRepository resultRepository; @@ -130,6 +134,7 @@ public ProgrammingExerciseStudentParticipation createParticipation(ProgrammingEx participation.setBranch(defaultBranch); programmingExerciseStudentParticipationRepository.save(participation); + log.debug("Created participation with id: {}", participation.getId()); return participation; } @@ -572,13 +577,17 @@ public void testLatestSubmission(Long participationId, String expectedCommitHash int expectedCodeIssueCount, Integer timeoutInSeconds) { // wait for result to be persisted Duration timeoutDuration = timeoutInSeconds != null ? Duration.ofSeconds(timeoutInSeconds) : Duration.ofSeconds(DEFAULT_AWAITILITY_TIMEOUT_IN_SECONDS); - await().atMost(timeoutDuration).until(() -> resultRepository.findFirstWithSubmissionsByParticipationIdOrderByCompletionDateDesc(participationId).isPresent()); + await().atMost(timeoutDuration).until(() -> { + participantScoreScheduleService.executeScheduledTasks(); + await().until(participantScoreScheduleService::isIdle); + return resultRepository.findFirstWithSubmissionsByParticipationIdOrderByCompletionDateDesc(participationId).isPresent(); + }); Authentication auth = SecurityContextHolder.getContext().getAuthentication(); List submissions = programmingSubmissionRepository.findAllByParticipationIdWithResults(participationId); - log.info("Expected commit hash: " + expectedCommitHash); + log.info("Expected commit hash: {}", expectedCommitHash); for (ProgrammingSubmission submission : submissions) { - log.info("Submission with commit hash: " + submission.getCommitHash()); + log.info("Submission with commit hash: {}", submission.getCommitHash()); } await().until(() -> { // get the latest valid submission (!ILLEGAL and with results) of the participation @@ -608,6 +617,10 @@ public void testLatestSubmission(Long participationId, String expectedCommitHash testLatestSubmission(participationId, expectedCommitHash, expectedSuccessfulTestCaseCount, buildFailed, false, 0, null); } + public void testLatestSubmission(Long participationId, String expectedCommitHash, int expectedSuccessfulTestCaseCount, boolean buildFailed, int timeoutInSeconds) { + testLatestSubmission(participationId, expectedCommitHash, expectedSuccessfulTestCaseCount, buildFailed, false, 0, timeoutInSeconds); + } + /** * Perform a push operation and fail if there was no exception. * diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/util/LocalVCServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCServiceTest.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/util/LocalVCServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCServiceTest.java index c0c7481c872e..9c6c71b4d8af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/util/LocalVCServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci.util; +package de.tum.cit.aet.artemis.programming.icl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verifyNoInteractions; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCSshIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCSshIntegrationTest.java similarity index 86% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCSshIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCSshIntegrationTest.java index 419a751e92e3..bca0ed60beb9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/LocalVCSshIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCSshIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; @@ -12,6 +12,7 @@ import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; +import java.util.Objects; import java.util.concurrent.TimeUnit; import org.apache.sshd.client.SshClient; @@ -20,6 +21,7 @@ import org.apache.sshd.common.SshException; import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyPairResourceWriter; +import org.apache.sshd.common.session.helpers.AbstractSession; import org.apache.sshd.server.SshServer; import org.apache.sshd.server.session.ServerSession; import org.junit.jupiter.api.Test; @@ -35,13 +37,20 @@ @Profile(PROFILE_LOCALVC) class LocalVCSshIntegrationTest extends LocalVCIntegrationTest { - private final String hostname = "localhost"; - - private final int port = 7921; + private static final String TEST_PREFIX = "localvcsshint"; @Autowired private SshServer sshServer; + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } + + private final String hostname = "localhost"; + + private final int port = 7921; + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testPushCommandWithoutSession() { @@ -111,8 +120,8 @@ void testAuthenticationFailure() { void testConnectOverSshAndReceivePack() throws IOException, GeneralSecurityException { try (var client = clientConnectToArtemisSshServer()) { assertThat(client).isNotNull(); - var serverSessions = sshServer.getActiveSessions(); - var serverSession = serverSessions.getFirst(); + var user = userTestRepository.getUser(); + var serverSession = getCurrentServerSession(user); final var uploadCommandString = "git-upload-pack '/git/" + projectKey1 + "/" + templateRepositorySlug + "'"; @@ -144,9 +153,13 @@ private SshGitCommand setupCommand(String commandString, ServerSession serverSes return command; } + /** + * Note: Don't count unattached sessions as a potential result from previous tests. + * See {@link org.apache.sshd.server.SshServer#getActiveSessions} + * and {@link org.apache.sshd.common.session.helpers.AbstractSession#getSession}. + */ private SshClient clientConnectToArtemisSshServer() throws GeneralSecurityException, IOException { var serverSessions = sshServer.getActiveSessions(); - var numberOfSessions = serverSessions.size(); localVCLocalCITestService.createParticipation(programmingExercise, student1Login); KeyPair keyPair = setupKeyPairAndAddToUser(); User user = userTestRepository.getUser(); @@ -155,6 +168,7 @@ private SshClient clientConnectToArtemisSshServer() throws GeneralSecurityExcept client.start(); ClientSession clientSession; + int numberOfSessions = serverSessions.size(); try { ConnectFuture connectFuture = client.connect(user.getName(), hostname, port); connectFuture.await(10, TimeUnit.SECONDS); @@ -169,11 +183,20 @@ private SshClient clientConnectToArtemisSshServer() throws GeneralSecurityExcept } serverSessions = sshServer.getActiveSessions(); + var attachedServerSessions = serverSessions.stream().filter(Objects::nonNull).count(); assertThat(clientSession.isAuthenticated()).isTrue(); - assertThat(serverSessions.size()).isEqualTo(numberOfSessions + 1); + assertThat(attachedServerSessions).as("There are more server sessions activated than expected.").isEqualTo(numberOfSessions + 1); return client; } + private AbstractSession getCurrentServerSession(User user) { + var serverSessions = sshServer.getActiveSessions(); + // parallel tests might create additional sessions, we need to be specific + var serverSession = serverSessions.stream().filter(session -> user.getName().equals(session.getUsername())).findFirst(); + + return serverSession.orElseThrow(() -> new IllegalStateException("No server session found for user " + user.getName())); + } + private KeyPair setupKeyPairAndAddToUser() throws GeneralSecurityException, IOException { User user = userTestRepository.getUser(); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/MultipleHostKeyProviderTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/MultipleHostKeyProviderTest.java similarity index 69% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/MultipleHostKeyProviderTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/MultipleHostKeyProviderTest.java index c045a7486981..a386ae6ccc2d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/MultipleHostKeyProviderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/MultipleHostKeyProviderTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; @@ -11,7 +11,14 @@ import de.tum.cit.aet.artemis.programming.service.localvc.ssh.MultipleHostKeyProvider; @Profile(PROFILE_LOCALVC) -class MultipleHostKeyProviderTest extends LocalVCIntegrationTest { +class MultipleHostKeyProviderTest extends AbstractLocalCILocalVCIntegrationTest { + + private static final String TEST_PREFIX = "multiplehostkeyprovider"; + + @Override + protected String getTestPrefix() { + return TEST_PREFIX; + } @Test void testMultipleHostKeyProvider() { diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 16c1077efd2f..f5ec144c6bf0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming; +package de.tum.cit.aet.artemis.programming.icl; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; @@ -24,6 +24,8 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -48,7 +50,17 @@ import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; +// TestInstance.Lifecycle.PER_CLASS allows all test methods in this class to share the same instance of the test class. +// This reduces the overhead of repeatedly creating and tearing down a new Spring application context for each test method. +// This is especially useful when the test setup is expensive or when we want to share resources, such as database connections or mock objects, across multiple tests. +// In this case, we want to share the same GitService and UsernamePasswordCredentialsProvider. @TestInstance(TestInstance.Lifecycle.PER_CLASS) + +// ExecutionMode.SAME_THREAD ensures that all tests within this class are executed sequentially in the same thread, rather than in parallel or in a different thread. +// This is important in the context of LocalCI because it avoids potential race conditions or inconsistencies that could arise if multiple test methods are executed +// concurrently. For example, it prevents overloading the LocalCI's result processing system with too many build job results at the same time, which could lead to flaky tests +// or timeouts. By keeping everything in the same thread, we maintain more predictable and stable test behavior, while not increasing the test execution time significantly. +@Execution(ExecutionMode.SAME_THREAD) class ProgrammingExerciseLocalVCLocalCIIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { private static final String TEST_PREFIX = "progexlocalvclocalci"; @@ -189,6 +201,19 @@ void testCreateProgrammingExercise() throws Exception { verify(competencyProgressService).updateProgressByLearningObjectAsync(eq(createdExercise)); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testCreateProgrammingExercise_Invalid_CheckoutPaths() throws Exception { + // The mock commit hashes don't allow the getPushDate() method in the LocalVCService to retrieve the push date using the commit hash. Thus, this method must be mocked. + doReturn(ZonedDateTime.now().minusSeconds(2)).when(versionControlService).getPushDate(any(), any(), any()); + + ProgrammingExercise newExercise = ProgrammingExerciseFactory.generateProgrammingExercise(ZonedDateTime.now().minusDays(1), ZonedDateTime.now().plusDays(7), course); + newExercise.setProjectType(ProjectType.PLAIN_GRADLE); + newExercise.getBuildConfig().setAssignmentCheckoutPath("/invalid/assignment"); + + request.postWithResponseBody("/api/programming-exercises/setup", newExercise, ProgrammingExercise.class, HttpStatus.BAD_REQUEST); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testUpdateProgrammingExercise() throws Exception { diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/RepositoryUriTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/RepositoryUriTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/RepositoryUriTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/RepositoryUriTest.java index ece90eae3ea9..bf124d494ccc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/RepositoryUriTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/RepositoryUriTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/SharedQueueManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/SharedQueueManagementServiceTest.java similarity index 97% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/SharedQueueManagementServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/SharedQueueManagementServiceTest.java index 23555d8fa783..e0a20b1bed46 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/SharedQueueManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/SharedQueueManagementServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci; +package de.tum.cit.aet.artemis.programming.icl; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/util/TestBuildAgentConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/TestBuildAgentConfiguration.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/programming/localvcci/util/TestBuildAgentConfiguration.java rename to src/test/java/de/tum/cit/aet/artemis/programming/icl/TestBuildAgentConfiguration.java index 936d53302706..00115aac0498 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/localvcci/util/TestBuildAgentConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/TestBuildAgentConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.localvcci.util; +package de.tum.cit.aet.artemis.programming.icl; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java index 1914e2b533f4..95ba2804b3b6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java @@ -2111,7 +2111,7 @@ public void startProgrammingExerciseStudentRetrieveEmptyArtifactPage() throws Ex mockDelegate.resetMockProvider(); mockDelegate.mockRetrieveArtifacts(participation); - var artifact = request.get(PARTICIPATION_BASE_URL + participation.getId() + "/buildArtifact", HttpStatus.OK, byte[].class); + var artifact = request.get(PARTICIPATION_BASE_URL + participation.getId() + "/build-artifact", HttpStatus.OK, byte[].class); assertThat(participation.getInitializationState()).as("Participation should be initialized").isEqualTo(InitializationState.INITIALIZED); assertThat(artifact).as("No build artifact available for this plan").isEmpty(); @@ -2382,7 +2382,7 @@ public void automaticCleanupGitRepositories() { createProgrammingParticipationWithSubmissionAndResult(examExercise, "student3", 100D, ZonedDateTime.now().minusDays(2L), false); createProgrammingParticipationWithSubmissionAndResult(examExercise, "student4", 80D, ZonedDateTime.now().minusDays(6L), false); - automaticProgrammingExerciseCleanupService.cleanupGitRepositoriesOnArtemisServer(); + automaticProgrammingExerciseCleanupService.cleanupGitWorkingCopiesOnArtemisServer(); // Note: at the moment, we cannot easily assert something here, it might be possible to verify mocks on gitService, in case we could define it as SpyBean } diff --git a/src/test/java/de/tum/cit/aet/artemis/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/quiz/QuizSubmissionIntegrationTest.java index 5a56c62d5273..41736fa7c6a9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/quiz/QuizSubmissionIntegrationTest.java @@ -1,12 +1,12 @@ package de.tum.cit.aet.artemis.quiz; +import static de.tum.cit.aet.artemis.core.config.Constants.EXERCISE_TOPIC_ROOT; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; import java.io.IOException; import java.time.Duration; @@ -414,7 +414,7 @@ void testQuizSubmitPractice_badRequest() throws Exception { Result result = request.postWithResponseBody("/api/exercises/" + quizExerciseServer.getId() + "/submissions/practice", quizSubmission, Result.class, HttpStatus.BAD_REQUEST); assertThat(result).isNull(); - verifyNoInteractions(websocketMessagingService); + verifyNoWebsocketMessageForExercise(quizExerciseServer); } @Test @@ -431,7 +431,7 @@ void testQuizSubmitPractice_badRequest_exam() throws Exception { Result result = request.postWithResponseBody("/api/exercises/" + quizExerciseServer.getId() + "/submissions/practice", quizSubmission, Result.class, HttpStatus.BAD_REQUEST); assertThat(result).isNull(); - verifyNoInteractions(websocketMessagingService); + verifyNoWebsocketMessageForExercise(quizExerciseServer); } @Test @@ -451,7 +451,7 @@ void testQuizSubmitPractice_forbidden() throws Exception { QuizExercise quizExercise = QuizExerciseFactory.createQuiz(course, ZonedDateTime.now().minusSeconds(4), null, QuizMode.SYNCHRONIZED); quizExerciseService.save(quizExercise); request.postWithResponseBody("/api/exercises/" + quizExercise.getId() + "/submissions/practice", new QuizSubmission(), Result.class, HttpStatus.FORBIDDEN); - verifyNoInteractions(websocketMessagingService); + verifyNoWebsocketMessageForExercise(quizExercise); } @Test @@ -757,6 +757,12 @@ private QuizExercise setupQuizExerciseParameters() { return quizExercise; } + private void verifyNoWebsocketMessageForExercise(QuizExercise exercise) { + String topic = EXERCISE_TOPIC_ROOT + exercise.getId() + "/newResults"; + verify(websocketMessagingService, never()).sendMessage(eq(topic), any()); + verify(websocketMessagingService, never()).sendMessageToUser(any(), eq(topic), any()); + } + @Nested @Isolated class QuizSubmitLiveModeIsolatedTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizRepositoryArchitectureTest.java new file mode 100644 index 000000000000..83c9e1785cc2 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.quiz.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class QuizRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".quiz"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizResourceArchitectureTest.java new file mode 100644 index 000000000000..03b7b63d4ef2 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.quiz.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class QuizResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".quiz"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizServiceArchitectureTest.java new file mode 100644 index 000000000000..cde158ac9ec2 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/quiz/architecture/QuizServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.quiz.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class QuizServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".quiz"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/quiz/util/QuizExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/quiz/util/QuizExerciseUtilService.java index 261ac6f912b0..2c378bb69fe9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/quiz/util/QuizExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/quiz/util/QuizExerciseUtilService.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; @@ -70,7 +70,7 @@ public class QuizExerciseUtilService { private CourseTestRepository courseRepo; @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepository; @Autowired private QuizSubmissionTestRepository quizSubmissionRepository; @@ -137,7 +137,7 @@ public Course addCourseWithOneQuizExercise(String title) { assertThat(quizExercise.isValid()).isTrue(); course.addExercises(quizExercise); course = courseRepo.save(course); - quizExercise = exerciseRepo.save(quizExercise); + quizExercise = exerciseRepository.save(quizExercise); assertThat(courseRepo.findWithEagerExercisesById(course.getId()).getExercises()).as("course contains the exercise").contains(quizExercise); return course; } diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/TestRepositoryConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/shared/TestRepositoryConfiguration.java index c5a605642d8e..8b3bfbaebfb0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/TestRepositoryConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/TestRepositoryConfiguration.java @@ -20,7 +20,7 @@ "de.tum.cit.aet.artemis.communication.test_repository", "de.tum.cit.aet.artemis.core.test_repository", "de.tum.cit.aet.artemis.exam.test_repository", "de.tum.cit.aet.artemis.exercise.test_repository", "de.tum.cit.aet.artemis.lecture.test_repository", "de.tum.cit.aet.artemis.lti.test_repository", "de.tum.cit.aet.artemis.modeling.test_repository", "de.tum.cit.aet.artemis.programming.test_repository", "de.tum.cit.aet.artemis.quiz.test_repository", - "de.tum.cit.aet.artemis.text.test_repository", "de.tum.cit.aet.artemis.tutorialgroups.test_repository" }, repositoryBaseClass = RepositoryImpl.class) + "de.tum.cit.aet.artemis.text.test_repository", "de.tum.cit.aet.artemis.tutorialgroup.test_repository" }, repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement public class TestRepositoryConfiguration { diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractModuleTestArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractModuleTestArchitectureTest.java new file mode 100644 index 000000000000..cc4f8c80357c --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractModuleTestArchitectureTest.java @@ -0,0 +1,28 @@ +package de.tum.cit.aet.artemis.shared.architecture; + +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMembers; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +public abstract class AbstractModuleTestArchitectureTest extends AbstractArchitectureTest { + + abstract protected String getModulePackageName(); + + abstract protected Class getAbstractModuleIntegrationTestClass(); + + @Test + void integrationTestsShouldExtendAbstractModuleIntegrationTest() { + classes().that().resideInAPackage(ARTEMIS_PACKAGE + "." + getModulePackageName()).and().haveSimpleNameEndingWith("IntegrationTest").should() + .beAssignableTo(getAbstractModuleIntegrationTestClass()).because("All integration tests should extend %s".formatted(getAbstractModuleIntegrationTestClass())) + .check(testClasses); + } + + @Test + void integrationTestsShouldNotAutowireMembers() { + noMembers().that().areAnnotatedWith(Autowired.class).should().beDeclaredInClassesThat().areAssignableTo(getAbstractModuleIntegrationTestClass()).andShould() + .notBeDeclaredIn(getAbstractModuleIntegrationTestClass()) + .because("Integration tests should not autowire members in any class that inherits from %s".formatted(getAbstractModuleIntegrationTestClass())).check(testClasses); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ArchitectureTest.java index 424f5e68b6ac..2cbd4da31b86 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ArchitectureTest.java @@ -81,13 +81,6 @@ /** * This class contains architecture tests that apply for the whole project. - *

    - * For more specific tests please refer to the other architecture test classes: - *

      - *
    • {@link RepositoryArchitectureTest}
      • - *
    • {@link ServiceArchitectureTest}
      • - *
    • {@link ResourceArchitectureTest}
      • - *
    */ class ArchitectureTest extends AbstractArchitectureTest { @@ -108,7 +101,7 @@ void testClassNameAndVisibility() { .areAnnotatedWith(BeforeAll.class).or().areAnnotatedWith(AfterEach.class).or().areAnnotatedWith(AfterAll.class).should().bePublic(); classNames.check(testClasses); - noPublicTestClasses.check(testClasses.that(are(not(simpleNameContaining("Abstract"))))); + noPublicTestClasses.check(testClasses.that(are(not(or(simpleNameContaining("Abstract"), INTERFACES))))); noPublicTests.check(testClasses); } @@ -308,7 +301,7 @@ public void check(JavaClass item, ConditionEvents events) { @Test void testNoRestControllersImported() { final var exceptions = new String[] { "AccountResourceIntegrationTest", "AndroidAppSiteAssociationResourceTest", "AppleAppSiteAssociationResourceTest", - "ResourceArchitectureTest" }; + "AbstractModuleResourceArchitectureTest" }; final var classes = classesExcept(allClasses, exceptions); classes().should(IMPORT_RESTCONTROLLER).check(classes); } diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/RepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleRepositoryArchitectureTest.java similarity index 65% rename from src/test/java/de/tum/cit/aet/artemis/shared/architecture/RepositoryArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleRepositoryArchitectureTest.java index 91355aa292ca..6e3887654163 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/RepositoryArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleRepositoryArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.shared.architecture; +package de.tum.cit.aet.artemis.shared.architecture.module; import static com.tngtech.archunit.base.DescribedPredicate.and; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.INTERFACES; @@ -7,10 +7,6 @@ import static com.tngtech.archunit.core.domain.properties.HasType.Predicates.rawType; import static com.tngtech.archunit.lang.SimpleConditionEvent.violated; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; -import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods; -import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; -import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMethods; -import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; import java.util.Set; @@ -40,30 +36,31 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.repository.base.RepositoryImpl; +import de.tum.cit.aet.artemis.shared.architecture.AbstractArchitectureTest; -/** - * This class contains architecture tests for the persistence layer. - */ -class RepositoryArchitectureTest extends AbstractArchitectureTest { +public abstract class AbstractModuleRepositoryArchitectureTest extends AbstractArchitectureTest implements ModuleArchitectureTest { @Test void shouldBeNamedRepository() { - ArchRule rule = classes().that().areAnnotatedWith(Repository.class).should().haveSimpleNameEndingWith("Repository") + ArchRule rule = classesOfThisModuleThat().areAnnotatedWith(Repository.class).should().haveSimpleNameEndingWith("Repository") .because("repositories should have a name ending with 'Repository'."); - rule.check(productionClasses); + // allow empty should since some modules do not have repositories + rule.allowEmptyShould(true).check(allClasses); } @Test void shouldBeInRepositoryPackage() { - ArchRule rule = classes().that().areAnnotatedWith(Repository.class).should().resideInAPackage("..repository..") + ArchRule rule = classesOfThisModuleThat().areAnnotatedWith(Repository.class).should().resideInAPackage("..repository..") .because("repositories should be in the package 'repository'."); - rule.check(productionClasses); + // allow empty should since some modules do not have repositories + rule.allowEmptyShould(true).check(productionClasses); } @Test void testJPQLStyle() { - var queryRule = methods().that().areAnnotatedWith(Query.class).should(USE_UPPER_CASE_SQL_STYLE).because("@Query content should follow the style guide"); - queryRule.check(allClasses); + var queryRule = methodsOfThisModuleThat().areAnnotatedWith(Query.class).should(USE_UPPER_CASE_SQL_STYLE).because("@Query content should follow the style guide"); + // allow empty should since some modules do not have any @Query methods + queryRule.allowEmptyShould(true).check(allClasses); } // See https://openjpa.apache.org/builds/1.2.3/apache-openjpa/docs/jpa_langref.html#jpa_langref_from_identifiers @@ -95,7 +92,7 @@ public void check(JavaMethod item, ConditionEvents events) { @Test void testNoUnusedRepositoryMethods() { - ArchRule unusedMethods = noMethods().that().areDeclaredInClassesThat().areInterfaces().and().areDeclaredInClassesThat().areAnnotatedWith(Repository.class) + ArchRule unusedMethods = noMethodsOfThisModuleThat().areDeclaredInClassesThat().areInterfaces().and().areDeclaredInClassesThat().areAnnotatedWith(Repository.class) .should(new ArchCondition<>("not be referenced") { @Override @@ -106,49 +103,60 @@ public void check(JavaMethod javaMethod, ConditionEvents conditionEvents) { } } }).because("unused methods should be removed from repositories to keep a clean code base."); - unusedMethods.check(allClasses); + // allow empty should since some modules do not have repositories + unusedMethods.allowEmptyShould(true).check(allClasses); } @Test void testNoEntityGraphsOnQueries() { - ArchRule noEntityGraphsOnQueries = noMethods().that().areAnnotatedWith(Query.class).and().areDeclaredInClassesThat().areInterfaces().and().areDeclaredInClassesThat() - .areAnnotatedWith(Repository.class).should().beAnnotatedWith(EntityGraph.class) + ArchRule noEntityGraphsOnQueries = noMethodsOfThisModuleThat().areAnnotatedWith(Query.class).and().areDeclaredInClassesThat().areInterfaces().and() + .areDeclaredInClassesThat().areAnnotatedWith(Repository.class).should().beAnnotatedWith(EntityGraph.class) .because("Spring Boot 3 ignores EntityGraphs on JPQL queries. You need to integrate a JOIN FETCH into the query."); - noEntityGraphsOnQueries.check(productionClasses); + // allow empty should since some modules do not have any @Query methods + noEntityGraphsOnQueries.allowEmptyShould(true).check(productionClasses); } @Test void testRepositoryParamAnnotation() { - var useParamInQueries = methods().that().areAnnotatedWith(Query.class).should(haveAllParametersAnnotatedWithUnless(rawType(Param.class), type(Pageable.class))); - var notUseParamOutsideQueries = methods().that().areNotAnnotatedWith(Query.class).should(notHaveAnyParameterAnnotatedWith(rawType(Param.class))); - useParamInQueries.check(productionClasses); - notUseParamOutsideQueries.check(productionClasses); + var useParamInQueries = methodsOfThisModuleThat().areAnnotatedWith(Query.class).should(haveAllParametersAnnotatedWithUnless(rawType(Param.class), type(Pageable.class))); + var notUseParamOutsideQueries = methodsOfThisModuleThat().areNotAnnotatedWith(Query.class).should(notHaveAnyParameterAnnotatedWith(rawType(Param.class))); + // allow empty should since some modules do not have any @Query methods + useParamInQueries.allowEmptyShould(true).check(productionClasses); + notUseParamOutsideQueries.allowEmptyShould(true).check(productionClasses); } @Test void persistenceShouldNotAccessServices() { - noClasses().that().areAnnotatedWith(Repository.class).should().accessClassesThat().areAnnotatedWith(Service.class).check(allClasses); + // allow empty should since some modules do not have repositories + noClassesOfThisModuleThat().areAnnotatedWith(Repository.class).should().accessClassesThat().areAnnotatedWith(Service.class).allowEmptyShould(true).check(allClasses); + } + + // TODO: This method should be removed once all repositories are tested + protected Set testTransactionalExclusions() { + return Set.of(); } @Test void testTransactional() { var classesPredicated = and(INTERFACES, annotatedWith(Repository.class)); - var transactionalRule = methods().that().areAnnotatedWith(simpleNameAnnotation("Transactional")).should().beDeclaredInClassesThat(classesPredicated); - - // TODO: In the future we should reduce this number and eventually replace it by transactionalRule.check(allClasses) - // The following methods currently violate this rule: - // Method - // Method - // Method - // Method - // Method - var result = transactionalRule.evaluate(allClasses); - assertThat(result.getFailureReport().getDetails()).hasSize(5); + var transactionalRule = methodsOfThisModuleThat().areAnnotatedWith(simpleNameAnnotation("Transactional")).should().beDeclaredInClassesThat(classesPredicated) + .orShould(new ArchCondition<>("methods excluded from this rule") { + + @Override + public void check(JavaMethod javaMethod, ConditionEvents events) { + if (!testTransactionalExclusions().contains(javaMethod.getFullName())) { + events.add(violated(javaMethod, "Method %s should not be annotated with @Transactional".formatted(javaMethod.getFullName()))); + } + } + }); + + // allow empty should since some modules do not have any @Transactional methods + transactionalRule.allowEmptyShould(true).check(allClasses); } @Test void testOnlySpringTransactionalAnnotation() { - ArchRule onlySpringTransactionalAnnotation = noMethods().should().beAnnotatedWith(javax.transaction.Transactional.class).orShould() + ArchRule onlySpringTransactionalAnnotation = noMethodsOfThisModule().should().beAnnotatedWith(javax.transaction.Transactional.class).orShould() .beAnnotatedWith(jakarta.transaction.Transactional.class) .because("Only Spring's Transactional annotation should be used as the usage of the other two is not reliable."); onlySpringTransactionalAnnotation.check(allClasses); @@ -156,20 +164,26 @@ void testOnlySpringTransactionalAnnotation() { @Test void repositoriesImplementArtemisJpaRepository() { - classes().that().areAssignableTo(JpaRepository.class).and().doNotBelongToAnyOf(RepositoryImpl.class).should().beAssignableTo(ArtemisJpaRepository.class).check(allClasses); + // allow empty should since some modules do not have repositories + classesOfThisModuleThat().areAssignableTo(JpaRepository.class).and().doNotBelongToAnyOf(RepositoryImpl.class).should().beAssignableTo(ArtemisJpaRepository.class) + .allowEmptyShould(true).check(allClasses); } @Test void orElseThrowShouldNotBeCalled() { - noClasses().that().areAssignableTo(ArtemisJpaRepository.class).should().callMethod(Optional.class, "orElseThrow").orShould() - .callMethod(Optional.class, "orElseThrow", Supplier.class).because("ArtemisJpaRepository offers the method getValueElseThrow for this use case").check(allClasses); + // allow empty should since some modules do not have any repositories + noClassesOfThisModuleThat().areAssignableTo(ArtemisJpaRepository.class).should().callMethod(Optional.class, "orElseThrow").orShould() + .callMethod(Optional.class, "orElseThrow", Supplier.class).because("ArtemisJpaRepository offers the method getValueElseThrow for this use case") + .allowEmptyShould(true).check(allClasses); } @Test void usedInProductionCode() { var excludedMethods = Set.of("de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository.find(java.lang.String, java.time.Instant, java.lang.String)"); - methods().that().areDeclaredInClassesThat().areAnnotatedWith(Repository.class).and().areDeclaredInClassesThat(new DescribedPredicate<>("") { + + // allow empty should since some modules do not have repositories + methodsOfThisModuleThat().areDeclaredInClassesThat().areAnnotatedWith(Repository.class).and().areDeclaredInClassesThat(new DescribedPredicate<>("") { @Override public boolean test(JavaClass javaClass) { @@ -189,25 +203,56 @@ public void check(JavaMethod javaMethod, ConditionEvents conditionEvents) { conditionEvents.add(SimpleConditionEvent.violated(javaMethod, "Method " + javaMethod.getFullName() + " is not used in production code")); } } - }).because("methods that are not used in production code should be moved to test repositories").check(allClasses); + }).because("methods that are not used in production code should be moved to test repositories").allowEmptyShould(true).check(allClasses); } @Test void enforcePrimaryBeanAnnotationOnTestRepositories() { - classes().that().resideInAPackage("..test_repository..").should().beAnnotatedWith(Primary.class) - .because("Test repositories should be annotated with @Primary to override the production repository beans").check(testClasses); + // allow empty should since some modules do not have repositories + classesOfThisModuleThat().resideInAPackage("..test_repository..").should().beAnnotatedWith(Primary.class) + .because("Test repositories should be annotated with @Primary to override the production repository beans").allowEmptyShould(true).check(testClasses); } @Test void enforceUsageOfTestRepository() { - classes().should(notUseRepositoriesWithSubclasses()).because("Test Repositories should be used over production repositories, if such a repository exist.") + classesOfThisModule().should(notUseRepositoriesWithSubclasses()).because("Test Repositories should be used over production repositories, if such a repository exist.") .check(testClasses); } + private ArchCondition notUseRepositoriesWithSubclasses() { + return new ArchCondition<>("not use repositories with subclasses") { + + @Override + public void check(JavaClass testClass, ConditionEvents events) { + for (JavaField field : testClass.getAllFields()) { + JavaType fieldType = field.getRawType(); + + if (isRepository(fieldType)) { + JavaClass repositoryClass = fieldType.toErasure(); + + if (!repositoryClass.getSubclasses().isEmpty()) { + String message = String.format("Test class %s uses repository %s which has subclasses: %s", testClass.getName(), repositoryClass.getName(), + repositoryClass.getSubclasses()); + events.add(SimpleConditionEvent.violated(testClass, message)); + } + } + } + } + + private boolean isRepository(JavaType javaType) { + JavaClass javaClass = javaType.toErasure(); + // Check if the type is a repository by seeing if it implements JpaRepository + return javaClass.isAssignableTo(JpaRepository.class); + // Alternatively, if your repositories are in a specific package, you can use: + // return javaClass.getPackageName().startsWith("com.yourapp.repositories"); + } + }; + } + @Test void enforceStructureOfTestRepositories() { var excludedRepositories = Set.of("de.tum.cit.aet.artemis.lti.test_repository.OnlineCourseConfigurationTestRepository"); // OnlineCourseConfigurationTestRepository does not - // have an accompanying production repository + // have an accompanying production repository classes().that().resideInAPackage("..test_repository..").should().beInterfaces().andShould().beAssignableTo(JpaRepository.class) .andShould(new ArchCondition<>("extend a repository from production code with matching name excluding last 'Test'") { @@ -231,7 +276,14 @@ public void check(JavaClass javaClass, ConditionEvents events) { }).check(testClasses); } - // Utility method to replace the last occurrence of a substring + /** + * Utility method to replace the last occurrence of a substring. + * + * @param string The string to replace the substring in. + * @param substring The substring to replace. + * @param replacement The replacement for the substring. + * @return The string with the last occurrence of the substring replaced. + */ private String replaceLast(String string, String substring, String replacement) { int lastIndex = string.lastIndexOf(substring); if (lastIndex == -1) { @@ -241,34 +293,4 @@ private String replaceLast(String string, String substring, String replacement) sb.replace(lastIndex, lastIndex + substring.length(), replacement); return sb.toString(); } - - private ArchCondition notUseRepositoriesWithSubclasses() { - return new ArchCondition<>("not use repositories with subclasses") { - - @Override - public void check(JavaClass testClass, ConditionEvents events) { - for (JavaField field : testClass.getAllFields()) { - JavaType fieldType = field.getRawType(); - - if (isRepository(fieldType)) { - JavaClass repositoryClass = fieldType.toErasure(); - - if (!repositoryClass.getSubclasses().isEmpty()) { - String message = String.format("Test class %s uses repository %s which has subclasses: %s", testClass.getName(), repositoryClass.getName(), - repositoryClass.getSubclasses()); - events.add(SimpleConditionEvent.violated(testClass, message)); - } - } - } - } - - private boolean isRepository(JavaType javaType) { - JavaClass javaClass = javaType.toErasure(); - // Check if the type is a repository by seeing if it implements JpaRepository - return javaClass.isAssignableTo(JpaRepository.class); - // Alternatively, if your repositories are in a specific package, you can use: - // return javaClass.getPackageName().startsWith("com.yourapp.repositories"); - } - }; - } } diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleResourceArchitectureTest.java similarity index 54% rename from src/test/java/de/tum/cit/aet/artemis/shared/architecture/ResourceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleResourceArchitectureTest.java index a098dbde4535..5442e6d26c4b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleResourceArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.shared.architecture; +package de.tum.cit.aet.artemis.shared.architecture.module; import static com.tngtech.archunit.lang.ConditionEvent.createMessage; import static com.tngtech.archunit.lang.SimpleConditionEvent.violated; @@ -8,9 +8,11 @@ import java.lang.annotation.Annotation; import java.util.Set; import java.util.function.Consumer; +import java.util.regex.Pattern; import org.junit.jupiter.api.Test; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; @@ -31,31 +33,39 @@ import com.tngtech.archunit.lang.ConditionEvents; import de.tum.cit.aet.artemis.communication.web.LinkPreviewResource; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.shared.architecture.AbstractArchitectureTest; -class ResourceArchitectureTest extends AbstractArchitectureTest { +public abstract class AbstractModuleResourceArchitectureTest extends AbstractArchitectureTest implements ModuleArchitectureTest { + + private static final Pattern KEBAB_CASE_PATH_PATTERN = Pattern.compile("^(\\.?[a-z0-9]+(-[a-z0-9]+)*|\\{[^}]+})(/(([a-z0-9]+(-[a-z0-9]+)*|\\{[^}]+})))*(\\.json|/\\*)?$"); @Test void shouldBeNamedResource() { - ArchRule rule = classes().that().areAnnotatedWith(RestController.class).should().haveSimpleNameEndingWith("Resource") + ArchRule rule = classesOfThisModuleThat().areAnnotatedWith(RestController.class).should().haveSimpleNameEndingWith("Resource") .because("resources should have a name ending with 'Resource'."); - rule.check(productionClasses); + + // allow empty should since some modules do not have any REST controllers + rule.allowEmptyShould(true).check(productionClasses); } @Test void shouldBeInResourcePackage() { - ArchRule rule = classes().that().areAnnotatedWith(RestController.class).should().resideInAPackage("..web..").because("resources should be in the package 'rest'."); - rule.check(productionClasses); + ArchRule rule = classesOfThisModuleThat().areAnnotatedWith(RestController.class).should().resideInAPackage("..web..").because("resources should be in the package 'web'."); + // allow empty should since some modules do not have any REST controllers + rule.allowEmptyShould(true).check(productionClasses); } @Test void allPublicMethodsShouldReturnResponseEntity() { // TODO: We want to move away from ModelAndView. Once all occurrences are removed, this test needs to be adjusted. // REST controller methods should return ResponseEntity ("normal" endpoints) or ModelAndView (for redirects) - ArchRule rule = methods().that().areDeclaredInClassesThat().areAnnotatedWith(RestController.class).and().arePublic().should().haveRawReturnType(ResponseEntity.class) - .orShould().haveRawReturnType(ModelAndView.class); + ArchRule rule = methodsOfThisModuleThat().areDeclaredInClassesThat().areAnnotatedWith(RestController.class).and().arePublic().should() + .haveRawReturnType(ResponseEntity.class).orShould().haveRawReturnType(ModelAndView.class); // We exclude the LinkPreviewResource from this check, as it is a special case that requires the serialization of the response which is not possible with ResponseEntities JavaClasses classes = classesExcept(allClasses, LinkPreviewResource.class); - rule.check(classes); + // allow empty should since some modules do not have any REST controllers + rule.allowEmptyShould(true).check(classes); } private static final Set> annotationClasses = Set.of(GetMapping.class, PatchMapping.class, PostMapping.class, PutMapping.class, DeleteMapping.class, @@ -63,12 +73,38 @@ void allPublicMethodsShouldReturnResponseEntity() { @Test void shouldCorrectlyUseRequestMappingAnnotations() { - classes().that().areAnnotatedWith(RequestMapping.class).should(haveCorrectRequestMappingPathForClasses()).check(productionClasses); + // allow empty should since some modules do not have any REST controllers + classesOfThisModuleThat().areAnnotatedWith(RequestMapping.class).should(haveCorrectRequestMappingPathForClasses()).allowEmptyShould(true).check(productionClasses); for (var annotation : annotationClasses) { methods().that().areAnnotatedWith(annotation).should(haveCorrectRequestMappingPathForMethods(annotation)).allowEmptyShould(true).check(productionClasses); } } + @Test + void testUseKebabCaseForRestEndpoints() { + for (var annotation : annotationClasses) { + methods().should(useKebabCaseForRestAnnotations(annotation)).check(productionClasses); + } + } + + protected ArchCondition useKebabCaseForRestAnnotations(Class annotationClass) { + return new ArchCondition<>("use kebab case for rest mapping annotations") { + + @Override + public void check(JavaMethod item, ConditionEvents events) { + var restMappingAnnotation = item.getAnnotations().stream() + .filter(annotation -> ((JavaClass) annotation.getType()).getSimpleName().equals(annotationClass.getSimpleName())).findFirst(); + + if (restMappingAnnotation.isPresent()) { + String restURL = ((String[]) restMappingAnnotation.get().tryGetExplicitlyDeclaredProperty("value").get())[0]; + if (!KEBAB_CASE_PATH_PATTERN.matcher(restURL).matches()) { + events.add(violated(item, String.format("\"%s\" violates rule to only use kebab case for REST annotations in %s", restURL, item.getFullName()))); + } + } + } + }; + } + private ArchCondition haveCorrectRequestMappingPathForClasses() { return new ArchCondition<>("correctly use @RequestMapping") { @@ -116,4 +152,29 @@ private & HasDescription & HasSourceCodeLocation> v tester.accept(value); } } + + @Test + void testClassWithEnforceAdminInCorrectlyNamed() { + ArchRule annotationToNameRule = classesOfThisModuleThat().areAnnotatedWith(EnforceAdmin.class).should().haveSimpleNameStartingWith("Admin") + .andShould(new ArchCondition<>("Have package name ending with .admin") { + + @Override + public void check(JavaClass item, ConditionEvents events) { + if (!item.getPackage().getName().endsWith(".admin")) { + events.add(violated(item, "Classes annotated with @EnforceAdmin should be in an admin subpackage.")); + } + } + }); + annotationToNameRule.allowEmptyShould(true).check(productionClasses); + + ArchRule nameToAnnotationRule = classesOfThisModuleThat().haveSimpleNameStartingWith("Admin").should().beAnnotatedWith(EnforceAdmin.class); + nameToAnnotationRule.allowEmptyShould(true).check(productionClasses); + } + + @Test + void testNoOverrideOfEnforceAdmin() { + ArchRule rule = methodsOfThisModuleThat().areDeclaredInClassesThat().areAnnotatedWith(EnforceAdmin.class).should().notBeAnnotatedWith(EnforceAdmin.class).andShould() + .notBeMetaAnnotatedWith(PreAuthorize.class); + rule.allowEmptyShould(true).check(productionClasses); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleServiceArchitectureTest.java similarity index 62% rename from src/test/java/de/tum/cit/aet/artemis/shared/architecture/ServiceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleServiceArchitectureTest.java index 32d955cc8a32..cd43dd981e51 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ServiceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleServiceArchitectureTest.java @@ -1,11 +1,9 @@ -package de.tum.cit.aet.artemis.shared.architecture; +package de.tum.cit.aet.artemis.shared.architecture.module; import static com.tngtech.archunit.core.domain.JavaModifier.ABSTRACT; import static com.tngtech.archunit.core.domain.JavaModifier.FINAL; import static com.tngtech.archunit.lang.SimpleConditionEvent.violated; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; -import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods; -import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import org.junit.jupiter.api.Test; import org.springframework.scheduling.annotation.Async; @@ -26,18 +24,20 @@ import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; import de.tum.cit.aet.artemis.programming.service.localci.LocalCIWebsocketMessagingService; import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; +import de.tum.cit.aet.artemis.shared.architecture.AbstractArchitectureTest; -class ServiceArchitectureTest extends AbstractArchitectureTest { +public abstract class AbstractModuleServiceArchitectureTest extends AbstractArchitectureTest implements ModuleArchitectureTest { @Test void shouldBeNamedService() { - ArchRule rule = classes().that().areAnnotatedWith(Service.class).should().haveSimpleNameEndingWith("Service").because("services should have a name ending with 'Service'."); + ArchRule rule = classesOfThisModuleThat().areAnnotatedWith(Service.class).should().haveSimpleNameEndingWith("Service") + .because("services should have a name ending with 'Service'."); rule.check(productionClasses); } @Test void shouldBeInServicePackage() { - ArchRule rule = classes().that().areAnnotatedWith(Service.class).should().resideInAPackage("..service..").because("services should be in the package 'service'."); + ArchRule rule = classesOfThisModuleThat().areAnnotatedWith(Service.class).should().resideInAPackage("..service..").because("services should be in the package 'service'."); final var exceptions = new Class[] { MigrationService.class, SecurityMetersService.class, DomainUserDetailsService.class, OAuth2JWKSService.class, JWTCookieService.class, GitDiffReportParserService.class, ResultWebsocketService.class, LocalCIWebsocketMessagingService.class }; final var classes = classesExcept(productionClasses, exceptions); @@ -46,30 +46,30 @@ void shouldBeInServicePackage() { @Test void testNoWrongServiceImports() { - ArchRule rule = noClasses().should().dependOnClassesThat().resideInAnyPackage("org.jvnet.hk2.annotations") + ArchRule rule = noClassesOfThisModule().should().dependOnClassesThat().resideInAnyPackage("org.jvnet.hk2.annotations") .because("this is the wrong service class, use org.springframework.stereotype.Service."); rule.check(allClasses); } @Test void testCorrectServiceAnnotation() { - classes().that().resideInAPackage("de.tum.cit.aet.artemis.*.service..").and().haveSimpleNameEndingWith("Service").and().areNotInterfaces().and().doNotHaveModifier(ABSTRACT) - .should().beAnnotatedWith(org.springframework.stereotype.Service.class) + classesOfThisModuleThat().resideInAPackage("de.tum.cit.aet.artemis.*.service..").and().haveSimpleNameEndingWith("Service").and().areNotInterfaces().and() + .doNotHaveModifier(ABSTRACT).should().beAnnotatedWith(org.springframework.stereotype.Service.class) .because("services should be consistently managed by Spring's dependency injection container.").check(allClasses); - classes().that().haveSimpleNameEndingWith("Service").should().notBeAnnotatedWith(Component.class).check(allClasses); - classes().that().haveSimpleNameEndingWith("Service").should().notBeAnnotatedWith(RestController.class).check(allClasses); - classes().that().haveSimpleNameEndingWith("Service").should().notHaveModifier(FINAL).check(allClasses); + classesOfThisModuleThat().haveSimpleNameEndingWith("Service").should().notBeAnnotatedWith(Component.class).check(allClasses); + classesOfThisModuleThat().haveSimpleNameEndingWith("Service").should().notBeAnnotatedWith(RestController.class).check(allClasses); + classesOfThisModuleThat().haveSimpleNameEndingWith("Service").should().notHaveModifier(FINAL).check(allClasses); - classes().that().areAnnotatedWith(Service.class).should().haveSimpleNameEndingWith("Service").check(allClasses); - classes().that().areAnnotatedWith(Service.class).should().notBeAnnotatedWith(Component.class).check(allClasses); - classes().that().areAnnotatedWith(Service.class).should().notBeAnnotatedWith(RestController.class).check(allClasses); - classes().that().areAnnotatedWith(Service.class).should().notHaveModifier(FINAL).check(allClasses); + classesOfThisModuleThat().areAnnotatedWith(Service.class).should().haveSimpleNameEndingWith("Service").check(allClasses); + classesOfThisModuleThat().areAnnotatedWith(Service.class).should().notBeAnnotatedWith(Component.class).check(allClasses); + classesOfThisModuleThat().areAnnotatedWith(Service.class).should().notBeAnnotatedWith(RestController.class).check(allClasses); + classesOfThisModuleThat().areAnnotatedWith(Service.class).should().notHaveModifier(FINAL).check(allClasses); } @Test void testCorrectAsyncCalls() { - var noCallsFromOwnClass = methods().that().areAnnotatedWith(Async.class).should(new ArchCondition<>("not be called within the same class") { + var noCallsFromOwnClass = methodsOfThisModuleThat().areAnnotatedWith(Async.class).should(new ArchCondition<>("not be called within the same class") { @Override public void check(JavaMethod javaMethod, ConditionEvents conditionEvents) { @@ -85,6 +85,8 @@ public void check(JavaMethod javaMethod, ConditionEvents conditionEvents) { } }).because("Methods annotated with @Async are meant to be executed in a new thread." + " The thread gets created in a Spring proxy subclass and requires the method to only be called from the outside."); - noCallsFromOwnClass.check(productionClasses); + + // allow empty should since some modules do not have any @Async methods + noCallsFromOwnClass.allowEmptyShould(true).check(productionClasses); } } diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleTestArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleTestArchitectureTest.java new file mode 100644 index 000000000000..66da61a07636 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/AbstractModuleTestArchitectureTest.java @@ -0,0 +1,26 @@ +package de.tum.cit.aet.artemis.shared.architecture.module; + +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMembers; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import de.tum.cit.aet.artemis.shared.architecture.AbstractArchitectureTest; + +public abstract class AbstractModuleTestArchitectureTest extends AbstractArchitectureTest implements ModuleArchitectureTest { + + abstract protected Class getAbstractModuleIntegrationTestClass(); + + @Test + void integrationTestsShouldExtendAbstractModuleIntegrationTest() { + classesOfThisModuleThat().haveSimpleNameEndingWith("IntegrationTest").should().beAssignableTo(getAbstractModuleIntegrationTestClass()) + .because("All integration tests should extend %s".formatted(getAbstractModuleIntegrationTestClass())).check(testClasses); + } + + @Test + void integrationTestsShouldNotAutowireMembers() { + noMembers().that().areAnnotatedWith(Autowired.class).should().beDeclaredInClassesThat().areAssignableTo(getAbstractModuleIntegrationTestClass()).andShould() + .notBeDeclaredIn(getAbstractModuleIntegrationTestClass()) + .because("Integration tests should not autowire members in any class that inherits from %s".formatted(getAbstractModuleIntegrationTestClass())).check(testClasses); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/ModuleArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/ModuleArchitectureTest.java new file mode 100644 index 000000000000..817e47c7932e --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/module/ModuleArchitectureTest.java @@ -0,0 +1,52 @@ +package de.tum.cit.aet.artemis.shared.architecture.module; + +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods; +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMethods; + +import com.tngtech.archunit.lang.syntax.elements.ClassesThat; +import com.tngtech.archunit.lang.syntax.elements.GivenClassesConjunction; +import com.tngtech.archunit.lang.syntax.elements.GivenMethodsConjunction; +import com.tngtech.archunit.lang.syntax.elements.MethodsThat; + +public interface ModuleArchitectureTest { + + String getModulePackage(); + + default String getModuleWithSubpackage() { + return getModulePackage() + ".."; + } + + default GivenClassesConjunction classesOfThisModule() { + return classes().that().resideInAPackage(getModuleWithSubpackage()); + } + + default ClassesThat classesOfThisModuleThat() { + return classesOfThisModule().and(); + } + + default GivenClassesConjunction noClassesOfThisModule() { + return noClasses().that().resideInAPackage(getModuleWithSubpackage()); + } + + default ClassesThat noClassesOfThisModuleThat() { + return noClassesOfThisModule().and(); + } + + default GivenMethodsConjunction methodsOfThisModule() { + return methods().that().areDeclaredInClassesThat().resideInAPackage(getModuleWithSubpackage()); + } + + default MethodsThat methodsOfThisModuleThat() { + return methodsOfThisModule().and(); + } + + default GivenMethodsConjunction noMethodsOfThisModule() { + return noMethods().that().areDeclaredInClassesThat().resideInAPackage(getModuleWithSubpackage()); + } + + default MethodsThat noMethodsOfThisModuleThat() { + return noMethodsOfThisModule().and(); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractArtemisIntegrationTest.java index 57706d00e482..469e4f117837 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractArtemisIntegrationTest.java @@ -4,7 +4,9 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import java.time.Instant; import java.util.List; +import java.util.Optional; import jakarta.mail.internet.MimeMessage; @@ -23,6 +25,7 @@ import org.springframework.context.annotation.Import; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.assessment.test_repository.ResultTestRepository; @@ -51,7 +54,7 @@ import de.tum.cit.aet.artemis.core.util.RequestUtilService; import de.tum.cit.aet.artemis.core.util.ThrowingProducer; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService; import de.tum.cit.aet.artemis.lti.service.Lti13Service; import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; @@ -186,7 +189,7 @@ public abstract class AbstractArtemisIntegrationTest implements MockDelegate { protected UserTestRepository userTestRepository; @Autowired - protected ExerciseRepository exerciseRepository; + protected ExerciseTestRepository exerciseRepository; @Autowired protected ResultTestRepository resultRepository; @@ -199,6 +202,14 @@ void mockMailService() { doNothing().when(javaMailSender).send(any(MimeMessage.class)); } + @BeforeEach + void resetParticipantScoreScheduler() { + // Prevents the ParticipantScoreScheduleService from scheduling tasks related to prior results + ReflectionTestUtils.setField(participantScoreScheduleService, "lastScheduledRun", Optional.of(Instant.now())); + ParticipantScoreScheduleService.DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS = 100; + participantScoreScheduleService.activate(); + } + @AfterEach void stopQuizScheduler() { scheduleService.clearAllTasks(); diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index 9de675fa0d7d..1f78277f6942 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -50,7 +50,7 @@ @ResourceLock("AbstractSpringIntegrationGitlabCIGitlabSamlTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! @ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, "gitlabci", "gitlab", PROFILE_SAML2, PROFILE_SCHEDULING, PROFILE_LTI }) -@TestPropertySource(properties = { "artemis.user-management.use-external=false" }) +@TestPropertySource(properties = { "artemis.user-management.use-external=false", "spring.jpa.properties.hibernate.cache.hazelcast.instance_name=Artemis_gitlabci" }) public abstract class AbstractSpringIntegrationGitlabCIGitlabSamlTest extends AbstractArtemisIntegrationTest { // please only use this to verify method calls using Mockito. Do not mock methods, instead mock the communication with Gitlab using the corresponding RestTemplate and diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationIndependentTest.java index 06d39f233939..f315fef9ce39 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationIndependentTest.java @@ -43,7 +43,7 @@ // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! @ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, PROFILE_ATHENA, PROFILE_APOLLON, PROFILE_IRIS, PROFILE_AEOLUS, PROFILE_THEIA, PROFILE_LTI }) -@TestPropertySource(properties = { "artemis.user-management.use-external=false" }) +@TestPropertySource(properties = { "artemis.user-management.use-external=false", "spring.jpa.properties.hibernate.cache.hazelcast.instance_name=Artemis_independent" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { private static final Logger log = LoggerFactory.getLogger(AbstractSpringIntegrationIndependentTest.class); diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationJenkinsGitlabTest.java index 8db77872f646..221207ae9e41 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -59,7 +59,8 @@ @ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, "gitlab", "jenkins", PROFILE_ATHENA, PROFILE_LTI, PROFILE_AEOLUS, PROFILE_APOLLON }) @TestPropertySource(properties = { "info.guided-tour.course-group-tutors=artemis-artemistutorial-tutors", "info.guided-tour.course-group-students=artemis-artemistutorial-students", "info.guided-tour.course-group-editors=artemis-artemistutorial-editors", "info.guided-tour.course-group-instructors=artemis-artemistutorial-instructors", - "artemis.user-management.use-external=false", "artemis.user-management.course-enrollment.allowed-username-pattern=^(?!authorizationservicestudent2).*$" }) + "artemis.user-management.use-external=false", "artemis.user-management.course-enrollment.allowed-username-pattern=^(?!authorizationservicestudent2).*$", + "spring.jpa.properties.hibernate.cache.hazelcast.instance_name=Artemis_gitlabjenkins" }) public abstract class AbstractSpringIntegrationJenkinsGitlabTest extends AbstractArtemisIntegrationTest { // please only use this to verify method calls using Mockito. Do not mock methods, instead mock the communication with Jenkins using the corresponding RestTemplate. diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationLocalCILocalVCTest.java index 41a1f1436619..27c299ffa2ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -45,8 +45,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.programming.localvcci.LocalVCLocalCITestService; -import de.tum.cit.aet.artemis.programming.localvcci.util.TestBuildAgentConfiguration; +import de.tum.cit.aet.artemis.programming.icl.LocalVCLocalCITestService; +import de.tum.cit.aet.artemis.programming.icl.TestBuildAgentConfiguration; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; @@ -74,7 +74,8 @@ "artemis.continuous-integration.asynchronous=false", "artemis.continuous-integration.build.images.java.default=dummy-docker-image", "artemis.continuous-integration.image-cleanup.enabled=true", "artemis.continuous-integration.image-cleanup.disk-space-threshold-mb=1000000000", "spring.liquibase.enabled=true", "artemis.iris.health-ttl=500", "artemis.version-control.ssh-private-key-folder-path=${java.io.tmpdir}", - "artemis.version-control.build-agent-use-ssh=true", "info.contact=test@localhost", "artemis.version-control.ssh-template-clone-url=ssh://git@localhost:7921/" }) + "artemis.version-control.build-agent-use-ssh=true", "info.contact=test@localhost", "artemis.version-control.ssh-template-clone-url=ssh://git@localhost:7921/", + "spring.jpa.properties.hibernate.cache.hazelcast.instance_name=Artemis_localcilocalvc" }) @ContextConfiguration(classes = TestBuildAgentConfiguration.class) public abstract class AbstractSpringIntegrationLocalCILocalVCTest extends AbstractArtemisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextRepositoryArchitectureTest.java new file mode 100644 index 000000000000..61dc3973c989 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextRepositoryArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.text.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class TextRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".text"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextResourceArchitectureTest.java new file mode 100644 index 000000000000..71380481099c --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.text.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class TextResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".text"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextServbiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextServbiceArchitectureTest.java new file mode 100644 index 000000000000..d8bb2db8d3fa --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/text/architecture/TextServbiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.text.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class TextServbiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".text"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/text/util/TextExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/text/util/TextExerciseUtilService.java index fb1effac7c64..f52f9e7de82d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/util/TextExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/util/TextExerciseUtilService.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; @@ -62,7 +62,7 @@ public class TextExerciseUtilService { private static final ZonedDateTime futureFutureTimestamp = ZonedDateTime.now().plusDays(2); @Autowired - private ExerciseRepository exerciseRepo; + private ExerciseTestRepository exerciseRepository; @Autowired private CourseTestRepository courseRepo; @@ -194,7 +194,7 @@ public TextExercise createIndividualTextExercise(Course course, ZonedDateTime re TextExercise textExercise = TextExerciseFactory.generateTextExercise(releaseDate, dueDate, assessmentDueDate, course); textExercise.setMaxPoints(10.0); textExercise.setBonusPoints(0.0); - return exerciseRepo.save(textExercise); + return exerciseRepository.save(textExercise); } /** @@ -211,7 +211,7 @@ public TextExercise createTeamTextExercise(Course course, ZonedDateTime releaseD teamTextExercise.setMaxPoints(10.0); teamTextExercise.setBonusPoints(0.0); teamTextExercise.setMode(ExerciseMode.TEAM); - return exerciseRepo.save(teamTextExercise); + return exerciseRepository.save(teamTextExercise); } /** @@ -226,7 +226,7 @@ public Course addCourseWithOneReleasedTextExercise(String title) { textExercise.setTitle(title); course.addExercises(textExercise); course = courseRepo.save(course); - textExercise = exerciseRepo.save(textExercise); + textExercise = exerciseRepository.save(textExercise); assertThat(courseRepo.findWithEagerExercisesById(course.getId()).getExercises()).as("course contains the exercise").contains(textExercise); assertThat(textExercise.getPresentationScoreEnabled()).as("presentation score is enabled").isTrue(); @@ -268,7 +268,7 @@ public TextExercise addCourseExamExerciseGroupWithOneTextExercise(String title) if (title != null) { textExercise.setTitle(title); } - return exerciseRepo.save(textExercise); + return exerciseRepository.save(textExercise); } /** @@ -288,7 +288,7 @@ public TextExercise addCourseExamExerciseGroupWithOneTextExercise() { public TextExercise addCourseExamWithReviewDatesExerciseGroupWithOneTextExercise() { ExerciseGroup exerciseGroup = examUtilService.addExerciseGroupWithExamWithReviewDatesAndCourse(true); TextExercise textExercise = TextExerciseFactory.generateTextExerciseForExam(exerciseGroup); - return exerciseRepo.save(textExercise); + return exerciseRepository.save(textExercise); } /** @@ -493,7 +493,7 @@ public Course addCourseWithOneFinishedTextExercise() { finishedTextExercise.setTitle("Finished"); course.addExercises(finishedTextExercise); course = courseRepo.save(course); - exerciseRepo.save(finishedTextExercise); + exerciseRepository.save(finishedTextExercise); return course; } diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/AbstractTutorialGroupIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/AbstractTutorialGroupIntegrationTest.java index fb830564f00b..e18ea9081084 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/AbstractTutorialGroupIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup; -import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroup.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDate; @@ -44,10 +44,10 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupRegistrationTestRepository; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupScheduleTestRepository; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupTestRepository; -import de.tum.cit.aet.artemis.tutorialgroups.util.TutorialGroupUtilService; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupRegistrationTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupScheduleTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.util.TutorialGroupUtilService; /** * Contains useful methods for testing the tutorial groups feature. diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupFreePeriodIntegrationTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupFreePeriodIntegrationTest.java index 5b750a73f558..d4ba9018ca62 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupFreePeriodIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup; -import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroup.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDateTime; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupIntegrationTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupIntegrationTest.java index b08e710cd1a5..00e2cf588148 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupIntegrationTest.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup; +import static de.tum.cit.aet.artemis.tutorialgroup.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType.INSTRUCTOR_REGISTRATION; -import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupScheduleIntegrationTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupScheduleIntegrationTest.java index 6b0ab4262754..da47e6647d01 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupScheduleIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupSessionIntegrationTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupSessionIntegrationTest.java index 83b9087bd6a8..54fbfb9ad627 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupSessionIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup; -import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroup.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDate; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupsConfigurationIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupsConfigurationIntegrationTest.java index dd7b8801006f..0dda38b7f7c6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupsConfigurationIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup; -import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroup.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupRepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupRepositoryArchitectureTest.java new file mode 100644 index 000000000000..96cc99fc6eae --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupRepositoryArchitectureTest.java @@ -0,0 +1,18 @@ +package de.tum.cit.aet.artemis.tutorialgroup.architecture; + +import java.util.Set; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleRepositoryArchitectureTest; + +class TutorialGroupRepositoryArchitectureTest extends AbstractModuleRepositoryArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".tutorialgroup"; + } + + // TODO: This method should be removed once all repositories are tested + @Override + protected Set testTransactionalExclusions() { + return Set.of("de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupsConfigurationService.onTimeZoneUpdate(de.tum.cit.aet.artemis.core.domain.Course)"); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupResourceArchitectureTest.java new file mode 100644 index 000000000000..14a70d887215 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupResourceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.tutorialgroup.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleResourceArchitectureTest; + +class TutorialGroupResourceArchitectureTest extends AbstractModuleResourceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".tutorialgroup"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupServiceArchitectureTest.java new file mode 100644 index 000000000000..94843d026888 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/architecture/TutorialGroupServiceArchitectureTest.java @@ -0,0 +1,10 @@ +package de.tum.cit.aet.artemis.tutorialgroup.architecture; + +import de.tum.cit.aet.artemis.shared.architecture.module.AbstractModuleServiceArchitectureTest; + +class TutorialGroupServiceArchitectureTest extends AbstractModuleServiceArchitectureTest { + + public String getModulePackage() { + return ARTEMIS_PACKAGE + ".tutorialgroup"; + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupRegistrationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupRegistrationTestRepository.java similarity index 94% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupRegistrationTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupRegistrationTestRepository.java index 4b91c014ae70..d6ac29e112ee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupRegistrationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupRegistrationTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.tutorialgroups.test_repository; +package de.tum.cit.aet.artemis.tutorialgroup.test_repository; import jakarta.validation.constraints.NotNull; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupScheduleTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupScheduleTestRepository.java similarity index 88% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupScheduleTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupScheduleTestRepository.java index 9571f28a2c4b..bd2b8472b306 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupScheduleTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupScheduleTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.tutorialgroups.test_repository; +package de.tum.cit.aet.artemis.tutorialgroup.test_repository; import java.util.Optional; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupTestRepository.java similarity index 94% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupTestRepository.java index 75383acde76d..779dc5023571 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/test_repository/TutorialGroupTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/test_repository/TutorialGroupTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.tutorialgroups.test_repository; +package de.tum.cit.aet.artemis.tutorialgroup.test_repository; import java.util.Optional; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/util/TutorialGroupFactory.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/util/TutorialGroupFactory.java similarity index 97% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/util/TutorialGroupFactory.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/util/TutorialGroupFactory.java index 1ed5b6beeb7b..2b054c08dc81 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/util/TutorialGroupFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/util/TutorialGroupFactory.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.tutorialgroups.util; +package de.tum.cit.aet.artemis.tutorialgroup.util; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/util/TutorialGroupUtilService.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/util/TutorialGroupUtilService.java similarity index 97% rename from src/test/java/de/tum/cit/aet/artemis/tutorialgroups/util/TutorialGroupUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroup/util/TutorialGroupUtilService.java index 621f53a19be3..0f75088ebd5b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/util/TutorialGroupUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/util/TutorialGroupUtilService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.tutorialgroups.util; +package de.tum.cit.aet.artemis.tutorialgroup.util; import static de.tum.cit.aet.artemis.core.util.DateUtil.interpretInTimeZone; import static org.assertj.core.api.Assertions.assertThat; @@ -28,8 +28,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupRegistrationTestRepository; -import de.tum.cit.aet.artemis.tutorialgroups.test_repository.TutorialGroupTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupRegistrationTestRepository; +import de.tum.cit.aet.artemis.tutorialgroup.test_repository.TutorialGroupTestRepository; /** * Service responsible for initializing the database with specific testdata related to tutorial groups for use in integration tests. diff --git a/src/test/javascript/spec/component/account/ssh-user-settings.component.spec.ts b/src/test/javascript/spec/component/account/ssh-user-settings.component.spec.ts index c7b44b4f9e97..29b647dfb946 100644 --- a/src/test/javascript/spec/component/account/ssh-user-settings.component.spec.ts +++ b/src/test/javascript/spec/component/account/ssh-user-settings.component.spec.ts @@ -76,10 +76,10 @@ describe('SshUserSettingsComponent', () => { accountServiceMock.addSshPublicKey.mockReturnValue(of(new HttpResponse({ status: 200 }))); comp.ngOnInit(); comp.sshKey = 'new-key'; - comp.editSshKey = true; + comp.showSshKey = true; comp.saveSshKey(); expect(accountServiceMock.addSshPublicKey).toHaveBeenCalledWith('new-key'); - expect(comp.editSshKey).toBeFalse(); + expect(comp.showSshKey).toBeFalse(); }); it('should delete SSH key and disable edit mode', () => { @@ -87,10 +87,10 @@ describe('SshUserSettingsComponent', () => { comp.ngOnInit(); const empty = ''; comp.sshKey = 'new-key'; - comp.editSshKey = true; + comp.showSshKey = true; comp.deleteSshKey(); expect(accountServiceMock.deleteSshPublicKey).toHaveBeenCalled(); - expect(comp.editSshKey).toBeFalse(); + expect(comp.showSshKey).toBeFalse(); expect(comp.storedSshKey).toEqual(empty); }); @@ -113,12 +113,48 @@ describe('SshUserSettingsComponent', () => { const oldKey = 'old-key'; const newKey = 'new-key'; comp.sshKey = oldKey; - comp.editSshKey = true; + comp.showSshKey = true; comp.saveSshKey(); expect(comp.storedSshKey).toEqual(oldKey); - comp.editSshKey = true; + comp.showSshKey = true; comp.sshKey = newKey; comp.cancelEditingSshKey(); expect(comp.storedSshKey).toEqual(oldKey); }); + + it('should detect Windows', () => { + jest.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue('Mozilla/5.0 (Windows NT 10.0; Win64; x64)'); + comp.ngOnInit(); + expect(comp.copyInstructions).toBe('cat ~/.ssh/id_ed25519.pub | clip'); + }); + + it('should detect MacOS', () => { + jest.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)'); + comp.ngOnInit(); + expect(comp.copyInstructions).toBe('pbcopy < ~/.ssh/id_ed25519.pub'); + }); + + it('should detect Linux', () => { + jest.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue('Mozilla/5.0 (X11; Linux x86_64)'); + comp.ngOnInit(); + expect(comp.copyInstructions).toBe('xclip -selection clipboard < ~/.ssh/id_ed25519.pub'); + }); + + it('should detect Android', () => { + jest.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue('Mozilla/5.0 (Linux; Android 10; Pixel 3)'); + comp.ngOnInit(); + expect(comp.copyInstructions).toBe('termux-clipboard-set < ~/.ssh/id_ed25519.pub'); + }); + + it('should detect iOS', () => { + jest.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue('Mozilla/5.0 (iPhone; CPU iPhone OS 13_5)'); + comp.ngOnInit(); + expect(comp.copyInstructions).toBe('Ctrl + C'); + }); + + it('should return Unknown for unrecognized OS', () => { + jest.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue('Mozilla/5.0 (Unknown OS)'); + comp.ngOnInit(); + expect(comp.copyInstructions).toBe('Ctrl + C'); + }); }); diff --git a/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts b/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts index 48ee21c6a6e8..d82f0614375c 100644 --- a/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts +++ b/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts @@ -4,7 +4,7 @@ import { of } from 'rxjs'; import { Router, RouterModule } from '@angular/router'; import { ArtemisTestModule } from '../../test.module'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; -import { MockTranslateService, TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; +import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PROFILE_LOCALVC } from 'app/app.constants'; @@ -27,8 +27,7 @@ describe('UserSettingsContainerComponent', () => { }; await TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterModule], - declarations: [UserSettingsContainerComponent, TranslatePipeMock], + imports: [UserSettingsContainerComponent, ArtemisTestModule, RouterModule], providers: [ { provide: ProfileService, useValue: profileServiceMock }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/component/admin/configuration.component.spec.ts b/src/test/javascript/spec/component/admin/configuration.component.spec.ts index 5ff61e9b6d3d..3f3780774ef9 100644 --- a/src/test/javascript/spec/component/admin/configuration.component.spec.ts +++ b/src/test/javascript/spec/component/admin/configuration.component.spec.ts @@ -1,9 +1,10 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { of } from 'rxjs'; import { ConfigurationComponent } from 'app/admin/configuration/configuration.component'; import { ConfigurationService } from 'app/admin/configuration/configuration.service'; import { Bean, PropertySource } from 'app/admin/configuration/configuration.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Component Tests', () => { describe('ConfigurationComponent', () => { @@ -13,9 +14,9 @@ describe('Component Tests', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], declarations: [ConfigurationComponent], - providers: [ConfigurationService], + providers: [provideHttpClient(), provideHttpClientTesting(), ConfigurationService], }) .overrideTemplate(ConfigurationComponent, '') .compileComponents(); diff --git a/src/test/javascript/spec/component/admin/legal-document-service.spec.ts b/src/test/javascript/spec/component/admin/legal-document-service.spec.ts index afb6366af5f1..7fba2b5b2227 100644 --- a/src/test/javascript/spec/component/admin/legal-document-service.spec.ts +++ b/src/test/javascript/spec/component/admin/legal-document-service.spec.ts @@ -1,10 +1,11 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { LegalDocumentService } from 'app/shared/service/legal-document.service'; import { LegalDocument, LegalDocumentLanguage, LegalDocumentType } from 'app/entities/legal-document.model'; import { PrivacyStatement } from 'app/entities/privacy-statement.model'; import { Imprint } from 'app/entities/imprint.model'; +import { provideHttpClient } from '@angular/common/http'; describe('LegalDocumentService', () => { let service: LegalDocumentService; @@ -12,7 +13,8 @@ describe('LegalDocumentService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(LegalDocumentService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/admin/logs.component.spec.ts b/src/test/javascript/spec/component/admin/logs.component.spec.ts index 5ec0637f63e5..28f7b0ca00fe 100644 --- a/src/test/javascript/spec/component/admin/logs.component.spec.ts +++ b/src/test/javascript/spec/component/admin/logs.component.spec.ts @@ -1,10 +1,11 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { of } from 'rxjs'; import { LogsComponent } from 'app/admin/logs/logs.component'; import { LogsService } from 'app/admin/logs/logs.service'; import { Log, LoggersResponse } from 'app/admin/logs/log.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Component Tests', () => { describe('LogsComponent', () => { @@ -14,9 +15,9 @@ describe('Component Tests', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], declarations: [LogsComponent], - providers: [LogsService], + providers: [provideHttpClient(), provideHttpClientTesting(), LogsService], }).compileComponents(); })); diff --git a/src/test/javascript/spec/component/admin/user-management.component.spec.ts b/src/test/javascript/spec/component/admin/user-management.component.spec.ts index 29189fad046b..4b2ee62e13a4 100644 --- a/src/test/javascript/spec/component/admin/user-management.component.spec.ts +++ b/src/test/javascript/spec/component/admin/user-management.component.spec.ts @@ -11,7 +11,7 @@ import { import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; import { ActivatedRoute, Router } from '@angular/router'; -import { HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http'; +import { HttpHeaders, HttpParams, HttpResponse, provideHttpClient } from '@angular/common/http'; import { User } from 'app/core/user/user.model'; import { Subscription, of } from 'rxjs'; import { AbstractControl, ReactiveFormsModule } from '@angular/forms'; @@ -25,7 +25,7 @@ import { ArtemisTestModule } from '../../test.module'; import { MockRouter } from '../../helpers/mocks/mock-router'; import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive'; import { EventManager } from 'app/core/util/event-manager.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; @@ -62,7 +62,7 @@ describe('UserManagementComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MockModule(ReactiveFormsModule), MockModule(NgbModule), HttpClientTestingModule], + imports: [ArtemisTestModule, MockModule(ReactiveFormsModule), MockModule(NgbModule)], declarations: [ UserManagementComponent, MockRouterLinkDirective, @@ -73,6 +73,8 @@ describe('UserManagementComponent', () => { MockDirective(SortDirective), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: route, diff --git a/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-create-form.component.spec.ts b/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-create-form.component.spec.ts index eabecfa7deb0..cb7c1fc68ee7 100644 --- a/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-create-form.component.spec.ts +++ b/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-create-form.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ApollonDiagram } from 'app/entities/apollon-diagram.model'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { TranslateService } from '@ngx-translate/core'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { ApollonDiagramCreateFormComponent } from 'app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-create-form.component'; @@ -10,7 +10,7 @@ import { ApollonDiagramService } from 'app/exercises/quiz/manage/apollon-diagram import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { MockRouter } from '../../helpers/mocks/mock-router'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { of } from 'rxjs'; import { UMLDiagramType } from '@ls1intum/apollon'; @@ -25,9 +25,11 @@ describe('ApollonDiagramCreateForm Component', () => { diagram.id = 1; TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], declarations: [ApollonDiagramCreateFormComponent], providers: [ + provideHttpClient(), + provideHttpClientTesting(), ApollonDiagramService, NgbActiveModal, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-list.component.spec.ts b/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-list.component.spec.ts index 624d432837f2..eed0f095cb77 100644 --- a/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-list.component.spec.ts +++ b/src/test/javascript/spec/component/apollon-diagrams/apollon-diagram-list.component.spec.ts @@ -10,8 +10,8 @@ import { AlertService } from 'app/core/util/alert.service'; import { SortService } from 'app/shared/service/sort.service'; import { ApollonDiagramListComponent } from 'app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-list.component'; import { ApollonDiagram } from 'app/entities/apollon-diagram.model'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { HttpResponse } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { AccountService } from 'app/core/auth/account.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; @@ -31,9 +31,11 @@ describe('ApollonDiagramList Component', () => { const route = { params: of({ courseId: 123 }), snapshot: { paramMap: convertToParamMap({ courseId: course.id }) } } as any as ActivatedRoute; TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], declarations: [ApollonDiagramListComponent], providers: [ + provideHttpClient(), + provideHttpClientTesting(), AlertService, ApollonDiagramService, MockProvider(SortService), diff --git a/src/test/javascript/spec/component/apollon-diagrams/exercise-generation/quiz-exercise-generator.spec.ts b/src/test/javascript/spec/component/apollon-diagrams/exercise-generation/quiz-exercise-generator.spec.ts index aa864fb5cc72..7ab39cb856d3 100644 --- a/src/test/javascript/spec/component/apollon-diagrams/exercise-generation/quiz-exercise-generator.spec.ts +++ b/src/test/javascript/spec/component/apollon-diagrams/exercise-generation/quiz-exercise-generator.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { Selection, UMLModel, UMLModelElement, findElement } from '@ls1intum/apollon'; @@ -40,9 +40,11 @@ describe('QuizExercise Generator', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], declarations: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(TranslateService), { provide: SessionStorageService, diff --git a/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts b/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts index 92a1d051230e..b122fb9fd8b9 100644 --- a/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; -import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; +import { ActivatedRoute, Router, RouterModule, convertToParamMap } from '@angular/router'; import { of, throwError } from 'rxjs'; import { HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http'; import { SidePanelComponent } from 'app/shared/side-panel/side-panel.component'; @@ -57,7 +57,6 @@ import { MockTranslateValuesDirective } from '../../helpers/mocks/directive/mock import { PieChartModule } from '@swimlane/ngx-charts'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; -import { RouterTestingModule } from '@angular/router/testing'; import { SortService } from 'app/shared/service/sort.service'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { AccountService } from 'app/core/auth/account.service'; @@ -211,7 +210,7 @@ describe('ExerciseAssessmentDashboardComponent', () => { }), }, } as any as ActivatedRoute; - const imports = [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(PieChartModule)]; + const imports = [ArtemisTestModule, MockModule(PieChartModule), RouterModule.forRoot([])]; const declarations = [ ExerciseAssessmentDashboardComponent, diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts index 6c151bfbce91..a85e5e47bc16 100644 --- a/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts @@ -6,7 +6,6 @@ import { AssessmentHeaderComponent } from 'app/assessment/assessment-header/asse import { ArtemisTestModule } from '../../test.module'; import { Result } from 'app/entities/result.model'; import { AlertOverlayComponent } from 'app/shared/alert/alert-overlay.component'; -import { RouterTestingModule } from '@angular/router/testing'; import { AssessmentWarningComponent } from 'app/assessment/assessment-warning/assessment-warning.component'; import { MockProvider } from 'ng-mocks'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; @@ -25,6 +24,7 @@ import { MockTranslateValuesDirective } from '../../helpers/mocks/directive/mock import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; import { NgbAlertsMocksModule } from '../../helpers/mocks/directive/ngbAlertsMocks.module'; import { AssessmentNote } from 'app/entities/assessment-note.model'; +import { RouterModule } from '@angular/router'; describe('AssessmentHeaderComponent', () => { let component: AssessmentHeaderComponent; @@ -49,7 +49,7 @@ describe('AssessmentHeaderComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule, NgbTooltipMocksModule, NgbAlertsMocksModule], + imports: [ArtemisTestModule, NgbTooltipMocksModule, NgbAlertsMocksModule, RouterModule.forRoot([])], declarations: [AssessmentHeaderComponent, AssessmentWarningComponent, AlertOverlayComponent, TranslateDirective, ArtemisTranslatePipe, MockTranslateValuesDirective], providers: [ { diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts index 54ebbc921892..f63d14776140 100644 --- a/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts @@ -19,8 +19,9 @@ import { of } from 'rxjs'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route'; import { ActivatedRoute } from '@angular/router'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; +import { provideHttpClient } from '@angular/common/http'; describe('AssessmentLocksComponent', () => { let component: AssessmentLocksComponent; @@ -39,9 +40,11 @@ describe('AssessmentLocksComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), HttpClientTestingModule], + imports: [TranslateModule.forRoot()], declarations: [AssessmentLocksComponent, MockPipe(ArtemisTranslatePipe), MockRouterLinkDirective, MockHasAnyAuthorityDirective, MockPipe(ArtemisDatePipe)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(TextAssessmentService), MockProvider(CourseManagementService), MockProvider(ModelingAssessmentService), diff --git a/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts index e6a35ac15468..df3b885c4a93 100644 --- a/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts +++ b/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts @@ -4,7 +4,6 @@ import { ArtemisTestModule } from '../../test.module'; import { Annotation, CodeEditorMonacoComponent } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component'; import { MockComponent } from 'ng-mocks'; import { CodeEditorTutorAssessmentInlineFeedbackComponent } from 'app/exercises/programming/assess/code-editor-tutor-assessment-inline-feedback.component'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; import { MockResizeObserver } from '../../helpers/mocks/service/mock-resize-observer'; import { CodeEditorFileService } from 'app/exercises/programming/shared/code-editor/service/code-editor-file.service'; @@ -48,13 +47,8 @@ describe('CodeEditorMonacoComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule], - declarations: [ - CodeEditorMonacoComponent, - MockComponent(CodeEditorTutorAssessmentInlineFeedbackComponent), - MockComponent(CodeEditorHeaderComponent), - MonacoEditorComponent, - ], + imports: [ArtemisTestModule, MonacoEditorComponent], + declarations: [CodeEditorMonacoComponent, MockComponent(CodeEditorTutorAssessmentInlineFeedbackComponent), MockComponent(CodeEditorHeaderComponent)], providers: [ CodeEditorFileService, { provide: CodeEditorRepositoryFileService, useClass: MockCodeEditorRepositoryFileService }, diff --git a/src/test/javascript/spec/component/competencies/competency-card-stub.component.ts b/src/test/javascript/spec/component/competencies/competency-card-stub.component.ts index e29531716e82..c214176f34fb 100644 --- a/src/test/javascript/spec/component/competencies/competency-card-stub.component.ts +++ b/src/test/javascript/spec/component/competencies/competency-card-stub.component.ts @@ -1,10 +1,11 @@ -import { Component, Input } from '@angular/core'; -import { Competency } from 'app/entities/competency.model'; +import { Component, input } from '@angular/core'; +import { CourseCompetency } from 'app/entities/competency.model'; @Component({ selector: 'jhi-competency-card', template: '
    ' }) export class CompetencyCardStubComponent { - @Input() courseId?: number; - @Input() competency: Competency; - @Input() isPrerequisite: boolean; - @Input() hideProgress: boolean; + courseId = input(); + competency = input(); + isPrerequisite = input(); + hideProgress = input(false); + noProgressRings = input(false); } diff --git a/src/test/javascript/spec/component/competencies/competency-card.component.spec.ts b/src/test/javascript/spec/component/competencies/competency-card.component.spec.ts index 0424545cf688..54e9e97c34e6 100644 --- a/src/test/javascript/spec/component/competencies/competency-card.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/competency-card.component.spec.ts @@ -41,7 +41,7 @@ describe('CompetencyCardComponent', () => { }); it('should calculate correct progress, confidence and mastery', () => { - competencyCardComponent.competency = { + const competency = { id: 1, masteryThreshold: 80, userProgress: [ @@ -51,6 +51,7 @@ describe('CompetencyCardComponent', () => { } as CompetencyProgress, ], } as Competency; + competencyCardComponentFixture.componentRef.setInput('competency', competency); competencyCardComponentFixture.detectChanges(); @@ -60,7 +61,7 @@ describe('CompetencyCardComponent', () => { }); it('should display competency as mastered', () => { - competencyCardComponent.competency = { + const competency = { id: 1, masteryThreshold: 40, userProgress: [ @@ -70,6 +71,7 @@ describe('CompetencyCardComponent', () => { } as CompetencyProgress, ], } as Competency; + competencyCardComponentFixture.componentRef.setInput('competency', competency); competencyCardComponentFixture.detectChanges(); @@ -79,10 +81,11 @@ describe('CompetencyCardComponent', () => { }); it('should display optional badge for optional competency', () => { - competencyCardComponent.competency = { + const competency = { id: 1, optional: true, } as Competency; + competencyCardComponentFixture.componentRef.setInput('competency', competency); competencyCardComponentFixture.detectChanges(); @@ -91,10 +94,11 @@ describe('CompetencyCardComponent', () => { }); it('should not display optional badge for non-optional competency', () => { - competencyCardComponent.competency = { + const competency = { id: 1, optional: false, } as Competency; + competencyCardComponentFixture.componentRef.setInput('competency', competency); competencyCardComponentFixture.detectChanges(); @@ -104,12 +108,12 @@ describe('CompetencyCardComponent', () => { it('should detect if due date is passed', () => { const competencyFuture = { softDueDate: dayjs().add(1, 'days') } as Competency; - competencyCardComponent.competency = competencyFuture; + competencyCardComponentFixture.componentRef.setInput('competency', competencyFuture); competencyCardComponentFixture.detectChanges(); expect(competencyCardComponent.softDueDatePassed).toBeFalse(); const competencyPast = { softDueDate: dayjs().subtract(1, 'days') } as Competency; - competencyCardComponent.competency = competencyPast; + competencyCardComponentFixture.componentRef.setInput('competency', competencyPast); competencyCardComponentFixture.detectChanges(); expect(competencyCardComponent.softDueDatePassed).toBeTrue(); }); @@ -118,7 +122,7 @@ describe('CompetencyCardComponent', () => { { competency: { softDueDate: dayjs().add(1, 'days') } as Competency, expectedBadge: 'success' }, { competency: { softDueDate: dayjs().subtract(1, 'days') } as Competency, expectedBadge: 'danger' }, ])('should have [ngClass] resolve to correct date badge', ({ competency, expectedBadge }) => { - competencyCardComponent.competency = competency; + competencyCardComponentFixture.componentRef.setInput('competency', competency); competencyCardComponentFixture.detectChanges(); const badge = competencyCardComponentFixture.debugElement.query(By.css('#date-badge')).nativeElement; expect(badge.classList).toContain('bg-' + expectedBadge); diff --git a/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts b/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts index 824aad62c0c3..b0305c56b76d 100644 --- a/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts @@ -4,11 +4,9 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { Competency, CompetencyRelation, CompetencyWithTailRelationDTO, CourseCompetencyProgress, CourseCompetencyType } from 'app/entities/competency.model'; import { CompetencyManagementComponent } from 'app/course/competencies/competency-management/competency-management.component'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, provideRouter } from '@angular/router'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; -import { RouterTestingModule } from '@angular/router/testing'; import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; -import { HttpResponse } from '@angular/common/http'; import { AccountService } from 'app/core/auth/account.service'; import { ArtemisTestModule } from '../../../test.module'; import { NgbModal, NgbModalRef, NgbProgressbar } from '@ng-bootstrap/ng-bootstrap'; @@ -20,7 +18,7 @@ import { By } from '@angular/platform-browser'; import '@angular/localize/init'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; -import { ImportAllCompetenciesComponent, ImportAllFromCourseResult } from 'app/course/competencies/competency-management/import-all-competencies.component'; +import { ImportAllCompetenciesComponent } from 'app/course/competencies/competency-management/import-all-competencies.component'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; @@ -29,12 +27,16 @@ import { PROFILE_IRIS } from 'app/app.constants'; import { CompetencyRelationGraphStubComponent } from './competency-relation-graph-stub.component'; import { Prerequisite } from 'app/entities/prerequisite.model'; import { CompetencyManagementTableComponent } from 'app/course/competencies/competency-management/competency-management-table.component'; -import { CourseCompetencyService } from 'app/course/competencies/course-competency.service'; +import { CourseCompetencyApiService } from 'app/course/competencies/services/course-competency-api.service'; +import { + ImportAllCourseCompetenciesModalComponent, + ImportAllCourseCompetenciesResult, +} from 'app/course/competencies/components/import-all-course-competencies-modal/import-all-course-competencies-modal.component'; describe('CompetencyManagementComponent', () => { let fixture: ComponentFixture; let component: CompetencyManagementComponent; - let courseCompetencyService: CourseCompetencyService; + let courseCompetencyApiService: CourseCompetencyApiService; let profileService: ProfileService; let irisSettingsService: IrisSettingsService; let modalService: NgbModal; @@ -44,7 +46,7 @@ describe('CompetencyManagementComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), NgbProgressbar], + imports: [ArtemisTestModule, NgbProgressbar], declarations: [ CompetencyManagementComponent, MockHasAnyAuthorityDirective, @@ -58,6 +60,7 @@ describe('CompetencyManagementComponent', () => { MockDirective(DeleteButtonDirective), ], providers: [ + provideRouter([]), MockProvider(AccountService), MockProvider(AlertService), { provide: NgbModal, useClass: MockNgbModalService }, @@ -78,7 +81,7 @@ describe('CompetencyManagementComponent', () => { .then(() => { fixture = TestBed.createComponent(CompetencyManagementComponent); component = fixture.componentInstance; - courseCompetencyService = TestBed.inject(CourseCompetencyService); + courseCompetencyApiService = TestBed.inject(CourseCompetencyApiService); modalService = fixture.debugElement.injector.get(NgbModal); const competency: Competency = new Competency(); @@ -92,17 +95,15 @@ describe('CompetencyManagementComponent', () => { courseCompetencyProgress.numberOfMasteredStudents = 5; courseCompetencyProgress.averageStudentScore = 90; - getAllForCourseSpy = jest.spyOn(courseCompetencyService, 'getAllForCourse').mockReturnValue( - of( - new HttpResponse({ - body: [competency, { id: 5, type: CourseCompetencyType.COMPETENCY } as Competency, { id: 3, type: CourseCompetencyType.PREREQUISITE } as Prerequisite], - status: 200, - }), - ), - ); - getCompetencyRelationsSpy = jest - .spyOn(courseCompetencyService, 'getCompetencyRelations') - .mockReturnValue(of(new HttpResponse({ body: [{ id: 1 } as CompetencyRelation], status: 200 }))); + getAllForCourseSpy = jest.spyOn(courseCompetencyApiService, 'getCourseCompetenciesByCourseId').mockResolvedValue([ + competency, + { id: 5, type: CourseCompetencyType.COMPETENCY } as Competency, + { + id: 3, + type: CourseCompetencyType.PREREQUISITE, + } as Prerequisite, + ]); + getCompetencyRelationsSpy = jest.spyOn(courseCompetencyApiService, 'getCourseCompetencyRelations').mockResolvedValue([{ id: 1 } as CompetencyRelation]); }); }); @@ -110,7 +111,7 @@ describe('CompetencyManagementComponent', () => { jest.restoreAllMocks(); }); - it('should show generate button if IRIS is enabled', () => { + it('should show generate button if IRIS is enabled', async () => { profileService = TestBed.inject(ProfileService); irisSettingsService = TestBed.inject(IrisSettingsService); const profileInfoResponse = { @@ -124,18 +125,18 @@ describe('CompetencyManagementComponent', () => { const getProfileInfoSpy = jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(profileInfoResponse)); const getIrisSettingsSpy = jest.spyOn(irisSettingsService, 'getCombinedCourseSettings').mockReturnValue(of(irisSettingsResponse)); + component['loadIrisEnabled'](); fixture.detectChanges(); - return fixture.whenStable().then(() => { - const generateButton = fixture.debugElement.query(By.css('#generateButton')); - expect(getProfileInfoSpy).toHaveBeenCalled(); - expect(getIrisSettingsSpy).toHaveBeenCalled(); - expect(generateButton).not.toBeNull(); - }); + const generateButton = fixture.nativeElement.querySelector('#generateButton'); + + expect(getProfileInfoSpy).toHaveBeenCalled(); + expect(getIrisSettingsSpy).toHaveBeenCalled(); + expect(generateButton).not.toBeNull(); }); - it('should load competencies and prerequisites', () => { - component.loadData(); + it('should load competencies and prerequisites', async () => { + await component.loadData(); expect(getAllForCourseSpy).toHaveBeenCalledOnce(); expect(getCompetencyRelationsSpy).toHaveBeenCalledOnce(); @@ -144,10 +145,17 @@ describe('CompetencyManagementComponent', () => { expect(component.prerequisites).toHaveLength(1); }); - it('should open import modal and update values', () => { - const modalResult: ImportAllFromCourseResult = { - courseForImportDTO: { id: 1 }, - importRelations: false, + it('should open import modal and update values', async () => { + fixture.detectChanges(); + const modalResult: ImportAllCourseCompetenciesResult = { + course: { id: 1, title: 'Course 1' }, + courseCompetencyImportOptions: { + sourceCourseId: 3, + importRelations: true, + competencyIds: [5, 4], + importLectures: true, + importExercises: true, + }, }; const modalRef = { result: Promise.resolve(modalResult), @@ -157,39 +165,44 @@ describe('CompetencyManagementComponent', () => { { competency: { id: 1, type: CourseCompetencyType.COMPETENCY }, tailRelations: [{ id: 11 }] }, { competency: { id: 2, type: CourseCompetencyType.COMPETENCY } }, ]; - const response = new HttpResponse({ - body: importedCompetencies, - status: 200, - }); jest.spyOn(modalService, 'open').mockReturnValue(modalRef); - jest.spyOn(courseCompetencyService, 'importAll').mockReturnValue(of(response)); - fixture.detectChanges(); + jest.spyOn(courseCompetencyApiService, 'importAllByCourseId').mockResolvedValue(importedCompetencies); + await component.loadData(); const existingCompetencies = component.competencies.length; const existingRelations = component.relations.length; const importButton = fixture.debugElement.query(By.css('#courseCompetencyImportAllButton')); importButton.nativeElement.click(); + fixture.detectChanges(); + await fixture.whenStable(); + expect(modalService.open).toHaveBeenCalledWith(ImportAllCourseCompetenciesModalComponent, { + size: 'lg', + backdrop: 'static', + }); + fixture.detectChanges(); + await fixture.whenStable(); - expect(modalService.open).toHaveBeenCalledWith(ImportAllCompetenciesComponent, { size: 'lg', backdrop: 'static' }); - expect(modalRef.componentInstance.disabledIds).toEqual([1]); expect(component.competencies).toHaveLength(existingCompetencies + 2); expect(component.relations).toHaveLength(existingRelations + 1); }); - it('should handle create relation callback', () => { + it('should handle create relation callback', async () => { const relation: CompetencyRelation = { id: 1 }; - const response = new HttpResponse({ - body: relation, - status: 200, - }); - jest.spyOn(courseCompetencyService, 'createCompetencyRelation').mockReturnValue(of(response)); + jest.spyOn(courseCompetencyApiService, 'createCourseCompetencyRelation').mockResolvedValue(relation); + fixture.detectChanges(); + await fixture.whenStable(); + const existingRelations = component.relations.length; const relationGraph: CompetencyRelationGraphStubComponent = fixture.debugElement.query(By.directive(CompetencyRelationGraphStubComponent)).componentInstance; + expect(relationGraph).toBeDefined(); relationGraph.onCreateRelation.emit(relation); + fixture.detectChanges(); + await fixture.whenStable(); + expect(component.relations).toHaveLength(existingRelations + 1); }); @@ -209,15 +222,20 @@ describe('CompetencyManagementComponent', () => { expect(modalService.open).toHaveBeenCalledOnce(); }); - it('should remove relation', () => { - jest.spyOn(courseCompetencyService, 'removeCompetencyRelation').mockReturnValue(of(new HttpResponse())); + it('should remove relation', async () => { + jest.spyOn(courseCompetencyApiService, 'deleteCourseCompetencyRelation').mockResolvedValue(); fixture.detectChanges(); - component.relations = [{ id: 1 }, { id: 2 }]; + component.relations = [{ id: 1, headCompetency: { id: 5 }, tailCompetency: { id: 3 } }]; - component['removeRelation'](1); + fixture.detectChanges(); + await fixture.whenStable(); + fixture.detectChanges(); expect(component.relations).toHaveLength(1); - expect(component.relations.at(0)?.id).toBe(2); + + await component['removeRelation'](1); + + expect(component.relations).toHaveLength(0); }); it('should remove competency and its relation', () => { diff --git a/src/test/javascript/spec/component/competencies/competency-popover.component.spec.ts b/src/test/javascript/spec/component/competencies/competency-popover.component.spec.ts index 95d919c34ec0..551d03446489 100644 --- a/src/test/javascript/spec/component/competencies/competency-popover.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/competency-popover.component.spec.ts @@ -3,11 +3,11 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; -import { RouterTestingModule } from '@angular/router/testing'; import { CompetenciesPopoverComponent } from 'app/course/competencies/competencies-popover/competencies-popover.component'; import { By } from '@angular/platform-browser'; import { Component } from '@angular/core'; import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; +import { RouterModule } from '@angular/router'; @Component({ selector: 'jhi-statistics', @@ -29,7 +29,7 @@ describe('CompetencyPopoverComponent', () => { TestBed.configureTestingModule({ imports: [ NgbPopoverModule, - RouterTestingModule.withRoutes([ + RouterModule.forRoot([ { path: 'courses/:courseId/competencies', component: DummyStatisticsComponent }, { path: 'course-management/:courseId/competency-management', component: DummyManagementComponent }, ]), diff --git a/src/test/javascript/spec/component/competencies/competency.service.spec.ts b/src/test/javascript/spec/component/competencies/competency.service.spec.ts index 2d0bc277e85b..0b88bd1810ff 100644 --- a/src/test/javascript/spec/component/competencies/competency.service.spec.ts +++ b/src/test/javascript/spec/component/competencies/competency.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { MockProvider } from 'ng-mocks'; @@ -43,8 +43,10 @@ describe('CompetencyService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService, { convertLectureUnitArrayDatesFromServer(res: T[]): T[] { return res; diff --git a/src/test/javascript/spec/component/competencies/components/import-course-competencies-modal/import-all-course-competencies-modal.component.spec.ts b/src/test/javascript/spec/component/competencies/components/import-course-competencies-modal/import-all-course-competencies-modal.component.spec.ts new file mode 100644 index 000000000000..eb4ecd81c175 --- /dev/null +++ b/src/test/javascript/spec/component/competencies/components/import-course-competencies-modal/import-all-course-competencies-modal.component.spec.ts @@ -0,0 +1,112 @@ +import '@angular/localize/init'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ImportAllCourseCompetenciesModalComponent } from 'app/course/competencies/components/import-all-course-competencies-modal/import-all-course-competencies-modal.component'; +import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service'; +import { TranslateService } from '@ngx-translate/core'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { CourseCompetencyImportSettings } from 'app/course/competencies/components/import-course-competencies-settings/import-course-competencies-settings.component'; +import { Course } from 'app/entities/course.model'; + +describe('ImportAllCourseCompetenciesModalComponent', () => { + let component: ImportAllCourseCompetenciesModalComponent; + let fixture: ComponentFixture; + + let activeModal: NgbActiveModal; + let closeModalSpy: jest.SpyInstance; + + const courseId = 1; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ImportAllCourseCompetenciesModalComponent], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + { + provide: TranslateService, + useClass: MockTranslateService, + }, + { + provide: NgbActiveModal, + useValue: { + close(result?: any): Promise { + return Promise.resolve(result); + }, + }, + }, + ], + }).compileComponents(); + + activeModal = TestBed.inject(NgbActiveModal); + closeModalSpy = jest.spyOn(activeModal, 'close'); + + fixture = TestBed.createComponent(ImportAllCourseCompetenciesModalComponent); + component = fixture.componentInstance; + fixture.componentRef.setInput('courseId', courseId); + }); + + it('should initialize', () => { + expect(component).toBeTruthy(); + expect(component.courseId()).toEqual(courseId); + const settings = new CourseCompetencyImportSettings(); + expect(component.importSettings()).toEqual(settings); + }); + + it('should set disabledIds', () => { + expect(component.disabledIds()).toEqual([courseId]); + }); + + it('should close modal on close button', () => { + fixture.detectChanges(); + + const closeButton = fixture.debugElement.nativeElement.querySelector('#close-button'); + closeButton.click(); + + expect(closeModalSpy).toHaveBeenCalledOnce(); + }); + + it('should select course and close modal', () => { + const course = { id: 2, title: 'Course 02', shortName: 'C2' }; + component.selectCourse(course); + + expect(closeModalSpy).toHaveBeenCalledWith({ + course: course, + courseCompetencyImportOptions: { + sourceCourseId: course.id, + importExercises: false, + importLectures: false, + importRelations: false, + referenceDate: undefined, + isReleaseDate: undefined, + }, + }); + }); + + it('should initialize table columns correctly', () => { + expect(component['tableColumns']).toEqual([ + { name: 'TITLE', getProperty: expect.any(Function) }, + { name: 'SHORT_NAME', getProperty: expect.any(Function) }, + { name: 'SEMESTER', getProperty: expect.any(Function) }, + ]); + }); + + it('should get correct property for TITLE column', () => { + const course = { title: 'Course Title' } as Course; + const titleColumn = component['tableColumns'].find((col) => col.name === 'TITLE'); + expect(titleColumn?.getProperty(course)).toBe('Course Title'); + }); + + it('should get correct property for SHORT_NAME column', () => { + const course = { shortName: 'CS101' } as Course; + const shortNameColumn = component['tableColumns'].find((col) => col.name === 'SHORT_NAME'); + expect(shortNameColumn?.getProperty(course)).toBe('CS101'); + }); + + it('should get correct property for SEMESTER column', () => { + const course = { semester: 'Fall 2023' } as Course; + const semesterColumn = component['tableColumns'].find((col) => col.name === 'SEMESTER'); + expect(semesterColumn?.getProperty(course)).toBe('Fall 2023'); + }); +}); diff --git a/src/test/javascript/spec/component/competencies/components/import-course-competencies-settings/import-course-competencies-settings.component.spec.ts b/src/test/javascript/spec/component/competencies/components/import-course-competencies-settings/import-course-competencies-settings.component.spec.ts new file mode 100644 index 000000000000..1d9d6356c01a --- /dev/null +++ b/src/test/javascript/spec/component/competencies/components/import-course-competencies-settings/import-course-competencies-settings.component.spec.ts @@ -0,0 +1,131 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { + CourseCompetencyImportSettings, + ImportCourseCompetenciesSettingsComponent, +} from 'app/course/competencies/components/import-course-competencies-settings/import-course-competencies-settings.component'; +import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service'; +import { TranslateService } from '@ngx-translate/core'; + +describe('ImportCourseCompetenciesSettingsComponent', () => { + let component: ImportCourseCompetenciesSettingsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ImportCourseCompetenciesSettingsComponent], + providers: [ + { + provide: TranslateService, + useClass: MockTranslateService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ImportCourseCompetenciesSettingsComponent); + component = fixture.componentInstance; + fixture.componentRef.setInput('importSettings', new CourseCompetencyImportSettings()); + }); + + it('should initialize', () => { + expect(component).toBeTruthy(); + }); + + it('should toggle import setting', () => { + fixture.detectChanges(); + + const importRelationsToggle = fixture.debugElement.nativeElement.querySelector('#importRelations-checkbox'); + importRelationsToggle.click(); + + fixture.detectChanges(); + + expect(component.importSettings().importRelations).toBeTrue(); + }); + + test.each(['importRelations', 'importExercises', 'importLectures'])('should toggle import setting', (setting) => { + fixture.detectChanges(); + + const importRelationsToggle = fixture.debugElement.nativeElement.querySelector(`#${setting}-checkbox`); + importRelationsToggle.click(); + + fixture.detectChanges(); + + expect(component.importSettings()[setting as keyof CourseCompetencyImportSettings]).toBeTrue(); + importRelationsToggle.click(); + + fixture.detectChanges(); + + expect(component.importSettings()[setting as keyof CourseCompetencyImportSettings]).toBeFalse(); + }); + + it('should set reference date', () => { + fixture.detectChanges(); + + const referenceDateTypeSelect = fixture.debugElement.nativeElement.querySelector('#reference-date-type-select'); + fixture.detectChanges(); + + expect(referenceDateTypeSelect.disabled).toBeTrue(); + + const date = new Date(2022, 0, 1); + const dateEvent = { value: date.toDateString() } as HTMLInputElement; + component.setReferenceDate(dateEvent); + + expect(component.importSettings().referenceDate).toEqual(date); + expect(component.importSettings().isReleaseDate).toBeTrue(); + }); + + it('should set reference date type', () => { + fixture.detectChanges(); + + const referenceDateTypeSelect = fixture.debugElement.nativeElement.querySelector('#reference-date-type-select'); + referenceDateTypeSelect.value = 'true'; + referenceDateTypeSelect.dispatchEvent(new Event('change')); + + expect(component.importSettings().isReleaseDate).toBeTrue(); + + referenceDateTypeSelect.value = 'false'; + referenceDateTypeSelect.dispatchEvent(new Event('change')); + + expect(component.importSettings().isReleaseDate).toBeFalse(); + }); + + it('should set reference date when dateEvent is provided', () => { + const date = new Date(2022, 0, 1); + const dateEvent = { value: date.toDateString() } as HTMLInputElement; + component.setReferenceDate(dateEvent); + + expect(component.importSettings().referenceDate).toEqual(date); + expect(component.importSettings().isReleaseDate).toBeTrue(); + }); + + it('should unset reference date when dateEvent is not provided', () => { + component.setReferenceDate(); + + expect(component.importSettings().referenceDate).toBeUndefined(); + expect(component.importSettings().isReleaseDate).toBeUndefined(); + }); + + it('should retain isReleaseDate when reference date is already set', () => { + const initialDate = new Date(2022, 0, 1); + component.importSettings.update((settings) => ({ + ...settings, + referenceDate: initialDate, + isReleaseDate: false, + })); + + const newDate = new Date(2023, 0, 1); + const dateEvent = { value: newDate.toDateString() } as HTMLInputElement; + component.setReferenceDate(dateEvent); + + expect(component.importSettings().referenceDate).toEqual(newDate); + expect(component.importSettings().isReleaseDate).toBeFalse(); + }); + + it('should set isReleaseDate to true when reference date is set for the first time', () => { + const date = new Date(2022, 0, 1); + const dateEvent = { value: date.toDateString() } as HTMLInputElement; + component.setReferenceDate(dateEvent); + + expect(component.importSettings().referenceDate).toEqual(date); + expect(component.importSettings().isReleaseDate).toBeTrue(); + }); +}); diff --git a/src/test/javascript/spec/component/competencies/course-competencies.component.spec.ts b/src/test/javascript/spec/component/competencies/course-competencies.component.spec.ts index 623244fb77f9..5f9f93ad370b 100644 --- a/src/test/javascript/spec/component/competencies/course-competencies.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/course-competencies.component.spec.ts @@ -7,12 +7,12 @@ import { Competency, CompetencyProgress, CourseCompetencyType } from 'app/entiti import { ActivatedRoute } from '@angular/router'; import { AlertService } from 'app/core/util/alert.service'; import { CourseCompetenciesComponent } from 'app/overview/course-competencies/course-competencies.component'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; import { AccountService } from 'app/core/auth/account.service'; import { User } from 'app/core/user/user.model'; import { CourseStorageService } from 'app/course/manage/course-storage.service'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ArtemisTestModule } from '../../test.module'; import { CompetencyCardStubComponent } from './competency-card-stub.component'; import { FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service'; @@ -50,9 +50,11 @@ describe('CourseCompetencies', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], declarations: [CourseCompetenciesComponent, CompetencyCardStubComponent, MockPipe(ArtemisTranslatePipe)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(AlertService), { provide: CourseStorageService, useValue: mockCourseStorageService }, MockProvider(CompetencyService), diff --git a/src/test/javascript/spec/component/competencies/judgement-of-learning-rating-component.spec.ts b/src/test/javascript/spec/component/competencies/judgement-of-learning-rating-component.spec.ts new file mode 100644 index 000000000000..cd574310daec --- /dev/null +++ b/src/test/javascript/spec/component/competencies/judgement-of-learning-rating-component.spec.ts @@ -0,0 +1,118 @@ +import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; +import { JudgementOfLearningRatingComponent } from 'app/course/competencies/judgement-of-learning-rating/judgement-of-learning-rating.component'; +import { AlertService } from 'app/core/util/alert.service'; +import { CourseCompetencyService } from 'app/course/competencies/course-competency.service'; +import { MockAlertService } from '../../helpers/mocks/service/mock-alert.service'; +import { HttpErrorResponse, HttpResponse, provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; +import { TranslateService } from '@ngx-translate/core'; +import { SessionStorageService } from 'ngx-webstorage'; +import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; +import { StarRatingComponent } from 'app/exercises/shared/rating/star-rating/star-rating.component'; +import { of, throwError } from 'rxjs'; + +describe('JudgementOfLearningRatingComponent', () => { + let component: JudgementOfLearningRatingComponent; + let fixture: ComponentFixture; + + let courseCompetencyService: CourseCompetencyService; + let alertService: AlertService; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [JudgementOfLearningRatingComponent], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + { + provide: AlertService, + useClass: MockAlertService, + }, + { + provide: TranslateService, + useClass: MockTranslateService, + }, + { + provide: SessionStorageService, + useClass: MockSyncStorage, + }, + ], + }).compileComponents(); + + courseCompetencyService = TestBed.inject(CourseCompetencyService); + alertService = TestBed.inject(AlertService); + + fixture = TestBed.createComponent(JudgementOfLearningRatingComponent); + component = fixture.componentInstance; + + fixture.componentRef.setInput('courseId', 1); + fixture.componentRef.setInput('competencyId', 2); + fixture.componentRef.setInput('rating', 3); + fixture.componentRef.setInput('mastery', 0.8); + }); + + it('should initialize', () => { + expect(component).toBeTruthy(); + }); + + it('should not emit value when rating and courseId is undefined', () => { + component.courseId = undefined; + component.rating = undefined; + + const emitSpy = jest.spyOn(component.ratingChange, 'emit'); + + component.onRate({} as any); + expect(emitSpy).not.toHaveBeenCalled(); + }); + + it('should not emit value when rating is undefined', () => { + component.courseId = 1; + component.rating = undefined; + + const emitSpy = jest.spyOn(component.ratingChange, 'emit'); + + component.onRate({} as any); + expect(emitSpy).not.toHaveBeenCalled(); + }); + + it('should not emit value when courseId is undefined', () => { + component.courseId = undefined; + component.rating = 3; + + const emitSpy = jest.spyOn(component.ratingChange, 'emit'); + + component.onRate({} as any); + expect(emitSpy).not.toHaveBeenCalled(); + }); + + it('should emit new rating when onRate is called with valid data', fakeAsync(() => { + component.rating = undefined; + component.courseId = 1; + + const newRating = 4; + const event = { oldValue: 3, newValue: newRating, starRating: {} as StarRatingComponent }; + jest.spyOn(courseCompetencyService, 'setJudgementOfLearning').mockReturnValue(of(new HttpResponse({ status: 200 }))); + const emitSpy = jest.spyOn(component.ratingChange, 'emit'); + + component.onRate(event); + + expect(component.rating).toBe(newRating); + expect(emitSpy).toHaveBeenCalledWith(newRating); + })); + + it('should show error message when setting judgement of learning fails', fakeAsync(() => { + component.rating = undefined; + component.courseId = 1; + + const newRating = 4; + const event = { oldValue: 3, newValue: newRating, starRating: {} as StarRatingComponent }; + jest.spyOn(courseCompetencyService, 'setJudgementOfLearning').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 400 }))); + const errorSpy = jest.spyOn(alertService, 'error'); + + component.onRate(event); + + expect(component.rating).toBeUndefined(); + expect(errorSpy).toHaveBeenCalled(); + })); +}); diff --git a/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts b/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts index 3911a601d7df..c3c69d7980d2 100644 --- a/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts +++ b/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { MockProvider } from 'ng-mocks'; @@ -44,8 +44,10 @@ describe('PrerequisiteService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService, { convertLectureUnitArrayDatesFromServer(res: T[]): T[] { return res; diff --git a/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts b/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts index 5d93f7870fa0..0031fb3bb60c 100644 --- a/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { ComplaintResponseService } from 'app/complaints/complaint-response.service'; @@ -23,8 +23,8 @@ describe('ComplaintResponseService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [MockProvider(AccountService)], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), MockProvider(AccountService)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/complaints/complaint.service.spec.ts b/src/test/javascript/spec/component/complaints/complaint.service.spec.ts index 959355b8d92a..a4c2f8dbc2b3 100644 --- a/src/test/javascript/spec/component/complaints/complaint.service.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaint.service.spec.ts @@ -6,13 +6,14 @@ import { ComplaintResponse } from 'app/entities/complaint-response.model'; import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import dayjs from 'dayjs/esm'; import { Result } from 'app/entities/result.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { Course } from 'app/entities/course.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { ComplaintRequestDTO } from 'app/entities/complaint-request-dto.model'; +import { provideHttpClient } from '@angular/common/http'; describe('ComplaintService', () => { let complaintService: ComplaintService; @@ -57,8 +58,8 @@ describe('ComplaintService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts index c8fdeedcc452..867a683b12d1 100644 --- a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts @@ -5,7 +5,6 @@ import { ComplaintsForTutorComponent } from 'app/complaints/complaints-for-tutor import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { TextareaCounterComponent } from 'app/shared/textarea/textarea-counter.component'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; -import { RouterTestingModule } from '@angular/router/testing'; import { AlertService } from 'app/core/util/alert.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; @@ -18,6 +17,7 @@ import { of } from 'rxjs'; import { Course } from 'app/entities/course.model'; import { Exercise } from 'app/entities/exercise.model'; import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { provideRouter } from '@angular/router'; describe('ComplaintsForTutorComponent', () => { let complaintsForTutorComponent: ComplaintsForTutorComponent; @@ -29,7 +29,7 @@ describe('ComplaintsForTutorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), FormsModule], + imports: [FormsModule], declarations: [ ComplaintsForTutorComponent, MockPipe(ArtemisTranslatePipe), @@ -37,7 +37,7 @@ describe('ComplaintsForTutorComponent', () => { MockComponent(TextareaCounterComponent), MockDirective(TranslateDirective), ], - providers: [MockProvider(ComplaintResponseService), MockProvider(ComplaintService), MockProvider(AlertService)], + providers: [provideRouter([]), MockProvider(ComplaintResponseService), MockProvider(ComplaintService), MockProvider(AlertService)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/course/course-admin.service.spec.ts b/src/test/javascript/spec/component/course/course-admin.service.spec.ts index 23cfe17745f6..49e455d54a72 100644 --- a/src/test/javascript/spec/component/course/course-admin.service.spec.ts +++ b/src/test/javascript/spec/component/course/course-admin.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -12,6 +12,7 @@ import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.s import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { CourseAdminService } from 'app/course/manage/course-admin.service'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { provideHttpClient } from '@angular/common/http'; describe('Course Admin Service', () => { let courseAdminService: CourseAdminService; @@ -23,8 +24,10 @@ describe('Course Admin Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts index 3a2e57aa1588..8f8f1634603e 100644 --- a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts @@ -6,7 +6,6 @@ import { of } from 'rxjs'; import { Course } from 'app/entities/course.model'; import { MockComponent, MockDirective, MockModule, MockPipe } from 'ng-mocks'; import { OrionFilterDirective } from 'app/shared/orion/orion-filter.directive'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock-has-any-authority.directive'; import { TranslateService } from '@ngx-translate/core'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; @@ -15,7 +14,7 @@ import { CourseExercisesComponent } from 'app/overview/course-exercises/course-e import { CourseExerciseRowComponent } from 'app/overview/course-exercises/course-exercise-row.component'; import { SidePanelComponent } from 'app/shared/side-panel/side-panel.component'; import { MockTranslateService, TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, RouterModule } from '@angular/router'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { Exercise } from 'app/entities/exercise.model'; import dayjs from 'dayjs/esm'; @@ -45,11 +44,10 @@ describe('CourseExercisesComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, FormsModule, RouterTestingModule.withRoutes([]), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], + imports: [ArtemisTestModule, FormsModule, RouterModule.forRoot([]), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], declarations: [ CourseExercisesComponent, SidebarComponent, - SearchFilterComponent, MockDirective(OrionFilterDirective), MockComponent(CourseExerciseRowComponent), MockComponent(SidePanelComponent), @@ -61,6 +59,7 @@ describe('CourseExercisesComponent', () => { MockDirective(DeleteButtonDirective), MockTranslateValuesDirective, MockPipe(SearchFilterPipe), + MockComponent(SearchFilterComponent), ], providers: [ { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/course/course-for-import-dto-paging-service.spec.ts b/src/test/javascript/spec/component/course/course-for-import-dto-paging-service.spec.ts index ab3bac8da196..2df37d2275b2 100644 --- a/src/test/javascript/spec/component/course/course-for-import-dto-paging-service.spec.ts +++ b/src/test/javascript/spec/component/course/course-for-import-dto-paging-service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { AccountService } from 'app/core/auth/account.service'; @@ -6,6 +6,7 @@ import { MockAccountService } from '../../helpers/mocks/service/mock-account.ser import { CourseForImportDTOPagingService } from 'app/course/course-for-import-dto-paging-service'; import { CourseForImportDTO } from 'app/entities/course.model'; import { SortingOrder } from 'app/shared/table/pageable-table'; +import { provideHttpClient } from '@angular/common/http'; describe('CourseForImportDtoPagingService', () => { let pagingService: CourseForImportDTOPagingService; @@ -14,8 +15,8 @@ describe('CourseForImportDtoPagingService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }); pagingService = TestBed.inject(CourseForImportDTOPagingService); diff --git a/src/test/javascript/spec/component/course/course-management-tab-bar.component.spec.ts b/src/test/javascript/spec/component/course/course-management-tab-bar.component.spec.ts index 035b50fc9ad1..f65329c2fd1b 100644 --- a/src/test/javascript/spec/component/course/course-management-tab-bar.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-management-tab-bar.component.spec.ts @@ -2,13 +2,13 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; import { Course } from 'app/entities/course.model'; import { MockComponent, MockDirective, MockProvider } from 'ng-mocks'; import { CourseManagementTabBarComponent } from 'app/course/manage/course-management-tab-bar/course-management-tab-bar.component'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { of } from 'rxjs'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { CourseAdminService } from 'app/course/manage/course-admin.service'; import { EventManager } from 'app/core/util/event-manager.service'; import { ActivatedRoute, Router, RouterModule } from '@angular/router'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { HeaderCourseComponent } from 'app/overview/header-course.component'; import { ArtemisTestModule } from '../../test.module'; import { CourseExamArchiveButtonComponent } from 'app/shared/components/course-exam-archive-button/course-exam-archive-button.component'; @@ -50,8 +50,10 @@ describe('Course Management Tab Bar Component', () => { MockDirective(FeatureToggleLinkDirective), MockDirective(FeatureToggleHideDirective), ], - imports: [HttpClientTestingModule, RouterModule, ArtemisTestModule], + imports: [RouterModule, ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: { diff --git a/src/test/javascript/spec/component/course/course-management.component.spec.ts b/src/test/javascript/spec/component/course/course-management.component.spec.ts index b1b33b125911..947e6a5a3477 100644 --- a/src/test/javascript/spec/component/course/course-management.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-management.component.spec.ts @@ -11,7 +11,6 @@ import { Course } from 'app/entities/course.model'; import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { OrionFilterDirective } from 'app/shared/orion/orion-filter.directive'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock-has-any-authority.directive'; import { TranslateService } from '@ngx-translate/core'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; @@ -25,6 +24,7 @@ import { SortByDirective } from 'app/shared/sort/sort-by.directive'; import { SortDirective } from 'app/shared/sort/sort.directive'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; import { CourseAccessStorageService } from 'app/course/course-access-storage.service'; +import { provideRouter } from '@angular/router'; describe('CourseManagementComponent', () => { let fixture: ComponentFixture; @@ -90,7 +90,7 @@ describe('CourseManagementComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([])], + imports: [ArtemisTestModule], declarations: [ CourseManagementComponent, MockDirective(OrionFilterDirective), @@ -104,6 +104,7 @@ describe('CourseManagementComponent', () => { MockComponent(DocumentationButtonComponent), ], providers: [ + provideRouter([]), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, MockProvider(TranslateService), diff --git a/src/test/javascript/spec/component/course/course-management.service.spec.ts b/src/test/javascript/spec/component/course/course-management.service.spec.ts index f98debbcc226..475e1ebe2eea 100644 --- a/src/test/javascript/spec/component/course/course-management.service.spec.ts +++ b/src/test/javascript/spec/component/course/course-management.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -28,6 +28,7 @@ import { CourseStorageService } from 'app/course/manage/course-storage.service'; import { OnlineCourseDtoModel } from 'app/lti/online-course-dto.model'; import { CoursesForDashboardDTO } from 'app/course/manage/courses-for-dashboard-dto'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { provideHttpClient } from '@angular/common/http'; describe('Course Management Service', () => { let courseManagementService: CourseManagementService; @@ -59,8 +60,10 @@ describe('Course Management Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, @@ -163,7 +166,7 @@ describe('Course Management Service', () => { .pipe(take(1)) .subscribe((res) => expect(res.body).toEqual(course)); - const req = httpMock.expectOne({ method: 'PUT', url: `${resourceUrl}/1/onlineCourseConfiguration` }); + const req = httpMock.expectOne({ method: 'PUT', url: `${resourceUrl}/1/online-course-configuration` }); req.flush(returnedFromService); tick(); })); @@ -474,7 +477,7 @@ describe('Course Management Service', () => { const submissions = [submission]; returnedFromService = [...submissions]; courseManagementService.findAllLockedSubmissionsOfCourse(course.id!).subscribe((res) => expect(res.body).toEqual(submissions)); - const req = httpMock.expectOne({ method: 'GET', url: `${resourceUrl}/${course.id}/lockedSubmissions` }); + const req = httpMock.expectOne({ method: 'GET', url: `${resourceUrl}/${course.id}/locked-submissions` }); req.flush(returnedFromService); tick(); })); diff --git a/src/test/javascript/spec/component/course/course-overview.component.spec.ts b/src/test/javascript/spec/component/course/course-overview.component.spec.ts index b411f3760596..8a92520473bf 100644 --- a/src/test/javascript/spec/component/course/course-overview.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-overview.component.spec.ts @@ -5,10 +5,9 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ArtemisTestModule } from '../../test.module'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; -import { ActivatedRoute, Params, Router } from '@angular/router'; +import { ActivatedRoute, Params, Router, RouterModule } from '@angular/router'; import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model'; import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock-has-any-authority.directive'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { CourseExerciseRowComponent } from 'app/overview/course-exercises/course-exercise-row.component'; @@ -165,8 +164,8 @@ describe('CourseOverviewComponent', () => { TestBed.configureTestingModule({ imports: [ + RouterModule.forRoot([]), ArtemisTestModule, - RouterTestingModule.withRoutes([]), MockModule(MatSidenavModule), MockModule(NgbTooltipModule), MockModule(BrowserAnimationsModule), @@ -216,6 +215,7 @@ describe('CourseOverviewComponent', () => { fixture = TestBed.createComponent(CourseOverviewComponent); component = fixture.componentInstance; + component.isLti = false; courseService = TestBed.inject(CourseManagementService); courseStorageService = TestBed.inject(CourseStorageService); examParticipationService = TestBed.inject(ExamParticipationService); @@ -647,14 +647,18 @@ describe('CourseOverviewComponent', () => { }); it('should display content of dropdown when dropdownOpen changes', () => { - itemsDrop.open(); - fixture.detectChanges(); - expect(component.itemsDrop.isOpen).toBeTrue(); + if (component.itemsDrop) { + itemsDrop.open(); + fixture.detectChanges(); + expect(component.itemsDrop.isOpen).toBeTrue(); + } }); it('should hide content of dropdown when dropdownOpen changes', () => { - itemsDrop.close(); - fixture.detectChanges(); - expect(component.itemsDrop.isOpen).toBeFalse(); + if (component.itemsDrop) { + itemsDrop.close(); + fixture.detectChanges(); + expect(component.itemsDrop.isOpen).toBeFalse(); + } }); it('should display more icon and label if at least one item gets hidden in the sidebar', () => { @@ -668,11 +672,13 @@ describe('CourseOverviewComponent', () => { }); it('should change dropdownOpen when clicking on More', () => { - itemsDrop.close(); - const clickOnMoreItem = fixture.nativeElement.querySelector('.three-dots'); - clickOnMoreItem.click(); + if (component.itemsDrop) { + itemsDrop.close(); + const clickOnMoreItem = fixture.nativeElement.querySelector('.three-dots'); + clickOnMoreItem.click(); - expect(fixture.nativeElement.querySelector('.dropdown-content').hidden).toBeFalse(); + expect(fixture.nativeElement.querySelector('.dropdown-content').hidden).toBeFalse(); + } }); it('should apply exam-wrapper and exam-is-active if exam is started', () => { diff --git a/src/test/javascript/spec/component/course/course-overview.service.spec.ts b/src/test/javascript/spec/component/course/course-overview.service.spec.ts index 7dbc94aabaea..728d0fb269a8 100644 --- a/src/test/javascript/spec/component/course/course-overview.service.spec.ts +++ b/src/test/javascript/spec/component/course/course-overview.service.spec.ts @@ -6,7 +6,7 @@ import { UMLDiagramType } from '@ls1intum/apollon'; import { Course } from 'app/entities/course.model'; import dayjs from 'dayjs/esm'; import { Lecture } from 'app/entities/lecture.model'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; @@ -14,6 +14,7 @@ import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.s import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Exam } from 'app/entities/exam/exam.model'; import { ChannelDTO, ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model'; +import { provideHttpClient } from '@angular/common/http'; describe('CourseOverviewService', () => { let service: CourseOverviewService; @@ -36,8 +37,10 @@ describe('CourseOverviewService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), CourseOverviewService, { provide: TranslateService, useClass: MockTranslateService }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/course/course-statistics/course-management-statistics.component.spec.ts b/src/test/javascript/spec/component/course/course-statistics/course-management-statistics.component.spec.ts index dde47fbdeadd..5f96004ea5ac 100644 --- a/src/test/javascript/spec/component/course/course-statistics/course-management-statistics.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-statistics/course-management-statistics.component.spec.ts @@ -3,7 +3,6 @@ import { ArtemisTestModule } from '../../../test.module'; import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockHasAnyAuthorityDirective } from '../../../helpers/mocks/directive/mock-has-any-authority.directive'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; @@ -15,6 +14,7 @@ import { of } from 'rxjs'; import { StatisticsAverageScoreGraphComponent } from 'app/shared/statistics-graph/statistics-average-score-graph.component'; import { ExerciseType } from 'app/entities/exercise.model'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; +import { RouterModule } from '@angular/router'; describe('CourseManagementStatisticsComponent', () => { let fixture: ComponentFixture; @@ -31,7 +31,7 @@ describe('CourseManagementStatisticsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([])], + imports: [ArtemisTestModule, RouterModule.forRoot([])], declarations: [ CourseManagementStatisticsComponent, MockComponent(StatisticsGraphComponent), diff --git a/src/test/javascript/spec/component/course/course-unenrollment/course-unenrollment-modal.component.spec.ts b/src/test/javascript/spec/component/course/course-unenrollment/course-unenrollment-modal.component.spec.ts index f95c539004ac..3c939b4ecf7a 100644 --- a/src/test/javascript/spec/component/course/course-unenrollment/course-unenrollment-modal.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-unenrollment/course-unenrollment-modal.component.spec.ts @@ -12,9 +12,8 @@ import { By } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ReactiveFormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; -import { Router } from '@angular/router'; +import { Router, provideRouter } from '@angular/router'; describe('CourseRegistrationButtonComponent', () => { let fixture: ComponentFixture; @@ -29,9 +28,9 @@ describe('CourseRegistrationButtonComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, ReactiveFormsModule, RouterTestingModule.withRoutes([])], + imports: [ArtemisTestModule, ReactiveFormsModule], declarations: [CourseUnenrollmentModalComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe)], - providers: [MockProvider(CourseManagementService), MockProvider(AlertService), MockProvider(TranslateService)], + providers: [provideRouter([]), MockProvider(CourseManagementService), MockProvider(AlertService), MockProvider(TranslateService)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/course/course-update.component.spec.ts b/src/test/javascript/spec/component/course/course-update.component.spec.ts index 289e91dbd948..9a8d29a1b1fd 100644 --- a/src/test/javascript/spec/component/course/course-update.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-update.component.spec.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; @@ -37,7 +37,7 @@ import { By } from '@angular/platform-browser'; import { EventManager } from 'app/core/util/event-manager.service'; import { cloneDeep } from 'lodash-es'; import { FeatureToggleHideDirective } from 'app/shared/feature-toggle/feature-toggle-hide.directive'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; import { ImageCropperModalComponent } from 'app/course/manage/image-cropper-modal.component'; import { FeatureToggle, FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service'; @@ -840,16 +840,10 @@ describe('Course Management Student Course Analytics Dashboard Update', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ArtemisTestModule, - HttpClientTestingModule, - MockModule(ReactiveFormsModule), - MockModule(FormsModule), - ImageCropperModule, - MockDirective(NgbTypeahead), - MockModule(NgbTooltipModule), - ], + imports: [ArtemisTestModule, MockModule(ReactiveFormsModule), MockModule(FormsModule), ImageCropperModule, MockDirective(NgbTypeahead), MockModule(NgbTooltipModule)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: AccountService, useClass: MockAccountService }, @@ -960,16 +954,10 @@ describe('Course Management Update Component Create', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ArtemisTestModule, - HttpClientTestingModule, - MockModule(ReactiveFormsModule), - MockModule(FormsModule), - ImageCropperModule, - MockDirective(NgbTypeahead), - MockModule(NgbTooltipModule), - ], + imports: [ArtemisTestModule, MockModule(ReactiveFormsModule), MockModule(FormsModule), ImageCropperModule, MockDirective(NgbTypeahead), MockModule(NgbTooltipModule)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: AccountService, useClass: MockAccountService }, diff --git a/src/test/javascript/spec/component/course/course.component.spec.ts b/src/test/javascript/spec/component/course/course.component.spec.ts index 0922550c27e3..925a54864297 100644 --- a/src/test/javascript/spec/component/course/course.component.spec.ts +++ b/src/test/javascript/spec/component/course/course.component.spec.ts @@ -1,9 +1,8 @@ import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { HttpTestingController } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { Location } from '@angular/common'; -import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { DueDateStat } from 'app/course/dashboards/due-date-stat.model'; import { CourseForDashboardDTO } from 'app/course/manage/course-for-dashboard-dto'; @@ -34,6 +33,8 @@ import { of } from 'rxjs'; import dayjs from 'dayjs/esm'; import { Exam } from 'app/entities/exam/exam.model'; import { CourseAccessStorageService } from 'app/course/course-access-storage.service'; +import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe'; +import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; const endDate1 = dayjs().add(1, 'days'); const visibleDate1 = dayjs().subtract(1, 'days'); @@ -93,7 +94,7 @@ describe('CoursesComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([{ path: 'courses/:courseId/exams/:examId', component: DummyComponent }])], + imports: [ArtemisTestModule, RouterModule.forRoot([{ path: 'courses/:courseId/exams/:examId', component: DummyComponent }])], declarations: [ CoursesComponent, MockDirective(MockHasAnyAuthorityDirective), @@ -101,10 +102,12 @@ describe('CoursesComponent', () => { MockDirective(SortDirective), MockDirective(SortByDirective), MockPipe(ArtemisDatePipe), + MockPipe(SearchFilterPipe), MockComponent(CourseExerciseRowComponent), MockComponent(CourseExercisesComponent), MockComponent(CourseRegistrationComponent), MockComponent(CourseCardComponent), + MockComponent(SearchFilterComponent), ], providers: [ { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/course/detail/course-detail-doughnut-chart.component.spec.ts b/src/test/javascript/spec/component/course/detail/course-detail-doughnut-chart.component.spec.ts index ad3246741090..d73a030743dd 100644 --- a/src/test/javascript/spec/component/course/detail/course-detail-doughnut-chart.component.spec.ts +++ b/src/test/javascript/spec/component/course/detail/course-detail-doughnut-chart.component.spec.ts @@ -1,4 +1,3 @@ -import { RouterTestingModule } from '@angular/router/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../../test.module'; import { CourseDetailDoughnutChartComponent } from 'app/course/manage/detail/course-detail-doughnut-chart.component'; @@ -7,6 +6,7 @@ import { MockModule, MockPipe } from 'ng-mocks'; import { DoughnutChartType } from 'app/course/manage/detail/course-detail.component'; import { Course } from 'app/entities/course.model'; import { PieChartModule } from '@swimlane/ngx-charts'; +import { provideRouter } from '@angular/router'; describe('CourseDetailDoughnutChartComponent', () => { let fixture: ComponentFixture; @@ -19,8 +19,9 @@ describe('CourseDetailDoughnutChartComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(PieChartModule)], + imports: [ArtemisTestModule, MockModule(PieChartModule)], declarations: [CourseDetailDoughnutChartComponent, MockPipe(ArtemisTranslatePipe)], + providers: [provideRouter([])], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts index 5bf796d51879..f962626e8e37 100644 --- a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; @@ -16,6 +15,7 @@ import { NgxChartsSingleSeriesDataEntry } from 'app/shared/chart/ngx-charts-data import { ExerciseType } from 'app/entities/exercise.model'; import { LocaleConversionService } from 'app/shared/service/locale-conversion.service'; import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { RouterModule } from '@angular/router'; describe('ExamScoresAverageScoresGraphComponent', () => { let fixture: ComponentFixture; @@ -55,7 +55,7 @@ describe('ExamScoresAverageScoresGraphComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)], + imports: [ArtemisTestModule, MockModule(BarChartModule), RouterModule.forRoot([])], declarations: [ExamScoresAverageScoresGraphComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], providers: [ MockProvider(CourseManagementService, { diff --git a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts index 7dd87ad9bef8..88fad0011056 100644 --- a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts @@ -4,10 +4,9 @@ import { Component } from '@angular/core'; import cloneDeep from 'lodash-es/cloneDeep'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { RouterTestingModule } from '@angular/router/testing'; -import { ActivatedRoute, Router, UrlSegment } from '@angular/router'; +import { ActivatedRoute, Router, UrlSegment, provideRouter } from '@angular/router'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { HttpErrorResponse, HttpResponse, provideHttpClient } from '@angular/common/http'; import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ExamUpdateComponent, prepareExamForImport } from 'app/exam/manage/exams/exam-update.component'; @@ -43,6 +42,7 @@ import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/ti import { UMLDiagramType } from '@ls1intum/apollon'; import { TextExercise } from 'app/entities/text/text-exercise.model'; import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; @Component({ template: '', @@ -73,7 +73,7 @@ describe('ExamUpdateComponent', () => { describe('create and edit exams', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes(routes), MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, HttpClientModule, ArtemisExamModePickerModule], + imports: [MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, ArtemisExamModePickerModule], declarations: [ ExamUpdateComponent, MockComponent(FormDateTimePickerComponent), @@ -89,6 +89,9 @@ describe('ExamUpdateComponent', () => { MockComponent(TitleChannelNameComponent), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), + provideRouter(routes), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, MockDirective(TranslateDirective), @@ -601,7 +604,7 @@ describe('ExamUpdateComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes(routes), MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, HttpClientModule, ArtemisExamModePickerModule], + imports: [MockModule(NgbModule), TranslateModule.forRoot(), FormsModule, ArtemisExamModePickerModule], declarations: [ ExamUpdateComponent, ExamExerciseImportComponent, @@ -621,6 +624,9 @@ describe('ExamUpdateComponent', () => { MockComponent(TitleChannelNameComponent), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), + provideRouter(routes), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, MockDirective(TranslateDirective), diff --git a/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts index 747d87a8a3c5..e7ba34a33bb2 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { Course } from 'app/entities/course.model'; import { ArtemisTestModule } from '../../../test.module'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; @@ -17,6 +17,7 @@ import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { provideHttpClient } from '@angular/common/http'; describe('Exam Management Service Tests', () => { let service: ExamManagementService; @@ -35,8 +36,8 @@ describe('Exam Management Service Tests', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [ExamManagementService], - imports: [ArtemisTestModule, HttpClientTestingModule], + providers: [provideHttpClient(), provideHttpClientTesting(), ExamManagementService], + imports: [ArtemisTestModule], }); service = TestBed.inject(ExamManagementService); @@ -635,7 +636,7 @@ describe('Exam Management Service Tests', () => { // THEN const req = httpMock.expectOne({ method: 'GET', - url: `${service.resourceUrl}/${course.id!}/exams/${mockExam.id!}/lockedSubmissions`, + url: `${service.resourceUrl}/${course.id!}/exams/${mockExam.id!}/locked-submissions`, }); req.flush(mockResponse); tick(); diff --git a/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts index dfe43434b530..4418d84f29ac 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ActivatedRoute, Router, UrlSegment, convertToParamMap } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, Router, UrlSegment, convertToParamMap, provideRouter } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { User } from 'app/core/user/user.model'; import { Course } from 'app/entities/course.model'; @@ -12,9 +11,8 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { SortService } from 'app/shared/service/sort.service'; import { SortDirective } from 'app/shared/sort/sort.directive'; import { HttpResponse } from '@angular/common/http'; -import { of } from 'rxjs'; +import { Observable, of } from 'rxjs'; import { MockDirective, MockPipe } from 'ng-mocks'; -import { Observable } from 'rxjs'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { MockNgbModalService } from '../../../helpers/mocks/service/mock-ngb-modal.service'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; @@ -43,9 +41,10 @@ describe('ExamStudentsAttendanceCheckComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [ExamStudentsAttendanceCheckComponent, MockDirective(TranslateDirective), MockDirective(SortDirective), MockPipe(ArtemisTranslatePipe)], providers: [ + provideRouter([]), { provide: TranslateService, useClass: MockTranslateService }, { provide: NgbModal, useClass: MockNgbModalService }, { provide: Router, useClass: MockRouter }, diff --git a/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts index 068acb5558ea..cdcea3157be7 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts @@ -1,7 +1,6 @@ import { HttpResponse } from '@angular/common/http'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ActivatedRoute, UrlSegment, convertToParamMap } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, UrlSegment, convertToParamMap, provideRouter } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { NgxDatatableModule } from '@siemens/ngx-datatable'; import { User } from 'app/core/user/user.model'; @@ -61,7 +60,7 @@ describe('ExamStudentsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgxDatatableModule, RouterTestingModule], + imports: [ArtemisTestModule, NgxDatatableModule], declarations: [ ExamStudentsComponent, MockComponent(UsersImportButtonComponent), @@ -71,10 +70,7 @@ describe('ExamStudentsComponent', () => { MockDirective(DeleteButtonDirective), MockPipe(ArtemisTranslatePipe), ], - providers: [ - { provide: TranslateService, useClass: MockTranslateService }, - { provide: ActivatedRoute, useValue: route }, - ], + providers: [provideRouter([]), { provide: TranslateService, useClass: MockTranslateService }, { provide: ActivatedRoute, useValue: route }], }).compileComponents(); fixture = TestBed.createComponent(ExamStudentsComponent); diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts index da54d7079565..60b382f6d9cb 100644 --- a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts @@ -1,17 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; -import { RouterTestingModule } from '@angular/router/testing'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { Component } from '@angular/core'; import { HasAnyAuthorityDirective } from 'app/shared/auth/has-any-authority.directive'; import { ChecklistCheckComponent } from 'app/shared/components/checklist-check/checklist-check.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ProgressBarComponent } from 'app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component'; import { ExamChecklistExerciseGroupTableComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist-exercisegroup-table/exam-checklist-exercisegroup-table.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ExerciseGroupVariantColumn } from 'app/entities/exercise-group-variant-column.model'; +import { provideHttpClient } from '@angular/common/http'; +import { provideRouter } from '@angular/router'; @Component({ template: '', @@ -57,18 +58,7 @@ describe('ExamChecklistExerciseGroupTableComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - RouterTestingModule.withRoutes([ - { path: 'course-management/:courseId/exams/:examId/edit', component: DummyComponent }, - { path: 'course-management/:courseId/exams/:examId/exercise-groups', component: DummyComponent }, - { path: 'course-management/:courseId/exams/:examId/assessment-dashboard', component: DummyComponent }, - { path: 'course-management/:courseId/exams/:examId/scores', component: DummyComponent }, - { path: 'course-management/:courseId/exams/:examId/student-exams', component: DummyComponent }, - { path: 'course-management/:courseId/exams/:examId/test-runs', component: DummyComponent }, - { path: 'course-management/:courseId/exams/:examId/students', component: DummyComponent }, - ]), - HttpClientTestingModule, - ], + imports: [], declarations: [ DummyComponent, MockPipe(ArtemisTranslatePipe), @@ -80,7 +70,19 @@ describe('ExamChecklistExerciseGroupTableComponent', () => { ProgressBarComponent, MockComponent(FaIconComponent), ], - providers: [], + providers: [ + provideRouter([ + { path: 'course-management/:courseId/exams/:examId/edit', component: DummyComponent }, + { path: 'course-management/:courseId/exams/:examId/exercise-groups', component: DummyComponent }, + { path: 'course-management/:courseId/exams/:examId/assessment-dashboard', component: DummyComponent }, + { path: 'course-management/:courseId/exams/:examId/scores', component: DummyComponent }, + { path: 'course-management/:courseId/exams/:examId/student-exams', component: DummyComponent }, + { path: 'course-management/:courseId/exams/:examId/test-runs', component: DummyComponent }, + { path: 'course-management/:courseId/exams/:examId/students', component: DummyComponent }, + ]), + provideHttpClient(), + provideHttpClientTesting(), + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts index 4abd8b00e497..811b2574c994 100644 --- a/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts @@ -1,10 +1,9 @@ import { Location } from '@angular/common'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { Component } from '@angular/core'; import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ActivatedRoute, Data, Router } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, Data, Router, RouterModule } from '@angular/router'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { AccountService } from 'app/core/auth/account.service'; import { Course } from 'app/entities/course.model'; @@ -23,7 +22,7 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { CourseExamArchiveButtonComponent } from 'app/shared/components/course-exam-archive-button/course-exam-archive-button.component'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { of } from 'rxjs'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; import { MockAccountService } from '../../../../helpers/mocks/service/mock-account.service'; @@ -62,7 +61,7 @@ describe('ExamDetailComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - RouterTestingModule.withRoutes([ + RouterModule.forRoot([ { path: 'course-management/:courseId/exams/:examId/edit', component: DummyComponent }, { path: 'course-management/:courseId/exams/:examId/exercise-groups', component: DummyComponent }, { @@ -75,7 +74,6 @@ describe('ExamDetailComponent', () => { { path: 'course-management/:courseId/exams/:examId/students', component: DummyComponent }, { path: 'course-management/:courseId/exams', component: DummyComponent }, ]), - HttpClientTestingModule, ExerciseDetailDirective, MockComponent(NoDataComponent), ], @@ -101,6 +99,8 @@ describe('ExamDetailComponent', () => { MockDirective(ExerciseDetailDirective), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: { diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts index 040752cb4ffb..d46517c338eb 100644 --- a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts @@ -1,7 +1,6 @@ import { HttpResponse } from '@angular/common/http'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, Router, convertToParamMap, provideRouter } from '@angular/router'; import { faCheckDouble, faFileUpload, faFont, faKeyboard, faProjectDiagram } from '@fortawesome/free-solid-svg-icons'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; @@ -59,7 +58,7 @@ describe('Exercise Groups Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [ ExerciseGroupsComponent, MockComponent(ExamExerciseRowButtonsComponent), @@ -74,6 +73,7 @@ describe('Exercise Groups Component', () => { MockDirective(TranslateDirective), ], providers: [ + provideRouter([]), MockProvider(AlertService), { provide: ActivatedRoute, useValue: route }, { provide: Router, useClass: MockRouter }, diff --git a/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts b/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts index cb10c66e1574..3a0d9d6e640c 100644 --- a/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts @@ -83,7 +83,7 @@ describe('ProgrammingExerciseExamDiffComponent', () => { const modalServiceSpy = jest.spyOn(modal, 'open'); component.exercise = { id: 1 } as ProgrammingExercise; component.showGitDiff(); - expect(modalServiceSpy).toHaveBeenCalledExactlyOnceWith(GitDiffReportModalComponent, { size: 'xl' }); + expect(modalServiceSpy).toHaveBeenCalledExactlyOnceWith(GitDiffReportModalComponent, { windowClass: GitDiffReportModalComponent.WINDOW_CLASS }); }); it('should use reports from cache if available', fakeAsync(() => { diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts index 64ad9c2198c0..94355a8b80fd 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts @@ -4,7 +4,6 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgxDatatableModule } from '@siemens/ngx-datatable'; import { TranslateModule } from '@ngx-translate/core'; -import { RouterTestingModule } from '@angular/router/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; @@ -24,6 +23,7 @@ import { AlertService } from 'app/core/util/alert.service'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { faCheckDouble, faFileUpload, faKeyboard, faProjectDiagram } from '@fortawesome/free-solid-svg-icons'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { provideRouter } from '@angular/router'; describe('StudentExamDetailTableRowComponent', () => { let studentExamDetailTableRowComponentFixture: ComponentFixture; @@ -45,9 +45,9 @@ describe('StudentExamDetailTableRowComponent', () => { exercise.studentParticipations = [studentParticipation]; return TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), NgbModule, NgxDatatableModule, ReactiveFormsModule, TranslateModule.forRoot()], + imports: [NgbModule, NgxDatatableModule, ReactiveFormsModule, TranslateModule.forRoot()], declarations: [StudentExamDetailTableRowComponent, MockComponent(DataTableComponent), MockTranslateValuesDirective, MockPipe(ArtemisTranslatePipe)], - providers: [MockProvider(AlertService), MockDirective(TranslateDirective)], + providers: [provideRouter([]), MockProvider(AlertService), MockDirective(TranslateDirective)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts index 7f2a3e46ff70..73e1d256c63c 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts @@ -6,13 +6,12 @@ import { StudentExam } from 'app/entities/student-exam.model'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { StudentExamService } from 'app/exam/manage/student-exams/student-exam.service'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { of } from 'rxjs'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, RouterModule } from '@angular/router'; import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgxDatatableModule } from '@siemens/ngx-datatable'; import { TranslateModule } from '@ngx-translate/core'; -import { RouterTestingModule } from '@angular/router/testing'; import { NgForm, NgModel, ReactiveFormsModule } from '@angular/forms'; import { Exercise } from 'app/entities/exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; @@ -24,7 +23,7 @@ import { ParticipationType } from 'app/entities/participation/participation.mode import { Result } from 'app/entities/result.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { StudentExamDetailTableRowComponent } from 'app/exam/manage/student-exams/student-exam-detail-table-row/student-exam-detail-table-row.component'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { DataTableComponent } from 'app/shared/data-table/data-table.component'; import { AlertService } from 'app/core/util/alert.service'; import { TranslateDirective } from 'app/shared/language/translate.directive'; @@ -128,15 +127,7 @@ describe('StudentExamDetailComponent', () => { } as StudentExamWithGradeDTO; await TestBed.configureTestingModule({ - imports: [ - ArtemisTestModule, - RouterTestingModule.withRoutes([]), - NgbModule, - NgxDatatableModule, - ReactiveFormsModule, - TranslateModule.forRoot(), - HttpClientTestingModule, - ], + imports: [ArtemisTestModule, NgbModule, NgxDatatableModule, ReactiveFormsModule, TranslateModule.forRoot(), RouterModule.forRoot([])], declarations: [ StudentExamDetailComponent, MockComponent(DataTableComponent), @@ -150,6 +141,8 @@ describe('StudentExamDetailComponent', () => { StudentExamDetailTableRowComponent, ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(StudentExamService, { updateWorkingTime: () => { return of( diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts index 224db870bc21..17e860891743 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ActivatedRoute, Params, convertToParamMap } from '@angular/router'; +import { ActivatedRoute, Params, convertToParamMap, provideRouter } from '@angular/router'; import { StudentExamsComponent } from 'app/exam/manage/student-exams/student-exams.component'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; @@ -7,7 +7,6 @@ import { StudentExamService } from 'app/exam/manage/student-exams/student-exam.s import { CourseManagementService } from 'app/course/manage/course-management.service'; import { TranslateService } from '@ngx-translate/core'; import { NgxDatatableModule } from '@siemens/ngx-datatable'; -import { RouterTestingModule } from '@angular/router/testing'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { MockLocalStorageService } from '../../../../helpers/mocks/service/mock-local-storage.service'; @@ -49,6 +48,7 @@ describe('StudentExamsComponent', () => { const referenceDateNow = dayjs(); const providers = [ + provideRouter([]), MockProvider(ExamManagementService, { find: () => { return of( @@ -208,7 +208,7 @@ describe('StudentExamsComponent', () => { studentExams = [studentExamOne, studentExamTwo]; return TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), MockModule(NgxDatatableModule)], + imports: [MockModule(NgxDatatableModule)], declarations: [ StudentExamsComponent, MockComponent(StudentExamStatusComponent), diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts index 0760f147551b..d49930cd7a21 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts @@ -1,8 +1,9 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { SuspiciousSessionsService } from 'app/exam/manage/suspicious-behavior/suspicious-sessions.service'; import { SuspiciousExamSessions, SuspiciousSessionReason, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam/exam-session.model'; +import { provideHttpClient } from '@angular/common/http'; describe('SuspiciousSessionsService', () => { let service: SuspiciousSessionsService; @@ -34,7 +35,8 @@ describe('SuspiciousSessionsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(SuspiciousSessionsService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts index 45ce49fc2b4d..2645f07b9ce2 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts @@ -20,6 +20,8 @@ import { TranslateService } from '@ngx-translate/core'; import { facSaveSuccess, facSaveWarning } from 'src/main/webapp/content/icons/icons'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ExamLiveEventsButtonComponent } from 'app/exam/participate/events/exam-live-events-button.component'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; describe('ExamNavigationSidebarComponent', () => { let fixture: ComponentFixture; @@ -33,8 +35,8 @@ describe('ExamNavigationSidebarComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, TranslateTestingModule, MockModule(NgbTooltipModule)], - declarations: [ExamNavigationSidebarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent)], + imports: [ArtemisTestModule, TranslateTestingModule, MockModule(NgbTooltipModule), MockModule(ArtemisSharedCommonModule)], + declarations: [ExamNavigationSidebarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent), MockComponent(SearchFilterComponent)], providers: [ ExamParticipationService, { provide: ExamExerciseUpdateService, useValue: mockExamExerciseUpdateService }, diff --git a/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts index 6332ee962a6c..c675ea69d8c7 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { User } from 'app/core/user/user.model'; import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; @@ -15,6 +14,7 @@ import { ArtemisSharedModule } from 'app/shared/shared.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ArtemisExamSharedModule } from 'app/exam/shared/exam-shared.module'; import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { provideRouter } from '@angular/router'; let fixture: ComponentFixture; let component: ExamStartInformationComponent; @@ -40,7 +40,7 @@ describe('ExamStartInformationComponent', () => { studentExam = { id: 1, exam, user, workingTime: 60, submitted: true } as StudentExam; return TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), ArtemisSharedModule, ArtemisSharedComponentModule, ArtemisExamSharedModule], + imports: [ArtemisSharedModule, ArtemisSharedComponentModule, ArtemisExamSharedModule], declarations: [ ExamStartInformationComponent, MockComponent(StudentExamWorkingTimeComponent), @@ -50,6 +50,7 @@ describe('ExamStartInformationComponent', () => { MockPipe(ArtemisDatePipe), MockPipe(ArtemisDurationFromSecondsPipe), ], + providers: [provideRouter([])], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts index 83319f461faf..9c10ec5ca996 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts @@ -77,10 +77,9 @@ describe('FileUploadExamSubmissionComponent', () => { expect(FileUploadExamSubmissionComponent).not.toBeNull(); }); - it('should show exercise group title', () => { - comp.exercise.exerciseGroup = { title: 'Test Group' } as ExerciseGroup; + it('should show static text in header', () => { fixture.detectChanges(); - const el = fixture.debugElement.query((de) => de.nativeElement.textContent === comp.exercise.exerciseGroup?.title); + const el = fixture.debugElement.query((de) => de.nativeElement.textContent === 'artemisApp.exam.yourSolution'); expect(el).not.toBeNull(); }); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts index 1277bc869032..60731362866e 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts @@ -16,7 +16,6 @@ import { ArtemisTestModule } from '../../../../test.module'; import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; import { ExamExerciseUpdateHighlighterComponent } from 'app/exam/participate/exercises/exam-exercise-update-highlighter/exam-exercise-update-highlighter.component'; import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module'; -import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { SubmissionVersion } from 'app/entities/submission-version.model'; describe('ModelingExamSubmissionComponent', () => { @@ -69,10 +68,9 @@ describe('ModelingExamSubmissionComponent', () => { expect(ModelingExamSubmissionComponent).not.toBeNull(); }); - it('should show exercise group title', () => { - comp.exercise.exerciseGroup = { title: 'Test Group' } as ExerciseGroup; + it('should show static text in header', () => { fixture.detectChanges(); - const el = fixture.debugElement.query((de) => de.nativeElement.textContent === comp.exercise.exerciseGroup?.title); + const el = fixture.debugElement.query((de) => de.nativeElement.textContent === 'artemisApp.exam.yourSolution'); expect(el).not.toBeNull(); }); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts index 1ec885212f1e..c83015c99c75 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model'; import { DragAndDropQuestion } from 'app/entities/quiz/drag-and-drop-question.model'; @@ -25,6 +24,7 @@ import { SubmissionVersion } from 'app/entities/submission-version.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { Course } from 'app/entities/course.model'; +import { provideRouter } from '@angular/router'; describe('QuizExamSubmissionComponent', () => { let fixture: ComponentFixture; @@ -47,7 +47,7 @@ describe('QuizExamSubmissionComponent', () => { shortAnswerQuestion.id = 3; return TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), NgbTooltipMocksModule], + imports: [NgbTooltipMocksModule], declarations: [ QuizExamSubmissionComponent, MockPipe(ArtemisTranslatePipe), @@ -56,7 +56,7 @@ describe('QuizExamSubmissionComponent', () => { MockComponent(DragAndDropQuestionComponent), MockComponent(ShortAnswerQuestionComponent), ], - providers: [MockProvider(ArtemisQuizService)], + providers: [provideRouter([]), MockProvider(ArtemisQuizService)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts b/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts index 9ead47365e2e..ce662f79bdf6 100644 --- a/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; +import { provideRouter } from '@angular/router'; import { User } from 'app/core/user/user.model'; import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; @@ -35,7 +35,6 @@ describe('ExamGeneralInformationComponent', () => { studentExam = { id: 1, exam, user, workingTime: 60, submitted: true } as StudentExam; return TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([])], declarations: [ ExamGeneralInformationComponent, MockComponent(StudentExamWorkingTimeComponent), @@ -43,6 +42,7 @@ describe('ExamGeneralInformationComponent', () => { MockPipe(ArtemisDatePipe), MockPipe(ArtemisDurationFromSecondsPipe), ], + providers: [provideRouter([])], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts index a36b5b62eb0e..f144828d2e74 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts @@ -1,8 +1,7 @@ -import { HttpClientModule, HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ActivatedRoute, convertToParamMap } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, convertToParamMap, provideRouter } from '@angular/router'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { ComplaintsStudentViewComponent } from 'app/complaints/complaints-for-students/complaints-student-view.component'; import { ThemeService } from 'app/core/theme/theme.service'; @@ -56,6 +55,7 @@ import { AlertService } from 'app/core/util/alert.service'; import { ProgrammingExerciseExampleSolutionRepoDownloadComponent } from 'app/exercises/programming/shared/actions/programming-exercise-example-solution-repo-download.component'; import * as ExamUtils from 'app/exam/participate/exam.utils'; import { CollapsibleCardComponent } from 'app/exam/participate/summary/collapsible-card.component'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; let fixture: ComponentFixture; let component: ExamResultSummaryComponent; @@ -172,7 +172,7 @@ const gradeInfo: StudentExamWithGradeDTO = { function sharedSetup(url: string[]) { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), HttpClientModule, NgbCollapseMocksModule], + imports: [NgbCollapseMocksModule], declarations: [ ExamResultSummaryComponent, MockComponent(TestRunRibbonComponent), @@ -197,6 +197,9 @@ function sharedSetup(url: string[]) { MockComponent(CollapsibleCardComponent), ], providers: [ + provideRouter([]), + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: { diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-exam-summary.component.spec.ts index 37611dc202f5..f06a761ea035 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-exam-summary.component.spec.ts @@ -2,11 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FileUploadExamSummaryComponent } from 'app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component'; import { MockComponent, MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; import { By } from '@angular/platform-browser'; import { FileUploadSubmissionComponent } from 'app/exercises/file-upload/participate/file-upload-submission.component'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; +import { provideHttpClient } from '@angular/common/http'; describe('FileUploadExamSummaryComponent', () => { let fixture: ComponentFixture; @@ -16,8 +17,9 @@ describe('FileUploadExamSummaryComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], declarations: [FileUploadExamSummaryComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FileUploadSubmissionComponent)], + providers: [provideHttpClient(), provideHttpClientTesting()], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts index 6dc458e8d548..aa873e10d504 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts @@ -1,4 +1,5 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; import { Exam } from 'app/entities/exam/exam.model'; @@ -77,9 +78,9 @@ describe('QuizExamSummaryComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, MockModule(ArtemisQuizQuestionTypesModule)], + imports: [MockModule(ArtemisQuizQuestionTypesModule)], declarations: [QuizExamSummaryComponent, MockPipe(ArtemisTranslatePipe)], - providers: [MockProvider(TranslateService), MockProvider(QuizExerciseService), MockProvider(ArtemisServerDateService)], + providers: [provideHttpClient(), provideHttpClientTesting(), MockProvider(TranslateService), MockProvider(QuizExerciseService), MockProvider(ArtemisServerDateService)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts index 836d997c7530..a486b4350061 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts @@ -1,6 +1,5 @@ import dayjs from 'dayjs/esm'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { User } from 'app/core/user/user.model'; @@ -13,7 +12,7 @@ import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { Result } from 'app/entities/result.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { GradeType } from 'app/entities/grading-scale.model'; @@ -22,6 +21,8 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { ExerciseResult, StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; import { GradingKeyTableComponent } from 'app/grading-system/grading-key-overview/grading-key/grading-key-table.component'; import { CollapsibleCardComponent } from 'app/exam/participate/summary/collapsible-card.component'; +import { provideHttpClient } from '@angular/common/http'; +import { provideRouter } from '@angular/router'; let fixture: ComponentFixture; let component: ExamResultOverviewComponent; @@ -128,7 +129,7 @@ const textExerciseResult = { describe('ExamResultOverviewComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), MockModule(NgbModule), HttpClientTestingModule], + imports: [MockModule(NgbModule)], declarations: [ ExamResultOverviewComponent, MockComponent(FaIconComponent), @@ -136,7 +137,7 @@ describe('ExamResultOverviewComponent', () => { MockComponent(GradingKeyTableComponent), MockComponent(CollapsibleCardComponent), ], - providers: [MockProvider(ExerciseService)], + providers: [provideRouter([]), provideHttpClient(), provideHttpClientTesting(), MockProvider(ExerciseService)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts index 40d92651dcfa..16c0eb4b276d 100644 --- a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts +++ b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts @@ -1,8 +1,7 @@ -import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { HttpErrorResponse, HttpResponse, provideHttpClient } from '@angular/common/http'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ActivatedRoute, convertToParamMap } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, RouterModule, convertToParamMap } from '@angular/router'; import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -29,6 +28,7 @@ import { MockTranslateService } from '../../../helpers/mocks/service/mock-transl import { SortDirective } from 'app/shared/sort/sort.directive'; import { AlertService } from 'app/core/util/alert.service'; import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; describe('Test Run Management Component', () => { let component: TestRunManagementComponent; @@ -49,7 +49,7 @@ describe('Test Run Management Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([]), FontAwesomeTestingModule, TranslateModule.forRoot(), HttpClientModule, NgbTooltipMocksModule], + imports: [RouterModule.forRoot([]), FontAwesomeTestingModule, TranslateModule.forRoot(), NgbTooltipMocksModule], declarations: [ TestRunManagementComponent, @@ -61,6 +61,8 @@ describe('Test Run Management Component', () => { MockDirective(TranslateDirective), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts index 4ef9a51082c3..fe8282591d2b 100644 --- a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts +++ b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts @@ -162,7 +162,7 @@ describe('ExerciseHint Management Update Component', () => { // Mock getCombinedProgrammingExerciseSettings const irisSettingsService = TestBed.inject(IrisSettingsService); - const getCombinedProgrammingExerciseSettingsSpy = jest.spyOn(irisSettingsService, 'getCombinedProgrammingExerciseSettings').mockReturnValue(of(fakeSettings)); + const getCombinedProgrammingExerciseSettingsSpy = jest.spyOn(irisSettingsService, 'getCombinedExerciseSettings').mockReturnValue(of(fakeSettings)); // Run ngOnInit comp.ngOnInit(); diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping-question-list.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping-question-list.component.spec.ts index 00839b99c1c7..e4d6fe61cc0d 100644 --- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping-question-list.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping-question-list.component.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -18,6 +18,7 @@ jest.mock('@angular/cdk/drag-drop', () => { }); import * as DragDrop from '@angular/cdk/drag-drop'; import { moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop'; +import { provideHttpClient } from '@angular/common/http'; describe('QuizPoolMappingQuestionListComponent', () => { let fixture: ComponentFixture; @@ -25,9 +26,9 @@ describe('QuizPoolMappingQuestionListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, DragDrop.DragDropModule, HttpClientTestingModule], + imports: [ArtemisTestModule, DragDrop.DragDropModule], declarations: [QuizPoolMappingQuestionListComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), MockDirective(TranslateDirective)], - providers: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping.component.spec.ts index 595a8cb073a1..8c0c3e6c9cd8 100644 --- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool-mapping.component.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ButtonComponent } from 'app/shared/components/button.component'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; @@ -13,6 +13,7 @@ import { QuizPoolMappingComponent } from 'app/exercises/quiz/manage/quiz-pool-ma import { QuizGroup } from 'app/entities/quiz/quiz-group.model'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; +import { provideHttpClient } from '@angular/common/http'; describe('QuizPoolMappingComponent', () => { let fixture: ComponentFixture; @@ -20,7 +21,7 @@ describe('QuizPoolMappingComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockDirective(NgbTooltip)], + imports: [ArtemisTestModule, MockDirective(NgbTooltip)], declarations: [ QuizPoolMappingComponent, ButtonComponent, @@ -31,7 +32,7 @@ describe('QuizPoolMappingComponent', () => { MockDirective(NgModel), MockDirective(DeleteButtonDirective), ], - providers: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts index c3c268ae9481..de726ad5d815 100644 --- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -9,7 +9,7 @@ import { QuizPoolComponent } from 'app/exercises/quiz/manage/quiz-pool.component import { ActivatedRoute, convertToParamMap } from '@angular/router'; import { QuizPoolService } from 'app/exercises/quiz/manage/quiz-pool.service'; import { of } from 'rxjs'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { QuizPool } from 'app/entities/quiz/quiz-pool.model'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; import { QuizGroup } from 'app/entities/quiz/quiz-group.model'; @@ -39,7 +39,7 @@ describe('QuizPoolComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, NgbModule, FormsModule], + imports: [ArtemisTestModule, NgbModule, FormsModule], declarations: [ QuizPoolComponent, MockComponent(QuizPoolMappingComponent), @@ -48,7 +48,7 @@ describe('QuizPoolComponent', () => { MockPipe(ArtemisDatePipe), MockDirective(TranslateDirective), ], - providers: [{ provide: ActivatedRoute, useValue: route }, MockProvider(ChangeDetectorRef), MockProvider(AlertService)], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: ActivatedRoute, useValue: route }, MockProvider(ChangeDetectorRef), MockProvider(AlertService)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts index cac2387f7258..c4584c18ccee 100644 --- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -9,7 +9,7 @@ import { CommonModule } from '@angular/common'; import { QuizQuestionListEditExistingComponent, State } from 'app/exercises/quiz/manage/quiz-question-list-edit-existing.component'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { of } from 'rxjs'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { Exam } from 'app/entities/exam/exam.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { Course } from 'app/entities/course.model'; @@ -106,9 +106,9 @@ describe('QuizQuestionListEditExistingComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CommonModule, ArtemisTestModule, HttpClientTestingModule, FormsModule], + imports: [CommonModule, ArtemisTestModule, FormsModule], declarations: [QuizQuestionListEditExistingComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), MockDirective(TranslateDirective)], - providers: [MockProvider(NgbModal), MockProvider(ChangeDetectorRef)], + providers: [provideHttpClient(), provideHttpClientTesting(), MockProvider(NgbModal), MockProvider(ChangeDetectorRef)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit.component.spec.ts index b596c65ce5b0..8c3f31495bed 100644 --- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit.component.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -10,6 +10,7 @@ import { CommonModule } from '@angular/common'; import { QuizQuestionListEditExistingComponent } from 'app/exercises/quiz/manage/quiz-question-list-edit-existing.component'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; import { ShortAnswerQuestion } from 'app/entities/quiz/short-answer-question.model'; +import { provideHttpClient } from '@angular/common/http'; describe('QuizQuestionListEditComponent', () => { let fixture: ComponentFixture; @@ -24,7 +25,7 @@ describe('QuizQuestionListEditComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CommonModule, ArtemisTestModule, HttpClientTestingModule], + imports: [CommonModule, ArtemisTestModule], declarations: [ QuizQuestionListEditComponent, MockComponent(QuizQuestionListEditExistingComponent), @@ -32,7 +33,7 @@ describe('QuizQuestionListEditComponent', () => { MockPipe(ArtemisDatePipe), MockDirective(TranslateDirective), ], - providers: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts index fcd06811ac07..ad730e43b55d 100644 --- a/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync, tick } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -139,9 +139,11 @@ describe('QuizParticipationComponent', () => { describe('live mode', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockDirective(NgbTooltip)], + imports: [ArtemisTestModule, MockDirective(NgbTooltip)], declarations: [testBedDeclarations, MockDirective(NgModel)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: { @@ -498,9 +500,11 @@ describe('QuizParticipationComponent', () => { describe('preview mode', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockDirective(NgbTooltip)], + imports: [ArtemisTestModule, MockDirective(NgbTooltip)], declarations: testBedDeclarations, providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: { @@ -577,9 +581,11 @@ describe('QuizParticipationComponent', () => { describe('practice mode', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockDirective(NgbTooltip)], + imports: [ArtemisTestModule, MockDirective(NgbTooltip)], declarations: testBedDeclarations, providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: { @@ -658,9 +664,11 @@ describe('QuizParticipationComponent', () => { describe('solution mode', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockDirective(NgbTooltip)], + imports: [ArtemisTestModule, MockDirective(NgbTooltip)], declarations: testBedDeclarations, providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: { diff --git a/src/test/javascript/spec/component/exercises/quiz/quiz-participation.service.spec.ts b/src/test/javascript/spec/component/exercises/quiz/quiz-participation.service.spec.ts index c374cbe6de55..59ba0f36dc58 100644 --- a/src/test/javascript/spec/component/exercises/quiz/quiz-participation.service.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/quiz-participation.service.spec.ts @@ -1,10 +1,11 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { QuizParticipationService } from 'app/exercises/quiz/participate/quiz-participation.service'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { Result } from 'app/entities/result.model'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../../../helpers/mocks/service/mock-account.service'; +import { provideHttpClient } from '@angular/common/http'; describe('Quiz Participation Service', () => { let service: QuizParticipationService; @@ -12,8 +13,8 @@ describe('Quiz Participation Service', () => { let exerciseId: number; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }); service = TestBed.inject(QuizParticipationService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts index e04d0625a7e2..78386edfe0c9 100644 --- a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts @@ -1,8 +1,7 @@ import { HttpResponse } from '@angular/common/http'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { NgModel } from '@angular/forms'; -import { ActivatedRoute } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, provideRouter } from '@angular/router'; import { NgxDatatableModule } from '@siemens/ngx-datatable'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; @@ -121,7 +120,7 @@ describe('Exercise Scores Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(NgxDatatableModule)], + imports: [ArtemisTestModule, MockModule(NgxDatatableModule)], declarations: [ ExerciseScoresComponent, MockComponent(ExerciseScoresExportButtonComponent), @@ -137,6 +136,7 @@ describe('Exercise Scores Component', () => { MockDirective(NgModel), ], providers: [ + provideRouter([]), { provide: ExerciseService, useClass: MockExerciseService }, { provide: ActivatedRoute, useValue: route }, { provide: ResultService, useClass: MockResultService }, diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-statistics.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-statistics.component.spec.ts index 7d813e9bd19a..525e5a2482e2 100644 --- a/src/test/javascript/spec/component/exercises/shared/exercise-statistics.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/exercise-statistics.component.spec.ts @@ -3,7 +3,6 @@ import { ArtemisTestModule } from '../../../test.module'; import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockHasAnyAuthorityDirective } from '../../../helpers/mocks/directive/mock-has-any-authority.directive'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; @@ -20,6 +19,7 @@ import { HttpResponse } from '@angular/common/http'; import { Exercise } from 'app/entities/exercise.model'; import { ExerciseDetailStatisticsComponent } from 'app/exercises/shared/statistics/exercise-detail-statistics.component'; import { TranslateService } from '@ngx-translate/core'; +import { RouterModule } from '@angular/router'; describe('ExerciseStatisticsComponent', () => { let fixture: ComponentFixture; @@ -53,7 +53,7 @@ describe('ExerciseStatisticsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([])], + imports: [ArtemisTestModule, RouterModule.forRoot([])], declarations: [ ExerciseStatisticsComponent, MockComponent(StatisticsGraphComponent), diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts index 72c2cd1aafca..ff076e80d8c8 100644 --- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts @@ -12,7 +12,7 @@ import { TranslateService } from '@ngx-translate/core'; import { cloneDeep } from 'lodash-es'; import { Submission } from 'app/entities/submission.model'; import { ExerciseType } from 'app/entities/exercise.model'; -import { faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons'; +import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; @@ -141,11 +141,31 @@ describe('ResultComponent', () => { expect(component.result!.participation).toEqual(participation1); expect(component.submission).toEqual(submission1); expect(component.textColorClass).toBe('text-secondary'); - expect(component.resultIconClass).toEqual(faQuestionCircle); + expect(component.resultIconClass).toEqual(faCheckCircle); expect(component.resultString).toBe('artemisApp.result.resultString.short (artemisApp.result.preliminary)'); expect(component.templateStatus).toBe(ResultTemplateStatus.HAS_RESULT); }); + it('should set (automatic athena) results for programming exercise', () => { + const submission1: Submission = { id: 1 }; + const result1: Result = { id: 1, submission: submission1, score: 0.8, assessmentType: AssessmentType.AUTOMATIC_ATHENA, successful: true }; + const result2: Result = { id: 2 }; + const participation1 = cloneDeep(programmingParticipation); + participation1.results = [result1, result2]; + component.participation = participation1; + component.showUngradedResults = true; + + fixture.detectChanges(); + + expect(component.result).toEqual(result1); + expect(component.result!.participation).toEqual(participation1); + expect(component.submission).toEqual(submission1); + expect(component.textColorClass).toBe('text-secondary'); + expect(component.resultIconClass).toEqual(faCheckCircle); + expect(component.resultString).toBe('artemisApp.result.resultString.automaticAIFeedbackSuccessful (artemisApp.result.preliminary)'); + expect(component.templateStatus).toBe(ResultTemplateStatus.HAS_RESULT); + }); + it('should set (automatic athena) results for text exercise', () => { const submission1: Submission = { id: 1 }; const result1: Result = { id: 1, submission: submission1, score: 1, assessmentType: AssessmentType.AUTOMATIC_ATHENA, successful: true }; @@ -161,7 +181,7 @@ describe('ResultComponent', () => { expect(component.result!.participation).toEqual(participation1); expect(component.submission).toEqual(submission1); expect(component.textColorClass).toBe('text-secondary'); - expect(component.resultIconClass).toEqual(faQuestionCircle); + expect(component.resultIconClass).toEqual(faCheckCircle); expect(component.resultString).toBe('artemisApp.result.resultString.short (artemisApp.result.preliminary)'); }); diff --git a/src/test/javascript/spec/component/faq/faq-update.component.spec.ts b/src/test/javascript/spec/component/faq/faq-update.component.spec.ts new file mode 100644 index 000000000000..04c04b3d12d3 --- /dev/null +++ b/src/test/javascript/spec/component/faq/faq-update.component.spec.ts @@ -0,0 +1,193 @@ +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing'; +import { TranslateService } from '@ngx-translate/core'; +import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; +import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; +import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { of, throwError } from 'rxjs'; +import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive'; +import { MockRouter } from '../../helpers/mocks/mock-router'; +import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; +import { ArtemisTestModule } from '../../test.module'; +import { FaqUpdateComponent } from 'app/faq/faq-update.component'; +import { FaqService } from 'app/faq/faq.service'; +import { Faq, FaqState } from 'app/entities/faq.model'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { AlertService } from 'app/core/util/alert.service'; +import { FaqCategory } from 'app/entities/faq-category.model'; +import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; + +describe('FaqUpdateComponent', () => { + let faqUpdateComponentFixture: ComponentFixture; + let faqUpdateComponent: FaqUpdateComponent; + let faqService: FaqService; + let activatedRoute: ActivatedRoute; + let router: Router; + let faq1: Faq; + let courseId: number; + + let alertServiceStub: jest.SpyInstance; + let alertService: AlertService; + + beforeEach(() => { + faq1 = new Faq(); + faq1.id = 1; + faq1.questionTitle = 'questionTitle'; + faq1.questionAnswer = 'questionAnswer'; + faq1.categories = [new FaqCategory('category1', '#94a11c')]; + courseId = 1; + TestBed.configureTestingModule({ + imports: [ArtemisTestModule, MockModule(ArtemisMarkdownEditorModule), MockModule(BrowserAnimationsModule)], + declarations: [FaqUpdateComponent, MockPipe(HtmlForMarkdownPipe), MockRouterLinkDirective], + providers: [ + { provide: TranslateService, useClass: MockTranslateService }, + { provide: Router, useClass: MockRouter }, + { + provide: ActivatedRoute, + useValue: { + parent: { + data: of({ course: { id: 1 } }), + }, + snapshot: { + paramMap: convertToParamMap({ + courseId: '1', + }), + }, + }, + }, + MockProvider(FaqService, { + find: () => { + return of( + new HttpResponse({ + body: faq1, + status: 200, + }), + ); + }, + findAllCategoriesByCourseId: () => { + return of( + new HttpResponse({ + body: [], + status: 200, + }), + ); + }, + }), + ], + }).compileComponents(); + + faqUpdateComponentFixture = TestBed.createComponent(FaqUpdateComponent); + faqUpdateComponent = faqUpdateComponentFixture.componentInstance; + + faqService = TestBed.inject(FaqService); + alertService = TestBed.inject(AlertService); + + router = TestBed.inject(Router); + activatedRoute = TestBed.inject(ActivatedRoute); + faqUpdateComponentFixture.detectChanges(); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should create faq', fakeAsync(() => { + faqUpdateComponent.faq = { questionTitle: 'test1' } as Faq; + const createSpy = jest.spyOn(faqService, 'create').mockReturnValue( + of( + new HttpResponse({ + body: { + id: 3, + questionTitle: 'test1', + course: { + id: 1, + }, + } as Faq, + }), + ), + ); + + faqUpdateComponentFixture.detectChanges(); + faqUpdateComponent.save(); + tick(); + + expect(createSpy).toHaveBeenCalledExactlyOnceWith(courseId, { faqState: FaqState.ACCEPTED, questionTitle: 'test1' }); + expect(faqUpdateComponent.isSaving).toBeFalse(); + })); + + it('should edit a faq', fakeAsync(() => { + activatedRoute.parent!.data = of({ course: { id: 1 }, faq: { id: 6 } }); + + faqUpdateComponentFixture.detectChanges(); + faqUpdateComponent.faq = { id: 6, questionTitle: 'test1Updated' } as Faq; + + const updateSpy = jest.spyOn(faqService, 'update').mockReturnValue( + of>( + new HttpResponse({ + body: { + id: 6, + questionTitle: 'test1Updated', + questionAnswer: 'answer', + course: { + id: 1, + }, + } as Faq, + }), + ), + ); + + faqUpdateComponent.save(); + tick(); + faqUpdateComponentFixture.detectChanges(); + + expect(updateSpy).toHaveBeenCalledExactlyOnceWith(courseId, { id: 6, questionTitle: 'test1Updated' }); + })); + + it('should navigate to previous state', fakeAsync(() => { + activatedRoute = TestBed.inject(ActivatedRoute); + activatedRoute.parent!.data = of({ course: { id: 1 }, faq: { id: 6, questionTitle: '', course: { id: 1 } } }); + + faqUpdateComponent.ngOnInit(); + faqUpdateComponentFixture.detectChanges(); + + const navigateSpy = jest.spyOn(router, 'navigate'); + const previousState = jest.spyOn(faqUpdateComponent, 'previousState'); + faqUpdateComponent.previousState(); + tick(); + expect(previousState).toHaveBeenCalledOnce(); + + const expectedPath = ['course-management', 1, 'faqs']; + expect(navigateSpy).toHaveBeenCalledWith(expectedPath); + })); + + it('should update categories', fakeAsync(() => { + const categories = [new FaqCategory('category1', 'red'), new FaqCategory('category2', 'blue')]; + faqUpdateComponentFixture.detectChanges(); + faqUpdateComponent.updateCategories(categories); + expect(faqUpdateComponent.faqCategories).toEqual(categories); + expect(faqUpdateComponent.faq.categories).toEqual(categories); + })); + + it('should not be able to save unless title and question are filled', fakeAsync(() => { + faqUpdateComponentFixture.detectChanges(); + faqUpdateComponent.faq = { questionTitle: 'test1' } as Faq; + faqUpdateComponent.validate(); + expect(faqUpdateComponent.isAllowedToSave).toBeFalse(); + faqUpdateComponent.faq = { questionAnswer: 'test1' } as Faq; + faqUpdateComponent.validate(); + expect(faqUpdateComponent.isAllowedToSave).toBeFalse(); + faqUpdateComponent.faq = { questionTitle: 'test', questionAnswer: 'test1' } as Faq; + faqUpdateComponent.validate(); + expect(faqUpdateComponent.isAllowedToSave).toBeTrue(); + })); + + it('should fail while saving with ErrorResponse', fakeAsync(() => { + alertServiceStub = jest.spyOn(alertService, 'error'); + const error = { status: 404 }; + jest.spyOn(faqService, 'create').mockReturnValue(throwError(() => new HttpErrorResponse(error))); + faqUpdateComponent.save(); + expect(faqUpdateComponent.isSaving).toBeFalse(); + expect(alertServiceStub).toHaveBeenCalledOnce(); + flush(); + })); +}); diff --git a/src/test/javascript/spec/component/faq/faq.component.spec.ts b/src/test/javascript/spec/component/faq/faq.component.spec.ts new file mode 100644 index 000000000000..d9f8b84c6cd5 --- /dev/null +++ b/src/test/javascript/spec/component/faq/faq.component.spec.ts @@ -0,0 +1,191 @@ +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateService } from '@ngx-translate/core'; +import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; +import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; +import { of, throwError } from 'rxjs'; +import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive'; +import { MockRouter } from '../../helpers/mocks/mock-router'; +import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; +import { ArtemisTestModule } from '../../test.module'; +import { FaqService } from 'app/faq/faq.service'; +import { Faq } from 'app/entities/faq.model'; +import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; + +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { FaqComponent } from 'app/faq/faq.component'; +import { FaqCategory } from 'app/entities/faq-category.model'; +import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component'; +import { AlertService } from 'app/core/util/alert.service'; +import { SortService } from 'app/shared/service/sort.service'; + +function createFaq(id: number, category: string, color: string): Faq { + const faq = new Faq(); + faq.id = id; + faq.questionTitle = 'questionTitle'; + faq.questionAnswer = 'questionAnswer'; + faq.categories = [new FaqCategory(category, color)]; + return faq; +} + +describe('FaqComponent', () => { + let faqComponentFixture: ComponentFixture; + let faqComponent: FaqComponent; + + let faqService: FaqService; + let alertServiceStub: jest.SpyInstance; + let alertService: AlertService; + let sortService: SortService; + + let faq1: Faq; + let faq2: Faq; + let faq3: Faq; + + let courseId: number; + + beforeEach(() => { + // In beforeEach: + faq1 = createFaq(1, 'category1', '#94a11c'); + faq2 = createFaq(2, 'category2', '#0ab84f'); + faq3 = createFaq(3, 'category3', '#0ab84f'); + + courseId = 1; + + TestBed.configureTestingModule({ + imports: [ArtemisTestModule, MockModule(ArtemisMarkdownEditorModule), MockModule(BrowserAnimationsModule)], + declarations: [FaqComponent, MockRouterLinkDirective, MockComponent(CustomExerciseCategoryBadgeComponent)], + providers: [ + { provide: TranslateService, useClass: MockTranslateService }, + { provide: Router, useClass: MockRouter }, + { + provide: ActivatedRoute, + useValue: { + parent: { + data: of({ course: { id: 1 } }), + }, + snapshot: { + paramMap: convertToParamMap({ + courseId: '1', + }), + }, + }, + }, + MockProvider(FaqService, { + findAllByCourseId: () => { + return of( + new HttpResponse({ + body: [faq1, faq2, faq3], + status: 200, + }), + ); + }, + delete: () => { + return of(new HttpResponse({ status: 200 })); + }, + findAllCategoriesByCourseId: () => { + return of( + new HttpResponse({ + body: [], + status: 200, + }), + ); + }, + applyFilters: () => { + return [faq2, faq3]; + }, + hasSearchTokens: () => { + return true; + }, + }), + ], + }) + .compileComponents() + .then(() => { + faqComponentFixture = TestBed.createComponent(FaqComponent); + faqComponent = faqComponentFixture.componentInstance; + + faqService = TestBed.inject(FaqService); + alertService = TestBed.inject(AlertService); + sortService = TestBed.inject(SortService); + }); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should fetch faqs when initialized', () => { + const findAllSpy = jest.spyOn(faqService, 'findAllByCourseId'); + + faqComponentFixture.detectChanges(); + expect(findAllSpy).toHaveBeenCalledExactlyOnceWith(1); + expect(faqComponent.faqs).toHaveLength(3); + expect(faqComponent.faqs).toEqual([faq1, faq2, faq3]); + }); + + it('should catch error if loading fails', () => { + const error = { status: 404 }; + const findSpy = jest.spyOn(faqService, 'findAllByCourseId').mockReturnValue(throwError(() => new HttpErrorResponse(error))); + faqComponentFixture.detectChanges(); + expect(findSpy).toHaveBeenCalled(); + expect(faqComponent.faqs).toBeUndefined(); + }); + + it('should delete faq', () => { + const deleteSpy = jest.spyOn(faqService, 'delete'); + faqComponentFixture.detectChanges(); + faqComponent.deleteFaq(courseId, faq1.id!); + expect(deleteSpy).toHaveBeenCalledExactlyOnceWith(courseId, faq1.id!); + expect(faqComponent.faqs).toHaveLength(2); + expect(faqComponent.faqs).not.toContain(faq1); + expect(faqComponent.faqs).toEqual(faqComponent.filteredFaqs); + }); + + it('should not delete faq on error', () => { + const error = { status: 404 }; + const deleteSpy = jest.spyOn(faqService, 'delete').mockReturnValue(throwError(() => new HttpErrorResponse(error))); + faqComponentFixture.detectChanges(); + faqComponent.deleteFaq(courseId, faq1.id!); + expect(deleteSpy).toHaveBeenCalledExactlyOnceWith(courseId, faq1.id!); + expect(faqComponent.faqs).toHaveLength(3); + expect(faqComponent.faqs).toContain(faq1); + }); + + it('should toggle filter correctly', () => { + const toggleFilterSpy = jest.spyOn(faqService, 'toggleFilter'); + faqComponentFixture.detectChanges(); + faqComponent.toggleFilters('category2'); + expect(toggleFilterSpy).toHaveBeenCalledOnce(); + expect(faqComponent.filteredFaqs).toHaveLength(2); + expect(faqComponent.filteredFaqs).not.toContain(faq1); + expect(faqComponent.filteredFaqs).toEqual([faq2, faq3]); + }); + + it('should catch error if no categories are found', () => { + alertServiceStub = jest.spyOn(alertService, 'error'); + const error = { status: 404 }; + jest.spyOn(faqService, 'findAllCategoriesByCourseId').mockReturnValue(throwError(() => new HttpErrorResponse(error))); + faqComponentFixture.detectChanges(); + expect(alertServiceStub).toHaveBeenCalledOnce(); + }); + + it('should search through already filtered array', () => { + const searchSpy = jest.spyOn(faqService, 'hasSearchTokens'); + const applyFilterSpy = jest.spyOn(faqService, 'applyFilters'); + faqComponent.setSearchValue('questionTitle'); + faqComponent.refreshFaqList(faqComponent.searchInput.getValue()); + expect(applyFilterSpy).toHaveBeenCalledOnce(); + expect(searchSpy).toHaveBeenCalledTimes(2); + expect(searchSpy).toHaveBeenCalledWith(faq2, 'questionTitle'); + expect(searchSpy).toHaveBeenCalledWith(faq3, 'questionTitle'); + expect(faqComponent.filteredFaqs).toHaveLength(2); + expect(faqComponent.filteredFaqs).not.toContain(faq1); + expect(faqComponent.filteredFaqs).toEqual([faq2, faq3]); + }); + + it('should call sortService when sortRows is called', () => { + jest.spyOn(sortService, 'sortByProperty').mockReturnValue([]); + faqComponent.sortRows(); + expect(sortService.sortByProperty).toHaveBeenCalledOnce(); + }); +}); diff --git a/src/test/javascript/spec/component/file-upload-assessment/file-upload-assessment.component.spec.ts b/src/test/javascript/spec/component/file-upload-assessment/file-upload-assessment.component.spec.ts index 2f3af3647b19..14485bc32e2e 100644 --- a/src/test/javascript/spec/component/file-upload-assessment/file-upload-assessment.component.spec.ts +++ b/src/test/javascript/spec/component/file-upload-assessment/file-upload-assessment.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { JhiLanguageHelper } from 'app/core/language/language.helper'; import { AccountService } from 'app/core/auth/account.service'; import { of, throwError } from 'rxjs'; @@ -8,7 +7,7 @@ import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../test.module'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockComponent, MockPipe } from 'ng-mocks'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { FileUploadAssessmentComponent } from 'app/exercises/file-upload/assess/file-upload-assessment.component'; import { DebugElement } from '@angular/core'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; @@ -72,7 +71,7 @@ describe('FileUploadAssessmentComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([routes[0]])], + imports: [ArtemisTestModule, RouterModule.forRoot([routes[0]])], declarations: [ FileUploadAssessmentComponent, MockComponent(UpdatingResultComponent), diff --git a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-detail.component.spec.ts b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-detail.component.spec.ts index 33728abe32c1..50a4daac6d0b 100644 --- a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-detail.component.spec.ts +++ b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-detail.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, provideRouter } from '@angular/router'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { ArtemisTestModule } from '../../test.module'; @@ -7,7 +7,6 @@ import { FileUploadExerciseDetailComponent } from 'app/exercises/file-upload/man import { MockFileUploadExerciseService, fileUploadExercise } from '../../helpers/mocks/service/mock-file-upload-exercise.service'; import { JhiLanguageHelper } from 'app/core/language/language.helper'; import { AlertService } from 'app/core/util/alert.service'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { FileUploadExerciseService } from 'app/exercises/file-upload/manage/file-upload-exercise.service'; @@ -58,7 +57,7 @@ describe('FileUploadExercise Management Detail Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [ FileUploadExerciseDetailComponent, MockPipe(HtmlForMarkdownPipe), @@ -68,6 +67,7 @@ describe('FileUploadExercise Management Detail Component', () => { MockComponent(DocumentationButtonComponent), ], providers: [ + provideRouter([]), JhiLanguageHelper, AlertService, { provide: ActivatedRoute, useValue: route }, diff --git a/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts b/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts index fdd4524e6dbe..7373ed41e712 100644 --- a/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts +++ b/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts @@ -1,12 +1,11 @@ import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { AccountService } from 'app/core/auth/account.service'; import { ArtemisTestModule } from '../../test.module'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; import { MockComponent, MockPipe } from 'ng-mocks'; import { AlertService } from 'app/core/util/alert.service'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; @@ -54,7 +53,7 @@ describe('FileUploadSubmissionComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgxDatatableModule, TranslateModule.forRoot(), RouterTestingModule.withRoutes([routes[0]])], + imports: [ArtemisTestModule, NgxDatatableModule, TranslateModule.forRoot(), RouterModule.forRoot([routes[0]])], declarations: [ FileUploadSubmissionComponent, MockComponent(ComplaintsForTutorComponent), diff --git a/src/test/javascript/spec/component/footer/footer.component.spec.ts b/src/test/javascript/spec/component/footer/footer.component.spec.ts index 276359d939ee..074119bd8e9c 100644 --- a/src/test/javascript/spec/component/footer/footer.component.spec.ts +++ b/src/test/javascript/spec/component/footer/footer.component.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { FooterComponent } from 'app/shared/layouts/footer/footer.component'; import { TranslateModule } from '@ngx-translate/core'; import { ArtemisTestModule } from '../../test.module'; import { MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { RouterModule } from '@angular/router'; describe('FooterComponent', () => { let component: FooterComponent; @@ -13,7 +13,8 @@ describe('FooterComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [FooterComponent, MockPipe(ArtemisTranslatePipe)], - imports: [ArtemisTestModule, RouterTestingModule, TranslateModule.forRoot()], + imports: [ArtemisTestModule, TranslateModule.forRoot(), RouterModule.forRoot([])], + providers: [], }).compileComponents(); }); diff --git a/src/test/javascript/spec/component/grading-system/grading-system.component.spec.ts b/src/test/javascript/spec/component/grading-system/grading-system.component.spec.ts index 4f30fbc65658..31fad3a99ef5 100644 --- a/src/test/javascript/spec/component/grading-system/grading-system.component.spec.ts +++ b/src/test/javascript/spec/component/grading-system/grading-system.component.spec.ts @@ -6,10 +6,9 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { GradingSystemInfoModalComponent } from 'app/grading-system/grading-system-info-modal/grading-system-info-modal.component'; import { NgModel } from '@angular/forms'; import { BehaviorSubject } from 'rxjs'; -import { ActivatedRoute, Params } from '@angular/router'; +import { ActivatedRoute, Params, RouterModule } from '@angular/router'; import { GradingSystemComponent } from 'app/grading-system/grading-system.component'; import { BaseGradingSystemComponent } from 'app/grading-system/base-grading-system/base-grading-system.component'; -import { RouterTestingModule } from '@angular/router/testing'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; describe('Grading System Component', () => { @@ -21,7 +20,7 @@ describe('Grading System Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule, RouterModule.forRoot([])], declarations: [ GradingSystemComponent, MockDirective(NgModel), diff --git a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel-title.component.spec.ts b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel-title.component.spec.ts index 3dc633eb4b50..86380ebed0a7 100644 --- a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel-title.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel-title.component.spec.ts @@ -22,34 +22,34 @@ describe('GitDiffFilePanelTitleComponent', () => { it.each([ { - filePath: 'some-unchanged-file.java', - previousFilePath: 'some-unchanged-file.java', + modifiedFilePath: 'some-unchanged-file.java', + originalFilePath: 'some-unchanged-file.java', status: 'unchanged', title: 'some-unchanged-file.java', }, { - filePath: undefined, - previousFilePath: 'some-deleted-file.java', + modifiedFilePath: undefined, + originalFilePath: 'some-deleted-file.java', status: 'deleted', title: 'some-deleted-file.java', }, { - filePath: 'some-created-file.java', - previousFilePath: undefined, + modifiedFilePath: 'some-created-file.java', + originalFilePath: undefined, status: 'created', title: 'some-created-file.java', }, { - filePath: 'some-renamed-file.java', - previousFilePath: 'some-file.java', + modifiedFilePath: 'some-renamed-file.java', + originalFilePath: 'some-file.java', status: 'renamed', title: 'some-file.java → some-renamed-file.java', }, - ])('should correctly set title and status', ({ filePath, previousFilePath, status, title }) => { - comp.previousFilePath = previousFilePath; - comp.filePath = filePath; + ])('should correctly set title and status', ({ originalFilePath, modifiedFilePath, status, title }) => { + fixture.componentRef.setInput('originalFilePath', originalFilePath); + fixture.componentRef.setInput('modifiedFilePath', modifiedFilePath); fixture.detectChanges(); - expect(comp.title).toBe(title); - expect(comp.fileStatus).toBe(status); + expect(comp.title()).toBe(title); + expect(comp.fileStatus()).toBe(status); }); }); diff --git a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel.component.spec.ts b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel.component.spec.ts index d4938caea953..26627dba3e8f 100644 --- a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file-panel.component.spec.ts @@ -1,29 +1,27 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective } from 'ng-mocks'; import { GitDiffLineStatComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-line-stat.component'; import { ProgrammingExerciseGitDiffEntry } from 'app/entities/hestia/programming-exercise-git-diff-entry.model'; import { GitDiffFilePanelComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-file-panel.component'; -import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; import { NgbAccordionBody, NgbAccordionButton, NgbAccordionCollapse, NgbAccordionDirective, NgbAccordionHeader, NgbAccordionItem } from '@ng-bootstrap/ng-bootstrap'; import { GitDiffFileComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-file.component'; import { GitDiffFilePanelTitleComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-file-panel-title.component'; +import { MonacoDiffEditorComponent } from '../../../../../../main/webapp/app/shared/monaco-editor/monaco-diff-editor.component'; -describe('ProgrammingExerciseGitDiffFilePanel Component', () => { +describe('GitDiffFilePanelComponent', () => { let comp: GitDiffFilePanelComponent; let fixture: ComponentFixture; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule], + // TODO: We cannot mock GitDiffFileComponent because of https://github.com/help-me-mom/ng-mocks/issues/8634. + imports: [ArtemisTestModule, GitDiffFileComponent], declarations: [ GitDiffFilePanelComponent, - MockPipe(ArtemisTranslatePipe), MockComponent(GitDiffFilePanelTitleComponent), MockComponent(GitDiffLineStatComponent), - MockComponent(GitDiffFileComponent), - MockDirective(DeleteButtonDirective), + MockComponent(MonacoDiffEditorComponent), MockDirective(NgbAccordionDirective), MockDirective(NgbAccordionItem), MockDirective(NgbAccordionHeader), @@ -35,8 +33,8 @@ describe('ProgrammingExerciseGitDiffFilePanel Component', () => { }).compileComponents(); fixture = TestBed.createComponent(GitDiffFilePanelComponent); comp = fixture.componentInstance; - comp.templateFileContent = 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16'; - comp.solutionFileContent = 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16'; + fixture.componentRef.setInput('originalFileContent', 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16'); + fixture.componentRef.setInput('modifiedFileContent', 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16'); }); afterEach(() => { @@ -44,21 +42,21 @@ describe('ProgrammingExerciseGitDiffFilePanel Component', () => { }); it('Should extract file path', () => { - comp.diffEntries = [{ filePath: 'src/a.java', previousFilePath: 'src/b.java' }] as ProgrammingExerciseGitDiffEntry[]; - comp.ngOnInit(); - expect(comp.filePath).toBe('src/a.java'); - expect(comp.previousFilePath).toBe('src/b.java'); + fixture.componentRef.setInput('diffEntries', [{ filePath: 'src/a.java', previousFilePath: 'src/b.java' }] as ProgrammingExerciseGitDiffEntry[]); + fixture.detectChanges(); + expect(comp.modifiedFilePath()).toBe('src/a.java'); + expect(comp.originalFilePath()).toBe('src/b.java'); }); it('Should set added/removed lines to 1-0', () => { - comp.diffEntries = [{ filePath: 'src/a.java', startLine: 1, lineCount: 1 }] as ProgrammingExerciseGitDiffEntry[]; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(1); - expect(comp.removedLineCount).toBe(0); + fixture.componentRef.setInput('diffEntries', [{ filePath: 'src/a.java', startLine: 1, lineCount: 1 }] as ProgrammingExerciseGitDiffEntry[]); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(1); + expect(comp.removedLineCount()).toBe(0); }); it('Should set added/removed lines to 4-1', () => { - comp.diffEntries = [ + fixture.componentRef.setInput('diffEntries', [ { filePath: 'src/a.java', previousFilePath: 'src/a.java', @@ -67,14 +65,14 @@ describe('ProgrammingExerciseGitDiffFilePanel Component', () => { previousStartLine: 5, previousLineCount: 1, }, - ] as ProgrammingExerciseGitDiffEntry[]; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(4); - expect(comp.removedLineCount).toBe(1); + ] as ProgrammingExerciseGitDiffEntry[]); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(4); + expect(comp.removedLineCount()).toBe(1); }); it('Should set added/removed lines to 3-2', () => { - comp.diffEntries = [ + fixture.componentRef.setInput('diffEntries', [ { filePath: 'src/a.java', previousFilePath: 'src/a.java', @@ -83,14 +81,14 @@ describe('ProgrammingExerciseGitDiffFilePanel Component', () => { previousStartLine: 5, previousLineCount: 2, }, - ] as ProgrammingExerciseGitDiffEntry[]; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(3); - expect(comp.removedLineCount).toBe(2); + ] as ProgrammingExerciseGitDiffEntry[]); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(3); + expect(comp.removedLineCount()).toBe(2); }); it('Should set added/removed lines to 2-3', () => { - comp.diffEntries = [ + fixture.componentRef.setInput('diffEntries', [ { filePath: 'src/a.java', previousFilePath: 'src/a.java', @@ -99,14 +97,14 @@ describe('ProgrammingExerciseGitDiffFilePanel Component', () => { previousStartLine: 5, previousLineCount: 3, }, - ] as ProgrammingExerciseGitDiffEntry[]; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(2); - expect(comp.removedLineCount).toBe(3); + ] as ProgrammingExerciseGitDiffEntry[]); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(2); + expect(comp.removedLineCount()).toBe(3); }); it('Should set added/removed lines to 1-4', () => { - comp.diffEntries = [ + fixture.componentRef.setInput('diffEntries', [ { filePath: 'src/a.java', previousFilePath: 'src/a.java', @@ -115,23 +113,23 @@ describe('ProgrammingExerciseGitDiffFilePanel Component', () => { previousStartLine: 5, previousLineCount: 4, }, - ] as ProgrammingExerciseGitDiffEntry[]; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(1); - expect(comp.removedLineCount).toBe(4); + ] as ProgrammingExerciseGitDiffEntry[]); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(1); + expect(comp.removedLineCount()).toBe(4); }); it('Should set added/removed lines to 0-1', () => { - comp.diffEntries = [ + fixture.componentRef.setInput('diffEntries', [ { filePath: 'src/a.java', previousFilePath: 'src/a.java', previousStartLine: 1, previousLineCount: 1, }, - ] as ProgrammingExerciseGitDiffEntry[]; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(0); - expect(comp.removedLineCount).toBe(1); + ] as ProgrammingExerciseGitDiffEntry[]); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(0); + expect(comp.removedLineCount()).toBe(1); }); }); diff --git a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file.component.spec.ts b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file.component.spec.ts index dbef6bd7eb72..17007596e8a8 100644 --- a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-file.component.spec.ts @@ -1,8 +1,8 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { GitDiffFileComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-file.component'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; +import { MonacoDiffEditorComponent } from '../../../../../../main/webapp/app/shared/monaco-editor/monaco-diff-editor.component'; function getDiffEntryWithPaths(previousFilePath?: string, filePath?: string) { return { @@ -17,8 +17,8 @@ describe('GitDiffFileComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule], - declarations: [GitDiffFileComponent], + imports: [ArtemisTestModule, MonacoDiffEditorComponent], + declarations: [], providers: [], }).compileComponents(); // Required because Monaco uses the ResizeObserver for the diff editor. @@ -33,28 +33,20 @@ describe('GitDiffFileComponent', () => { jest.restoreAllMocks(); }); - it.each([ - getDiffEntryWithPaths('same file', 'same file'), - getDiffEntryWithPaths('old file', 'renamed file'), - getDiffEntryWithPaths('deleted file', undefined), - getDiffEntryWithPaths(undefined, 'created file'), - ])('should infer file paths from the diff entries', (entry) => { - comp.diffEntries = [entry]; - fixture.detectChanges(); - expect(comp.modifiedFilePath).toBe(entry.filePath); - expect(comp.originalFilePath).toBe(entry.previousFilePath); - }); - it('should initialize the content of the diff editor', () => { const fileName = 'some-changed-file.java'; const originalContent = 'some file content'; const modifiedContent = 'some changed file content'; - const setFileContentsStub = jest.spyOn(comp.monacoDiffEditor, 'setFileContents').mockImplementation(); + const setFileContentsStub = jest.fn(); + jest.spyOn(comp, 'monacoDiffEditor').mockReturnValue({ setFileContents: setFileContentsStub } as unknown as MonacoDiffEditorComponent); const diffEntry = getDiffEntryWithPaths(fileName, fileName); - comp.originalFileContent = originalContent; - comp.modifiedFileContent = modifiedContent; - comp.diffEntries = [diffEntry]; + fixture.componentRef.setInput('diffEntries', [diffEntry]); + fixture.componentRef.setInput('originalFileContent', originalContent); + fixture.componentRef.setInput('originalFilePath', fileName); + fixture.componentRef.setInput('modifiedFileContent', modifiedContent); + fixture.componentRef.setInput('modifiedFilePath', fileName); fixture.detectChanges(); expect(setFileContentsStub).toHaveBeenCalledExactlyOnceWith(originalContent, fileName, modifiedContent, fileName); + expect(comp.fileUnchanged()).toBeFalse(); }); }); diff --git a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-line-stat.component.spec.ts b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-line-stat.component.spec.ts index 03a61f184b67..2ea540371804 100644 --- a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-line-stat.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-line-stat.component.spec.ts @@ -4,7 +4,7 @@ import { GitDiffLineStatComponent } from 'app/exercises/programming/hestia/git-d import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockPipe } from 'ng-mocks'; -describe('Git-Diff line-stat Component', () => { +describe('GitDiffLineStatComponent', () => { let comp: GitDiffLineStatComponent; let fixture: ComponentFixture; @@ -29,10 +29,10 @@ describe('Git-Diff line-stat Component', () => { ]; it.each(boxesTestTable)('Should show %s-%s boxes', (expectedAddedSquareCount, expectedRemovedSquareCount, addedLineCount, removedLineCount) => { - comp.addedLineCount = addedLineCount; - comp.removedLineCount = removedLineCount; - comp.ngOnInit(); - expect(comp.addedSquareCount).toBe(expectedAddedSquareCount); - expect(comp.removedSquareCount).toBe(expectedRemovedSquareCount); + fixture.componentRef.setInput('addedLineCount', addedLineCount); + fixture.componentRef.setInput('removedLineCount', removedLineCount); + fixture.detectChanges(); + expect(comp.squareCounts().addedSquareCount).toBe(expectedAddedSquareCount); + expect(comp.squareCounts().removedSquareCount).toBe(expectedRemovedSquareCount); }); }); diff --git a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-modal.component.spec.ts b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-modal.component.spec.ts index cfae09afae32..7fc9a8693d0e 100644 --- a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-modal.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-modal.component.spec.ts @@ -1,7 +1,7 @@ import { GitDiffReportComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report.component'; import { ArtemisTestModule } from '../../../test.module'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { ComponentFixture, TestBed, fakeAsync, flush } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { GitDiffReportModalComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { of, throwError } from 'rxjs'; @@ -32,7 +32,7 @@ describe('GitDiffReportModalComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], - declarations: [GitDiffReportModalComponent, MockPipe(ArtemisTranslatePipe), MockComponent(GitDiffReportComponent)], + declarations: [MockPipe(ArtemisTranslatePipe), MockComponent(GitDiffReportComponent)], }).compileComponents(); fixture = TestBed.createComponent(GitDiffReportModalComponent); comp = fixture.componentInstance; @@ -52,68 +52,80 @@ describe('GitDiffReportModalComponent', () => { jest.restoreAllMocks(); }); - it('should call correct service method onInit', fakeAsync(() => { + const finishEffects = async () => { + // We need to wait for all asynchronous code to finish execution before we can expect the results. + // See https://stackoverflow.com/questions/44741102/how-to-make-jest-wait-for-all-asynchronous-code-to-finish-execution-before-expec/51045733#51045733 + await new Promise(process.nextTick); + await fixture.whenStable(); + }; + + it('should call correct service method onInit', async () => { // case 1: diff for template and solution - comp.report = { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc' } as ProgrammingExerciseGitDiffReport; - comp.diffForTemplateAndSolution = true; - comp.ngOnInit(); - flush(); + fixture.componentRef.setInput('report', { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc' } as ProgrammingExerciseGitDiffReport); + fixture.componentRef.setInput('diffForTemplateAndSolution', true); + fixture.detectChanges(); + await finishEffects(); expect(loadTemplateFilesSpy).toHaveBeenCalledExactlyOnceWith(1); expect(loadSolutionFilesSpy).toHaveBeenCalledExactlyOnceWith(1); expect(loadParticipationFilesSpy).not.toHaveBeenCalled(); - expect(comp.leftCommitFileContentByPath).toEqual(filesWithContentTemplate); - expect(comp.rightCommitFileContentByPath).toEqual(filesWithContentSolution); - })); + expect(comp.leftCommitFileContentByPath()).toEqual(filesWithContentTemplate); + expect(comp.rightCommitFileContentByPath()).toEqual(filesWithContentSolution); + }); - it('should retrieve files for template and submission if diffForTemplateAndSolution is false and firstParticipationId is undefined', () => { - comp.report = { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc' } as ProgrammingExerciseGitDiffReport; + it('should retrieve files for template and submission if diffForTemplateAndSolution is false and firstParticipationId is undefined', async () => { + fixture.componentRef.setInput('report', { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc' } as ProgrammingExerciseGitDiffReport); // case 2: diff for submission with template - comp.diffForTemplateAndSolution = false; - comp.ngOnInit(); + fixture.componentRef.setInput('diffForTemplateAndSolution', false); + fixture.detectChanges(); + await finishEffects(); expect(loadParticipationFilesSpy).toHaveBeenCalledExactlyOnceWith(3, 'abc'); expect(loadTemplateFilesSpy).toHaveBeenCalledExactlyOnceWith(1); - expect(comp.leftCommitFileContentByPath).toEqual(filesWithContentTemplate); - expect(comp.rightCommitFileContentByPath).toEqual(filesWithContentParticipation1); + expect(comp.leftCommitFileContentByPath()).toEqual(filesWithContentTemplate); + expect(comp.rightCommitFileContentByPath()).toEqual(filesWithContentParticipation1); }); - it('should retrieve files for both submissions if diffForTemplateAndSolution is false and firstParticipationId is defined', function () { + it('should retrieve files for both submissions if diffForTemplateAndSolution is false and firstParticipationId is defined', async () => { // case 3: diff for two submissions - comp.report = { + fixture.componentRef.setInput('report', { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc', participationIdForLeftCommit: 2, leftCommitHash: 'def', - } as ProgrammingExerciseGitDiffReport; - comp.diffForTemplateAndSolution = false; - comp.ngOnInit(); + } as ProgrammingExerciseGitDiffReport); + fixture.componentRef.setInput('diffForTemplateAndSolution', false); + fixture.detectChanges(); + await finishEffects(); expect(loadParticipationFilesSpy).toHaveBeenCalledTimes(2); expect(loadParticipationFilesSpy).toHaveBeenCalledWith(2, 'def'); expect(loadParticipationFilesSpy).toHaveBeenCalledWith(3, 'abc'); - expect(comp.leftCommitFileContentByPath).toEqual(filesWithContentParticipation1); - expect(comp.rightCommitFileContentByPath).toEqual(filesWithContentParticipation1); + expect(comp.leftCommitFileContentByPath()).toEqual(filesWithContentParticipation1); + expect(comp.rightCommitFileContentByPath()).toEqual(filesWithContentParticipation1); }); - it('should set error flag if loading files fails', () => { + it('should set error flag if loading files fails', async () => { jest.spyOn(programmingExerciseService, 'getTemplateRepositoryTestFilesWithContent').mockReturnValue(throwError('error')); jest.spyOn(programmingExerciseService, 'getSolutionRepositoryTestFilesWithContent').mockReturnValue(throwError('error')); jest.spyOn(programmingExerciseParticipationService, 'getParticipationRepositoryFilesWithContentAtCommit').mockReturnValue(throwError('error')); - comp.report = { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc' } as ProgrammingExerciseGitDiffReport; - comp.diffForTemplateAndSolution = true; - comp.ngOnInit(); - expect(comp.errorWhileFetchingRepos).toBeTrue(); + fixture.componentRef.setInput('report', { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc' } as ProgrammingExerciseGitDiffReport); + fixture.componentRef.setInput('diffForTemplateAndSolution', true); + fixture.detectChanges(); + await fixture.whenStable(); + expect(comp.errorWhileFetchingRepos()).toBeTrue(); //reset value - comp.errorWhileFetchingRepos = false; - comp.diffForTemplateAndSolution = false; - comp.ngOnInit(); - expect(comp.errorWhileFetchingRepos).toBeTrue(); + comp.errorWhileFetchingRepos.set(false); + fixture.componentRef.setInput('diffForTemplateAndSolution', false); + fixture.detectChanges(); + await fixture.whenStable(); + expect(comp.errorWhileFetchingRepos()).toBeTrue(); //reset value - comp.errorWhileFetchingRepos = false; - comp.report = { ...comp.report, participationIdForLeftCommit: 2, leftCommitHash: 'def' } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.errorWhileFetchingRepos).toBeTrue(); + comp.errorWhileFetchingRepos.set(false); + fixture.componentRef.setInput('report', { ...comp.report, participationIdForLeftCommit: 2, leftCommitHash: 'def' } as unknown as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + await fixture.whenStable(); + expect(comp.errorWhileFetchingRepos()).toBeTrue(); }); it('should call modal service when close() is invoked', () => { @@ -122,36 +134,38 @@ describe('GitDiffReportModalComponent', () => { expect(modalServiceSpy).toHaveBeenCalled(); }); - it('should load files from cache if available for template and participation repo', () => { + it('should load files from cache if available for template and participation repo', async () => { const cachedRepositoryFiles = new Map>(); cachedRepositoryFiles.set('1-template', filesWithContentTemplate); cachedRepositoryFiles.set('def', filesWithContentParticipation1); - comp.cachedRepositoryFiles = cachedRepositoryFiles; - comp.report = { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'def' } as ProgrammingExerciseGitDiffReport; - comp.diffForTemplateAndSolution = false; - comp.ngOnInit(); + fixture.componentRef.setInput('cachedRepositoryFiles', cachedRepositoryFiles); + fixture.componentRef.setInput('report', { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'def' } as ProgrammingExerciseGitDiffReport); + fixture.componentRef.setInput('diffForTemplateAndSolution', false); + fixture.detectChanges(); + await finishEffects(); expect(loadParticipationFilesSpy).not.toHaveBeenCalled(); expect(loadTemplateFilesSpy).not.toHaveBeenCalled(); - expect(comp.leftCommitFileContentByPath).toEqual(filesWithContentTemplate); - expect(comp.rightCommitFileContentByPath).toEqual(filesWithContentParticipation1); + expect(comp.leftCommitFileContentByPath()).toEqual(filesWithContentTemplate); + expect(comp.rightCommitFileContentByPath()).toEqual(filesWithContentParticipation1); }); - it('should load files from cache if available for participation repo at both commits', () => { + it('should load files from cache if available for participation repo at both commits', async () => { const cachedRepositoryFiles = new Map>(); cachedRepositoryFiles.set('def', filesWithContentParticipation1); cachedRepositoryFiles.set('abc', filesWithContentParticipation2); - comp.cachedRepositoryFiles = cachedRepositoryFiles; - comp.report = { + fixture.componentRef.setInput('cachedRepositoryFiles', cachedRepositoryFiles); + fixture.componentRef.setInput('report', { programmingExercise: { id: 1 }, participationIdForRightCommit: 3, rightCommitHash: 'abc', participationIdForLeftCommit: 2, leftCommitHash: 'def', - } as ProgrammingExerciseGitDiffReport; - comp.diffForTemplateAndSolution = false; - comp.ngOnInit(); + } as ProgrammingExerciseGitDiffReport); + fixture.componentRef.setInput('diffForTemplateAndSolution', false); + fixture.detectChanges(); + await finishEffects(); expect(loadParticipationFilesSpy).not.toHaveBeenCalled(); - expect(comp.leftCommitFileContentByPath).toEqual(filesWithContentParticipation1); - expect(comp.rightCommitFileContentByPath).toEqual(filesWithContentParticipation2); + expect(comp.leftCommitFileContentByPath()).toEqual(filesWithContentParticipation1); + expect(comp.rightCommitFileContentByPath()).toEqual(filesWithContentParticipation2); }); }); diff --git a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-report.component.spec.ts b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-report.component.spec.ts index 18614f41c481..143c150edc57 100644 --- a/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-report.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/git-diff-report/git-diff-report.component.spec.ts @@ -8,7 +8,6 @@ import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programmin import { ProgrammingExerciseGitDiffEntry } from 'app/entities/hestia/programming-exercise-git-diff-entry.model'; import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { GitDiffFilePanelComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-file-panel.component'; -import { ButtonComponent } from 'app/shared/components/button.component'; describe('ProgrammingExerciseGitDiffReport Component', () => { let comp: GitDiffReportComponent; @@ -17,19 +16,19 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, NgbTooltipMocksModule], - declarations: [ - GitDiffReportComponent, - MockComponent(ButtonComponent), - MockPipe(ArtemisTranslatePipe), - MockComponent(GitDiffFilePanelComponent), - MockComponent(GitDiffLineStatComponent), - ], + declarations: [GitDiffReportComponent, MockPipe(ArtemisTranslatePipe), MockComponent(GitDiffFilePanelComponent), MockComponent(GitDiffLineStatComponent)], providers: [], }).compileComponents(); fixture = TestBed.createComponent(GitDiffReportComponent); comp = fixture.componentInstance; - comp.templateFileContentByPath = new Map([['src/a.java', 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16']]); - comp.solutionFileContentByPath = new Map([['src/a.java', 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16']]); + fixture.componentRef.setInput( + 'templateFileContentByPath', + new Map([['src/a.java', 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16']]), + ); + fixture.componentRef.setInput( + 'solutionFileContentByPath', + new Map([['src/a.java', 'L1\nL2\nL3\nL4\nL5\nL6\nL7\nL8\nL9\nL10\nL11\nL12\nL13\nL14\nL15\nL16']]), + ); }); afterEach(() => { @@ -55,18 +54,18 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { { filePath: 'src/b.java', startLine: 2 }, ] as ProgrammingExerciseGitDiffEntry[]; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.entries).toStrictEqual(expectedEntries); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + expect(comp.sortedEntries()).toStrictEqual(expectedEntries); }); it('Should set added/removed lines to 1-0', () => { const entries = [{ filePath: 'src/a.java', previousFilePath: 'src/a.java', startLine: 1, lineCount: 1 }] as ProgrammingExerciseGitDiffEntry[]; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(1); - expect(comp.removedLineCount).toBe(0); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(1); + expect(comp.removedLineCount()).toBe(0); }); it('Should set added/removed lines to 4-1', () => { @@ -81,10 +80,10 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { }, ] as ProgrammingExerciseGitDiffEntry[]; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(4); - expect(comp.removedLineCount).toBe(1); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(4); + expect(comp.removedLineCount()).toBe(1); }); it('Should set added/removed lines to 3-2', () => { @@ -99,10 +98,10 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { }, ] as ProgrammingExerciseGitDiffEntry[]; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(3); - expect(comp.removedLineCount).toBe(2); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(3); + expect(comp.removedLineCount()).toBe(2); }); it('Should set added/removed lines to 2-3', () => { @@ -117,10 +116,10 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { }, ] as ProgrammingExerciseGitDiffEntry[]; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(2); - expect(comp.removedLineCount).toBe(3); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(2); + expect(comp.removedLineCount()).toBe(3); }); it('Should set added/removed lines to 1-4', () => { @@ -135,19 +134,19 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { }, ] as ProgrammingExerciseGitDiffEntry[]; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(1); - expect(comp.removedLineCount).toBe(4); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(1); + expect(comp.removedLineCount()).toBe(4); }); it('Should set added/removed lines to 0-1', () => { const entries = [{ filePath: 'src/a.java', previousFilePath: 'src/a.java', previousStartLine: 1, previousLineCount: 1 }] as ProgrammingExerciseGitDiffEntry[]; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; - comp.ngOnInit(); - expect(comp.addedLineCount).toBe(0); - expect(comp.removedLineCount).toBe(1); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); + fixture.detectChanges(); + expect(comp.addedLineCount()).toBe(0); + expect(comp.removedLineCount()).toBe(1); }); it('should record for each path whether the diff is ready', () => { @@ -161,26 +160,30 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { { filePath: 'src/b.java', startLine: 2 }, { filePath: 'src/a.java', startLine: 1 }, ]; - comp.solutionFileContentByPath = new Map(); - comp.solutionFileContentByPath.set(filePath1, 'some file content'); - comp.solutionFileContentByPath.set(filePath2, 'some other file content'); - comp.templateFileContentByPath = comp.solutionFileContentByPath; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; + fixture.componentRef.setInput( + 'solutionFileContentByPath', + new Map([ + ['src/a.java', 'some file content'], + ['src/b.java', 'some other file content'], + ]), + ); + fixture.componentRef.setInput('templateFileContentByPath', comp.solutionFileContentByPath()); + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); fixture.detectChanges(); // Initialization - expect(comp.allDiffsReady).toBeFalse(); - expect(comp.diffInformationForPaths[0].diffReady).toBeFalse(); - expect(comp.diffInformationForPaths[1].diffReady).toBeFalse(); + expect(comp.allDiffsReady()).toBeFalse(); + expect(comp.diffInformationForPaths()[0].diffReady).toBeFalse(); + expect(comp.diffInformationForPaths()[1].diffReady).toBeFalse(); // First file ready comp.onDiffReady(filePath1, true); - expect(comp.allDiffsReady).toBeFalse(); - expect(comp.diffInformationForPaths[0].diffReady).toBeTrue(); - expect(comp.diffInformationForPaths[1].diffReady).toBeFalse(); + expect(comp.allDiffsReady()).toBeFalse(); + expect(comp.diffInformationForPaths()[0].diffReady).toBeTrue(); + expect(comp.diffInformationForPaths()[1].diffReady).toBeFalse(); // Second file ready comp.onDiffReady(filePath2, true); - expect(comp.allDiffsReady).toBeTrue(); - expect(comp.diffInformationForPaths[0].diffReady).toBeTrue(); - expect(comp.diffInformationForPaths[1].diffReady).toBeTrue(); + expect(comp.allDiffsReady()).toBeTrue(); + expect(comp.diffInformationForPaths()[0].diffReady).toBeTrue(); + expect(comp.diffInformationForPaths()[1].diffReady).toBeTrue(); }); it('should correctly identify renamed files', () => { @@ -196,18 +199,18 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { ]; const defaultContent = 'some content that might change'; const modifiedContent = 'some content that has changed'; - comp.report = { entries } as ProgrammingExerciseGitDiffReport; + fixture.componentRef.setInput('report', { entries } as ProgrammingExerciseGitDiffReport); const originalFileContents = new Map(); const modifiedFileContents = new Map(); [originalFilePath1, originalFilePath2, notRenamedFilePath].forEach((path) => { originalFileContents.set(path, defaultContent); modifiedFileContents.set(path, path === originalFilePath1 ? defaultContent : modifiedContent); }); - comp.templateFileContentByPath = originalFileContents; - comp.solutionFileContentByPath = modifiedFileContents; + fixture.componentRef.setInput('templateFileContentByPath', originalFileContents); + fixture.componentRef.setInput('solutionFileContentByPath', modifiedFileContents); fixture.detectChanges(); - expect(comp.renamedFilePaths).toEqual({ [renamedFilePath1]: originalFilePath1, [renamedFilePath2]: originalFilePath2 }); + expect(comp.renamedFilePaths()).toEqual({ [renamedFilePath1]: originalFilePath1, [renamedFilePath2]: originalFilePath2 }); }); }); diff --git a/src/test/javascript/spec/component/iris/iris-chat-http.service.spec.ts b/src/test/javascript/spec/component/iris/iris-chat-http.service.spec.ts index 28608a069935..8ca9b6a23024 100644 --- a/src/test/javascript/spec/component/iris/iris-chat-http.service.spec.ts +++ b/src/test/javascript/spec/component/iris/iris-chat-http.service.spec.ts @@ -1,10 +1,11 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { irisExercise, mockClientMessage, mockConversation, mockServerMessage } from '../../helpers/sample/iris-sample-data'; import { IrisUserMessage } from 'app/entities/iris/iris-message.model'; import { IrisChatHttpService } from 'app/iris/iris-chat-http.service'; import { ChatServiceMode } from 'app/iris/iris-chat.service'; +import { provideHttpClient } from '@angular/common/http'; describe('Iris Chat Http Service', () => { let service: IrisChatHttpService; @@ -12,8 +13,8 @@ describe('Iris Chat Http Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [IrisChatHttpService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), IrisChatHttpService], }); service = TestBed.inject(IrisChatHttpService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/iris/iris-status.service.spec.ts b/src/test/javascript/spec/component/iris/iris-status.service.spec.ts index d1971823407c..54f7ee7ced58 100644 --- a/src/test/javascript/spec/component/iris/iris-status.service.spec.ts +++ b/src/test/javascript/spec/component/iris/iris-status.service.spec.ts @@ -1,9 +1,10 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { of } from 'rxjs'; import { IrisStatusService } from 'app/iris/iris-status.service'; import { IrisRateLimitInformation } from 'app/entities/iris/iris-ratelimit-info.model'; +import { provideHttpClient } from '@angular/common/http'; describe('IrisStatusService', () => { let service: IrisStatusService; @@ -11,8 +12,10 @@ describe('IrisStatusService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), IrisStatusService, { provide: JhiWebsocketService, useValue: { connectionState: of({ connected: true, intendedDisconnect: false, wasEverConnectedBefore: true }) } }, ], diff --git a/src/test/javascript/spec/component/iris/settings/iris-common-sub-settings-update.component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-common-sub-settings-update.component.spec.ts index 0a3bf65f8433..2b36487e4576 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-common-sub-settings-update.component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-common-sub-settings-update.component.spec.ts @@ -1,39 +1,43 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { IrisTemplate } from 'app/entities/iris/settings/iris-template'; import { IrisChatSubSettings } from 'app/entities/iris/settings/iris-sub-settings.model'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { MockDirective, MockPipe } from 'ng-mocks'; import { SimpleChange, SimpleChanges } from '@angular/core'; import { IrisCommonSubSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component'; -import { mockModels } from './mock-settings'; +import { mockVariants } from './mock-settings'; import { IrisSettingsType } from 'app/entities/iris/settings/iris-settings.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; +import { of } from 'rxjs'; function baseSettings() { - const mockTemplate = new IrisTemplate(); - mockTemplate.id = 1; - mockTemplate.content = 'Hello World'; const irisSubSettings = new IrisChatSubSettings(); irisSubSettings.id = 2; irisSubSettings.enabled = true; - const allowedModels = mockModels(); - allowedModels.pop(); - irisSubSettings.allowedModels = allowedModels.map((model) => model.id!); - irisSubSettings.preferredModel = allowedModels[0].id!; + const allowedVariants = mockVariants(); + allowedVariants.pop(); + irisSubSettings.allowedVariants = allowedVariants.map((model) => model.id!); + irisSubSettings.selectedVariant = allowedVariants[0].id!; return irisSubSettings; } describe('IrisCommonSubSettingsUpdateComponent Component', () => { let comp: IrisCommonSubSettingsUpdateComponent; let fixture: ComponentFixture; + let getVariantsSpy: jest.SpyInstance; beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, FormsModule, MockDirective(NgbTooltip), MockPipe(ArtemisTranslatePipe)], declarations: [IrisCommonSubSettingsUpdateComponent], - }).compileComponents(); + }) + .compileComponents() + .then(() => { + const irisSettingsService = TestBed.inject(IrisSettingsService); + getVariantsSpy = jest.spyOn(irisSettingsService, 'getVariantsForFeature').mockReturnValue(of(mockVariants())); + }); fixture = TestBed.createComponent(IrisCommonSubSettingsUpdateComponent); comp = fixture.componentInstance; }); @@ -45,28 +49,29 @@ describe('IrisCommonSubSettingsUpdateComponent Component', () => { it('child setup works', () => { comp.subSettings = baseSettings(); comp.parentSubSettings = baseSettings(); - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); comp.settingsType = IrisSettingsType.EXERCISE; fixture.detectChanges(); + expect(getVariantsSpy).toHaveBeenCalledOnce(); expect(comp.enabled).toBeTrue(); - expect(comp.inheritAllowedModels).toBeFalse(); - expect(comp.allowedIrisModels).toEqual([mockModels()[0]]); + expect(comp.inheritAllowedVariants).toBeFalse(); + expect(comp.allowedVariants).toEqual([mockVariants()[0]]); }); it('parent setup works', () => { const subSettings = baseSettings(); - subSettings.allowedModels = undefined; - subSettings.preferredModel = undefined; + subSettings.allowedVariants = undefined; + subSettings.selectedVariant = undefined; comp.subSettings = subSettings; comp.parentSubSettings = baseSettings(); - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); comp.settingsType = IrisSettingsType.EXERCISE; fixture.detectChanges(); expect(comp.enabled).toBeTrue(); - expect(comp.inheritAllowedModels).toBeTrue(); - expect(comp.allowedIrisModels).toEqual([mockModels()[0]]); + expect(comp.inheritAllowedVariants).toBeTrue(); + expect(comp.allowedVariants).toEqual([mockVariants()[0]]); }); it('prevents enabling chat settings if the parent chat settings disabled', () => { @@ -75,7 +80,7 @@ describe('IrisCommonSubSettingsUpdateComponent Component', () => { comp.parentSubSettings.enabled = false; comp.isAdmin = true; comp.settingsType = IrisSettingsType.EXERCISE; - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); fixture.detectChanges(); expect(comp.inheritDisabled).toBeTrue(); @@ -88,7 +93,7 @@ describe('IrisCommonSubSettingsUpdateComponent Component', () => { comp.parentSubSettings.enabled = false; comp.isAdmin = true; comp.settingsType = IrisSettingsType.COURSE; - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); fixture.detectChanges(); expect(comp.inheritDisabled).toBeTrue(); @@ -96,34 +101,34 @@ describe('IrisCommonSubSettingsUpdateComponent Component', () => { }); it('change allowed model', () => { - const allIrisModels = mockModels(); + const availableVariants = mockVariants(); comp.subSettings = baseSettings(); comp.parentSubSettings = baseSettings(); - comp.allIrisModels = allIrisModels; + comp.availableVariants = availableVariants; comp.settingsType = IrisSettingsType.EXERCISE; fixture.detectChanges(); - comp.onAllowedIrisModelsSelectionChange(allIrisModels[1]); - expect(comp.allowedIrisModels).toEqual([allIrisModels[0], allIrisModels[1]]); - comp.onAllowedIrisModelsSelectionChange(allIrisModels[0]); - expect(comp.allowedIrisModels).toEqual([allIrisModels[1]]); + comp.onAllowedIrisVariantsSelectionChange(availableVariants[1]); + expect(comp.allowedVariants).toEqual([availableVariants[0], availableVariants[1]]); + comp.onAllowedIrisVariantsSelectionChange(availableVariants[0]); + expect(comp.allowedVariants).toEqual([availableVariants[1]]); }); it('change preferred model', () => { comp.subSettings = baseSettings(); comp.parentSubSettings = baseSettings(); - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); comp.settingsType = IrisSettingsType.EXERCISE; fixture.detectChanges(); - comp.setModel(mockModels()[1]); - expect(comp.subSettings!.preferredModel).toBe(mockModels()[1].id); + comp.setVariant(mockVariants()[1]); + expect(comp.subSettings!.selectedVariant).toBe(mockVariants()[1].id); }); it('change enabled', () => { comp.subSettings = baseSettings(); comp.parentSubSettings = baseSettings(); - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); comp.settingsType = IrisSettingsType.EXERCISE; fixture.detectChanges(); @@ -139,41 +144,41 @@ describe('IrisCommonSubSettingsUpdateComponent Component', () => { it('change inherit allowed models', () => { comp.subSettings = baseSettings(); comp.parentSubSettings = baseSettings(); - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); comp.settingsType = IrisSettingsType.EXERCISE; fixture.detectChanges(); - comp.inheritAllowedModels = true; - comp.onInheritAllowedModelsChange(); - expect(comp.subSettings!.allowedModels).toBeUndefined(); - expect(comp.allowedIrisModels).toEqual(comp.getAvailableModels()); + comp.inheritAllowedVariants = true; + comp.onInheritAllowedVariantsChange(); + expect(comp.subSettings!.allowedVariants).toBeUndefined(); + expect(comp.allowedVariants).toEqual(comp.getAllowedVariants()); - comp.inheritAllowedModels = false; - comp.onInheritAllowedModelsChange(); - expect(comp.subSettings!.allowedModels).toEqual(comp.allowedIrisModels.map((model) => model.id)); + comp.inheritAllowedVariants = false; + comp.onInheritAllowedVariantsChange(); + expect(comp.subSettings!.allowedVariants).toEqual(comp.allowedVariants.map((model) => model.id)); }); it('ngOnChanges works', () => { comp.subSettings = baseSettings(); comp.parentSubSettings = baseSettings(); - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); comp.settingsType = IrisSettingsType.EXERCISE; fixture.detectChanges(); const newSubSettings = baseSettings(); newSubSettings.enabled = false; - const newModels = mockModels(); + const newModels = mockVariants(); newModels.pop(); const changes: SimpleChanges = { subSettings: new SimpleChange(comp.subSettings, newSubSettings, false), - allIrisModels: new SimpleChange(comp.allIrisModels, newModels, false), + availableVariants: new SimpleChange(comp.availableVariants, newModels, false), }; comp.subSettings = newSubSettings; - comp.allIrisModels = mockModels(); + comp.availableVariants = mockVariants(); comp.ngOnChanges(changes); expect(comp.enabled).toBeFalse(); - expect(comp.allowedIrisModels).toEqual(newModels); + expect(comp.allowedVariants).toEqual(newModels); }); }); diff --git a/src/test/javascript/spec/component/iris/settings/iris-course-settings-update.component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-course-settings-update.component.spec.ts index c5f5a5af8fa8..8e721fcc7653 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-course-settings-update.component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-course-settings-update.component.spec.ts @@ -6,10 +6,8 @@ import { MockComponent, MockDirective, MockProvider } from 'ng-mocks'; import { BehaviorSubject, of } from 'rxjs'; import { ButtonComponent } from 'app/shared/components/button.component'; import { IrisCommonSubSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component'; -import { IrisGlobalAutoupdateSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-global-autoupdate-settings-update/iris-global-autoupdate-settings-update.component'; import { mockEmptySettings, mockSettings } from './mock-settings'; -import { ActivatedRoute, Params } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, Params, provideRouter } from '@angular/router'; import { NgModel } from '@angular/forms'; import { IrisCourseSettingsUpdateComponent } from 'app/iris/settings/iris-course-settings-update/iris-course-settings-update.component'; import { By } from '@angular/platform-browser'; @@ -24,21 +22,19 @@ describe('IrisCourseSettingsUpdateComponent Component', () => { const route = { parent: { params: routeParamsSubject.asObservable() } } as ActivatedRoute; let paramsSpy: jest.SpyInstance; let getSettingsSpy: jest.SpyInstance; - //let getModelsSpy: jest.SpyInstance; let getParentSettingsSpy: jest.SpyInstance; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [ IrisCourseSettingsUpdateComponent, IrisSettingsUpdateComponent, MockComponent(IrisCommonSubSettingsUpdateComponent), - MockComponent(IrisGlobalAutoupdateSettingsUpdateComponent), MockComponent(ButtonComponent), MockDirective(NgModel), ], - providers: [MockProvider(IrisSettingsService), { provide: ActivatedRoute, useValue: route }], + providers: [provideRouter([]), MockProvider(IrisSettingsService), { provide: ActivatedRoute, useValue: route }], }) .compileComponents() .then(() => { @@ -50,7 +46,6 @@ describe('IrisCourseSettingsUpdateComponent Component', () => { const irisSettings = mockSettings(); getSettingsSpy = jest.spyOn(irisSettingsService, 'getUncombinedCourseSettings').mockReturnValue(of(irisSettings)); - //getModelsSpy = jest.spyOn(irisSettingsService, 'getIrisModels').mockReturnValue(of(mockModels())); getParentSettingsSpy = jest.spyOn(irisSettingsService, 'getGlobalSettings').mockReturnValue(of(irisSettings)); }); fixture = TestBed.createComponent(IrisCourseSettingsUpdateComponent); @@ -67,10 +62,8 @@ describe('IrisCourseSettingsUpdateComponent Component', () => { expect(comp.courseId).toBe(1); expect(comp.settingsUpdateComponent).toBeTruthy(); expect(getSettingsSpy).toHaveBeenCalledWith(1); - //expect(getModelsSpy).toHaveBeenCalledOnce(); expect(getParentSettingsSpy).toHaveBeenCalledOnce(); - expect(fixture.debugElement.query(By.directive(IrisGlobalAutoupdateSettingsUpdateComponent))).toBeFalsy(); expect(fixture.debugElement.queryAll(By.directive(IrisCommonSubSettingsUpdateComponent))).toHaveLength(4); }); @@ -100,7 +93,6 @@ describe('IrisCourseSettingsUpdateComponent Component', () => { comp.settingsUpdateComponent!.fillEmptyIrisSubSettings(); expect(comp.settingsUpdateComponent!.irisSettings.irisChatSettings).toBeTruthy(); expect(comp.settingsUpdateComponent!.irisSettings.irisLectureIngestionSettings).toBeTruthy(); - expect(comp.settingsUpdateComponent!.irisSettings.irisHestiaSettings).toBeTruthy(); expect(comp.settingsUpdateComponent!.irisSettings.irisCompetencyGenerationSettings).toBeTruthy(); }); }); diff --git a/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts index ba02154c4bc5..8647d036e2a7 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts @@ -4,7 +4,6 @@ import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.serv import { MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { mockSettings } from './mock-settings'; -import { RouterTestingModule } from '@angular/router/testing'; import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model'; import { HttpResponse } from '@angular/common/http'; import { IrisEnabledComponent } from 'app/iris/settings/shared/iris-enabled.component'; @@ -12,6 +11,7 @@ import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { IrisSubSettingsType } from 'app/entities/iris/settings/iris-sub-settings.model'; +import { provideRouter } from '@angular/router'; describe('IrisEnabledComponent', () => { let comp: IrisEnabledComponent; @@ -26,9 +26,9 @@ describe('IrisEnabledComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [IrisEnabledComponent, TranslatePipeMock], - providers: [MockProvider(IrisSettingsService)], + providers: [provideRouter([]), MockProvider(IrisSettingsService)], }) .compileComponents() .then(() => { @@ -47,8 +47,8 @@ describe('IrisEnabledComponent', () => { expect(comp).toBeDefined(); }); - it.each([IrisSubSettingsType.CHAT, IrisSubSettingsType.HESTIA, IrisSubSettingsType.COMPETENCY_GENERATION])('should load exercise', async (subSettingstype) => { - const getExerciseSettingsSpy = jest.spyOn(irisSettingsService, 'getUncombinedProgrammingExerciseSettings').mockReturnValue(of(irisSettings)); + it.each([IrisSubSettingsType.CHAT, IrisSubSettingsType.COMPETENCY_GENERATION])('should load exercise', async (subSettingstype) => { + const getExerciseSettingsSpy = jest.spyOn(irisSettingsService, 'getUncombinedExerciseSettings').mockReturnValue(of(irisSettings)); comp.exercise = exercise; comp.irisSubSettingsType = subSettingstype; fixture.detectChanges(); @@ -58,22 +58,19 @@ describe('IrisEnabledComponent', () => { expect(comp.irisSubSettings).toBeDefined(); }); - it.each([IrisSubSettingsType.CHAT, IrisSubSettingsType.HESTIA, IrisSubSettingsType.COMPETENCY_GENERATION, IrisSubSettingsType.LECTURE_INGESTION])( - 'should load course', - async (subSettingstype) => { - const getExerciseSettingsSpy = jest.spyOn(irisSettingsService, 'getUncombinedCourseSettings').mockReturnValue(of(irisSettings)); - comp.course = course; - comp.irisSubSettingsType = subSettingstype; - fixture.detectChanges(); - expect(getExerciseSettingsSpy).toHaveBeenCalledOnce(); - await Promise.resolve(); - expect(comp.irisSettings).toBe(irisSettings); - expect(comp.irisSubSettings).toBeDefined(); - }, - ); + it.each([IrisSubSettingsType.CHAT, IrisSubSettingsType.COMPETENCY_GENERATION, IrisSubSettingsType.LECTURE_INGESTION])('should load course', async (subSettingstype) => { + const getExerciseSettingsSpy = jest.spyOn(irisSettingsService, 'getUncombinedCourseSettings').mockReturnValue(of(irisSettings)); + comp.course = course; + comp.irisSubSettingsType = subSettingstype; + fixture.detectChanges(); + expect(getExerciseSettingsSpy).toHaveBeenCalledOnce(); + await Promise.resolve(); + expect(comp.irisSettings).toBe(irisSettings); + expect(comp.irisSubSettings).toBeDefined(); + }); it('should set exercise enabled', async () => { - const setSettingsSpy = jest.spyOn(irisSettingsService, 'setProgrammingExerciseSettings').mockReturnValue(of(new HttpResponse({ body: null as any as IrisSettings }))); + const setSettingsSpy = jest.spyOn(irisSettingsService, 'setExerciseSettings').mockReturnValue(of(new HttpResponse({ body: null as any as IrisSettings }))); comp.exercise = exercise; comp.irisSettings = irisSettings; comp.irisSubSettingsType = IrisSubSettingsType.CHAT; @@ -89,8 +86,8 @@ describe('IrisEnabledComponent', () => { const setSettingsSpy = jest.spyOn(irisSettingsService, 'setCourseSettings').mockReturnValue(of(new HttpResponse({ body: null as any as IrisSettings }))); comp.course = course; comp.irisSettings = irisSettings; - comp.irisSubSettingsType = IrisSubSettingsType.HESTIA; - comp.irisSubSettings = irisSettings.irisHestiaSettings; + comp.irisSubSettingsType = IrisSubSettingsType.CHAT; + comp.irisSubSettings = irisSettings.irisChatSettings; comp.setEnabled(true); expect(setSettingsSpy).toHaveBeenCalledOnce(); diff --git a/src/test/javascript/spec/component/iris/settings/iris-exercise-settings-update.component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-exercise-settings-update.component.spec.ts index d99ce839e8a5..7d37655167c4 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-exercise-settings-update.component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-exercise-settings-update.component.spec.ts @@ -6,11 +6,9 @@ import { MockComponent, MockDirective, MockProvider } from 'ng-mocks'; import { BehaviorSubject, of } from 'rxjs'; import { ButtonComponent } from 'app/shared/components/button.component'; import { IrisCommonSubSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component'; -import { IrisGlobalAutoupdateSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-global-autoupdate-settings-update/iris-global-autoupdate-settings-update.component'; import { mockSettings } from './mock-settings'; import { IrisExerciseSettingsUpdateComponent } from 'app/iris/settings/iris-exercise-settings-update/iris-exercise-settings-update.component'; -import { ActivatedRoute, Params } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, Params, provideRouter } from '@angular/router'; import { NgModel } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model'; @@ -24,21 +22,19 @@ describe('IrisExerciseSettingsUpdateComponent Component', () => { const route = { parent: { params: routeParamsSubject.asObservable() } } as ActivatedRoute; let paramsSpy: jest.SpyInstance; let getSettingsSpy: jest.SpyInstance; - //let getModelsSpy: jest.SpyInstance; let getParentSettingsSpy: jest.SpyInstance; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [ IrisExerciseSettingsUpdateComponent, IrisSettingsUpdateComponent, MockComponent(IrisCommonSubSettingsUpdateComponent), - MockComponent(IrisGlobalAutoupdateSettingsUpdateComponent), MockComponent(ButtonComponent), MockDirective(NgModel), ], - providers: [MockProvider(IrisSettingsService), { provide: ActivatedRoute, useValue: route }], + providers: [provideRouter([]), MockProvider(IrisSettingsService), { provide: ActivatedRoute, useValue: route }], }) .compileComponents() .then(() => { @@ -49,8 +45,7 @@ describe('IrisExerciseSettingsUpdateComponent Component', () => { paramsSpy = jest.spyOn(route.parent!.params, 'subscribe'); const irisSettings = mockSettings(); - getSettingsSpy = jest.spyOn(irisSettingsService, 'getUncombinedProgrammingExerciseSettings').mockReturnValue(of(irisSettings)); - //getModelsSpy = jest.spyOn(irisSettingsService, 'getIrisModels').mockReturnValue(of(mockModels())); + getSettingsSpy = jest.spyOn(irisSettingsService, 'getUncombinedExerciseSettings').mockReturnValue(of(irisSettings)); getParentSettingsSpy = jest.spyOn(irisSettingsService, 'getCombinedCourseSettings').mockReturnValue(of(irisSettings)); }); fixture = TestBed.createComponent(IrisExerciseSettingsUpdateComponent); @@ -68,11 +63,9 @@ describe('IrisExerciseSettingsUpdateComponent Component', () => { expect(comp.exerciseId).toBe(2); expect(comp.settingsUpdateComponent).toBeTruthy(); expect(getSettingsSpy).toHaveBeenCalledWith(2); - //expect(getModelsSpy).toHaveBeenCalledOnce(); expect(getParentSettingsSpy).toHaveBeenCalledWith(1); - expect(fixture.debugElement.query(By.directive(IrisGlobalAutoupdateSettingsUpdateComponent))).toBeFalsy(); - expect(fixture.debugElement.queryAll(By.directive(IrisCommonSubSettingsUpdateComponent))).toHaveLength(1); + expect(fixture.debugElement.queryAll(By.directive(IrisCommonSubSettingsUpdateComponent))).toHaveLength(2); }); it('Can deactivate correctly', () => { @@ -89,7 +82,7 @@ describe('IrisExerciseSettingsUpdateComponent Component', () => { const irisSettings = mockSettings(); irisSettings.id = undefined; const irisSettingsSaved = mockSettings(); - const setSettingsSpy = jest.spyOn(irisSettingsService, 'setProgrammingExerciseSettings').mockReturnValue(of(new HttpResponse({ body: irisSettingsSaved }))); + const setSettingsSpy = jest.spyOn(irisSettingsService, 'setExerciseSettings').mockReturnValue(of(new HttpResponse({ body: irisSettingsSaved }))); comp.settingsUpdateComponent!.irisSettings = irisSettings; comp.settingsUpdateComponent!.saveIrisSettings(); expect(setSettingsSpy).toHaveBeenCalledWith(2, irisSettings); diff --git a/src/test/javascript/spec/component/iris/settings/iris-global-settings-update.component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-global-settings-update.component.spec.ts index a00353681299..0478f3ad2f7a 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-global-settings-update.component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-global-settings-update.component.spec.ts @@ -6,7 +6,6 @@ import { MockComponent, MockDirective, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { ButtonComponent } from 'app/shared/components/button.component'; import { IrisCommonSubSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component'; -import { IrisGlobalAutoupdateSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-global-autoupdate-settings-update/iris-global-autoupdate-settings-update.component'; import { mockSettings } from './mock-settings'; import { NgModel } from '@angular/forms'; import { IrisGlobalSettingsUpdateComponent } from 'app/iris/settings/iris-global-settings-update/iris-global-settings-update.component'; @@ -19,7 +18,6 @@ describe('IrisGlobalSettingsUpdateComponent Component', () => { let fixture: ComponentFixture; let irisSettingsService: IrisSettingsService; let getSettingsSpy: jest.SpyInstance; - //let getModelsSpy: jest.SpyInstance; beforeEach(() => { TestBed.configureTestingModule({ @@ -28,7 +26,6 @@ describe('IrisGlobalSettingsUpdateComponent Component', () => { IrisGlobalSettingsUpdateComponent, IrisSettingsUpdateComponent, MockComponent(IrisCommonSubSettingsUpdateComponent), - MockComponent(IrisGlobalAutoupdateSettingsUpdateComponent), MockComponent(ButtonComponent), MockDirective(NgModel), ], @@ -41,7 +38,6 @@ describe('IrisGlobalSettingsUpdateComponent Component', () => { // Setup const irisSettings = mockSettings(); getSettingsSpy = jest.spyOn(irisSettingsService, 'getGlobalSettings').mockReturnValue(of(irisSettings)); - //getModelsSpy = jest.spyOn(irisSettingsService, 'getIrisModels').mockReturnValue(of(mockModels())); }); fixture = TestBed.createComponent(IrisGlobalSettingsUpdateComponent); comp = fixture.componentInstance; @@ -55,9 +51,7 @@ describe('IrisGlobalSettingsUpdateComponent Component', () => { fixture.detectChanges(); expect(comp.settingsUpdateComponent).toBeTruthy(); expect(getSettingsSpy).toHaveBeenCalledOnce(); - //expect(getModelsSpy).toHaveBeenCalledOnce(); - expect(fixture.debugElement.query(By.directive(IrisGlobalAutoupdateSettingsUpdateComponent))).toBeTruthy(); expect(fixture.debugElement.queryAll(By.directive(IrisCommonSubSettingsUpdateComponent))).toHaveLength(4); }); diff --git a/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts index 1c3a6fb751b4..d07481ba739e 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts @@ -2,12 +2,11 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { By } from '@angular/platform-browser'; import { IrisSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-settings-update.component'; import { IrisSettingsType } from 'app/entities/iris/settings/iris-settings.model'; -import { mockSettings } from './mock-settings'; +import { mockSettings, mockVariants } from './mock-settings'; import { ArtemisTestModule } from '../../../test.module'; import { NgModel } from '@angular/forms'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { IrisCommonSubSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component'; -import { IrisGlobalAutoupdateSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-global-autoupdate-settings-update/iris-global-autoupdate-settings-update.component'; import { ButtonComponent } from 'app/shared/components/button.component'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { of } from 'rxjs'; @@ -17,12 +16,12 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; describe('IrisSettingsUpdateComponent', () => { let component: IrisSettingsUpdateComponent; let fixture: ComponentFixture; + let getVariantsSpy: jest.SpyInstance; beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], declarations: [ - IrisGlobalAutoupdateSettingsUpdateComponent, IrisCourseSettingsUpdateComponent, IrisSettingsUpdateComponent, IrisCommonSubSettingsUpdateComponent, @@ -34,7 +33,7 @@ describe('IrisSettingsUpdateComponent', () => { MockProvider(IrisSettingsService, { getGlobalSettings: () => of(mockSettings()), getUncombinedCourseSettings: () => of(mockSettings()), - getUncombinedProgrammingExerciseSettings: () => of(mockSettings()), + getUncombinedExerciseSettings: () => of(mockSettings()), }), ], }) @@ -42,15 +41,12 @@ describe('IrisSettingsUpdateComponent', () => { .then(() => { fixture = TestBed.createComponent(IrisSettingsUpdateComponent); component = fixture.componentInstance; + + const irisSettingsService = TestBed.inject(IrisSettingsService); + getVariantsSpy = jest.spyOn(irisSettingsService, 'getVariantsForFeature').mockReturnValue(of(mockVariants())); }); }); - it('should display global auto-update settings only if settingsType is GLOBAL', () => { - component.irisSettings = mockSettings(); - component.settingsType = IrisSettingsType.GLOBAL; - fixture.detectChanges(); - const globalSettingsElement = fixture.debugElement.query(By.css('jhi-iris-global-autoupdate-settings-update')); - expect(globalSettingsElement).toBeTruthy(); - }); + it('should display the checkbox for lecture ingestion when settingsType is COURSE', fakeAsync(() => { component.irisSettings = mockSettings(); component.settingsType = IrisSettingsType.COURSE; @@ -65,5 +61,6 @@ describe('IrisSettingsUpdateComponent', () => { expect(lectureIngestionElement).not.toBeNull(); expect(checkboxElement).toBeTruthy(); expect(labelElement).toBeTruthy(); + expect(getVariantsSpy).toHaveBeenCalled(); })); }); diff --git a/src/test/javascript/spec/component/iris/settings/iris-settings.service.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-settings.service.spec.ts index 4a181b852a84..e835d8b6489b 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-settings.service.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-settings.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { mockSettings } from './mock-settings'; +import { provideHttpClient } from '@angular/common/http'; describe('Iris Settings Service', () => { let service: IrisSettingsService; @@ -10,8 +11,8 @@ describe('Iris Settings Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [IrisSettingsService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), IrisSettingsService], }); service = TestBed.inject(IrisSettingsService); httpMock = TestBed.inject(HttpTestingController); @@ -75,7 +76,7 @@ describe('Iris Settings Service', () => { it('should get uncombined programming exercise settings', fakeAsync(() => { const mockedSettings = mockSettings(); service - .getUncombinedProgrammingExerciseSettings(1) + .getUncombinedExerciseSettings(1) .pipe(take(1)) .subscribe((resp) => expect(resp).toEqual(mockedSettings)); const req = httpMock.expectOne({ method: 'GET' }); @@ -86,7 +87,7 @@ describe('Iris Settings Service', () => { it('should get combined programming exercise settings', fakeAsync(() => { const mockedSettings = mockSettings(); service - .getCombinedProgrammingExerciseSettings(1) + .getCombinedExerciseSettings(1) .pipe(take(1)) .subscribe((resp) => expect(resp).toEqual(mockedSettings)); const req = httpMock.expectOne({ method: 'GET' }); @@ -97,7 +98,7 @@ describe('Iris Settings Service', () => { it('should set programming exercise settings', fakeAsync(() => { const mockedSettings = mockSettings(); service - .setProgrammingExerciseSettings(1, mockedSettings) + .setExerciseSettings(1, mockedSettings) .pipe(take(1)) .subscribe((resp) => expect(resp.body).toEqual(mockedSettings)); const req = httpMock.expectOne({ method: 'PUT' }); diff --git a/src/test/javascript/spec/component/iris/settings/mock-settings.ts b/src/test/javascript/spec/component/iris/settings/mock-settings.ts index f9338cd78cc4..109fb0fdc04f 100644 --- a/src/test/javascript/spec/component/iris/settings/mock-settings.ts +++ b/src/test/javascript/spec/component/iris/settings/mock-settings.ts @@ -1,51 +1,42 @@ -import { IrisModel } from 'app/entities/iris/settings/iris-model'; -import { IrisTemplate } from 'app/entities/iris/settings/iris-template'; +import { IrisVariant } from 'app/entities/iris/settings/iris-variant'; import { IrisChatSubSettings, IrisCompetencyGenerationSubSettings, - IrisHestiaSubSettings, IrisLectureIngestionSubSettings, + IrisTextExerciseChatSubSettings, } from 'app/entities/iris/settings/iris-sub-settings.model'; import { IrisGlobalSettings } from 'app/entities/iris/settings/iris-settings.model'; export function mockSettings() { - const mockTemplate = new IrisTemplate(); - mockTemplate.id = 1; - mockTemplate.content = 'Hello World'; const mockChatSettings = new IrisChatSubSettings(); mockChatSettings.id = 1; - mockChatSettings.template = mockTemplate; mockChatSettings.enabled = true; + const mockTextExerciseChatSettings = new IrisTextExerciseChatSubSettings(); + mockTextExerciseChatSettings.id = 13; + mockTextExerciseChatSettings.enabled = true; const mockLectureIngestionSettings = new IrisLectureIngestionSubSettings(); mockLectureIngestionSettings.id = 7; mockLectureIngestionSettings.enabled = true; mockLectureIngestionSettings.autoIngestOnLectureAttachmentUpload = true; - const mockHestiaSettings = new IrisHestiaSubSettings(); - mockHestiaSettings.id = 2; - mockHestiaSettings.template = mockTemplate; - mockHestiaSettings.enabled = true; const mockCompetencyGenerationSettings = new IrisCompetencyGenerationSubSettings(); mockCompetencyGenerationSettings.id = 5; mockCompetencyGenerationSettings.enabled = false; const irisSettings = new IrisGlobalSettings(); irisSettings.id = 1; irisSettings.irisChatSettings = mockChatSettings; - irisSettings.irisHestiaSettings = mockHestiaSettings; + irisSettings.irisTextExerciseChatSettings = mockTextExerciseChatSettings; irisSettings.irisCompetencyGenerationSettings = mockCompetencyGenerationSettings; irisSettings.irisLectureIngestionSettings = mockLectureIngestionSettings; return irisSettings; } export function mockEmptySettings() { - const mockTemplate = new IrisTemplate(); - mockTemplate.id = 1; - mockTemplate.content = 'Hello World'; const irisSettings = new IrisGlobalSettings(); irisSettings.id = 1; return irisSettings; } -export function mockModels() { +export function mockVariants() { return [ { id: '1', @@ -57,5 +48,5 @@ export function mockModels() { name: 'Model 2', description: 'Model 2 Description', }, - ] as IrisModel[]; + ] as IrisVariant[]; } diff --git a/src/test/javascript/spec/component/iris/ui/exercise-chatbot-button.component.spec.ts b/src/test/javascript/spec/component/iris/ui/exercise-chatbot-button.component.spec.ts index 8980bc1e35f7..0e78bb39e27a 100644 --- a/src/test/javascript/spec/component/iris/ui/exercise-chatbot-button.component.spec.ts +++ b/src/test/javascript/spec/component/iris/ui/exercise-chatbot-button.component.spec.ts @@ -7,7 +7,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { AccountService } from 'app/core/auth/account.service'; import { Subject, of } from 'rxjs'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { MockAccountService } from '../../../helpers/mocks/service/mock-account.service'; import { ActivatedRoute } from '@angular/router'; import { mockServerSessionHttpResponseWithId, mockWebsocketServerMessage } from '../../../helpers/sample/iris-sample-data'; @@ -19,6 +19,7 @@ import { IrisWebsocketService } from 'app/iris/iris-websocket.service'; import { IrisStatusService } from 'app/iris/iris-status.service'; import { UserService } from 'app/core/user/user.service'; import dayjs from 'dayjs/esm'; +import { provideHttpClient } from '@angular/common/http'; describe('ExerciseChatbotButtonComponent', () => { let component: IrisExerciseChatbotButtonComponent; @@ -68,9 +69,11 @@ describe('ExerciseChatbotButtonComponent', () => { } as unknown as Overlay; await TestBed.configureTestingModule({ - imports: [FormsModule, FontAwesomeModule, HttpClientTestingModule], + imports: [FormsModule, FontAwesomeModule], declarations: [IrisExerciseChatbotButtonComponent, MockComponent(IrisLogoComponent), MockPipe(ArtemisTranslatePipe)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), IrisChatService, MockProvider(IrisChatHttpService), MockProvider(IrisWebsocketService), @@ -98,12 +101,15 @@ describe('ExerciseChatbotButtonComponent', () => { jest.restoreAllMocks(); }); - it('should subscribe to route.params and call chatService.switchTo', fakeAsync(() => { + it('should subscribe to route.params and call chatService.switchTo with exercise mode', fakeAsync(() => { jest.spyOn(chatHttpServiceMock, 'getCurrentSessionOrCreateIfNotExists').mockReturnValueOnce(of(mockServerSessionHttpResponseWithId(123))); jest.spyOn(wsServiceMock, 'subscribeToSession').mockReturnValueOnce(of()); const mockExerciseId = 123; const spy = jest.spyOn(chatService, 'switchTo'); + component.mode = ChatServiceMode.EXERCISE; + fixture.detectChanges(); + mockParamsSubject.next({ exerciseId: mockExerciseId, }); @@ -113,6 +119,24 @@ describe('ExerciseChatbotButtonComponent', () => { expect(spy).toHaveBeenCalledExactlyOnceWith(ChatServiceMode.EXERCISE, mockExerciseId); })); + it('should subscribe to route.params and call chatService.switchTo with text exercise mode', fakeAsync(() => { + jest.spyOn(chatHttpServiceMock, 'getCurrentSessionOrCreateIfNotExists').mockReturnValueOnce(of(mockServerSessionHttpResponseWithId(123))); + jest.spyOn(wsServiceMock, 'subscribeToSession').mockReturnValueOnce(of()); + const mockExerciseId = 123; + const spy = jest.spyOn(chatService, 'switchTo'); + + component.mode = ChatServiceMode.TEXT_EXERCISE; + fixture.detectChanges(); + + mockParamsSubject.next({ + exerciseId: mockExerciseId, + }); + fixture.whenStable(); + tick(); + + expect(spy).toHaveBeenCalledExactlyOnceWith(ChatServiceMode.TEXT_EXERCISE, mockExerciseId); + })); + it('should close the dialog when destroying the object', () => { // given component.openChat(); diff --git a/src/test/javascript/spec/component/iris/websocket.service.spec.ts b/src/test/javascript/spec/component/iris/websocket.service.spec.ts index 3ddc00ce2c7c..b1f317220d9c 100644 --- a/src/test/javascript/spec/component/iris/websocket.service.spec.ts +++ b/src/test/javascript/spec/component/iris/websocket.service.spec.ts @@ -1,11 +1,12 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { MockProvider } from 'ng-mocks'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; import { IrisWebsocketService } from 'app/iris/iris-websocket.service'; import { defer, of } from 'rxjs'; +import { provideHttpClient } from '@angular/common/http'; describe('IrisWebsocketService', () => { let irisWebsocketService: IrisWebsocketService; @@ -16,8 +17,14 @@ describe('IrisWebsocketService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [IrisWebsocketService, MockProvider(JhiWebsocketService), { provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + IrisWebsocketService, + MockProvider(JhiWebsocketService), + { provide: AccountService, useClass: MockAccountService }, + ], }); irisWebsocketService = TestBed.inject(IrisWebsocketService); jhiWebsocketService = TestBed.inject(JhiWebsocketService); diff --git a/src/test/javascript/spec/component/learning-paths/components/competency-graph.component.spec.ts b/src/test/javascript/spec/component/learning-paths/components/competency-graph.component.spec.ts index 4de4c6bde96a..6230f341bb64 100644 --- a/src/test/javascript/spec/component/learning-paths/components/competency-graph.component.spec.ts +++ b/src/test/javascript/spec/component/learning-paths/components/competency-graph.component.spec.ts @@ -4,6 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateService } from '@ngx-translate/core'; import { CompetencyGraphDTO, CompetencyGraphEdgeDTO, CompetencyGraphNodeDTO } from 'app/entities/competency/learning-path.model'; +import { SizeUpdate } from 'app/course/learning-paths/components/competency-node/competency-node.component'; describe('CompetencyGraphComponent', () => { let component: CompetencyGraphComponent; @@ -62,4 +63,20 @@ describe('CompetencyGraphComponent', () => { expect(component.nodes()).toEqual(competencyGraph.nodes); expect(component.edges()).toEqual(edgesWithUniqueIds); }); + + it('should handle empty nodes array gracefully', () => { + component['internalCompetencyGraph'].set({ nodes: [], edges: [] }); + const sizeUpdate: SizeUpdate = { id: '1', dimension: { width: 100, height: 100 } }; + component.setNodeDimension(sizeUpdate); + + expect(component.nodes()).toHaveLength(0); + }); + + it('should not update dimension if node id does not exist', () => { + const sizeUpdate: SizeUpdate = { id: '3', dimension: { width: 100, height: 100 } }; + const originalNodes = [...component.nodes()]; + component.setNodeDimension(sizeUpdate); + + expect(component.nodes()).toEqual(originalNodes); + }); }); diff --git a/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts b/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts index c3609648d0d8..15f0dc14b768 100644 --- a/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts +++ b/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts @@ -13,6 +13,7 @@ import { LearningPathApiService } from 'app/course/learning-paths/services/learn import { AlertService } from 'app/core/util/alert.service'; import { MockAlertService } from '../../../helpers/mocks/service/mock-alert.service'; import { EntityNotFoundError } from 'app/course/learning-paths/exceptions/entity-not-found.error'; +import { LearningPathDTO } from 'app/entities/competency/learning-path.model'; describe('LearningPathStudentPageComponent', () => { let component: LearningPathStudentPageComponent; @@ -20,7 +21,11 @@ describe('LearningPathStudentPageComponent', () => { let learningPathApiService: LearningPathApiService; let alertService: AlertService; - const learningPathId = 1; + const learningPath: LearningPathDTO = { + id: 1, + progress: 0, + startedByStudent: false, + }; const courseId = 2; beforeEach(async () => { @@ -42,6 +47,14 @@ describe('LearningPathStudentPageComponent', () => { }, { provide: TranslateService, useClass: MockTranslateService }, { provide: AlertService, useClass: MockAlertService }, + { + provide: LearningPathApiService, + useValue: { + getLearningPathForCurrentUser: jest.fn().mockResolvedValue(learningPath), + generateLearningPathForCurrentUser: jest.fn().mockResolvedValue(learningPath), + startLearningPathForCurrentUser: jest.fn().mockReturnValue(() => Promise.resolve()), + }, + }, ], }) .overrideComponent(LearningPathStudentPageComponent, { @@ -70,18 +83,23 @@ describe('LearningPathStudentPageComponent', () => { expect(component.courseId()).toBe(courseId); }); - it('should get learning path id', async () => { - const getLearningPathIdSpy = jest.spyOn(learningPathApiService, 'getLearningPathId').mockResolvedValue(learningPathId); + it('should get learning path', async () => { + const getLearningPathIdSpy = jest.spyOn(learningPathApiService, 'getLearningPathForCurrentUser').mockResolvedValue(learningPath); fixture.detectChanges(); await fixture.whenStable(); expect(getLearningPathIdSpy).toHaveBeenCalledWith(courseId); - expect(component.learningPathId()).toEqual(learningPathId); + expect(component.learningPath()).toEqual(learningPath); }); - it('should show navigation on successful load', async () => { - jest.spyOn(learningPathApiService, 'getLearningPathId').mockResolvedValue(learningPathId); + it('should show navigation when learning path has been started', async () => { + const learningPath: LearningPathDTO = { + id: 1, + progress: 0, + startedByStudent: true, + }; + jest.spyOn(learningPathApiService, 'getLearningPathForCurrentUser').mockResolvedValueOnce(learningPath); fixture.detectChanges(); await fixture.whenStable(); @@ -91,9 +109,9 @@ describe('LearningPathStudentPageComponent', () => { expect(navComponent).toBeTruthy(); }); - it('should show error when learning path id could not be loaded', async () => { - const getLearningPathIdSpy = jest.spyOn(learningPathApiService, 'getLearningPathId').mockRejectedValue(new Error()); - const alertServiceErrorSpy = jest.spyOn(alertService, 'error'); + it('should show error when learning path could not be loaded', async () => { + const getLearningPathIdSpy = jest.spyOn(learningPathApiService, 'getLearningPathForCurrentUser').mockRejectedValue(new Error()); + const alertServiceErrorSpy = jest.spyOn(alertService, 'addAlert'); fixture.detectChanges(); await fixture.whenStable(); @@ -103,8 +121,8 @@ describe('LearningPathStudentPageComponent', () => { }); it('should set isLoading correctly during learning path load', async () => { - jest.spyOn(learningPathApiService, 'getLearningPathId').mockResolvedValue(learningPathId); - const loadingSpy = jest.spyOn(component.isLearningPathIdLoading, 'set'); + jest.spyOn(learningPathApiService, 'getLearningPathForCurrentUser').mockResolvedValue(learningPath); + const loadingSpy = jest.spyOn(component.isLearningPathLoading, 'set'); fixture.detectChanges(); await fixture.whenStable(); @@ -113,28 +131,34 @@ describe('LearningPathStudentPageComponent', () => { expect(loadingSpy).toHaveBeenNthCalledWith(2, false); }); - it('should generate learning path on click', async () => { - jest.spyOn(learningPathApiService, 'getLearningPathId').mockRejectedValue(new EntityNotFoundError()); - const generateLearningPathSpy = jest.spyOn(learningPathApiService, 'generateLearningPath').mockResolvedValue(learningPathId); + it('should generate learning path on start when not found', async () => { + jest.spyOn(learningPathApiService, 'getLearningPathForCurrentUser').mockReturnValueOnce(Promise.reject(new EntityNotFoundError())); + const generateLearningPathSpy = jest.spyOn(learningPathApiService, 'generateLearningPathForCurrentUser').mockResolvedValue(learningPath); + const startSpy = jest.spyOn(learningPathApiService, 'startLearningPathForCurrentUser'); fixture.detectChanges(); await fixture.whenStable(); - fixture.detectChanges(); - const generateLearningPathButton = fixture.debugElement.query(By.css('#generate-learning-path-button')); - generateLearningPathButton.nativeElement.click(); + await component.startLearningPath(); + + expect(component.learningPath()).toEqual({ ...learningPath, startedByStudent: true }); + expect(generateLearningPathSpy).toHaveBeenCalledExactlyOnceWith(courseId); + expect(startSpy).toHaveBeenCalledExactlyOnceWith(learningPath.id); + }); + it('should set learning path to started', async () => { + const startedSpy = jest.spyOn(learningPathApiService, 'startLearningPathForCurrentUser'); fixture.detectChanges(); await fixture.whenStable(); - expect(component.learningPathId()).toEqual(learningPathId); - expect(generateLearningPathSpy).toHaveBeenCalledWith(courseId); + await component.startLearningPath(); + + expect(component.learningPath()).toEqual({ ...learningPath, startedByStudent: true }); + expect(startedSpy).toHaveBeenCalledExactlyOnceWith(learningPath.id); }); - it('should set isLoading correctly during learning path generation', async () => { - jest.spyOn(learningPathApiService, 'getLearningPathId').mockRejectedValue(new EntityNotFoundError()); - jest.spyOn(learningPathApiService, 'generateLearningPath').mockResolvedValue(learningPathId); - const loadingSpy = jest.spyOn(component.isLearningPathIdLoading, 'set'); + it('should set isLoading correctly during learning path start', async () => { + const loadingSpy = jest.spyOn(component.isLearningPathLoading, 'set'); fixture.detectChanges(); await fixture.whenStable(); diff --git a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts index 504f8ffd3903..81d65f9709f1 100644 --- a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync } from '@angular/core/testing'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { MockProvider } from 'ng-mocks'; @@ -20,8 +20,10 @@ describe('AttachmentUnitService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService, { convertLectureUnitResponseDatesFromServer(res: HttpResponse): HttpResponse { return res; diff --git a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts index 61d60ac7d907..546e72b4d087 100644 --- a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { MockProvider } from 'ng-mocks'; @@ -20,8 +20,10 @@ describe('ExerciseUnitService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService, { convertLectureUnitResponseDatesFromServer(res: HttpResponse): HttpResponse { return res; diff --git a/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts index 9195af36b64b..df7b3e171889 100644 --- a/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync } from '@angular/core/testing'; import { Lecture } from 'app/entities/lecture.model'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; @@ -27,7 +27,8 @@ describe('LectureUnitService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting()], }); expectedResultArray = {} as HttpResponse; service = TestBed.inject(LectureUnitService); diff --git a/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit.service.spec.ts index 9b546b390b60..24be38f98865 100644 --- a/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync } from '@angular/core/testing'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { MockProvider } from 'ng-mocks'; @@ -18,8 +18,10 @@ describe('OnlineUnitService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService, { convertLectureUnitResponseDatesFromServer(res: HttpResponse): HttpResponse { if (res.body) { diff --git a/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit.service.spec.ts index 206c1cb3effb..b3c958e5e9f6 100644 --- a/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync } from '@angular/core/testing'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { MockProvider } from 'ng-mocks'; @@ -17,8 +17,10 @@ describe('TextUnitService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService, { convertLectureUnitResponseDatesFromServer(res: HttpResponse): HttpResponse { if (res.body) { diff --git a/src/test/javascript/spec/component/lecture-unit/unit-creation-card.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/unit-creation-card.component.spec.ts index 7fa293c29ec7..7be1e3df1990 100644 --- a/src/test/javascript/spec/component/lecture-unit/unit-creation-card.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/unit-creation-card.component.spec.ts @@ -3,18 +3,18 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { UnitCreationCardComponent } from 'app/lecture/lecture-unit/lecture-unit-management/unit-creation-card/unit-creation-card.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; -import { RouterTestingModule } from '@angular/router/testing'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; import { TranslateService } from '@ngx-translate/core'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model'; +import { RouterModule } from '@angular/router'; describe('UnitCreationCardComponent', () => { let unitCreationCardComponentFixture: ComponentFixture; let unitCreationCardComponent: UnitCreationCardComponent; beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule], + imports: [RouterModule.forRoot([])], declarations: [ UnitCreationCardComponent, MockPipe(ArtemisTranslatePipe), diff --git a/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit.service.spec.ts index 29142772bdb2..1ef5b4d43f75 100644 --- a/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync } from '@angular/core/testing'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { MockProvider } from 'ng-mocks'; @@ -17,8 +17,10 @@ describe('VideoUnitService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService, { convertLectureUnitResponseDatesFromServer(res: HttpResponse): HttpResponse { if (res.body) { diff --git a/src/test/javascript/spec/component/lecture/lecture-detail.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture-detail.component.spec.ts index 35e529ded700..367f3d916eff 100644 --- a/src/test/javascript/spec/component/lecture/lecture-detail.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/lecture-detail.component.spec.ts @@ -13,9 +13,9 @@ import { MockTranslateService } from '../../helpers/mocks/service/mock-translate import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { LectureService } from 'app/lecture/lecture.service'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_IRIS } from 'app/app.constants'; @@ -49,8 +49,10 @@ describe('LectureDetailComponent', () => { }; await TestBed.configureTestingModule({ - declarations: [LectureDetailComponent, HtmlForMarkdownPipe, MockPipe(ArtemisDatePipe), MockModule(RouterModule), DetailOverviewListComponent, HttpClientTestingModule], + declarations: [LectureDetailComponent, HtmlForMarkdownPipe, MockPipe(ArtemisDatePipe), MockModule(RouterModule), DetailOverviewListComponent], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: mockActivatedRoute }, MockProvider(SessionStorageService), { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/component/link-preview/link-preview.service.spec.ts b/src/test/javascript/spec/component/link-preview/link-preview.service.spec.ts index 9b494f35a8c3..450cc228053a 100644 --- a/src/test/javascript/spec/component/link-preview/link-preview.service.spec.ts +++ b/src/test/javascript/spec/component/link-preview/link-preview.service.spec.ts @@ -1,4 +1,5 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { LinkPreviewService } from 'app/shared/link-preview/services/link-preview.service'; @@ -8,8 +9,8 @@ describe('LinkPreviewService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [LinkPreviewService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), LinkPreviewService], }); service = TestBed.inject(LinkPreviewService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts index 494f211ee2b3..421b868c03fe 100644 --- a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts +++ b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { BuildJob } from 'app/entities/programming/build-job.model'; @@ -10,6 +10,7 @@ import { BuildAgent } from 'app/entities/programming/build-agent.model'; import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model'; import { JobTimingInfo } from 'app/entities/job-timing-info.model'; import { BuildConfig } from 'app/entities/programming/build-config.model'; +import { provideHttpClient } from '@angular/common/http'; describe('BuildAgentsService', () => { let service: BuildAgentsService; @@ -75,8 +76,8 @@ describe('BuildAgentsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: TranslateService, useClass: MockTranslateService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }], }); service = TestBed.inject(BuildAgentsService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts index e762ed0d878b..73b4ac460f63 100644 --- a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts +++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { BuildQueueService } from 'app/localci/build-queue/build-queue.service'; -import { HttpClientTestingModule, HttpTestingController, TestRequest } from '@angular/common/http/testing'; +import { HttpTestingController, TestRequest, provideHttpClientTesting } from '@angular/common/http/testing'; import { Router } from '@angular/router'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storage.service'; @@ -14,6 +14,7 @@ import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repo import { JobTimingInfo } from 'app/entities/job-timing-info.model'; import { BuildConfig } from 'app/entities/programming/build-config.model'; import { FinishedBuildJobFilter } from 'app/localci/build-queue/build-queue.component'; +import { provideHttpClient } from '@angular/common/http'; describe('BuildQueueService', () => { let service: BuildQueueService; @@ -42,8 +43,10 @@ describe('BuildQueueService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/lti/lti13-dynamic-registration.component.spec.ts b/src/test/javascript/spec/component/lti/lti13-dynamic-registration.component.spec.ts index 4aa1669fb065..56175d76c661 100644 --- a/src/test/javascript/spec/component/lti/lti13-dynamic-registration.component.spec.ts +++ b/src/test/javascript/spec/component/lti/lti13-dynamic-registration.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; import { Lti13DynamicRegistrationComponent } from 'app/lti/lti13-dynamic-registration.component'; import { ActivatedRoute, ActivatedRouteSnapshot, Params, Router, convertToParamMap } from '@angular/router'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { HttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpClient, provideHttpClient } from '@angular/common/http'; import { MockRouter } from '../../helpers/mocks/mock-router'; import { of, throwError } from 'rxjs'; @@ -20,11 +20,8 @@ describe('Lti13DynamicRegistrationComponentTest', () => { } as ActivatedRoute; TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], - providers: [ - { provide: ActivatedRoute, useValue: route }, - { provide: Router, useClass: MockRouter }, - ], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: ActivatedRoute, useValue: route }, { provide: Router, useClass: MockRouter }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts b/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts index a7c2acd4db34..9b4cf223fe7a 100644 --- a/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts +++ b/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { ArtemisTestModule } from '../../test.module'; import { Lti13ExerciseLaunchComponent } from 'app/lti/lti13-exercise-launch.component'; import { ActivatedRoute, ActivatedRouteSnapshot, Router, convertToParamMap } from '@angular/router'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { HttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpClient, provideHttpClient } from '@angular/common/http'; import { of, throwError } from 'rxjs'; import { LoginService } from 'app/core/login/login.service'; import { AccountService } from 'app/core/auth/account.service'; @@ -32,8 +32,10 @@ describe('Lti13ExerciseLaunchComponent', () => { window.sessionStorage.setItem('state', 'state'); TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: ActivatedRoute, useValue: route }, { provide: LoginService, useValue: loginService }, { provide: AccountService, useClass: MockAccountService }, diff --git a/src/test/javascript/spec/component/manage/exercise-paging.service.spec.ts b/src/test/javascript/spec/component/manage/exercise-paging.service.spec.ts index 7acce4232953..b778b3a8a490 100644 --- a/src/test/javascript/spec/component/manage/exercise-paging.service.spec.ts +++ b/src/test/javascript/spec/component/manage/exercise-paging.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpClient } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpClient, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; @@ -17,8 +17,10 @@ describe('Exercise Paging Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts index 65e4e0edb5b5..14cdcc02d9d0 100644 --- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts @@ -1,7 +1,6 @@ import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { ActivatedRoute, ParamMap, Router, convertToParamMap } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, ParamMap, Router, RouterModule, convertToParamMap } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { AssessmentLayoutComponent } from 'app/assessment/assessment-layout/assessment-layout.component'; import { ComplaintService, EntityResponseType } from 'app/complaints/complaint.service'; @@ -63,7 +62,7 @@ describe('ModelingAssessmentEditorComponent', () => { beforeEach(() => { paramMapSubject = new BehaviorSubject(convertToParamMap({})); TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule, RouterModule.forRoot([])], declarations: [ ModelingAssessmentEditorComponent, MockComponent(AssessmentLayoutComponent), diff --git a/src/test/javascript/spec/component/modeling-editor/modeling-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-editor/modeling-editor.component.spec.ts index 5fcb6a63a1ee..b340821a8a37 100644 --- a/src/test/javascript/spec/component/modeling-editor/modeling-editor.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-editor/modeling-editor.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, convertToParamMap } from '@angular/router'; import { Subject, of } from 'rxjs'; import { ApollonDiagram } from 'app/entities/apollon-diagram.model'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ApollonEditor, Patch, UMLDiagramType, UMLModel } from '@ls1intum/apollon'; import { Text } from '@ls1intum/apollon/lib/es5/utils/svg/text'; import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component'; @@ -16,6 +16,7 @@ import { SimpleChange } from '@angular/core'; import { MockComponent, MockProvider } from 'ng-mocks'; import { ModelingExplanationEditorComponent } from 'app/exercises/modeling/shared/modeling-explanation-editor.component'; import { associationUML, personUML, studentUML } from 'app/guided-tour/guided-tour-task.model'; +import { provideHttpClient } from '@angular/common/http'; // has to be overridden, because jsdom does not provide a getBBox() function for SVGTextElements Text.size = () => { @@ -35,9 +36,9 @@ describe('ModelingEditorComponent', () => { diagram.jsonRepresentation = JSON.stringify(classDiagram); TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, ArtemisTestModule], + imports: [ArtemisTestModule], declarations: [ModelingEditorComponent, MockComponent(ModelingExplanationEditorComponent)], - providers: [MockProvider(GuidedTourService), { provide: ActivatedRoute, useValue: route }], + providers: [provideHttpClient(), provideHttpClientTesting(), MockProvider(GuidedTourService), { provide: ActivatedRoute, useValue: route }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts b/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts index 0f44f1b0e6fd..1ebae9d40337 100644 --- a/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts @@ -8,8 +8,7 @@ import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.s import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; -import { RouterTestingModule } from '@angular/router/testing'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, RouterModule } from '@angular/router'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { ChangeDetectorRef, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; @@ -65,7 +64,7 @@ describe('ModelingSubmissionComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([routes[0]])], + imports: [ArtemisTestModule, RouterModule.forRoot([routes[0]])], declarations: [ ModelingSubmissionComponent, MockComponent(ModelingEditorComponent), diff --git a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts index 439db7c5dcb9..4f5ecdb8616a 100644 --- a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts @@ -8,8 +8,7 @@ import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.s import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; -import { RouterTestingModule } from '@angular/router/testing'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, RouterModule } from '@angular/router'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { ChangeDetectorRef, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; @@ -61,7 +60,7 @@ describe('ModelingSubmissionComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([routes[0]])], + imports: [ArtemisTestModule, RouterModule.forRoot([routes[0]])], declarations: [ ModelingSubmissionComponent, MockComponent(ModelingEditorComponent), diff --git a/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts b/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts index e81ad3cbd435..4fe946bec7d3 100644 --- a/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts +++ b/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts @@ -22,6 +22,7 @@ import { MockRouter } from '../helpers/mocks/mock-router'; import { Router } from '@angular/router'; import { MockRouterLinkDirective } from '../helpers/mocks/directive/mock-router-link.directive'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; describe('Exercise detail common actions Component', () => { let comp: NonProgrammingExerciseDetailCommonActionsComponent; @@ -44,8 +45,10 @@ describe('Exercise detail common actions Component', () => { { provide: FileUploadExerciseService, useClass: MockFileUploadExerciseService }, MockProvider(ModelingExerciseService), { provide: Router, useClass: MockRouter }, + MockProvider(ProfileService), ], }).compileComponents(); + jest.spyOn(TestBed.inject(ProfileService), 'getProfileInfo').mockReturnValue(of()); fixture = TestBed.createComponent(NonProgrammingExerciseDetailCommonActionsComponent); comp = fixture.componentInstance; }); diff --git a/src/test/javascript/spec/component/organization/organization-management.service.spec.ts b/src/test/javascript/spec/component/organization/organization-management.service.spec.ts index 7185b111d553..e3bd38c76f91 100644 --- a/src/test/javascript/spec/component/organization/organization-management.service.spec.ts +++ b/src/test/javascript/spec/component/organization/organization-management.service.spec.ts @@ -3,14 +3,14 @@ import { Organization } from 'app/entities/organization.model'; import { MockRouter } from '../../helpers/mocks/mock-router'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; -import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { Router } from '@angular/router'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; import { User } from 'app/core/user/user.model'; -import { fakeAsync, tick } from '@angular/core/testing'; import { OrganizationCountDto } from 'app/admin/organization-management/organization-count-dto.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Organization Service', () => { let service: OrganizationManagementService; @@ -19,8 +19,10 @@ describe('Organization Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts b/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts index 658cc5b4f7ae..4fbb28e42077 100644 --- a/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts @@ -18,11 +18,11 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { FireworksComponent } from 'app/shared/fireworks/fireworks.component'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { MockRouter } from '../../../helpers/mocks/mock-router'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { Competency, CompetencyProgress } from 'app/entities/competency.model'; import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { MockHasAnyAuthorityDirective } from '../../../helpers/mocks/directive/mock-has-any-authority.directive'; import { By } from '@angular/platform-browser'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; @@ -51,7 +51,7 @@ describe('CourseCompetenciesDetails', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockModule(NgbTooltipModule)], + imports: [ArtemisTestModule, MockModule(NgbTooltipModule)], declarations: [ CourseCompetenciesDetailsComponent, MockPipe(ArtemisTranslatePipe), @@ -70,6 +70,8 @@ describe('CourseCompetenciesDetails', () => { MockPipe(HtmlForMarkdownPipe), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(LectureUnitService), MockProvider(AlertService), MockProvider(FeatureToggleService), diff --git a/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts index 969c54184708..288ed74a8c86 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts @@ -14,11 +14,12 @@ import { BehaviorSubject } from 'rxjs'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { MessageInlineInputComponent } from 'app/shared/metis/message/message-inline-input/message-inline-input.component'; import { PostCreateEditModalComponent } from 'app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { PostSortCriterion, SortDirection } from 'app/shared/metis/metis.util'; import { metisExamChannelDTO, metisExerciseChannelDTO, metisGeneralChannelDTO, metisLectureChannelDTO } from '../../../helpers/sample/metis-sample-data'; import { getElement } from '../../../helpers/utils/general.utils'; import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Directive({ // eslint-disable-next-line @angular-eslint/directive-selector @@ -68,6 +69,7 @@ describe('CourseWideSearchComponent', () => { MockComponent(PostingThreadComponent), MockComponent(MessageInlineInputComponent), MockComponent(PostCreateEditModalComponent), + MockDirective(TranslateDirective), ], providers: [MockProvider(MetisConversationService), MockProvider(MetisService), MockProvider(NgbModal)], }).compileComponents(); diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts index e58af8239cc1..133fc64978b9 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts @@ -22,6 +22,7 @@ import { of } from 'rxjs'; import { isGroupChatDTO } from 'app/entities/metis/conversation/group-chat.model'; import { By } from '@angular/platform-browser'; import { NgbDropdownMocksModule } from '../../../../../../../../helpers/mocks/directive/ngbDropdownMocks.module'; +import { getElement } from '../../../../../../../../helpers/utils/general.utils'; const memberTemplate = { id: 1, @@ -167,6 +168,11 @@ examples.forEach((activeConversation) => { } })); + it('should display default profile picture', () => { + fixture.detectChanges(); + expect(getElement(fixture.debugElement, '.conversation-member-row-default-profile-picture')).not.toBeNull(); + }); + function checkGrantModeratorButton(shouldExist: boolean) { const grantModeratorRoleButton = fixture.debugElement.query(By.css('.grant-moderator')); if (shouldExist) { diff --git a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts index 5af6ce680ba9..1bec632a62d4 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { ConversationHeaderComponent } from 'app/overview/course-conversations/layout/conversation-header/conversation-header.component'; import { Location } from '@angular/common'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { ChannelIconComponent } from 'app/overview/course-conversations/other/channel-icon/channel-icon.component'; import { GroupChatIconComponent } from 'app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component'; @@ -28,6 +27,7 @@ import { MockMetisService } from '../../../../../helpers/mocks/service/mock-meti import { MetisModule } from 'app/shared/metis/metis.module'; import { MockTranslateService } from '../../../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; +import { provideRouter } from '@angular/router'; const examples: ConversationDTO[] = [ generateOneToOneChatDTO({}), @@ -54,14 +54,14 @@ examples.forEach((activeConversation) => { MockComponent(GroupChatIconComponent), MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe), - RouterTestingModule.withRoutes([ + ], + imports: [MetisModule], + providers: [ + provideRouter([ { path: 'courses/:courseId/lectures/:lectureId', component: CourseLectureDetailsComponent }, { path: 'courses/:courseId/exercises/:exerciseId', component: CourseExerciseDetailsComponent }, { path: 'courses/:courseId/exams/:examId', component: ExamDetailComponent }, ]), - ], - imports: [MetisModule], - providers: [ MockProvider(NgbModal), MockProvider(MetisConversationService), MockProvider(ConversationService), diff --git a/src/test/javascript/spec/component/overview/course-conversations/services/channel.service.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/services/channel.service.spec.ts index 80790eeb2382..a3ab41a7c960 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/services/channel.service.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/services/channel.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { map, take } from 'rxjs/operators'; import { ChannelService } from 'app/shared/metis/conversations/channel.service'; @@ -10,6 +10,7 @@ import { MockTranslateService } from '../../../../helpers/mocks/service/mock-tra import { AccountService } from 'app/core/auth/account.service'; import { NotificationService } from 'app/shared/notification/notification.service'; import { MockNotificationService } from '../../../../helpers/mocks/service/mock-notification.service'; +import { provideHttpClient } from '@angular/common/http'; describe('ChannelService', () => { let service: ChannelService; @@ -18,8 +19,10 @@ describe('ChannelService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: AccountService, useClass: MockAccountService }, { provide: NotificationService, useClass: MockNotificationService }, diff --git a/src/test/javascript/spec/component/overview/course-conversations/services/conversation.service.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/services/conversation.service.spec.ts index 3ed5a45c550b..dc0096d3303e 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/services/conversation.service.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/services/conversation.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { map, take } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; @@ -10,6 +10,7 @@ import { ConversationUserDTO } from 'app/entities/metis/conversation/conversatio import { generateExampleChannelDTO, generateExampleGroupChatDTO, generateOneToOneChatDTO } from '../helpers/conversationExampleModels'; import { NotificationService } from 'app/shared/notification/notification.service'; import { MockNotificationService } from '../../../../helpers/mocks/service/mock-notification.service'; +import { provideHttpClient } from '@angular/common/http'; describe('ConversationService', () => { let service: ConversationService; @@ -17,8 +18,10 @@ describe('ConversationService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: AccountService, useClass: MockAccountService }, { provide: NotificationService, useClass: MockNotificationService }, diff --git a/src/test/javascript/spec/component/overview/course-conversations/services/group-chat.service.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/services/group-chat.service.spec.ts index 59b1f540c0e2..d2604ab58d07 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/services/group-chat.service.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/services/group-chat.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { generateExampleGroupChatDTO } from '../helpers/conversationExampleModels'; @@ -10,6 +10,7 @@ import { GroupChatService } from 'app/shared/metis/conversations/group-chat.serv import { GroupChatDTO } from 'app/entities/metis/conversation/group-chat.model'; import { NotificationService } from 'app/shared/notification/notification.service'; import { MockNotificationService } from '../../../../helpers/mocks/service/mock-notification.service'; +import { provideHttpClient } from '@angular/common/http'; describe('GroupChatService', () => { let service: GroupChatService; @@ -18,8 +19,10 @@ describe('GroupChatService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: AccountService, useClass: MockAccountService }, { provide: NotificationService, useClass: MockNotificationService }, diff --git a/src/test/javascript/spec/component/overview/course-conversations/services/one-to-one-chat.service.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/services/one-to-one-chat.service.spec.ts index aa8d8da3ace7..6514ba2c0458 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/services/one-to-one-chat.service.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/services/one-to-one-chat.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { generateOneToOneChatDTO } from '../helpers/conversationExampleModels'; @@ -10,6 +10,7 @@ import { OneToOneChatService } from 'app/shared/metis/conversations/one-to-one-c import { OneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; import { NotificationService } from 'app/shared/notification/notification.service'; import { MockNotificationService } from '../../../../helpers/mocks/service/mock-notification.service'; +import { provideHttpClient } from '@angular/common/http'; describe('OneToOneChatService', () => { let service: OneToOneChatService; @@ -18,8 +19,10 @@ describe('OneToOneChatService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: AccountService, useClass: MockAccountService }, { provide: NotificationService, useClass: MockNotificationService }, diff --git a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts index 60590bae4bde..c8a658a2ef65 100644 --- a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { CourseExamsComponent } from 'app/overview/course-exams/course-exams.component'; import { Exam } from 'app/entities/exam/exam.model'; import { ArtemisTestModule } from '../../../test.module'; import dayjs from 'dayjs/esm'; -import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { Observable, of } from 'rxjs'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; @@ -15,7 +15,6 @@ import { CourseStorageService } from 'app/course/manage/course-storage.service'; import { SidebarComponent } from 'app/shared/sidebar/sidebar.component'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe'; -import { RouterTestingModule } from '@angular/router/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { CourseOverviewService } from 'app/overview/course-overview.service'; @@ -101,8 +100,8 @@ describe('CourseExamsComponent', () => { router.navigate.mockImplementation(() => Promise.resolve(true)); TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], - declarations: [CourseExamsComponent, SidebarComponent, SearchFilterComponent, MockPipe(ArtemisTranslatePipe), MockPipe(SearchFilterPipe)], + imports: [ArtemisTestModule, RouterModule.forRoot([]), MockModule(FormsModule), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], + declarations: [CourseExamsComponent, SidebarComponent, MockComponent(SearchFilterComponent), MockPipe(ArtemisTranslatePipe), MockPipe(SearchFilterPipe)], providers: [ { provide: Router, useValue: router }, { diff --git a/src/test/javascript/spec/component/overview/course-exercises/course-exercise-row.component.spec.ts b/src/test/javascript/spec/component/overview/course-exercises/course-exercise-row.component.spec.ts index 6966044517da..1c4ed04de6f7 100644 --- a/src/test/javascript/spec/component/overview/course-exercises/course-exercise-row.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-exercises/course-exercise-row.component.spec.ts @@ -30,9 +30,9 @@ import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-hea import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { OrionFilterDirective } from 'app/shared/orion/orion-filter.directive'; -import { RouterTestingModule } from '@angular/router/testing'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; import { ExerciseCategoriesComponent } from 'app/shared/exercise-categories/exercise-categories.component'; +import { RouterModule } from '@angular/router'; @Component({ template: '', @@ -51,11 +51,11 @@ describe('CourseExerciseRowComponent', () => { imports: [ ArtemisTestModule, TranslateModule.forRoot(), - NgbModule, - RouterTestingModule.withRoutes([ + RouterModule.forRoot([ { path: 'courses/:courseId/exercises', component: DummyComponent }, { path: 'courses/:courseId/exercises/:exerciseId', component: DummyComponent }, ]), + NgbModule, ], declarations: [ MockComponent(SubmissionResultStatusComponent), diff --git a/src/test/javascript/spec/component/overview/course-faq/course-faq-accordion.component.spec.ts b/src/test/javascript/spec/component/overview/course-faq/course-faq-accordion.component.spec.ts new file mode 100644 index 000000000000..400c305f573a --- /dev/null +++ b/src/test/javascript/spec/component/overview/course-faq/course-faq-accordion.component.spec.ts @@ -0,0 +1,36 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MockComponent, MockDirective } from 'ng-mocks'; +import { CourseFaqAccordionComponent } from 'app/overview/course-faq/course-faq-accordion-component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component'; +import { ArtemisMarkdownModule } from 'app/shared/markdown.module'; +import { input } from '@angular/core'; + +describe('CourseFaqAccordionComponent', () => { + let courseFaqAccordionComponent: CourseFaqAccordionComponent; + let courseFaqAccordionComponentFixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ArtemisMarkdownModule], + declarations: [CourseFaqAccordionComponent, MockDirective(TranslateDirective), MockComponent(CustomExerciseCategoryBadgeComponent)], + }) + .compileComponents() + .then(() => { + courseFaqAccordionComponentFixture = TestBed.createComponent(CourseFaqAccordionComponent); + courseFaqAccordionComponent = courseFaqAccordionComponentFixture.componentInstance; + TestBed.runInInjectionContext(() => (courseFaqAccordionComponent.faq = input({ id: 1, questionTitle: 'Title?', questionAnswer: 'Answer', categories: [] }))); + }); + }); + + afterEach(() => { + courseFaqAccordionComponent.ngOnDestroy(); + courseFaqAccordionComponentFixture.destroy(); + }); + + it('should initialize', () => { + courseFaqAccordionComponentFixture.detectChanges(); + expect(courseFaqAccordionComponent).not.toBeNull(); + courseFaqAccordionComponent.ngOnDestroy(); + }); +}); diff --git a/src/test/javascript/spec/component/overview/course-faq/course-faq.component.spec.ts b/src/test/javascript/spec/component/overview/course-faq/course-faq.component.spec.ts new file mode 100644 index 000000000000..f7795a433603 --- /dev/null +++ b/src/test/javascript/spec/component/overview/course-faq/course-faq.component.spec.ts @@ -0,0 +1,159 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, Router } from '@angular/router'; +import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { TranslateService } from '@ngx-translate/core'; +import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; +import { of, throwError } from 'rxjs'; +import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { CourseFaqComponent } from 'app/overview/course-faq/course-faq.component'; +import { AlertService } from 'app/core/util/alert.service'; +import { FaqService } from 'app/faq/faq.service'; +import { MockRouter } from '../../../helpers/mocks/mock-router'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { ArtemisSharedModule } from 'app/shared/shared.module'; +import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component'; +import { CourseFaqAccordionComponent } from 'app/overview/course-faq/course-faq-accordion-component'; +import { Faq } from 'app/entities/faq.model'; +import { FaqCategory } from 'app/entities/faq-category.model'; +import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; + +function createFaq(id: number, category: string, color: string): Faq { + const faq = new Faq(); + faq.id = id; + faq.questionTitle = 'questionTitle ' + id; + faq.questionAnswer = 'questionAnswer ' + id; + faq.categories = [new FaqCategory(category, color)]; + return faq; +} + +describe('CourseFaqs', () => { + let courseFaqComponentFixture: ComponentFixture; + let courseFaqComponent: CourseFaqComponent; + + let faqService: FaqService; + let alertServiceStub: jest.SpyInstance; + let alertService: AlertService; + + let faq1: Faq; + let faq2: Faq; + let faq3: Faq; + + beforeEach(() => { + // In beforeEach: + faq1 = createFaq(1, 'category1', '#94a11c'); + faq2 = createFaq(2, 'category2', '#0ab84f'); + faq3 = createFaq(3, 'category3', '#0ab84f'); + + TestBed.configureTestingModule({ + imports: [ArtemisSharedComponentModule, ArtemisSharedModule, MockComponent(CustomExerciseCategoryBadgeComponent), MockComponent(CourseFaqAccordionComponent)], + declarations: [ + CourseFaqComponent, + MockPipe(ArtemisTranslatePipe), + MockComponent(FaIconComponent), + MockDirective(TranslateDirective), + MockComponent(SearchFilterComponent), + ], + providers: [ + MockProvider(FaqService), + { provide: Router, useClass: MockRouter }, + { provide: TranslateService, useClass: MockTranslateService }, + { + provide: ActivatedRoute, + useValue: { + parent: { + params: of({ courseId: '1' }), + }, + }, + }, + MockProvider(FaqService, { + findAllByCourseId: () => { + return of( + new HttpResponse({ + body: [faq1, faq2, faq3], + status: 200, + }), + ); + }, + delete: () => { + return of(new HttpResponse({ status: 200 })); + }, + findAllCategoriesByCourseId: () => { + return of( + new HttpResponse({ + body: [], + status: 200, + }), + ); + }, + applyFilters: () => { + return [faq2, faq3]; + }, + hasSearchTokens: () => { + return true; + }, + }), + ], + }) + .compileComponents() + .then(() => { + courseFaqComponentFixture = TestBed.createComponent(CourseFaqComponent); + courseFaqComponent = courseFaqComponentFixture.componentInstance; + + faqService = TestBed.inject(FaqService); + alertService = TestBed.inject(AlertService); + }); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should initialize', () => { + courseFaqComponentFixture.detectChanges(); + expect(courseFaqComponent).not.toBeNull(); + courseFaqComponent.ngOnDestroy(); + }); + + it('should fetch faqs when initialized', () => { + const findAllSpy = jest.spyOn(faqService, 'findAllByCourseId'); + + courseFaqComponentFixture.detectChanges(); + expect(findAllSpy).toHaveBeenCalledExactlyOnceWith(1); + expect(courseFaqComponent.faqs).toHaveLength(3); + }); + + it('should toggle filter correctly', () => { + const toggleFilterSpy = jest.spyOn(faqService, 'toggleFilter'); + courseFaqComponentFixture.detectChanges(); + courseFaqComponent.toggleFilters('category2'); + expect(toggleFilterSpy).toHaveBeenCalledOnce(); + expect(courseFaqComponent.filteredFaqs).toHaveLength(2); + expect(courseFaqComponent.filteredFaqs).not.toContain(faq1); + expect(courseFaqComponent.filteredFaqs).toEqual([faq2, faq3]); + }); + + it('should search through already filtered array', () => { + const searchSpy = jest.spyOn(faqService, 'hasSearchTokens'); + const applyFilterSpy = jest.spyOn(faqService, 'applyFilters'); + courseFaqComponent.setSearchValue('questionTitle'); + courseFaqComponent.refreshFaqList(courseFaqComponent.searchInput.getValue()); + expect(applyFilterSpy).toHaveBeenCalledOnce(); + expect(searchSpy).toHaveBeenCalledTimes(2); + expect(searchSpy).toHaveBeenCalledWith(faq2, 'questionTitle'); + expect(searchSpy).toHaveBeenCalledWith(faq3, 'questionTitle'); + expect(courseFaqComponent.filteredFaqs).toHaveLength(2); + expect(courseFaqComponent.filteredFaqs).not.toContain(faq1); + expect(courseFaqComponent.filteredFaqs).toEqual([faq2, faq3]); + }); + + it('should catch error if no categories are found', () => { + alertServiceStub = jest.spyOn(alertService, 'error'); + const error = { status: 404 }; + jest.spyOn(faqService, 'findAllCategoriesByCourseId').mockReturnValue(throwError(() => new HttpErrorResponse(error))); + courseFaqComponentFixture.detectChanges(); + expect(alertServiceStub).toHaveBeenCalledOnce(); + }); +}); diff --git a/src/test/javascript/spec/component/overview/course-lectures/course-lecture-row.component.spec.ts b/src/test/javascript/spec/component/overview/course-lectures/course-lecture-row.component.spec.ts index 2cf30064e71f..31dc9dba62d7 100644 --- a/src/test/javascript/spec/component/overview/course-lectures/course-lecture-row.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-lectures/course-lecture-row.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { RouterTestingModule } from '@angular/router/testing'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { Course } from 'app/entities/course.model'; import { Lecture } from 'app/entities/lecture.model'; @@ -12,7 +11,7 @@ import dayjs from 'dayjs/esm'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { Location } from '@angular/common'; import { Component } from '@angular/core'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; @Component({ @@ -29,11 +28,11 @@ describe('CourseLectureRow', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - RouterTestingModule.withRoutes([ + MockDirective(NgbTooltip), + RouterModule.forRoot([ { path: 'courses/:courseId/lectures', component: DummyComponent }, { path: 'courses/:courseId/lectures/:lectureId', component: DummyComponent }, ]), - MockDirective(NgbTooltip), ], declarations: [ DummyComponent, diff --git a/src/test/javascript/spec/component/overview/course-lectures/course-lectures.component.spec.ts b/src/test/javascript/spec/component/overview/course-lectures/course-lectures.component.spec.ts index 55048ea53f59..1db277061599 100644 --- a/src/test/javascript/spec/component/overview/course-lectures/course-lectures.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-lectures/course-lectures.component.spec.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, RouterModule } from '@angular/router'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; @@ -8,8 +8,8 @@ import { LocalStorageService } from 'ngx-webstorage'; import { Course } from 'app/entities/course.model'; import { Lecture } from 'app/entities/lecture.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; -import { CourseLecturesComponent } from '../../../../../../main/webapp/app/overview/course-lectures/course-lectures.component'; -import { SidebarComponent } from '../../../../../../main/webapp/app/shared/sidebar/sidebar.component'; +import { CourseLecturesComponent } from 'app/overview/course-lectures/course-lectures.component'; +import { SidebarComponent } from 'app/shared/sidebar/sidebar.component'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe'; @@ -21,14 +21,14 @@ import { MockTranslateService } from '../../../helpers/mocks/service/mock-transl import { TranslateDirective } from 'app/shared/language/translate.directive'; import { CourseStorageService } from 'app/course/manage/course-storage.service'; import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storage.service'; -import { CourseOverviewService } from '../../../../../../main/webapp/app/overview/course-overview.service'; -import { HttpClientModule } from '@angular/common/http'; -import { ProfileService } from '../../../../../../main/webapp/app/shared/layouts/profiles/profile.service'; +import { CourseOverviewService } from 'app/overview/course-overview.service'; +import { provideHttpClient } from '@angular/common/http'; +import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { MockProfileService } from '../../../helpers/mocks/service/mock-profile.service'; -import { ProfileInfo } from '../../../../../../main/webapp/app/shared/layouts/profiles/profile-info.model'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; @Component({ selector: 'jhi-course-lecture-row', template: '' }) class CourseLectureRowStubComponent { @@ -67,20 +67,22 @@ describe('CourseLectures', () => { course.lectures = [lecture1, lecture2, lecture3]; TestBed.configureTestingModule({ - imports: [NgbDropdownModule, HttpClientModule, RouterTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockModule(NgbTooltipModule)], + imports: [NgbDropdownModule, RouterModule.forRoot([]), MockModule(FormsModule), MockModule(ReactiveFormsModule), MockModule(NgbTooltipModule)], declarations: [ CourseLecturesComponent, CourseLectureRowStubComponent, SidebarComponent, - SearchFilterComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), MockPipe(SearchFilterPipe), MockComponent(SidePanelComponent), MockComponent(FaIconComponent), MockDirective(TranslateDirective), + MockComponent(SearchFilterComponent), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(CourseStorageService, { getCourse: () => { return course; diff --git a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts index b38eefa60f4e..29e6c4bf98f7 100644 --- a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ActivatedRoute } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, provideRouter } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { BarChartModule, PieChartModule } from '@swimlane/ngx-charts'; import { CourseScores } from 'app/course/course-scores/course-scores'; @@ -329,7 +328,7 @@ describe('CourseStatisticsComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule, TreeviewModule.forRoot(), MockModule(PieChartModule), MockModule(BarChartModule), MockModule(NgbTooltipModule)], + imports: [ArtemisTestModule, TreeviewModule.forRoot(), MockModule(PieChartModule), MockModule(BarChartModule), MockModule(NgbTooltipModule)], declarations: [ CourseStatisticsComponent, MockComponent(CourseCompetenciesComponent), @@ -340,6 +339,7 @@ describe('CourseStatisticsComponent', () => { TranslateDirective, ], providers: [ + provideRouter([]), MockProvider(ArtemisNavigationUtilService), MockProvider(ChartCategoryFilter), { diff --git a/src/test/javascript/spec/component/overview/course-statistics/visualizations/exercise-scores-chart.component.spec.ts b/src/test/javascript/spec/component/overview/course-statistics/visualizations/exercise-scores-chart.component.spec.ts index 76416a42e4f9..f791c8b813c8 100644 --- a/src/test/javascript/spec/component/overview/course-statistics/visualizations/exercise-scores-chart.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-statistics/visualizations/exercise-scores-chart.component.spec.ts @@ -5,9 +5,8 @@ import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ChartNode, ExerciseScoresChartComponent } from 'app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { of } from 'rxjs'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, provideRouter } from '@angular/router'; import { ExerciseScoresChartService, ExerciseScoresDTO } from 'app/overview/visualizations/exercise-scores-chart.service'; -import { RouterTestingModule } from '@angular/router/testing'; import { ExerciseType } from 'app/entities/exercise.model'; import dayjs from 'dayjs/esm'; import { HttpResponse } from '@angular/common/http'; @@ -43,9 +42,10 @@ describe('ExerciseScoresChartComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MockModule(LineChartModule), RouterTestingModule.withRoutes([]), MockModule(BrowserAnimationsModule)], + imports: [ArtemisTestModule, MockModule(LineChartModule), MockModule(BrowserAnimationsModule)], declarations: [ExerciseScoresChartComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], providers: [ + provideRouter([]), MockProvider(AlertService), MockProvider(ArtemisNavigationUtilService), { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/component/overview/exercise-details/request-feedback-button/request-feedback-button.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/request-feedback-button/request-feedback-button.component.spec.ts new file mode 100644 index 000000000000..94219fdd2420 --- /dev/null +++ b/src/test/javascript/spec/component/overview/exercise-details/request-feedback-button/request-feedback-button.component.spec.ts @@ -0,0 +1,228 @@ +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { MockProvider } from 'ng-mocks'; +import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { Observable, of } from 'rxjs'; +import { Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { By } from '@angular/platform-browser'; +import { DebugElement } from '@angular/core'; +import { AlertService } from 'app/core/util/alert.service'; +import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; +import { HttpClient, HttpResponse } from '@angular/common/http'; +import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; +import { RequestFeedbackButtonComponent } from 'app/overview/exercise-details/request-feedback-button/request-feedback-button.component'; +import { ArtemisTestModule } from '../../../../test.module'; +import { MockProfileService } from '../../../../helpers/mocks/service/mock-profile.service'; +import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; + +describe('RequestFeedbackButtonComponent', () => { + let component: RequestFeedbackButtonComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + let profileService: ProfileService; + let alertService: AlertService; + let courseExerciseService: CourseExerciseService; + let exerciseService: ExerciseService; + + beforeEach(() => { + return TestBed.configureTestingModule({ + imports: [ArtemisTestModule, RequestFeedbackButtonComponent], + providers: [{ provide: ProfileService, useClass: MockProfileService }, MockProvider(HttpClient)], + }) + .compileComponents() + .then(() => { + fixture = TestBed.createComponent(RequestFeedbackButtonComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + courseExerciseService = debugElement.injector.get(CourseExerciseService); + exerciseService = debugElement.injector.get(ExerciseService); + profileService = debugElement.injector.get(ProfileService); + alertService = debugElement.injector.get(AlertService); + }); + }); + + function setAthenaEnabled(enabled: boolean) { + jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of({ activeProfiles: enabled ? ['athena'] : [] } as ProfileInfo)); + } + + function mockExerciseDetails(exercise: Exercise) { + jest.spyOn(exerciseService, 'getExerciseDetails').mockReturnValue(of(new HttpResponse({ body: { exercise: exercise } }))); + } + + it('should handle errors when requestFeedback fails', fakeAsync(() => { + setAthenaEnabled(true); + const participation = { + id: 1, + submissions: [{ id: 1, submitted: true }], + testRun: false, + } as StudentParticipation; + const exercise = { id: 1, type: ExerciseType.TEXT, course: undefined, studentParticipations: [participation] } as Exercise; + fixture.componentRef.setInput('exercise', exercise); + mockExerciseDetails(exercise); + + jest.spyOn(courseExerciseService, 'requestFeedback').mockReturnValue( + new Observable((subscriber) => { + subscriber.error({ error: { errorKey: 'someError' } }); + }), + ); + jest.spyOn(alertService, 'error'); + + component.requestFeedback(); + tick(); + + expect(alertService.error).toHaveBeenCalledWith('artemisApp.exercise.someError'); + })); + + it('should display the button when Athena is enabled and it is not an exam exercise', fakeAsync(() => { + setAthenaEnabled(true); + const exercise = { id: 1, type: ExerciseType.TEXT, course: {} } as Exercise; // course undefined means exam exercise + fixture.componentRef.setInput('exercise', exercise); + mockExerciseDetails(exercise); + + component.ngOnInit(); + tick(); + fixture.detectChanges(); + + const button = debugElement.query(By.css('button')); + expect(button).not.toBeNull(); + expect(button.nativeElement.disabled).toBeTrue(); + })); + + it('should not display the button when it is an exam exercise', fakeAsync(() => { + setAthenaEnabled(true); + fixture.componentRef.setInput('exercise', { id: 1, type: ExerciseType.TEXT, course: undefined } as Exercise); + + component.ngOnInit(); + tick(); + fixture.detectChanges(); + + const button = debugElement.query(By.css('button')); + const link = debugElement.query(By.css('a')); + expect(button).toBeNull(); + expect(link).toBeNull(); + })); + + it('should disable the button when participation is missing', fakeAsync(() => { + setAthenaEnabled(true); + const exercise = { id: 1, type: ExerciseType.TEXT, course: {}, studentParticipations: undefined } as Exercise; + fixture.componentRef.setInput('exercise', exercise); + mockExerciseDetails(exercise); + + component.ngOnInit(); + tick(); + fixture.detectChanges(); + + const button = debugElement.query(By.css('button')); + expect(button).not.toBeNull(); + expect(button.nativeElement.disabled).toBeTrue(); + })); + + it('should display the correct button label and style when Athena is enabled', fakeAsync(() => { + setAthenaEnabled(true); + const participation = { + id: 1, + submissions: [{ id: 1, submitted: true }], + } as StudentParticipation; + const exercise = { id: 1, type: ExerciseType.TEXT, course: {}, studentParticipations: [participation] } as Exercise; + fixture.componentRef.setInput('exercise', exercise); + component.isExamExercise = false; + mockExerciseDetails(exercise); + + component.ngOnInit(); + tick(); + fixture.detectChanges(); + + const button = debugElement.query(By.css('button')); + expect(button).not.toBeNull(); + + const span = button.query(By.css('span')); + expect(span.nativeElement.textContent).toContain('artemisApp.exerciseActions.requestAutomaticFeedback'); + })); + + it('should call requestFeedback() when button is clicked', fakeAsync(() => { + setAthenaEnabled(true); + const participation = { + id: 1, + submissions: [{ id: 1, submitted: false }], + testRun: false, + } as StudentParticipation; + const exercise = { id: 1, type: ExerciseType.PROGRAMMING, studentParticipations: [participation], course: {} } as Exercise; + fixture.componentRef.setInput('exercise', exercise); + + mockExerciseDetails(exercise); + + component.ngOnInit(); + tick(); + fixture.detectChanges(); + + jest.spyOn(component, 'requestFeedback'); + jest.spyOn(courseExerciseService, 'requestFeedback').mockReturnValue( + new Observable((subscriber) => { + subscriber.next(); + subscriber.complete(); + }), + ); + + const button = debugElement.query(By.css('a')); + button.nativeElement.click(); + tick(); + + expect(component.requestFeedback).toHaveBeenCalled(); + })); + + it('should show an alert when requestFeedback() is called and conditions are not satisfied', fakeAsync(() => { + setAthenaEnabled(true); + + const exercise = { id: 1, type: ExerciseType.TEXT, course: {} } as Exercise; + fixture.componentRef.setInput('exercise', exercise); + + jest.spyOn(component, 'hasAthenaResultForLatestSubmission').mockReturnValue(true); + jest.spyOn(alertService, 'warning'); + + component.requestFeedback(); + + expect(alertService.warning).toHaveBeenCalled(); + })); + + it('should disable the button if latest submission is not submitted or feedback is generating', fakeAsync(() => { + setAthenaEnabled(true); + const participation = { + id: 1, + submissions: [{ id: 1, submitted: false }], + testRun: false, + } as StudentParticipation; + const exercise = { id: 1, type: ExerciseType.TEXT, studentParticipations: [participation], course: {} } as Exercise; + fixture.componentRef.setInput('exercise', exercise); + fixture.componentRef.setInput('isGeneratingFeedback', false); + mockExerciseDetails(exercise); + + component.ngOnInit(); + tick(); + fixture.detectChanges(); + + const button = debugElement.query(By.css('button')); + expect(button).not.toBeNull(); + expect(button.nativeElement.disabled).toBeTrue(); + })); + + it('should enable the button if latest submission is submitted and feedback is not generating', fakeAsync(() => { + setAthenaEnabled(true); + const participation = { + id: 1, + submissions: [{ id: 1, submitted: true }], + testRun: false, + } as StudentParticipation; + const exercise = { id: 1, type: ExerciseType.TEXT, course: {}, studentParticipations: [participation] } as Exercise; + fixture.componentRef.setInput('exercise', exercise); + fixture.componentRef.setInput('isGeneratingFeedback', false); + mockExerciseDetails(exercise); + + component.ngOnInit(); + tick(); + fixture.detectChanges(); + + const button = debugElement.query(By.css('button')); + expect(button).not.toBeNull(); + expect(button.nativeElement.disabled).toBeFalse(); + })); +}); diff --git a/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts b/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts index e7a7f5ca10e2..a00664f4e5a5 100644 --- a/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts +++ b/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts @@ -5,7 +5,7 @@ import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../test.module'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { BehaviorSubject, of, throwError } from 'rxjs'; import { UnreferencedFeedbackDetailComponent } from 'app/assessment/unreferenced-feedback-detail/unreferenced-feedback-detail.component'; import { DebugElement } from '@angular/core'; @@ -21,7 +21,6 @@ import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-re import { Submission, SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { TextSubmission } from 'app/entities/text/text-submission.model'; -import { RouterTestingModule } from '@angular/router/testing'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; @@ -89,7 +88,7 @@ describe('ParticipationSubmissionComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule, NgxDatatableModule], + imports: [ArtemisTestModule, NgxDatatableModule, RouterModule.forRoot([])], declarations: [ ParticipationSubmissionComponent, MockComponent(UpdatingResultComponent), diff --git a/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts b/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts index 2118d941e1df..a404cf9e63f1 100644 --- a/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts @@ -13,7 +13,6 @@ import { ProgrammingExercise } from 'app/entities/programming/programming-exerci import { DomainChange, DomainType, FileType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission'; import { TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement'; -import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { SplitPaneHeaderComponent } from 'app/exercises/shared/plagiarism/plagiarism-split-view/split-pane-header/split-pane-header.component'; import { MockComponent, MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -29,6 +28,7 @@ describe('Text Submission Viewer Component', () => { 'src/Main.java': FileType.FILE, 'src/Utils.java': FileType.FILE, 'src/Helper.java': FileType.FILE, + 'src/image.png': FileType.FILE, }; beforeEach(() => { @@ -137,7 +137,7 @@ describe('Text Submission Viewer Component', () => { it('filters files of type FILE', () => { const filtered = comp.filterFiles(files); - expect(filtered).toHaveLength(3); + expect(filtered).toHaveLength(4); expect(filtered).not.toContain('src/'); }); @@ -147,8 +147,6 @@ describe('Text Submission Viewer Component', () => { const fileName = Object.keys(files)[1]; comp.matches = new Map(); - const expectedHeaders = new HttpHeaders().append('content-type', 'text/plain'); - jest.spyOn(repositoryService, 'getFileHeaders').mockReturnValue(of(new HttpResponse({ headers: expectedHeaders }))); jest.spyOn(repositoryService, 'getFileForPlagiarismView').mockReturnValue(of({ fileContent: 'if(current>max)' })); comp.handleFileSelect(fileName); @@ -162,9 +160,7 @@ describe('Text Submission Viewer Component', () => { it('handles binary file selection', () => { comp.plagiarismSubmission = { submissionId: 1 } as PlagiarismSubmission; - const fileName = Object.keys(files)[1]; - const expectedHeaders = new HttpHeaders().append('content-type', 'audio/mpeg'); - jest.spyOn(repositoryService, 'getFileHeaders').mockReturnValue(of(new HttpResponse({ headers: expectedHeaders }))); + const fileName = Object.keys(files)[4]; jest.spyOn(repositoryService, 'getFileForPlagiarismView').mockReturnValue(of({ fileContent: 'Test' })); comp.handleFileSelect(fileName); diff --git a/src/test/javascript/spec/component/presentation-score/presentation-score.component.spec.ts b/src/test/javascript/spec/component/presentation-score/presentation-score.component.spec.ts index 7afff6254c85..79767df891e3 100644 --- a/src/test/javascript/spec/component/presentation-score/presentation-score.component.spec.ts +++ b/src/test/javascript/spec/component/presentation-score/presentation-score.component.spec.ts @@ -3,7 +3,8 @@ import { PresentationScoreComponent } from 'app/exercises/shared/presentation-sc import { Course } from 'app/entities/course.model'; import { Exercise } from 'app/entities/exercise.model'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; describe('PresentationScoreComponent', () => { let component: PresentationScoreComponent; @@ -38,8 +39,8 @@ describe('PresentationScoreComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ declarations: [PresentationScoreComponent], - imports: [HttpClientTestingModule], - providers: [GradingSystemService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), GradingSystemService], }) .overrideTemplate(PresentationScoreComponent, '') .compileComponents() diff --git a/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts b/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts index 92350e8377d9..4177be93e1d9 100644 --- a/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts +++ b/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts @@ -32,12 +32,11 @@ import { Course } from 'app/entities/course.model'; import { delay } from 'rxjs/operators'; import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; -import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; +import { ActivatedRoute, Router, convertToParamMap, provideRouter } from '@angular/router'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { CodeEditorRepositoryFileService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; import { CodeEditorFileBrowserComponent } from 'app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser.component'; import { FileType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; -import { RouterTestingModule } from '@angular/router/testing'; import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component'; import { ResultComponent } from 'app/exercises/shared/result/result.component'; import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; @@ -173,7 +172,7 @@ describe('CodeEditorTutorAssessmentContainerComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [ CodeEditorTutorAssessmentContainerComponent, MockComponent(ProgrammingAssessmentRepoExportButtonComponent), @@ -204,7 +203,7 @@ describe('CodeEditorTutorAssessmentContainerComponent', () => { ExtensionPointDirective, ], providers: [ - MockProvider(Router), + provideRouter([]), { provide: TranslateService, useClass: MockTranslateService }, { provide: ParticipationWebsocketService, useClass: MockParticipationWebsocketService }, { provide: RepositoryFileService, useClass: MockRepositoryFileService }, diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index a4f9a2a3ee42..893d3e598b2f 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -1,6 +1,7 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; +import { provideHttpClient } from '@angular/common/http'; describe('FeedbackAnalysisService', () => { let service: FeedbackAnalysisService; @@ -13,8 +14,8 @@ describe('FeedbackAnalysisService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [FeedbackAnalysisService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), FeedbackAnalysisService], }); service = TestBed.inject(FeedbackAnalysisService); @@ -36,15 +37,5 @@ describe('FeedbackAnalysisService', () => { const result = await responsePromise; expect(result).toEqual(feedbackDetailsMock); }); - - it('should handle errors while retrieving feedback details', async () => { - const responsePromise = service.getFeedbackDetailsForExercise(1); - - const req = httpMock.expectOne('api/exercises/1/feedback-details'); - expect(req.request.method).toBe('GET'); - req.flush('Something went wrong', { status: 500, statusText: 'Server Error' }); - - await expect(responsePromise).rejects.toThrow('Internal server error'); - }); }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-docker-image.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-build-configuration.component.spec.ts similarity index 54% rename from src/test/javascript/spec/component/programming-exercise/programming-exercise-docker-image.component.spec.ts rename to src/test/javascript/spec/component/programming-exercise/programming-exercise-build-configuration.component.spec.ts index 8f6987901422..978f821fb406 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-docker-image.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-build-configuration.component.spec.ts @@ -1,34 +1,39 @@ import { TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; -import { ProgrammingExerciseDockerImageComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-docker-image/programming-exercise-docker-image.component'; +import { ProgrammingExerciseBuildConfigurationComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-build-configuration/programming-exercise-build-configuration.component'; import { FormsModule } from '@angular/forms'; import { ArtemisProgrammingExerciseUpdateModule } from 'app/exercises/programming/manage/update/programming-exercise-update.module'; describe('ProgrammingExercise Docker Image', () => { - let comp: ProgrammingExerciseDockerImageComponent; + let comp: ProgrammingExerciseBuildConfigurationComponent; beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, FormsModule, ArtemisProgrammingExerciseUpdateModule], - declarations: [ProgrammingExerciseDockerImageComponent], + declarations: [ProgrammingExerciseBuildConfigurationComponent], providers: [], }) .compileComponents() .then(); - const fixture = TestBed.createComponent(ProgrammingExerciseDockerImageComponent); + const fixture = TestBed.createComponent(ProgrammingExerciseBuildConfigurationComponent); comp = fixture.componentInstance; - comp.dockerImage = 'testImage'; + fixture.componentRef.setInput('dockerImage', 'testImage'); + fixture.componentRef.setInput('timeout', 10); }); afterEach(() => { jest.restoreAllMocks(); }); - it('should update docker image', () => { - expect(comp.dockerImage).toBe('testImage'); + it('should update build values', () => { + expect(comp.dockerImage()).toBe('testImage'); comp.dockerImageChange.subscribe((value) => expect(value).toBe('newImage')); comp.dockerImageChange.emit('newImage'); + + expect(comp.timeout()).toBe(10); + comp.timeoutChange.subscribe((value) => expect(value).toBe(20)); + comp.timeoutChange.emit(20); }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts index 8b59cc5e8c6b..005fa8fdd41a 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts @@ -8,8 +8,6 @@ import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entit import { ActivatedRoute, convertToParamMap } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { ProgrammingExerciseCustomAeolusBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component'; -import { ElementRef, Renderer2 } from '@angular/core'; -import { ThemeService } from 'app/core/theme/theme.service'; import { MockComponent } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; @@ -18,10 +16,8 @@ import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.s import { PROFILE_AEOLUS } from 'app/app.constants'; import { Observable } from 'rxjs'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; -import { TranslateService } from '@ngx-translate/core'; describe('ProgrammingExercise Aeolus Custom Build Plan', () => { - let mockThemeService: ThemeService; let comp: ProgrammingExerciseCustomAeolusBuildPlanComponent; const course = { id: 123 } as Course; @@ -33,8 +29,7 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => { let cleanBuildAction: ScriptAction = new ScriptAction(); let platformAction: PlatformAction = new PlatformAction(); let mockAeolusService: AeolusService; - let renderer2: Renderer2; - let translateService: TranslateService; + let monacoEditorComponent: MonacoEditorComponent; beforeEach(() => { programmingExercise = new ProgrammingExercise(course, undefined); @@ -75,16 +70,13 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => { .compileComponents() .then(() => { mockAeolusService = TestBed.inject(AeolusService); - mockThemeService = TestBed.inject(ThemeService); }); const fixture = TestBed.createComponent(ProgrammingExerciseCustomAeolusBuildPlanComponent); - // These are not directly injected into the component, but are needed for the tests. - renderer2 = fixture.debugElement.injector.get(Renderer2); - translateService = fixture.debugElement.injector.get(TranslateService); comp = fixture.componentInstance; comp.programmingExercise = programmingExercise; + monacoEditorComponent = TestBed.createComponent(MonacoEditorComponent).componentInstance; }); afterEach(() => { @@ -123,11 +115,13 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => { expect(programmingExercise.buildConfig?.windfile?.actions.length).toBe(size! + 1); }); - it('should accept editor', () => { - const elementRef: ElementRef = new ElementRef(document.createElement('div')); + it('should accept and setup editor', () => { + const setTextStub = jest.spyOn(monacoEditorComponent, 'setText').mockImplementation(); + comp.code = 'void'; expect(comp.editor).toBeUndefined(); - comp.editor = new MonacoEditorComponent(mockThemeService, elementRef, renderer2, translateService); - expect(comp.editor).toBeDefined(); + comp.editor = monacoEditorComponent; + expect(comp.editor).toBe(monacoEditorComponent); + expect(setTextStub).toHaveBeenCalledExactlyOnceWith(comp.code); }); it('should change code of active action', () => { @@ -175,8 +169,7 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => { }); it('should set editor text', () => { - const elementRef: ElementRef = new ElementRef(document.createElement('div')); - comp.editor = new MonacoEditorComponent(mockThemeService, elementRef, renderer2, translateService); + comp.editor = monacoEditorComponent; comp.changeActiveAction('gradle'); expect(comp.editor?.getText()).toBe(gradleBuildAction.script); }); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts index b2ec21d46f82..a02862b32a59 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts @@ -1,4 +1,4 @@ -import { TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action'; import { DockerConfiguration } from 'app/entities/programming/docker.configuration'; import { WindFile } from 'app/entities/programming/wind.file'; @@ -7,8 +7,7 @@ import { ArtemisTestModule } from '../../test.module'; import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { ActivatedRoute, convertToParamMap } from '@angular/router'; import { Course } from 'app/entities/course.model'; -import { ElementRef, Renderer2 } from '@angular/core'; -import { ThemeService } from 'app/core/theme/theme.service'; +import { Renderer2 } from '@angular/core'; import { MockComponent } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; @@ -18,10 +17,9 @@ import { ProgrammingExerciseCustomBuildPlanComponent } from 'app/exercises/progr import { PROFILE_LOCALCI } from 'app/app.constants'; import { Observable } from 'rxjs'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; -import { TranslateService } from '@ngx-translate/core'; describe('ProgrammingExercise Custom Build Plan', () => { - let mockThemeService: ThemeService; + let fixture: ComponentFixture; let comp: ProgrammingExerciseCustomBuildPlanComponent; const course = { id: 123 } as Course; @@ -33,8 +31,6 @@ describe('ProgrammingExercise Custom Build Plan', () => { let cleanBuildAction: ScriptAction = new ScriptAction(); let platformAction: PlatformAction = new PlatformAction(); let mockAeolusService: AeolusService; - let renderer2: Renderer2; - let translateService: TranslateService; beforeEach(() => { programmingExercise = new ProgrammingExercise(course, undefined); @@ -68,14 +64,10 @@ describe('ProgrammingExercise Custom Build Plan', () => { .compileComponents() .then(() => { mockAeolusService = TestBed.inject(AeolusService); - mockThemeService = TestBed.inject(ThemeService); }); - const fixture = TestBed.createComponent(ProgrammingExerciseCustomBuildPlanComponent); + fixture = TestBed.createComponent(ProgrammingExerciseCustomBuildPlanComponent); comp = fixture.componentInstance; - // These are not directly injected into the component, but are needed for the tests. - renderer2 = fixture.debugElement.injector.get(Renderer2); - translateService = fixture.debugElement.injector.get(TranslateService); comp.programmingExercise = programmingExercise; }); @@ -92,9 +84,8 @@ describe('ProgrammingExercise Custom Build Plan', () => { }); it('should accept editor', () => { - const elementRef: ElementRef = new ElementRef(document.createElement('div')); expect(comp.editor).toBeUndefined(); - comp.editor = new MonacoEditorComponent(mockThemeService, elementRef, renderer2, translateService); + comp.editor = TestBed.createComponent(MonacoEditorComponent).componentInstance; expect(comp.editor).toBeDefined(); }); @@ -178,7 +169,7 @@ describe('ProgrammingExercise Custom Build Plan', () => { expect(loadAeolusTemplateSpy).toHaveBeenCalled(); }); - it('should update windfile', () => { + it('should update programming exercise values', () => { comp.programmingExercise.buildConfig!.windfile = undefined; programmingExerciseCreationConfigMock.customBuildPlansSupported = PROFILE_LOCALCI; comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock; @@ -186,6 +177,7 @@ describe('ProgrammingExercise Custom Build Plan', () => { jest.spyOn(mockAeolusService, 'getAeolusTemplateScript').mockReturnValue(new Observable((subscriber) => subscriber.next("echo 'test'"))); comp.loadAeolusTemplate(); expect(comp.programmingExercise.buildConfig?.windfile).toBeDefined(); + expect(comp.programmingExercise.buildConfig?.timeoutSeconds).toBe(0); }); it('should call this.resetCustomBuildPlan', () => { @@ -224,15 +216,14 @@ describe('ProgrammingExercise Custom Build Plan', () => { it('should accept editor for existing exercise', () => { comp.programmingExercise.id = 1; - const elementRef: ElementRef = new ElementRef(document.createElement('div')); comp.programmingExercise.buildConfig!.buildScript = 'buildscript'; - const editor = new MonacoEditorComponent(mockThemeService, elementRef, renderer2, translateService); + const editor = TestBed.createComponent(MonacoEditorComponent).componentInstance; expect(comp.editor).toBeUndefined(); comp.editor = editor; expect(comp.code).toBe('buildscript'); expect(comp.editor).toBeDefined(); comp.programmingExercise.buildConfig!.buildScript = undefined; - comp.editor = new MonacoEditorComponent(mockThemeService, elementRef, renderer2, translateService); + comp.editor = TestBed.createComponent(MonacoEditorComponent).componentInstance; expect(comp.code).toBe(''); }); @@ -274,4 +265,10 @@ describe('ProgrammingExercise Custom Build Plan', () => { expect(mockAeolusService.getAeolusTemplateFile).not.toHaveBeenCalled(); expect(comp.programmingExercise.buildConfig?.buildScript).toBe('echo "test"'); }); + + it('should set timeout correctly', () => { + comp.programmingExercise.buildConfig!.timeoutSeconds = 100; + comp.setTimeout(10); + expect(comp.programmingExercise.buildConfig?.timeoutSeconds).toBe(10); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-checkout-directories.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-checkout-directories.component.spec.ts new file mode 100644 index 000000000000..5702048b3e80 --- /dev/null +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-checkout-directories.component.spec.ts @@ -0,0 +1,147 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ProgrammingExerciseEditCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-edit-checkout-directories/programming-exercise-edit-checkout-directories.component'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; +import { TranslateService } from '@ngx-translate/core'; +import { HelpIconComponent } from 'app/shared/components/help-icon.component'; +import { MockComponent } from 'ng-mocks'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action'; +import { WindFile } from 'app/entities/programming/wind.file'; +import { WindMetadata } from 'app/entities/programming/wind.metadata'; +import { DockerConfiguration } from 'app/entities/programming/docker.configuration'; +import { Course } from 'app/entities/course.model'; +import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/programming/build-plan-checkout-directories-dto'; + +describe('ProgrammingExerciseEditCheckoutDirectoriesComponent', () => { + let component: ProgrammingExerciseEditCheckoutDirectoriesComponent; + let fixture: ComponentFixture; + const course = { id: 123 } as Course; + + let programmingExercise = new ProgrammingExercise(course, undefined); + let windFile: WindFile = new WindFile(); + let actions: BuildAction[] = []; + let gradleBuildAction: ScriptAction = new ScriptAction(); + let cleanBuildAction: ScriptAction = new ScriptAction(); + let platformAction: PlatformAction = new PlatformAction(); + + const submissionBuildPlanCheckoutRepositories: BuildPlanCheckoutDirectoriesDTO = { + exerciseCheckoutDirectory: '/assignment', + solutionCheckoutDirectory: '/solution', + testCheckoutDirectory: '/tests', + }; + + beforeEach(async () => { + programmingExercise = new ProgrammingExercise(course, undefined); + programmingExercise.customizeBuildPlanWithAeolus = true; + windFile = new WindFile(); + const metadata = new WindMetadata(); + metadata.docker = new DockerConfiguration(); + metadata.docker.image = 'testImage'; + windFile.metadata = metadata; + actions = []; + gradleBuildAction = new ScriptAction(); + gradleBuildAction.name = 'gradle'; + gradleBuildAction.script = './gradlew clean test'; + platformAction = new PlatformAction(); + platformAction.name = 'platform'; + platformAction.kind = 'junit'; + cleanBuildAction = new ScriptAction(); + cleanBuildAction.name = 'clean'; + cleanBuildAction.script = `chmod -R 777 .`; + actions.push(gradleBuildAction); + actions.push(cleanBuildAction); + actions.push(platformAction); + windFile.actions = actions; + programmingExercise.buildConfig!.windfile = windFile; + + await TestBed.configureTestingModule({ + imports: [ArtemisSharedComponentModule, ArtemisSharedCommonModule], + declarations: [ProgrammingExerciseEditCheckoutDirectoriesComponent, MockComponent(HelpIconComponent)], + providers: [{ provide: TranslateService, useClass: MockTranslateService }], + }).compileComponents(); + + fixture = TestBed.createComponent(ProgrammingExerciseEditCheckoutDirectoriesComponent); + component = fixture.componentInstance; + + fixture.componentRef.setInput('programmingExercise', programmingExercise); + fixture.componentRef.setInput('submissionBuildPlanCheckoutRepositories', { + testCheckoutDirectory: '/', + }); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('reset should set editable and input fields correctly', () => { + fixture.componentRef.setInput('submissionBuildPlanCheckoutRepositories', submissionBuildPlanCheckoutRepositories); + component.reset(); + expect(component.isAssigmentRepositoryEditable).toBeTrue(); + expect(component.assignmentCheckoutPath).toBe('assignment'); + expect(component.isTestRepositoryEditable).toBeTrue(); + expect(component.testCheckoutPath).toBe('tests'); + expect(component.isSolutionRepositoryEditable).toBeTrue(); + expect(component.solutionCheckoutPath).toBe('solution'); + + fixture.componentRef.setInput('submissionBuildPlanCheckoutRepositories', { + testCheckoutDirectory: '/', + }); + component.reset(); + expect(component.isAssigmentRepositoryEditable).toBeFalse(); + expect(component.assignmentCheckoutPath).toBe(''); + expect(component.isTestRepositoryEditable).toBeFalse(); + expect(component.testCheckoutPath).toBe('/'); + expect(component.isSolutionRepositoryEditable).toBeFalse(); + expect(component.solutionCheckoutPath).toBe(''); + }); + + it('should update fields correctly', () => { + component.onAssigmentRepositoryCheckoutPathChange('assignment'); + expect(component.assignmentCheckoutPath).toBe('assignment'); + expect(component.formValid).toBeTrue(); + component.onTestRepositoryCheckoutPathChange('tests'); + expect(component.formValid).toBeTrue(); + expect(component.testCheckoutPath).toBe('tests'); + component.onSolutionRepositoryCheckoutPathChange('solution'); + expect(component.formValid).toBeTrue(); + expect(component.solutionCheckoutPath).toBe('solution'); + + component.onAssigmentRepositoryCheckoutPathChange('solution'); + expect(component.formValid).toBeFalse(); + + component.calculateFormValid(); + }); + + it('should correctly check if values are unique', () => { + let stringArray: (string | undefined)[] = ['a', 'b', 'c']; + expect(component.areValuesUnique(stringArray)).toBeTrue(); + + stringArray = ['a', 'b', 'a']; + expect(component.areValuesUnique(stringArray)).toBeFalse(); + + stringArray = ['a', 'b', undefined]; + expect(component.areValuesUnique(stringArray)).toBeTrue(); + }); + + it('should should reset values correctly when buildconfig is null', () => { + fixture.componentRef.setInput('programmingExercise', new ProgrammingExercise(course, undefined)); + fixture.componentRef.setInput('submissionBuildPlanCheckoutRepositories', submissionBuildPlanCheckoutRepositories); + component.reset(); + + expect(component.assignmentCheckoutPath).toBe('assignment'); + expect(component.testCheckoutPath).toBe('tests'); + expect(component.solutionCheckoutPath).toBe('solution'); + }); + + it('should set values to their defaults if no buildConfig of submissionBuildPlan available', () => { + fixture.componentRef.setInput('programmingExercise', new ProgrammingExercise(course, undefined)); + fixture.componentRef.setInput('submissionBuildPlanCheckoutRepositories', undefined); + component.reset(); + + expect(component.assignmentCheckoutPath).toBe(''); + expect(component.testCheckoutPath).toBe('/'); + expect(component.solutionCheckoutPath).toBe(''); + }); +}); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts index aa7f5e3e80bb..582b93b71df9 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { CheckoutDirectoriesDto } from 'app/entities/programming/checkout-directories-dto'; import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { MockComponent } from 'ng-mocks'; import { Subscription, of } from 'rxjs'; @@ -73,7 +74,7 @@ describe('ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent', () => { programmingExerciseService = TestBed.inject(ProgrammingExerciseService); component.programmingLanguage = ProgrammingLanguage.C; - component.programmingExercise = { id: 1, shortName: 'shortName' } as ProgrammingExercise; + component.programmingExercise = { id: 1, shortName: 'shortName', buildConfig: new ProgrammingExerciseBuildConfig() } as ProgrammingExercise; component.isLocal = true; jest.spyOn(programmingExerciseService, 'getCheckoutDirectoriesForProgrammingLanguage').mockImplementation( @@ -177,6 +178,11 @@ describe('ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent', () => { // assertion to check if ngOnChanges was executed properly and updated the checkout directories expect(programmingExerciseService.getCheckoutDirectoriesForProgrammingLanguage).toHaveBeenCalledWith(ProgrammingLanguage.OCAML, true); expect(component.checkoutDirectories?.submissionBuildPlanCheckoutDirectories?.solutionCheckoutDirectory).toBe('/solution'); // was null before with JAVA as programming language + + // should also reset build config + expect(component.programmingExercise?.buildConfig?.solutionCheckoutPath).toBeUndefined(); + expect(component.programmingExercise?.buildConfig?.testCheckoutPath).toBeUndefined(); + expect(component.programmingExercise?.buildConfig?.assignmentCheckoutPath).toBeUndefined(); }); it('should update checkout directories when checkoutSolution flag changes', () => { @@ -195,6 +201,58 @@ describe('ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent', () => { expect(programmingExerciseService.getCheckoutDirectoriesForProgrammingLanguage).toHaveBeenCalledWith(ProgrammingLanguage.OCAML, false); // solution checkout directory was /solution before with OCaml as programming language and solution checkout allowed expect(component.checkoutDirectories?.submissionBuildPlanCheckoutDirectories?.solutionCheckoutDirectory).toBeUndefined(); + + // should also reset build config + expect(component.programmingExercise?.buildConfig?.solutionCheckoutPath).toBeUndefined(); + expect(component.programmingExercise?.buildConfig?.testCheckoutPath).toBeUndefined(); + expect(component.programmingExercise?.buildConfig?.assignmentCheckoutPath).toBeUndefined(); + }); + + it('should not call service without language', () => { + jest.spyOn(programmingExerciseService, 'getCheckoutDirectoriesForProgrammingLanguage'); + + component.programmingLanguage = undefined; + component.checkoutSolutionRepository = false; + component.ngOnChanges({ + checkoutSolutionRepository: { + previousValue: true, + currentValue: false, + }, + } as unknown as SimpleChanges); + + // assertion to check if ngOnChanges was executed properly and updated the checkout directories + expect(programmingExerciseService.getCheckoutDirectoriesForProgrammingLanguage).not.toHaveBeenCalledWith(ProgrammingLanguage.OCAML, false); + }); + + it('should not call service when inEdit and build config is available', () => { + jest.spyOn(programmingExerciseService, 'getCheckoutDirectoriesForProgrammingLanguage'); + + component.isCreateOrEdit = true; + component.programmingExercise!.buildConfig = new ProgrammingExerciseBuildConfig(); + component.programmingExercise!.buildConfig.solutionCheckoutPath = 'solution'; + component.programmingExercise!.buildConfig.testCheckoutPath = 'tests'; + component.programmingExercise!.buildConfig.assignmentCheckoutPath = 'assignment'; + + component.ngOnChanges({ + checkoutSolutionRepository: { + previousValue: true, + currentValue: true, + }, + } as unknown as SimpleChanges); + + // assertion to check if ngOnChanges was executed properly and updated the checkout directories + expect(programmingExerciseService.getCheckoutDirectoriesForProgrammingLanguage).not.toHaveBeenCalledWith(ProgrammingLanguage.OCAML, false); + expect(component.checkoutDirectories).toEqual({ + submissionBuildPlanCheckoutDirectories: { + exerciseCheckoutDirectory: '/assignment', + testCheckoutDirectory: '/tests', + solutionCheckoutDirectory: '/solution', + }, + solutionBuildPlanCheckoutDirectories: { + solutionCheckoutDirectory: '/assignment', + testCheckoutDirectory: '/tests', + }, + }); }); it('should update auxiliary repository directories on changes', () => { @@ -214,4 +272,27 @@ describe('ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent', () => { expect(submissionPreviewElement).toBeTruthy(); expect(submissionPreviewElement.textContent).toContain('/assignment/src'); }); + + it('should update component when buildconfig was changed', () => { + component.isCreateOrEdit = true; + component.programmingExercise!.buildConfig = new ProgrammingExerciseBuildConfig(); + component.programmingExercise!.buildConfig.solutionCheckoutPath = 'solution'; + + component.ngOnChanges({ + programmingExercise: { + previousValue: { buildConfig: new ProgrammingExerciseBuildConfig() }, + currentValue: { buildConfig: component.programmingExercise!.buildConfig }, + }, + } as unknown as SimpleChanges); + + expect(component.checkoutDirectories).toEqual({ + solutionBuildPlanCheckoutDirectories: { + testCheckoutDirectory: '/', + }, + submissionBuildPlanCheckoutDirectories: { + solutionCheckoutDirectory: '/solution', + testCheckoutDirectory: '/', + }, + }); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts index adc5d04cd682..561469eb9381 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts @@ -940,6 +940,49 @@ describe('ProgrammingExerciseUpdateComponent', () => { }); } }); + + it('should find invalid timeout', () => { + comp.programmingExercise.buildConfig!.timeoutSeconds = -1; + expect(comp.getInvalidReasons()).toContainEqual({ + translateKey: 'artemisApp.programmingExercise.timeout.alert', + translateValues: {}, + }); + + comp.programmingExercise.buildConfig!.timeoutSeconds = 100; + expect(comp.getInvalidReasons()).not.toContainEqual({ + translateKey: 'artemisApp.programmingExercise.timeout.alert', + translateValues: {}, + }); + }); + + it('should find invalid checkoutpaths', () => { + comp.programmingExercise.buildConfig!.assignmentCheckoutPath = 'assignment'; + comp.programmingExercise.buildConfig!.testCheckoutPath = 'assignment'; + comp.programmingExercise.buildConfig!.solutionCheckoutPath = 'solution'; + + expect(comp.getInvalidReasons()).toContainEqual({ + translateKey: 'artemisApp.programmingExercise.checkoutPath.invalid', + translateValues: {}, + }); + + comp.programmingExercise.buildConfig!.testCheckoutPath = 'test'; + expect(comp.getInvalidReasons()).not.toContainEqual({ + translateKey: 'artemisApp.programmingExercise.checkoutPath.invalid', + translateValues: {}, + }); + + comp.programmingExercise.buildConfig!.assignmentCheckoutPath = 'assignment/'; + expect(comp.getInvalidReasons()).toContainEqual({ + translateKey: 'artemisApp.programmingExercise.checkoutPath.invalid', + translateValues: {}, + }); + + comp.programmingExercise.buildConfig!.assignmentCheckoutPath = 'assignment'; + expect(comp.getInvalidReasons()).not.toContainEqual({ + translateKey: 'artemisApp.programmingExercise.checkoutPath.invalid', + translateValues: {}, + }); + }); }); describe('disable features based on selected language and project type', () => { diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts index 963ef4c6ff37..5079df73e575 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts @@ -7,6 +7,7 @@ import { ProgrammingExerciseInformationComponent } from 'app/exercises/programmi import { DefaultValueAccessor, NgModel } from '@angular/forms'; import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { CategorySelectorComponent } from 'app/shared/category-selector/category-selector.component'; import { AddAuxiliaryRepositoryButtonComponent } from 'app/exercises/programming/manage/update/add-auxiliary-repository-button.component'; @@ -15,6 +16,7 @@ import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise import { TableEditableFieldComponent } from 'app/shared/table/table-editable-field.component'; import { QueryList } from '@angular/core'; import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component'; +import { ProgrammingExerciseEditCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-edit-checkout-directories/programming-exercise-edit-checkout-directories.component'; describe('ProgrammingExerciseInformationComponent', () => { let fixture: ComponentFixture; @@ -30,6 +32,7 @@ describe('ProgrammingExerciseInformationComponent', () => { MockComponent(HelpIconComponent), MockComponent(ExerciseTitleChannelNameComponent), MockComponent(ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent), + MockComponent(ProgrammingExerciseEditCheckoutDirectoriesComponent), MockComponent(CategorySelectorComponent), MockComponent(AddAuxiliaryRepositoryButtonComponent), MockPipe(ArtemisTranslatePipe), @@ -51,6 +54,7 @@ describe('ProgrammingExerciseInformationComponent', () => { comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock; comp.programmingExercise = new ProgrammingExercise(undefined, undefined); + comp.programmingExercise.buildConfig = new ProgrammingExerciseBuildConfig(); }); }); @@ -72,6 +76,7 @@ describe('ProgrammingExerciseInformationComponent', () => { comp.recreateBuildPlansField = { valueChanges: new Subject(), valid: true } as any as NgModel; comp.updateTemplateFilesField = { valueChanges: new Subject(), valid: true } as any as NgModel; comp.tableEditableFields = { changes: new Subject() } as any as QueryList; + comp.programmingExerciseEditCheckoutDirectories = { formValidChanges: new Subject() } as ProgrammingExerciseEditCheckoutDirectoriesComponent; comp.ngAfterViewInit(); (comp.tableEditableFields.changes as Subject).next({ toArray: () => [editableField] } as any as QueryList); comp.exerciseTitleChannelComponent.titleChannelNameComponent.formValidChanges.next(false); @@ -80,6 +85,16 @@ describe('ProgrammingExerciseInformationComponent', () => { (comp.recreateBuildPlansField.valueChanges as Subject).next(false); (comp.updateTemplateFilesField.valueChanges as Subject).next(false); (editableField.editingInput.valueChanges as Subject).next(false); - expect(calculateFormValidSpy).toHaveBeenCalledTimes(6); + comp.programmingExerciseEditCheckoutDirectories.formValidChanges.next(false); + expect(calculateFormValidSpy).toHaveBeenCalledTimes(7); + }); + + it('should update checkout directories', () => { + comp.onTestRepositoryCheckoutPathChange('test'); + expect(comp.programmingExercise.buildConfig?.testCheckoutPath).toBe('test'); + comp.onSolutionRepositoryCheckoutPathChange('solution'); + expect(comp.programmingExercise.buildConfig?.solutionCheckoutPath).toBe('solution'); + comp.onAssigmentRepositoryCheckoutPathChange('assignment'); + expect(comp.programmingExercise.buildConfig?.assignmentCheckoutPath).toBe('assignment'); }); }); diff --git a/src/test/javascript/spec/component/settings/ide/ide-settings.component.spec.ts b/src/test/javascript/spec/component/settings/ide/ide-settings.component.spec.ts index 6d739c583751..87b1a505980e 100644 --- a/src/test/javascript/spec/component/settings/ide/ide-settings.component.spec.ts +++ b/src/test/javascript/spec/component/settings/ide/ide-settings.component.spec.ts @@ -4,7 +4,8 @@ import { of } from 'rxjs'; import { IdeSettingsComponent } from 'app/shared/user-settings/ide-preferences/ide-settings.component'; import { IdeSettingsService } from 'app/shared/user-settings/ide-preferences/ide-settings.service'; import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; describe('IdeSettingsComponent', () => { let component: IdeSettingsComponent; @@ -19,9 +20,9 @@ describe('IdeSettingsComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], declarations: [IdeSettingsComponent], - providers: [{ provide: IdeSettingsService, useValue: mockIdeSettingsService }], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: IdeSettingsService, useValue: mockIdeSettingsService }], schemas: [CUSTOM_ELEMENTS_SCHEMA], }).compileComponents(); diff --git a/src/test/javascript/spec/component/shared/code-button.component.spec.ts b/src/test/javascript/spec/component/shared/code-button.component.spec.ts index 72d26a2d07b6..5665d6d4a1ef 100644 --- a/src/test/javascript/spec/component/shared/code-button.component.spec.ts +++ b/src/test/javascript/spec/component/shared/code-button.component.spec.ts @@ -26,9 +26,9 @@ import { MockProfileService } from '../../helpers/mocks/service/mock-profile.ser import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { ArtemisTestModule } from '../../test.module'; -import { RouterTestingModule } from '@angular/router/testing'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { provideRouter } from '@angular/router'; describe('CodeButtonComponent', () => { let component: CodeButtonComponent; @@ -91,7 +91,7 @@ describe('CodeButtonComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, ClipboardModule, NgbPopoverModule, RouterTestingModule.withRoutes([])], + imports: [ArtemisTestModule, ClipboardModule, NgbPopoverModule], declarations: [ CodeButtonComponent, MockComponent(ExerciseActionButtonComponent), @@ -102,6 +102,7 @@ describe('CodeButtonComponent', () => { MockDirective(TranslateDirective), ], providers: [ + provideRouter([]), MockProvider(AlertService), { provide: FeatureToggleService, useClass: MockFeatureToggleService }, { provide: AccountService, useClass: MockAccountService }, diff --git a/src/test/javascript/spec/component/shared/http/file.service.spec.ts b/src/test/javascript/spec/component/shared/http/file.service.spec.ts index c504ac111084..68a2b56a7faf 100644 --- a/src/test/javascript/spec/component/shared/http/file.service.spec.ts +++ b/src/test/javascript/spec/component/shared/http/file.service.spec.ts @@ -1,7 +1,8 @@ import { FileService } from 'app/shared/http/file.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { v4 as uuid } from 'uuid'; +import { provideHttpClient } from '@angular/common/http'; jest.mock('uuid', () => ({ v4: jest.fn(), @@ -18,8 +19,8 @@ describe('FileService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [FileService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), FileService], }); fileService = TestBed.inject(FileService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/shared/icon-card/icon-card.component.spec.ts b/src/test/javascript/spec/component/shared/icon-card/icon-card.component.spec.ts new file mode 100644 index 000000000000..d96d5417b943 --- /dev/null +++ b/src/test/javascript/spec/component/shared/icon-card/icon-card.component.spec.ts @@ -0,0 +1,40 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MockDirective } from 'ng-mocks'; +import { IconCardComponent } from 'app/shared/icon-card/icon-card.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { faCircleInfo, faCoffee } from '@fortawesome/free-solid-svg-icons'; + +describe('IconCardComponent', () => { + let component: IconCardComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [], + declarations: [IconCardComponent, MockDirective(TranslateDirective)], + }).compileComponents(); + + fixture = TestBed.createComponent(IconCardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).not.toBeNull(); + }); + + it('should display the default headerIcon and headline', () => { + expect(component.headerIcon()).toBe(faCircleInfo); + expect(component.headline()).toBe('Title'); + }); + + it('should display custom headerIcon and headline when inputs are set', () => { + fixture.componentRef.setInput('headerIcon', faCoffee); + fixture.componentRef.setInput('headline', 'Test'); + + fixture.detectChanges(); + + expect(component.headerIcon()).toBe(faCoffee); + expect(component.headline()).toBe('Test'); + }); +}); diff --git a/src/test/javascript/spec/component/shared/import-list/import-table.component.spec.ts b/src/test/javascript/spec/component/shared/import-list/import-table.component.spec.ts new file mode 100644 index 000000000000..697c0322181b --- /dev/null +++ b/src/test/javascript/spec/component/shared/import-list/import-table.component.spec.ts @@ -0,0 +1,240 @@ +import '@angular/localize/init'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Column, ImportTableComponent } from 'app/shared/import-list/import-table.component'; +import { PagingService } from 'app/exercises/shared/manage/paging.service'; +import { Course } from 'app/entities/course.model'; +import { Observable, of } from 'rxjs'; +import { SearchResult, SortingOrder } from 'app/shared/table/pageable-table'; +import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; +import { TranslateService } from '@ngx-translate/core'; +import { AlertService } from 'app/core/util/alert.service'; +import { MockAlertService } from '../../../helpers/mocks/service/mock-alert.service'; + +describe('ImportTableComponent', () => { + let component: ImportTableComponent; + let fixture: ComponentFixture>; + + let pagingService: PagingService; + let alertService: AlertService; + let searchSpy: jest.SpyInstance; + + const columns: Column[] = [ + { + name: 'TITLE', + getProperty: (entity: Course) => entity.title, + }, + { + name: 'SHORT_NAME', + getProperty: (entity: Course) => entity.shortName, + }, + ]; + + let objectList: Course[] = []; + + let searchResult: SearchResult; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ImportTableComponent], + providers: [ + { + provide: TranslateService, + useClass: MockTranslateService, + }, + { + provide: AlertService, + useClass: MockAlertService, + }, + { + provide: PagingService, + useClass: class MockPagingService extends PagingService { + search = jest.fn(); + }, + }, + { + provide: AlertService, + useClass: MockAlertService, + }, + ], + }).compileComponents(); + + objectList = [ + { id: 1, title: 'Object 01', shortName: 'O1' }, + { id: 2, title: 'Object 02', shortName: 'O2' }, + { id: 3, title: 'Object 03', shortName: 'O3' }, + { id: 4, title: 'Object 04', shortName: 'O4' }, + { id: 5, title: 'Object 05', shortName: 'O5' }, + { id: 6, title: 'Object 06', shortName: 'O6' }, + { id: 7, title: 'Object 07', shortName: 'O7' }, + { id: 8, title: 'Object 08', shortName: 'O8' }, + { id: 9, title: 'Object 09', shortName: 'O9' }, + { id: 10, title: 'Object 10', shortName: '10' }, + ]; + + searchResult = >{ + resultsOnPage: objectList, + numberOfPages: 2, + }; + + pagingService = TestBed.inject(PagingService); + alertService = TestBed.inject(AlertService); + searchSpy = jest.spyOn(pagingService, 'search').mockReturnValue(of(searchResult)); + + fixture = TestBed.createComponent(ImportTableComponent); + component = fixture.componentInstance; + fixture.componentRef.setInput('columns', columns); + fixture.componentRef.setInput('columnBaseTranslationKey', 'translationKey'); + }); + + it('should initialize', () => { + expect(component).toBeTruthy(); + expect(component.columns()).toEqual(columns); + }); + + it('should load and display data correctly in table', async () => { + fixture.detectChanges(); + await fixture.whenStable(); + fixture.detectChanges(); + + const tableRows = fixture.debugElement.nativeElement.querySelectorAll('tbody tr'); + const tableColumns = tableRows[0].querySelectorAll('td'); + + expect(component.resultsOnPage()).toEqual(objectList); + expect(tableRows).toHaveLength(objectList.length); + expect(tableColumns).toHaveLength(columns.length + 2); + expect(searchSpy).toHaveBeenCalledExactlyOnceWith({ + page: 1, + pageSize: 10, + sortingOrder: SortingOrder.ASCENDING, + sortedColumn: 'ID', + searchTerm: '', + }); + }); + + it('should set isLoading correctly on data load', async () => { + const isLoadingSpy = jest.spyOn(component.isLoading, 'set'); + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(isLoadingSpy).toHaveBeenNthCalledWith(1, true); + expect(isLoadingSpy).toHaveBeenNthCalledWith(2, false); + }); + + it('should search data', async () => { + fixture.detectChanges(); + await fixture.whenStable(); + + const searchField = fixture.debugElement.nativeElement.querySelector('#import-objects-search'); + searchField.value = 'Object 01'; + searchField.dispatchEvent(new Event('input')); + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(component.searchTerm()).toBe('Object 01'); + expect(searchSpy).toHaveBeenLastCalledWith({ + page: 1, + pageSize: 10, + sortingOrder: SortingOrder.ASCENDING, + sortedColumn: 'ID', + searchTerm: 'Object 01', + }); + }); + + it('should select row', async () => { + const onRowSelectionSpy = jest.spyOn(component.onRowSelection, 'emit'); + + fixture.detectChanges(); + await fixture.whenStable(); + fixture.detectChanges(); + + const selectButton = fixture.debugElement.nativeElement.querySelectorAll('tbody tr:nth-child(1) button')[0]; + + selectButton.click(); + + expect(onRowSelectionSpy).toHaveBeenCalledExactlyOnceWith(objectList[0]); + }); + + it('should set page size', async () => { + fixture.detectChanges(); + await fixture.whenStable(); + fixture.detectChanges(); + + expect(component.page()).toBe(1); + + const pageSizeSelect = fixture.debugElement.nativeElement.querySelectorAll('.page-link')[3]; + + pageSizeSelect.click(); + + fixture.detectChanges(); + await fixture.whenStable(); + fixture.detectChanges(); + + expect(component.page()).toBe(2); + expect(searchSpy).toHaveBeenLastCalledWith({ + page: 2, + pageSize: 10, + sortingOrder: SortingOrder.ASCENDING, + sortedColumn: 'ID', + searchTerm: '', + }); + }); + + it('should sort TITLE column ASCENDING', async () => { + await loadDataAndClickColumn(2, 1, 'TITLE', SortingOrder.ASCENDING, 'Object 01'); + }); + + it('should sort TITLE column DESCENDING', async () => { + const invertedObjectList = objectList.reverse(); + searchSpy.mockReturnValueOnce(of({ ...searchResult, resultsOnPage: invertedObjectList })); + + await loadDataAndClickColumn(2, 2, 'TITLE', SortingOrder.DESCENDING, 'Object 10'); + }); + + it('should sort ID column DESCENDING', async () => { + const invertedObjectList = objectList.reverse(); + searchSpy.mockReturnValue(of({ ...searchResult, resultsOnPage: invertedObjectList })); + + await loadDataAndClickColumn(1, 1, 'ID', SortingOrder.DESCENDING, 'Object 10'); + }); + + it('should show alert on data load error', async () => { + searchSpy.mockReturnValue(new Observable((observer) => observer.error('Error message'))); + const errorSpy = jest.spyOn(alertService, 'addAlert'); + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(errorSpy).toHaveBeenCalledOnce(); + }); + + async function loadDataAndClickColumn(columnIndex: number, timesClicking: number, compareSortedColumn: string, compareSortingOrder: SortingOrder, compareCellContent: string) { + fixture.detectChanges(); + await fixture.whenStable(); + fixture.detectChanges(); + + const titleColumnHeader = fixture.debugElement.nativeElement.querySelector('thead th:nth-child(' + columnIndex + ') div'); + + expect(component.sortedColumn()).toBe('ID'); + expect(component.sortingOrder()).toBe(SortingOrder.ASCENDING); + + for (let i = 0; i < timesClicking; i++) { + titleColumnHeader.click(); + } + + expect(component.sortedColumn()).toBe(compareSortedColumn); + expect(component.sortingOrder()).toBe(compareSortingOrder); + expect(searchSpy).toHaveBeenLastCalledWith({ + page: 1, + pageSize: 10, + sortingOrder: compareSortingOrder, + sortedColumn: compareSortedColumn, + searchTerm: '', + }); + + const tableRows = fixture.debugElement.nativeElement.querySelectorAll('tbody tr'); + const tableColumns = tableRows[0].querySelectorAll('td'); + expect(tableColumns[1].textContent).toBe(compareCellContent); + } +}); diff --git a/src/test/javascript/spec/component/shared/main.component.spec.ts b/src/test/javascript/spec/component/shared/main.component.spec.ts index 9fa80d3863d1..2f639ad2429f 100644 --- a/src/test/javascript/spec/component/shared/main.component.spec.ts +++ b/src/test/javascript/spec/component/shared/main.component.spec.ts @@ -1,10 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateTestingModule } from '../../helpers/mocks/service/mock-translate.service'; +import { MockTranslateService, TranslateTestingModule } from '../../helpers/mocks/service/mock-translate.service'; import { ArtemisTestModule } from '../../test.module'; import { By } from '@angular/platform-browser'; import { JhiMainComponent } from 'app/shared/layouts/main/main.component'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; -import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; import { ThemeService } from 'app/core/theme/theme.service'; @@ -13,7 +12,7 @@ import { MockComponent } from 'ng-mocks'; import { AlertOverlayComponent } from 'app/shared/alert/alert-overlay.component'; import { PageRibbonComponent } from 'app/shared/layouts/profiles/page-ribbon.component'; import { NotificationPopupComponent } from 'app/shared/notification/notification-popup/notification-popup.component'; -import { RouterTestingModule } from '@angular/router/testing'; +import { RouterModule } from '@angular/router'; // Mock the initialize method class MockThemeService { @@ -28,7 +27,7 @@ describe('JhiMainComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, TranslateTestingModule, RouterTestingModule], + imports: [ArtemisTestModule, TranslateTestingModule, RouterModule.forRoot([])], declarations: [JhiMainComponent, MockComponent(AlertOverlayComponent), MockComponent(PageRibbonComponent), MockComponent(NotificationPopupComponent)], providers: [ { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/shared/metis/message-inline-input-component/message-inline-input.component.spec.ts b/src/test/javascript/spec/component/shared/metis/message-inline-input-component/message-inline-input.component.spec.ts index ce4c15b9f1da..2a0b89b17f77 100644 --- a/src/test/javascript/spec/component/shared/metis/message-inline-input-component/message-inline-input.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/message-inline-input-component/message-inline-input.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { MetisService } from 'app/shared/metis/metis.service'; import { MockModule, MockPipe } from 'ng-mocks'; import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { MessageInlineInputComponent } from 'app/shared/metis/message/message-inline-input/message-inline-input.component'; import { MockMetisService } from '../../../../helpers/mocks/service/mock-metis-service.service'; import { directMessageUser1, metisPostToCreateUser1 } from '../../../../helpers/sample/metis-sample-data'; @@ -10,6 +10,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { throwError } from 'rxjs'; import { MockSyncStorage } from '../../../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService } from 'ngx-webstorage'; +import { provideHttpClient } from '@angular/common/http'; describe('MessageInlineInputComponent', () => { let component: MessageInlineInputComponent; @@ -20,9 +21,15 @@ describe('MessageInlineInputComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)], + imports: [MockModule(FormsModule), MockModule(ReactiveFormsModule)], declarations: [MessageInlineInputComponent, MockPipe(ArtemisTranslatePipe)], - providers: [FormBuilder, { provide: MetisService, useClass: MockMetisService }, { provide: LocalStorageService, useClass: MockSyncStorage }], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + FormBuilder, + { provide: MetisService, useClass: MockMetisService }, + { provide: LocalStorageService, useClass: MockSyncStorage }, + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/shared/metis/message-reply-inline-input/message-reply-inline-input.component.spec.ts b/src/test/javascript/spec/component/shared/metis/message-reply-inline-input/message-reply-inline-input.component.spec.ts index 9870eab289c9..ab90976788fc 100644 --- a/src/test/javascript/spec/component/shared/metis/message-reply-inline-input/message-reply-inline-input.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/message-reply-inline-input/message-reply-inline-input.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { MetisService } from 'app/shared/metis/metis.service'; import { MockModule, MockPipe } from 'ng-mocks'; import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { MockMetisService } from '../../../../helpers/mocks/service/mock-metis-service.service'; import { directMessageUser1, metisPostToCreateUser1 } from '../../../../helpers/sample/metis-sample-data'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -10,6 +10,7 @@ import { MessageReplyInlineInputComponent } from 'app/shared/metis/message/messa import { throwError } from 'rxjs'; import { MockSyncStorage } from '../../../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService } from 'ngx-webstorage'; +import { provideHttpClient } from '@angular/common/http'; describe('MessageReplyInlineInputComponent', () => { let component: MessageReplyInlineInputComponent; @@ -20,9 +21,15 @@ describe('MessageReplyInlineInputComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)], + imports: [MockModule(FormsModule), MockModule(ReactiveFormsModule)], declarations: [MessageReplyInlineInputComponent, MockPipe(ArtemisTranslatePipe)], - providers: [FormBuilder, { provide: MetisService, useClass: MockMetisService }, { provide: LocalStorageService, useClass: MockSyncStorage }], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + FormBuilder, + { provide: MetisService, useClass: MockMetisService }, + { provide: LocalStorageService, useClass: MockSyncStorage }, + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts b/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts index a5618407cc41..dac357f94bec 100644 --- a/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts @@ -23,11 +23,10 @@ import { unsortedAnswerArray, } from '../../../../helpers/sample/metis-sample-data'; import { MockQueryParamsDirective, MockRouterLinkDirective } from '../../../../helpers/mocks/directive/mock-router-link.directive'; -import { RouterTestingModule } from '@angular/router/testing'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { MetisConversationService } from 'app/shared/metis/metis-conversation.service'; import { OneToOneChatService } from 'app/shared/metis/conversations/one-to-one-chat.service'; -import { Router, RouterState } from '@angular/router'; +import { Router, RouterState, provideRouter } from '@angular/router'; import { of } from 'rxjs'; import { OneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; import { HttpResponse } from '@angular/common/http'; @@ -47,8 +46,9 @@ describe('PostComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [RouterTestingModule, MockDirective(NgbTooltip)], + imports: [MockDirective(NgbTooltip)], providers: [ + provideRouter([]), { provide: MetisService, useClass: MockMetisService }, { provide: Router, useClass: MockRouter }, MockProvider(MetisConversationService), diff --git a/src/test/javascript/spec/component/shared/metis/posting-content/posting-content.component.spec.ts b/src/test/javascript/spec/component/shared/metis/posting-content/posting-content.component.spec.ts index 503ed6f20634..d3b874b1c8d4 100644 --- a/src/test/javascript/spec/component/shared/metis/posting-content/posting-content.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/posting-content/posting-content.component.spec.ts @@ -3,7 +3,7 @@ import { PostingContentPartComponent } from 'app/shared/metis/posting-content/po import { MockComponent, MockPipe } from 'ng-mocks'; import { PostingContentComponent } from 'app/shared/metis/posting-content/posting-content.components'; import { MetisService } from 'app/shared/metis/metis.service'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { MockMetisService } from '../../../../helpers/mocks/service/mock-metis-service.service'; import { PatternMatch, PostingContentPart, ReferenceType } from 'app/shared/metis/metis.util'; import { Observable, of } from 'rxjs'; @@ -12,6 +12,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { metisCourse, metisCoursePosts, metisExercisePosts, metisGeneralCourseWidePosts, metisLecturePosts } from '../../../../helpers/sample/metis-sample-data'; import { Params } from '@angular/router'; +import { provideHttpClient } from '@angular/common/http'; describe('PostingContentComponent', () => { let component: PostingContentComponent; @@ -20,8 +21,8 @@ describe('PostingContentComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: MetisService, useClass: MockMetisService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: MetisService, useClass: MockMetisService }], declarations: [PostingContentComponent, MockComponent(PostingContentPartComponent), MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe)], }) .compileComponents() diff --git a/src/test/javascript/spec/component/shared/metis/postings-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.spec.ts index 692f9af19423..4c75746e2bbe 100644 --- a/src/test/javascript/spec/component/shared/metis/postings-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/postings-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.spec.ts @@ -11,12 +11,13 @@ import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { PostTagSelectorComponent } from 'app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-tag-selector/post-tag-selector.component'; import { PageType } from 'app/shared/metis/metis.util'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ArtemisTestModule } from '../../../../../test.module'; import { PostComponent } from 'app/shared/metis/post/post.component'; import { metisCourse, metisExercise, metisPostLectureUser1, metisPostTechSupport, metisPostToCreateUser1 } from '../../../../../helpers/sample/metis-sample-data'; import { MockNgbModalService } from '../../../../../helpers/mocks/service/mock-ngb-modal.service'; import { Channel } from 'app/entities/metis/conversation/channel.model'; +import { provideHttpClient } from '@angular/common/http'; describe('PostCreateEditModalComponent', () => { let component: PostCreateEditModalComponent; @@ -30,7 +31,7 @@ describe('PostCreateEditModalComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)], + imports: [ArtemisTestModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)], declarations: [ PostCreateEditModalComponent, MockPipe(ArtemisTranslatePipe), @@ -40,7 +41,13 @@ describe('PostCreateEditModalComponent', () => { MockComponent(HelpIconComponent), MockComponent(PostTagSelectorComponent), ], - providers: [FormBuilder, { provide: MetisService, useClass: MockMetisService }, { provide: NgbModal, useClass: MockNgbModalService }], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + FormBuilder, + { provide: MetisService, useClass: MockMetisService }, + { provide: NgbModal, useClass: MockNgbModalService }, + ], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts index 3b42c92afbdd..0557ae671297 100644 --- a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts @@ -4,7 +4,7 @@ import { MetisService } from 'app/shared/metis/metis.service'; import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { OverlayModule } from '@angular/cdk/overlay'; import { Reaction } from 'app/entities/metis/reaction.model'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ReactionService } from 'app/shared/metis/reaction.service'; import { MockReactionService } from '../../../../../helpers/mocks/service/mock-reaction.service'; import { AccountService } from 'app/core/auth/account.service'; @@ -26,6 +26,7 @@ import { metisCourse, metisUser1, post } from '../../../../../helpers/sample/met import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { NotificationService } from 'app/shared/notification/notification.service'; import { MockNotificationService } from '../../../../../helpers/mocks/service/mock-notification.service'; +import { provideHttpClient } from '@angular/common/http'; describe('AnswerPostReactionsBarComponent', () => { let component: AnswerPostReactionsBarComponent; @@ -37,9 +38,11 @@ describe('AnswerPostReactionsBarComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, MockModule(OverlayModule), MockModule(EmojiModule), MockModule(PickerModule), MockModule(NgbTooltipModule)], + imports: [MockModule(OverlayModule), MockModule(EmojiModule), MockModule(PickerModule), MockModule(NgbTooltipModule)], declarations: [AnswerPostReactionsBarComponent, TranslatePipeMock, MockPipe(ReactingUsersOnPostingPipe), MockComponent(FaIconComponent), MockComponent(EmojiComponent)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(SessionStorageService), { provide: NotificationService, useClass: MockNotificationService }, { provide: MetisService, useClass: MetisService }, diff --git a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts index baa72c2c00f8..ac6dd8bcbd9c 100644 --- a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts @@ -7,7 +7,7 @@ import { getElement, getElements } from '../../../../../helpers/utils/general.ut import { PostReactionsBarComponent } from 'app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component'; import { OverlayModule } from '@angular/cdk/overlay'; import { Reaction } from 'app/entities/metis/reaction.model'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ReactionService } from 'app/shared/metis/reaction.service'; import { MockReactionService } from '../../../../../helpers/mocks/service/mock-reaction.service'; import { AccountService } from 'app/core/auth/account.service'; @@ -32,6 +32,7 @@ import { MockNotificationService } from '../../../../../helpers/mocks/service/mo import { ConversationDTO, ConversationType } from 'app/entities/metis/conversation/conversation.model'; import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; import { User } from 'app/core/user/user.model'; +import { provideHttpClient } from '@angular/common/http'; describe('PostReactionsBarComponent', () => { let component: PostReactionsBarComponent; @@ -51,9 +52,11 @@ describe('PostReactionsBarComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, MockModule(OverlayModule), MockModule(EmojiModule), MockModule(PickerModule), MockDirective(NgbTooltip)], + imports: [MockModule(OverlayModule), MockModule(EmojiModule), MockModule(PickerModule), MockDirective(NgbTooltip)], declarations: [PostReactionsBarComponent, TranslatePipeMock, MockPipe(ReactingUsersOnPostingPipe), MockComponent(FaIconComponent), EmojiComponent], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(SessionStorageService), { provide: MetisService, useClass: MetisService }, { provide: ReactionService, useClass: MockReactionService }, diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-diff-editor.component.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-diff-editor.component.spec.ts index 350a6ed235d3..bdfd70b64723 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-diff-editor.component.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-diff-editor.component.spec.ts @@ -1,28 +1,21 @@ -import { Theme, ThemeService } from 'app/core/theme/theme.service'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../../test.module'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; import { MonacoDiffEditorComponent } from 'app/shared/monaco-editor/monaco-diff-editor.component'; -import { BehaviorSubject } from 'rxjs'; describe('MonacoDiffEditorComponent', () => { let fixture: ComponentFixture; let comp: MonacoDiffEditorComponent; - let mockThemeService: ThemeService; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule], - declarations: [MonacoDiffEditorComponent], - providers: [], + imports: [ArtemisTestModule, MonacoDiffEditorComponent], }) .compileComponents() .then(() => { global.ResizeObserver = jest.fn().mockImplementation((callback: ResizeObserverCallback) => { return new MockResizeObserver(callback); }); - mockThemeService = TestBed.inject(ThemeService); fixture = TestBed.createComponent(MonacoDiffEditorComponent); comp = fixture.componentInstance; }); @@ -32,37 +25,21 @@ describe('MonacoDiffEditorComponent', () => { jest.restoreAllMocks(); }); - it('should adjust its theme to the global theme', () => { - const themeSubject = new BehaviorSubject(Theme.LIGHT); - const subscribeStub = jest.spyOn(mockThemeService, 'getCurrentThemeObservable').mockReturnValue(themeSubject.asObservable()); - const changeThemeSpy = jest.spyOn(comp, 'changeTheme'); - fixture.detectChanges(); - themeSubject.next(Theme.DARK); - expect(subscribeStub).toHaveBeenCalledOnce(); - expect(changeThemeSpy).toHaveBeenCalledTimes(2); - expect(changeThemeSpy).toHaveBeenNthCalledWith(1, Theme.LIGHT); - expect(changeThemeSpy).toHaveBeenNthCalledWith(2, Theme.DARK); - }); - it('should dispose its listeners and subscriptions when destroyed', () => { fixture.detectChanges(); - const resizeObserverDisconnectSpy = jest.spyOn(comp.resizeObserver!, 'disconnect'); - const themeSubscriptionUnsubscribeSpy = jest.spyOn(comp.themeSubscription!, 'unsubscribe'); const listenerDisposeSpies = comp.listeners.map((listener) => jest.spyOn(listener, 'dispose')); comp.ngOnDestroy(); - for (const spy of [resizeObserverDisconnectSpy, themeSubscriptionUnsubscribeSpy, ...listenerDisposeSpies]) { + for (const spy of listenerDisposeSpies) { expect(spy).toHaveBeenCalledOnce(); } }); - it('should update the size of its container and layout the editor', () => { - const layoutSpy = jest.spyOn(comp, 'layout'); + it('should update the size of its container', () => { fixture.detectChanges(); const element = document.createElement('div'); comp.monacoDiffEditorContainerElement = element; - comp.adjustHeightAndLayout(100); + comp.adjustContainerHeight(100); expect(element.style.height).toBe('100px'); - expect(layoutSpy).toHaveBeenCalledOnce(); }); it('should set the text of the editor', () => { diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts index 06d99f3ae996..a759b1da24fc 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; import { ArtemisTestModule } from '../../../test.module'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; import { InsertShortAnswerOptionAction } from 'app/shared/monaco-editor/model/actions/quiz/insert-short-answer-option.action'; import { InsertShortAnswerSpotAction } from 'app/shared/monaco-editor/model/actions/quiz/insert-short-answer-spot.action'; @@ -20,9 +19,7 @@ describe('MonacoEditorActionQuizIntegration', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule], - declarations: [MonacoEditorComponent], - providers: [], + imports: [ArtemisTestModule, MonacoEditorComponent], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts index 730f84f110f1..f4fe90f07a2c 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; import { ArtemisTestModule } from '../../../test.module'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; import { BoldAction } from 'app/shared/monaco-editor/model/actions/bold.action'; import { TextEditorAction } from 'app/shared/monaco-editor/model/actions/text-editor-action.model'; @@ -29,9 +28,7 @@ describe('MonacoEditorActionIntegration', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule], - declarations: [MonacoEditorComponent], - providers: [], + imports: [ArtemisTestModule, MonacoEditorComponent], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-communication-action.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-communication-action.integration.spec.ts index 9fa5c2b391c5..862de1bdc8a7 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-communication-action.integration.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-communication-action.integration.spec.ts @@ -43,6 +43,7 @@ describe('MonacoEditorCommunicationActionIntegration', () => { beforeEach(() => { return TestBed.configureTestingModule({ + imports: [MonacoEditorComponent], providers: [ { provide: MetisService, useClass: MockMetisService }, { provide: TranslateService, useClass: MockTranslateService }, @@ -51,7 +52,6 @@ describe('MonacoEditorCommunicationActionIntegration', () => { MockProvider(CourseManagementService), MockProvider(ChannelService), ], - declarations: [MonacoEditorComponent], }) .compileComponents() .then(() => { @@ -60,7 +60,6 @@ describe('MonacoEditorCommunicationActionIntegration', () => { }); fixture = TestBed.createComponent(MonacoEditorComponent); comp = fixture.componentInstance; - // debugElement = fixture.debugElement; metisService = TestBed.inject(MetisService); courseManagementService = TestBed.inject(CourseManagementService); lectureService = TestBed.inject(LectureService); diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts index 8d608dc314b6..ab99555cc7d6 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts @@ -1,6 +1,5 @@ import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; import { ArtemisTestModule } from '../../../test.module'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { GradingInstructionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/grading-instruction.action'; @@ -17,8 +16,7 @@ describe('MonacoEditorActionGradingInstructionsIntegration', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule], - declarations: [MonacoEditorComponent], + imports: [ArtemisTestModule, MonacoEditorComponent], providers: [], }) .compileComponents() diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts index ae34f743a3a7..df228c9b340c 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts @@ -1,10 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ArtemisTestModule } from '../../../test.module'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; -import { Theme, ThemeService } from 'app/core/theme/theme.service'; -import { BehaviorSubject } from 'rxjs'; import { MonacoEditorBuildAnnotationType } from 'app/shared/monaco-editor/model/monaco-editor-build-annotation.model'; import { MonacoCodeEditorElement } from 'app/shared/monaco-editor/model/monaco-code-editor-element.model'; import { MonacoEditorLineDecorationsHoverButton } from 'app/shared/monaco-editor/model/monaco-editor-line-decorations-hover-button.model'; @@ -14,7 +11,6 @@ import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco- describe('MonacoEditorComponent', () => { let fixture: ComponentFixture; let comp: MonacoEditorComponent; - let mockThemeService: ThemeService; const singleLineText = 'public class Main { }'; const multiLineText = ['public class Main {', 'static void main() {', 'foo();', '}', '}'].join('\n'); @@ -23,13 +19,10 @@ describe('MonacoEditorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule], - declarations: [MonacoEditorComponent], - providers: [], + imports: [ArtemisTestModule, MonacoEditorComponent], }) .compileComponents() .then(() => { - mockThemeService = TestBed.inject(ThemeService); fixture = TestBed.createComponent(MonacoEditorComponent); comp = fixture.componentInstance; global.ResizeObserver = jest.fn().mockImplementation((callback: ResizeObserverCallback) => { @@ -59,7 +52,7 @@ describe('MonacoEditorComponent', () => { it('should only send a notification once per delay interval', fakeAsync(() => { const delay = 1000; const valueCallbackStub = jest.fn(); - comp.textChangedEmitDelay = delay; + fixture.componentRef.setInput('textChangedEmitDelay', delay); fixture.detectChanges(); comp.textChanged.subscribe(valueCallbackStub); comp.setText('too early'); @@ -70,36 +63,14 @@ describe('MonacoEditorComponent', () => { })); it('should be set to readOnly depending on the input', () => { - comp.readOnly = true; + fixture.componentRef.setInput('readOnly', true); fixture.detectChanges(); expect(comp.isReadOnly()).toBeTrue(); - comp.readOnly = false; + fixture.componentRef.setInput('readOnly', false); fixture.detectChanges(); expect(comp.isReadOnly()).toBeFalse(); }); - it('should adjust its theme to the global theme', () => { - const themeSubject = new BehaviorSubject(Theme.LIGHT); - const subscribeStub = jest.spyOn(mockThemeService, 'getCurrentThemeObservable').mockReturnValue(themeSubject.asObservable()); - const changeThemeSpy = jest.spyOn(comp, 'changeTheme'); - fixture.detectChanges(); - themeSubject.next(Theme.DARK); - expect(subscribeStub).toHaveBeenCalledOnce(); - expect(changeThemeSpy).toHaveBeenCalledTimes(2); - expect(changeThemeSpy).toHaveBeenNthCalledWith(1, Theme.LIGHT); - expect(changeThemeSpy).toHaveBeenNthCalledWith(2, Theme.DARK); - }); - - it('should unsubscribe from the global theme when destroyed', () => { - const themeSubject = new BehaviorSubject(Theme.LIGHT); - const subscribeStub = jest.spyOn(mockThemeService, 'getCurrentThemeObservable').mockReturnValue(themeSubject.asObservable()); - fixture.detectChanges(); - const unsubscribeStub = jest.spyOn(comp.themeSubscription!, 'unsubscribe').mockImplementation(); - comp.ngOnDestroy(); - expect(subscribeStub).toHaveBeenCalledOnce(); - expect(unsubscribeStub).toHaveBeenCalledOnce(); - }); - it('should display hidden line widgets', () => { const lineWidgetDiv = document.createElement('div'); // This is the case e.g. for feedback items. @@ -118,9 +89,9 @@ describe('MonacoEditorComponent', () => { comp.setAnnotations(buildAnnotationArray, false); comp.setText(multiLineText); const element = document.getElementById(buildAnnotationId); - expect(comp.editorBuildAnnotations).toHaveLength(1); + expect(comp.buildAnnotations).toHaveLength(1); expect(element).not.toBeNull(); - expect(element).toEqual(comp.editorBuildAnnotations[0].getGlyphMarginDomNode()); + expect(element).toEqual(comp.buildAnnotations[0].getGlyphMarginDomNode()); }); it('should not display build annotations that are out of bounds', () => { @@ -130,28 +101,28 @@ describe('MonacoEditorComponent', () => { comp.setAnnotations(buildAnnotationArray, false); comp.setText(singleLineText); const element = document.getElementById(buildAnnotationId); - expect(comp.editorBuildAnnotations).toHaveLength(1); + expect(comp.buildAnnotations).toHaveLength(1); // Ensure that the element is actually there, but not displayed in the DOM. expect(element).toBeNull(); - expect(comp.editorBuildAnnotations[0].getGlyphMarginDomNode().id).toBe(buildAnnotationId); + expect(comp.buildAnnotations[0].getGlyphMarginDomNode().id).toBe(buildAnnotationId); }); it('should mark build annotations as outdated if specified', () => { fixture.detectChanges(); comp.setText(multiLineText); comp.setAnnotations(buildAnnotationArray, true); - expect(comp.editorBuildAnnotations).toHaveLength(1); - expect(comp.editorBuildAnnotations[0].isOutdated()).toBeTrue(); + expect(comp.buildAnnotations).toHaveLength(1); + expect(comp.buildAnnotations[0].isOutdated()).toBeTrue(); }); it('should mark build annotations as outdated when a keyboard input is made', () => { fixture.detectChanges(); comp.setText(multiLineText); comp.setAnnotations(buildAnnotationArray, false); - expect(comp.editorBuildAnnotations).toHaveLength(1); - expect(comp.editorBuildAnnotations[0].isOutdated()).toBeFalse(); + expect(comp.buildAnnotations).toHaveLength(1); + expect(comp.buildAnnotations[0].isOutdated()).toBeFalse(); comp.triggerKeySequence('typing'); - expect(comp.editorBuildAnnotations[0].isOutdated()).toBeTrue(); + expect(comp.buildAnnotations[0].isOutdated()).toBeTrue(); }); it('should highlight line ranges with the specified classnames', () => { @@ -205,7 +176,7 @@ describe('MonacoEditorComponent', () => { }); it('should not allow editing in readonly mode', () => { - comp.readOnly = true; + fixture.componentRef.setInput('readOnly', true); fixture.detectChanges(); comp.setText(singleLineText); comp.triggerKeySequence('some ignored input'); @@ -218,7 +189,7 @@ describe('MonacoEditorComponent', () => { comp.addLineWidget(1, 'widget', document.createElement('div')); comp.setLineDecorationsHoverButton('testClass', jest.fn()); comp.highlightLines(1, 1); - const disposeAnnotationSpy = jest.spyOn(comp.editorBuildAnnotations[0], 'dispose'); + const disposeAnnotationSpy = jest.spyOn(comp.buildAnnotations[0], 'dispose'); const disposeWidgetSpy = jest.spyOn(comp.lineWidgets[0], 'dispose'); const disposeHoverButtonSpy = jest.spyOn(comp.lineDecorationsHoverButton!, 'dispose'); const disposeLineHighlightSpy = jest.spyOn(comp.lineHighlights[0], 'dispose'); diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.service.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.service.spec.ts new file mode 100644 index 000000000000..82ffd4e2b8b3 --- /dev/null +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.service.spec.ts @@ -0,0 +1,69 @@ +import { TestBed } from '@angular/core/testing'; +import * as monaco from 'monaco-editor'; +import { Theme, ThemeService } from 'app/core/theme/theme.service'; +import { MonacoEditorService } from '../../../../../../main/webapp/app/shared/monaco-editor/monaco-editor.service'; +import { ArtemisTestModule } from '../../../test.module'; +import { CUSTOM_MARKDOWN_LANGUAGE_ID } from 'app/shared/monaco-editor/model/languages/monaco-custom-markdown.language'; +import { BehaviorSubject } from 'rxjs'; +import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; + +describe('MonacoEditorService', () => { + let monacoEditorService: MonacoEditorService; + let setThemeSpy: jest.SpyInstance; + let registerLanguageSpy: jest.SpyInstance; + const themeSubject = new BehaviorSubject(Theme.LIGHT); + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ArtemisTestModule], + }); + // Avoids an error with the diff editor, which uses a ResizeObserver. + global.ResizeObserver = jest.fn().mockImplementation((callback: ResizeObserverCallback) => { + return new MockResizeObserver(callback); + }); + registerLanguageSpy = jest.spyOn(monaco.languages, 'register'); + setThemeSpy = jest.spyOn(monaco.editor, 'setTheme'); + const themeService = TestBed.inject(ThemeService); + jest.spyOn(themeService, 'getCurrentThemeObservable').mockReturnValue(themeSubject.asObservable()); + monacoEditorService = TestBed.inject(MonacoEditorService); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should register the custom markdown language', () => { + const customMarkdownLanguage = monaco.languages.getLanguages().find((l) => l.id === CUSTOM_MARKDOWN_LANGUAGE_ID); + expect(customMarkdownLanguage).toBeDefined(); + expect(registerLanguageSpy).toHaveBeenCalledExactlyOnceWith({ id: customMarkdownLanguage!.id }); + }); + + it('should correctly handle themes', () => { + // Initialization: The editor should be in light mode since that is what we initialized the themeSubject with + expect(setThemeSpy).toHaveBeenCalledExactlyOnceWith(MonacoEditorService.LIGHT_THEME_ID); + // Switch to dark theme + themeSubject.next(Theme.DARK); + TestBed.flushEffects(); + expect(setThemeSpy).toHaveBeenCalledTimes(2); + expect(setThemeSpy).toHaveBeenNthCalledWith(2, MonacoEditorService.DARK_THEME_ID); + // Switch back to light theme + themeSubject.next(Theme.LIGHT); + TestBed.flushEffects(); + expect(setThemeSpy).toHaveBeenCalledTimes(3); + expect(setThemeSpy).toHaveBeenNthCalledWith(3, MonacoEditorService.LIGHT_THEME_ID); + }); + + it.each([ + { className: 'monaco-editor', createFn: (element: HTMLElement) => monacoEditorService.createStandaloneCodeEditor(element) }, + { className: 'monaco-diff-editor', createFn: (element: HTMLElement) => monacoEditorService.createStandaloneDiffEditor(element) }, + ])( + 'should insert an editor ($className) into the provided DOM element', + ({ className, createFn }: { className: string; createFn: (element: HTMLElement) => monaco.editor.IStandaloneCodeEditor | monaco.editor.IStandaloneDiffEditor }) => { + const element = document.createElement('div'); + const editor = createFn(element); + expect(editor.getContainerDomNode()).toBe(element); + expect(element.children).toHaveLength(1); + expect(element.children.item(0)!.classList).toContain(className); + }, + ); +}); diff --git a/src/test/javascript/spec/component/shared/navbar.component.spec.ts b/src/test/javascript/spec/component/shared/navbar.component.spec.ts index b02e161d1f22..8b37f25b6f19 100644 --- a/src/test/javascript/spec/component/shared/navbar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/navbar.component.spec.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ActivatedRoute, Router, UrlSerializer } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -37,7 +37,7 @@ import { SystemNotificationComponent } from 'app/shared/notification/system-noti import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; import { NgbCollapseMocksModule } from '../../helpers/mocks/directive/ngbCollapseMocks.module'; import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; class MockBreadcrumb { @@ -93,7 +93,7 @@ describe('NavbarComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, NgbTooltipMocksModule, NgbCollapseMocksModule, NgbDropdownMocksModule], + imports: [NgbTooltipMocksModule, NgbCollapseMocksModule, NgbDropdownMocksModule], declarations: [ NavbarComponent, MockDirective(HasAnyAuthorityDirective), @@ -112,6 +112,8 @@ describe('NavbarComponent', () => { MockComponent(FaIconComponent), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(UrlSerializer), { provide: AccountService, diff --git a/src/test/javascript/spec/component/shared/notification/notification-popup.component.spec.ts b/src/test/javascript/spec/component/shared/notification/notification-popup.component.spec.ts index b7a85f93e7dd..a628c21d022e 100644 --- a/src/test/javascript/spec/component/shared/notification/notification-popup.component.spec.ts +++ b/src/test/javascript/spec/component/shared/notification/notification-popup.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { ReplaySubject } from 'rxjs'; @@ -11,7 +11,6 @@ import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storag import { MockNotificationService } from '../../../helpers/mocks/service/mock-notification.service'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; import { NEW_MESSAGE_TITLE, Notification, QUIZ_EXERCISE_STARTED_TEXT, QUIZ_EXERCISE_STARTED_TITLE } from 'app/entities/notification.model'; -import { RouterTestingModule } from '@angular/router/testing'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockPipe } from 'ng-mocks'; @@ -53,7 +52,7 @@ describe('Notification Popup Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([])], + imports: [ArtemisTestModule, RouterModule.forRoot([])], declarations: [NotificationPopupComponent, MockPipe(ArtemisTranslatePipe)], providers: [ { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/shared/result.component.spec.ts b/src/test/javascript/spec/component/shared/result.component.spec.ts index d72fdc5f3bd2..e013c1e03e58 100644 --- a/src/test/javascript/spec/component/shared/result.component.spec.ts +++ b/src/test/javascript/spec/component/shared/result.component.spec.ts @@ -370,7 +370,6 @@ describe('ResultComponent', () => { it('should use special handling if result is an automatic AI result', () => { comp.result = { ...mockResult, score: 90, assessmentType: AssessmentType.AUTOMATIC_ATHENA }; - jest.spyOn(Result, 'isAthenaAIResult').mockReturnValue(true); comp.evaluate(); diff --git a/src/test/javascript/spec/component/shared/search-filter.component.spec.ts b/src/test/javascript/spec/component/shared/search-filter.component.spec.ts index 5ff83d37e5fd..a75e50a3551e 100644 --- a/src/test/javascript/spec/component/shared/search-filter.component.spec.ts +++ b/src/test/javascript/spec/component/shared/search-filter.component.spec.ts @@ -1,11 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; -import { MockModule, MockPipe } from 'ng-mocks'; +import { MockModule } from 'ng-mocks'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { By } from '@angular/platform-browser'; -import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; describe('SearchFilterComponent', () => { let component: SearchFilterComponent; @@ -14,7 +13,7 @@ describe('SearchFilterComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, MockModule(ReactiveFormsModule), MockModule(FormsModule), MockModule(FontAwesomeModule)], - declarations: [SearchFilterComponent, MockPipe(ArtemisTranslatePipe)], + declarations: [SearchFilterComponent], }).compileComponents(); }); diff --git a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts index a89b2264612a..0fc2fad98e4c 100644 --- a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts +++ b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts @@ -14,7 +14,6 @@ import { CourseExerciseDetailsComponent } from 'app/overview/exercise-details/co import { ExamDetailComponent } from 'app/exam/manage/exams/exam-detail.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ConversationService } from 'app/shared/metis/conversations/conversation.service'; -import { RouterTestingModule } from '@angular/router/testing'; import { AlertService } from 'app/core/util/alert.service'; import { MetisService } from 'app/shared/metis/metis.service'; import { MockMetisService } from '../../../helpers/mocks/service/mock-metis-service.service'; @@ -27,6 +26,7 @@ import { ConversationDetailDialogComponent } from 'app/overview/course-conversat import { MetisConversationService } from 'app/shared/metis/metis-conversation.service'; import { isOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { provideRouter } from '@angular/router'; const examples: (() => ConversationDTO)[] = [ () => generateOneToOneChatDTO({}), @@ -51,17 +51,14 @@ examples.forEach((conversation) => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ArtemisSharedModule, - NgbDropdownMocksModule, - RouterTestingModule.withRoutes([ + imports: [ArtemisSharedModule, NgbDropdownMocksModule], + declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], + providers: [ + provideRouter([ { path: 'courses/:courseId/lectures/:lectureId', component: CourseLectureDetailsComponent }, { path: 'courses/:courseId/exercises/:exerciseId', component: CourseExerciseDetailsComponent }, { path: 'courses/:courseId/exams/:examId', component: ExamDetailComponent }, ]), - ], - declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], - providers: [ MockProvider(ConversationService), MockProvider(MetisConversationService), MockProvider(AlertService), diff --git a/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts index bcffb82bc9c1..68eddc94218d 100644 --- a/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts +++ b/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts @@ -31,6 +31,7 @@ describe('SidebarAccordionComponent', () => { SearchFilterPipe, SearchFilterComponent, MockPipe(ArtemisTranslatePipe), + MockComponent(SearchFilterComponent), ], }).compileComponents(); }); diff --git a/src/test/javascript/spec/component/shared/user-settings/notification-settings.service.spec.ts b/src/test/javascript/spec/component/shared/user-settings/notification-settings.service.spec.ts index 541a09f6a565..8632f04491e9 100644 --- a/src/test/javascript/spec/component/shared/user-settings/notification-settings.service.spec.ts +++ b/src/test/javascript/spec/component/shared/user-settings/notification-settings.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { NotificationSetting } from 'app/shared/user-settings/notification-settings/notification-settings-structure'; import { NotificationSettingsService, reloadNotificationSideBarMessage } from 'app/shared/user-settings/notification-settings/notification-settings.service'; @@ -6,7 +6,7 @@ import { COURSE_ARCHIVE_STARTED_TITLE, EXAM_ARCHIVE_STARTED_TITLE, EXERCISE_PRAC import { SettingId } from 'app/shared/constants/user-settings.constants'; import { UserSettingsService } from 'app/shared/user-settings/user-settings.service'; import { of } from 'rxjs'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { Setting } from 'app/shared/user-settings/user-settings.model'; const notificationSettingA: NotificationSetting = { @@ -28,7 +28,8 @@ describe('User Settings Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/shared/user-settings/science-settings.service.spec.ts b/src/test/javascript/spec/component/shared/user-settings/science-settings.service.spec.ts index c084b70e876c..16f4318fb82a 100644 --- a/src/test/javascript/spec/component/shared/user-settings/science-settings.service.spec.ts +++ b/src/test/javascript/spec/component/shared/user-settings/science-settings.service.spec.ts @@ -1,9 +1,9 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { SettingId } from 'app/shared/constants/user-settings.constants'; import { UserSettingsService } from 'app/shared/user-settings/user-settings.service'; import { of } from 'rxjs'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { Setting } from 'app/shared/user-settings/user-settings.model'; import { ScienceSetting } from 'app/shared/user-settings/science-settings/science-settings-structure'; import { ScienceSettingsService } from 'app/shared/user-settings/science-settings/science-settings.service'; @@ -26,8 +26,8 @@ describe('ScienceSettingsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: LocalStorageService, useClass: MockLocalStorageService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockLocalStorageService }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/shared/user-settings/user-settings.directive.spec.ts b/src/test/javascript/spec/component/shared/user-settings/user-settings.directive.spec.ts index a4dcae96918f..bce6f3acfcbc 100644 --- a/src/test/javascript/spec/component/shared/user-settings/user-settings.directive.spec.ts +++ b/src/test/javascript/spec/component/shared/user-settings/user-settings.directive.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AccountService } from 'app/core/auth/account.service'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; @@ -13,7 +13,7 @@ import { UserSettingsDirective } from 'app/shared/user-settings/user-settings.di import { MockRouter } from '../../../helpers/mocks/mock-router'; import { Router } from '@angular/router'; import { of, throwError } from 'rxjs'; -import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { HttpErrorResponse, HttpResponse, provideHttpClient } from '@angular/common/http'; import { MockProvider } from 'ng-mocks'; import { MockUserSettingsService } from '../../../helpers/mocks/service/mock-user-settings.service'; import { AlertService } from 'app/core/util/alert.service'; @@ -62,9 +62,11 @@ describe('User Settings Directive', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, TranslateTestingModule], + imports: [TranslateTestingModule], declarations: [UserSettingsMockComponent], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(ChangeDetectorRef), { provide: JhiWebsocketService, useClass: MockWebsocketService }, { provide: AccountService, useClass: MockAccountService }, diff --git a/src/test/javascript/spec/component/shared/user-settings/user-settings.service.spec.ts b/src/test/javascript/spec/component/shared/user-settings/user-settings.service.spec.ts index 3ee3131e380c..d52dd09a8b2c 100644 --- a/src/test/javascript/spec/component/shared/user-settings/user-settings.service.spec.ts +++ b/src/test/javascript/spec/component/shared/user-settings/user-settings.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { AccountService } from 'app/core/auth/account.service'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; @@ -9,6 +9,7 @@ import { MockAccountService } from '../../../helpers/mocks/service/mock-account. import { TranslateTestingModule } from '../../../helpers/mocks/service/mock-translate.service'; import { Setting, UserSettingsStructure } from 'app/shared/user-settings/user-settings.model'; import { NotificationSetting, notificationSettingsStructure } from 'app/shared/user-settings/notification-settings/notification-settings-structure'; +import { provideHttpClient } from '@angular/common/http'; const notificationSettingA: NotificationSetting = { settingId: SettingId.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE, @@ -123,8 +124,10 @@ describe('User Settings Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, TranslateTestingModule], + imports: [TranslateTestingModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: JhiWebsocketService, useClass: MockWebsocketService }, { provide: AccountService, useClass: MockAccountService }, ], diff --git a/src/test/javascript/spec/component/standardized-competencies/admin-standardized-competency.service.spec.ts b/src/test/javascript/spec/component/standardized-competencies/admin-standardized-competency.service.spec.ts index deddba28f58e..6b9f73c07ba5 100644 --- a/src/test/javascript/spec/component/standardized-competencies/admin-standardized-competency.service.spec.ts +++ b/src/test/javascript/spec/component/standardized-competencies/admin-standardized-competency.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { AdminStandardizedCompetencyService } from 'app/admin/standardized-competencies/admin-standardized-competency.service'; import { KnowledgeAreaDTO, KnowledgeAreasForImportDTO, StandardizedCompetencyDTO } from 'app/entities/competency/standardized-competency.model'; @@ -14,8 +14,8 @@ describe('AdminStandardizedCompetencyService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); adminStandardizedCompetencyService = TestBed.inject(AdminStandardizedCompetencyService); diff --git a/src/test/javascript/spec/component/standardized-competencies/standardized-competency.service.spec.ts b/src/test/javascript/spec/component/standardized-competencies/standardized-competency.service.spec.ts index a36ff6f9389d..d9867dc66ab1 100644 --- a/src/test/javascript/spec/component/standardized-competencies/standardized-competency.service.spec.ts +++ b/src/test/javascript/spec/component/standardized-competencies/standardized-competency.service.spec.ts @@ -1,5 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { KnowledgeArea, KnowledgeAreaDTO, Source, StandardizedCompetency } from 'app/entities/competency/standardized-competency.model'; import { take } from 'rxjs'; @@ -14,8 +14,8 @@ describe('StandardizedCompetencyService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); standardizedCompetencyService = TestBed.inject(StandardizedCompetencyService); diff --git a/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts b/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts index 2626dffc45e1..d77c1251079e 100644 --- a/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts +++ b/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { PerformanceInterval, StatisticsAverageScoreGraphComponent } from 'app/shared/statistics-graph/statistics-average-score-graph.component'; @@ -13,6 +12,7 @@ import { ChartExerciseTypeFilter } from 'app/shared/chart/chart-exercise-type-fi import { ChartCategoryFilter } from 'app/shared/chart/chart-category-filter'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; +import { provideRouter } from '@angular/router'; describe('StatisticsAverageScoreGraphComponent', () => { let fixture: ComponentFixture; @@ -78,9 +78,9 @@ describe('StatisticsAverageScoreGraphComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)], + imports: [ArtemisTestModule, MockModule(BarChartModule)], declarations: [StatisticsAverageScoreGraphComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], - providers: [MockProvider(ArtemisNavigationUtilService), MockProvider(ChartExerciseTypeFilter), MockProvider(ChartCategoryFilter)], + providers: [provideRouter([]), MockProvider(ArtemisNavigationUtilService), MockProvider(ChartExerciseTypeFilter), MockProvider(ChartCategoryFilter)], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/statistics/statistics-graph.component.spec.ts b/src/test/javascript/spec/component/statistics/statistics-graph.component.spec.ts index 7675dfe64dbf..6fce3eef9959 100644 --- a/src/test/javascript/spec/component/statistics/statistics-graph.component.spec.ts +++ b/src/test/javascript/spec/component/statistics/statistics-graph.component.spec.ts @@ -1,7 +1,6 @@ import { HttpTestingController } from '@angular/common/http/testing'; import { SimpleChange } from '@angular/core'; import { ArtemisTestModule } from '../../test.module'; -import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { StatisticsGraphComponent } from 'app/shared/statistics-graph/statistics-graph.component'; import { StatisticsService } from 'app/shared/statistics-graph/statistics.service'; @@ -13,6 +12,7 @@ import { of } from 'rxjs'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BarChartModule } from '@swimlane/ngx-charts'; +import { provideRouter } from '@angular/router'; describe('StatisticsGraphComponent', () => { let fixture: ComponentFixture; @@ -22,9 +22,9 @@ describe('StatisticsGraphComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)], + imports: [ArtemisTestModule, MockModule(BarChartModule)], declarations: [StatisticsGraphComponent, MockPipe(ArtemisTranslatePipe)], - providers: [{ provide: TranslateService, useClass: MockTranslateService }], + providers: [provideRouter([]), { provide: TranslateService, useClass: MockTranslateService }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/statistics/statistics.component.spec.ts b/src/test/javascript/spec/component/statistics/statistics.component.spec.ts index 84b45d345bb3..060d6f991100 100644 --- a/src/test/javascript/spec/component/statistics/statistics.component.spec.ts +++ b/src/test/javascript/spec/component/statistics/statistics.component.spec.ts @@ -3,13 +3,13 @@ import { ArtemisTestModule } from '../../test.module'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; -import { RouterTestingModule } from '@angular/router/testing'; import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock-has-any-authority.directive'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { StatisticsComponent } from 'app/admin/statistics/statistics.component'; import { StatisticsGraphComponent } from 'app/shared/statistics-graph/statistics-graph.component'; import { SpanType } from 'app/entities/statistics.model'; +import { provideRouter } from '@angular/router'; describe('StatisticsComponent', () => { let fixture: ComponentFixture; @@ -17,7 +17,7 @@ describe('StatisticsComponent', () => { beforeEach(fakeAsync(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([])], + imports: [ArtemisTestModule], declarations: [ StatisticsComponent, MockComponent(StatisticsGraphComponent), @@ -25,10 +25,7 @@ describe('StatisticsComponent', () => { MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), ], - providers: [ - { provide: LocalStorageService, useClass: MockSyncStorage }, - { provide: SessionStorageService, useClass: MockSyncStorage }, - ], + providers: [provideRouter([]), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/component/team/teams.component.spec.ts b/src/test/javascript/spec/component/team/teams.component.spec.ts index f4b3cf2b454a..9ace2666920a 100644 --- a/src/test/javascript/spec/component/team/teams.component.spec.ts +++ b/src/test/javascript/spec/component/team/teams.component.spec.ts @@ -6,7 +6,7 @@ import { NgModel } from '@angular/forms'; import { TeamService } from 'app/exercises/shared/team/team.service'; import { TeamsComponent } from 'app/exercises/shared/team/teams.component'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; -import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; +import { ActivatedRoute, Router, convertToParamMap, provideRouter } from '@angular/router'; import { of } from 'rxjs'; import { MockTeamService, mockTeams } from '../../helpers/mocks/service/mock-team.service'; import { MockExerciseService } from '../../helpers/mocks/service/mock-exercise.service'; @@ -22,8 +22,6 @@ import { NgxDatatableModule } from '@siemens/ngx-datatable'; import { TeamStudentsListComponent } from 'app/exercises/shared/team/team-participate/team-students-list.component'; import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive'; import { TeamDeleteButtonComponent } from 'app/exercises/shared/team/team-update-dialog/team-delete-button.component'; -import { RouterTestingModule } from '@angular/router/testing'; -import { teamRoute } from 'app/exercises/shared/team/team.route'; describe('TeamsComponent', () => { let comp: TeamsComponent; @@ -38,7 +36,7 @@ describe('TeamsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MockModule(NgxDatatableModule), RouterTestingModule.withRoutes([teamRoute[0]])], + imports: [ArtemisTestModule, MockModule(NgxDatatableModule)], declarations: [ TeamsComponent, MockDirective(NgModel), @@ -52,6 +50,7 @@ describe('TeamsComponent', () => { MockComponent(TeamDeleteButtonComponent), ], providers: [ + provideRouter([]), { provide: ActivatedRoute, useValue: route }, { provide: ParticipationService, useClass: MockParticipationService }, { provide: ExerciseService, useClass: MockExerciseService }, diff --git a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts index 6bfb8cf13d4f..79fbe6ae6f3e 100644 --- a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts +++ b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts @@ -1,6 +1,6 @@ import { DebugElement } from '@angular/core'; import dayjs from 'dayjs/esm'; -import { ActivatedRoute, convertToParamMap } from '@angular/router'; +import { ActivatedRoute, RouterModule, convertToParamMap } from '@angular/router'; import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing'; import { AlertService } from 'app/core/util/alert.service'; import { ArtemisTestModule } from '../../test.module'; @@ -8,7 +8,6 @@ import { TranslateService } from '@ngx-translate/core'; import { MockTextEditorService } from '../../helpers/mocks/service/mock-text-editor.service'; import { TextEditorService } from 'app/exercises/text/participate/text-editor.service'; import { BehaviorSubject } from 'rxjs'; -import { RouterTestingModule } from '@angular/router/testing'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; @@ -65,7 +64,7 @@ describe('TextEditorComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule.withRoutes([textEditorRoute[0]])], + imports: [ArtemisTestModule, RouterModule.forRoot([textEditorRoute[0]])], declarations: [ TextEditorComponent, MockComponent(SubmissionResultStatusComponent), diff --git a/src/test/javascript/spec/component/text-exercise/tutor-effort-statistics.component.spec.ts b/src/test/javascript/spec/component/text-exercise/tutor-effort-statistics.component.spec.ts index 628acbaaa880..b8cac8be2db1 100644 --- a/src/test/javascript/spec/component/text-exercise/tutor-effort-statistics.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/tutor-effort-statistics.component.spec.ts @@ -3,7 +3,7 @@ import { MockComponent, MockDirective, MockModule, MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { TutorEffortStatisticsComponent } from 'app/exercises/text/manage/tutor-effort/tutor-effort-statistics.component'; import { ArtemisTestModule } from '../../test.module'; import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock-has-any-authority.directive'; @@ -16,6 +16,7 @@ import { BarChartModule } from '@swimlane/ngx-charts'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { MockRouter } from '../../helpers/mocks/mock-router'; import { of } from 'rxjs'; +import { provideHttpClient } from '@angular/common/http'; describe('TutorEffortStatisticsComponent', () => { let fixture: ComponentFixture; @@ -49,9 +50,11 @@ describe('TutorEffortStatisticsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule, MockModule(BarChartModule)], + imports: [ArtemisTestModule, MockModule(BarChartModule)], declarations: [TutorEffortStatisticsComponent, MockPipe(ArtemisTranslatePipe), MockDirective(MockHasAnyAuthorityDirective), MockComponent(HelpIconComponent)], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: ActivatedRoute, diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts index 1a550e93428c..c17c369af9ce 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts @@ -17,7 +17,7 @@ import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import dayjs from 'dayjs/esm'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; +import { ActivatedRoute, Router, convertToParamMap, provideRouter } from '@angular/router'; import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.component'; import { Course } from 'app/entities/course.model'; import { ManualTextblockSelectionComponent } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component'; @@ -26,7 +26,6 @@ import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; import { AlertService } from 'app/core/util/alert.service'; -import { RouterTestingModule } from '@angular/router/testing'; import { SubmissionService } from 'app/exercises/shared/submission/submission.service'; import { GradingInstructionLinkIconComponent } from 'app/shared/grading-instruction-link-icon/grading-instruction-link-icon.component'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; @@ -146,7 +145,7 @@ describe('TextSubmissionAssessmentComponent', () => { } as unknown as ActivatedRoute; TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule], + imports: [ArtemisTestModule], declarations: [ TextSubmissionAssessmentComponent, TextAssessmentAreaComponent, @@ -164,6 +163,7 @@ describe('TextSubmissionAssessmentComponent', () => { MockDirective(TranslateDirective), ], providers: [ + provideRouter([]), { provide: ActivatedRoute, useValue: mockActivatedRoute }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts index de181aa7add3..ccc0b8a126b7 100644 --- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { CourseTutorialGroupCardComponent } from 'app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { TranslateService } from '@ngx-translate/core'; @@ -10,6 +9,7 @@ import { Course } from 'app/entities/course.model'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { MockComponent, MockDirective } from 'ng-mocks'; import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service'; +import { RouterModule } from '@angular/router'; describe('CourseTutorialGroupCardComponent', () => { let component: CourseTutorialGroupCardComponent; @@ -19,7 +19,7 @@ describe('CourseTutorialGroupCardComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([])], + imports: [RouterModule.forRoot([])], declarations: [CourseTutorialGroupCardComponent, MockComponent(FaIconComponent), TranslatePipeMock, MockDirective(TranslateDirective)], providers: [ { diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts index cf60468091e9..95738abdc115 100644 --- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service'; import { MockRouter } from '../../../helpers/mocks/mock-router'; -import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { AlertService } from 'app/core/util/alert.service'; import { ActivatedRoute, Router, RouterModule, convertToParamMap } from '@angular/router'; @@ -34,7 +34,7 @@ describe('CourseTutorialGroupsComponent', () => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, RouterModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], - declarations: [CourseTutorialGroupsComponent, MockPipe(ArtemisTranslatePipe), SidebarComponent, SearchFilterComponent, MockPipe(SearchFilterPipe)], + declarations: [CourseTutorialGroupsComponent, MockPipe(ArtemisTranslatePipe), SidebarComponent, MockComponent(SearchFilterComponent), MockPipe(SearchFilterPipe)], providers: [ MockProvider(TutorialGroupsService), MockProvider(CourseStorageService), diff --git a/src/test/javascript/spec/component/tutorial-groups/helpers/tutorialGroupExampleModels.ts b/src/test/javascript/spec/component/tutorial-groups/helpers/tutorialGroupExampleModels.ts index 72ed52f96b02..1d55425cf1a1 100644 --- a/src/test/javascript/spec/component/tutorial-groups/helpers/tutorialGroupExampleModels.ts +++ b/src/test/javascript/spec/component/tutorial-groups/helpers/tutorialGroupExampleModels.ts @@ -18,6 +18,8 @@ export const generateExampleTutorialGroup = ({ numberOfRegisteredUsers = 5, course = { id: 1, title: 'Test Course' } as Course, teachingAssistantName = 'Example TA', + teachingAssistantId = 1, + teachingAssistantImageUrl = 'test image', courseTitle = 'Test Course', tutorialGroupSchedule = { id: 1, @@ -44,6 +46,8 @@ export const generateExampleTutorialGroup = ({ exampleTutorialGroup.numberOfRegisteredUsers = numberOfRegisteredUsers; exampleTutorialGroup.course = course; exampleTutorialGroup.teachingAssistantName = teachingAssistantName; + exampleTutorialGroup.teachingAssistantId = teachingAssistantId; + exampleTutorialGroup.teachingAssistantImageUrl = teachingAssistantImageUrl; exampleTutorialGroup.courseTitle = courseTitle; exampleTutorialGroup.tutorialGroupSchedule = tutorialGroupSchedule; return exampleTutorialGroup; diff --git a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-free-period.service.spec.ts b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-free-period.service.spec.ts index 9db5612b487f..12f338cf6b48 100644 --- a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-free-period.service.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-free-period.service.spec.ts @@ -1,9 +1,10 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { TutorialGroupFreePeriodDTO, TutorialGroupFreePeriodService } from 'app/course/tutorial-groups/services/tutorial-group-free-period.service'; import { generateExampleTutorialGroupFreePeriod } from '../helpers/tutorialGroupFreePeriodExampleModel'; import { TutorialGroupFreePeriod } from 'app/entities/tutorial-group/tutorial-group-free-day.model'; +import { provideHttpClient } from '@angular/common/http'; describe('TutorialGroupFreePeriodService', () => { let service: TutorialGroupFreePeriodService; @@ -12,7 +13,8 @@ describe('TutorialGroupFreePeriodService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(TutorialGroupFreePeriodService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-session.service.spec.ts b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-session.service.spec.ts index 42a959420fa6..3767e48293f7 100644 --- a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-session.service.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group-session.service.spec.ts @@ -1,9 +1,10 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { TutorialGroupSessionDTO, TutorialGroupSessionService } from 'app/course/tutorial-groups/services/tutorial-group-session.service'; import { TutorialGroupSession } from 'app/entities/tutorial-group/tutorial-group-session.model'; import { generateExampleTutorialGroupSession } from '../helpers/tutorialGroupSessionExampleModels'; +import { provideHttpClient } from '@angular/common/http'; describe('TutorialGroupSessionService', () => { let service: TutorialGroupSessionService; @@ -12,7 +13,8 @@ describe('TutorialGroupSessionService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(TutorialGroupSessionService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group.service.spec.ts b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group.service.spec.ts index 2644fc2117c5..fe362b0267d2 100644 --- a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group.service.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-group.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { map, take } from 'rxjs/operators'; import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service'; @@ -8,6 +8,7 @@ import { TutorialGroupSessionService } from 'app/course/tutorial-groups/services import { TutorialGroupsConfigurationService } from 'app/course/tutorial-groups/services/tutorial-groups-configuration.service'; import { TutorialGroupSession } from 'app/entities/tutorial-group/tutorial-group-session.model'; import { TutorialGroupRegistrationImportDTO } from 'app/entities/tutorial-group/tutorial-group-import-dto.model'; +import { provideHttpClient } from '@angular/common/http'; describe('TutorialGroupService', () => { let service: TutorialGroupsService; @@ -28,8 +29,10 @@ describe('TutorialGroupService', () => { }; TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TutorialGroupSessionService, useValue: spySessionService }, { provide: TutorialGroupsConfigurationService, useValue: spyConfigService }, ], diff --git a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups-configuration.service.spec.ts b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups-configuration.service.spec.ts index 5c6248037b7b..37e11af2fcf8 100644 --- a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups-configuration.service.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups-configuration.service.spec.ts @@ -1,10 +1,11 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { TutorialGroupSession } from 'app/entities/tutorial-group/tutorial-group-session.model'; import { generateExampleTutorialGroupsConfiguration } from '../helpers/tutorialGroupsConfigurationExampleModels'; import { TutorialGroupsConfigurationService } from 'app/course/tutorial-groups/services/tutorial-groups-configuration.service'; import { TutorialGroupsConfiguration } from 'app/entities/tutorial-group/tutorial-groups-configuration.model'; +import { provideHttpClient } from '@angular/common/http'; describe('TutorialGroupsConfigurationService', () => { let service: TutorialGroupsConfigurationService; @@ -13,7 +14,8 @@ describe('TutorialGroupsConfigurationService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(TutorialGroupsConfigurationService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups.service.spec.ts b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups.service.spec.ts index 7f674a9d052a..79159be61cbe 100644 --- a/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups.service.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/services/tutorial-groups.service.spec.ts @@ -1,10 +1,11 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { map, take } from 'rxjs/operators'; import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { StudentDTO } from 'app/entities/student-dto.model'; import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels'; +import { provideHttpClient } from '@angular/common/http'; describe('TutorialGroupService', () => { let service: TutorialGroupsService; @@ -13,7 +14,8 @@ describe('TutorialGroupService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(TutorialGroupsService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts index a997564fe086..1290e595fbd3 100644 --- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts @@ -1,26 +1,27 @@ import { TutorialGroupDetailComponent } from 'app/course/tutorial-groups/shared/tutorial-group-detail/tutorial-group-detail.component'; -import { RouterTestingModule } from '@angular/router/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels'; -import { Component, Input, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, ViewChild } from '@angular/core'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { SortService } from 'app/shared/service/sort.service'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { TutorialGroupUtilizationIndicatorComponent } from 'app/course/tutorial-groups/shared/tutorial-group-utilization-indicator/tutorial-group-utilization-indicator.component'; import { RemoveSecondsPipe } from 'app/course/tutorial-groups/shared/remove-seconds.pipe'; -import { DetailOverviewListComponent } from 'app/detail-overview-list/detail-overview-list.component'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { MockLocalStorageService } from '../../../helpers/mocks/service/mock-local-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import dayjs from 'dayjs/esm'; import { TutorialGroupSessionStatus } from 'app/entities/tutorial-group/tutorial-group-session.model'; -import { ChangeDetectorRef } from '@angular/core'; +import { provideHttpClient } from '@angular/common/http'; +import { RouterModule } from '@angular/router'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { IconCardComponent } from 'app/shared/icon-card/icon-card.component'; @Component({ selector: 'jhi-mock-header', template: '
    ' }) class MockHeaderComponent { @@ -57,18 +58,21 @@ describe('TutorialGroupDetailWrapperTest', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule, RouterTestingModule.withRoutes([]), HttpClientTestingModule], + imports: [NgbTooltipMocksModule, RouterModule.forRoot([])], declarations: [ TutorialGroupDetailComponent, - DetailOverviewListComponent, MockWrapperComponent, MockHeaderComponent, + MockComponent(IconCardComponent), MockPipe(ArtemisTranslatePipe), MockPipe(RemoveSecondsPipe), MockComponent(FaIconComponent), MockComponent(TutorialGroupUtilizationIndicatorComponent), + MockDirective(TranslateDirective), ], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(ArtemisMarkdownService), MockProvider(SortService), MockProvider(SessionStorageService), @@ -76,7 +80,6 @@ describe('TutorialGroupDetailWrapperTest', () => { { provide: LocalStorageService, useClass: MockLocalStorageService }, ], }) - .overrideTemplate(DetailOverviewListComponent, '') .compileComponents() .then(() => { fixture = TestBed.createComponent(MockWrapperComponent); @@ -107,13 +110,15 @@ describe('TutorialGroupDetailComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule, RouterTestingModule.withRoutes([])], + imports: [NgbTooltipMocksModule, RouterModule.forRoot([])], declarations: [ TutorialGroupDetailComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), + MockComponent(IconCardComponent), MockComponent(TutorialGroupUtilizationIndicatorComponent), MockPipe(RemoveSecondsPipe), + MockDirective(TranslateDirective), ], providers: [MockProvider(ArtemisMarkdownService), { provide: TranslateService, useClass: MockTranslateService }, MockProvider(ChangeDetectorRef)], }) diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-row.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-row.component.spec.ts index dda5cb2ef561..8395b83f29fd 100644 --- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-row.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-row.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { TutorialGroupRowComponent } from 'app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { MockComponent, MockPipe } from 'ng-mocks'; @@ -8,6 +7,7 @@ import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels'; import { TutorialGroupUtilizationIndicatorComponent } from 'app/course/tutorial-groups/shared/tutorial-group-utilization-indicator/tutorial-group-utilization-indicator.component'; import { MeetingPatternPipe } from 'app/course/tutorial-groups/shared/meeting-pattern.pipe'; +import { RouterModule } from '@angular/router'; describe('TutorialGroupRowComponent', () => { let component: TutorialGroupRowComponent; @@ -16,7 +16,7 @@ describe('TutorialGroupRowComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([])], + imports: [RouterModule.forRoot([])], declarations: [ TutorialGroupRowComponent, MockComponent(TutorialGroupUtilizationIndicatorComponent), @@ -24,6 +24,7 @@ describe('TutorialGroupRowComponent', () => { MockPipe(ArtemisTranslatePipe), MockPipe(MeetingPatternPipe), ], + providers: [], }).compileComponents(); fixture = TestBed.createComponent(TutorialGroupRowComponent); diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-management-resolve.service.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-management-resolve.service.spec.ts index 8fdf395b38ce..0105de66beb2 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-management-resolve.service.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-management-resolve.service.spec.ts @@ -1,12 +1,11 @@ import { TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { of } from 'rxjs'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { Course } from 'app/entities/course.model'; -import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; +import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, provideRouter } from '@angular/router'; import { TutorialGroupManagementResolve } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-group-management-resolve.service'; import { MockProvider } from 'ng-mocks'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; @@ -20,8 +19,11 @@ describe('TutorialGroupManagementResolve', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule, HttpClientTestingModule], + imports: [], providers: [ + provideRouter([]), + provideHttpClient(), + provideHttpClientTesting(), TutorialGroupManagementResolve, { provide: Router, useClass: MockRouter }, { diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group.component.spec.ts index 57b555cfb9bf..aaec48efefa3 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group.component.spec.ts @@ -55,6 +55,8 @@ describe('CreateTutorialGroupComponent', () => { delete exampleTutorialGroup.numberOfRegisteredUsers; delete exampleTutorialGroup.courseTitle; delete exampleTutorialGroup.teachingAssistantName; + delete exampleTutorialGroup.teachingAssistantId; + delete exampleTutorialGroup.teachingAssistantImageUrl; delete exampleTutorialGroup.tutorialGroupSchedule!.id; const createResponse: HttpResponse = new HttpResponse({ diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group.component.spec.ts index 7446c5fbb049..979a8c999a5a 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group.component.spec.ts @@ -90,6 +90,8 @@ describe('EditTutorialGroupComponent', () => { delete exampleTutorialGroup.numberOfRegisteredUsers; delete exampleTutorialGroup.courseTitle; delete exampleTutorialGroup.teachingAssistantName; + delete exampleTutorialGroup.teachingAssistantId; + delete exampleTutorialGroup.teachingAssistantImageUrl; const changedTutorialGroup = { ...exampleTutorialGroup, diff --git a/src/test/javascript/spec/component/utils/result.utils.spec.ts b/src/test/javascript/spec/component/utils/result.utils.spec.ts index 4796766de234..24303c3e59af 100644 --- a/src/test/javascript/spec/component/utils/result.utils.spec.ts +++ b/src/test/javascript/spec/component/utils/result.utils.spec.ts @@ -15,6 +15,7 @@ import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/fre import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'; import { ExerciseType } from 'app/entities/exercise.model'; import { Result } from 'app/entities/result.model'; +import dayjs from 'dayjs/esm'; describe('ResultUtils', () => { it('should filter out all non unreferenced feedbacks', () => { @@ -69,7 +70,7 @@ describe('ResultUtils', () => { { result: { score: 0, successful: undefined, assessmentType: AssessmentType.AUTOMATIC_ATHENA }, templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK, - expected: 'text-primary', + expected: 'text-secondary', }, { result: { score: 0, successful: true, assessmentType: AssessmentType.AUTOMATIC_ATHENA }, @@ -128,7 +129,12 @@ describe('ResultUtils', () => { expected: faTimesCircle, }, { - result: { feedbacks: [{ type: FeedbackType.AUTOMATIC, text: 'AI result being generated test case' }], assessmentType: AssessmentType.AUTOMATIC_ATHENA }, + result: { + feedbacks: [{ type: FeedbackType.AUTOMATIC, text: 'AI result being generated test case' }], + assessmentType: AssessmentType.AUTOMATIC_ATHENA, + successful: undefined, + completionDate: dayjs().add(5, 'minutes'), + }, templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK, expected: faCircleNotch, }, @@ -138,9 +144,10 @@ describe('ResultUtils', () => { participation: { type: ParticipationType.STUDENT, exercise: { type: ExerciseType.TEXT } }, successful: true, assessmentType: AssessmentType.AUTOMATIC_ATHENA, + completionDate: dayjs().subtract(5, 'minutes'), } as Result, templateStatus: ResultTemplateStatus.HAS_RESULT, - expected: faQuestionCircle, + expected: faCheckCircle, }, { result: { @@ -148,9 +155,10 @@ describe('ResultUtils', () => { participation: { type: ParticipationType.STUDENT, exercise: { type: ExerciseType.TEXT } }, successful: false, assessmentType: AssessmentType.AUTOMATIC_ATHENA, + completionDate: dayjs().subtract(5, 'minutes'), } as Result, templateStatus: ResultTemplateStatus.HAS_RESULT, - expected: faQuestionCircle, + expected: faTimesCircle, }, ])('should correctly determine result icon', ({ result, templateStatus, expected }) => { expect(getResultIconClass(result, templateStatus!)).toBe(expected); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-alert.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-alert.service.ts index 930af8f3b468..bf8bddef3463 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-alert.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-alert.service.ts @@ -3,4 +3,5 @@ import { Alert } from 'app/core/util/alert.service'; export class MockAlertService { success = (message: string) => ({}) as Alert; error = (message: string) => ({}) as Alert; + addAlert = (alert: Alert) => {}; } diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts index d8f9e0bb8126..d55cc49a6983 100644 --- a/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts +++ b/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync, flush, tick } from '@angular/core/testing'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import dayjs from 'dayjs/esm'; -import { ChangeDetectorRef, DebugElement } from '@angular/core'; +import { DebugElement } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgModel } from '@angular/forms'; import { NgbDropdown, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; @@ -73,8 +73,9 @@ import { TreeviewItemComponent } from 'app/exercises/programming/shared/code-edi import { CodeEditorHeaderComponent } from 'app/exercises/programming/shared/code-editor/header/code-editor-header.component'; import { AlertService } from 'app/core/util/alert.service'; import { MockResizeObserver } from '../../helpers/mocks/service/mock-resize-observer'; -import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { CodeEditorMonacoComponent } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component'; +import { RequestFeedbackButtonComponent } from 'app/overview/exercise-details/request-feedback-button/request-feedback-button.component'; +import { MonacoEditorComponent } from '../../../../../main/webapp/app/shared/monaco-editor/monaco-editor.component'; describe('CodeEditorContainerIntegration', () => { let container: CodeEditorContainerComponent; @@ -100,7 +101,7 @@ describe('CodeEditorContainerIntegration', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MonacoEditorModule, MockDirective(NgbDropdown), MockModule(NgbTooltipModule)], + imports: [ArtemisTestModule, MonacoEditorComponent, MockDirective(NgbDropdown), MockModule(NgbTooltipModule)], declarations: [ CodeEditorContainerComponent, MockComponent(CodeEditorGridComponent), @@ -123,9 +124,9 @@ describe('CodeEditorContainerIntegration', () => { TreeviewItemComponent, MockPipe(ArtemisDatePipe), MockComponent(CodeEditorTutorAssessmentInlineFeedbackComponent), + MockComponent(RequestFeedbackButtonComponent), ], providers: [ - ChangeDetectorRef, CodeEditorConflictStateService, MockProvider(AlertService), { provide: ActivatedRoute, useClass: MockActivatedRouteWithSubjects }, diff --git a/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts b/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts index 57b934b9497c..3ebe67f4a26e 100644 --- a/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts +++ b/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts @@ -9,7 +9,6 @@ import { GuidedTourComponent } from 'app/guided-tour/guided-tour.component'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; import { AccountService } from 'app/core/auth/account.service'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; -import { RouterTestingModule } from '@angular/router/testing'; import { courseOverviewTour } from 'app/guided-tour/tours/course-overview-tour'; import { CoursesComponent } from 'app/overview/courses.component'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; @@ -43,6 +42,7 @@ import { JhiConnectionWarningComponent } from 'app/shared/connection-warning/con import { NgbCollapse, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; +import { RouterModule } from '@angular/router'; describe('Guided tour integration', () => { const user = { id: 1 } as User; @@ -61,7 +61,7 @@ describe('Guided tour integration', () => { TestBed.configureTestingModule({ imports: [ ArtemisTestModule, - RouterTestingModule.withRoutes([ + RouterModule.forRoot([ { path: 'courses', component: MockComponent(CoursesComponent), diff --git a/src/test/javascript/spec/service/admin-user.service.spec.ts b/src/test/javascript/spec/service/admin-user.service.spec.ts index 0704851a32d5..88d0c2aad627 100644 --- a/src/test/javascript/spec/service/admin-user.service.spec.ts +++ b/src/test/javascript/spec/service/admin-user.service.spec.ts @@ -1,7 +1,8 @@ import { TestBed } from '@angular/core/testing'; import { User } from 'app/core/user/user.model'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { AdminUserService } from 'app/core/user/admin-user.service'; +import { provideHttpClient } from '@angular/common/http'; describe('User Service', () => { let adminService: AdminUserService; @@ -9,7 +10,8 @@ describe('User Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); adminService = TestBed.inject(AdminUserService); diff --git a/src/test/javascript/spec/service/apollon-diagram.service.spec.ts b/src/test/javascript/spec/service/apollon-diagram.service.spec.ts index b539a8cfdb3f..a4a46d41b9fc 100644 --- a/src/test/javascript/spec/service/apollon-diagram.service.spec.ts +++ b/src/test/javascript/spec/service/apollon-diagram.service.spec.ts @@ -1,8 +1,8 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ApollonDiagramService } from 'app/exercises/quiz/manage/apollon-diagrams/apollon-diagram.service'; import { ApollonDiagram } from 'app/entities/apollon-diagram.model'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { UMLDiagramType } from '@ls1intum/apollon'; const resourceUrl = 'api'; @@ -14,8 +14,8 @@ describe('ApollonDiagramService', () => { let httpTestingController: HttpTestingController; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [ApollonDiagramService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), ApollonDiagramService], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/service/athena.service.spec.ts b/src/test/javascript/spec/service/athena.service.spec.ts index 099b679ee249..27350c4c20b5 100644 --- a/src/test/javascript/spec/service/athena.service.spec.ts +++ b/src/test/javascript/spec/service/athena.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { AthenaService } from 'app/assessment/athena.service'; import { ArtemisTestModule } from '../test.module'; @@ -12,6 +12,7 @@ import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; +import { provideHttpClient } from '@angular/common/http'; describe('AthenaService', () => { let athenaService: AthenaService; @@ -51,8 +52,8 @@ describe('AthenaService', () => { } as Exercise; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], - providers: [{ provide: ProfileService, useClass: MockProfileService }], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: ProfileService, useClass: MockProfileService }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/service/attachment.service.spec.ts b/src/test/javascript/spec/service/attachment.service.spec.ts index 77356f0aa445..96cf5e563860 100644 --- a/src/test/javascript/spec/service/attachment.service.spec.ts +++ b/src/test/javascript/spec/service/attachment.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { HttpResponse } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { take } from 'rxjs/operators'; import { ArtemisTestModule } from '../test.module'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; @@ -21,8 +21,10 @@ describe('Attachment Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/service/audits.service.spec.ts b/src/test/javascript/spec/service/audits.service.spec.ts index 0e42d66b6944..1f161bda6389 100644 --- a/src/test/javascript/spec/service/audits.service.spec.ts +++ b/src/test/javascript/spec/service/audits.service.spec.ts @@ -2,7 +2,8 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { AuditsService } from 'app/admin/audits/audits.service'; import { Audit } from 'app/admin/audits/audit.model'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; describe('Audits Service', () => { let service: AuditsService; @@ -10,7 +11,8 @@ describe('Audits Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(AuditsService); diff --git a/src/test/javascript/spec/service/auth-jwt.service.spec.ts b/src/test/javascript/spec/service/auth-jwt.service.spec.ts index 1a24e7eabbdf..d1d2cf688adc 100644 --- a/src/test/javascript/spec/service/auth-jwt.service.spec.ts +++ b/src/test/javascript/spec/service/auth-jwt.service.spec.ts @@ -1,9 +1,10 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { AuthServerProvider, Credentials } from 'app/core/auth/auth-jwt.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { MockLocalStorageService } from '../helpers/mocks/service/mock-local-storage.service'; +import { provideHttpClient } from '@angular/common/http'; describe('AuthServerProvider', () => { let service: AuthServerProvider; @@ -19,8 +20,10 @@ describe('AuthServerProvider', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockLocalStorageService }, { provide: SessionStorageService, useClass: MockSyncStorage }, ], diff --git a/src/test/javascript/spec/service/base-api-http.service.spec.ts b/src/test/javascript/spec/service/base-api-http.service.spec.ts new file mode 100644 index 000000000000..3d4956c9bdcf --- /dev/null +++ b/src/test/javascript/spec/service/base-api-http.service.spec.ts @@ -0,0 +1,52 @@ +import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; + +describe('debounce', () => { + jest.useFakeTimers(); + + it('calls the callback after the specified delay', () => { + const callback = jest.fn(); + const debouncedFunction = BaseApiHttpService.debounce(callback, 1000); + + debouncedFunction(); + expect(callback).not.toHaveBeenCalled(); + + jest.advanceTimersByTime(1000); + expect(callback).toHaveBeenCalledOnce(); + }); + + it('resets the delay if called again within the delay period', () => { + const callback = jest.fn(); + const debouncedFunction = BaseApiHttpService.debounce(callback, 1000); + + debouncedFunction(); + jest.advanceTimersByTime(500); + debouncedFunction(); + jest.advanceTimersByTime(500); + expect(callback).not.toHaveBeenCalled(); + + jest.advanceTimersByTime(500); + expect(callback).toHaveBeenCalledOnce(); + }); + + it('calls the callback with the correct arguments', () => { + const callback = jest.fn(); + const debouncedFunction = BaseApiHttpService.debounce(callback, 1000); + + debouncedFunction('arg1', 'arg2'); + jest.advanceTimersByTime(1000); + expect(callback).toHaveBeenCalledWith('arg1', 'arg2'); + }); + + it('handles multiple calls correctly', () => { + const callback = jest.fn(); + const debouncedFunction = BaseApiHttpService.debounce(callback, 1000); + + debouncedFunction(); + jest.advanceTimersByTime(1000); + expect(callback).toHaveBeenCalledOnce(); + + debouncedFunction(); + jest.advanceTimersByTime(1000); + expect(callback).toHaveBeenCalledTimes(2); + }); +}); diff --git a/src/test/javascript/spec/service/bonus.service.spec.ts b/src/test/javascript/spec/service/bonus.service.spec.ts index 94feb314508a..7c76635a53be 100644 --- a/src/test/javascript/spec/service/bonus.service.spec.ts +++ b/src/test/javascript/spec/service/bonus.service.spec.ts @@ -1,13 +1,14 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { GradeType, GradingScale } from 'app/entities/grading-scale.model'; import { take } from 'rxjs/operators'; -import { RouterTestingModule } from '@angular/router/testing'; import { GradeStep, GradeStepsDTO } from 'app/entities/grade-step.model'; import { BonusService } from 'app/grading-system/bonus/bonus.service'; import { Bonus, BonusExample, BonusStrategy } from 'app/entities/bonus.model'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; import { cloneDeep } from 'lodash-es'; +import { provideHttpClient } from '@angular/common/http'; +import { provideRouter } from '@angular/router'; describe('Bonus Service', () => { type GradeStepBuilder = { @@ -90,7 +91,8 @@ describe('Bonus Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, RouterTestingModule], + imports: [], + providers: [provideRouter([]), provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(BonusService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/build-log.service.spec.ts b/src/test/javascript/spec/service/build-log.service.spec.ts index 0582e9ff369b..b082ed4c9ae0 100644 --- a/src/test/javascript/spec/service/build-log.service.spec.ts +++ b/src/test/javascript/spec/service/build-log.service.spec.ts @@ -1,7 +1,8 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service'; import { BuildLogEntry, BuildLogType } from 'app/entities/programming/build-log.model'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; describe('Build Log Service', () => { let service: BuildLogService; @@ -11,7 +12,8 @@ describe('Build Log Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(BuildLogService); diff --git a/src/test/javascript/spec/service/configuration.service.spec.ts b/src/test/javascript/spec/service/configuration.service.spec.ts index 48e8b1070083..6114ef3b7b65 100644 --- a/src/test/javascript/spec/service/configuration.service.spec.ts +++ b/src/test/javascript/spec/service/configuration.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { ConfigurationService } from 'app/admin/configuration/configuration.service'; import { Bean, ConfigProps, Env, PropertySource } from 'app/admin/configuration/configuration.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Service Tests', () => { describe('Logs Service', () => { @@ -12,7 +13,8 @@ describe('Service Tests', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); expectedResult = null; diff --git a/src/test/javascript/spec/service/course-competency/course-competency-api.service.spec.ts b/src/test/javascript/spec/service/course-competency/course-competency-api.service.spec.ts new file mode 100644 index 000000000000..e641f31f9ae7 --- /dev/null +++ b/src/test/javascript/spec/service/course-competency/course-competency-api.service.spec.ts @@ -0,0 +1,95 @@ +import { provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { CourseCompetencyApiService } from 'app/course/competencies/services/course-competency-api.service'; +import { CompetencyRelation, CourseCompetencyImportOptionsDTO } from 'app/entities/competency.model'; + +describe('CourseCompetencyApiService', () => { + let httpClient: HttpTestingController; + let courseCompetencyApiService: CourseCompetencyApiService; + + const baseUrl = 'api'; + + const courseId = 1; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [provideHttpClient(), provideHttpClientTesting()], + }); + + courseCompetencyApiService = TestBed.inject(CourseCompetencyApiService); + httpClient = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpClient.verify(); + }); + + it('should import all by course id', async () => { + const courseCompetencyImportOptions = { + sourceCourseId: courseId, + importRelations: true, + importExercises: true, + importLectures: true, + }; + + const methodCall = courseCompetencyApiService.importAllByCourseId(courseId, courseCompetencyImportOptions); + const response = httpClient.expectOne({ + method: 'POST', + url: `${getBasePath(courseId)}/import-all`, + }); + response.flush({}); + await methodCall; + }); + + it('should create course competency relation', async () => { + const relation = { + tailCompetencyId: 1, + headCompetencyId: 2, + }; + + const methodCall = courseCompetencyApiService.createCourseCompetencyRelation(courseId, relation); + const response = httpClient.expectOne({ + method: 'POST', + url: `${getBasePath(courseId)}/relations`, + }); + response.flush({}); + await methodCall; + }); + + it('should delete course competency relation', async () => { + const relationId = 1; + + const methodCall = courseCompetencyApiService.deleteCourseCompetencyRelation(courseId, relationId); + const response = httpClient.expectOne({ + method: 'DELETE', + url: `${getBasePath(courseId)}/relations/${relationId}`, + }); + response.flush({}); + await methodCall; + }); + + it('should get course competency relations', async () => { + const methodCall = courseCompetencyApiService.getCourseCompetencyRelations(courseId); + const response = httpClient.expectOne({ + method: 'GET', + url: `${getBasePath(courseId)}/relations`, + }); + response.flush([]); + await methodCall; + }); + + it('should get course competencies by course id', async () => { + const methodCall = courseCompetencyApiService.getCourseCompetenciesByCourseId(courseId); + const response = httpClient.expectOne({ + method: 'GET', + url: `${getBasePath(courseId)}`, + }); + response.flush([]); + await methodCall; + }); + + function getBasePath(courseId: number): string { + return `${baseUrl}/courses/${courseId}/course-competencies`; + } +}); diff --git a/src/test/javascript/spec/service/course-exercise.service.spec.ts b/src/test/javascript/spec/service/course-exercise.service.spec.ts index d123760c6d25..55f133c866a8 100644 --- a/src/test/javascript/spec/service/course-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/course-exercise.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -20,6 +20,7 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { of } from 'rxjs'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { provideHttpClient } from '@angular/common/http'; describe('Course Management Service', () => { let service: CourseExerciseService; @@ -45,8 +46,10 @@ describe('Course Management Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/data-export.service.spec.ts b/src/test/javascript/spec/service/data-export.service.spec.ts index 940754dea6ec..6fb7967cf76d 100644 --- a/src/test/javascript/spec/service/data-export.service.spec.ts +++ b/src/test/javascript/spec/service/data-export.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { DataExportService } from 'app/core/legal/data-export/data-export.service'; import { DataExport } from 'app/entities/data-export.model'; @@ -6,6 +6,7 @@ import { User } from 'app/core/user/user.model'; import dayjs from 'dayjs/esm'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; +import { provideHttpClient } from '@angular/common/http'; describe('DataExportService', () => { let service: DataExportService; @@ -13,8 +14,8 @@ describe('DataExportService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: TranslateService, useClass: MockTranslateService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }], }); service = TestBed.inject(DataExportService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/exam-import-paging.service.spec.ts b/src/test/javascript/spec/service/exam-import-paging.service.spec.ts index 091acf0bc0c0..1f51356b8a1e 100644 --- a/src/test/javascript/spec/service/exam-import-paging.service.spec.ts +++ b/src/test/javascript/spec/service/exam-import-paging.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; import { SortingOrder } from 'app/shared/table/pageable-table'; @@ -8,6 +8,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; import { Exam } from 'app/entities/exam/exam.model'; import { ExamImportPagingService } from 'app/exam/manage/exams/exam-import/exam-import-paging.service'; +import { provideHttpClient } from '@angular/common/http'; describe('Exam Import Paging Service', () => { let service: ExamImportPagingService; @@ -22,8 +23,10 @@ describe('Exam Import Paging Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/exam-participation-live-events.service.spec.ts b/src/test/javascript/spec/service/exam-participation-live-events.service.spec.ts index 7950c0c96bdb..07b49299c4ec 100644 --- a/src/test/javascript/spec/service/exam-participation-live-events.service.spec.ts +++ b/src/test/javascript/spec/service/exam-participation-live-events.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { Subject, firstValueFrom } from 'rxjs'; import { ConnectionState, JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; @@ -7,6 +7,7 @@ import { ExamLiveEvent, ExamLiveEventType, ExamParticipationLiveEventsService } import { LocalStorageService } from 'ngx-webstorage'; import dayjs from 'dayjs/esm'; import { MockWebsocketService } from '../helpers/mocks/service/mock-websocket.service'; +import { provideHttpClient } from '@angular/common/http'; describe('ExamParticipationLiveEventsService', () => { let service: ExamParticipationLiveEventsService; @@ -34,8 +35,10 @@ describe('ExamParticipationLiveEventsService', () => { mockWebsocketService = tmpMockWebsocketService as unknown as JhiWebsocketService; TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: JhiWebsocketService, useValue: mockWebsocketService }, { provide: ExamParticipationService, useValue: mockExamParticipationService }, { provide: LocalStorageService, useValue: mockLocalStorageService }, diff --git a/src/test/javascript/spec/service/exam-participation.service.spec.ts b/src/test/javascript/spec/service/exam-participation.service.spec.ts index 56d0aa53bef8..26e52989bb33 100644 --- a/src/test/javascript/spec/service/exam-participation.service.spec.ts +++ b/src/test/javascript/spec/service/exam-participation.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import dayjs from 'dayjs/esm'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; @@ -19,6 +19,7 @@ import { Result } from 'app/entities/result.model'; import { getLatestSubmissionResult } from 'app/entities/submission.model'; import { StudentExamWithGradeDTO, StudentResult } from 'app/exam/exam-scores/exam-score-dtos.model'; import { GradeType } from 'app/entities/grading-scale.model'; +import { provideHttpClient } from '@angular/common/http'; describe('ExamParticipationService', () => { let service: ExamParticipationService; @@ -30,8 +31,10 @@ describe('ExamParticipationService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, ArtemisTestModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts b/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts index d1eee71bc343..a0366227a455 100644 --- a/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts +++ b/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; import { SortingOrder } from 'app/shared/table/pageable-table'; @@ -9,6 +9,7 @@ import { MockTranslateService } from '../helpers/mocks/service/mock-translate.se import { ExampleSubmissionImportPagingService } from 'app/exercises/shared/example-submission/example-submission-import/example-submission-import-paging.service'; import { Exercise } from 'app/entities/exercise.model'; import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Example Submission Import Paging Service', () => { let service: ExampleSubmissionImportPagingService; @@ -16,8 +17,10 @@ describe('Example Submission Import Paging Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/example-submission.service.spec.ts b/src/test/javascript/spec/service/example-submission.service.spec.ts index 60addda81875..afc3aeb922b3 100644 --- a/src/test/javascript/spec/service/example-submission.service.spec.ts +++ b/src/test/javascript/spec/service/example-submission.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { HttpResponse } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { take } from 'rxjs/operators'; import { ArtemisTestModule } from '../test.module'; import { ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service'; @@ -24,8 +24,8 @@ describe('Example Submission Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], - providers: [{ provide: ExerciseService, useClass: MockExerciseService }, MockProvider(StringCountService)], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: ExerciseService, useClass: MockExerciseService }, MockProvider(StringCountService)], }); service = TestBed.inject(ExampleSubmissionService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/exercise-hint.service.spec.ts b/src/test/javascript/spec/service/exercise-hint.service.spec.ts index 74a6c5e84bb9..b988b61db162 100644 --- a/src/test/javascript/spec/service/exercise-hint.service.spec.ts +++ b/src/test/javascript/spec/service/exercise-hint.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { HttpResponse } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { take } from 'rxjs/operators'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; @@ -17,8 +17,8 @@ describe('ExerciseHint Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: ExerciseService, useClass: MockExerciseService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: ExerciseService, useClass: MockExerciseService }], }); expectedResult = {} as HttpResponse; service = TestBed.inject(ExerciseHintService); diff --git a/src/test/javascript/spec/service/exercise-scores-chart.service.spec.ts b/src/test/javascript/spec/service/exercise-scores-chart.service.spec.ts index 7feea1837e42..3726acd33010 100644 --- a/src/test/javascript/spec/service/exercise-scores-chart.service.spec.ts +++ b/src/test/javascript/spec/service/exercise-scores-chart.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { ArtemisTestModule } from '../test.module'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; @@ -7,6 +7,7 @@ import { SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; import { ExerciseScoresChartService, ExerciseScoresDTO } from 'app/overview/visualizations/exercise-scores-chart.service'; +import { provideHttpClient } from '@angular/common/http'; describe('Exercise Scores Chart Service', () => { let service: ExerciseScoresChartService; @@ -15,8 +16,10 @@ describe('Exercise Scores Chart Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, ], diff --git a/src/test/javascript/spec/service/exercise.service.spec.ts b/src/test/javascript/spec/service/exercise.service.spec.ts index 3213088306c1..82aa1b9369f6 100644 --- a/src/test/javascript/spec/service/exercise.service.spec.ts +++ b/src/test/javascript/spec/service/exercise.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -24,6 +24,7 @@ import { Observable } from 'rxjs'; import { AccountService } from 'app/core/auth/account.service'; import { EntityTitleService } from 'app/shared/layouts/navbar/entity-title.service'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { provideHttpClient } from '@angular/common/http'; describe('Exercise Service', () => { let service: ExerciseService; @@ -64,8 +65,10 @@ describe('Exercise Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/external-submission.service.spec.ts b/src/test/javascript/spec/service/external-submission.service.spec.ts index b7b7c6701e8b..816d4ec35314 100644 --- a/src/test/javascript/spec/service/external-submission.service.spec.ts +++ b/src/test/javascript/spec/service/external-submission.service.spec.ts @@ -1,6 +1,6 @@ import { ArtemisTestModule } from '../test.module'; import { ExternalSubmissionService } from 'app/exercises/shared/external-submission/external-submission.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { ExerciseType } from 'app/entities/exercise.model'; import { Result } from 'app/entities/result.model'; @@ -8,6 +8,7 @@ import { User } from 'app/core/user/user.model'; import { EntityResponseType, ResultService } from 'app/exercises/shared/result/result.service'; import dayjs from 'dayjs/esm'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { provideHttpClient } from '@angular/common/http'; describe('External Submission Service', () => { let httpMock: HttpTestingController; @@ -15,7 +16,8 @@ describe('External Submission Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(ExternalSubmissionService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/faq.service.spec.ts b/src/test/javascript/spec/service/faq.service.spec.ts new file mode 100644 index 000000000000..272a7352a091 --- /dev/null +++ b/src/test/javascript/spec/service/faq.service.spec.ts @@ -0,0 +1,220 @@ +import { TestBed } from '@angular/core/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { take } from 'rxjs/operators'; +import { ArtemisTestModule } from '../test.module'; +import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; +import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; +import { TranslateService } from '@ngx-translate/core'; +import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; +import { Course } from 'app/entities/course.model'; +import { Faq, FaqState } from 'app/entities/faq.model'; +import { FaqCategory } from 'app/entities/faq-category.model'; +import { FaqService } from 'app/faq/faq.service'; + +describe('Faq Service', () => { + let httpMock: HttpTestingController; + let service: FaqService; + let expectedResult: any; + let elemDefault: Faq; + let courseId: number; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ArtemisTestModule], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + { provide: LocalStorageService, useClass: MockSyncStorage }, + { provide: SessionStorageService, useClass: MockSyncStorage }, + { provide: TranslateService, useClass: MockTranslateService }, + ], + }); + service = TestBed.inject(FaqService); + httpMock = TestBed.inject(HttpTestingController); + + expectedResult = {} as HttpResponse; + elemDefault = new Faq(); + elemDefault.questionTitle = 'Title'; + elemDefault.course = new Course(); + elemDefault.questionAnswer = 'Answer'; + elemDefault.id = 1; + elemDefault.faqState = FaqState.ACCEPTED; + courseId = 1; + }); + + afterEach(() => { + httpMock.verify(); + }); + + describe('Service methods', () => { + it('should create a faq', () => { + const returnedFromService = { ...elemDefault }; + const expected = { ...returnedFromService }; + service + .create(courseId, elemDefault) + .pipe(take(1)) + .subscribe((resp) => (expectedResult = resp)); + const req = httpMock.expectOne({ + url: `api/courses/${courseId}/faqs`, + method: 'POST', + }); + req.flush(returnedFromService); + expect(expectedResult.body).toEqual(expected); + }); + + it('should update a faq', () => { + const returnedFromService = { ...elemDefault }; + const expected = { ...returnedFromService }; + const faqId = elemDefault.id!; + service + .update(courseId, elemDefault) + .pipe(take(1)) + .subscribe((resp) => (expectedResult = resp)); + const req = httpMock.expectOne({ + url: `api/courses/${courseId}/faqs/${faqId}`, + method: 'PUT', + }); + req.flush(returnedFromService); + expect(expectedResult.body).toEqual(expected); + }); + + it('should delete a faq', () => { + const returnedFromService = { ...elemDefault }; + const faqId = elemDefault.id!; + service + .delete(courseId, faqId) + .pipe(take(1)) + .subscribe((resp) => (expectedResult = resp)); + const req = httpMock.expectOne({ + url: `api/courses/${courseId}/faqs/${faqId}`, + method: 'DELETE', + }); + req.flush(returnedFromService); + expect(req.request.method).toBe('DELETE'); + }); + + it('should find a faq', () => { + const category = { + color: '#6ae8ac', + category: 'category1', + } as FaqCategory; + const returnedFromService = { ...elemDefault, categories: [JSON.stringify(category)] }; + const expected = { ...elemDefault, categories: [new FaqCategory('category1', '#6ae8ac')] }; + const faqId = elemDefault.id!; + service + .find(courseId, faqId) + .pipe(take(1)) + .subscribe((resp) => (expectedResult = resp)); + const req = httpMock.expectOne({ + url: `api/courses/${courseId}/faqs/${faqId}`, + method: 'GET', + }); + req.flush(returnedFromService); + expect(expectedResult.body).toEqual(expected); + }); + + it('should find faqs by courseId', () => { + const category = { + color: '#6ae8ac', + category: 'category1', + } as FaqCategory; + const returnedFromService = [{ ...elemDefault, categories: [JSON.stringify(category)] }]; + const expected = [{ ...elemDefault, categories: [new FaqCategory('category1', '#6ae8ac')] }]; + const courseId = 1; + service + .findAllByCourseId(courseId) + .pipe(take(1)) + .subscribe((resp) => (expectedResult = resp)); + const req = httpMock.expectOne({ + url: `api/courses/${courseId}/faqs`, + method: 'GET', + }); + req.flush(returnedFromService); + expect(expectedResult.body).toEqual(expected); + }); + + it('should find all categories by courseId', () => { + const category = { + color: '#6ae8ac', + category: 'category1', + } as FaqCategory; + const returnedFromService = { categories: [JSON.stringify(category)] }; + const expected = { ...returnedFromService }; + const courseId = 1; + service + .findAllCategoriesByCourseId(courseId) + .pipe(take(1)) + .subscribe((resp) => (expectedResult = resp)); + const req = httpMock.expectOne({ + url: `api/courses/${courseId}/faq-categories`, + method: 'GET', + }); + req.flush(returnedFromService); + expect(expectedResult.body).toEqual(expected); + }); + + it('should set add active filter correctly', () => { + let activeFilters = new Set(); + activeFilters = service.toggleFilter('category1', activeFilters); + + expect(activeFilters).toContain('category1'); + expect(activeFilters.size).toBe(1); + }); + + it('should remove active filter correctly', () => { + let activeFilters = new Set(); + activeFilters.add('category1'); + activeFilters = service.toggleFilter('category1', activeFilters); + + expect(activeFilters).not.toContain('category1'); + expect(activeFilters.size).toBe(0); + }); + + it('should apply faqFilter correctly', () => { + const activeFilters = new Set(); + + const faq1 = new Faq(); + faq1.categories = [new FaqCategory('test', 'red'), new FaqCategory('test2', 'blue')]; + + const faq11 = new Faq(); + faq11.categories = [new FaqCategory('test', 'red'), new FaqCategory('test2', 'blue')]; + + const faq2 = new Faq(); + faq2.categories = [new FaqCategory('testing', 'red'), new FaqCategory('test2', 'blue')]; + + let filteredFaq = [faq1, faq11, faq2]; + + filteredFaq = service.applyFilters(activeFilters, filteredFaq); + expect(filteredFaq).toBeArrayOfSize(3); + expect(filteredFaq).toContainAllValues([faq1, faq11, faq2]); + + activeFilters.add('test'); + filteredFaq = service.applyFilters(activeFilters, filteredFaq); + expect(filteredFaq).toBeArrayOfSize(2); + expect(filteredFaq).toContainAllValues([faq1, faq11]); + }); + + it('should convert String into FAQ categories correctly', async () => { + const convertedCategory = service.convertFaqCategoriesAsStringFromServer(['{"category":"category1", "color":"red"}']); + expect(convertedCategory[0].category).toBe('category1'); + expect(convertedCategory[0].color).toBe('red'); + }); + + it('should convert FAQ categories into strings', () => { + const faq2 = new Faq(); + faq2.categories = [new FaqCategory('testing', 'red')]; + const convertedCategory = FaqService.stringifyFaqCategories(faq2); + expect(convertedCategory).toEqual(['{"color":"red","category":"testing"}']); + }); + + it('should return if all tokens exist in FAQ title or answer', () => { + const faq1 = new Faq(); + faq1.questionTitle = 'Title'; + faq1.questionAnswer = 'Answer'; + + expect(service.hasSearchTokens(faq1, 'title answer')).toBeTrue(); + expect(service.hasSearchTokens(faq1, 'title answer missing')).toBeFalse(); + }); + }); +}); diff --git a/src/test/javascript/spec/service/file-type.service.spec.ts b/src/test/javascript/spec/service/file-type.service.spec.ts index 25d4439f9108..11da975b431c 100644 --- a/src/test/javascript/spec/service/file-type.service.spec.ts +++ b/src/test/javascript/spec/service/file-type.service.spec.ts @@ -1,13 +1,15 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { FileTypeService } from 'app/exercises/programming/shared/service/file-type.service'; +import { provideHttpClient } from '@angular/common/http'; describe('FileTypeService', () => { let service: FileTypeService; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(FileTypeService); diff --git a/src/test/javascript/spec/service/file-upload-assessment.service.spec.ts b/src/test/javascript/spec/service/file-upload-assessment.service.spec.ts index db8c081cba25..5e689ee0992c 100644 --- a/src/test/javascript/spec/service/file-upload-assessment.service.spec.ts +++ b/src/test/javascript/spec/service/file-upload-assessment.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import dayjs from 'dayjs/esm'; import { Result } from 'app/entities/result.model'; @@ -7,7 +7,7 @@ import { Feedback } from 'app/entities/feedback.model'; import { FileUploadAssessmentService } from 'app/exercises/file-upload/assess/file-upload-assessment.service'; import { ArtemisTestModule } from '../test.module'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; describe('Modeling Assessment Service', () => { let httpMock: HttpTestingController; @@ -18,7 +18,8 @@ describe('Modeling Assessment Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(FileUploadAssessmentService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/file-upload-exercise.service.spec.ts b/src/test/javascript/spec/service/file-upload-exercise.service.spec.ts index 00627640a1d1..795d3e1b6f57 100644 --- a/src/test/javascript/spec/service/file-upload-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/file-upload-exercise.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { map, take } from 'rxjs/operators'; import { FileUploadExerciseService } from 'app/exercises/file-upload/manage/file-upload-exercise.service'; @@ -12,6 +12,7 @@ import { TranslateService } from '@ngx-translate/core'; import { Course } from 'app/entities/course.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { MockExerciseService } from '../helpers/mocks/service/mock-exercise.service'; +import { provideHttpClient } from '@angular/common/http'; describe('FileUploadExercise Service', () => { let service: FileUploadExerciseService; @@ -25,8 +26,10 @@ describe('FileUploadExercise Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/service/file-upload-submission.service.spec.ts b/src/test/javascript/spec/service/file-upload-submission.service.spec.ts index 0d70069df20c..75c0075eba60 100644 --- a/src/test/javascript/spec/service/file-upload-submission.service.spec.ts +++ b/src/test/javascript/spec/service/file-upload-submission.service.spec.ts @@ -1,10 +1,11 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { map, take } from 'rxjs/operators'; import { FileUploadSubmissionService } from 'app/exercises/file-upload/participate/file-upload-submission.service'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; +import { provideHttpClient } from '@angular/common/http'; describe('FileUploadSubmission Service', () => { let service: FileUploadSubmissionService; @@ -13,8 +14,8 @@ describe('FileUploadSubmission Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }); service = TestBed.inject(FileUploadSubmissionService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/grading-system.service.spec.ts b/src/test/javascript/spec/service/grading-system.service.spec.ts index 027e7ddc0da5..4ab33d2cff99 100644 --- a/src/test/javascript/spec/service/grading-system.service.spec.ts +++ b/src/test/javascript/spec/service/grading-system.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; import { GradeType, GradingScale } from 'app/entities/grading-scale.model'; import { take } from 'rxjs/operators'; -import { RouterTestingModule } from '@angular/router/testing'; import { GradeDTO, GradeStep, GradeStepsDTO } from 'app/entities/grade-step.model'; import { of } from 'rxjs'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { cloneDeep } from 'lodash-es'; +import { provideRouter } from '@angular/router'; describe('Grading System Service', () => { let service: GradingSystemService; @@ -42,7 +42,8 @@ describe('Grading System Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, RouterTestingModule], + imports: [], + providers: [provideRouter([]), provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(GradingSystemService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/learning-path/learning-path-api.service.spec.ts b/src/test/javascript/spec/service/learning-path/learning-path-api.service.spec.ts index 57d2487cefdb..d7f34259716e 100644 --- a/src/test/javascript/spec/service/learning-path/learning-path-api.service.spec.ts +++ b/src/test/javascript/spec/service/learning-path/learning-path-api.service.spec.ts @@ -26,11 +26,11 @@ describe('LearningPathApiService', () => { httpClient.verify(); }); - it('should get learning path id', async () => { + it('should get learning path for current user', async () => { const courseId = 1; - const methodCall = learningPathApiService.getLearningPathId(courseId); - const response = httpClient.expectOne({ method: 'GET', url: `${baseUrl}/courses/${courseId}/learning-path-id` }); + const methodCall = learningPathApiService.getLearningPathForCurrentUser(courseId); + const response = httpClient.expectOne({ method: 'GET', url: `${baseUrl}/courses/${courseId}/learning-path/me` }); response.flush({}); await methodCall; }); @@ -55,6 +55,13 @@ describe('LearningPathApiService', () => { await methodCall; }); + it('should start learning path for current user', async () => { + const methodCall = learningPathApiService.startLearningPathForCurrentUser(learningPathId); + const response = httpClient.expectOne({ method: 'PATCH', url: `${baseUrl}/learning-path/${learningPathId}/start` }); + response.flush({}); + await methodCall; + }); + it('should get learning path navigation overview', async () => { const methodCall = learningPathApiService.getLearningPathNavigationOverview(learningPathId); const response = httpClient.expectOne({ method: 'GET', url: `${baseUrl}/learning-path/${learningPathId}/navigation-overview` }); @@ -62,8 +69,8 @@ describe('LearningPathApiService', () => { await methodCall; }); - it('should generate learning path', async () => { - const methodCall = learningPathApiService.generateLearningPath(courseId); + it('should generate learning path for current user', async () => { + const methodCall = learningPathApiService.generateLearningPathForCurrentUser(courseId); const response = httpClient.expectOne({ method: 'POST', url: `${baseUrl}/courses/${courseId}/learning-path` }); response.flush({}); await methodCall; diff --git a/src/test/javascript/spec/service/learning-path/learning-path-navigation.service.spec.ts b/src/test/javascript/spec/service/learning-path/learning-path-navigation.service.spec.ts index 83f2ba48a7c6..db8373bfa6b2 100644 --- a/src/test/javascript/spec/service/learning-path/learning-path-navigation.service.spec.ts +++ b/src/test/javascript/spec/service/learning-path/learning-path-navigation.service.spec.ts @@ -120,6 +120,15 @@ describe('LearningPathNavigationService', () => { expect(alertServiceErrorSpy).toHaveBeenCalled(); }); + it('should call alert service on relative learning path loading fail', async () => { + jest.spyOn(learningPathApiService, 'getRelativeLearningPathNavigation').mockRejectedValue(Error('Server error')); + const alertServiceErrorSpy = jest.spyOn(alertService, 'error'); + + await learningPathNavigationService.loadRelativeLearningPathNavigation(learningPathId, learningPathNavigationDto.currentLearningObject!); + + expect(alertServiceErrorSpy).toHaveBeenCalled(); + }); + it('should set current learning object completion to true', () => { learningPathNavigationService.setCurrentLearningObjectCompletion(true); expect(learningPathNavigationService.isCurrentLearningObjectCompleted()).toBeTrue(); diff --git a/src/test/javascript/spec/service/lecture.service.spec.ts b/src/test/javascript/spec/service/lecture.service.spec.ts index ecd4ceea10d0..681d13f11509 100644 --- a/src/test/javascript/spec/service/lecture.service.spec.ts +++ b/src/test/javascript/spec/service/lecture.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { HttpResponse } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { take } from 'rxjs/operators'; import { ArtemisTestModule } from '../test.module'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; @@ -21,8 +21,10 @@ describe('Lecture Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/service/logs.service.spec.ts b/src/test/javascript/spec/service/logs.service.spec.ts index 609d658288c9..541772d705aa 100644 --- a/src/test/javascript/spec/service/logs.service.spec.ts +++ b/src/test/javascript/spec/service/logs.service.spec.ts @@ -1,7 +1,8 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { LogsService } from 'app/admin/logs/logs.service'; import { Log } from 'app/admin/logs/log.model'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; describe('Logs Service', () => { let service: LogsService; @@ -9,7 +10,8 @@ describe('Logs Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(LogsService); diff --git a/src/test/javascript/spec/service/lti-configuration.service.spec.ts b/src/test/javascript/spec/service/lti-configuration.service.spec.ts index 5fafdbdb34da..dd76c709c89a 100644 --- a/src/test/javascript/spec/service/lti-configuration.service.spec.ts +++ b/src/test/javascript/spec/service/lti-configuration.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { LtiPlatformConfiguration } from 'app/admin/lti-configuration/lti-configuration.model'; import { LtiConfigurationService } from 'app/admin/lti-configuration/lti-configuration.service'; import { ITEMS_PER_PAGE } from 'app/shared/constants/pagination.constants'; -import { HttpErrorResponse } from '@angular/common/http'; +import { HttpErrorResponse, provideHttpClient } from '@angular/common/http'; describe('LtiConfigurationService', () => { let service: LtiConfigurationService; @@ -11,8 +11,8 @@ describe('LtiConfigurationService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [LtiConfigurationService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), LtiConfigurationService], }); service = TestBed.inject(LtiConfigurationService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/metis/answer-post.service.spec.ts b/src/test/javascript/spec/service/metis/answer-post.service.spec.ts index a73fb8467319..9da223085265 100644 --- a/src/test/javascript/spec/service/metis/answer-post.service.spec.ts +++ b/src/test/javascript/spec/service/metis/answer-post.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { AnswerPostService } from 'app/shared/metis/answer-post.service'; import { metisAnswerPostToCreateUser1, metisResolvingAnswerPostUser1 } from '../../helpers/sample/metis-sample-data'; +import { provideHttpClient } from '@angular/common/http'; describe('AnswerPost Service', () => { let service: AnswerPostService; @@ -10,7 +11,8 @@ describe('AnswerPost Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(AnswerPostService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/metis/metis.service.spec.ts b/src/test/javascript/spec/service/metis/metis.service.spec.ts index 9608e39ca2a5..7b61efbc958e 100644 --- a/src/test/javascript/spec/service/metis/metis.service.spec.ts +++ b/src/test/javascript/spec/service/metis/metis.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { Post } from 'app/entities/metis/post.model'; import { Course } from 'app/entities/course.model'; import { MockPostService } from '../../helpers/mocks/service/mock-post.service'; @@ -42,7 +42,7 @@ import { import { ITEMS_PER_PAGE } from 'app/shared/constants/pagination.constants'; import { ChannelDTO, ChannelSubType } from 'app/entities/metis/conversation/channel.model'; import { ConversationType } from 'app/entities/metis/conversation/conversation.model'; -import { HttpHeaders, HttpResponse } from '@angular/common/http'; +import { HttpHeaders, HttpResponse, provideHttpClient } from '@angular/common/http'; import { ConversationService } from 'app/shared/metis/conversations/conversation.service'; import { NotificationService } from 'app/shared/notification/notification.service'; import { MockNotificationService } from '../../helpers/mocks/service/mock-notification.service'; @@ -66,8 +66,10 @@ describe('Metis Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), MockProvider(SessionStorageService), MockProvider(ConversationService), { provide: NotificationService, useClass: MockNotificationService }, diff --git a/src/test/javascript/spec/service/metis/post.service.spec.ts b/src/test/javascript/spec/service/metis/post.service.spec.ts index bc06c55fb706..dae7803858b5 100644 --- a/src/test/javascript/spec/service/metis/post.service.spec.ts +++ b/src/test/javascript/spec/service/metis/post.service.spec.ts @@ -1,10 +1,11 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { Post } from 'app/entities/metis/post.model'; import { PostService } from 'app/shared/metis/post.service'; import { DisplayPriority } from 'app/shared/metis/metis.util'; import { metisCourse, metisCoursePosts, metisPostExerciseUser1, metisPostToCreateUser1, metisTags } from '../../helpers/sample/metis-sample-data'; +import { provideHttpClient } from '@angular/common/http'; describe('Post Service', () => { let service: PostService; @@ -12,7 +13,8 @@ describe('Post Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(PostService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/metis/reaction.service.spec.ts b/src/test/javascript/spec/service/metis/reaction.service.spec.ts index 9815b0a382e9..4bc0a252c51d 100644 --- a/src/test/javascript/spec/service/metis/reaction.service.spec.ts +++ b/src/test/javascript/spec/service/metis/reaction.service.spec.ts @@ -1,9 +1,10 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { Reaction } from 'app/entities/metis/reaction.model'; import { ReactionService } from 'app/shared/metis/reaction.service'; import { metisReactionToCreate, metisReactionUser2 } from '../../helpers/sample/metis-sample-data'; +import { provideHttpClient } from '@angular/common/http'; describe('Reaction Service', () => { let service: ReactionService; @@ -11,7 +12,8 @@ describe('Reaction Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(ReactionService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/modeling-assessment.service.spec.ts b/src/test/javascript/spec/service/modeling-assessment.service.spec.ts index e2579b0b93c9..4ca47f887385 100644 --- a/src/test/javascript/spec/service/modeling-assessment.service.spec.ts +++ b/src/test/javascript/spec/service/modeling-assessment.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { HttpResponse } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { take } from 'rxjs/operators'; import { ArtemisTestModule } from '../test.module'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; @@ -106,8 +106,10 @@ describe('ModelingAssessmentService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/service/modeling-exercise.service.spec.ts b/src/test/javascript/spec/service/modeling-exercise.service.spec.ts index 5fdfe0efe181..26c669335007 100644 --- a/src/test/javascript/spec/service/modeling-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/modeling-exercise.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; @@ -16,6 +16,7 @@ import { Router } from '@angular/router'; import { MockRouter } from '../helpers/mocks/mock-router'; import { lastValueFrom } from 'rxjs'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { provideHttpClient } from '@angular/common/http'; describe('ModelingExercise Service', () => { let service: ModelingExerciseService; @@ -26,8 +27,10 @@ describe('ModelingExercise Service', () => { const categories = [JSON.stringify(category) as unknown as ExerciseCategory] as ExerciseCategory[]; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/modeling-submission.service.spec.ts b/src/test/javascript/spec/service/modeling-submission.service.spec.ts index 090171ef6ab6..f8bacc84ded4 100644 --- a/src/test/javascript/spec/service/modeling-submission.service.spec.ts +++ b/src/test/javascript/spec/service/modeling-submission.service.spec.ts @@ -1,10 +1,11 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { ModelingSubmissionService } from 'app/exercises/modeling/participate/modeling-submission.service'; import { take } from 'rxjs/operators'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; +import { provideHttpClient } from '@angular/common/http'; describe('ModelingSubmission Service', () => { let service: ModelingSubmissionService; @@ -13,8 +14,8 @@ describe('ModelingSubmission Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }); service = TestBed.inject(ModelingSubmissionService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/notification.service.spec.ts b/src/test/javascript/spec/service/notification.service.spec.ts index 9293a0d3cee1..19c5d0600c33 100644 --- a/src/test/javascript/spec/service/notification.service.spec.ts +++ b/src/test/javascript/spec/service/notification.service.spec.ts @@ -1,8 +1,8 @@ -import { HttpClientTestingModule, HttpTestingController, TestRequest } from '@angular/common/http/testing'; +import { HttpTestingController, TestRequest, provideHttpClientTesting } from '@angular/common/http/testing'; import { NotificationService } from 'app/shared/notification/notification.service'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { TestBed } from '@angular/core/testing'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, provideRouter } from '@angular/router'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateTestingModule } from '../helpers/mocks/service/mock-translate.service'; import { @@ -16,7 +16,6 @@ import { Notification, } from 'app/entities/notification.model'; import { MockRouter } from '../helpers/mocks/mock-router'; -import { RouterTestingModule } from '@angular/router/testing'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { BehaviorSubject, Subject } from 'rxjs'; import { AccountService } from 'app/core/auth/account.service'; @@ -40,6 +39,7 @@ import { Post } from 'app/entities/metis/post.model'; import { User } from 'app/core/user/user.model'; import { ConversationType } from 'app/entities/metis/conversation/conversation.model'; import { Channel } from 'app/entities/metis/conversation/channel.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Notification Service', () => { const resourceUrl = 'api/notifications'; @@ -155,9 +155,12 @@ describe('Notification Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, TranslateTestingModule, RouterTestingModule.withRoutes([])], + imports: [TranslateTestingModule], declarations: [MockPipe(ArtemisTranslatePipe)], providers: [ + provideRouter([]), + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: Router, useClass: MockRouter }, diff --git a/src/test/javascript/spec/service/participation.service.spec.ts b/src/test/javascript/spec/service/participation.service.spec.ts index 0d405cbfb018..2084e5efd1d6 100644 --- a/src/test/javascript/spec/service/participation.service.spec.ts +++ b/src/test/javascript/spec/service/participation.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpHeaders, HttpResponse } from '@angular/common/http'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpHeaders, HttpResponse, provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { map, take } from 'rxjs/operators'; import dayjs from 'dayjs/esm'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; @@ -24,8 +24,10 @@ describe('Participation Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts b/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts index 134bdc518fee..f9133ebf11db 100644 --- a/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts +++ b/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts @@ -1,4 +1,4 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; import { take } from 'rxjs/operators'; @@ -11,6 +11,7 @@ import { ModelingSubmissionElement } from 'app/exercises/shared/plagiarism/types import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase'; import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission'; import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict'; +import { provideHttpClient } from '@angular/common/http'; describe('Plagiarism Cases Service', () => { let service: PlagiarismCasesService; @@ -71,7 +72,8 @@ describe('Plagiarism Cases Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(PlagiarismCasesService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/plagiarism-results.service.spec.ts b/src/test/javascript/spec/service/plagiarism-results.service.spec.ts index 809adc604178..fa5e6fe2e5ad 100644 --- a/src/test/javascript/spec/service/plagiarism-results.service.spec.ts +++ b/src/test/javascript/spec/service/plagiarism-results.service.spec.ts @@ -1,4 +1,5 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { PlagiarismResultsService } from 'app/course/plagiarism-cases/shared/plagiarism-results.service'; @@ -7,7 +8,8 @@ describe('Plagiarism Results Service', () => { let httpMock: HttpTestingController; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(PlagiarismResultsService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/profile.service.spec.ts b/src/test/javascript/spec/service/profile.service.spec.ts index 2d3c984d5345..ace62a0ea60b 100644 --- a/src/test/javascript/spec/service/profile.service.spec.ts +++ b/src/test/javascript/spec/service/profile.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { MockRouter } from '../helpers/mocks/mock-router'; @@ -9,6 +9,7 @@ import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { BrowserFingerprintService } from 'app/shared/fingerprint/browser-fingerprint.service'; +import { provideHttpClient } from '@angular/common/http'; describe('ProfileService', () => { let service: ProfileService; @@ -268,8 +269,10 @@ describe('ProfileService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: Router, useClass: MockRouter }, diff --git a/src/test/javascript/spec/service/programming-exercise-participation.service.spec.ts b/src/test/javascript/spec/service/programming-exercise-participation.service.spec.ts index 1ef9b69501d1..edc1a07586a0 100644 --- a/src/test/javascript/spec/service/programming-exercise-participation.service.spec.ts +++ b/src/test/javascript/spec/service/programming-exercise-participation.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { AccountService } from 'app/core/auth/account.service'; import { of } from 'rxjs'; import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; @@ -7,6 +7,7 @@ import { Submission } from 'app/entities/submission.model'; import { ArtemisTestModule } from '../test.module'; import { Result } from 'app/entities/result.model'; import dayjs from 'dayjs/esm'; +import { provideHttpClient } from '@angular/common/http'; describe('ProgrammingExerciseParticipation Service', () => { let service: ProgrammingExerciseParticipationService; @@ -20,8 +21,8 @@ describe('ProgrammingExerciseParticipation Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], - providers: [], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting()], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts b/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts index b45536f41584..a47cc762f73b 100644 --- a/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts +++ b/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts @@ -1,7 +1,7 @@ import { ProgrammingExerciseTaskService } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task.service'; import { TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../test.module'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { AlertService } from 'app/core/util/alert.service'; import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; @@ -13,6 +13,7 @@ import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/gradin import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; import { firstValueFrom, of } from 'rxjs'; +import { provideHttpClient } from '@angular/common/http'; describe('ProgrammingExerciseTask Service', () => { let service: ProgrammingExerciseTaskService; @@ -127,8 +128,10 @@ describe('ProgrammingExerciseTask Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), ProgrammingExerciseTaskService, { provide: ProgrammingExerciseGradingService, useClass: MockProgrammingExerciseGradingService }, MockProvider(AlertService), diff --git a/src/test/javascript/spec/service/programming-exercise.service.spec.ts b/src/test/javascript/spec/service/programming-exercise.service.spec.ts index 70d9a94a1eb7..9d450bbf7f8f 100644 --- a/src/test/javascript/spec/service/programming-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/programming-exercise.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; @@ -20,6 +20,7 @@ import { SolutionProgrammingExerciseParticipation } from 'app/entities/participa import { Submission } from 'app/entities/submission.model'; import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; import { ProgrammingExerciseGitDiffEntry } from 'app/entities/hestia/programming-exercise-git-diff-entry.model'; +import { provideHttpClient } from '@angular/common/http'; describe('ProgrammingExercise Service', () => { let service: ProgrammingExerciseService; @@ -30,8 +31,10 @@ describe('ProgrammingExercise Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: TranslateService, useClass: MockTranslateService }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/programming-submission.service.spec.ts b/src/test/javascript/spec/service/programming-submission.service.spec.ts index 6259bcaf65d9..eaed7a0be320 100644 --- a/src/test/javascript/spec/service/programming-submission.service.spec.ts +++ b/src/test/javascript/spec/service/programming-submission.service.spec.ts @@ -16,10 +16,10 @@ import { StudentParticipation } from 'app/entities/participation/student-partici import { MockParticipationWebsocketService } from '../helpers/mocks/service/mock-participation-websocket.service'; import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { MockProgrammingExerciseParticipationService } from '../helpers/mocks/service/mock-programming-exercise-participation.service'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, provideHttpClient } from '@angular/common/http'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; describe('ProgrammingSubmissionService', () => { let websocketService: JhiWebsocketService; @@ -54,8 +54,10 @@ describe('ProgrammingSubmissionService', () => { result2 = { id: 32, submission: currentSubmission2 } as any; TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: JhiWebsocketService, useClass: MockWebsocketService }, { provide: ParticipationWebsocketService, useClass: MockParticipationWebsocketService }, { provide: ProgrammingExerciseParticipationService, useClass: MockProgrammingExerciseParticipationService }, diff --git a/src/test/javascript/spec/service/quiz-exercise.service.spec.ts b/src/test/javascript/spec/service/quiz-exercise.service.spec.ts index c1fe73c1139b..29db9a28779e 100644 --- a/src/test/javascript/spec/service/quiz-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/quiz-exercise.service.spec.ts @@ -1,7 +1,7 @@ import { TranslateService } from '@ngx-translate/core'; import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController, TestRequest } from '@angular/common/http/testing'; -import { HttpResponse } from '@angular/common/http'; +import { HttpTestingController, TestRequest, provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { SessionStorageService } from 'ngx-webstorage'; import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service'; import { QuizBatch, QuizExercise, QuizStatus } from 'app/entities/quiz/quiz-exercise.model'; @@ -43,8 +43,10 @@ describe('QuizExercise Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, ], diff --git a/src/test/javascript/spec/service/quiz-pool.service.spec.ts b/src/test/javascript/spec/service/quiz-pool.service.spec.ts index 049a8be08df1..021542bf25d1 100644 --- a/src/test/javascript/spec/service/quiz-pool.service.spec.ts +++ b/src/test/javascript/spec/service/quiz-pool.service.spec.ts @@ -1,9 +1,10 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { QuizPoolService } from 'app/exercises/quiz/manage/quiz-pool.service'; import { ArtemisTestModule } from '../test.module'; import { QuizPool } from 'app/entities/quiz/quiz-pool.model'; import { firstValueFrom } from 'rxjs'; +import { provideHttpClient } from '@angular/common/http'; describe('QuizPoolService', () => { let quizPoolService: QuizPoolService; @@ -11,8 +12,8 @@ describe('QuizPoolService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], - providers: [QuizPoolService], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting(), QuizPoolService], }); quizPoolService = TestBed.inject(QuizPoolService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/quiz-re-evaluate.service.spec.ts b/src/test/javascript/spec/service/quiz-re-evaluate.service.spec.ts index 1cba6a320fda..907b121de7a7 100644 --- a/src/test/javascript/spec/service/quiz-re-evaluate.service.spec.ts +++ b/src/test/javascript/spec/service/quiz-re-evaluate.service.spec.ts @@ -1,16 +1,17 @@ -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { QuizReEvaluateService } from 'app/exercises/quiz/manage/re-evaluate/quiz-re-evaluate.service'; import { ArtemisTestModule } from '../test.module'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; +import { provideHttpClient } from '@angular/common/http'; describe('QuizReEvaluateService', () => { let service: QuizReEvaluateService; let httpMock: HttpTestingController; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], - providers: [QuizReEvaluateService], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting(), QuizReEvaluateService], }); service = TestBed.inject(QuizReEvaluateService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/rating.service.spec.ts b/src/test/javascript/spec/service/rating.service.spec.ts index 9ee310a08e27..eac37f21d9b8 100644 --- a/src/test/javascript/spec/service/rating.service.spec.ts +++ b/src/test/javascript/spec/service/rating.service.spec.ts @@ -1,10 +1,11 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { ArtemisTestModule } from '../test.module'; import { RatingService } from 'app/exercises/shared/rating/rating.service'; import { Rating } from 'app/entities/rating.model'; import { Result } from 'app/entities/result.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Rating Service', () => { let service: RatingService; @@ -12,7 +13,8 @@ describe('Rating Service', () => { let elemDefault: Rating; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(RatingService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/result.service.spec.ts b/src/test/javascript/spec/service/result.service.spec.ts index 8afb25f538cd..e6c24cf75850 100644 --- a/src/test/javascript/spec/service/result.service.spec.ts +++ b/src/test/javascript/spec/service/result.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { HttpClient, HttpResponse } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { HttpClient, HttpResponse, provideHttpClient } from '@angular/common/http'; import { TranslateService } from '@ngx-translate/core'; import { MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; @@ -129,8 +129,10 @@ describe('ResultService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), ResultService, ExerciseService, ParticipationService, @@ -305,8 +307,10 @@ describe('ResultService', () => { it('should return correct string for Athena non graded successful feedback', () => { programmingExercise.assessmentDueDate = dayjs().subtract(5, 'minutes'); - expect(resultService.getResultString(result6, programmingExercise)).toBe('artemisApp.result.resultString.automaticAIFeedbackSuccessful'); - expect(translateServiceSpy).toHaveBeenCalledOnce(); + expect(resultService.getResultString(result6, programmingExercise)).toBe( + 'artemisApp.result.resultString.automaticAIFeedbackSuccessful (artemisApp.result.preliminary)', + ); + expect(translateServiceSpy).toHaveBeenCalledTimes(2); }); it('should return correct string for Athena non graded unsuccessful feedback', () => { diff --git a/src/test/javascript/spec/service/settings/ide-settings.service.spec.ts b/src/test/javascript/spec/service/settings/ide-settings.service.spec.ts index 0fdb4d3350ca..f2937a2818ce 100644 --- a/src/test/javascript/spec/service/settings/ide-settings.service.spec.ts +++ b/src/test/javascript/spec/service/settings/ide-settings.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { IdeSettingsService } from 'app/shared/user-settings/ide-preferences/ide-settings.service'; import { Ide, IdeMappingDTO } from 'app/shared/user-settings/ide-preferences/ide.model'; import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; +import { provideHttpClient } from '@angular/common/http'; describe('IdeSettingsService', () => { let service: IdeSettingsService; @@ -10,8 +11,8 @@ describe('IdeSettingsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [IdeSettingsService], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), IdeSettingsService], }); service = TestBed.inject(IdeSettingsService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/structured-grading-criterion.service.spec.ts b/src/test/javascript/spec/service/structured-grading-criterion.service.spec.ts index 6e4e55611738..ae1660f17b86 100644 --- a/src/test/javascript/spec/service/structured-grading-criterion.service.spec.ts +++ b/src/test/javascript/spec/service/structured-grading-criterion.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service'; import { Feedback } from 'app/entities/feedback.model'; import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Structured Grading Criteria Service', () => { let service: StructuredGradingCriterionService; @@ -11,7 +12,8 @@ describe('Structured Grading Criteria Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(StructuredGradingCriterionService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/submission-export.service.spec.ts b/src/test/javascript/spec/service/submission-export.service.spec.ts index fb88ed3161ec..e0599599f44c 100644 --- a/src/test/javascript/spec/service/submission-export.service.spec.ts +++ b/src/test/javascript/spec/service/submission-export.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../test.module'; import { SubmissionExportService } from 'app/exercises/shared/submission-export/submission-export.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { ExerciseType } from 'app/entities/exercise.model'; +import { provideHttpClient } from '@angular/common/http'; describe('Submission Export Service', () => { let service: SubmissionExportService; @@ -12,7 +13,8 @@ describe('Submission Export Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(SubmissionExportService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/submission-policy.service.spec.ts b/src/test/javascript/spec/service/submission-policy.service.spec.ts index 60c5f139df52..f6bff784fc46 100644 --- a/src/test/javascript/spec/service/submission-policy.service.spec.ts +++ b/src/test/javascript/spec/service/submission-policy.service.spec.ts @@ -1,9 +1,10 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { SubmissionPolicyService } from 'app/exercises/programming/manage/services/submission-policy.service'; import { LockRepositoryPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { take } from 'rxjs/operators'; +import { provideHttpClient } from '@angular/common/http'; describe('Submission Policy Service', () => { let httpMock: HttpTestingController; @@ -15,8 +16,8 @@ describe('Submission Policy Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: SubmissionPolicyService, useClass: SubmissionPolicyService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: SubmissionPolicyService, useClass: SubmissionPolicyService }], }); httpMock = TestBed.inject(HttpTestingController); submissionPolicyService = TestBed.inject(SubmissionPolicyService); diff --git a/src/test/javascript/spec/service/submission-version.service.spec.ts b/src/test/javascript/spec/service/submission-version.service.spec.ts index 380659aabf58..5b66938ff2a3 100644 --- a/src/test/javascript/spec/service/submission-version.service.spec.ts +++ b/src/test/javascript/spec/service/submission-version.service.spec.ts @@ -1,9 +1,10 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ArtemisTestModule } from '../test.module'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TextSubmission } from 'app/entities/text/text-submission.model'; import dayjs from 'dayjs/esm'; import { SubmissionVersionService } from 'app/exercises/shared/submission-version/submission-version.service'; +import { provideHttpClient } from '@angular/common/http'; describe('SubmissionVersion Service', () => { let service: SubmissionVersionService; @@ -12,7 +13,8 @@ describe('SubmissionVersion Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting()], }).compileComponents(); service = TestBed.inject(SubmissionVersionService); diff --git a/src/test/javascript/spec/service/submission.service.spec.ts b/src/test/javascript/spec/service/submission.service.spec.ts index 276aa8be2498..244b23b35876 100644 --- a/src/test/javascript/spec/service/submission.service.spec.ts +++ b/src/test/javascript/spec/service/submission.service.spec.ts @@ -2,7 +2,7 @@ import { SubmissionService, SubmissionWithComplaintDTO } from 'app/exercises/sha import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { take } from 'rxjs/operators'; import { ArtemisTestModule } from '../test.module'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { TranslateService } from '@ngx-translate/core'; @@ -10,7 +10,7 @@ import { MockTranslateService } from '../helpers/mocks/service/mock-translate.se import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { Submission, SubmissionType, getLatestSubmissionResult } from 'app/entities/submission.model'; import dayjs from 'dayjs/esm'; import { Complaint } from 'app/entities/complaint.model'; @@ -23,8 +23,10 @@ describe('Submission Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], + imports: [ArtemisTestModule], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: LocalStorageService, useClass: MockSyncStorage }, { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, diff --git a/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts b/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts index 111bc06bc06c..365c4920c3ed 100644 --- a/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts +++ b/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service'; import { FeedbackType } from 'app/entities/feedback.model'; @@ -14,6 +14,7 @@ import { ActivatedRoute } from '@angular/router'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; import { throwError } from 'rxjs'; import { Location } from '@angular/common'; +import { provideHttpClient } from '@angular/common/http'; describe('TextAssessmentAnalytics Service', () => { let service: TextAssessmentAnalytics; @@ -32,8 +33,10 @@ describe('TextAssessmentAnalytics Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: Location, diff --git a/src/test/javascript/spec/service/text-assessment.service.spec.ts b/src/test/javascript/spec/service/text-assessment.service.spec.ts index 63ae92c49ffb..863259b528e7 100644 --- a/src/test/javascript/spec/service/text-assessment.service.spec.ts +++ b/src/test/javascript/spec/service/text-assessment.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; @@ -17,6 +17,7 @@ import { NewStudentParticipationResolver, StudentParticipationResolver } from 'a import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { of } from 'rxjs'; import { ActivatedRouteSnapshot, convertToParamMap } from '@angular/router'; +import { provideHttpClient } from '@angular/common/http'; describe('TextAssessment Service', () => { let service: TextAssessmentService; @@ -64,8 +65,8 @@ describe('TextAssessment Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }); service = TestBed.inject(TextAssessmentService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/text-exercise.service.spec.ts b/src/test/javascript/spec/service/text-exercise.service.spec.ts index 5557d381a1e9..88d047510b48 100644 --- a/src/test/javascript/spec/service/text-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/text-exercise.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; import { TextExercise } from 'app/entities/text/text-exercise.model'; @@ -10,7 +10,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { Router } from '@angular/router'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { MockRouter } from '../helpers/mocks/mock-router'; -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { PlagiarismOptions } from 'app/exercises/shared/plagiarism/types/PlagiarismOptions'; import dayjs from 'dayjs/esm'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; @@ -26,8 +26,10 @@ describe('TextExercise Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ + provideHttpClient(), + provideHttpClientTesting(), { provide: Router, useClass: MockRouter }, { provide: TranslateService, useClass: MockTranslateService }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/text-submission.service.spec.ts b/src/test/javascript/spec/service/text-submission.service.spec.ts index d21d44eda72c..15d3236f1cc2 100644 --- a/src/test/javascript/spec/service/text-submission.service.spec.ts +++ b/src/test/javascript/spec/service/text-submission.service.spec.ts @@ -1,11 +1,12 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { TextSubmission } from 'app/entities/text/text-submission.model'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { provideHttpClient } from '@angular/common/http'; describe('TextSubmission Service', () => { let service: TextSubmissionService; @@ -14,8 +15,8 @@ describe('TextSubmission Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }) .compileComponents() .then(() => { diff --git a/src/test/javascript/spec/service/tutor-participation.service.spec.ts b/src/test/javascript/spec/service/tutor-participation.service.spec.ts index b8adce9a8be1..5bae679aaa88 100644 --- a/src/test/javascript/spec/service/tutor-participation.service.spec.ts +++ b/src/test/javascript/spec/service/tutor-participation.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { isEmpty, take } from 'rxjs/operators'; import { ArtemisTestModule } from '../test.module'; import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor/tutor-participation.service'; @@ -9,6 +9,7 @@ import { Exercise } from 'app/entities/exercise.model'; import { Course } from 'app/entities/course.model'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; import { AccountService } from 'app/core/auth/account.service'; +import { provideHttpClient } from '@angular/common/http'; describe('Rating Service', () => { let service: TutorParticipationService; @@ -19,8 +20,8 @@ describe('Rating Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, HttpClientTestingModule], - providers: [{ provide: AccountService, useClass: MockAccountService }], + imports: [ArtemisTestModule], + providers: [provideHttpClient(), provideHttpClientTesting(), { provide: AccountService, useClass: MockAccountService }], }); service = TestBed.inject(TutorParticipationService); httpMock = TestBed.inject(HttpTestingController); diff --git a/src/test/javascript/spec/service/user-route-access.service.spec.ts b/src/test/javascript/spec/service/user-route-access.service.spec.ts index 8546593c1339..5c8f583c7075 100644 --- a/src/test/javascript/spec/service/user-route-access.service.spec.ts +++ b/src/test/javascript/spec/service/user-route-access.service.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserRouteAccessService } from 'app/core/auth/user-route-access-service'; -import { ActivatedRouteSnapshot, Route, Router } from '@angular/router'; +import { ActivatedRouteSnapshot, Route, Router, RouterModule } from '@angular/router'; import { ArtemisTestModule } from '../test.module'; import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; @@ -8,8 +8,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { Mutable } from '../helpers/mutable'; import { mockedActivatedRouteSnapshot } from '../helpers/mocks/activated-route/mock-activated-route-snapshot'; import { CourseExerciseDetailsComponent } from 'app/overview/exercise-details/course-exercise-details.component'; @@ -17,6 +16,7 @@ import { Authority } from 'app/shared/constants/authority.constants'; import { StateStorageService } from 'app/core/auth/state-storage.service'; import { MockProvider } from 'ng-mocks'; import { AlertService } from 'app/core/util/alert.service'; +import { provideHttpClient } from '@angular/common/http'; describe('UserRouteAccessService', () => { const routeStateMock: any = { snapshot: {}, url: '/courses/20/exercises/4512' }; @@ -39,8 +39,7 @@ describe('UserRouteAccessService', () => { TestBed.configureTestingModule({ imports: [ ArtemisTestModule, - HttpClientTestingModule, - RouterTestingModule.withRoutes([ + RouterModule.forRoot([ { path: route, component: CourseExerciseDetailsComponent, @@ -49,6 +48,8 @@ describe('UserRouteAccessService', () => { ], declarations: [CourseExerciseDetailsComponent], providers: [ + provideHttpClient(), + provideHttpClientTesting(), mockedActivatedRouteSnapshot(route), { provide: AccountService, useClass: MockAccountService }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/service/user.service.spec.ts b/src/test/javascript/spec/service/user.service.spec.ts index 31cf92e2412c..6a76530103e5 100644 --- a/src/test/javascript/spec/service/user.service.spec.ts +++ b/src/test/javascript/spec/service/user.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed } from '@angular/core/testing'; import { UserService } from 'app/core/user/user.service'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { Authority } from 'app/shared/constants/authority.constants'; import { AdminUserService } from 'app/core/user/admin-user.service'; +import { provideHttpClient } from '@angular/common/http'; describe('User Service', () => { let service: UserService; @@ -11,7 +12,8 @@ describe('User Service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], }); service = TestBed.inject(UserService); diff --git a/src/test/playwright/e2e/course/CourseManagement.spec.ts b/src/test/playwright/e2e/course/CourseManagement.spec.ts index 8a7eacab4135..5c011a02b499 100644 --- a/src/test/playwright/e2e/course/CourseManagement.spec.ts +++ b/src/test/playwright/e2e/course/CourseManagement.spec.ts @@ -23,6 +23,7 @@ const courseData = { editorGroupName: process.env.EDITOR_GROUP_NAME ?? '', instructorGroupName: process.env.INSTRUCTOR_GROUP_NAME ?? '', enableComplaints: true, + enableFaqs: true, maxComplaints: 5, maxTeamComplaints: 3, maxComplaintTimeDays: 6, @@ -100,6 +101,7 @@ test.describe('Course management', () => { await courseCreation.setCourseMaxPoints(courseData.maxPoints); await courseCreation.setProgrammingLanguage(courseData.programmingLanguage); await courseCreation.setEnableComplaints(courseData.enableComplaints); + await courseCreation.setEnableFaq(courseData.enableFaqs); await courseCreation.setMaxComplaints(courseData.maxComplaints); await courseCreation.setMaxTeamComplaints(courseData.maxTeamComplaints); await courseCreation.setMaxComplaintsTimeDays(courseData.maxComplaintTimeDays); @@ -120,6 +122,7 @@ test.describe('Course management', () => { expect(courseBody.maxPoints).toBe(courseData.maxPoints); expect(courseBody.defaultProgrammingLanguage).toBe(courseData.programmingLanguage); expect(courseBody.complaintsEnabled).toBe(courseData.enableComplaints); + expect(courseBody.faqEnabled).toBe(courseData.enableFaqs); expect(courseBody.maxComplaints).toBe(courseData.maxComplaints); expect(courseBody.maxTeamComplaints).toBe(courseData.maxTeamComplaints); expect(courseBody.maxComplaintTimeDays).toBe(courseData.maxComplaintTimeDays); diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts index 1699d5539c22..806e5054f551 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts @@ -69,14 +69,17 @@ test.describe('Test Exam - student exams', () => { await studentExamManagement.checkExamStudent(studentOne.username); await studentExamManagement.checkExamStudent(studentTwo.username); + await studentExamManagement.checkExamStudent(studentThree.username); - await expect(studentExamManagement.getStudentExamRows()).toHaveCount(2); + await expect(studentExamManagement.getStudentExamRows()).toHaveCount(3); await studentExamManagement.checkStudentExamProperty(studentOne.username, 'Started', 'Yes'); await studentExamManagement.checkStudentExamProperty(studentTwo.username, 'Started', 'Yes'); + await studentExamManagement.checkStudentExamProperty(studentThree.username, 'Started', 'No'); await studentExamManagement.checkStudentExamProperty(studentOne.username, 'Submitted', 'Yes'); await studentExamManagement.checkStudentExamProperty(studentTwo.username, 'Submitted', 'No'); + await studentExamManagement.checkStudentExamProperty(studentThree.username, 'Submitted', 'No'); await studentExamManagement.checkStudentExamProperty(studentTwo.username, 'Used working time', '0s'); }); @@ -115,6 +118,7 @@ test.describe('Test Exam - student exams', () => { ) { if (!toStart) { await examParticipation.openExam(student, course, exam); + await examParticipation.almostStartExam(); } else { await examParticipation.openExam(student, course, exam); await examParticipation.startExam(); diff --git a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts index 631d21fcba5d..e990c05fa6a8 100644 --- a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts @@ -44,6 +44,9 @@ test.describe('Modeling Exercise Assessment', () => { // }); test('Tutor can assess a submission', async ({ login, courseManagement, courseAssessment, exerciseAssessment, modelingExerciseAssessment }) => { + await login(tutor, '/course-management'); + await courseManagement.openSubmissionsForExerciseAndCourse(course.id!, modelingExercise.id!); + await courseManagement.checkIfStudentSubmissionExists(studentOne.username); await login(tutor, '/course-management'); await courseManagement.openAssessmentDashboardOfCourse(course.id!); await courseAssessment.clickExerciseDashboardButton(); diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts index 9bea097033d6..e5d2f60d6e4f 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts @@ -106,7 +106,7 @@ test.describe('Programming Exercise Management', () => { }); test('Create an exercise team', async ({ login, page, navigationBar, courseManagement, courseManagementExercises, exerciseTeams, programmingExerciseOverview }) => { - await login(instructor, '/'); + await login(instructor); await navigationBar.openCourseManagement(); await courseManagement.openExercisesOfCourse(course.id!); await courseManagementExercises.openExerciseTeams(exercise.id!); diff --git a/src/test/playwright/support/pageobjects/course/CourseCreationPage.ts b/src/test/playwright/support/pageobjects/course/CourseCreationPage.ts index 2048bdbed18d..cc582aadd368 100644 --- a/src/test/playwright/support/pageobjects/course/CourseCreationPage.ts +++ b/src/test/playwright/support/pageobjects/course/CourseCreationPage.ts @@ -147,6 +147,19 @@ export class CourseCreationPage { } } + /** + * Sets if FAQs are enabled for the course + * @param enableFaq if FAQs should be enabled + */ + async setEnableFaq(enableFaq: boolean) { + const selector = this.page.locator('#field_faq_enabled'); + if (enableFaq) { + await selector.check(); + } else { + await selector.uncheck(); + } + } + /** * Sets maximum amount of complaints * @param maxComplaints the maximum complaints diff --git a/src/test/playwright/support/pageobjects/course/CourseManagementPage.ts b/src/test/playwright/support/pageobjects/course/CourseManagementPage.ts index 3dc494cda33a..fe1d6bf51c14 100644 --- a/src/test/playwright/support/pageobjects/course/CourseManagementPage.ts +++ b/src/test/playwright/support/pageobjects/course/CourseManagementPage.ts @@ -134,6 +134,17 @@ export class CourseManagementPage { await this.page.waitForURL('**/assessment-dashboard**'); } + async openSubmissionsForExerciseAndCourse(courseID: number, exerciseID: number) { + await this.getCourse(courseID).locator('#course-card-open-exercises').click(); + await this.page.waitForURL('**/exercises**'); + await this.page.click(`[href="/course-management/${courseID}/modeling-exercises/${exerciseID}/scores"]`); + await this.page.waitForURL('**/scores'); + } + + async checkIfStudentSubmissionExists(studentName: string) { + await expect(this.page.locator('.datatable-body-row', { hasText: studentName })).toBeVisible(); + } + /* * Helper methods to get information about the course */ diff --git a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts index 58d3557d19f3..435202bf7971 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts @@ -32,14 +32,14 @@ export class ExamExerciseGroupCreationPage { } async clickSave(): Promise { - const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/exams/*/exerciseGroups`); + const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/exams/*/exercise-groups`); await this.page.locator('#save-group').click(); const response = await responsePromise; return response.json(); } async update() { - const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/exams/*/exerciseGroups`); + const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/exams/*/exercise-groups`); await this.page.locator('#save-group').click(); await responsePromise; } diff --git a/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts index e07b9e42f486..5af59d960050 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts @@ -115,6 +115,10 @@ export class ExamParticipationPage extends ExamParticipationActions { await this.examStartEnd.startExam(true); } + async almostStartExam() { + await this.examStartEnd.onlyClickConfirmationCheckmark(); + } + async handInEarly() { await this.examNavigation.handInEarly(); const response = await this.examStartEnd.finishExam(); diff --git a/src/test/playwright/support/pageobjects/exam/ExamStartEndPage.ts b/src/test/playwright/support/pageobjects/exam/ExamStartEndPage.ts index 22c774719115..367d075cb37a 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamStartEndPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamStartEndPage.ts @@ -48,6 +48,10 @@ export class ExamStartEndPage { } } + async onlyClickConfirmationCheckmark() { + await this.setConfirmCheckmark(); + } + async finishExam(timeout?: number) { await this.setConfirmCheckmark(timeout); await this.enterFirstnameLastname(); diff --git a/src/test/playwright/support/requests/ExamAPIRequests.ts b/src/test/playwright/support/requests/ExamAPIRequests.ts index c250415fb2db..3e5e18a04a7d 100644 --- a/src/test/playwright/support/requests/ExamAPIRequests.ts +++ b/src/test/playwright/support/requests/ExamAPIRequests.ts @@ -148,12 +148,12 @@ export class ExamAPIRequests { exerciseGroup.exam = exam; exerciseGroup.title = title; exerciseGroup.isMandatory = mandatory; - const response = await this.page.request.post(`${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/exerciseGroups`, { data: exerciseGroup }); + const response = await this.page.request.post(`${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/exercise-groups`, { data: exerciseGroup }); return response.json(); } async deleteExerciseGroupForExam(exam: Exam, exerciseGroup: ExerciseGroup) { - await this.page.request.delete(`${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/exerciseGroups/${exerciseGroup.id}`); + await this.page.request.delete(`${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/exercise-groups/${exerciseGroup.id}`); } /** diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index f48155253d32..ee94c5be7573 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -70,6 +70,8 @@ artemis: default: "~~invalid~~" javascript: default: "~~invalid~~" + r: + default: "~~invalid~~" spring: application: diff --git a/src/test/resources/placeholder-signatures.json b/src/test/resources/placeholder-signatures.json index 3826822f8eaf..49fb7814743f 100644 --- a/src/test/resources/placeholder-signatures.json +++ b/src/test/resources/placeholder-signatures.json @@ -16,7 +16,7 @@ "fieldName" : "courseTitle", "fieldType" : "java.lang.String" }, { - "fieldName" : "channelName", + "fieldName" : "conversationName", "fieldType" : "java.lang.String" }, { "fieldName" : "responsibleForUserName", @@ -49,7 +49,7 @@ "fieldName" : "courseTitle", "fieldType" : "java.lang.String" }, { - "fieldName" : "channelName", + "fieldName" : "conversationName", "fieldType" : "java.lang.String" }, { "fieldName" : "responsibleForUserName", @@ -67,7 +67,7 @@ "fieldName" : "messageCreationDate", "fieldType" : "java.lang.String" }, { - "fieldName" : "channelName", + "fieldName" : "conversationName", "fieldType" : "java.lang.String" }, { "fieldName" : "authorName", @@ -109,7 +109,7 @@ "fieldName" : "courseTitle", "fieldType" : "java.lang.String" }, { - "fieldName" : "channelName", + "fieldName" : "conversationName", "fieldType" : "java.lang.String" }, { "fieldName" : "responsibleForUserName", @@ -595,4 +595,4 @@ "fieldName" : "courseTitle", "fieldType" : "java.lang.String" } ] -} ] \ No newline at end of file +} ]