diff --git a/.github/workflows/analysis-of-endpoint-connections.yml b/.github/workflows/analysis-of-endpoint-connections.yml index 2116605bea0a..f5f2dd4edb71 100644 --- a/.github/workflows/analysis-of-endpoint-connections.yml +++ b/.github/workflows/analysis-of-endpoint-connections.yml @@ -2,7 +2,13 @@ name: Analysis of Endpoint Connections on: workflow_dispatch: - push: + pull_request: + types: + - opened + - synchronize + paths: + - 'src/main/java/**' + - 'src/main/webapp/**' # Keep in sync with build.yml and test.yml and codeql-analysis.yml env: @@ -20,7 +26,7 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 21 + - name: Set up JDK uses: actions/setup-java@v4 with: java-version: '${{ env.java }}' @@ -59,7 +65,7 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 21 + - name: Set up JDK uses: actions/setup-java@v4 with: distribution: 'temurin' diff --git a/angular.json b/angular.json index a2c893ff59f6..e5543ff2ce60 100644 --- a/angular.json +++ b/angular.json @@ -21,8 +21,6 @@ "builder": "@angular-devkit/build-angular:application", "options": { "allowedCommonJsDependencies": [ - "brace", - "brace/mode/java", "clone-deep", "crypto-js", "crypto", diff --git a/build.gradle b/build.gradle index 8eda5b8226e5..9a023c709654 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id "com.github.ben-manes.versions" version "0.51.0" id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}" id "com.gorylenko.gradle-git-properties" version "2.4.2" - id "org.owasp.dependencycheck" version "10.0.3" + id "org.owasp.dependencycheck" version "10.0.4" id "com.adarshr.test-logger" version "4.0.0" } @@ -284,12 +284,12 @@ dependencies { implementation "org.apache.sshd:sshd-sftp:${sshd_version}" // https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml - implementation "net.sourceforge.plantuml:plantuml:1.2024.6" + implementation "net.sourceforge.plantuml:plantuml:1.2024.5" implementation "org.jasypt:jasypt:1.9.3" implementation "me.xdrop:fuzzywuzzy:1.4.0" implementation("org.yaml:snakeyaml") { version { - strictly "2.2" + strictly "2.3" // needed to reduce the number of vulnerabilities, also see https://mvnrepository.com/artifact/org.yaml/snakeyaml } } @@ -330,7 +330,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.12.6" + implementation "io.micrometer:micrometer-registry-prometheus:1.13.3" implementation "net.logstash.logback:logstash-logback-encoder:8.0" // Defines low-level streaming API, and includes JSON-specific implementations @@ -349,13 +349,19 @@ dependencies { implementation "com.hazelcast:hazelcast:${hazelcast_version}" implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}" implementation "com.hazelcast:hazelcast-hibernate53:5.2.0" + implementation "javax.cache:cache-api:1.1.1" implementation "org.hibernate.orm:hibernate-core:${hibernate_version}" + implementation "com.zaxxer:HikariCP:5.1.0" + implementation "org.apache.commons:commons-text:1.12.0" implementation "org.apache.commons:commons-math3:3.6.1" + implementation "javax.transaction:javax.transaction-api:1.3" + implementation "org.liquibase:liquibase-core:${liquibase_version}" + implementation "org.springframework.boot:spring-boot-starter-validation:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-loader-tools:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-mail:${spring_boot_version}" @@ -421,12 +427,12 @@ dependencies { } implementation "io.springfox:springfox-bean-validators:3.0.0" implementation "com.mysql:mysql-connector-j:9.0.0" - implementation "org.postgresql:postgresql:42.7.3" + implementation "org.postgresql:postgresql:42.7.4" implementation "org.zalando:problem-spring-web:0.29.1" implementation "org.zalando:jackson-datatype-problem:0.27.1" implementation "com.ibm.icu:icu4j-charset:75.1" - implementation "com.github.seancfoley:ipaddress:5.5.0" + implementation "com.github.seancfoley:ipaddress:5.5.1" implementation "org.apache.maven:maven-model:3.9.9" // NOTE: 3.0.2 is broken for splitting lecture specific PDFs implementation "org.apache.pdfbox:pdfbox:3.0.1" @@ -442,6 +448,9 @@ dependencies { // use newest version of gson to avoid security issues through outdated dependencies implementation "com.google.code.gson:gson:2.11.0" + + implementation "com.google.errorprone:error_prone_annotations:2.31.0" + annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}" annotationProcessor("org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}") { exclude group: "jakarta.ws.rs", module: "jsr311-api" @@ -474,7 +483,7 @@ dependencies { 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" - testImplementation "org.apache.maven.surefire:surefire-report-parser:3.4.0" + testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.0" testImplementation "com.opencsv:opencsv:5.9" testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") { exclude group: "org.testcontainers", module: "mariadb" @@ -486,7 +495,7 @@ dependencies { } testImplementation("net.bytebuddy:byte-buddy") { version { - strictly "1.14.19" + strictly "1.15.1" } } // cannot update due to "Syntax error in SQL statement "WITH ids_to_delete" diff --git a/docs/user/exercises/programming-exercise-features.inc b/docs/user/exercises/programming-exercise-features.inc index e73c16088efe..3675a9e4c2b0 100644 --- a/docs/user/exercises/programming-exercise-features.inc +++ b/docs/user/exercises/programming-exercise-features.inc @@ -33,6 +33,8 @@ Instructors can still use those templates to generate programming exercises and +----------------------+----------+---------+ | OCaml | yes | no | +----------------------+----------+---------+ + | Rust | 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. @@ -63,6 +65,8 @@ 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 | + +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+ - *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. - *Static Code Analysis*: ``Artemis`` can generate a build plan which additionally executes static code analysis tools. diff --git a/gradle.properties b/gradle.properties index cfff6f39ed14..80dbe5279b3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,23 +6,22 @@ node_version=20.14.0 npm_version=10.7.0 # Dependency versions -jhipster_dependencies_version=8.6.0 -spring_boot_version=3.3.2 -spring_security_version=6.3.2 -# TODO: before we upgrade to 6.5.x, we need to make sure that there are no performance issues with empty sets or lists -hibernate_version=6.4.9.Final +jhipster_dependencies_version=8.7.0 +spring_boot_version=3.3.3 +spring_security_version=6.3.3 +# TODO: upgrading to 6.6.0 currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code +hibernate_version=6.4.10.Final # TODO: can we update to 5.x? opensaml_version=4.3.2 jwt_version=0.12.6 jaxb_runtime_version=4.0.5 -# TODO: we cannot update to 5.5.0 because we currently use the CP Subsystem for fenced locks, however CP Subsystem is only available to Enterprise customers -hazelcast_version=5.4.0 +hazelcast_version=5.5.0 junit_version=5.10.2 -mockito_version=5.12.0 +mockito_version=5.13.0 fasterxml_version=2.17.2 jgit_version=6.10.0.202406032230-r sshd_version=2.13.2 -checkstyle_version=10.17.0 +checkstyle_version=10.18.1 jplag_version=5.1.0 slf4j_version=2.0.16 sentry_version=7.14.0 diff --git a/package-lock.json b/package-lock.json index 4ac4c8f4a4b4..e0f6197e7588 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,18 +10,18 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@angular/animations": "18.2.1", - "@angular/cdk": "18.2.1", - "@angular/common": "18.2.1", - "@angular/compiler": "18.2.1", - "@angular/core": "18.2.1", - "@angular/forms": "18.2.1", - "@angular/localize": "18.2.1", - "@angular/material": "18.2.1", - "@angular/platform-browser": "18.2.1", - "@angular/platform-browser-dynamic": "18.2.1", - "@angular/router": "18.2.1", - "@angular/service-worker": "18.2.1", + "@angular/animations": "18.2.2", + "@angular/cdk": "18.2.2", + "@angular/common": "18.2.2", + "@angular/compiler": "18.2.2", + "@angular/core": "18.2.2", + "@angular/forms": "18.2.2", + "@angular/localize": "18.2.2", + "@angular/material": "18.2.2", + "@angular/platform-browser": "18.2.2", + "@angular/platform-browser-dynamic": "18.2.2", + "@angular/router": "18.2.2", + "@angular/service-worker": "18.2.2", "@ctrl/ngx-emoji-mart": "9.2.0", "@danielmoncada/angular-datetime-picker": "18.1.0", "@fingerprintjs/fingerprintjs": "4.4.3", @@ -31,16 +31,14 @@ "@fortawesome/free-regular-svg-icons": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", "@ls1intum/apollon": "3.3.14", - "@ng-bootstrap/ng-bootstrap": "17.0.0", + "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", - "@sentry/angular": "8.26.0", + "@sentry/angular": "8.27.0", "@swimlane/ngx-charts": "20.5.0", "@swimlane/ngx-graph": "8.4.0", "@vscode/codicons": "0.0.36", - "ace-builds": "1.36.0", "bootstrap": "5.3.3", - "brace": "0.11.1", "compare-versions": "6.1.1", "core-js": "3.38.1", "crypto-js": "4.2.0", @@ -61,12 +59,12 @@ "ngx-infinite-scroll": "18.0.0", "ngx-webstorage": "18.0.0", "papaparse": "5.4.1", - "posthog-js": "1.157.2", + "posthog-js": "1.160.0", "rxjs": "7.8.1", "showdown": "2.1.0", "showdown-highlight": "3.1.0", "showdown-katex": "0.6.0", - "simple-statistics": "7.8.4", + "simple-statistics": "7.8.5", "smoothscroll-polyfill": "0.4.4", "sockjs-client": "1.6.1", "split.js": "1.6.5", @@ -79,33 +77,33 @@ }, "devDependencies": { "@angular-builders/jest": "18.0.0", - "@angular-devkit/build-angular": "18.2.1", + "@angular-devkit/build-angular": "18.2.2", "@angular-eslint/builder": "18.3.0", "@angular-eslint/eslint-plugin": "18.3.0", "@angular-eslint/eslint-plugin-template": "18.3.0", "@angular-eslint/schematics": "18.3.0", "@angular-eslint/template-parser": "18.3.0", - "@angular/cli": "18.2.1", - "@angular/compiler-cli": "18.2.1", - "@angular/language-service": "18.2.1", - "@sentry/types": "8.26.0", + "@angular/cli": "18.2.2", + "@angular/compiler-cli": "18.2.2", + "@angular/language-service": "18.2.2", + "@sentry/types": "8.27.0", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", "@types/jest": "29.5.12", "@types/lodash-es": "4.17.12", - "@types/node": "22.5.0", + "@types/node": "22.5.1", "@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.2.0", - "@typescript-eslint/parser": "8.2.0", + "@typescript-eslint/eslint-plugin": "8.3.0", + "@typescript-eslint/parser": "8.3.0", "eslint": "9.9.1", "eslint-config-prettier": "9.1.0", "eslint-plugin-deprecation": "3.0.0", - "eslint-plugin-jest": "28.8.0", + "eslint-plugin-jest": "28.8.1", "eslint-plugin-jest-extended": "2.4.0", "eslint-plugin-prettier": "5.2.1", "folder-hash": "4.0.4", @@ -118,7 +116,7 @@ "jest-junit": "16.0.0", "jest-preset-angular": "14.2.2", "lint-staged": "15.2.9", - "ng-mocks": "14.13.0", + "ng-mocks": "14.13.1", "prettier": "3.3.3", "sass": "1.77.8", "ts-jest": "29.2.5", @@ -211,13 +209,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1802.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.1.tgz", - "integrity": "sha512-XTnJfCBMDQl3xF4w/eNrq821gbj2Ig1cqbzpRflhz4pqrANTAfHfPoIC7piWEZ60FNlHapzb6fvh6tJUGXG9og==", + "version": "0.1802.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.2.tgz", + "integrity": "sha512-LPRl9jhcf0NgshaL6RoUy1uL/cAyNt7oxctoZ9EHUu8eh5E9W/jZGhVowjOLpirwqYhmEzKJJIeS49Ssqs3RQg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.1", + "@angular-devkit/core": "18.2.2", "rxjs": "7.8.1" }, "engines": { @@ -227,17 +225,17 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.1.tgz", - "integrity": "sha512-ANsTWKjIlEvJ6s276TbwnDhkoHhQDfsNiRFUDRGBZu94UNR78ImQZSyKYGHJOeQQH6jpBtraA1rvW5WKozAtlw==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.2.tgz", + "integrity": "sha512-7HEnTN2T1jnjuItXKcApOsoYGgfou4+POju3ZbwIQukDZ3B2COskvQkVTxqPNrQ0ZjT2mxZYoVlmGW9M+7N25g==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.1", - "@angular-devkit/build-webpack": "0.1802.1", - "@angular-devkit/core": "18.2.1", - "@angular/build": "18.2.1", + "@angular-devkit/architect": "0.1802.2", + "@angular-devkit/build-webpack": "0.1802.2", + "@angular-devkit/core": "18.2.2", + "@angular/build": "18.2.2", "@babel/core": "7.25.2", "@babel/generator": "7.25.0", "@babel/helper-annotate-as-pure": "7.24.7", @@ -248,7 +246,7 @@ "@babel/preset-env": "7.25.3", "@babel/runtime": "7.25.0", "@discoveryjs/json-ext": "0.6.1", - "@ngtools/webpack": "18.2.1", + "@ngtools/webpack": "18.2.2", "@vitejs/plugin-basic-ssl": "1.1.0", "ansi-colors": "4.1.3", "autoprefixer": "10.4.20", @@ -290,7 +288,7 @@ "tslib": "2.6.3", "vite": "5.4.0", "watchpack": "2.4.1", - "webpack": "5.93.0", + "webpack": "5.94.0", "webpack-dev-middleware": "7.3.0", "webpack-dev-server": "5.0.4", "webpack-merge": "6.0.1", @@ -381,13 +379,13 @@ "license": "0BSD" }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1802.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.1.tgz", - "integrity": "sha512-xOP9Hxkj/mWYdMTa/8uNxFTv7z+3UiGdt4VAO7vetV5qkU/S9rRq8FEKviCc2llXfwkhInSgeeHpWKdATa+YIQ==", + "version": "0.1802.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.2.tgz", + "integrity": "sha512-Pj+YmKh0nJOKl6QAsqYh3SqfuVJrFqjyp5WrG9BgfsMD9GCMD+5teMHNYJlp+vG/C8e7VdZp4rqOon8K9Xn4Mw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1802.1", + "@angular-devkit/architect": "0.1802.2", "rxjs": "7.8.1" }, "engines": { @@ -401,9 +399,9 @@ } }, "node_modules/@angular-devkit/core": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.1.tgz", - "integrity": "sha512-fSuGj6CxiTFR+yjuVcaWqaVb5Wts39CSBYRO1BlsOlbuWFZ2NKC/BAb5bdxpB31heCBJi7e3XbPvcMMJIcnKlA==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.2.tgz", + "integrity": "sha512-Zz0tGptI/QQnUBDdp+1G5wGwQWMjpfe2oO+UohkrDVgFS71yVj4VDnOy51kMTxBvzw+36evTgthPpmzqPIfxBw==", "dev": true, "license": "MIT", "dependencies": { @@ -429,13 +427,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.1.tgz", - "integrity": "sha512-2t/q0Jcv7yqhAzEdNgsxoGSCmPgD4qfnVOJ7EJw3LNIA+kX1CmtN4FESUS0i49kN4AyNJFAI5O2pV8iJiliKaw==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.2.tgz", + "integrity": "sha512-PU6+3nX+gQ3gofR7BGwXuvNUNeeV2raURaZjlPfGpBqjyTBxukMV71QsTTWptAZT4WibCWkTFp6X1gvsOGbjMg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.1", + "@angular-devkit/core": "18.2.2", "jsonc-parser": "3.3.1", "magic-string": "0.30.11", "ora": "5.4.1", @@ -548,9 +546,9 @@ } }, "node_modules/@angular/animations": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.1.tgz", - "integrity": "sha512-jit452yuE6DMVV09E6RAjgapgw64mMVH31ccpPvMDekzPsTuP3KNKtgRFU/k2DFhYJvyczM1AqqlgccE/JGaRw==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.2.tgz", + "integrity": "sha512-jh/dGrY77HGm54HdTiQsxmvoRfFeJgHeWAK2+nWCPoc4b7OHcWxy/04cYffs0/27ThmABmppP7ERAyZ0f60uow==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -559,18 +557,18 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.1" + "@angular/core": "18.2.2" } }, "node_modules/@angular/build": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.1.tgz", - "integrity": "sha512-HwzjB+I31cAtjTTbbS2NbayzfcWthaKaofJlSmZIst3PN+GwLZ8DU0DRpd/xu5AXkk+DoAIWd+lzUIaqngz6ow==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.2.tgz", + "integrity": "sha512-okaDdTMXnDhvnnnih6rPQnexL6htfEAPr19bB1Ci9d31gEjVuKZCjlcw2sPZ6BUyilwC9nZlCI5vbH1Ljf6mzA==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.1", + "@angular-devkit/architect": "0.1802.2", "@babel/core": "7.25.2", "@babel/helper-annotate-as-pure": "7.24.7", "@babel/helper-split-export-declaration": "7.24.7", @@ -650,9 +648,9 @@ } }, "node_modules/@angular/cdk": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.1.tgz", - "integrity": "sha512-6y4MmpEPXze6igUHkLsBUPkxw32F8+rmW0xVXZchkSyGlFgqfh53ueXoryWb0qL4s5enkNY6AzXnKAqHfPNkVQ==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.2.tgz", + "integrity": "sha512-+u7ZcMA24WO03vDzlBJJWq+okZLFDeW9JrtHzrdiT09FDt4sdUp+7PddXaZcRHIXjJL+CaCLQ6slaqPNEufqgg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -667,18 +665,18 @@ } }, "node_modules/@angular/cli": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.1.tgz", - "integrity": "sha512-SomUFDHanY4o7k3XBGf1eFt4z1h05IGJHfcbl2vxoc0lY59VN13m/pZsD2AtpqtJTzLQT02XQOUP4rmBbGoQ+Q==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.2.tgz", + "integrity": "sha512-HVVaMxnbID0q+V3KE+JqzGbPHcBUFo1RKhBZ/jxY7USZNzgtyYbRc0IYqPWNdr99UT5QefTJrjVazJo1nqQZvQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1802.1", - "@angular-devkit/core": "18.2.1", - "@angular-devkit/schematics": "18.2.1", + "@angular-devkit/architect": "0.1802.2", + "@angular-devkit/core": "18.2.2", + "@angular-devkit/schematics": "18.2.2", "@inquirer/prompts": "5.3.8", "@listr2/prompt-adapter-inquirer": "2.0.15", - "@schematics/angular": "18.2.1", + "@schematics/angular": "18.2.2", "@yarnpkg/lockfile": "1.1.0", "ini": "4.1.3", "jsonc-parser": "3.3.1", @@ -701,9 +699,9 @@ } }, "node_modules/@angular/common": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.1.tgz", - "integrity": "sha512-N0ZJO1/iU9UhprplZRPvBcdRgA/i6l6Ng5gXs5ymHBJ0lxsB+mDVCmC4jISjR9gAWc426xXwLaOpuP5Gv3f/yg==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.2.tgz", + "integrity": "sha512-AQe4xnnNNch/sXRnV82C8FmhijxPATKfPGojC2qbAG2o6VkWKgt5Lbj0O8WxvSIOS5Syedv+O2kLY/JMGWHNtw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -712,14 +710,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.1", + "@angular/core": "18.2.2", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.1.tgz", - "integrity": "sha512-5e9ygKEcsBoV6xpaGKVrtsLxLETlrM0oB7twl4qG/xuKYqCLj8cRQMcAKSqDfTPzWMOAQc7pHdk+uFVo/8dWHA==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.2.tgz", + "integrity": "sha512-gmVNCXZiv/CIk2eKRLnH19N9VsPuE2s3Oxm0MNi003zk1cLy7D4YEm4fSrjKXtPY8MMpRXiu5f63W94hLwWEVw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -728,7 +726,7 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.1" + "@angular/core": "18.2.2" }, "peerDependenciesMeta": { "@angular/core": { @@ -737,9 +735,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.1.tgz", - "integrity": "sha512-D+Qba0r6RfHfffzrebGYp54h05AxpkagLjit/GczKNgWSP1gIgZxSfi88D+GvFmeWvZxWN1ecAQ+yqft9hJqWg==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.2.tgz", + "integrity": "sha512-fF7lDrTA12YGqVjF4LyMi4hm58cv9G6CWmzSlvun0nMYCwrbRNnakZsj19dOfiIqqu4MwHaF4w3PTmUSxkMuiw==", "license": "MIT", "dependencies": { "@babel/core": "7.25.2", @@ -760,14 +758,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.1", + "@angular/compiler": "18.2.2", "typescript": ">=5.4 <5.6" } }, "node_modules/@angular/core": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.1.tgz", - "integrity": "sha512-9KrSpJ65UlJZNXrE18NszcfOwb5LZgG+LYi5Doe7amt218R1bzb3trvuAm0ZzMaoKh4ugtUCkzEOd4FALPEX6w==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.2.tgz", + "integrity": "sha512-Rx6XajL0Ydj9hXUSPDvL2Q/kMzWtbiE3VxZFJnkE+fLQiWvr0GncB+NTb/nQ6QlPQ0ly60DvuI3KLcGDuFtGVA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -781,9 +779,9 @@ } }, "node_modules/@angular/forms": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.1.tgz", - "integrity": "sha512-T7z8KUuj2PoPxrMrAruQVJha+x4a9Y6IrKYtArgOQQlTwCEJuqpVYuOk5l3fwWpHE9bVEjvgkAMI1D5YXA/U6w==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.2.tgz", + "integrity": "sha512-K8cv0w6o7+ocQfUrdSA3XaKrYfa1+2TlmtyxPHjEd2mCu2R+Yqo5RqJ3P8keFewJ1+bSLhz6xnn6mumwl0RnUQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -792,16 +790,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.1", - "@angular/core": "18.2.1", - "@angular/platform-browser": "18.2.1", + "@angular/common": "18.2.2", + "@angular/core": "18.2.2", + "@angular/platform-browser": "18.2.2", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-service": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.1.tgz", - "integrity": "sha512-JI4oox9ELNdDVg0uJqCwgyFoK4XrowV14wSoNpGhpTLModRg3eDS6q+8cKn27cjTQRZvpReyYSTfiZMB8j4eqQ==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.2.tgz", + "integrity": "sha512-aROQNQeLf+o+F5OVvE/9BUe/Tpv8pjzmrZlogBbic5cb4IqSNhR4RjxbgIyXBO/6bhLCZwqfmMqRbW2J2xqMkg==", "dev": true, "license": "MIT", "engines": { @@ -809,9 +807,9 @@ } }, "node_modules/@angular/localize": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.1.tgz", - "integrity": "sha512-nNdB6ehXCSBpQ75sTh6Gcwy2rgExfZEkGcPARJLpjqQlHO+Mk3b1y3ka6XT9M2qQYUeyukncTFUMEZWwHICsOA==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.2.tgz", + "integrity": "sha512-grWQ3CVbizOWCthGpyIlNNnZCpF/xpWYa6tIsPzKOXLCyqFQ7vOEtSludNN1nsUmMlZQt76+wA17Fx0qcNx0EA==", "license": "MIT", "dependencies": { "@babel/core": "7.25.2", @@ -828,21 +826,21 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.1", - "@angular/compiler-cli": "18.2.1" + "@angular/compiler": "18.2.2", + "@angular/compiler-cli": "18.2.2" } }, "node_modules/@angular/material": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.1.tgz", - "integrity": "sha512-DBSJGqLttT9vYpLGWTuuRoOKd1mNelS0jnNo7jNZyMpjcGfuhNzmPtYiBkXfNsAl7YoXoUmX8+4uh1JZspQGqA==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.2.tgz", + "integrity": "sha512-c+EQo1GEvM2w3qasgV/BGxB0bpJeSGs2WcMVTXCYVMcqEk8nwpALwfZiCAYl8JoKoiC5k993zz19xP2Eu14qkQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/animations": "^18.0.0 || ^19.0.0", - "@angular/cdk": "18.2.1", + "@angular/cdk": "18.2.2", "@angular/common": "^18.0.0 || ^19.0.0", "@angular/core": "^18.0.0 || ^19.0.0", "@angular/forms": "^18.0.0 || ^19.0.0", @@ -851,9 +849,9 @@ } }, "node_modules/@angular/platform-browser": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.1.tgz", - "integrity": "sha512-hQABX7QotGmCIR3EhCBCDh5ZTvQao+JkuK5CCw2G1PkRfJMBwEpjNqnyhz41hZhWiGlucp9jgbeypppW+mIQEw==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.2.tgz", + "integrity": "sha512-Bfvl8elCFxyJ9vlwamr4X5sVMcp/tSwBal2coyl0WR+/PH2PAAtf+/WMYxIN90yZmPiJx6RZWUSJRlHOFiFp3A==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -862,9 +860,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "18.2.1", - "@angular/common": "18.2.1", - "@angular/core": "18.2.1" + "@angular/animations": "18.2.2", + "@angular/common": "18.2.2", + "@angular/core": "18.2.2" }, "peerDependenciesMeta": { "@angular/animations": { @@ -873,9 +871,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.1.tgz", - "integrity": "sha512-tYJHtshbaKrtnRA15k3vrveSVBqkVUGhINvGugFA2vMtdTOfhfPw+hhzYrcwJibgU49rHogCfI9mkIbpNRYntA==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.2.tgz", + "integrity": "sha512-UM/+1nY4iIj1v4lxAmV3XRHPAh/4qfNKScCLq8tJGot64rPCbtCl0Rl8rFFGqxAFvTErVDaJycUgWNZSfVl/hw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -884,16 +882,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.1", - "@angular/compiler": "18.2.1", - "@angular/core": "18.2.1", - "@angular/platform-browser": "18.2.1" + "@angular/common": "18.2.2", + "@angular/compiler": "18.2.2", + "@angular/core": "18.2.2", + "@angular/platform-browser": "18.2.2" } }, "node_modules/@angular/router": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.1.tgz", - "integrity": "sha512-gVyqW6fYnG7oq1DlZSXJMQ2Py2dJQB7g6XVtRcYB1gR4aeowx5N9ws7PjqAi0ih91ASq2MmP4OlSSWLq+eaMGg==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.2.tgz", + "integrity": "sha512-tBHwuNtZNjzYAoVdveTI1ke/ZnQjKhc7gqDk9HCH2JUpdQhGbTvCKwDM51ktJpPMPcZlA263lQyy7VIyvdtK0A==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -902,16 +900,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.1", - "@angular/core": "18.2.1", - "@angular/platform-browser": "18.2.1", + "@angular/common": "18.2.2", + "@angular/core": "18.2.2", + "@angular/platform-browser": "18.2.2", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/service-worker": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.1.tgz", - "integrity": "sha512-Is4arGy+4HjyvALmR/GsWI4SwXYVJ1IkauAgxPsQKvWLNHdX7a/CEgEEVQGXq96H46QX9O2OcW69PnPatmJIXg==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.2.tgz", + "integrity": "sha512-az0v0gNkAjOQ4DThDWfNJv2DkH63B4Vj/WnXd8pbY/C7Be6w3S1mN2y9vJClWAzUH/GSLQHnOrZJfnZtTc8M0w==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -923,8 +921,8 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.1", - "@angular/core": "18.2.1" + "@angular/common": "18.2.2", + "@angular/core": "18.2.2" } }, "node_modules/@babel/code-frame": { @@ -1285,13 +1283,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", - "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", + "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", "license": "MIT", "dependencies": { "@babel/template": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/types": "^7.25.6" }, "engines": { "node": ">=6.9.0" @@ -1313,12 +1311,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.4.tgz", - "integrity": "sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.4" + "@babel/types": "^7.25.6" }, "bin": { "parser": "bin/babel-parser.js" @@ -1506,13 +1504,13 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz", - "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==", + "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==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -2723,16 +2721,16 @@ } }, "node_modules/@babel/traverse": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.4.tgz", - "integrity": "sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", + "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.4", - "@babel/parser": "^7.25.4", + "@babel/generator": "^7.25.6", + "@babel/parser": "^7.25.6", "@babel/template": "^7.25.0", - "@babel/types": "^7.25.4", + "@babel/types": "^7.25.6", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -2741,12 +2739,12 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.25.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.5.tgz", - "integrity": "sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", + "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.4", + "@babel/types": "^7.25.6", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -2756,9 +2754,9 @@ } }, "node_modules/@babel/types": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.4.tgz", - "integrity": "sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.24.8", @@ -4096,6 +4094,16 @@ "node": ">=8" } }, + "node_modules/@jest/console/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/console/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4220,6 +4228,16 @@ "node": ">=8" } }, + "node_modules/@jest/core/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/core/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4417,6 +4435,16 @@ "node": ">=8" } }, + "node_modules/@jest/reporters/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/reporters/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4490,6 +4518,16 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/@jest/test-sequencer/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/transform": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", @@ -4587,6 +4625,16 @@ "node": ">=8" } }, + "node_modules/@jest/transform/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/transform/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -5047,9 +5095,9 @@ ] }, "node_modules/@ng-bootstrap/ng-bootstrap": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-17.0.0.tgz", - "integrity": "sha512-hTbBtozJlpevF1RO6J2adCoXiAkMTPV3wmXIyK05dVha4VsKjHibgaL6YldToKoh6ElQnIYkPEIJHX9z5EtyMw==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-17.0.1.tgz", + "integrity": "sha512-utbm8OXIoqVVYGVzQkOS773ymbjc+UMkXv8lyi7hTqLhCQs0rZ0yA74peqVZRuOGXLHgcSTA7fnJhA80iQOblw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -5064,9 +5112,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.1.tgz", - "integrity": "sha512-v86U3jOoy5R9ZWe9Q0LbHRx/IBw1lbn0ldBU+gIIepREyVvb9CcH/vAyIb2Fw1zaYvvfG1OyzdrHyW8iGXjdnQ==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.2.tgz", + "integrity": "sha512-YhADmc+lVjLt3kze07A+yLry2yzcghdclu+7D3EDfa6fG2Pk33HK3MY2I0Z0BO+Ivoq7cV7yxm+naR+Od0Y5ng==", "dev": true, "license": "MIT", "engines": { @@ -5711,14 +5759,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.1.tgz", - "integrity": "sha512-bBV7I+MCbdQmBPUFF4ECg37VReM0+AdQsxgwkjBBSYExmkErkDoDgKquwL/tH7stDCc5IfTd0g9BMeosRgDMug==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.2.tgz", + "integrity": "sha512-0uPA1kQ38RnbNrzMlveX/QAqQIDu2INl5IYd3EUbJZRfYSp1VVyOSyuIBJ+1iUl5Y5VUa2uylaVZXhFdKWprXw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.1", - "@angular-devkit/schematics": "18.2.1", + "@angular-devkit/core": "18.2.2", + "@angular-devkit/schematics": "18.2.2", "jsonc-parser": "3.3.1" }, "engines": { @@ -5728,73 +5776,73 @@ } }, "node_modules/@sentry-internal/browser-utils": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.26.0.tgz", - "integrity": "sha512-O2Tj+WK33/ZVp5STnz6ZL0OO+/Idk2KqsH0ITQkQmyZ2z0kdzWOeqK7s7q3/My6rB1GfPcyqPcBBv4dVv92FYQ==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.27.0.tgz", + "integrity": "sha512-YTIwQ1GM1NTRXgN4DvpFSQ2x4pjlqQ0FQAyHW5x2ZYv4z7VmqG4Xkid1P/srQUipECk6nxkebfD4WR19nLsvnQ==", "license": "MIT", "dependencies": { - "@sentry/core": "8.26.0", - "@sentry/types": "8.26.0", - "@sentry/utils": "8.26.0" + "@sentry/core": "8.27.0", + "@sentry/types": "8.27.0", + "@sentry/utils": "8.27.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/feedback": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.26.0.tgz", - "integrity": "sha512-hQtw1gg8n6ERK1UH47F7ZI1zOsbhu0J2VX+TrnkpaQR2FgxDW1oe9Ja6oCV4CQKuR4w+1ZI/Kj4imSt0K33kEw==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.27.0.tgz", + "integrity": "sha512-b71PQc9aK1X9b/SO1DiJlrnAEx4n0MzPZQ/tKd9oRWDyGit6pJWZfQns9r2rvc96kJPMOTxFAa/upXRCkA723A==", "license": "MIT", "dependencies": { - "@sentry/core": "8.26.0", - "@sentry/types": "8.26.0", - "@sentry/utils": "8.26.0" + "@sentry/core": "8.27.0", + "@sentry/types": "8.27.0", + "@sentry/utils": "8.27.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.26.0.tgz", - "integrity": "sha512-JDY7W2bswlp5c3483lKP4kcb75fHNwGNfwD8x8FsY9xMjv7nxeXjLpR5cCEk1XqPq2+n6w4j7mJOXhEXGiUIKg==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.27.0.tgz", + "integrity": "sha512-Ofucncaon98dvlxte2L//hwuG9yILSxNrTz/PmO0k+HzB9q+oBic4667QF+azWR2qv4oKSWpc+vEovP3hVqveA==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.26.0", - "@sentry/core": "8.26.0", - "@sentry/types": "8.26.0", - "@sentry/utils": "8.26.0" + "@sentry-internal/browser-utils": "8.27.0", + "@sentry/core": "8.27.0", + "@sentry/types": "8.27.0", + "@sentry/utils": "8.27.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay-canvas": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.26.0.tgz", - "integrity": "sha512-2CFQW6f9aJHIo/DqmqYa9PaYoLn1o36ywc0h8oyGrD4oPCbrnE5F++PmTdc71GBODu41HBn/yoCTLmxOD+UjpA==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.27.0.tgz", + "integrity": "sha512-uuEfiWbjwugB9M4KxXxovHYiKRqg/R6U4EF8xM/Ub4laUuEcWsfRp7lQ3MxL3qYojbca8ncIFic2bIoKMPeejA==", "license": "MIT", "dependencies": { - "@sentry-internal/replay": "8.26.0", - "@sentry/core": "8.26.0", - "@sentry/types": "8.26.0", - "@sentry/utils": "8.26.0" + "@sentry-internal/replay": "8.27.0", + "@sentry/core": "8.27.0", + "@sentry/types": "8.27.0", + "@sentry/utils": "8.27.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/angular": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.26.0.tgz", - "integrity": "sha512-9YolcJMdEzS6hbImal3jrAbzGZGM7DpmfSOfzt1Cs4bYTD9gCxKRkLyUgiNRIlrIBO7CkdpMrCSY+nEohvCw7A==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.27.0.tgz", + "integrity": "sha512-0BjjrqnVMofVbQGEwfZgYAZWFl4ewkWRjcUj+NIX4iJpRZZniKZxo6XOlo/pTkt4oVHsbNHJO0C1tS+gRZFErg==", "license": "MIT", "dependencies": { - "@sentry/browser": "8.26.0", - "@sentry/core": "8.26.0", - "@sentry/types": "8.26.0", - "@sentry/utils": "8.26.0", + "@sentry/browser": "8.27.0", + "@sentry/core": "8.27.0", + "@sentry/types": "8.27.0", + "@sentry/utils": "8.27.0", "tslib": "^2.4.1" }, "engines": { @@ -5808,52 +5856,52 @@ } }, "node_modules/@sentry/browser": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.26.0.tgz", - "integrity": "sha512-e5s6eKlwLZWzTwQcBwqyAGZMMuQROW9Z677VzwkSyREWAIkKjfH2VBxHATnNGc0IVkNHjD7iH3ixo3C0rLKM3w==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.27.0.tgz", + "integrity": "sha512-eL1eaHwoYUGkp4mpeYesH6WtCrm+0u9jYCW5Lm0MAeTmpx22BZKEmj0OljuUJXGnJwFbvPDlRjyz6QG11m8kZA==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.26.0", - "@sentry-internal/feedback": "8.26.0", - "@sentry-internal/replay": "8.26.0", - "@sentry-internal/replay-canvas": "8.26.0", - "@sentry/core": "8.26.0", - "@sentry/types": "8.26.0", - "@sentry/utils": "8.26.0" + "@sentry-internal/browser-utils": "8.27.0", + "@sentry-internal/feedback": "8.27.0", + "@sentry-internal/replay": "8.27.0", + "@sentry-internal/replay-canvas": "8.27.0", + "@sentry/core": "8.27.0", + "@sentry/types": "8.27.0", + "@sentry/utils": "8.27.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/core": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.26.0.tgz", - "integrity": "sha512-g/tVmTZD4GNbLFf++hKJfBpcCAtduFEMLnbfa9iT/QEZjlmP+EzY+GsH9bafM5VsNe8DiOUp+kJKWtShzlVdBA==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.27.0.tgz", + "integrity": "sha512-4frlXluHT3Du+Omw91K04jpvbfMtydvg4Bxj2+gt/DT19Swhm/fbEpzdUjgbAd3Jinj/n0qk/jFRXjr9JZKFjg==", "license": "MIT", "dependencies": { - "@sentry/types": "8.26.0", - "@sentry/utils": "8.26.0" + "@sentry/types": "8.27.0", + "@sentry/utils": "8.27.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/types": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.26.0.tgz", - "integrity": "sha512-zKmh6SWsJh630rpt7a9vP4Cm4m1C2gDTUqUiH565CajCL/4cePpNWYrNwalSqsOSL7B9OrczA1+n6a6XvND+ng==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.27.0.tgz", + "integrity": "sha512-B6lrP46+m2x0lfqWc9F4VcUbN893mVGnPEd7KIMRk95mPzkFJ3sNxggTQF5/ZfNO7lDQYQb22uysB5sj/BqFiw==", "license": "MIT", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.26.0.tgz", - "integrity": "sha512-xvlPU9Hd2BlyT+FhWHGNwnxWqdVRk2AHnDtVcW4Ma0Ri5EwS+uy4Jeik5UkSv8C5RVb9VlxFmS8LN3I1MPJsLw==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.27.0.tgz", + "integrity": "sha512-gyJM3SyLQe0A3mkQVVNdKYvk3ZoikkYgyA/D+5StFNLKdyUgEbJgXOGXrQSSYPF7BSX6Sc5b0KHCglPII0KuKw==", "license": "MIT", "dependencies": { - "@sentry/types": "8.26.0" + "@sentry/types": "8.27.0" }, "engines": { "node": ">=14.18" @@ -6273,27 +6321,18 @@ } }, "node_modules/@types/eslint": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz", - "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", "dev": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "@types/estree": "*", "@types/json-schema": "*" } }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", @@ -6456,9 +6495,9 @@ } }, "node_modules/@types/node": { - "version": "22.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.0.tgz", - "integrity": "sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==", + "version": "22.5.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz", + "integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==", "dev": true, "license": "MIT", "dependencies": { @@ -6662,17 +6701,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.2.0.tgz", - "integrity": "sha512-02tJIs655em7fvt9gps/+4k4OsKULYGtLBPJfOsmOq1+3cdClYiF0+d6mHu6qDnTcg88wJBkcPLpQhq7FyDz0A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.3.0.tgz", + "integrity": "sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.2.0", - "@typescript-eslint/type-utils": "8.2.0", - "@typescript-eslint/utils": "8.2.0", - "@typescript-eslint/visitor-keys": "8.2.0", + "@typescript-eslint/scope-manager": "8.3.0", + "@typescript-eslint/type-utils": "8.3.0", + "@typescript-eslint/utils": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -6696,16 +6735,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.2.0.tgz", - "integrity": "sha512-j3Di+o0lHgPrb7FxL3fdEy6LJ/j2NE8u+AP/5cQ9SKb+JLH6V6UHDqJ+e0hXBkHP1wn1YDFjYCS9LBQsZDlDEg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.3.0.tgz", + "integrity": "sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "8.2.0", - "@typescript-eslint/types": "8.2.0", - "@typescript-eslint/typescript-estree": "8.2.0", - "@typescript-eslint/visitor-keys": "8.2.0", + "@typescript-eslint/scope-manager": "8.3.0", + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/typescript-estree": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0", "debug": "^4.3.4" }, "engines": { @@ -6725,14 +6764,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.2.0.tgz", - "integrity": "sha512-OFn80B38yD6WwpoHU2Tz/fTz7CgFqInllBoC3WP+/jLbTb4gGPTy9HBSTsbDWkMdN55XlVU0mMDYAtgvlUspGw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.3.0.tgz", + "integrity": "sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.2.0", - "@typescript-eslint/visitor-keys": "8.2.0" + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6743,14 +6782,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.2.0.tgz", - "integrity": "sha512-g1CfXGFMQdT5S+0PSO0fvGXUaiSkl73U1n9LTK5aRAFnPlJ8dLKkXr4AaLFvPedW8lVDoMgLLE3JN98ZZfsj0w==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.3.0.tgz", + "integrity": "sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.2.0", - "@typescript-eslint/utils": "8.2.0", + "@typescript-eslint/typescript-estree": "8.3.0", + "@typescript-eslint/utils": "8.3.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -6768,9 +6807,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.2.0.tgz", - "integrity": "sha512-6a9QSK396YqmiBKPkJtxsgZZZVjYQ6wQ/TlI0C65z7vInaETuC6HAHD98AGLC8DyIPqHytvNuS8bBVvNLKyqvQ==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.3.0.tgz", + "integrity": "sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==", "dev": true, "license": "MIT", "engines": { @@ -6782,16 +6821,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.2.0.tgz", - "integrity": "sha512-kiG4EDUT4dImplOsbh47B1QnNmXSoUqOjWDvCJw/o8LgfD0yr7k2uy54D5Wm0j4t71Ge1NkynGhpWdS0dEIAUA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.3.0.tgz", + "integrity": "sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "8.2.0", - "@typescript-eslint/visitor-keys": "8.2.0", + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", @@ -6811,16 +6850,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.2.0.tgz", - "integrity": "sha512-O46eaYKDlV3TvAVDNcoDzd5N550ckSe8G4phko++OCSC1dYIb9LTc3HDGYdWqWIAT5qDUKphO6sd9RrpIJJPfg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.3.0.tgz", + "integrity": "sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.2.0", - "@typescript-eslint/types": "8.2.0", - "@typescript-eslint/typescript-estree": "8.2.0" + "@typescript-eslint/scope-manager": "8.3.0", + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/typescript-estree": "8.3.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6834,13 +6873,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.2.0.tgz", - "integrity": "sha512-sbgsPMW9yLvS7IhCi8IpuK1oBmtbWUNP+hBdwl/I9nzqVsszGnNGti5r9dUtF5RLivHUFFIdRvLiTsPhzSyJ3Q==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.3.0.tgz", + "integrity": "sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.2.0", + "@typescript-eslint/types": "8.3.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -7076,12 +7115,6 @@ "node": ">= 0.6" } }, - "node_modules/ace-builds": { - "version": "1.36.0", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.36.0.tgz", - "integrity": "sha512-7to4F86V5N13EY4M9LWaGo2Wmr9iWe5CrYpc28F+/OyYCf7yd+xBV5x9v/GB73EBGGoYd89m6JjeIUjkL6Yw+w==", - "license": "BSD-3-Clause" - }, "node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", @@ -7505,6 +7538,16 @@ "node": ">=8" } }, + "node_modules/babel-jest/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/babel-jest/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -7856,12 +7899,6 @@ "@popperjs/core": "^2.11.8" } }, - "node_modules/brace": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz", - "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==", - "license": "MIT" - }, "node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -8099,9 +8136,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001651", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", - "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "version": "1.0.30001654", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001654.tgz", + "integrity": "sha512-wLJc602fW0OdrUR+PqsBUH3dgrjDcT+mWs/Kw86zPvgjiqOiI2TXMkBFK4KihYzZclmJxrFwgYhZDSEogFai/g==", "funding": [ { "type": "opencollective", @@ -8210,9 +8247,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", - "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz", + "integrity": "sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g==", "dev": true, "license": "MIT" }, @@ -8653,53 +8690,6 @@ "node": ">=10.13.0" } }, - "node_modules/copy-webpack-plugin/node_modules/globby": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", - "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/merge-streams": "^2.1.0", - "fast-glob": "^3.3.2", - "ignore": "^5.2.4", - "path-type": "^5.0.0", - "slash": "^5.1.0", - "unicorn-magic": "^0.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/copy-webpack-plugin/node_modules/path-type": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", - "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/copy-webpack-plugin/node_modules/slash": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", - "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/core-js": { "version": "3.38.1", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz", @@ -9663,6 +9653,16 @@ "node": ">=8" } }, + "node_modules/dir-glob/node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/dns-packet": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", @@ -9791,9 +9791,9 @@ } }, "node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "dev": true, "license": "MIT" }, @@ -10007,9 +10007,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "license": "MIT", "engines": { "node": ">=6" @@ -10222,10 +10222,41 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/eslint-plugin-deprecation/node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint-plugin-deprecation/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/eslint-plugin-jest": { - "version": "28.8.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.0.tgz", - "integrity": "sha512-Tubj1hooFxCl52G4qQu0edzV/+EZzPUeN8p2NnW5uu4fbDs+Yo7+qDVDc4/oG3FbCqEBmu/OC3LSsyiU22oghw==", + "version": "28.8.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.1.tgz", + "integrity": "sha512-G46XMyYu6PtSNJUkQ0hsPjzXYpzq/O4vpCciMizTKRJG8kNsRreGoMRDG6H9FIB/xVgfFuclVnuX4XRvFUzrZQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10393,6 +10424,37 @@ "node": ">=4.0" } }, + "node_modules/eslint-plugin-jest-extended/node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint-plugin-jest-extended/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/eslint-plugin-prettier": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", @@ -11462,21 +11524,21 @@ } }, "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", + "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", "dev": true, "license": "MIT", "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" + "@sindresorhus/merge-streams": "^2.1.0", + "fast-glob": "^3.3.2", + "ignore": "^5.2.4", + "path-type": "^5.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.1.0" }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -12826,6 +12888,16 @@ "node": ">=8" } }, + "node_modules/jest-circus/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/jest-circus/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -13058,6 +13130,16 @@ "node": ">=8" } }, + "node_modules/jest-config/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/jest-config/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -13603,6 +13685,16 @@ "node": ">=8" } }, + "node_modules/jest-message-util/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/jest-message-util/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -13786,6 +13878,16 @@ "node": ">=8" } }, + "node_modules/jest-resolve/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/jest-resolve/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -14026,6 +14128,16 @@ "node": ">=8" } }, + "node_modules/jest-runtime/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/jest-runtime/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -16137,9 +16249,9 @@ "license": "MIT" }, "node_modules/ng-mocks": { - "version": "14.13.0", - "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.0.tgz", - "integrity": "sha512-cQ6nUj/P+v7X52gYU6bAj/03iDKl2pzbPy2V0tx/d5lxME063Vxc190p6UPlJkbRIxcB+OqSALPgQvy83efzjw==", + "version": "14.13.1", + "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz", + "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==", "dev": true, "license": "MIT", "funding": { @@ -16245,9 +16357,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz", - "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", + "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", "dev": true, "license": "MIT", "bin": { @@ -17087,13 +17199,16 @@ "license": "MIT" }, "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", + "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/pepjs": { @@ -17421,9 +17536,9 @@ "license": "MIT" }, "node_modules/posthog-js": { - "version": "1.157.2", - "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.157.2.tgz", - "integrity": "sha512-ATYKGs+Q51u26nHHhrhWNh1whqFm7j/rwQQYw+y6/YzNmRlo+YsqrGZji9nqXb9/4fo0ModDr+ZmuOI3hKkUXA==", + "version": "1.160.0", + "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.160.0.tgz", + "integrity": "sha512-K/RRgmPYIpP69nnveCJfkclb8VU+R+jsgqlrKaLGsM5CtQM9g01WOzAiT3u36WLswi58JiFMXgJtECKQuoqTgQ==", "license": "MIT", "dependencies": { "fflate": "^0.4.8", @@ -18822,12 +18937,12 @@ } }, "node_modules/simple-statistics": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/simple-statistics/-/simple-statistics-7.8.4.tgz", - "integrity": "sha512-KHC7X+4Dji2rFgnPU7FxPPp4GxPz9hvQCHx2x6JbjLYNKuSMHcoNZ54gF0xBBMOAvNtWmfCHcfC4MD2T89ffEA==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/simple-statistics/-/simple-statistics-7.8.5.tgz", + "integrity": "sha512-yw4aOnkvPLbL80zamrEKznAnk5cIIkjEcx/z0aQl+m/YKMmVufrnWgWJWRspqZtwh+ElZXRhJ0MtnUjFUQV5Ow==", "license": "ISC", "engines": { - "node": ">= 18" + "node": "*" } }, "node_modules/sisteransi": { @@ -18838,13 +18953,16 @@ "license": "MIT" }, "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/slice-ansi": { @@ -21032,13 +21150,12 @@ } }, "node_modules/webpack": { - "version": "5.93.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz", - "integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", "dev": true, "license": "MIT", "dependencies": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", "@webassemblyjs/ast": "^1.12.1", "@webassemblyjs/wasm-edit": "^1.12.1", @@ -21047,7 +21164,7 @@ "acorn-import-attributes": "^1.9.5", "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.17.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", diff --git a/package.json b/package.json index da3d4a60a893..0fba06f2db55 100644 --- a/package.json +++ b/package.json @@ -13,18 +13,18 @@ "node_modules" ], "dependencies": { - "@angular/animations": "18.2.1", - "@angular/cdk": "18.2.1", - "@angular/common": "18.2.1", - "@angular/compiler": "18.2.1", - "@angular/core": "18.2.1", - "@angular/forms": "18.2.1", - "@angular/localize": "18.2.1", - "@angular/material": "18.2.1", - "@angular/platform-browser": "18.2.1", - "@angular/platform-browser-dynamic": "18.2.1", - "@angular/router": "18.2.1", - "@angular/service-worker": "18.2.1", + "@angular/animations": "18.2.2", + "@angular/cdk": "18.2.2", + "@angular/common": "18.2.2", + "@angular/compiler": "18.2.2", + "@angular/core": "18.2.2", + "@angular/forms": "18.2.2", + "@angular/localize": "18.2.2", + "@angular/material": "18.2.2", + "@angular/platform-browser": "18.2.2", + "@angular/platform-browser-dynamic": "18.2.2", + "@angular/router": "18.2.2", + "@angular/service-worker": "18.2.2", "@ctrl/ngx-emoji-mart": "9.2.0", "@danielmoncada/angular-datetime-picker": "18.1.0", "@fingerprintjs/fingerprintjs": "4.4.3", @@ -34,16 +34,14 @@ "@fortawesome/free-regular-svg-icons": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", "@ls1intum/apollon": "3.3.14", - "@ng-bootstrap/ng-bootstrap": "17.0.0", + "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", - "@sentry/angular": "8.26.0", + "@sentry/angular": "8.27.0", "@swimlane/ngx-charts": "20.5.0", "@swimlane/ngx-graph": "8.4.0", "@vscode/codicons": "0.0.36", - "ace-builds": "1.36.0", "bootstrap": "5.3.3", - "brace": "0.11.1", "compare-versions": "6.1.1", "core-js": "3.38.1", "crypto-js": "4.2.0", @@ -64,12 +62,12 @@ "ngx-infinite-scroll": "18.0.0", "ngx-webstorage": "18.0.0", "papaparse": "5.4.1", - "posthog-js": "1.157.2", + "posthog-js": "1.160.0", "rxjs": "7.8.1", "showdown": "2.1.0", "showdown-highlight": "3.1.0", "showdown-katex": "0.6.0", - "simple-statistics": "7.8.4", + "simple-statistics": "7.8.5", "smoothscroll-polyfill": "0.4.4", "sockjs-client": "1.6.1", "split.js": "1.6.5", @@ -115,33 +113,33 @@ }, "devDependencies": { "@angular-builders/jest": "18.0.0", - "@angular-devkit/build-angular": "18.2.1", + "@angular-devkit/build-angular": "18.2.2", "@angular-eslint/builder": "18.3.0", "@angular-eslint/eslint-plugin": "18.3.0", "@angular-eslint/eslint-plugin-template": "18.3.0", "@angular-eslint/schematics": "18.3.0", "@angular-eslint/template-parser": "18.3.0", - "@angular/cli": "18.2.1", - "@angular/compiler-cli": "18.2.1", - "@angular/language-service": "18.2.1", - "@sentry/types": "8.26.0", + "@angular/cli": "18.2.2", + "@angular/compiler-cli": "18.2.2", + "@angular/language-service": "18.2.2", + "@sentry/types": "8.27.0", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", "@types/jest": "29.5.12", "@types/lodash-es": "4.17.12", - "@types/node": "22.5.0", + "@types/node": "22.5.1", "@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.2.0", - "@typescript-eslint/parser": "8.2.0", + "@typescript-eslint/eslint-plugin": "8.3.0", + "@typescript-eslint/parser": "8.3.0", "eslint": "9.9.1", "eslint-config-prettier": "9.1.0", "eslint-plugin-deprecation": "3.0.0", - "eslint-plugin-jest": "28.8.0", + "eslint-plugin-jest": "28.8.1", "eslint-plugin-jest-extended": "2.4.0", "eslint-plugin-prettier": "5.2.1", "folder-hash": "4.0.4", @@ -154,7 +152,7 @@ "jest-junit": "16.0.0", "jest-preset-angular": "14.2.2", "lint-staged": "15.2.9", - "ng-mocks": "14.13.0", + "ng-mocks": "14.13.1", "prettier": "3.3.3", "sass": "1.77.8", "ts-jest": "29.2.5", diff --git a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java index 45bfdaf4a97b..f88d93656d1b 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java +++ b/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java @@ -8,6 +8,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Configuration @Profile("gitlab | gitlabci") public class GitLabApiConfiguration { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java b/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java index 3d43ae71fc93..60da52e071f2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java @@ -47,7 +47,8 @@ public enum ProgrammingLanguage { VHDL, ASSEMBLER, SWIFT, - OCAML + OCAML, + RUST ); // @formatter:on diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java deleted file mode 100644 index 4353f30a63c1..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java +++ /dev/null @@ -1,51 +0,0 @@ -package de.tum.in.www1.artemis.domain.iris.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.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; - -/** - * A IrisCompetencyGenerationSession is a session specific to a course and user. - * This is used for course editors to generate competency recommendations. - */ -@Entity -@DiscriminatorValue("COMPETENCY_GENERATION") -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class IrisCompetencyGenerationSession extends IrisSession { - - @ManyToOne - @JsonIgnore - private Course course; - - @ManyToOne - @JsonIgnore - private User user; - - public Course getCourse() { - return course; - } - - public void setCourse(Course course) { - this.course = course; - } - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - @Override - public String toString() { - return "IrisCompetencyGenerationSession{" + "id=" + getId() + ", course=" + (course == null ? "null" : course.getId()) + ", user=" - + (user == null ? "null" : user.getName()) + '}'; - } -} diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java index 16800e0021c7..816d18157234 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java @@ -37,6 +37,9 @@ public class Lti13ClientRegistration { @JsonProperty("jwks_uri") private String jwksUri; + @JsonProperty("logo_uri") + private String logoUri; + @JsonProperty("token_endpoint_auth_method") private String tokenEndpointAuthMethod; @@ -67,6 +70,7 @@ public Lti13ClientRegistration(String serverUrl, String clientRegistrationId) { this.setRedirectUris(List.of(serverUrl + "/" + CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH)); this.setInitiateLoginUri(serverUrl + "/" + CustomLti13Configurer.LTI13_LOGIN_INITIATION_PATH + "/" + clientRegistrationId); this.setJwksUri(serverUrl + "/.well-known/jwks.json"); + this.setLogoUri(serverUrl + "/public/images/logo.png"); Lti13ToolConfiguration toolConfiguration = getLti13ToolConfiguration(serverUrl); this.setLti13ToolConfiguration(toolConfiguration); @@ -83,6 +87,7 @@ private static Lti13ToolConfiguration getLti13ToolConfiguration(String serverUrl } toolConfiguration.setDomain(domain); toolConfiguration.setTargetLinkUri(serverUrl + "/courses"); + toolConfiguration.setDescription("Artemis: Interactive Learning with Individual Feedback"); toolConfiguration.setClaims(Arrays.asList("iss", "email", "sub", "name", "given_name", "family_name")); Message deepLinkingMessage = new Message(CustomLti13Configurer.LTI13_DEEPLINK_MESSAGE_REQUEST, serverUrl + "/" + CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH); toolConfiguration.setMessages(List.of(deepLinkingMessage)); @@ -145,6 +150,14 @@ public void setJwksUri(String jwksUri) { this.jwksUri = jwksUri; } + public String getLogoUri() { + return logoUri; + } + + public void setLogoUri(String logoUri) { + this.logoUri = logoUri; + } + public String getTokenEndpointAuthMethod() { return tokenEndpointAuthMethod; } @@ -179,6 +192,8 @@ public static class Lti13ToolConfiguration { @JsonProperty("target_link_uri") private String targetLinkUri; + private String description; + private List messages; private List claims; @@ -199,6 +214,14 @@ public void setTargetLinkUri(String targetLinkUri) { this.targetLinkUri = targetLinkUri; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public List getMessages() { return messages; } diff --git a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java b/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java index 44f21ed0bf25..77279e2a6593 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java +++ b/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java @@ -1,5 +1,8 @@ package de.tum.in.www1.artemis.exception; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + public class GitLabCIException extends ContinuousIntegrationException { public GitLabCIException(String message) { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java index 470e789cdb27..1187d8c0e11d 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java @@ -222,8 +222,6 @@ SELECT COUNT(c) > 0 List findAllByShortName(String shortName); - Optional findById(long courseId); - /** * Returns the title of the course with the given id. * diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java index 127e51c9efab..afac757c9ccd 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java @@ -58,7 +58,7 @@ public interface ExamRepository extends ArtemisJpaRepository { /** * Find all exams for multiple courses that are already visible to the user (either registered, at least tutor or the exam is a test exam) * - * @param courseIds set of courseIds that the exams should be retreived + * @param courseIds set of courseIds that the exams should be retrieved * @param userId the id of the user requesting the exams * @param groupNames the groups of the user requesting the exams * @param now the current date, typically ZonedDateTime.now() diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java index b86b9ea3abc3..3924394b81ee 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java @@ -39,9 +39,9 @@ Set findAllExamSessionsWithTheSameIpAddressAndBrowserFingerprintByE @Param("studentExamId") Long studentExamId, @Param("ipAddress") String ipAddress, @Param("browserFingerprintHash") String browserFingerprintHash); @Query(""" - SELECT es - FROM ExamSession es - WHERE es.studentExam.exam.id = :examId + SELECT es + FROM ExamSession es + WHERE es.studentExam.exam.id = :examId """) Set findAllExamSessionsByExamId(@Param("examId") long examId); } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java index e659f82db28d..04dd3b8732f2 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java @@ -765,6 +765,17 @@ default Page findAllWithGroupsByIsDeletedIsFalse(Pageable pageable) { """) void updateUserSshPublicKeyHash(@Param("userId") long userId, @Param("sshPublicKeyHash") String sshPublicKeyHash, @Param("sshPublicKey") String sshPublicKey); + @Modifying + @Transactional // ok because of modifying query + @Query(""" + UPDATE User user + SET user.vcsAccessToken = :vcsAccessToken, + user.vcsAccessTokenExpiryDate = :vcsAccessTokenExpiryDate + WHERE user.id = :userId + """) + void updateUserVcsAccessToken(@Param("userId") long userId, @Param("vcsAccessToken") String vcsAccessToken, + @Param("vcsAccessTokenExpiryDate") ZonedDateTime vcsAccessTokenExpiryDate); + @Modifying @Transactional // ok because of modifying query @Query(""" diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java deleted file mode 100644 index 978749785907..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.tum.in.www1.artemis.repository.iris; - -import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; - -/** - * Repository interface for managing {@link IrisCompetencyGenerationSession} entities. - */ -public interface IrisCompetencyGenerationSessionRepository extends ArtemisJpaRepository { - - /** - * Finds the latest {@link IrisCompetencyGenerationSession} based on its course and user. - * - * @param courseId The ID of the course. - * @param userId The ID of the user. - * - * @return The latest competency generation session - */ - IrisCompetencyGenerationSession findFirstByCourseIdAndUserIdOrderByCreationDateDesc(long courseId, long userId); -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java index 4143a0e00bbe..724a8f98e347 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java @@ -10,8 +10,6 @@ import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; -import javax.annotation.CheckReturnValue; - import org.hibernate.Hibernate; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; @@ -19,6 +17,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; +import com.google.errorprone.annotations.CheckReturnValue; + import de.tum.in.www1.artemis.domain.Authority; import de.tum.in.www1.artemis.domain.Course; import de.tum.in.www1.artemis.domain.Exercise; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java index f22eebc954bf..2cb70653b3d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/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 -> "assignment"; - case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVA, PYTHON, C, HASKELL, KOTLIN, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST -> "assignment"; + case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, 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 -> ""; + case JAVA, PYTHON, HASKELL, KOTLIN, SWIFT, EMPTY, RUST -> ""; case C, VHDL, ASSEMBLER, OCAML -> "tests"; - case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException("Unsupported programming language: " + language); }; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java index 4bf736963136..1b27d35bd3dd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java @@ -10,6 +10,9 @@ import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + public abstract class AbstractGitLabAuthorizationInterceptor implements ClientHttpRequestInterceptor { private static final String GITLAB_AUTHORIZATION_HEADER_NAME = "Private-Token"; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java index 9a78a348d9d8..2e461a5e1106 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java @@ -3,6 +3,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlab") @Component public class GitLabAuthorizationInterceptor extends AbstractGitLabAuthorizationInterceptor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java index b34cd9c61dba..f217ef874422 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java @@ -2,6 +2,9 @@ import de.tum.in.www1.artemis.exception.VersionControlException; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + public class GitLabException extends VersionControlException { public GitLabException() { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java index e5d5fb7b3c4e..e903ffe004f5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java @@ -31,6 +31,9 @@ /** * Provides VCS access token services for GitLab via means of personal access tokens. */ +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlab") public class GitLabPersonalAccessTokenManagementService extends VcsTokenManagementService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java index 103a58652025..4cdddb4cf7a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java @@ -66,6 +66,9 @@ import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.in.www1.artemis.service.util.UrlUtils; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlab") @Service public class GitLabService extends AbstractVersionControlService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java index 298dee6f4e1b..36f65cc51902 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java @@ -1,5 +1,8 @@ package de.tum.in.www1.artemis.service.connectors.gitlab; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + public class GitLabUserDoesNotExistException extends GitLabException { public GitLabUserDoesNotExistException(String login) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java index 9733c7a131c0..0f8f67198b55 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java @@ -28,6 +28,9 @@ import de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenManagementService; import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlab") public class GitLabUserManagementService implements VcsUserManagementService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java index b24a6013dc93..951aafa36d8d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java @@ -11,6 +11,9 @@ import de.tum.in.www1.artemis.config.Constants; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Component @Profile("gitlab") public class GitlabInfoContributor implements InfoContributor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java index 6942e2da6343..d937d570bb45 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java @@ -7,6 +7,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabCommitDTO(@JsonProperty("id") String hash, String message, ZonedDateTime timestamp, @JsonProperty("url") String commitUrl, Author author, List added, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java index 2662aef4d7d7..0ceec1bc02dc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java @@ -9,6 +9,9 @@ * * @param id The id of the personal access token. */ +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPersonalAccessTokenListResponseDTO(@JsonProperty Long id) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java index 263b15057000..154830c818b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPersonalAccessTokenRequestDTO(String name, @JsonProperty("user_id") Long userId, String[] scopes, @JsonProperty("expires_at") Date expiresAt) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java index e8f4333975f7..6920d3db2bee 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPersonalAccessTokenResponseDTO(String name, @JsonProperty("user_id") Long userId, String[] scopes, @JsonProperty("expires_at") Date expiresAt, String token) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java index 605679d176bf..71353195ac21 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabProjectDTO(int id, String name, String description, @JsonProperty("web_url") URL webUrl, @JsonProperty("git_ssh_url") String sshUrl, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java index 23858285deda..917628db09e8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java @@ -8,6 +8,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPushNotificationDTO(@JsonProperty("object_kind") String triggerType, @JsonProperty("event_name") String eventName, @JsonProperty("before") String previousHash, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java index f4e84034af8c..245eefed4498 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java @@ -5,6 +5,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabRepositoryDTO(String name, String url, String description, URL homepage) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java index 79de2d27aa42..258aa2df4269 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java @@ -5,6 +5,9 @@ import de.tum.in.www1.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Component public class GitLabCIAuthorizationInterceptor extends AbstractGitLabAuthorizationInterceptor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java index 80e9dab30be0..23500df008f1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java @@ -19,6 +19,9 @@ import de.tum.in.www1.artemis.service.ResourceLoaderService; import de.tum.in.www1.artemis.service.connectors.ci.AbstractBuildPlanCreator; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlabci") public class GitLabCIBuildPlanService extends AbstractBuildPlanCreator { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java index 832d100a7585..ee088f9d901a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java @@ -10,6 +10,9 @@ import de.tum.in.www1.artemis.config.Constants; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Component @Profile("gitlabci") public class GitLabCIInfoContributor implements InfoContributor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java index 55ecbb0e447c..661824ea06d8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java @@ -2,6 +2,7 @@ import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; @@ -13,6 +14,9 @@ import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlabci") public class GitLabCIProgrammingLanguageFeatureService extends ProgrammingLanguageFeatureService { @@ -20,5 +24,6 @@ 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)); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java index 620e22e09a55..f71e0fe8253b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java @@ -25,6 +25,9 @@ import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Service public class GitLabCIResultService extends AbstractContinuousIntegrationResultService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java index 2c78eb608c4e..45d66cf19272 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java @@ -42,6 +42,9 @@ import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Service public class GitLabCIService extends AbstractContinuousIntegrationService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java index 72c4fcb6150b..d2fe1c62525f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java @@ -15,6 +15,9 @@ import de.tum.in.www1.artemis.service.UriService; import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Service public class GitLabCITriggerService implements ContinuousIntegrationTriggerService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java index f70dd7a82ffa..e15e0dd7038f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java @@ -12,6 +12,9 @@ import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlabci") public class GitLabCIUserManagementService implements CIUserManagementService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java index 533e4c709005..d8a4abd0fea3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java @@ -6,6 +6,7 @@ import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; +import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.GCC; @@ -39,5 +40,6 @@ public JenkinsProgrammingLanguageFeatureService() { 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)); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index a97f293e1b53..929a9e1e5750 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/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 -> jenkinsBuildPlanCreator; - case VHDL, ASSEMBLER, OCAML, JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVA, KOTLIN, PYTHON, C, HASKELL, SWIFT, EMPTY, RUST -> jenkinsBuildPlanCreator; + case VHDL, ASSEMBLER, OCAML, JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, 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/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java index 276ab23671fa..101e0540521f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java @@ -8,6 +8,7 @@ import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.OCAML; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; +import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.VHDL; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT; @@ -46,5 +47,6 @@ public LocalCIProgrammingLanguageFeatureService() { 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(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)); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java index fd7e0cc0dc89..dfc7dcf776c2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java @@ -20,7 +20,6 @@ import com.hazelcast.collection.ItemEvent; import com.hazelcast.collection.ItemListener; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.cp.lock.FencedLock; import com.hazelcast.map.IMap; import de.tum.in.www1.artemis.domain.BuildJob; @@ -73,8 +72,6 @@ public class LocalCIResultProcessingService { private IMap buildAgentInformation; - private FencedLock resultQueueLock; - private UUID listenerId; public LocalCIResultProcessingService(@Qualifier("hazelcastInstance") HazelcastInstance hazelcastInstance, ProgrammingExerciseGradingService programmingExerciseGradingService, @@ -97,7 +94,6 @@ public LocalCIResultProcessingService(@Qualifier("hazelcastInstance") HazelcastI public void init() { this.resultQueue = this.hazelcastInstance.getQueue("buildResultQueue"); this.buildAgentInformation = this.hazelcastInstance.getMap("buildAgentInformation"); - this.resultQueueLock = this.hazelcastInstance.getCPSubsystem().getLock("resultQueueLock"); this.listenerId = resultQueue.addItemListener(new ResultQueueListener(), true); } @@ -112,9 +108,7 @@ public void removeListener() { public void processResult() { // set lock to prevent multiple nodes from processing the same build job - resultQueueLock.lock(); ResultQueueItem resultQueueItem = resultQueue.poll(); - resultQueueLock.unlock(); if (resultQueueItem == null) { return; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java index bdaea1f46fd5..939fa41cee19 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java @@ -27,7 +27,6 @@ import com.hazelcast.collection.IQueue; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.cp.lock.FencedLock; import com.hazelcast.map.IMap; import com.hazelcast.topic.ITopic; @@ -66,11 +65,6 @@ public class SharedQueueManagementService { private IMap dockerImageCleanupInfo; - /** - * Lock to prevent multiple nodes from processing the same build job. - */ - private FencedLock sharedLock; - private ITopic canceledBuildJobsTopic; public SharedQueueManagementService(BuildJobRepository buildJobRepository, @Qualifier("hazelcastInstance") HazelcastInstance hazelcastInstance, ProfileService profileService) { @@ -86,7 +80,6 @@ public SharedQueueManagementService(BuildJobRepository buildJobRepository, @Qual public void init() { this.buildAgentInformation = this.hazelcastInstance.getMap("buildAgentInformation"); this.processingJobs = this.hazelcastInstance.getMap("processingJobs"); - this.sharedLock = this.hazelcastInstance.getCPSubsystem().getLock("buildJobQueueLock"); this.queue = this.hazelcastInstance.getQueue("buildJobQueue"); this.canceledBuildJobsTopic = hazelcastInstance.getTopic("canceledBuildJobsTopic"); this.dockerImageCleanupInfo = this.hazelcastInstance.getMap("dockerImageCleanupInfo"); @@ -148,28 +141,22 @@ public List getBuildAgentInformationWithoutRecentBuildJob * @param buildJobId id of the build job to cancel */ public void cancelBuildJob(String buildJobId) { - sharedLock.lock(); - try { - // Remove build job if it is queued - if (queue.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) { - List toRemove = new ArrayList<>(); - for (BuildJobQueueItem job : queue) { - if (Objects.equals(job.id(), buildJobId)) { - toRemove.add(job); - } - } - queue.removeAll(toRemove); - } - else { - // Cancel build job if it is currently being processed - BuildJobQueueItem buildJob = processingJobs.remove(buildJobId); - if (buildJob != null) { - triggerBuildJobCancellation(buildJobId); + // Remove build job if it is queued + if (queue.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) { + List toRemove = new ArrayList<>(); + for (BuildJobQueueItem job : queue) { + if (Objects.equals(job.id(), buildJobId)) { + toRemove.add(job); } } + queue.removeAll(toRemove); } - finally { - sharedLock.unlock(); + else { + // Cancel build job if it is currently being processed + BuildJobQueueItem buildJob = processingJobs.remove(buildJobId); + if (buildJob != null) { + triggerBuildJobCancellation(buildJobId); + } } } @@ -188,30 +175,17 @@ private void triggerBuildJobCancellation(String buildJobId) { * Cancel all queued build jobs. */ public void cancelAllQueuedBuildJobs() { - sharedLock.lock(); - try { - log.debug("Cancelling all queued build jobs"); - queue.clear(); - } - finally { - sharedLock.unlock(); - } + log.debug("Cancelling all queued build jobs"); + queue.clear(); } /** * Cancel all running build jobs. */ public void cancelAllRunningBuildJobs() { - sharedLock.lock(); - try { - for (BuildJobQueueItem buildJob : processingJobs.values()) { - cancelBuildJob(buildJob.id()); - } - } - finally { - sharedLock.unlock(); + for (BuildJobQueueItem buildJob : processingJobs.values()) { + cancelBuildJob(buildJob.id()); } - } /** @@ -220,13 +194,7 @@ public void cancelAllRunningBuildJobs() { * @param agentName name of the agent */ public void cancelAllRunningBuildJobsForAgent(String agentName) { - sharedLock.lock(); - try { - processingJobs.values().stream().filter(job -> Objects.equals(job.buildAgentAddress(), agentName)).forEach(job -> cancelBuildJob(job.id())); - } - finally { - sharedLock.unlock(); - } + processingJobs.values().stream().filter(job -> Objects.equals(job.buildAgentAddress(), agentName)).forEach(job -> cancelBuildJob(job.id())); } /** @@ -235,19 +203,13 @@ public void cancelAllRunningBuildJobsForAgent(String agentName) { * @param courseId id of the course */ public void cancelAllQueuedBuildJobsForCourse(long courseId) { - sharedLock.lock(); - try { - List toRemove = new ArrayList<>(); - for (BuildJobQueueItem job : queue) { - if (job.courseId() == courseId) { - toRemove.add(job); - } + List toRemove = new ArrayList<>(); + for (BuildJobQueueItem job : queue) { + if (job.courseId() == courseId) { + toRemove.add(job); } - queue.removeAll(toRemove); - } - finally { - sharedLock.unlock(); } + queue.removeAll(toRemove); } /** @@ -269,25 +231,19 @@ public void cancelAllRunningBuildJobsForCourse(long courseId) { * @param participationId id of the participation */ public void cancelAllJobsForParticipation(long participationId) { - sharedLock.lock(); - try { - List toRemove = new ArrayList<>(); - for (BuildJobQueueItem queuedJob : queue) { - if (queuedJob.participationId() == participationId) { - toRemove.add(queuedJob); - } + List toRemove = new ArrayList<>(); + for (BuildJobQueueItem queuedJob : queue) { + if (queuedJob.participationId() == participationId) { + toRemove.add(queuedJob); } - queue.removeAll(toRemove); + } + queue.removeAll(toRemove); - for (BuildJobQueueItem runningJob : processingJobs.values()) { - if (runningJob.participationId() == participationId) { - cancelBuildJob(runningJob.id()); - } + for (BuildJobQueueItem runningJob : processingJobs.values()) { + if (runningJob.participationId() == participationId) { + cancelBuildJob(runningJob.id()); } } - finally { - sharedLock.unlock(); - } } /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java index 853b89493827..d19d0fae96ba 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java @@ -32,7 +32,6 @@ import com.hazelcast.collection.ItemEvent; import com.hazelcast.collection.ItemListener; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.cp.lock.FencedLock; import com.hazelcast.map.IMap; import de.tum.in.www1.artemis.domain.BuildLogEntry; @@ -65,11 +64,6 @@ public class SharedQueueProcessingService { private final BuildAgentSshKeyService buildAgentSSHKeyService; - /** - * Lock to prevent multiple nodes from processing the same build job. - */ - private FencedLock sharedLock; - private IQueue queue; private IQueue resultQueue; @@ -104,7 +98,6 @@ public SharedQueueProcessingService(@Qualifier("hazelcastInstance") HazelcastIns public void init() { this.buildAgentInformation = this.hazelcastInstance.getMap("buildAgentInformation"); this.processingJobs = this.hazelcastInstance.getMap("processingJobs"); - this.sharedLock = this.hazelcastInstance.getCPSubsystem().getLock("buildJobQueueLock"); this.queue = this.hazelcastInstance.getQueue("buildJobQueue"); this.resultQueue = this.hazelcastInstance.getQueue("buildResultQueue"); this.listenerId = this.queue.addItemListener(new QueuedBuildJobItemListener(), true); @@ -176,14 +169,8 @@ private void checkAvailabilityAndProcessNextBuild() { return; } - // Lock the queue to prevent multiple nodes from processing the same build job - sharedLock.lock(); - try { - buildJob = addToProcessingJobs(); - } - finally { - sharedLock.unlock(); - } + buildJob = addToProcessingJobs(); + processBuild(buildJob); } catch (RejectedExecutionException e) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java index 1c9320aed1d0..24dc20bffa65 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java @@ -2,6 +2,7 @@ import java.security.SecureRandom; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; @@ -19,6 +20,7 @@ import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.PyrisJob; import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.in.www1.artemis.web.rest.errors.ConflictException; /** * The PyrisJobService class is responsible for managing Pyris jobs in the Artemis system. @@ -58,6 +60,20 @@ public void init() { jobMap = hazelcastInstance.getMap("pyris-job-map"); } + /** + * Creates a token for an arbitrary job, runs the provided function with the token as an argument, + * and stores the job in the job map. + * + * @param tokenToJobFunction the function to run with the token + * @return the generated token + */ + public String createTokenForJob(Function tokenToJobFunction) { + var token = generateJobIdToken(); + var job = tokenToJobFunction.apply(token); + jobMap.put(token, job); + return token; + } + public String addExerciseChatJob(Long courseId, Long exerciseId, Long sessionId) { var token = generateJobIdToken(); var job = new ExerciseChatJob(token, courseId, exerciseId, sessionId); @@ -111,13 +127,15 @@ public PyrisJob getJob(String token) { * 2. Retrieves the PyrisJob object associated with the provided token. * 3. Throws an AccessForbiddenException if the token is invalid or not provided. *

