From fb29c5d3aefd0d09b5f2bb2ec4e6fecd3ac25ce2 Mon Sep 17 00:00:00 2001 From: Jan-Thurner <107639007+Jan-Thurner@users.noreply.github.com> Date: Sun, 8 Sep 2024 20:24:28 +0200 Subject: [PATCH 1/6] make demo branch ready for a PR --- .../in/www1/artemis/web/rest/hestia/ExerciseHintResource.java | 1 + .../programming/manage/services/programming-exercise.service.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java index c5c62d75099f..00060d36632e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java @@ -201,6 +201,7 @@ public ResponseEntity getExerciseHint(@PathVariable Long exerciseI return ResponseEntity.ok().body(exerciseHint); } + //TODO: Demo /** * {@code GET programming-exercises/:exerciseId/exercise-hints} : get the exerciseHints of a provided exercise. * diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts index 39fa4800ecb6..2f6522e7e455 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts @@ -640,6 +640,7 @@ export class ProgrammingExerciseService { return this.http.get(`${this.resourceUrl}/${exerciseId}/file-names`); } + //TODO: Demo getCodeHintsForExercise(exerciseId: number): Observable { return this.http.get(`${this.resourceUrl}/${exerciseId}/exercise-hints`); } From 8807d4e4845576eb5ab5eab44eaa55f54d58a9b1 Mon Sep 17 00:00:00 2001 From: Jan-Thurner <107639007+Jan-Thurner@users.noreply.github.com> Date: Sun, 8 Sep 2024 21:01:59 +0200 Subject: [PATCH 2/6] make demo branch ready for a PR --- .../in/www1/artemis/web/rest/hestia/ExerciseHintResource.java | 2 +- .../programming/manage/services/programming-exercise.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java index 00060d36632e..63611c72405e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java @@ -210,7 +210,7 @@ public ResponseEntity getExerciseHint(@PathVariable Long exerciseI * or with status {@code 404 (Not Found)}, * or with status {@code 409 (Conflict)} if the exerciseId is not valid. */ - @GetMapping("programming-exercises/{exerciseId}/exercise-hints") + @GetMapping("programming-exercises/{exerciseId}/exercise-hints-good") @EnforceAtLeastTutorInExercise public ResponseEntity> getExerciseHintsForExercise(@PathVariable Long exerciseId) { log.debug("REST request to get ExerciseHints : {}", exerciseId); diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts index 2f6522e7e455..3bf68c8eabe8 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts @@ -642,7 +642,7 @@ export class ProgrammingExerciseService { //TODO: Demo getCodeHintsForExercise(exerciseId: number): Observable { - return this.http.get(`${this.resourceUrl}/${exerciseId}/exercise-hints`); + return this.http.get(`${this.resourceUrl}/${exerciseId}/exercise-hints-good`); } createStructuralSolutionEntries(exerciseId: number): Observable { From e8faf506622c9884f3bcbb23c075e104c77846bb Mon Sep 17 00:00:00 2001 From: Jan-Thurner <107639007+Jan-Thurner@users.noreply.github.com> Date: Sun, 8 Sep 2024 21:05:52 +0200 Subject: [PATCH 3/6] make demo branch ready for a PR --- .../shared/exercise-hint/shared/exercise-hint.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts index 88c29bef59a6..4ad157127f04 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts @@ -132,7 +132,7 @@ export class ExerciseHintService implements IExerciseHintService { */ findByExerciseId(exerciseId: number): Observable> { return this.http - .get(`${this.resourceUrl}/${exerciseId}/exercise-hints`, { observe: 'response' }) + .get(`${this.resourceUrl}/${exerciseId}/exercise-hints-good`, { observe: 'response' }) .pipe(tap((res) => res?.body?.forEach((hint) => this.sendTitlesToEntityTitleService(hint, exerciseId)))); } From 3de830b1017dd2cb5f757e85e910204d7115be59 Mon Sep 17 00:00:00 2001 From: Jan-Thurner <107639007+Jan-Thurner@users.noreply.github.com> Date: Sun, 8 Sep 2024 21:12:08 +0200 Subject: [PATCH 4/6] make demo branch ready for a PR --- .../in/www1/artemis/web/rest/hestia/ExerciseHintResource.java | 2 +- .../programming/manage/services/programming-exercise.service.ts | 2 +- .../shared/exercise-hint/shared/exercise-hint.service.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java index 63611c72405e..00060d36632e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java @@ -210,7 +210,7 @@ public ResponseEntity getExerciseHint(@PathVariable Long exerciseI * or with status {@code 404 (Not Found)}, * or with status {@code 409 (Conflict)} if the exerciseId is not valid. */ - @GetMapping("programming-exercises/{exerciseId}/exercise-hints-good") + @GetMapping("programming-exercises/{exerciseId}/exercise-hints") @EnforceAtLeastTutorInExercise public ResponseEntity> getExerciseHintsForExercise(@PathVariable Long exerciseId) { log.debug("REST request to get ExerciseHints : {}", exerciseId); diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts index 3bf68c8eabe8..2f6522e7e455 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts @@ -642,7 +642,7 @@ export class ProgrammingExerciseService { //TODO: Demo getCodeHintsForExercise(exerciseId: number): Observable { - return this.http.get(`${this.resourceUrl}/${exerciseId}/exercise-hints-good`); + return this.http.get(`${this.resourceUrl}/${exerciseId}/exercise-hints`); } createStructuralSolutionEntries(exerciseId: number): Observable { diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts index 4ad157127f04..88c29bef59a6 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint.service.ts @@ -132,7 +132,7 @@ export class ExerciseHintService implements IExerciseHintService { */ findByExerciseId(exerciseId: number): Observable> { return this.http - .get(`${this.resourceUrl}/${exerciseId}/exercise-hints-good`, { observe: 'response' }) + .get(`${this.resourceUrl}/${exerciseId}/exercise-hints`, { observe: 'response' }) .pipe(tap((res) => res?.body?.forEach((hint) => this.sendTitlesToEntityTitleService(hint, exerciseId)))); } From 96e6a65e271d3466d1e6285b1a73fdee5906bbca Mon Sep 17 00:00:00 2001 From: Jan-Thurner <107639007+Jan-Thurner@users.noreply.github.com> Date: Sun, 8 Sep 2024 22:28:59 +0200 Subject: [PATCH 5/6] fix Bug --- .../main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java index bb959d3b71e6..0ed35913f5cc 100644 --- a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java +++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java @@ -167,7 +167,7 @@ private static void printRestCallAnalysisResult() { log.info("Number of REST calls without matching endpoints: {}", restCallsAndMatchingEndpoints.restCallsWithoutMatchingEndpoints().size()); - if (!restCallsAndMatchingEndpoints.restCallsWithMatchingEndpoints().isEmpty()) { + if (!restCallsAndMatchingEndpoints.restCallsWithoutMatchingEndpoints().isEmpty()) { System.exit(1); } } From 0c80db0d90d48c8cfe54131424985edd5d8589cc Mon Sep 17 00:00:00 2001 From: Jan-Thurner <107639007+Jan-Thurner@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:26:05 +0200 Subject: [PATCH 6/6] fix Bug --- .../in/www1/artemis/web/rest/hestia/ExerciseHintResource.java | 4 ++-- .../manage/services/programming-exercise.service.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java index 00060d36632e..b4dc2f2cf63e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java @@ -201,7 +201,7 @@ public ResponseEntity getExerciseHint(@PathVariable Long exerciseI return ResponseEntity.ok().body(exerciseHint); } - //TODO: Demo + // TODO: Demo /** * {@code GET programming-exercises/:exerciseId/exercise-hints} : get the exerciseHints of a provided exercise. * @@ -210,7 +210,7 @@ public ResponseEntity getExerciseHint(@PathVariable Long exerciseI * or with status {@code 404 (Not Found)}, * or with status {@code 409 (Conflict)} if the exerciseId is not valid. */ - @GetMapping("programming-exercises/{exerciseId}/exercise-hints") + @GetMapping("programming-exercises/{exerciseId}/exercise-hints-good") @EnforceAtLeastTutorInExercise public ResponseEntity> getExerciseHintsForExercise(@PathVariable Long exerciseId) { log.debug("REST request to get ExerciseHints : {}", exerciseId); diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts index 2f6522e7e455..3bf68c8eabe8 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts @@ -642,7 +642,7 @@ export class ProgrammingExerciseService { //TODO: Demo getCodeHintsForExercise(exerciseId: number): Observable { - return this.http.get(`${this.resourceUrl}/${exerciseId}/exercise-hints`); + return this.http.get(`${this.resourceUrl}/${exerciseId}/exercise-hints-good`); } createStructuralSolutionEntries(exerciseId: number): Observable {