From 4bce811eb4699eaf513346a8b4836ffc98dff2ef Mon Sep 17 00:00:00 2001
From: Lucas Welscher <ga53foy@mytum.de>
Date: Fri, 11 Oct 2024 12:26:53 +0200
Subject: [PATCH] `Development`: Fix wrong result subscription for exam
 exercises

---
 .../artemis/core/config/websocket/WebsocketConfiguration.java | 4 +---
 .../participate/summary/exam-result-summary.component.html    | 1 +
 .../programming-exam-summary.component.html                   | 2 +-
 .../programming-exam-summary.component.ts                     | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java
index 9163cfb7d7f1..d0c6941cc698 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java
@@ -64,7 +64,6 @@
 import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider;
 import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService;
 import de.tum.cit.aet.artemis.exam.repository.ExamRepository;
-import de.tum.cit.aet.artemis.exercise.domain.Exercise;
 import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation;
 import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository;
@@ -309,8 +308,7 @@ private boolean allowSubscription(@Nullable Principal principal, String destinat
 
                 // TODO: Is it right that TAs are not allowed to subscribe to exam exercises?
                 if (exerciseRepository.isExamExercise(exerciseId)) {
-                    Exercise exercise = exerciseRepository.findByIdElseThrow(exerciseId);
-                    return authorizationCheckService.isAtLeastInstructorInCourse(login, exercise.getCourseViaExerciseGroupOrCourseMember().getId());
+                    return authorizationCheckService.isAtLeastInstructorInExercise(login, exerciseId);
                 }
                 else {
                     return authorizationCheckService.isAtLeastTeachingAssistantInExercise(login, exerciseId);
diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html
index f1017919bfb7..44eea193c092 100644
--- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html
+++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html
@@ -190,6 +190,7 @@ <h3 jhiTranslate="artemisApp.exam.exercises"></h3>
                             [resultsPublished]="resultsArePublished"
                             [isPrinting]="isPrinting"
                             [isAfterResultsArePublished]="resultsArePublished"
+                            [instructorView]="instructorView"
                         />
                     }
                 }
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html
index c483a168cd8a..2a0df39f1353 100644
--- a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html
+++ b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html
@@ -48,7 +48,7 @@ <h5 jhiTranslate="artemisApp.exam.examSummary.assessment"></h5>
             <div class="col-md-8">
                 <h5 jhiTranslate="artemisApp.exam.examSummary.problemStatement"></h5>
                 @if (exercise.problemStatement) {
-                    <jhi-programming-exercise-instructions [exercise]="exercise" [participation]="participation" />
+                    <jhi-programming-exercise-instructions [exercise]="exercise" [participation]="participation" [personalParticipation]="!instructorView" />
                 }
             </div>
         </div>
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts
index 2243c413644a..5ffdffc38018 100644
--- a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts
+++ b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts
@@ -39,6 +39,8 @@ export class ProgrammingExamSummaryComponent implements OnInit {
 
     @Input() isAfterResultsArePublished?: boolean = false;
 
+    @Input() instructorView?: boolean = false;
+
     readonly PROGRAMMING: ExerciseType = ExerciseType.PROGRAMMING;
 
     protected readonly AssessmentType = AssessmentType;