- * The token was previously generated via {@link #addJob(Long, Long, Long)} + * The token was previously generated via {@link #createTokenForJob(Function)} * - * @param request the HttpServletRequest object representing the incoming request + * @param request the HttpServletRequest object representing the incoming request + * @param jobClass the class of the PyrisJob object to cast the retrieved job to + * @param the type of the PyrisJob object * @return the PyrisJob object associated with the token * @throws AccessForbiddenException if the token is invalid or not provided */ - public PyrisJob getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest request) { + public Job getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest request, Class jobClass) { var authHeader = request.getHeader("Authorization"); if (!authHeader.startsWith("Bearer ")) { throw new AccessForbiddenException("No valid token provided"); @@ -127,7 +145,10 @@ public PyrisJob getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest requ if (job == null) { throw new AccessForbiddenException("No valid token provided"); } - return job; + if (!jobClass.isInstance(job)) { + throw new ConflictException("Run ID is not a " + jobClass.getSimpleName(), "Job", "invalidRunId"); + } + return jobClass.cast(job); } /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java index 54c8d2daf5f3..a2fc3f1c3ce4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,21 +19,19 @@ import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.ProgrammingSubmission; import de.tum.in.www1.artemis.domain.competency.CompetencyJol; -import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession; import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.in.www1.artemis.domain.participation.StudentParticipation; import de.tum.in.www1.artemis.repository.CourseRepository; import de.tum.in.www1.artemis.repository.StudentParticipationRepository; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatPipelineExecutionBaseDataDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.in.www1.artemis.service.iris.exception.IrisException; import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; import de.tum.in.www1.artemis.service.metrics.LearningMetricsService; @@ -79,69 +77,48 @@ public PyrisPipelineService(PyrisConnectorService pyrisConnectorService, PyrisJo } /** - * Executes a chat pipeline for a given chat session subtype. - * This method prepares the execution data, executes the specified pipeline, and handles the state updates. + * Executes a pipeline on Pyris, identified by the given name and variant. + * The pipeline execution is tracked by a unique job token, which must be provided by the caller. + * The caller must additionally provide a mapper function to create the concrete DTO type for this pipeline from the base DTO. + * The status of the pipeline execution is updated via a consumer that accepts a list of stages. This method will + * call the consumer with the initial stages of the pipeline execution. Later stages will be sent back from Pyris, + * and need to be handled in the endpoint that receives the status updates. *

- * The general idea of this being generic is that the pipeline execution is the same for all chat sessions, - * but the specific data required for the pipeline execution is different for each session / pipeline type. - * Therefore, the specific data is provided by a function that accepts the basic chat data and returns the more specific data. * - * @param variant the variant of the pipeline - * @param session the active chat session, must inherit from {@link IrisChatSession} - * @param pipelineName the name of the pipeline to be executed - * @param executionDtoSupplier a function that accepts basic chat data and returns an execution DTO specific to the pipeline being executed - * @param jobTokenSupplier a supplier that provides a unique job token for tracking the pipeline execution - * @param the type of the chat session - * @param the type of the execution DTO + * @param name the name of the pipeline to be executed + * @param variant the variant of the pipeline + * @param jobToken a unique job token for tracking the pipeline execution + * @param dtoMapper a function to create the concrete DTO type for this pipeline from the base DTO + * @param statusUpdater a consumer to update the status of the pipeline execution */ - private void executeChatPipeline(String variant, T session, String pipelineName, - Function executionDtoSupplier, Supplier jobTokenSupplier) { - - // Retrieve the unique job token for this pipeline execution - var jobToken = jobTokenSupplier.get(); - - // Set up initial pipeline execution settings with the server base URL - var settingsDTO = new PyrisPipelineExecutionSettingsDTO(jobToken, List.of(), artemisBaseUrl); - + public void executePipeline(String name, String variant, String jobToken, Function dtoMapper, Consumer> statusUpdater) { // Define the preparation stages of pipeline execution with their initial states // There will be more stages added in Pyris later - var preparingRequestStageInProgress = new PyrisStageDTO("Preparing", 10, PyrisStageState.IN_PROGRESS, null); - var preparingRequestStageDone = new PyrisStageDTO("Preparing", 10, PyrisStageState.DONE, null); - var executingPipelineStageNotStarted = new PyrisStageDTO("Executing pipeline", 30, PyrisStageState.NOT_STARTED, null); + var preparing = new PyrisStageDTO("Preparing", 10, null, null); + var executing = new PyrisStageDTO("Executing pipeline", 30, null, null); // Send initial status update indicating that the preparation stage is in progress - irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageInProgress, executingPipelineStageNotStarted)); + statusUpdater.accept(List.of(preparing.inProgress(), executing.notStarted())); - try { - // Prepare the base execution data for the pipeline. - // It is shared among chat pipelines and included as field "base" in the specific execution DTOs. - var base = new PyrisChatPipelineExecutionBaseDataDTO(pyrisDTOService.toPyrisMessageDTOList(session.getMessages()), new PyrisUserDTO(session.getUser()), settingsDTO, - List.of(preparingRequestStageDone) // The initial stage is done when the request arrives at Pyris - ); - - // Prepare the specific execution data for the pipeline - // This is implementation-specific and includes additional data required for the pipeline - // Implementations must deliver the base data, too - U executionDTO = executionDtoSupplier.apply(base); + var baseDto = new PyrisPipelineExecutionDTO(new PyrisPipelineExecutionSettingsDTO(jobToken, List.of(), artemisBaseUrl), List.of(preparing.done())); + var pipelineDto = dtoMapper.apply(baseDto); + try { // Send a status update that preparation is done and pipeline execution is starting - var executingPipelineStageInProgress = new PyrisStageDTO("Executing pipeline", 30, PyrisStageState.IN_PROGRESS, null); - irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageDone, executingPipelineStageInProgress)); + statusUpdater.accept(List.of(preparing.done(), executing.inProgress())); try { // Execute the pipeline using the connector service - pyrisConnectorService.executePipeline(pipelineName, variant, executionDTO); + pyrisConnectorService.executePipeline(name, variant, pipelineDto); } catch (PyrisConnectorException | IrisException e) { - log.error("Failed to execute " + pipelineName + " pipeline", e); - var executingPipelineStageFailed = new PyrisStageDTO("Executing pipeline", 30, PyrisStageState.ERROR, "An internal error occurred"); - irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageDone, executingPipelineStageFailed)); + log.error("Failed to execute {} pipeline", name, e); + statusUpdater.accept(List.of(preparing.done(), executing.error("An internal error occurred"))); } } catch (Exception e) { - log.error("Failed to prepare " + pipelineName + " pipeline execution", e); - var preparingRequestStageFailed = new PyrisStageDTO("Preparing request", 10, PyrisStageState.ERROR, "An internal error occurred"); - irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageFailed, executingPipelineStageNotStarted)); + log.error("Failed to prepare {} pipeline execution", name, e); + statusUpdater.accept(List.of(preparing.error("An internal error occurred"), executing.notStarted())); } } @@ -157,14 +134,29 @@ private void executeChatPipeline(String variant, * @param latestSubmission the latest submission of the student * @param exercise the programming exercise * @param session the chat session - * @see PyrisPipelineService#executeChatPipeline for more details on the pipeline execution process. + * @see PyrisPipelineService#executePipeline for more details on the pipeline execution process. */ public void executeExerciseChatPipeline(String variant, Optional latestSubmission, ProgrammingExercise exercise, IrisExerciseChatSession session) { - executeChatPipeline(variant, session, "tutor-chat", // TODO: Rename this to 'exercise-chat' with next breaking Pyris version - base -> new PyrisExerciseChatPipelineExecutionDTO(latestSubmission.map(pyrisDTOService::toPyrisSubmissionDTO).orElse(null), - pyrisDTOService.toPyrisProgrammingExerciseDTO(exercise), new PyrisCourseDTO(exercise.getCourseViaExerciseGroupOrCourseMember()), base.chatHistory(), - base.user(), base.settings(), base.initialStages()), - () -> pyrisJobService.addExerciseChatJob(exercise.getCourseViaExerciseGroupOrCourseMember().getId(), exercise.getId(), session.getId())); + // @formatter:off + executePipeline( + "tutor-chat", // TODO: Rename this to 'exercise-chat' with next breaking Pyris version + variant, + pyrisJobService.addExerciseChatJob(exercise.getCourseViaExerciseGroupOrCourseMember().getId(), exercise.getId(), session.getId()), + executionDto -> { + var course = exercise.getCourseViaExerciseGroupOrCourseMember(); + return new PyrisExerciseChatPipelineExecutionDTO( + latestSubmission.map(pyrisDTOService::toPyrisSubmissionDTO).orElse(null), + pyrisDTOService.toPyrisProgrammingExerciseDTO(exercise), + new PyrisCourseDTO(course), + pyrisDTOService.toPyrisMessageDTOList(session.getMessages()), + new PyrisUserDTO(session.getUser()), + executionDto.settings(), + executionDto.initialStages() + ); + }, + stages -> irisChatWebsocketService.sendStatusUpdate(session, stages) + ); + // @formatter:on } /** @@ -178,17 +170,31 @@ public void executeExerciseChatPipeline(String variant, Optional { - var fullCourse = loadCourseWithParticipationOfStudent(courseId, studentId); - return new PyrisCourseChatPipelineExecutionDTO(PyrisExtendedCourseDTO.of(fullCourse), - learningMetricsService.getStudentCourseMetrics(session.getUser().getId(), courseId), competencyJol == null ? null : CompetencyJolDTO.of(competencyJol), - base.chatHistory(), base.user(), base.settings(), base.initialStages()); - }, () -> pyrisJobService.addCourseChatJob(courseId, session.getId())); + executePipeline( + "course-chat", + variant, + pyrisJobService.addCourseChatJob(courseId, session.getId()), + executionDto -> { + var fullCourse = loadCourseWithParticipationOfStudent(courseId, studentId); + return new PyrisCourseChatPipelineExecutionDTO( + PyrisExtendedCourseDTO.of(fullCourse), + learningMetricsService.getStudentCourseMetrics(session.getUser().getId(), courseId), + competencyJol == null ? null : CompetencyJolDTO.of(competencyJol), + pyrisDTOService.toPyrisMessageDTOList(session.getMessages()), + new PyrisUserDTO(session.getUser()), + executionDto.settings(), // flatten the execution dto here + executionDto.initialStages() + ); + }, + stages -> irisChatWebsocketService.sendStatusUpdate(session, stages) + ); + // @formatter:on } /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java index 759e62ca9e35..0966455b3533 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java @@ -1,17 +1,22 @@ package de.tum.in.www1.artemis.service.connectors.pyris; +import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; +import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService; import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; @@ -25,13 +30,16 @@ public class PyrisStatusUpdateService { private final IrisCourseChatSessionService courseChatSessionService; + private final IrisCompetencyGenerationService competencyGenerationService; + private static final Logger log = LoggerFactory.getLogger(PyrisStatusUpdateService.class); public PyrisStatusUpdateService(PyrisJobService pyrisJobService, IrisExerciseChatSessionService irisExerciseChatSessionService, - IrisCourseChatSessionService courseChatSessionService) { + IrisCourseChatSessionService courseChatSessionService, IrisCompetencyGenerationService competencyGenerationService) { this.pyrisJobService = pyrisJobService; this.irisExerciseChatSessionService = irisExerciseChatSessionService; this.courseChatSessionService = courseChatSessionService; + this.competencyGenerationService = competencyGenerationService; } /** @@ -43,7 +51,7 @@ public PyrisStatusUpdateService(PyrisJobService pyrisJobService, IrisExerciseCha public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO statusUpdate) { irisExerciseChatSessionService.handleStatusUpdate(job, statusUpdate); - removeJobIfTerminated(statusUpdate, job.jobId()); + removeJobIfTerminated(statusUpdate.stages(), job.jobId()); } /** @@ -56,7 +64,20 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statusUpdate) { courseChatSessionService.handleStatusUpdate(job, statusUpdate); - removeJobIfTerminated(statusUpdate, job.jobId()); + removeJobIfTerminated(statusUpdate.stages(), job.jobId()); + } + + /** + * Handles the status update of a competency extraction job and forwards it to + * {@link de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService#handleStatusUpdate(String, long, PyrisCompetencyStatusUpdateDTO)} + * + * @param job the job that is updated + * @param statusUpdate the status update + */ + public void handleStatusUpdate(CompetencyExtractionJob job, PyrisCompetencyStatusUpdateDTO statusUpdate) { + competencyGenerationService.handleStatusUpdate(job.userLogin(), job.courseId(), statusUpdate); + + removeJobIfTerminated(statusUpdate.stages(), job.jobId()); } /** @@ -66,11 +87,11 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu * * @see PyrisStageState#isTerminal() * - * @param statusUpdate the status update - * @param job the job to remove + * @param stages the stages of the status update + * @param job the job to remove */ - private void removeJobIfTerminated(PyrisChatStatusUpdateDTO statusUpdate, String job) { - var isDone = statusUpdate.stages().stream().map(PyrisStageDTO::state).allMatch(PyrisStageState::isTerminal); + private void removeJobIfTerminated(List stages, String job) { + var isDone = stages.stream().map(PyrisStageDTO::state).allMatch(PyrisStageState::isTerminal); if (isDone) { pyrisJobService.removeJob(job); } @@ -85,10 +106,6 @@ private void removeJobIfTerminated(PyrisChatStatusUpdateDTO statusUpdate, String */ public void handleStatusUpdate(IngestionWebhookJob job, PyrisLectureIngestionStatusUpdateDTO statusUpdate) { statusUpdate.stages().forEach(stage -> log.info(stage.name() + ":" + stage.message())); - boolean isDone = statusUpdate.stages().stream().map(PyrisStageDTO::state) - .allMatch(state -> state == PyrisStageState.DONE || state == PyrisStageState.ERROR || state == PyrisStageState.SKIPPED); - if (isDone) { - pyrisJobService.removeJob(job.jobId()); - } + removeJobIfTerminated(statusUpdate.stages(), job.jobId()); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java new file mode 100644 index 000000000000..86c5f01c0479 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java @@ -0,0 +1,11 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisPipelineExecutionDTO(PyrisPipelineExecutionSettingsDTO settings, List initialStages) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java new file mode 100644 index 000000000000..504fe8aa92fa --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java @@ -0,0 +1,7 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisCompetencyExtractionInputDTO(String courseDescription, PyrisCompetencyRecommendationDTO[] currentCompetencies) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java new file mode 100644 index 000000000000..64979fa9125d --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java @@ -0,0 +1,20 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; + +/** + * DTO to execute the Iris competency extraction pipeline on Pyris + * + * @param execution The pipeline execution details + * @param courseDescription The description of the course + * @param currentCompetencies The current competencies of the course (to avoid re-extraction) + * @param taxonomyOptions The taxonomy options to use + * @param maxN The maximum number of competencies to extract + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisCompetencyExtractionPipelineExecutionDTO(PyrisPipelineExecutionDTO execution, String courseDescription, PyrisCompetencyRecommendationDTO[] currentCompetencies, + CompetencyTaxonomy[] taxonomyOptions, int maxN) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java new file mode 100644 index 000000000000..897b9b7ca3ce --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java @@ -0,0 +1,17 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; + +/** + * DTO for the Iris competency generation feature. + * A competency recommendation is just a title, description and taxonomy generated by Iris. + * + * @param title The title of the competency + * @param description The description of the competency + * @param taxonomy The taxonomy of the competency + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisCompetencyRecommendationDTO(String title, String description, CompetencyTaxonomy taxonomy) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java new file mode 100644 index 000000000000..967dfcd51906 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java @@ -0,0 +1,19 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; + +/** + * DTO for the Iris competency generation feature. + * Pyris sends callback updates back to Artemis during generation of competencies, + * which are then forwarded to the user via Websockets. + * + * @param stages List of stages of the generation process + * @param result List of competencies recommendations that have been generated so far + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisCompetencyStatusUpdateDTO(List stages, List result) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java index 39728eceb4a1..3bc3b2f9758a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java @@ -4,4 +4,25 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisStageDTO(String name, int weight, PyrisStageState state, String message) { + + public PyrisStageDTO notStarted() { + return new PyrisStageDTO(name, weight, PyrisStageState.NOT_STARTED, message); + } + + public PyrisStageDTO inProgress() { + return new PyrisStageDTO(name, weight, PyrisStageState.IN_PROGRESS, message); + } + + public PyrisStageDTO error(String message) { + return new PyrisStageDTO(name, weight, PyrisStageState.ERROR, message); + } + + public PyrisStageDTO done() { + return new PyrisStageDTO(name, weight, PyrisStageState.DONE, message); + } + + public PyrisStageDTO with(PyrisStageState state, String message) { + return new PyrisStageDTO(name, weight, state, message); + } + } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java index 10648687f7f2..0f2ace2f7e40 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java @@ -5,15 +5,9 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public enum PyrisStageState { - NOT_STARTED(false), IN_PROGRESS(false), DONE(true), SKIPPED(true), ERROR(true); - - private final boolean isTerminal; - - PyrisStageState(boolean isTerminal) { - this.isTerminal = isTerminal; - } + NOT_STARTED, IN_PROGRESS, DONE, SKIPPED, ERROR; public boolean isTerminal() { - return isTerminal; + return this == DONE || this == SKIPPED || this == ERROR; } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java new file mode 100644 index 000000000000..2a76f5a3b072 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java @@ -0,0 +1,22 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.job; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.in.www1.artemis.domain.Course; + +/** + * A pyris job that extracts competencies from a course description. + * + * @param jobId the job id + * @param courseId the course in which the competencies are being extracted + * @param userLogin the user login of the user who started the job + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record CompetencyExtractionJob(String jobId, long courseId, String userLogin) implements PyrisJob { + + @Override + public boolean canAccess(Course course) { + return course.getId().equals(courseId); + } + +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java b/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java index 97d02ca20df7..22c2cccd6546 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java @@ -74,6 +74,8 @@ public class UserDTO extends AuditingEntityDTO { private String vcsAccessToken; + private ZonedDateTime vcsAccessTokenExpiryDate; + private String sshPublicKey; private ZonedDateTime irisAccepted; @@ -250,6 +252,14 @@ public void setVcsAccessToken(String vcsAccessToken) { this.vcsAccessToken = vcsAccessToken; } + public void setVcsAccessTokenExpiryDate(ZonedDateTime zoneDateTime) { + this.vcsAccessTokenExpiryDate = zoneDateTime; + } + + public ZonedDateTime getVcsAccessTokenExpiryDate() { + return vcsAccessTokenExpiryDate; + } + public String getSshPublicKey() { return sshPublicKey; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java new file mode 100644 index 000000000000..07be63259336 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java @@ -0,0 +1,71 @@ +package de.tum.in.www1.artemis.service.iris; + +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import de.tum.in.www1.artemis.domain.Course; +import de.tum.in.www1.artemis.domain.User; +import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; +import de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketService; + +/** + * Service to handle the Competency generation subsytem of Iris. + */ +@Service +@Profile("iris") +public class IrisCompetencyGenerationService { + + private final PyrisPipelineService pyrisPipelineService; + + private final IrisWebsocketService websocketService; + + private final PyrisJobService pyrisJobService; + + public IrisCompetencyGenerationService(PyrisPipelineService pyrisPipelineService, IrisWebsocketService websocketService, PyrisJobService pyrisJobService) { + this.pyrisPipelineService = pyrisPipelineService; + this.websocketService = websocketService; + this.pyrisJobService = pyrisJobService; + } + + /** + * Executes the competency extraction pipeline on Pyris for a given course, user and course description + * + * @param user the user for which the pipeline should be executed + * @param course the course for which the pipeline should be executed + * @param courseDescription the description of the course + * @param currentCompetencies the current competencies of the course (to avoid re-extraction) + */ + public void executeCompetencyExtractionPipeline(User user, Course course, String courseDescription, PyrisCompetencyRecommendationDTO[] currentCompetencies) { + // @formatter:off + pyrisPipelineService.executePipeline( + "competency-extraction", + "default", + pyrisJobService.createTokenForJob(token -> new CompetencyExtractionJob(token, course.getId(), user.getLogin())), + executionDto -> new PyrisCompetencyExtractionPipelineExecutionDTO(executionDto, courseDescription, currentCompetencies, CompetencyTaxonomy.values(), 5), + stages -> websocketService.send(user.getLogin(), websocketTopic(course.getId()), new PyrisCompetencyStatusUpdateDTO(stages, null)) + ); + // @formatter:on + } + + /** + * Takes a status update from Pyris containing a new competency extraction result and sends it to the client via websocket + * + * @param userLogin the login of the user + * @param courseId the id of the course + * @param statusUpdate the status update containing the new competency recommendations + */ + public void handleStatusUpdate(String userLogin, long courseId, PyrisCompetencyStatusUpdateDTO statusUpdate) { + websocketService.send(userLogin, websocketTopic(courseId), statusUpdate); + } + + private static String websocketTopic(long courseId) { + return "competencies/" + courseId; + } + +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java index dded30f4e42e..f455b13979fe 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java @@ -8,14 +8,12 @@ import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession; import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession; import de.tum.in.www1.artemis.domain.iris.session.IrisSession; import de.tum.in.www1.artemis.repository.UserRepository; import de.tum.in.www1.artemis.service.iris.session.IrisChatBasedFeatureInterface; -import de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService; @@ -38,16 +36,12 @@ public class IrisSessionService { private final IrisHestiaSessionService irisHestiaSessionService; - private final IrisCompetencyGenerationSessionService irisCompetencyGenerationSessionService; - public IrisSessionService(UserRepository userRepository, IrisExerciseChatSessionService irisExerciseChatSessionService, - IrisCourseChatSessionService irisCourseChatSessionService, IrisHestiaSessionService irisHestiaSessionService, - IrisCompetencyGenerationSessionService irisCompetencyGenerationSessionService) { + IrisCourseChatSessionService irisCourseChatSessionService, IrisHestiaSessionService irisHestiaSessionService) { this.userRepository = userRepository; this.irisExerciseChatSessionService = irisExerciseChatSessionService; this.irisCourseChatSessionService = irisCourseChatSessionService; this.irisHestiaSessionService = irisHestiaSessionService; - this.irisCompetencyGenerationSessionService = irisCompetencyGenerationSessionService; } /** @@ -107,7 +101,7 @@ public void requestMessageFromIris(S session) { public void sendOverWebsocket(IrisMessage message, S session) { var wrapper = getIrisSessionSubService(session); if (wrapper.irisSubFeatureInterface instanceof IrisChatBasedFeatureInterface chatWrapper) { - chatWrapper.sendOverWebsocket(message); + chatWrapper.sendOverWebsocket(session, message); } else { throw new BadRequestException("Invalid Iris session type " + message.getSession().getClass().getSimpleName()); @@ -143,8 +137,6 @@ private IrisSubFeatureWrapper getIrisSessionSubServic 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 IrisCompetencyGenerationSession irisCompetencyGenerationSession -> - (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisCompetencyGenerationSessionService, irisCompetencyGenerationSession); case null, default -> throw new BadRequestException("Unknown Iris session type " + session.getClass().getSimpleName()); }; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java rename to src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java index 4c5067bde279..12fa282a3012 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.websocket; +package de.tum.in.www1.artemis.service.iris.dto; import java.util.List; import java.util.Objects; @@ -20,7 +20,7 @@ * @param stages the stages of the Pyris pipeline */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisWebsocketDTO(IrisWebsocketMessageType type, IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, +public record IrisChatWebsocketDTO(IrisWebsocketMessageType type, IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, List suggestions) { /** @@ -31,7 +31,7 @@ public record IrisWebsocketDTO(IrisWebsocketMessageType type, IrisMessage messag * @param rateLimitInfo the rate limit information * @param stages the stages of the Pyris pipeline */ - public IrisWebsocketDTO(@Nullable IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, List suggestions) { + public IrisChatWebsocketDTO(@Nullable IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, List suggestions) { this(determineType(message), message, rateLimitInfo, stages, suggestions); } @@ -62,7 +62,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - IrisWebsocketDTO that = (IrisWebsocketDTO) o; + IrisChatWebsocketDTO that = (IrisChatWebsocketDTO) o; return type == that.type && Objects.equals(message, that.message) && Objects.equals(rateLimitInfo, that.rateLimitInfo) && Objects.equals(stages, that.stages); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java index 2bef37bda870..c98fdb1663a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java @@ -10,6 +10,6 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set allowedModels, - @Nullable String preferredModel, @Nullable IrisTemplate template) implements IrisCombinedSubSettingsInterface { + @Nullable String preferredModel, @Nullable IrisTemplate template) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java index 7e2e399e530e..e924be92e773 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java @@ -9,7 +9,6 @@ import de.tum.in.www1.artemis.domain.iris.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) - implements IrisCombinedSubSettingsInterface { - +public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, + @Nullable IrisTemplate template) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java index 47861b16ebbb..315fb572194c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java @@ -9,6 +9,5 @@ import de.tum.in.www1.artemis.domain.iris.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) - implements IrisCombinedSubSettingsInterface { +public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java deleted file mode 100644 index 79d23120b4fc..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.tum.in.www1.artemis.service.iris.dto; - -import java.util.Set; - -import jakarta.annotation.Nullable; - -public interface IrisCombinedSubSettingsInterface { - - boolean enabled(); - - @Nullable - Set allowedModels(); - - @Nullable - String preferredModel(); -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java index db345e973fdb..2001cb7077b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java @@ -8,9 +8,10 @@ public interface IrisChatBasedFeatureInterface extends Ir /** * Sends a message over the websocket to a specific user * + * @param session that the message belongs to * @param message that should be sent over the websocket */ - void sendOverWebsocket(IrisMessage message); + void sendOverWebsocket(S session, IrisMessage message); /** * Sends a request to Iris to get a message for the given session. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java deleted file mode 100644 index d8ec1f901123..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java +++ /dev/null @@ -1,154 +0,0 @@ -package de.tum.in.www1.artemis.service.iris.session; - -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.List; - -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 com.fasterxml.jackson.databind.JsonNode; - -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.iris.IrisCompetencyGenerationSessionRepository; -import de.tum.in.www1.artemis.repository.iris.IrisMessageRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.in.www1.artemis.service.iris.IrisMessageService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; - -/** - * Service to handle the Competency generation subsytem of Iris. - */ -@Service -@Profile("iris") -public class IrisCompetencyGenerationSessionService implements IrisButtonBasedFeatureInterface> { - - private static final Logger log = LoggerFactory.getLogger(IrisCompetencyGenerationSessionService.class); - - private final PyrisConnectorService pyrisConnectorService; - - private final IrisSettingsService irisSettingsService; - - private final IrisSessionRepository irisSessionRepository; - - private final AuthorizationCheckService authCheckService; - - private final IrisCompetencyGenerationSessionRepository irisCompetencyGenerationSessionRepository; - - private final IrisMessageService irisMessageService; - - private final IrisMessageRepository irisMessageRepository; - - public IrisCompetencyGenerationSessionService(PyrisConnectorService pyrisConnectorService, IrisSettingsService irisSettingsService, IrisSessionRepository irisSessionRepository, - AuthorizationCheckService authCheckService, IrisCompetencyGenerationSessionRepository irisCompetencyGenerationSessionRepository, IrisMessageService irisMessageService, - IrisMessageRepository irisMessageRepository) { - this.pyrisConnectorService = pyrisConnectorService; - this.irisSettingsService = irisSettingsService; - this.irisSessionRepository = irisSessionRepository; - this.authCheckService = authCheckService; - this.irisCompetencyGenerationSessionRepository = irisCompetencyGenerationSessionRepository; - this.irisMessageService = irisMessageService; - this.irisMessageRepository = irisMessageRepository; - } - - /** - * Creates a new Iris session for the given course and user or gets an existing one from the last hour. - * - * @param course The course to create the session for - * @param user The user to create the session for - * @return The Iris session for the course - */ - public IrisCompetencyGenerationSession getOrCreateSession(Course course, User user) { - var existingSession = irisCompetencyGenerationSessionRepository.findFirstByCourseIdAndUserIdOrderByCreationDateDesc(course.getId(), user.getId()); - // Return the newest session if there is one and it is not older than 1 hour - if (existingSession != null && existingSession.getCreationDate().plusHours(1).isAfter(ZonedDateTime.now())) { - checkHasAccessTo(user, existingSession); - checkIsFeatureActivatedFor(existingSession); - return existingSession; - } - - var irisSession = new IrisCompetencyGenerationSession(); - irisSession.setCourse(course); - irisSession.setUser(user); - checkHasAccessTo(user, irisSession); - checkIsFeatureActivatedFor(irisSession); - irisSession = irisSessionRepository.save(irisSession); - return irisSession; - } - - /** - * Adds a user text message to a given IRIS session - * - * @param session the IRIS session - * @param message the message to add - */ - public void addUserTextMessageToSession(IrisCompetencyGenerationSession session, String message) { - var userMessage = new IrisMessage(); - userMessage.setSender(IrisMessageSender.USER); - userMessage.addContent(new IrisTextMessageContent(message)); - irisMessageService.saveMessage(userMessage, session, IrisMessageSender.USER); - } - - // @formatter:off - @JsonInclude(JsonInclude.Include.NON_EMPTY) - record CompetencyGenerationDTO( - String courseDescription, - CompetencyTaxonomy[] taxonomyOptions - ) {} - // @formatter:on - - @Override - public List executeRequest(IrisCompetencyGenerationSession session) { - // TODO: Re-add in a future PR. Remember to reenable the test cases! - return null; - } - - @Override - public void checkHasAccessTo(User user, IrisCompetencyGenerationSession irisSession) { - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, irisSession.getCourse(), user); - } - - @Override - public void checkIsFeatureActivatedFor(IrisCompetencyGenerationSession irisSession) { - irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.COMPETENCY_GENERATION, irisSession.getCourse()); - } - - private List toCompetencies(JsonNode content) { - List competencies = new ArrayList<>(); - for (JsonNode node : content.get("competencies")) { - try { - Competency competency = new Competency(); - competency.setTitle(node.required("title").asText()); - - // skip competency if IRIS only replied with a title containing the special response "!done!" - if (node.get("description") == null && node.get("title").asText().equals("!done!")) { - log.info("Received special response \"!done!\", skipping parsing of competency."); - continue; - } - competency.setDescription(node.required("description").asText()); - competency.setTaxonomy(CompetencyTaxonomy.valueOf(node.required("taxonomy").asText())); - - competencies.add(competency); - } - catch (IllegalArgumentException e) { - log.error("Missing fields, could not parse Competency: " + node.toPrettyString(), e); - } - } - return competencies; - } -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java index 134e47b2abc4..bd5a4c25887b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java @@ -97,8 +97,8 @@ public void checkIsFeatureActivatedFor(IrisCourseChatSession session) { } @Override - public void sendOverWebsocket(IrisMessage message) { - irisChatWebsocketService.sendMessage(message); + public void sendOverWebsocket(IrisCourseChatSession session, IrisMessage message) { + irisChatWebsocketService.sendMessage(session, message, null); } @Override @@ -135,7 +135,7 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu var message = new IrisMessage(); message.addContent(new IrisTextMessageContent(statusUpdate.result())); var savedMessage = irisMessageService.saveMessage(message, session, IrisMessageSender.LLM); - irisChatWebsocketService.sendMessage(savedMessage, statusUpdate.stages()); + irisChatWebsocketService.sendMessage(session, savedMessage, statusUpdate.stages()); } else { irisChatWebsocketService.sendStatusUpdate(session, statusUpdate.stages(), statusUpdate.suggestions()); diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java index 2916a34171ab..36508d8b0934 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java @@ -119,8 +119,8 @@ public void checkIsFeatureActivatedFor(IrisExerciseChatSession session) { } @Override - public void sendOverWebsocket(IrisMessage message) { - irisChatWebsocketService.sendMessage(message); + public void sendOverWebsocket(IrisExerciseChatSession session, IrisMessage message) { + irisChatWebsocketService.sendMessage(session, message, null); } @Override @@ -170,7 +170,7 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta var message = new IrisMessage(); message.addContent(new IrisTextMessageContent(statusUpdate.result())); var savedMessage = irisMessageService.saveMessage(message, session, IrisMessageSender.LLM); - irisChatWebsocketService.sendMessage(savedMessage, statusUpdate.stages()); + irisChatWebsocketService.sendMessage(session, savedMessage, statusUpdate.stages()); } else { irisChatWebsocketService.sendStatusUpdate(session, statusUpdate.stages(), statusUpdate.suggestions()); diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java index 253ba0df1e45..21bfc4449228 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java @@ -5,52 +5,42 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; +import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO; @Service @Profile("iris") -public class IrisChatWebsocketService extends IrisWebsocketService { +public class IrisChatWebsocketService { + + private final IrisWebsocketService websocketService; private final IrisRateLimitService rateLimitService; - public IrisChatWebsocketService(WebsocketMessagingService websocketMessagingService, IrisRateLimitService rateLimitService) { - super(websocketMessagingService); + public IrisChatWebsocketService(IrisWebsocketService websocketService, IrisRateLimitService rateLimitService) { + this.websocketService = websocketService; this.rateLimitService = rateLimitService; } - private User checkSessionTypeAndGetUser(IrisSession irisSession) { - if (!(irisSession instanceof IrisChatSession chatSession)) { - throw new UnsupportedOperationException("Only IrisChatSessions are supported"); - } - return chatSession.getUser(); - } - /** - * Sends a message over the websocket to a specific user + * Sends a message and/or a status update over the websocket to the user + * involved in the session. At least one of the message or the stages must be + * non-null, otherwise there is no need to send a message. + * This is currently used for both the exercise and course chat sessions, but + * this could be split up in the future. * + * @param session the session to send the message to * @param irisMessage that should be sent over the websocket * @param stages that should be sent over the websocket */ - public void sendMessage(IrisMessage irisMessage, List stages) { - var session = irisMessage.getSession(); - var user = checkSessionTypeAndGetUser(session); + public void sendMessage(IrisChatSession session, IrisMessage irisMessage, List stages) { + var user = session.getUser(); var rateLimitInfo = rateLimitService.getRateLimitInformation(user); - super.send(user, session.getId(), new IrisWebsocketDTO(irisMessage, rateLimitInfo, stages, null)); - } - - /** - * Sends a message over the websocket to a specific user without stages and suggestions - * - * @param message that should be sent over the websocket - */ - public void sendMessage(IrisMessage message) { - sendMessage(message, null); + var topic = "" + session.getId(); // Todo: add more specific topic + var payload = new IrisChatWebsocketDTO(irisMessage, rateLimitInfo, stages, null); + websocketService.send(user.getLogin(), topic, payload); } /** @@ -59,7 +49,7 @@ public void sendMessage(IrisMessage message) { * @param session the session to send the status update to * @param stages the stages to send */ - public void sendStatusUpdate(IrisSession session, List stages) { + public void sendStatusUpdate(IrisChatSession session, List stages) { this.sendStatusUpdate(session, stages, null); } @@ -70,8 +60,11 @@ public void sendStatusUpdate(IrisSession session, List stages) { * @param stages the stages to send * @param suggestions the suggestions to send */ - public void sendStatusUpdate(IrisSession session, List stages, List suggestions) { - var user = checkSessionTypeAndGetUser(session); - super.send(user, session.getId(), new IrisWebsocketDTO(null, rateLimitService.getRateLimitInformation(user), stages, suggestions)); + public void sendStatusUpdate(IrisChatSession session, List stages, List suggestions) { + var user = session.getUser(); + var rateLimitInfo = rateLimitService.getRateLimitInformation(user); + var topic = "" + session.getId(); // Todo: add more specific topic + var payload = new IrisChatWebsocketDTO(null, rateLimitInfo, stages, suggestions); + websocketService.send(user.getLogin(), topic, payload); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java index 537d9f31ec76..3fcd949be7b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java @@ -1,19 +1,24 @@ package de.tum.in.www1.artemis.service.iris.websocket; +import java.util.concurrent.ExecutionException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.service.WebsocketMessagingService; /** * A service to send a message over the websocket to a specific user */ -public abstract class IrisWebsocketService { +@Service +@Profile("iris") +public class IrisWebsocketService { private static final Logger log = LoggerFactory.getLogger(IrisWebsocketService.class); - private static final String IRIS_WEBSOCKET_TOPIC_PREFIX = "/topic/iris"; + private static final String TOPIC_PREFIX = "/topic/iris/"; private final WebsocketMessagingService websocketMessagingService; @@ -21,10 +26,22 @@ public IrisWebsocketService(WebsocketMessagingService websocketMessagingService) this.websocketMessagingService = websocketMessagingService; } - protected void send(User user, Long sessionId, Object payload) { - String irisWebsocketTopic = String.format("%s/%s", IRIS_WEBSOCKET_TOPIC_PREFIX, sessionId); - log.debug("Sending message to user {} on topic {}: {}", user.getLogin(), irisWebsocketTopic, payload); - websocketMessagingService.sendMessageToUser(user.getLogin(), irisWebsocketTopic, payload); + /** + * Sends a message over the websocket to a specific user + * + * @param userLogin the login of the user + * @param topicSuffix the suffix of the topic, which will be appended to "/topic/iris/" + * @param payload the DTO to send, which will be serialized to JSON + */ + public void send(String userLogin, String topicSuffix, Object payload) { + String topic = TOPIC_PREFIX + topicSuffix; + try { + websocketMessagingService.sendMessageToUser(userLogin, topic, payload).get(); + log.debug("Sent message to Iris user {} on topic {}: {}", userLogin, topic, payload); + } + catch (InterruptedException | ExecutionException e) { + log.error("Error while sending message to Iris user {} on topic {}: {}", userLogin, topic, payload, e); + } } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java index ad6ae2ab5744..a836f81a4982 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/programming/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 -> defaultRepositoryUpgradeService; - case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case KOTLIN, PYTHON, C, HASKELL, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST -> defaultRepositoryUpgradeService; + case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException("Unsupported programming language: " + programmingLanguage); }; } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java index 29ba05bcd377..5734c258da9a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java @@ -2,27 +2,42 @@ import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.PublicKey; +import java.time.ZonedDateTime; import java.util.Optional; import jakarta.validation.Valid; +import jakarta.ws.rs.BadRequestException; +import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; +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.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.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.in.www1.artemis.config.icl.ssh.HashUtils; import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.repository.UserRepository; import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.in.www1.artemis.service.AccountService; +import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; import de.tum.in.www1.artemis.service.dto.PasswordChangeDTO; import de.tum.in.www1.artemis.service.dto.UserDTO; import de.tum.in.www1.artemis.service.user.UserCreationService; import de.tum.in.www1.artemis.service.user.UserService; import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; import de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException; import de.tum.in.www1.artemis.web.rest.errors.PasswordViolatesRequirementsException; @@ -34,6 +49,11 @@ @RequestMapping("api/") public class AccountResource { + @Value("${jhipster.clientApp.name}") + private String applicationName; + + private static final Logger log = LoggerFactory.getLogger(AccountResource.class); + private final UserRepository userRepository; private final UserService userService; @@ -96,4 +116,120 @@ public ResponseEntity changePassword(@RequestBody PasswordChangeDTO passwo return ResponseEntity.ok().build(); } + + /** + * PUT account/ssh-public-key : sets the ssh public key + * + * @param sshPublicKey the ssh public key to set + * + * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request) + */ + @PutMapping("account/ssh-public-key") + @EnforceAtLeastStudent + public ResponseEntity addSshPublicKey(@RequestBody String sshPublicKey) throws GeneralSecurityException, IOException { + + User user = userRepository.getUser(); + log.debug("REST request to add SSH key to user {}", user.getLogin()); + // Parse the public key string + AuthorizedKeyEntry keyEntry; + try { + keyEntry = AuthorizedKeyEntry.parseAuthorizedKeyEntry(sshPublicKey); + } + catch (IllegalArgumentException e) { + throw new BadRequestAlertException("Invalid SSH key format", "SSH key", "invalidKeyFormat", true); + } + // Extract the PublicKey object + PublicKey publicKey = keyEntry.resolvePublicKey(null, null, null); + String keyHash = HashUtils.getSha512Fingerprint(publicKey); + userRepository.updateUserSshPublicKeyHash(user.getId(), keyHash, sshPublicKey); + return ResponseEntity.ok().build(); + } + + /** + * PUT account/ssh-public-key : sets the ssh public key + * + * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request) + */ + @DeleteMapping("account/ssh-public-key") + @EnforceAtLeastStudent + public ResponseEntity deleteSshPublicKey() { + User user = userRepository.getUser(); + log.debug("REST request to remove SSH key of user {}", user.getLogin()); + userRepository.updateUserSshPublicKeyHash(user.getId(), null, null); + + log.debug("Successfully deleted SSH key of user {}", user.getLogin()); + return ResponseEntity.ok().build(); + } + + /** + * PUT account/user-vcs-access-token : creates a vcsAccessToken for a user + * + * @param expiryDate The expiry date which should be set for the token + * @return the ResponseEntity with a userDTO containing the token: with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request) + */ + @PutMapping("account/user-vcs-access-token") + @EnforceAtLeastStudent + public ResponseEntity createVcsAccessToken(@RequestParam("expiryDate") ZonedDateTime expiryDate) { + User user = userRepository.getUser(); + log.debug("REST request to create a new VCS access token for user {}", user.getLogin()); + if (expiryDate.isBefore(ZonedDateTime.now()) || expiryDate.isAfter(ZonedDateTime.now().plusYears(1))) { + throw new BadRequestException("Invalid expiry date provided"); + } + + userRepository.updateUserVcsAccessToken(user.getId(), LocalVCPersonalAccessTokenManagementService.generateSecureVCSAccessToken(), expiryDate); + log.debug("Successfully created a VCS access token for user {}", user.getLogin()); + user = userRepository.getUser(); + UserDTO userDTO = new UserDTO(); + userDTO.setLogin(user.getLogin()); + userDTO.setVcsAccessToken(user.getVcsAccessToken()); + userDTO.setVcsAccessTokenExpiryDate(user.getVcsAccessTokenExpiryDate()); + return ResponseEntity.ok(userDTO); + } + + /** + * DELETE account/user-vcs-access-token : deletes the vcsAccessToken of a user + * + * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request) + */ + @DeleteMapping("account/user-vcs-access-token") + @EnforceAtLeastStudent + public ResponseEntity deleteVcsAccessToken() { + User user = userRepository.getUser(); + log.debug("REST request to remove VCS access token key of user {}", user.getLogin()); + userRepository.updateUserVcsAccessToken(user.getId(), null, null); + log.debug("Successfully deleted VCS access token of user {}", user.getLogin()); + return ResponseEntity.ok().build(); + } + + /** + * GET account/participation-vcs-access-token : get the vcsToken for of a user for a participation + * + * @param participationId the participation for which the access token should be fetched + * + * @return the versionControlAccessToken belonging to the provided participation and user + */ + @GetMapping("account/participation-vcs-access-token") + @EnforceAtLeastStudent + public ResponseEntity getVcsAccessToken(@RequestParam("participationId") Long participationId) { + User user = userRepository.getUser(); + + log.debug("REST request to get VCS access token of user {} for participation {}", user.getLogin(), participationId); + return ResponseEntity.ok(userService.getParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken()); + } + + /** + * PUT account/participation-vcs-access-token : get the vcsToken for of a user for a participation + * + * @param participationId the participation for which the access token should be fetched + * + * @return the versionControlAccessToken belonging to the provided participation and user + */ + @PutMapping("account/participation-vcs-access-token") + @EnforceAtLeastStudent + public ResponseEntity createVcsAccessToken(@RequestParam("participationId") Long participationId) { + User user = userRepository.getUser(); + + log.debug("REST request to create a new VCS access token for user {} for participation {}", user.getLogin(), participationId); + return ResponseEntity.ok(userService.createParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken()); + } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java index 747208042837..8415cbc6f104 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java @@ -2,24 +2,18 @@ import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.PublicKey; import java.time.ZonedDateTime; import java.util.List; import java.util.Optional; -import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; import org.slf4j.Logger; 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.PageRequest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; 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.PutMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -29,7 +23,6 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.config.icl.ssh.HashUtils; import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.repository.UserRepository; import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; @@ -39,7 +32,6 @@ import de.tum.in.www1.artemis.service.dto.UserInitializationDTO; import de.tum.in.www1.artemis.service.user.UserCreationService; import de.tum.in.www1.artemis.service.user.UserService; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; import tech.jhipster.web.util.PaginationUtil; /** @@ -67,9 +59,6 @@ @RequestMapping("api/") public class UserResource { - @Value("${jhipster.clientApp.name}") - private String applicationName; - private static final Logger log = LoggerFactory.getLogger(UserResource.class); private final UserService userService; @@ -180,81 +169,4 @@ public ResponseEntity setIrisAcceptedToTimestamp() { userRepository.updateIrisAcceptedToDate(user.getId(), ZonedDateTime.now()); return ResponseEntity.ok().build(); } - - /** - * PUT users/sshpublickey : sets the ssh public key - * - * @param sshPublicKey the ssh public key to set - * - * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request) - */ - @PutMapping("users/sshpublickey") - @EnforceAtLeastStudent - public ResponseEntity addSshPublicKey(@RequestBody String sshPublicKey) throws GeneralSecurityException, IOException { - - User user = userRepository.getUser(); - log.debug("REST request to add SSH key to user {}", user.getLogin()); - // Parse the public key string - AuthorizedKeyEntry keyEntry; - try { - keyEntry = AuthorizedKeyEntry.parseAuthorizedKeyEntry(sshPublicKey); - } - catch (IllegalArgumentException e) { - return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert(applicationName, true, "sshUserSettings", "saveSshKeyError", "Invalid SSH key format")) - .body(null); - } - // Extract the PublicKey object - PublicKey publicKey = keyEntry.resolvePublicKey(null, null, null); - String keyHash = HashUtils.getSha512Fingerprint(publicKey); - userRepository.updateUserSshPublicKeyHash(user.getId(), keyHash, sshPublicKey); - return ResponseEntity.ok().build(); - } - - /** - * PUT users/sshpublickey : sets the ssh public key - * - * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request) - */ - @DeleteMapping("users/sshpublickey") - @EnforceAtLeastStudent - public ResponseEntity deleteSshPublicKey() { - User user = userRepository.getUser(); - log.debug("REST request to remove SSH key of user {}", user.getLogin()); - userRepository.updateUserSshPublicKeyHash(user.getId(), null, null); - - log.debug("Successfully deleted SSH key of user {}", user.getLogin()); - return ResponseEntity.ok().build(); - } - - /** - * GET users/vcsToken : get the vcsToken for of a user for a participation - * - * @param participationId the participation for which the access token should be fetched - * - * @return the versionControlAccessToken belonging to the provided participation and user - */ - @GetMapping("users/vcsToken") - @EnforceAtLeastStudent - public ResponseEntity getVcsAccessToken(@RequestParam("participationId") Long participationId) { - User user = userRepository.getUser(); - - log.debug("REST request to get VCS access token of user {} for participation {}", user.getLogin(), participationId); - return ResponseEntity.ok(userService.getParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken()); - } - - /** - * PUT users/vcsToken : get the vcsToken for of a user for a participation - * - * @param participationId the participation for which the access token should be fetched - * - * @return the versionControlAccessToken belonging to the provided participation and user - */ - @PutMapping("users/vcsToken") - @EnforceAtLeastStudent - public ResponseEntity createVcsAccessToken(@RequestParam("participationId") Long participationId) { - User user = userRepository.getUser(); - - log.debug("REST request to create a new VCS access token for user {} for participation {}", user.getLogin(), participationId); - return ResponseEntity.ok(userService.createParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken()); - } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java index a3fdf0875c31..036b673d1674 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java @@ -46,9 +46,10 @@ import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; import de.tum.in.www1.artemis.service.competency.CompetencyRelationService; import de.tum.in.www1.artemis.service.competency.CourseCompetencyService; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; import de.tum.in.www1.artemis.service.feature.Feature; import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService; +import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService; import de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO; @@ -80,7 +81,7 @@ public class CourseCompetencyResource { private final CompetencyRelationService competencyRelationService; - private final Optional irisCompetencyGenerationSessionService; + private final Optional irisCompetencyGenerationService; private final CompetencyJolService competencyJolService; @@ -91,7 +92,7 @@ public class CourseCompetencyResource { public CourseCompetencyResource(UserRepository userRepository, CourseCompetencyService courseCompetencyService, CourseCompetencyRepository courseCompetencyRepository, CourseRepository courseRepository, CompetencyProgressService competencyProgressService, CompetencyProgressRepository competencyProgressRepository, CompetencyRelationRepository competencyRelationRepository, CompetencyRelationService competencyRelationService, - Optional irisCompetencyGenerationSessionService, CompetencyJolService competencyJolService, + Optional irisCompetencyGenerationService, CompetencyJolService competencyJolService, AuthorizationCheckService authorizationCheckService) { this.userRepository = userRepository; this.courseCompetencyService = courseCompetencyService; @@ -101,7 +102,7 @@ public CourseCompetencyResource(UserRepository userRepository, CourseCompetencyS this.competencyProgressRepository = competencyProgressRepository; this.competencyRelationRepository = competencyRelationRepository; this.competencyRelationService = competencyRelationService; - this.irisCompetencyGenerationSessionService = irisCompetencyGenerationSessionService; + this.irisCompetencyGenerationService = irisCompetencyGenerationService; this.competencyJolService = competencyJolService; this.authorizationCheckService = authorizationCheckService; } @@ -332,25 +333,25 @@ public ResponseEntity removeCompetencyRelation(@PathVariable long courseId } /** - * POST courses/:courseId/course-competencies/generate-from-description : Generates a list of course competencies from a given course description by using - * IRIS. + * POST courses/:courseId/course-competencies/:competencyId/competencies/generate-from-description + * Generates a list of competencies from a given course description with IRIS. * - * @param courseId the id of the current course - * @param courseDescription the text description of the course - * @return the ResponseEntity with status 200 (OK) and body the generated competencies + * @param courseId the id of the current course + * @param input the course description and current competencies + * @return the ResponseEntity with status 202 (Accepted) */ @PostMapping("courses/{courseId}/course-competencies/generate-from-description") @EnforceAtLeastEditorInCourse - public ResponseEntity> generateCompetenciesFromCourseDescription(@PathVariable Long courseId, @RequestBody String courseDescription) { - var irisService = irisCompetencyGenerationSessionService.orElseThrow(); + public ResponseEntity generateCompetenciesFromCourseDescription(@PathVariable Long courseId, @RequestBody PyrisCompetencyExtractionInputDTO input) { + var competencyGenerationService = irisCompetencyGenerationService.orElseThrow(); var user = userRepository.getUserWithGroupsAndAuthorities(); var course = courseRepository.findByIdElseThrow(courseId); - var session = irisService.getOrCreateSession(course, user); - irisService.addUserTextMessageToSession(session, courseDescription); - var competencies = irisService.executeRequest(session); + // Start the Iris competency generation pipeline for the given course. + // The generated competencies will be sent async over the websocket on the topic /topic/iris/competencies/{courseId} + competencyGenerationService.executeCompetencyExtractionPipeline(user, course, input.courseDescription(), input.currentCompetencies()); - return ResponseEntity.ok(competencies); + return ResponseEntity.accepted().build(); } /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java index 9480b6e77d79..7950c09cb773 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java @@ -165,6 +165,7 @@ public ResponseEntity getAccount() { UserDTO userDTO = new UserDTO(user); // we set this value on purpose here: the user can only fetch their own information, make the token available for constructing the token-based clone-URL userDTO.setVcsAccessToken(user.getVcsAccessToken()); + userDTO.setVcsAccessTokenExpiryDate(user.getVcsAccessTokenExpiryDate()); userDTO.setSshPublicKey(user.getSshPublicKey()); log.info("GET /account {} took {}ms", user.getLogin(), System.currentTimeMillis() - start); return ResponseEntity.ok(userDTO); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java index d2bf76e78491..f843fb729484 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java @@ -16,7 +16,9 @@ import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; @@ -27,7 +29,7 @@ /** * REST controller for providing Pyris access to Artemis internal data and status updates. * All endpoints in this controller use custom token based authentication. - * See {@link PyrisJobService#getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest)} for more information. + * See {@link PyrisJobService#getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest, Class)} for more information. */ @RestController @Profile("iris") @@ -58,15 +60,12 @@ public PublicPyrisStatusUpdateResource(PyrisJobService pyrisJobService, PyrisSta @PostMapping("pipelines/tutor-chat/runs/{runId}/status") // TODO: Rename this to 'exercise-chat' with next breaking Pyris version @EnforceNothing public ResponseEntity setStatusOfJob(@PathVariable String runId, @RequestBody PyrisChatStatusUpdateDTO statusUpdateDTO, HttpServletRequest request) { - var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request); + var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, ExerciseChatJob.class); if (!Objects.equals(job.jobId(), runId)) { throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch"); } - if (!(job instanceof ExerciseChatJob exerciseChatJob)) { - throw new ConflictException("Run ID is not a exercise chat job", "Job", "invalidRunId"); - } - pyrisStatusUpdateService.handleStatusUpdate(exerciseChatJob, statusUpdateDTO); + pyrisStatusUpdateService.handleStatusUpdate(job, statusUpdateDTO); return ResponseEntity.ok().build(); } @@ -86,15 +85,38 @@ public ResponseEntity setStatusOfJob(@PathVariable String runId, @RequestB @PostMapping("pipelines/course-chat/runs/{runId}/status") @EnforceNothing public ResponseEntity setStatusOfCourseChatJob(@PathVariable String runId, @RequestBody PyrisChatStatusUpdateDTO statusUpdateDTO, HttpServletRequest request) { - var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request); + var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, CourseChatJob.class); if (!Objects.equals(job.jobId(), runId)) { throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch"); } - if (!(job instanceof CourseChatJob courseChatJob)) { - throw new ConflictException("Run ID is not a course chat job", "Job", "invalidRunId"); + + pyrisStatusUpdateService.handleStatusUpdate(job, statusUpdateDTO); + + return ResponseEntity.ok().build(); + } + + /** + * POST public/pyris/pipelines/competency-extraction/runs/:runId/status : Send the competencies extracted from a course description in a status update + *

+ * Uses custom token based authentication. + * + * @param runId the ID of the job + * @param statusUpdateDTO the status update + * @param request the HTTP request + * @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 + * @return a {@link ResponseEntity} with status {@code 200 (OK)} + */ + @PostMapping("pipelines/competency-extraction/runs/{runId}/status") + @EnforceNothing + public ResponseEntity setCompetencyExtractionJobStatus(@PathVariable String runId, @RequestBody PyrisCompetencyStatusUpdateDTO statusUpdateDTO, + HttpServletRequest request) { + var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, CompetencyExtractionJob.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(courseChatJob, statusUpdateDTO); + pyrisStatusUpdateService.handleStatusUpdate(job, statusUpdateDTO); return ResponseEntity.ok().build(); } @@ -112,7 +134,7 @@ public ResponseEntity setStatusOfCourseChatJob(@PathVariable String runId, @PostMapping("webhooks/ingestion/runs/{runId}/status") @EnforceNothing public ResponseEntity setStatusOfIngestionJob(@PathVariable String runId, @RequestBody PyrisLectureIngestionStatusUpdateDTO statusUpdateDTO, HttpServletRequest request) { - PyrisJob job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request); + PyrisJob job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, PyrisJob.class); if (!job.jobId().equals(runId)) { throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch"); } diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index b216a43a2bf6..8c66b009451c 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -87,6 +87,8 @@ artemis: default: "ls1tum/artemis-swift-swiftlint-docker:latest" ocaml: default: "ls1tum/artemis-ocaml-docker:v1" + rust: + default: "ghcr.io/ls1intum/artemis-rust-docker:v0.9.70" management: endpoints: @@ -196,6 +198,9 @@ spring: thread-name-prefix: artemis-scheduling- pool: size: 2 + threads: + virtual: + enabled: true thymeleaf: mode: HTML output: diff --git a/src/main/resources/templates/aeolus/rust/default.sh b/src/main/resources/templates/aeolus/rust/default.sh new file mode 100644 index 000000000000..d1ba23293a58 --- /dev/null +++ b/src/main/resources/templates/aeolus/rust/default.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +set -e +export AEOLUS_INITIAL_DIRECTORY=${PWD} +build () { + echo '⚙️ executing build' + cargo build --verbose +} + +run_all_tests () { + echo '⚙️ executing run_all_tests' + cargo nextest run --profile ci +} + +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; build" + cd "${AEOLUS_INITIAL_DIRECTORY}" + bash -c "source ${_script_name} aeolus_sourcing; run_all_tests" +} + +main "${@}" diff --git a/src/main/resources/templates/aeolus/rust/default.yaml b/src/main/resources/templates/aeolus/rust/default.yaml new file mode 100644 index 000000000000..4cd44c110048 --- /dev/null +++ b/src/main/resources/templates/aeolus/rust/default.yaml @@ -0,0 +1,14 @@ +api: v0.0.1 +metadata: + name: Rust + id: rust + description: Test crate using cargo +actions: + - name: build + script: cargo build --verbose + - name: run_all_tests + script: cargo nextest run --profile ci + results: + - name: junit_target/nextest/ci/junit.xml + path: target/nextest/ci/junit.xml + type: junit diff --git a/src/main/resources/templates/gitlabci/rust/regularRuns/.gitlab-ci.yml b/src/main/resources/templates/gitlabci/rust/regularRuns/.gitlab-ci.yml new file mode 100644 index 000000000000..39e416158a9c --- /dev/null +++ b/src/main/resources/templates/gitlabci/rust/regularRuns/.gitlab-ci.yml @@ -0,0 +1,47 @@ +stages: + - test + - upload + + +test-job: + image: ${ARTEMIS_BUILD_DOCKER_IMAGE} + stage: test + only: + variables: + - $CI_COMMIT_BRANCH == $ARTEMIS_SUBMISSION_GIT_BRANCH + allow_failure: true + variables: + GIT_STRATEGY: none + script: + - git clone --branch ${ARTEMIS_TEST_GIT_BRANCH} ${CI_SERVER_PROTOCOL}://${ARTEMIS_TEST_GIT_USER}:${ARTEMIS_TEST_GIT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/${CI_PROJECT_NAMESPACE}/${ARTEMIS_TEST_GIT_REPOSITORY_SLUG} . + - git clone --branch ${ARTEMIS_SUBMISSION_GIT_BRANCH} ${CI_SERVER_PROTOCOL}://${ARTEMIS_TEST_GIT_USER}:${ARTEMIS_TEST_GIT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME} assignment + - export ARTEMIS_NOTIFICATION_SECRET=[hidden] # Workaround for overwriting the secret + - export ARTEMIS_TEST_GIT_TOKEN=[hidden] + - cargo nextest run --profile ci | tee -a "${ARTEMIS_BUILD_LOGS_FILE}" && echo "ARTEMIS_BUILD_STATUS=success" > .env || echo "ARTEMIS_BUILD_STATUS=failed" > .env + - test -e target/nextest/ci/junit.xml && sed -i 's/]*>//g ; s/<\/testsuites>/<\/testsuite>/g' target/nextest/ci/junit.xml # not supported by notification plugin + after_script: + - echo "ARTEMIS_TEST_GIT_HASH=$(git rev-parse HEAD)" >> .env + - echo "ARTEMIS_SUBMISSION_GIT_HASH=${CI_COMMIT_SHA}" >> .env + - echo "ARTEMIS_SUBMISSION_GIT_REPOSITORY_SLUG=${CI_PROJECT_NAME}" >> .env + artifacts: + paths: + - ${ARTEMIS_BUILD_LOGS_FILE} + - target/nextest/ci/*.xml + reports: + dotenv: .env + + +upload-job: + image: ${ARTEMIS_NOTIFICATION_PLUGIN_DOCKER_IMAGE} + stage: upload + dependencies: + - test-job + only: + variables: + - $CI_COMMIT_BRANCH == $ARTEMIS_SUBMISSION_GIT_BRANCH + variables: + GIT_STRATEGY: none + script: + - cp -r /notification-plugin/* . + - export ARTEMIS_TEST_RESULTS_DIR="target/nextest/ci" # override project variable + - gradle run diff --git a/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy new file mode 100644 index 000000000000..965d7423ce7c --- /dev/null +++ b/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy @@ -0,0 +1,56 @@ +/* + * 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 'cargo nextest run --profile ci' + } +} + +/** + * 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 target/nextest/ci/junit.xml ] + then + sed -i 's/]*>//g ; s/<\\/testsuites>/<\\/testsuite>/g' target/nextest/ci/junit.xml + fi + cp target/nextest/ci/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/rust/exercise/.gitattributes b/src/main/resources/templates/rust/exercise/.gitattributes new file mode 100644 index 000000000000..2677732ca2e9 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/.gitattributes @@ -0,0 +1,5 @@ +* text=auto eol=lf + +*.rs text eol=lf diff=rust +Cargo.toml text eol=lf +Cargo.lock text eol=lf diff --git a/src/main/resources/templates/rust/exercise/.gitignore b/src/main/resources/templates/rust/exercise/.gitignore new file mode 100644 index 000000000000..ea8c4bf7f35f --- /dev/null +++ b/src/main/resources/templates/rust/exercise/.gitignore @@ -0,0 +1 @@ +/target diff --git a/src/main/resources/templates/rust/exercise/Cargo.lock b/src/main/resources/templates/rust/exercise/Cargo.lock new file mode 100644 index 000000000000..2f5f96ba7454 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/Cargo.lock @@ -0,0 +1,100 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "num-traits", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rust-template-exercise" +version = "0.1.0" +dependencies = [ + "chrono", + "rand", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" diff --git a/src/main/resources/templates/rust/exercise/Cargo.toml b/src/main/resources/templates/rust/exercise/Cargo.toml new file mode 100644 index 000000000000..34b160c5368d --- /dev/null +++ b/src/main/resources/templates/rust/exercise/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "rust-template-exercise" +version = "0.1.0" +edition = "2021" + +[dependencies] +chrono = { version = "0.4.38", default-features = false } +rand = "0.8.5" diff --git a/src/main/resources/templates/rust/exercise/src/bubble_sort.rs b/src/main/resources/templates/rust/exercise/src/bubble_sort.rs new file mode 100644 index 000000000000..0587d2852dcf --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/bubble_sort.rs @@ -0,0 +1,14 @@ +use chrono::NaiveDate; + +pub struct BubbleSort; + +impl BubbleSort { + /// Sorts items with the Bubble Sort algorithm. + /// + /// Arguments: + /// + /// * `input`: slice of items to be sorted + pub fn perform_sort(&self, input: &mut [NaiveDate]) { + todo!("implement"); + } +} diff --git a/src/main/resources/templates/rust/exercise/src/context.rs b/src/main/resources/templates/rust/exercise/src/context.rs new file mode 100644 index 000000000000..30940f4db7a7 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/context.rs @@ -0,0 +1 @@ +// TODO: Create and implement a Context struct according to the UML class diagram diff --git a/src/main/resources/templates/rust/exercise/src/lib.rs b/src/main/resources/templates/rust/exercise/src/lib.rs new file mode 100644 index 000000000000..930d9899389d --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/lib.rs @@ -0,0 +1,5 @@ +pub mod bubble_sort; +pub mod context; +pub mod merge_sort; +pub mod policy; +pub mod sort_strategy; diff --git a/src/main/resources/templates/rust/exercise/src/main.rs b/src/main/resources/templates/rust/exercise/src/main.rs new file mode 100644 index 000000000000..9263a66a267e --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/main.rs @@ -0,0 +1,53 @@ +use std::ops::RangeInclusive; +use std::time::Duration; + +use chrono::{NaiveDate, TimeDelta}; +use rand::{thread_rng, Rng}; + +const ITERATIONS: usize = 10; +const LENGTH_MIN: usize = 5; +const LENGTH_MAX: usize = 15; + +/// Main function. +/// Add code to demonstrate your implementation here. +fn main() { + todo!("Init Context and Policy"); + + // Run multiple times to simulate different sorting strategies + for _ in 0..ITERATIONS { + let mut dates = create_random_dates(); + todo!("Configure context"); + println!("Unsorted Array of course dates = {dates:#?}"); + + todo!("Sort dates"); + + println!("Sorted Array of course dates = {dates:#?}"); + } +} + +/// Generates a [Vec] of random [NaiveDate] objects with a random length +/// between [LENGTH_MIN] and [LENGTH_MAX]. +fn create_random_dates() -> Vec { + let length = thread_rng().gen_range(LENGTH_MIN..=LENGTH_MAX); + + let date_format = "%Y-%m-%d"; + let low_date = NaiveDate::parse_from_str("2024-09-15", date_format).unwrap(); + let high_date = NaiveDate::parse_from_str("2025-01-15", date_format).unwrap(); + + let mut dates = Vec::new(); + dates.resize_with(length, || random_date_within(low_date..=high_date)); + dates +} + +/// Creates a random Date within the given range. +fn random_date_within(range: RangeInclusive) -> NaiveDate { + let (start, end) = range.into_inner(); + + let max_delta = end - start; + let max_duration = max_delta.to_std().unwrap(); + + let random_duration = thread_rng().gen_range(Duration::ZERO..=max_duration); + let random_delta = TimeDelta::from_std(random_duration).unwrap(); + + start + random_delta +} diff --git a/src/main/resources/templates/rust/exercise/src/merge_sort.rs b/src/main/resources/templates/rust/exercise/src/merge_sort.rs new file mode 100644 index 000000000000..78fbb6b6dd33 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/merge_sort.rs @@ -0,0 +1,14 @@ +use chrono::NaiveDate; + +pub struct MergeSort; + +impl MergeSort { + /// Sorts items with the Merge Sort algorithm. + /// + /// Arguments: + /// + /// * `input`: slice of items to be sorted + pub fn perform_sort(&self, input: &mut [NaiveDate]) { + todo!("implement"); + } +} diff --git a/src/main/resources/templates/rust/exercise/src/policy.rs b/src/main/resources/templates/rust/exercise/src/policy.rs new file mode 100644 index 000000000000..ebaa1dfd92d3 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/policy.rs @@ -0,0 +1 @@ +// TODO: Create and implement a Policy class as described in the problem statement diff --git a/src/main/resources/templates/rust/exercise/src/sort_strategy.rs b/src/main/resources/templates/rust/exercise/src/sort_strategy.rs new file mode 100644 index 000000000000..ccd9a65d5246 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/sort_strategy.rs @@ -0,0 +1,2 @@ +// TODO: Create a SortStrategy interface according to the UML class diagram +// TODO: Make the sorting algorithms implement this trait. diff --git a/src/main/resources/templates/rust/readme b/src/main/resources/templates/rust/readme new file mode 100755 index 000000000000..9510a4ca0428 --- /dev/null +++ b/src/main/resources/templates/rust/readme @@ -0,0 +1,91 @@ +# Sorting with the Strategy Pattern + +In this exercise, we want to implement sorting algorithms and choose them based on runtime specific variables. + +### Part 1: Sorting + +First, we need to implement two sorting algorithms, in this case `MergeSort` and `BubbleSort`. + +**You have the following tasks:** + +1. [task][Implement Bubble Sort](test_bubble_sort) +Implement the method `perform_sort(&mut [NaiveDate])` in the struct `BubbleSort`. Make sure to follow the Bubble Sort algorithm exactly. + +2. [task][Implement Merge Sort](test_merge_sort) +Implement the method `perform_sort(&mut [NaiveDate])` in the struct `MergeSort`. Make sure to follow the Merge Sort algorithm exactly. + +### Part 2: Strategy Pattern + +We want the application to apply different algorithms for sorting a slice of `NaiveDate` objects. +Use the strategy pattern to select the right sorting algorithm at runtime. + +**You have the following tasks:** + +1. [task][SortStrategy Interface](test_sort_strategy_trait,test_sort_strategy_methods,test_sort_strategy_supertrait,test_merge_sort_struct,test_bubble_sort_struct) +Create a `SortStrategy` trait and adjust the sorting algorithms so that they implement this interface. +Also make sure to declare `std::any::Any` as a supertrait. + +2. [task][Context Class](test_context_fields,test_context_methods) +Create and implement a `Context` struct following the below class diagram. +Also add a getter for `sort_algorithm` with the signature `sort_algorithm(&self) -> &dyn SortStrategy`. + +3. [task][Context Policy](test_policy_fields,test_policy_methods) +Create and implement a `Policy` struct following the below class diagram with a simple configuration mechanism: + + 1. [task][Select MergeSort](test_merge_sort_struct,test_use_merge_sort_for_big_list) + Select `MergeSort` when the List has more than 10 dates. + + 2. [task][Select BubbleSort](test_bubble_sort_struct,test_use_bubble_sort_for_small_list) + Select `BubbleSort` when the List has less or equal 10 dates. + +4. Complete the `main()` function which demonstrates switching between two strategies at runtime. + +@startuml + +class Policy { + +new(&RefCell) + +configure(&[NaiveDate]) +} + +class Context { + +new() + +sort(&mut [NaiveDate]) +} + +interface Any { +} + +interface SortStrategy { + +perform_sort(&mut [NaiveDate]) +} + +class BubbleSort { + +perform_sort(&mut [NaiveDate]) +} + +class MergeSort { + +perform_sort(&mut [NaiveDate]) +} + +MergeSort -up-|> SortStrategy #testsColor(test_merge_sort_struct) +BubbleSort -up-|> SortStrategy #testsColor(test_bubble_sort_struct) +SortStrategy -up-|> Any #testsColor(test_sort_strategy_supertrait) +Policy -right-> Context #testsColor(test_policy_fields): context +Context -right-> SortStrategy #testsColor(test_context_fields): sort_algorithm + +hide empty fields +hide empty methods + +@enduml + + +### Part 3: Optional Challenges + +(These are not tested) + +1. Create a new struct `QuickSort` that implements `SortStrategy` and implement the Quick Sort algorithm. + +2. Make the method `perform_sort(&mut [NaiveDate])` generic, so that other types can also be sorted by the same method. +**Hint:** Have a look at Rust Generics and the trait `Ord`. + +3. Think about a useful decision in `Policy` when to use the new `QuickSort` algorithm. diff --git a/src/main/resources/templates/rust/solution/.gitattributes b/src/main/resources/templates/rust/solution/.gitattributes new file mode 100644 index 000000000000..2677732ca2e9 --- /dev/null +++ b/src/main/resources/templates/rust/solution/.gitattributes @@ -0,0 +1,5 @@ +* text=auto eol=lf + +*.rs text eol=lf diff=rust +Cargo.toml text eol=lf +Cargo.lock text eol=lf diff --git a/src/main/resources/templates/rust/solution/.gitignore b/src/main/resources/templates/rust/solution/.gitignore new file mode 100644 index 000000000000..ea8c4bf7f35f --- /dev/null +++ b/src/main/resources/templates/rust/solution/.gitignore @@ -0,0 +1 @@ +/target diff --git a/src/main/resources/templates/rust/solution/Cargo.lock b/src/main/resources/templates/rust/solution/Cargo.lock new file mode 100644 index 000000000000..2f5f96ba7454 --- /dev/null +++ b/src/main/resources/templates/rust/solution/Cargo.lock @@ -0,0 +1,100 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "num-traits", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rust-template-exercise" +version = "0.1.0" +dependencies = [ + "chrono", + "rand", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" diff --git a/src/main/resources/templates/rust/solution/Cargo.toml b/src/main/resources/templates/rust/solution/Cargo.toml new file mode 100644 index 000000000000..34b160c5368d --- /dev/null +++ b/src/main/resources/templates/rust/solution/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "rust-template-exercise" +version = "0.1.0" +edition = "2021" + +[dependencies] +chrono = { version = "0.4.38", default-features = false } +rand = "0.8.5" diff --git a/src/main/resources/templates/rust/solution/src/bubble_sort.rs b/src/main/resources/templates/rust/solution/src/bubble_sort.rs new file mode 100644 index 000000000000..82c751842786 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/bubble_sort.rs @@ -0,0 +1,23 @@ +use std::cmp::Ord; + +use crate::sort_strategy::SortStrategy; + +pub struct BubbleSort; + +impl SortStrategy for BubbleSort { + /// Sorts items with the Bubble Sort algorithm. + /// + /// Arguments: + /// + /// * `input`: slice of items to be sorted + fn perform_sort(&self, input: &mut [T]) { + let len = input.len(); + for i in (0..len).rev() { + for j in 0..i { + if input[j] > input[j + 1] { + input.swap(j, j + 1); + } + } + } + } +} diff --git a/src/main/resources/templates/rust/solution/src/context.rs b/src/main/resources/templates/rust/solution/src/context.rs new file mode 100644 index 000000000000..71cd0d711753 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/context.rs @@ -0,0 +1,36 @@ +use crate::sort_strategy::SortStrategy; +use chrono::NaiveDate; +use std::ops::Deref; + +pub struct Context { + sort_algorithm: Option>>, +} + +impl Context { + pub fn new() -> Context { + Context { + sort_algorithm: None, + } + } + + /// Runs the configured sorting algorithm. + pub fn sort(&self, data: &mut [NaiveDate]) { + let sort_algorithm = self + .sort_algorithm + .as_ref() + .expect("sort_algorithm has to be set before sort() is called"); + + sort_algorithm.perform_sort(data); + } + + pub fn set_sort_algorithm(&mut self, sort_algorithm: Box>) { + self.sort_algorithm = Some(sort_algorithm); + } + + pub fn sort_algorithm(&self) -> &dyn SortStrategy { + self.sort_algorithm + .as_ref() + .expect("sort_algorithm has to be set") + .deref() + } +} diff --git a/src/main/resources/templates/rust/solution/src/lib.rs b/src/main/resources/templates/rust/solution/src/lib.rs new file mode 100644 index 000000000000..930d9899389d --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/lib.rs @@ -0,0 +1,5 @@ +pub mod bubble_sort; +pub mod context; +pub mod merge_sort; +pub mod policy; +pub mod sort_strategy; diff --git a/src/main/resources/templates/rust/solution/src/main.rs b/src/main/resources/templates/rust/solution/src/main.rs new file mode 100644 index 000000000000..0d8d362fafc9 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/main.rs @@ -0,0 +1,59 @@ +use std::time::Duration; +use std::{cell::RefCell, ops::RangeInclusive}; + +use chrono::{NaiveDate, TimeDelta}; +use rand::{thread_rng, Rng}; + +use rust_template_exercise::{context::Context, policy::Policy}; + +const ITERATIONS: usize = 10; +const LENGTH_MIN: usize = 5; +const LENGTH_MAX: usize = 15; + +/// Main function. +/// Add code to demonstrate your implementation here. +fn main() { + // Init Context and Policy + let context = RefCell::new(Context::new()); + let mut policy = Policy::new(&context); + + // Run multiple times to simulate different sorting strategies + for _ in 0..ITERATIONS { + let mut dates = create_random_dates(); + // Configure context + policy.configure(&dates); + println!("Unsorted Array of course dates = {dates:#?}"); + + // Sort dates + context.borrow().sort(&mut dates); + + println!("Sorted Array of course dates = {dates:#?}"); + } +} + +/// Generates a [Vec] of random [NaiveDate] objects with a random length +/// between [LENGTH_MIN] and [LENGTH_MAX]. +fn create_random_dates() -> Vec { + let length = thread_rng().gen_range(LENGTH_MIN..=LENGTH_MAX); + + let date_format = "%Y-%m-%d"; + let low_date = NaiveDate::parse_from_str("2024-09-15", date_format).unwrap(); + let high_date = NaiveDate::parse_from_str("2025-01-15", date_format).unwrap(); + + let mut dates = Vec::new(); + dates.resize_with(length, || random_date_within(low_date..=high_date)); + dates +} + +/// Creates a random Date within the given range. +fn random_date_within(range: RangeInclusive) -> NaiveDate { + let (start, end) = range.into_inner(); + + let max_delta = end - start; + let max_duration = max_delta.to_std().unwrap(); + + let random_duration = thread_rng().gen_range(Duration::ZERO..=max_duration); + let random_delta = TimeDelta::from_std(random_duration).unwrap(); + + start + random_delta +} diff --git a/src/main/resources/templates/rust/solution/src/merge_sort.rs b/src/main/resources/templates/rust/solution/src/merge_sort.rs new file mode 100644 index 000000000000..a1887c6d38f8 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/merge_sort.rs @@ -0,0 +1,59 @@ +use std::cmp::Ord; + +use crate::sort_strategy::SortStrategy; + +pub struct MergeSort; + +impl SortStrategy for MergeSort { + /// Sorts items with the Merge Sort algorithm. + /// + /// Arguments: + /// + /// * `input`: slice of items to be sorted + fn perform_sort(&self, input: &mut [T]) { + mergesort(input); + } +} + +fn mergesort(input: &mut [T]) { + if input.len() < 2 { + return; + } + + let middle = input.len() / 2; + let (left, right) = input.split_at_mut(middle); + mergesort(left); + mergesort(right); + merge(input, middle); +} + +fn merge(input: &mut [T], middle: usize) { + let mut result = Vec::with_capacity(input.len()); + + let mut left_index = 0; + let mut right_index = middle; + + while left_index < middle && right_index < input.len() { + if input[left_index] <= input[right_index] { + result.push(input[left_index]); + left_index += 1; + } else { + result.push(input[right_index]); + right_index += 1; + } + } + + if left_index < middle { + while left_index < middle { + result.push(input[left_index]); + left_index += 1; + } + } else { + while right_index < input.len() { + result.push(input[right_index]); + right_index += 1; + } + } + + input.copy_from_slice(&result); +} diff --git a/src/main/resources/templates/rust/solution/src/policy.rs b/src/main/resources/templates/rust/solution/src/policy.rs new file mode 100644 index 000000000000..a8e7e5203162 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/policy.rs @@ -0,0 +1,28 @@ +use crate::{ + bubble_sort::BubbleSort, context::Context, merge_sort::MergeSort, sort_strategy::SortStrategy, +}; +use chrono::NaiveDate; +use std::cell::RefCell; + +const SIZE_THRESHOLD: usize = 10; + +pub struct Policy<'a> { + context: &'a RefCell, +} + +impl<'a> Policy<'a> { + pub fn new(context: &'a RefCell) -> Policy<'a> { + Policy { context } + } + + /// Chooses a strategy depending on the number of items. + pub fn configure(&mut self, data: &[NaiveDate]) { + let sort_algorithm: Box> = if data.len() > SIZE_THRESHOLD { + Box::new(MergeSort) + } else { + Box::new(BubbleSort) + }; + + self.context.borrow_mut().set_sort_algorithm(sort_algorithm); + } +} diff --git a/src/main/resources/templates/rust/solution/src/sort_strategy.rs b/src/main/resources/templates/rust/solution/src/sort_strategy.rs new file mode 100644 index 000000000000..b924206e39ba --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/sort_strategy.rs @@ -0,0 +1,10 @@ +use std::any::Any; + +pub trait SortStrategy: Any { + /// Sorts a slice of `T`s. + /// + /// Arguments: + /// + /// * `input`: slice of items to be sorted + fn perform_sort(&self, input: &mut [T]); +} diff --git a/src/main/resources/templates/rust/test/.config/nextest.toml b/src/main/resources/templates/rust/test/.config/nextest.toml new file mode 100644 index 000000000000..6a109e171680 --- /dev/null +++ b/src/main/resources/templates/rust/test/.config/nextest.toml @@ -0,0 +1,5 @@ +[profile.ci] +fail-fast = false + +[profile.ci.junit] +path = "junit.xml" diff --git a/src/main/resources/templates/rust/test/.gitattributes b/src/main/resources/templates/rust/test/.gitattributes new file mode 100644 index 000000000000..2677732ca2e9 --- /dev/null +++ b/src/main/resources/templates/rust/test/.gitattributes @@ -0,0 +1,5 @@ +* text=auto eol=lf + +*.rs text eol=lf diff=rust +Cargo.toml text eol=lf +Cargo.lock text eol=lf diff --git a/src/main/resources/templates/rust/test/.gitignore b/src/main/resources/templates/rust/test/.gitignore new file mode 100644 index 000000000000..a37c5236a444 --- /dev/null +++ b/src/main/resources/templates/rust/test/.gitignore @@ -0,0 +1,2 @@ +/target +/assignment diff --git a/src/main/resources/templates/rust/test/Cargo.lock b/src/main/resources/templates/rust/test/Cargo.lock new file mode 100644 index 000000000000..bb5595575a1a --- /dev/null +++ b/src/main/resources/templates/rust/test/Cargo.lock @@ -0,0 +1,183 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "num-traits", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rust-template-exercise" +version = "0.1.0" +dependencies = [ + "chrono", + "rand", +] + +[[package]] +name = "rust-template-test" +version = "0.1.0" +dependencies = [ + "chrono", + "rust-template-exercise", + "rust_template_test_macros", + "syn", +] + +[[package]] +name = "rust_template_test_macros" +version = "0.1.0" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "zerocopy" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/src/main/resources/templates/rust/test/Cargo.toml b/src/main/resources/templates/rust/test/Cargo.toml new file mode 100644 index 000000000000..07f82b3f09f0 --- /dev/null +++ b/src/main/resources/templates/rust/test/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "rust-template-test" +version = "0.1.0" +edition = "2021" + +[dependencies] +chrono = { version = "0.4.38", default-features = false } +rust-template-exercise = { path = "assignment" } +syn = { version = "2.0.72", features = ["full"] } +rust_template_test_macros = { path = "./rust_template_test_macros" } + +[build-dependencies] +syn = { version = "2.0.72", features = ["full"] } diff --git a/src/main/resources/templates/rust/test/build.rs b/src/main/resources/templates/rust/test/build.rs new file mode 100644 index 000000000000..850fcb846cce --- /dev/null +++ b/src/main/resources/templates/rust/test/build.rs @@ -0,0 +1,204 @@ +use std::error::Error; +use std::ffi::OsStr; +use std::fs::read_to_string; +use std::path::{Component, Path}; +use std::{fs, io}; + +use syn::{parse_file, FnArg, ImplItem, Item, TraitItem, Type, TypeParamBound}; + +const SRC_DIR: &str = "assignment/src"; + +fn main() { + println!("cargo::rerun-if-changed={SRC_DIR}"); + if let Err(err) = visit_dirs(Path::new(SRC_DIR), &process_file) { + eprintln!("Failed to analyze submission: {err}"); + } +} + +fn visit_dirs Result<(), Box>>( + dir: &Path, + cb: &F, +) -> Result<(), Box> { + for entry in fs::read_dir(dir).map_err(|e| { + io::Error::new( + e.kind(), + format!("Failed to read directory {}: {}", dir.display(), e), + ) + })? { + let entry = entry?; + let path = entry.path(); + if path.is_dir() { + visit_dirs(&path, cb)?; + } else { + cb(&entry.path())?; + } + } + Ok(()) +} + +fn process_file(path: &Path) -> Result<(), Box> { + if path.extension() != Some(OsStr::new("rs")) { + return Ok(()); + } + + let file_content = read_to_string(path)?; + + let ast = parse_file(&file_content)?; + + let module = path + .strip_prefix(SRC_DIR)? + .with_extension("") + .components() + .map(Component::as_os_str) + .collect::>() + .join(OsStr::new("_")); + let module = module.to_str().ok_or("invalid UTF-8 in path")?; + + for item in ast.items { + match item { + Item::Enum(e) => { + println!("cargo::rustc-cfg=structure_{module}_enum_{}", e.ident); + + for v in e.variants { + println!( + "cargo::rustc-cfg=structure_{module}_enum_{}_variant_{}", + e.ident, v.ident + ); + } + } + Item::Fn(f) => println!("cargo::rustc-cfg=structure_{module}_fn_{}", f.sig.ident), + Item::Impl(impl_) => { + let self_path = if let Type::Path(p) = *impl_.self_ty { + p + } else { + continue; + }; + + let self_ident = if let Some(i) = self_path.path.segments.last().map(|s| &s.ident) { + i + } else { + continue; + }; + + if impl_.trait_.is_some() { + let trait_ident = if let Some(i) = impl_ + .trait_ + .as_ref() + .unwrap() + .1 + .segments + .last() + .map(|s| &s.ident) + { + i + } else { + continue; + }; + println!( + "cargo::rustc-cfg=structure_{module}_impl_{trait_ident}_for_{self_ident}" + ); + continue; + } + + for item in impl_.items { + match item { + ImplItem::Const(c) => println!( + "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_const_{}", + c.ident + ), + ImplItem::Fn(f) => { + println!( + "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_fn_{}", + f.sig.ident + ); + + if matches!(f.sig.inputs.first(), Some(&FnArg::Receiver(_))) { + println!( + "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_method_{}", + f.sig.ident + ); + } + } + ImplItem::Type(t) => println!( + "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_type_{}", + t.ident + ), + _ => continue, + } + } + } + Item::Struct(struct_) => { + println!( + "cargo::rustc-cfg=structure_{module}_struct_{}", + struct_.ident + ); + + for field in struct_.fields { + if let Some(field_ident) = field.ident { + println!( + "cargo::rustc-cfg=structure_{module}_struct_{}_field_{field_ident}", + struct_.ident + ); + } + } + } + Item::Trait(trait_) => { + println!("cargo::rustc-cfg=structure_{module}_trait_{}", trait_.ident); + + for supertrait in trait_.supertraits { + let supertrait = match supertrait { + TypeParamBound::Trait(supertrait) => supertrait, + _ => continue, + }; + let supertrait = &supertrait.path.segments.last().unwrap().ident; + println!( + "cargo::rustc-cfg=structure_{module}_trait_{}_supertrait_{supertrait}", + trait_.ident + ); + } + + for item in trait_.items { + match item { + TraitItem::Const(c) => println!( + "cargo::rustc-cfg=structure_{module}_trait_{}_const_{}", + trait_.ident, c.ident + ), + TraitItem::Fn(f) => { + println!( + "cargo::rustc-cfg=structure_{module}_trait_{}_fn_{}", + trait_.ident, f.sig.ident + ); + + if matches!(f.sig.inputs.first(), Some(&FnArg::Receiver(_))) { + println!( + "cargo::rustc-cfg=structure_{module}_trait_{}_method_{}", + trait_.ident, f.sig.ident + ); + } + } + TraitItem::Type(t) => println!( + "cargo::rustc-cfg=structure_{module}_trait_{}_type_{}", + trait_.ident, t.ident + ), + _ => continue, + } + } + } + Item::Union(union_) => { + println!("cargo::rustc-cfg=structure_{module}_union_{}", union_.ident); + + for field in union_.fields.named { + if let Some(field_ident) = field.ident { + println!( + "cargo::rustc-cfg=structure_{module}_union_{}_field_{field_ident}", + union_.ident + ); + } + } + } + _ => continue, + } + } + + Ok(()) +} diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/.gitignore b/src/main/resources/templates/rust/test/rust_template_test_macros/.gitignore new file mode 100644 index 000000000000..ea8c4bf7f35f --- /dev/null +++ b/src/main/resources/templates/rust/test/rust_template_test_macros/.gitignore @@ -0,0 +1 @@ +/target diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.lock b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.lock new file mode 100644 index 000000000000..a1259e414852 --- /dev/null +++ b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.lock @@ -0,0 +1,46 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rust_template_test_macros" +version = "0.1.0" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.toml b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.toml new file mode 100644 index 000000000000..625dee26344d --- /dev/null +++ b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "rust_template_test_macros" +version = "0.1.0" +edition = "2021" + +[lib] +proc-macro = true + +[dependencies] +quote = "1.0.36" +syn = { version = "2.0.72", features = ["full"] } diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs b/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs new file mode 100644 index 000000000000..498fa14d54a1 --- /dev/null +++ b/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs @@ -0,0 +1,346 @@ +//! Compile-time source code reflection +//! +//! Use this for conditional compilation. + +use proc_macro::TokenStream; + +use quote::{format_ident, quote}; +use syn::parse::Parse; +use syn::{parse_macro_input, Ident, Item, ItemFn, Path, Token}; + +trait ToStringLocal { + fn to_string(&self) -> String; +} + +impl ToStringLocal for Path { + fn to_string(&self) -> String { + let segments: Vec<_> = self.segments.iter().map(|s| s.ident.to_string()).collect(); + segments.join("::") + } +} + +#[proc_macro_attribute] +pub fn require_struct(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_struct) +} + +#[proc_macro_attribute] +pub fn require_struct_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_struct) +} + +#[proc_macro_attribute] +pub fn require_trait(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait) +} + +#[proc_macro_attribute] +pub fn require_trait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait) +} + +#[proc_macro_attribute] +pub fn require_enum(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_enum) +} + +#[proc_macro_attribute] +pub fn require_enum_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_enum) +} + +#[proc_macro_attribute] +pub fn require_function(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_function) +} + +#[proc_macro_attribute] +pub fn require_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_function) +} + +#[proc_macro_attribute] +pub fn require_impl_for_trait(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_for_trait) +} + +#[proc_macro_attribute] +pub fn require_impl_for_trait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_for_trait) +} + +#[proc_macro_attribute] +pub fn require_impl_function(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_function) +} + +#[proc_macro_attribute] +pub fn require_impl_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_function) +} + +#[proc_macro_attribute] +pub fn require_impl_method(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_method) +} + +#[proc_macro_attribute] +pub fn require_impl_method_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_method) +} + +#[proc_macro_attribute] +pub fn require_impl_const(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_const) +} + +#[proc_macro_attribute] +pub fn require_impl_const_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_const) +} + +#[proc_macro_attribute] +pub fn require_impl_type(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_type) +} + +#[proc_macro_attribute] +pub fn require_impl_type_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_type) +} + +#[proc_macro_attribute] +pub fn require_trait_function(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_function) +} + +#[proc_macro_attribute] +pub fn require_trait_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_function) +} + +#[proc_macro_attribute] +pub fn require_trait_method(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_method) +} + +#[proc_macro_attribute] +pub fn require_trait_method_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_method) +} + +#[proc_macro_attribute] +pub fn require_trait_const(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_const) +} + +#[proc_macro_attribute] +pub fn require_trait_const_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_const) +} + +#[proc_macro_attribute] +pub fn require_trait_type(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_type) +} + +#[proc_macro_attribute] +pub fn require_trait_type_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_type) +} + +#[proc_macro_attribute] +pub fn require_trait_supertrait(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_supertrait) +} + +#[proc_macro_attribute] +pub fn require_trait_supertrait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_supertrait) +} + +struct SuperTraitSpec { + module_path: String, + trait_name: String, + supertrait: String, +} + +impl Parse for SuperTraitSpec { + fn parse(input: syn::parse::ParseStream) -> syn::Result { + let path: Path = input.parse()?; + input.parse::()?; + let supertrait: Path = input.parse()?; + + let (module_path, trait_name) = split_path(path); + let supertrait = supertrait.segments.last().unwrap().ident.to_string(); + + Ok(SuperTraitSpec { + module_path, + trait_name, + supertrait, + }) + } +} + +impl ToStringLocal for SuperTraitSpec { + fn to_string(&self) -> String { + format!( + "supertrait {} of {}::{}", + self.supertrait, self.module_path, self.trait_name + ) + } +} + +fn require_for_item Ident>( + attr: TokenStream, + item: TokenStream, + make_cfg: F, +) -> TokenStream { + let attribute = parse_macro_input!(attr as A); + let original_item = parse_macro_input!(item as Item); + + let cfg = make_cfg(attribute); + + quote! ( + #[cfg(#cfg)] + #original_item + ) + .into() +} + +fn require_for_function Ident>( + attr: TokenStream, + item: TokenStream, + make_cfg: F, +) -> TokenStream { + let attribute = parse_macro_input!(attr as A); + let original_fn = parse_macro_input!(item as ItemFn); + + let failure_message = format!("missing {}", attribute.to_string()); + + let cfg = make_cfg(attribute); + + let ItemFn { + attrs, + vis, + sig, + block, + } = original_fn; + + quote!( + #(#attrs)* + #vis #sig { + #[cfg(not(#cfg))] + panic!(#failure_message); + #[cfg(#cfg)] + #block + } + ) + .into() +} + +fn make_cfg_struct(path: Path) -> Ident { + let (module_path, struct_name) = split_path(path); + format_ident!("structure_{module_path}_struct_{struct_name}") +} + +fn make_cfg_trait(path: Path) -> Ident { + let (module_path, trait_name) = split_path(path); + format_ident!("structure_{module_path}_trait_{trait_name}") +} + +fn make_cfg_enum(path: Path) -> Ident { + let (module_path, enum_name) = split_path(path); + format_ident!("structure_{module_path}_enum_{enum_name}") +} + +fn make_cfg_function(path: Path) -> Ident { + let (module_path, function_name) = split_path(path); + format_ident!("structure_{module_path}_fn_{function_name}") +} + +fn make_cfg_impl_for_trait(path: Path) -> Ident { + let (module_path, self_type, trait_name) = split_path2(path); + format_ident!("structure_{module_path}_impl_{trait_name}_for_{self_type}") +} + +fn make_cfg_impl_function(path: Path) -> Ident { + let (module_path, self_type, function) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_fn_{function}") +} + +fn make_cfg_impl_method(path: Path) -> Ident { + let (module_path, self_type, function) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_method_{function}") +} + +fn make_cfg_impl_const(path: Path) -> Ident { + let (module_path, self_type, const_name) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_const_{const_name}") +} + +fn make_cfg_impl_type(path: Path) -> Ident { + let (module_path, self_type, type_name) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_type_{type_name}") +} + +fn make_cfg_trait_function(path: Path) -> Ident { + let (module_path, trait_type, function) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_fn_{function}") +} + +fn make_cfg_trait_method(path: Path) -> Ident { + let (module_path, trait_type, function) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_method_{function}") +} + +fn make_cfg_trait_const(path: Path) -> Ident { + let (module_path, trait_type, const_name) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_const_{const_name}") +} + +fn make_cfg_trait_type(path: Path) -> Ident { + let (module_path, trait_type, type_name) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_type_{type_name}") +} + +fn make_cfg_trait_supertrait(spec: SuperTraitSpec) -> Ident { + format_ident!( + "structure_{}_trait_{}_supertrait_{}", + spec.module_path, + spec.trait_name, + spec.supertrait + ) +} + +fn split_path(path: Path) -> (String, String) { + let path_segments: Vec<_> = path.segments.iter().map(|s| &s.ident).collect(); + let (item_name, path_segments) = path_segments.split_last().unwrap(); + + let item_name = item_name.to_string(); + let module_path = path_segments + .iter() + .copied() + .map(Ident::to_string) + .collect::>() + .join("_"); + + (module_path, item_name) +} + +fn split_path2(path: Path) -> (String, String, String) { + let path_segments: Vec<_> = path.segments.iter().map(|s| &s.ident).collect(); + let (item2_name, path_segments) = path_segments.split_last().unwrap(); + let (item1_name, path_segments) = path_segments.split_last().unwrap(); + + let item1_name = item1_name.to_string(); + let item2_name = item2_name.to_string(); + let module_path = path_segments + .iter() + .copied() + .map(Ident::to_string) + .collect::>() + .join("_"); + + (module_path, item1_name, item2_name) +} diff --git a/src/main/resources/templates/rust/test/tests/behavior.rs b/src/main/resources/templates/rust/test/tests/behavior.rs new file mode 100644 index 000000000000..7efd38c20de5 --- /dev/null +++ b/src/main/resources/templates/rust/test/tests/behavior.rs @@ -0,0 +1,90 @@ +use chrono::NaiveDate; +use rust_template_exercise::{bubble_sort::BubbleSort, merge_sort::MergeSort}; + +use rust_template_test_macros::{ + require_impl_function_or_fail, require_impl_method_or_fail, require_struct_or_fail, + require_trait, require_trait_supertrait_or_fail, +}; + +#[require_trait(sort_strategy::SortStrategy)] +use rust_template_exercise::sort_strategy::SortStrategy; + +// We can't use the opt variants because the Option methods aren't const yet +#[allow(deprecated)] +const DATES_UNORDERED: [NaiveDate; 4] = [ + NaiveDate::from_ymd(2018, 11, 8), + NaiveDate::from_ymd(2017, 4, 15), + NaiveDate::from_ymd(2016, 2, 15), + NaiveDate::from_ymd(2017, 9, 15), +]; +#[allow(deprecated)] +const DATES_ORDERED: [NaiveDate; 4] = [ + NaiveDate::from_ymd(2016, 2, 15), + NaiveDate::from_ymd(2017, 4, 15), + NaiveDate::from_ymd(2017, 9, 15), + NaiveDate::from_ymd(2018, 11, 8), +]; + +#[test] +fn test_bubble_sort() { + let bubble_sort = BubbleSort; + let mut dates = DATES_UNORDERED; + bubble_sort.perform_sort(&mut dates); + assert_eq!(dates, DATES_ORDERED, "BubbleSort does not sort correctly"); +} + +#[test] +fn test_merge_sort() { + let merge_sort = MergeSort; + let mut dates = DATES_UNORDERED; + merge_sort.perform_sort(&mut dates); + assert_eq!(dates, DATES_ORDERED, "MergeSort does not sort correctly"); +} + +#[test] +#[require_struct_or_fail(context::Context)] +#[require_struct_or_fail(policy::Policy)] +#[require_trait_supertrait_or_fail(sort_strategy::SortStrategy : Any)] +#[require_impl_method_or_fail(context::Context::sort_algorithm)] +#[require_impl_function_or_fail(context::Context::new)] +#[require_impl_function_or_fail(policy::Policy::new)] +fn test_use_merge_sort_for_big_list() { + let context = std::cell::RefCell::new(rust_template_exercise::context::Context::new()); + let mut policy = rust_template_exercise::policy::Policy::new(&context); + + let data = [NaiveDate::default(); 20]; + policy.configure(&data); + + let context = context.borrow(); + let sort_strategy = context.sort_algorithm(); + + assert_eq!( + sort_strategy.type_id(), + std::any::TypeId::of::(), + "The sort algorithm of Context was not MergeSort for a list with more than 10 dates." + ); +} + +#[test] +#[require_struct_or_fail(context::Context)] +#[require_struct_or_fail(policy::Policy)] +#[require_trait_supertrait_or_fail(sort_strategy::SortStrategy : Any)] +#[require_impl_method_or_fail(context::Context::sort_algorithm)] +#[require_impl_function_or_fail(context::Context::new)] +#[require_impl_function_or_fail(policy::Policy::new)] +fn test_use_bubble_sort_for_small_list() { + let context = std::cell::RefCell::new(rust_template_exercise::context::Context::new()); + let mut policy = rust_template_exercise::policy::Policy::new(&context); + + let data = [NaiveDate::default(); 10]; + policy.configure(&data); + + let context = context.borrow(); + let sort_strategy = context.sort_algorithm(); + + assert_eq!( + sort_strategy.type_id(), + std::any::TypeId::of::(), + "The sort algorithm of Context was not BubbleSort for a list with less or equal than 10 dates." + ); +} diff --git a/src/main/resources/templates/rust/test/tests/structural.rs b/src/main/resources/templates/rust/test/tests/structural.rs new file mode 100644 index 000000000000..70b0d19c9131 --- /dev/null +++ b/src/main/resources/templates/rust/test/tests/structural.rs @@ -0,0 +1,79 @@ +mod structural_helpers; + +use structural_helpers::*; + +#[test] +fn test_sort_strategy_trait() { + let ast = parse_file("./assignment/src/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 sort_strategy = find_trait(&ast.items, "SortStrategy") + .expect("A trait named \"SortStrategy\" should be defined"); + check_trait_supertrait(sort_strategy, "Any") + .unwrap_or_else(|_| panic!("SortStrategy should have \"Any\" as a supertrait")); +} + +#[test] +fn test_sort_strategy_methods() { + let ast = parse_file("./assignment/src/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"]) + .unwrap_or_else(|name| panic!("SortStrategy should define the function \"{name}\"")); +} + +#[test] +fn test_context_fields() { + let ast = parse_file("./assignment/src/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"]) + .unwrap_or_else(|name| panic!("Context should define the field \"{name}\"")); +} + +#[test] +fn test_context_methods() { + let ast = parse_file("./assignment/src/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"]) + .unwrap_or_else(|name| panic!("Context should implement the function \"{name}\"")); +} + +#[test] +fn test_policy_fields() { + let ast = parse_file("./assignment/src/policy.rs"); + let policy = + find_struct(&ast.items, "Policy").expect("A struct named \"Policy\" should be defined"); + check_struct_field_names(&policy.fields, ["context"]) + .unwrap_or_else(|name| panic!("Policy should define the field \"{name}\"")); +} + +#[test] +fn test_policy_methods() { + let ast = parse_file("./assignment/src/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}\"")); +} + +#[test] +fn test_bubble_sort_struct() { + let ast = parse_file("./assignment/src/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\""); +} + +#[test] +fn test_merge_sort_struct() { + let ast = parse_file("./assignment/src/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/rust/test/tests/structural_helpers/mod.rs b/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs new file mode 100644 index 000000000000..493d043f6d5c --- /dev/null +++ b/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs @@ -0,0 +1,207 @@ +//! Run-time source code reflection +//! +//! Use this for flexible parsing and computed names. +#![allow(dead_code)] + +use std::io::Read; + +use syn::{ + Fields, ImplItem, ImplItemFn, + Item::{self, Impl, Struct, Trait}, + ItemImpl, ItemStruct, ItemTrait, TraitItem, TraitItemFn, TypeParamBound, +}; + +pub fn check_struct_names<'a, I: IntoIterator>( + items: &[Item], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_struct(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_struct<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemStruct> { + find_by_name( + items, + name, + |i| match i { + Struct(s) => Some(s), + _ => None, + }, + |s| &s.ident, + ) +} + +pub fn check_struct_field_names<'a, I: IntoIterator>( + fields: &Fields, + names: I, +) -> Result<(), &'a str> { + let p = match fields { + Fields::Named(f) => &f.named, + _ => panic!("The struct should have named fields"), + }; + + let field_names: Vec<_> = p.iter().map(|f| f.ident.as_ref().unwrap()).collect(); + + for name in names { + field_names + .iter() + .copied() + .find(|&n| n == name) + .ok_or(name)?; + } + Ok(()) +} + +pub fn find_impl<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemImpl> { + items.iter().find_map(|i| { + let im = match i { + Impl(im) => im, + _ => return None, + }; + let self_name = match im.self_ty.as_ref() { + syn::Type::Path(p) => &p.path.segments.last().unwrap().ident, + _ => return None, + }; + if im.trait_.is_some() { + return None; + } + + if self_name != name { + return None; + } + + Some(im) + }) +} + +pub fn find_impl_for<'a>(items: &'a [Item], name: &str, for_trait: &str) -> Option<&'a ItemImpl> { + items.iter().find_map(|i| { + let im = match i { + Impl(im) => im, + _ => return None, + }; + let self_name = match im.self_ty.as_ref() { + syn::Type::Path(p) => &p.path.segments.last().unwrap().ident, + _ => return None, + }; + let trait_name = match im.trait_.as_ref() { + Some((_, path, _)) => &path.segments.last().unwrap().ident, + _ => return None, + }; + + if self_name != name || trait_name != for_trait { + return None; + } + + Some(im) + }) +} + +pub fn check_impl_function_names<'a, I: IntoIterator>( + items: &[ImplItem], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_impl_function(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_impl_function<'a>(items: &'a [ImplItem], name: &str) -> Option<&'a ImplItemFn> { + find_by_name( + items, + name, + |i| match i { + ImplItem::Fn(f) => Some(f), + _ => None, + }, + |f| &f.sig.ident, + ) +} + +pub fn check_trait_names<'a, I: IntoIterator>( + items: &[Item], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_trait(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_trait<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemTrait> { + find_by_name( + items, + name, + |i| match i { + Trait(t) => Some(t), + _ => None, + }, + |t| &t.ident, + ) +} + +pub fn check_trait_function_names<'a, I: IntoIterator>( + items: &[TraitItem], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_trait_function(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_trait_function<'a>(items: &'a [TraitItem], name: &str) -> Option<&'a TraitItemFn> { + find_by_name( + items, + name, + |i| match i { + TraitItem::Fn(f) => Some(f), + _ => None, + }, + |f| &f.sig.ident, + ) +} + +pub fn check_trait_supertrait(trait_: &ItemTrait, supertrait_name: &str) -> Result<(), ()> { + find_by_name( + &trait_.supertraits, + supertrait_name, + |s| match s { + TypeParamBound::Trait(t) => Some(t), + _ => None, + }, + |t| &t.path.segments.last().unwrap().ident, + ) + .ok_or(())?; + Ok(()) +} + +fn find_by_name< + 'a, + Item, + I: IntoIterator, + M: FnMut(Item) -> Option, + R, + N: FnMut(&R) -> C, + C: PartialEq<&'a str>, +>( + items: I, + name: &'a str, + item_matcher: M, + mut name_getter: N, +) -> Option { + items + .into_iter() + .filter_map(item_matcher) + .find(|i| name_getter(i) == name) +} + +pub fn parse_file>(path: P) -> syn::File { + let mut file = std::fs::File::open(path).unwrap(); + let mut content = String::new(); + file.read_to_string(&mut content).unwrap(); + syn::parse_file(&content).unwrap() +} diff --git a/src/main/webapp/app/admin/legal/legal-document-update.component.ts b/src/main/webapp/app/admin/legal/legal-document-update.component.ts index cbe5aafc7cd5..63541a0c97dc 100644 --- a/src/main/webapp/app/admin/legal/legal-document-update.component.ts +++ b/src/main/webapp/app/admin/legal/legal-document-update.component.ts @@ -1,14 +1,13 @@ import { AfterContentChecked, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { faBan, faCheckCircle, faCircleNotch, faExclamationTriangle, faSave } from '@fortawesome/free-solid-svg-icons'; import { LegalDocumentService } from 'app/shared/service/legal-document.service'; -import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { UnsavedChangesWarningComponent } from 'app/admin/legal/unsaved-changes-warning/unsaved-changes-warning.component'; import { LegalDocument, LegalDocumentLanguage, LegalDocumentType } from 'app/entities/legal-document.model'; import { ActivatedRoute } from '@angular/router'; import { Observable, tap } from 'rxjs'; import { JhiLanguageHelper } from 'app/core/language/language.helper'; -import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; +import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; @Component({ selector: 'jhi-privacy-statement-update-component', diff --git a/src/main/webapp/app/core/auth/account.service.ts b/src/main/webapp/app/core/auth/account.service.ts index 81e0c074557b..1b6a82c3a0a0 100644 --- a/src/main/webapp/app/core/auth/account.service.ts +++ b/src/main/webapp/app/core/auth/account.service.ts @@ -12,7 +12,7 @@ import { StudentParticipation } from 'app/entities/participation/student-partici import { Exercise, getCourseFromExercise } from 'app/entities/exercise.model'; import { Authority } from 'app/shared/constants/authority.constants'; import { TranslateService } from '@ngx-translate/core'; -import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { EntityResponseType } from 'app/complaints/complaint.service'; export interface IAccountService { save: (account: any) => Observable>; @@ -39,7 +39,6 @@ export class AccountService implements IAccountService { private authenticated = false; private authenticationState = new BehaviorSubject(undefined); private prefilledUsernameValue?: string; - private versionControlAccessTokenRequired: boolean; constructor( private translateService: TranslateService, @@ -47,7 +46,6 @@ export class AccountService implements IAccountService { private http: HttpClient, private websocketService: JhiWebsocketService, private featureToggleService: FeatureToggleService, - private profileService: ProfileService, ) {} get userIdentity() { @@ -137,19 +135,10 @@ export class AccountService implements IAccountService { this.userIdentity = undefined; } - if (this.versionControlAccessTokenRequired === undefined) { - this.profileService.getProfileInfo().subscribe((profileInfo) => { - this.versionControlAccessTokenRequired = profileInfo.useVersionControlAccessToken ?? false; - }); - } - // check and see if we have retrieved the userIdentity data from the server. // if we have, reuse it by immediately resolving if (this.userIdentity) { - // in case a token is required but not present in the user, we cannot simply return the cached object - if (!this.versionControlAccessTokenRequired || this.userIdentity.vcsAccessToken !== undefined) { - return Promise.resolve(this.userIdentity); - } + return Promise.resolve(this.userIdentity); } // retrieve the userIdentity data from the server, update the identity object, and then resolve. @@ -336,7 +325,7 @@ export class AccountService implements IAccountService { if (this.userIdentity) { this.userIdentity.sshPublicKey = sshPublicKey; } - return this.http.put('api/users/sshpublickey', sshPublicKey); + return this.http.put('api/account/ssh-public-key', sshPublicKey); } /** @@ -346,7 +335,24 @@ export class AccountService implements IAccountService { if (this.userIdentity) { this.userIdentity.sshPublicKey = undefined; } - return this.http.delete('api/users/sshpublickey'); + return this.http.delete('api/account/ssh-public-key'); + } + + /** + * Sends a request to the server to delete the user's current vcsAccessToken + */ + deleteUserVcsAccessToken(): Observable { + return this.http.delete('api/account/user-vcs-access-token'); + } + + /** + * Sends a request to the server to create a new vcsAccessToken for the user + * + * @param expiryDate The expiry date which should get set for the vcsAccessToken + */ + addNewVcsAccessToken(expiryDate: string): Observable { + const params = new HttpParams().set('expiryDate', expiryDate); + return this.http.put('api/account/user-vcs-access-token', null, { observe: 'response', params }); } /** @@ -357,7 +363,7 @@ export class AccountService implements IAccountService { */ getVcsAccessToken(participationId: number): Observable> { const params = new HttpParams().set('participationId', participationId); - return this.http.get('api/users/vcsToken', { observe: 'response', params, responseType: 'text' as 'json' }); + return this.http.get('api/account/participation-vcs-access-token', { observe: 'response', params, responseType: 'text' as 'json' }); } /** @@ -368,6 +374,6 @@ export class AccountService implements IAccountService { */ createVcsAccessToken(participationId: number): Observable> { const params = new HttpParams().set('participationId', participationId); - return this.http.put('api/users/vcsToken', null, { observe: 'response', params, responseType: 'text' as 'json' }); + return this.http.put('api/account/participation-vcs-access-token', null, { observe: 'response', params, responseType: 'text' as 'json' }); } } diff --git a/src/main/webapp/app/core/theme/theme.service.ts b/src/main/webapp/app/core/theme/theme.service.ts index a6fa87c0c01a..507b355b11fe 100644 --- a/src/main/webapp/app/core/theme/theme.service.ts +++ b/src/main/webapp/app/core/theme/theme.service.ts @@ -11,24 +11,20 @@ export const THEME_OVERRIDE_ID = 'artemis-theme-override'; * If you add new themes, make sure to adapt the theme switch component which currently only supports two themes. */ export class Theme { - public static readonly LIGHT = new Theme('LIGHT', true, undefined, faSun, 'chrome', 'dreamweaver'); - public static readonly DARK = new Theme('DARK', false, 'theme-dark.css', faMoon, 'dracula', 'dracula'); + public static readonly LIGHT = new Theme('LIGHT', true, undefined, faSun); + public static readonly DARK = new Theme('DARK', false, 'theme-dark.css', faMoon); - private constructor(identifier: string, isDefault: boolean, fileName: string | undefined, icon: IconDefinition, markdownAceTheme: string, codeAceTheme: string) { + private constructor(identifier: string, isDefault: boolean, fileName: string | undefined, icon: IconDefinition) { this.identifier = identifier; this.isDefault = isDefault; this.fileName = fileName; this.icon = icon; - this.markdownAceTheme = markdownAceTheme; - this.codeAceTheme = codeAceTheme; } public readonly identifier: string; public readonly isDefault: boolean; public readonly fileName: string | undefined; public readonly icon: IconDefinition; - public readonly markdownAceTheme: string; - public readonly codeAceTheme: string; /** * Returns an array with all available themes. diff --git a/src/main/webapp/app/core/user/user.model.ts b/src/main/webapp/app/core/user/user.model.ts index 0c30062efbd0..816cf4fc9a9c 100644 --- a/src/main/webapp/app/core/user/user.model.ts +++ b/src/main/webapp/app/core/user/user.model.ts @@ -14,6 +14,7 @@ export class User extends Account { public visibleRegistrationNumber?: string; public password?: string; public vcsAccessToken?: string; + public vcsAccessTokenExpiryDate?: string; public sshPublicKey?: string; public irisAccepted?: dayjs.Dayjs; @@ -35,6 +36,7 @@ export class User extends Account { password?: string, imageUrl?: string, vcsAccessToken?: string, + vcsAccessTokenExpiryDate?: string, sshPublicKey?: string, irisAccepted?: dayjs.Dayjs, ) { @@ -48,6 +50,7 @@ export class User extends Account { this.lastNotificationRead = lastNotificationRead; this.password = password; this.vcsAccessToken = vcsAccessToken; + this.vcsAccessTokenExpiryDate = vcsAccessTokenExpiryDate; this.sshPublicKey = sshPublicKey; this.irisAccepted = irisAccepted; } diff --git a/src/main/webapp/app/course/competencies/course-competency.service.ts b/src/main/webapp/app/course/competencies/course-competency.service.ts index 65094f9d1a90..04403d48db93 100644 --- a/src/main/webapp/app/course/competencies/course-competency.service.ts +++ b/src/main/webapp/app/course/competencies/course-competency.service.ts @@ -20,6 +20,7 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service' import { Prerequisite } from 'app/entities/prerequisite.model'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { AccountService } from 'app/core/auth/account.service'; +import { CompetencyRecommendation } from 'app/course/competencies/generate-competencies/generate-competencies.component'; type EntityResponseType = HttpResponse; type EntityArrayResponseType = HttpResponse; @@ -105,8 +106,14 @@ export class CourseCompetencyService { ); } - generateCompetenciesFromCourseDescription(courseDescription: string, courseId: number): Observable { - return this.httpClient.post(`${this.resourceURL}/courses/${courseId}/course-competencies/generate-from-description`, courseDescription, { + // triggers the generation of competencies from the given course description + // the generated competencies are returned asynchronously over the websocket on the topic /topic/iris/competencies/{courseId} + generateCompetenciesFromCourseDescription(courseId: number, courseDescription: string, currentCompetencies: CompetencyRecommendation[]): Observable> { + const params = { + courseDescription: courseDescription, + currentCompetencies: currentCompetencies, + }; + return this.httpClient.post(`${this.resourceURL}/courses/${courseId}/course-competencies/generate-from-description`, params, { observe: 'response', }); } diff --git a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts index b6cec6cdec66..a466747c670b 100644 --- a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts +++ b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts @@ -9,6 +9,7 @@ import { ButtonType } from 'app/shared/components/button.component'; }) export class CourseDescriptionFormComponent implements OnInit { @Input() isLoading = false; + @Input() placeholder = ''; @Output() formSubmitted: EventEmitter = new EventEmitter(); form: FormGroup<{ courseDescription: FormControl }>; @@ -26,10 +27,14 @@ export class CourseDescriptionFormComponent implements OnInit { ngOnInit(): void { this.form = this.formBuilder.group({ - courseDescription: ['', [Validators.required, Validators.minLength(this.DESCRIPTION_MIN), Validators.maxLength(this.DESCRIPTION_MAX)]], + courseDescription: [this.placeholder, [Validators.required, Validators.minLength(this.DESCRIPTION_MIN), Validators.maxLength(this.DESCRIPTION_MAX)]], }); } + setCourseDescription(description: string) { + this.form.controls.courseDescription.setValue(description); + } + /** * Sends event to parent to handle submission */ diff --git a/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts b/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts index 74c6d6891d3f..9501484fe9b5 100644 --- a/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts +++ b/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts @@ -1,4 +1,4 @@ -import { Component, HostListener, OnInit } from '@angular/core'; +import { Component, HostListener, OnInit, ViewChild } from '@angular/core'; import { CompetencyService } from 'app/course/competencies/competency.service'; import { AlertService } from 'app/core/util/alert.service'; import { onError } from 'app/shared/util/global.utils'; @@ -8,17 +8,21 @@ import { ActivatedRoute, Router } from '@angular/router'; import { faBan, faSave, faTimes } from '@fortawesome/free-solid-svg-icons'; import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms'; import { ButtonType } from 'app/shared/components/button.component'; -import { finalize } from 'rxjs/operators'; import { ComponentCanDeactivate } from 'app/shared/guard/can-deactivate.model'; import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Observable, firstValueFrom, map } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { TranslateService } from '@ngx-translate/core'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; +import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; +import { IrisStageDTO, IrisStageStateDTO } from 'app/entities/iris/iris-stage-dto.model'; import { CourseCompetencyService } from 'app/course/competencies/course-competency.service'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module'; +import { CourseManagementService } from 'app/course/manage/course-management.service'; +import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component'; export type CompetencyFormControlsWithViewed = { competency: FormGroup; @@ -31,6 +35,17 @@ export type CompetencyFormControls = { taxonomy: FormControl; }; +export type CompetencyRecommendation = { + title?: string; + description?: string; + taxonomy?: CompetencyTaxonomy; +}; + +type CompetencyGenerationStatusUpdate = { + stages: IrisStageDTO[]; + result?: CompetencyRecommendation[]; +}; + @Component({ selector: 'jhi-generate-competencies', templateUrl: './generate-competencies.component.html', @@ -38,6 +53,8 @@ export type CompetencyFormControls = { imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule, ArtemisCompetenciesModule], }) export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeactivate { + @ViewChild(CourseDescriptionFormComponent) courseDescriptionForm: CourseDescriptionFormComponent; + courseId: number; isLoading = false; submitted: boolean = false; @@ -53,6 +70,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti readonly documentationType: DocumentationType = 'GenerateCompetencies'; constructor( + private courseManagementService: CourseManagementService, private courseCompetencyService: CourseCompetencyService, private competencyService: CompetencyService, private alertService: AlertService, @@ -62,11 +80,15 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti private modalService: NgbModal, private artemisTranslatePipe: ArtemisTranslatePipe, private translateService: TranslateService, + private jhiWebsocketService: JhiWebsocketService, ) {} ngOnInit(): void { this.activatedRoute.params.subscribe((params) => { this.courseId = Number(params['courseId']); + firstValueFrom(this.courseManagementService.find(this.courseId)) + .then((course) => this.courseDescriptionForm.setCourseDescription(course.body?.description ?? '')) + .catch((res: HttpErrorResponse) => onError(this.alertService, res)); }); } @@ -76,24 +98,61 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti */ getCompetencyRecommendations(courseDescription: string) { this.isLoading = true; - this.courseCompetencyService - .generateCompetenciesFromCourseDescription(courseDescription, this.courseId) - .pipe( - finalize(() => { + this.getCurrentCompetencies().subscribe((currentCompetencies) => { + this.courseCompetencyService.generateCompetenciesFromCourseDescription(this.courseId, courseDescription, currentCompetencies).subscribe({ + next: () => { + const websocketTopic = `/user/topic/iris/competencies/${this.courseId}`; + this.jhiWebsocketService.subscribe(websocketTopic); + this.jhiWebsocketService.receive(websocketTopic).subscribe({ + next: (update: CompetencyGenerationStatusUpdate) => { + if (update.result) { + for (const competency of update.result) { + this.addCompetencyToForm(competency); + } + } + if (update.stages.every((stage) => stage.state === IrisStageStateDTO.DONE)) { + this.alertService.success('artemisApp.competency.generate.courseDescription.success', { noOfCompetencies: update.result?.length }); + } else if (update.stages.some((stage) => stage.state === IrisStageStateDTO.ERROR)) { + this.alertService.warning('artemisApp.competency.generate.courseDescription.warning'); + } + if (update.stages.every((stage) => stage.state !== IrisStageStateDTO.NOT_STARTED && stage.state !== IrisStageStateDTO.IN_PROGRESS)) { + this.jhiWebsocketService.unsubscribe(websocketTopic); + this.isLoading = false; + } + }, + error: (res: HttpErrorResponse) => { + onError(this.alertService, res); + this.jhiWebsocketService.unsubscribe(websocketTopic); + this.isLoading = false; + }, + }); + }, + error: (res: HttpErrorResponse) => { + onError(this.alertService, res); this.isLoading = false; - }), - ) - .subscribe({ - next: (res) => { - if (res.body?.length && res.body.length > 0) { - this.alertService.success('artemisApp.competency.generate.courseDescription.success', { noOfCompetencies: res.body.length }); - res.body?.forEach((competency) => this.addCompetencyToForm(competency)); - } else { - this.alertService.warning('artemisApp.competency.generate.courseDescription.warning'); - } }, - error: (res: HttpErrorResponse) => onError(this.alertService, res), }); + }); + } + + /** + * Returns the title, description, and taxonomy of all current competencies saved in this course, + * and the competency recommendations that are currently in the form. + * @private + */ + private getCurrentCompetencies(): Observable { + const currentCompetencySuggestions = this.competencies.getRawValue().map((c) => c.competency); + const courseCompetenciesObservable = this.courseCompetencyService.getAllForCourse(this.courseId); + if (courseCompetenciesObservable) { + return courseCompetenciesObservable.pipe( + map((competencies) => competencies.body?.map((c) => ({ title: c.title, description: c.description, taxonomy: c.taxonomy }))), + map((competencies) => currentCompetencySuggestions.concat(competencies ?? [])), + ); + } + return new Observable((subscriber) => { + subscriber.next(currentCompetencySuggestions); + subscriber.complete(); + }); } /** @@ -101,7 +160,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti * @param competency * @private */ - private addCompetencyToForm(competency: Competency) { + private addCompetencyToForm(competency: CompetencyRecommendation) { const formGroup: FormGroup = this.formBuilder.nonNullable.group({ competency: this.formBuilder.nonNullable.group({ title: [competency.title], @@ -150,7 +209,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti * Saves the competency recommendations as competencies and navigates back */ save() { - const competenciesToSave = this.competencies.getRawValue().map((c) => c.competency as Competency); + const competenciesToSave = this.competencies.getRawValue().map((c) => Object.assign(new Competency(), c.competency)); this.competencyService.createBulk(competenciesToSave, this.courseId).subscribe({ next: () => { this.submitted = true; diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html index 10feb00946b8..2341a771ae26 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html +++ b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html @@ -1,4 +1,4 @@ -@if (isLectureUnitLoading()) { +@if (isLoading()) {