From f03e5e5c3a3d2b22c88ee8884aeebb95bc23e3a2 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Sun, 4 Aug 2024 20:33:07 +0200
Subject: [PATCH 01/99] add UI options for AI Feedback and result history

---
 ...feedback-suggestion-options.component.html | 14 +++++++++-
 ...e-feedback-suggestion-options.component.ts |  9 +++++++
 .../text-exercise-detail.component.ts         |  1 +
 .../participate/text-editor.component.html    |  4 +--
 .../text/participate/text-editor.component.ts |  6 ++++-
 .../course-exercise-details.component.html    |  2 +-
 ...ise-details-student-actions.component.html | 27 +++++++++++++++++++
 ...rcise-details-student-actions.component.ts | 11 ++++----
 8 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
index cce547bdf2ca..19d28516b886 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
@@ -18,7 +18,19 @@
             ></label>
             <jhi-help-icon placement="right auto" [text]="'artemisApp.exercise.feedbackSuggestionsEnabledTooltip'" />
         </div>
-        @if (!!this.exercise.feedbackSuggestionModule) {
+        <div class="form-check">
+            <input
+                type="checkbox"
+                class="form-check-input"
+                name="allowFeedbackRequests"
+                [checked]="!!exercise.allowFeedbackRequests"
+                id="allowFeedbackRequests"
+                (change)="toggleFeedbackRequests($event)"
+            />
+            <label class="form-control-label" for="allowFeedbackRequests" jhiTranslate="artemisApp.programmingExercise.timeline.allowFeedbackRequests"></label>
+            <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.timeline.allowFeedbackRequestsTooltip'" />
+        </div>
+        @if (!!this.exercise.feedbackSuggestionModule || this.exercise.allowFeedbackRequests) {
             <div class="form-group">
                 <label for="athenaModuleSelect">Athena Module</label>
                 <select
diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
index 40ee934e6dc8..935f6ff76e86 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
@@ -76,6 +76,15 @@ export class ExerciseFeedbackSuggestionOptionsComponent implements OnInit, OnCha
         }
     }
 
+    toggleFeedbackRequests(event: any) {
+        if (event.target.checked) {
+            this.exercise.feedbackSuggestionModule = this.availableAthenaModules.first();
+            this.exercise.allowFeedbackRequests = !this.exercise.allowFeedbackRequests;
+        } else {
+            this.exercise.feedbackSuggestionModule = undefined;
+        }
+    }
+
     private hasDueDatePassed() {
         return dayjs(this.exercise.dueDate).isBefore(dayjs());
     }
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts
index 72a0414b70fe..de95295ef190 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts
@@ -106,6 +106,7 @@ export class TextExerciseDetailComponent implements OnInit, OnDestroy {
                 details: [
                     ...defaultGradingDetails,
                     { type: DetailType.Boolean, title: 'artemisApp.exercise.feedbackSuggestionsEnabled', data: { boolean: !!exercise.feedbackSuggestionModule } },
+                    { type: DetailType.Boolean, title: 'artemisApp.programmingExercise.timeline.manualFeedbackRequests', data: { boolean: exercise.allowFeedbackRequests } },
                     ...gradingInstructionsCriteriaDetails,
                 ],
             },
diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.html b/src/main/webapp/app/exercises/text/participate/text-editor.component.html
index 280323741cda..6a0d7d189269 100644
--- a/src/main/webapp/app/exercises/text/participate/text-editor.component.html
+++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.html
@@ -49,7 +49,7 @@
                         >
                         </span>
                     </div>
-                    @if (!result) {
+                    @if (!result || isAutomaticResult) {
                         <textarea
                             id="text-editor"
                             #textEditor
@@ -109,7 +109,7 @@
                             </div>
                         }
                     }
-                    @if (textExercise && result && participation && !examMode) {
+                    @if (textExercise && result && participation && !examMode && !isAutomaticResult) {
                         <jhi-complaint-student-view [exercise]="textExercise" [result]="resultWithComplaint ? resultWithComplaint : result" [participation]="participation" />
                     }
                 </div>
diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
index 08be104f935c..309ded767f63 100644
--- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
@@ -186,13 +186,17 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
         this.isAlwaysActive = !!isAlwaysActive;
     }
 
+    get isAutomaticResult(): boolean {
+        const isAutomatic = this.result?.assessmentType === 'AUTOMATIC_ATHENA';
+        return !!isAutomatic;
+    }
     /**
      * True, if the due date is after the current date, or there is no due date, or the exercise is always active
      */
     get isActive(): boolean {
         const isActive =
             !this.examMode &&
-            !this.result &&
+            (!this.result || this.isAutomaticResult) &&
             (this.isAlwaysActive || (this.textExercise && this.textExercise.dueDate && !hasExerciseDueDatePassed(this.textExercise, this.participation)));
         return !!isActive;
     }
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
index 07fbccb20ec1..1406eb00af49 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
@@ -109,7 +109,7 @@
             <div class="col flex-grow-1">
                 <!-- EXERCISE ACTIONS END -->
                 <!-- RESULTS START -->
-                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length > 1) || this.practiceStudentParticipation?.results?.length) {
+                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 1) || this.practiceStudentParticipation?.results?.length) {
                     <div class="row">
                         <div class="row mb-2 mt-2 align-items-baseline d-none d-md-flex">
                             <div class="col-auto">
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index ea54cf40b8c2..878113014fab 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -227,6 +227,9 @@
                         ></button>
                     }
                 </span>
+                <!-- SPECIALTODO : Fix this so that it actually work conditionally rendering-->
+                <!-- @if (athenaEnabled) {  NOTE: exercise.allowFeedbackRequests &&  -->
+
                 @if (
                     (gradedParticipation?.initializationState === InitializationState.INITIALIZED && this.beforeDueDate) ||
                     gradedParticipation?.initializationState === InitializationState.FINISHED
@@ -250,6 +253,30 @@
                         [hideLabelMobile]="false"
                         [routerLink]="['/courses', courseId, 'exercises', exercise.type + '-exercises', exercise.id, 'participate', gradedParticipation!.id]"
                     ></button>
+                    @if (exercise.allowFeedbackRequests) {
+                        <a
+                            class="btn btn-primary"
+                            (click)="requestFeedback()"
+                            [class.btn-sm]="smallButtons"
+                            [id]="'request-feedback-' + exercise.id"
+                            [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate"
+                        >
+                            <fa-icon [icon]="faPenSquare" [fixedWidth]="true" />
+                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback">Send automatic feedback request</span>
+                        </a>
+                    }
+                    @if (athenaEnabled) {
+                        <a
+                            class="btn btn-primary"
+                            (click)="requestFeedback()"
+                            [class.btn-sm]="smallButtons"
+                            [id]="'request-feedback-' + exercise.id"
+                            [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate"
+                        >
+                            <fa-icon [icon]="faPenSquare" [fixedWidth]="true" />
+                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback">Send automatic feedback request</span>
+                        </a>
+                    }
                 }
             </div>
         }
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index f2e251a81804..2506de3ebb53 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -240,13 +240,14 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
     }
 
     requestFeedback() {
-        if (!this.assureConditionsSatisfied()) return;
+        if (this.exercise.type === ExerciseType.PROGRAMMING) {
+            if (!this.assureConditionsSatisfied()) return;
 
-        const confirmLockRepository = this.translateService.instant('artemisApp.exercise.lockRepositoryWarning');
-        if (!window.confirm(confirmLockRepository)) {
-            return;
+            const confirmLockRepository = this.translateService.instant('artemisApp.exercise.lockRepositoryWarning');
+            if (!window.confirm(confirmLockRepository)) {
+                return;
+            }
         }
-
         this.courseExerciseService.requestFeedback(this.exercise.id!).subscribe({
             next: (participation: StudentParticipation) => {
                 if (participation) {

From 1067ef12111c3761785c1eb7977f53a2b95344bc Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 16 Aug 2024 02:35:02 +0200
Subject: [PATCH 02/99] Add Athena Feedback option for text exercises

---
 ...feedback-suggestion-options.component.html | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
index 19d28516b886..e1be98ae8baa 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
@@ -18,19 +18,21 @@
             ></label>
             <jhi-help-icon placement="right auto" [text]="'artemisApp.exercise.feedbackSuggestionsEnabledTooltip'" />
         </div>
-        <div class="form-check">
-            <input
-                type="checkbox"
-                class="form-check-input"
-                name="allowFeedbackRequests"
-                [checked]="!!exercise.allowFeedbackRequests"
-                id="allowFeedbackRequests"
-                (change)="toggleFeedbackRequests($event)"
-            />
-            <label class="form-control-label" for="allowFeedbackRequests" jhiTranslate="artemisApp.programmingExercise.timeline.allowFeedbackRequests"></label>
-            <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.timeline.allowFeedbackRequestsTooltip'" />
-        </div>
-        @if (!!this.exercise.feedbackSuggestionModule || this.exercise.allowFeedbackRequests) {
+        @if (this.exercise.type === ExerciseType.TEXT){
+            <div class="form-check">
+                <input
+                    type="checkbox"
+                    class="form-check-input"
+                    name="allowFeedbackRequests"
+                    [checked]="!!exercise.allowFeedbackRequests"
+                    id="allowFeedbackRequests"
+                    (change)="toggleFeedbackRequests($event)"
+                />
+                <label class="form-control-label" for="allowFeedbackRequests" jhiTranslate="artemisApp.programmingExercise.timeline.allowFeedbackRequests"></label>
+                <jhi-help-icon placement="right auto" [text]="'artemisApp.programmingExercise.timeline.allowFeedbackRequestsTooltip'" />
+            </div>
+        }
+        @if (!!this.exercise.feedbackSuggestionModule) {
             <div class="form-group">
                 <label for="athenaModuleSelect">Athena Module</label>
                 <select

From 80242a0a26967fcc8d20b362b4125127696942f1 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 16 Aug 2024 02:35:54 +0200
Subject: [PATCH 03/99] Add Athena AI Feedback button and history to Text
 Exercises

---
 .../course-exercise-details.component.html    |  2 +-
 ...ise-details-student-actions.component.html | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
index 1406eb00af49..7e5cf96357ff 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
@@ -109,7 +109,7 @@
             <div class="col flex-grow-1">
                 <!-- EXERCISE ACTIONS END -->
                 <!-- RESULTS START -->
-                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 1) || this.practiceStudentParticipation?.results?.length) {
+               @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 0) || this.practiceStudentParticipation?.results?.length) {
                     <div class="row">
                         <div class="row mb-2 mt-2 align-items-baseline d-none d-md-flex">
                             <div class="col-auto">
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index 878113014fab..2ac90e15f4e4 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -253,29 +253,18 @@
                         [hideLabelMobile]="false"
                         [routerLink]="['/courses', courseId, 'exercises', exercise.type + '-exercises', exercise.id, 'participate', gradedParticipation!.id]"
                     ></button>
-                    @if (exercise.allowFeedbackRequests) {
-                        <a
-                            class="btn btn-primary"
-                            (click)="requestFeedback()"
-                            [class.btn-sm]="smallButtons"
-                            [id]="'request-feedback-' + exercise.id"
-                            [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate"
-                        >
-                            <fa-icon [icon]="faPenSquare" [fixedWidth]="true" />
-                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback">Send automatic feedback request</span>
-                        </a>
-                    }
-                    @if (athenaEnabled) {
-                        <a
+                    @if (exercise.allowFeedbackRequests && athenaEnabled) {
+                        <button
                             class="btn btn-primary"
                             (click)="requestFeedback()"
                             [class.btn-sm]="smallButtons"
+                            [disabled]="gradedParticipation?.submissions?.length==1 && !gradedParticipation!.submissions![0].submitted"
                             [id]="'request-feedback-' + exercise.id"
                             [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate"
                         >
                             <fa-icon [icon]="faPenSquare" [fixedWidth]="true" />
                             <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback">Send automatic feedback request</span>
-                        </a>
+                        </button>
                     }
                 }
             </div>

From 0245572288db396a15c5a61922c6fbd0c17d7c4f Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 16 Aug 2024 02:37:37 +0200
Subject: [PATCH 04/99] Add check for automatic Athena results in code editor
 so the student can continue working

---
 .../text/participate/text-editor.component.ts          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
index 309ded767f63..856465d8aa82 100644
--- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
@@ -27,6 +27,7 @@ import { Course } from 'app/entities/course.model';
 import { getCourseFromExercise } from 'app/entities/exercise.model';
 import { faListAlt } from '@fortawesome/free-regular-svg-icons';
 import { MAX_SUBMISSION_TEXT_LENGTH } from 'app/shared/constants/input.constants';
+import { AssessmentType } from 'app/entities/assessment-type.model';
 
 @Component({
     selector: 'jhi-text-editor',
@@ -141,7 +142,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
         this.course = getCourseFromExercise(this.textExercise);
 
         if (participation.submissions?.length) {
-            this.submission = participation.submissions[0] as TextSubmission;
+            this.submission = participation.submissions[participation.submissions.length-1] as TextSubmission;
             setLatestSubmissionResult(this.submission, getLatestSubmissionResult(this.submission));
             if (this.submission?.results && participation.results && (this.isAfterAssessmentDueDate || this.isAfterPublishDate)) {
                 this.result = this.submission.latestResult!;
@@ -187,8 +188,9 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
     }
 
     get isAutomaticResult(): boolean {
-        const isAutomatic = this.result?.assessmentType === 'AUTOMATIC_ATHENA';
-        return !!isAutomatic;
+
+        const isAutomatic = this.result?.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
+        return isAutomatic;
     }
     /**
      * True, if the due date is after the current date, or there is no due date, or the exercise is always active
@@ -289,7 +291,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
 
     /**
      * Stream of submissions being emitted on:
-     * 1. text editor input after a debounce time of 2 seconds
+     * 1. text editor input after a debounce time of  2 seconds
      * 2. manually triggered change on submission (e.g. when submit was clicked)
      */
     private buildSubmissionObservable() {

From 992a2bd978a15031027eb0dbf22bd9b1c832d85a Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 16 Aug 2024 02:38:26 +0200
Subject: [PATCH 05/99] Update result components for Text Feedback

---
 .../app/exercises/shared/result/result.component.ts    |  5 +++++
 .../webapp/app/exercises/shared/result/result.utils.ts | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.component.ts b/src/main/webapp/app/exercises/shared/result/result.component.ts
index f8982b0fe2f2..4c8ad8d3d6a0 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.component.ts
@@ -185,6 +185,11 @@ export class ResultComponent implements OnInit, OnChanges, OnDestroy {
             this.textColorClass = getTextColorClass(this.result, this.templateStatus);
             this.resultIconClass = getResultIconClass(this.result, this.templateStatus);
             this.resultString = this.resultService.getResultString(this.result, this.exercise, this.short);
+        } else if (this.exercise!.type! === ExerciseType.TEXT && this.result && Result.isAthenaAIResult(this.result)) {
+            this.textColorClass = 'text-primary';
+            this.resultIconClass = getResultIconClass(this.result, this.templateStatus);
+            this.resultString = 'Preliminary AI Feedback';
+            this.resultTooltip = this.buildResultTooltip();
         } else if (
             this.result &&
             ((this.result.score !== undefined && (this.result.rated || this.result.rated == undefined || this.showUngradedResults)) || Result.isAthenaAIResult(this.result))
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 9a997cd2be69..5db3973c6c8c 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -165,8 +165,8 @@ export const evaluateTemplateStatus = (
 
         if (inDueTime && initializedResultWithScore(result)) {
             // Submission is in due time of exercise and has a result with score
-            if (!assessmentDueDate || assessmentDueDate.isBefore(dayjs())) {
-                // the assessment due date has passed (or there was none)
+            if (!assessmentDueDate || assessmentDueDate.isBefore(dayjs()) || !isManualResult(result)) {
+                // the assessment due date has passed (or there was none) (or it is not manual feedback)
                 return ResultTemplateStatus.HAS_RESULT;
             } else {
                 // the assessment period is still active
@@ -177,7 +177,7 @@ export const evaluateTemplateStatus = (
             if (!dueDate || dueDate.isSameOrAfter(dayjs())) {
                 // the due date is in the future (or there is none) => the exercise is still ongoing
                 return ResultTemplateStatus.SUBMITTED;
-            } else if (!assessmentDueDate || assessmentDueDate.isSameOrAfter(dayjs())) {
+            } else if (!assessmentDueDate || assessmentDueDate.isSameOrAfter(dayjs()) || isManualResult(result)) {
                 // the due date is over, further submissions are no longer possible, waiting for grading
                 return ResultTemplateStatus.SUBMITTED_WAITING_FOR_GRADING;
             } else {
@@ -185,7 +185,7 @@ export const evaluateTemplateStatus = (
                 // TODO why is this distinct from the case above? The submission can still be graded and often is.
                 return ResultTemplateStatus.NO_RESULT;
             }
-        } else if (initializedResultWithScore(result) && (!assessmentDueDate || assessmentDueDate.isBefore(dayjs()))) {
+        } else if (initializedResultWithScore(result) && (!assessmentDueDate || assessmentDueDate.isBefore(dayjs()) || !isManualResult(result))) {
             // Submission is not in due time of exercise, has a result with score and there is no assessmentDueDate for the exercise or it lies in the past.
             // TODO handle external submissions with new status "External"
             return ResultTemplateStatus.LATE;
@@ -346,7 +346,7 @@ export const isBuildFailed = (submission?: Submission) => {
  * @param result the result.
  */
 export const isManualResult = (result?: Result) => {
-    return result?.assessmentType !== AssessmentType.AUTOMATIC;
+    return result?.assessmentType !== AssessmentType.AUTOMATIC && result?.assessmentType !== AssessmentType.AUTOMATIC_ATHENA;
 };
 
 /**

From b49ca0f29d970ea6a6b70fb3dc3e993b6ed7dc20 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 16 Aug 2024 02:40:31 +0200
Subject: [PATCH 06/99] Handle toggle of athena ai feedback request option

---
 .../exercise-feedback-suggestion-options.component.ts    | 9 ++++++---
 .../exercise-details-student-actions.component.ts        | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
index 935f6ff76e86..10425250ae3f 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
@@ -15,6 +15,8 @@ export class ExerciseFeedbackSuggestionOptionsComponent implements OnInit, OnCha
     @Input() dueDate?: dayjs.Dayjs;
     @Input() readOnly: boolean = false;
 
+    protected readonly ExerciseType = ExerciseType;
+
     protected readonly AssessmentType = AssessmentType;
 
     readonly assessmentType: AssessmentType;
@@ -71,17 +73,18 @@ export class ExerciseFeedbackSuggestionOptionsComponent implements OnInit, OnCha
     toggleFeedbackSuggestions(event: any) {
         if (event.target.checked) {
             this.exercise.feedbackSuggestionModule = this.availableAthenaModules.first();
-        } else {
+        } else if (!this.exercise.allowFeedbackRequests) {
             this.exercise.feedbackSuggestionModule = undefined;
         }
     }
-
+    // this two toggle functions act weirdly together and they should be rewritten
     toggleFeedbackRequests(event: any) {
         if (event.target.checked) {
             this.exercise.feedbackSuggestionModule = this.availableAthenaModules.first();
-            this.exercise.allowFeedbackRequests = !this.exercise.allowFeedbackRequests;
+            this.exercise.allowFeedbackRequests = true;
         } else {
             this.exercise.feedbackSuggestionModule = undefined;
+            this.exercise.allowFeedbackRequests = false;
         }
     }
 
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 2506de3ebb53..9623dcdeaba2 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -125,6 +125,9 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
             this.editorLabel = 'openModelingEditor';
         } else if (this.exercise.type === ExerciseType.TEXT) {
             this.editorLabel = 'openTextEditor';
+            this.profileService.getProfileInfo().subscribe((profileInfo) => {
+                this.athenaEnabled = profileInfo.activeProfiles?.includes(PROFILE_ATHENA);
+            });
         } else if (this.exercise.type === ExerciseType.FILE_UPLOAD) {
             this.editorLabel = 'uploadFile';
         }

From b79d3257fd9e3a1145973d963b5db74c66792878 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 21 Aug 2024 11:26:22 +0200
Subject: [PATCH 07/99] Get the last submission for assessment for text
 exercises

---
 .../webapp/app/exercises/text/assess/text-assessment.service.ts | 2 +-
 .../text/assess/text-submission-assessment.component.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts
index 8e2274337833..76a7db54a4b1 100644
--- a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts
@@ -152,7 +152,7 @@ export class TextAssessmentService {
                     if (participation.exercise) {
                         this.accountService.setAccessRightsForExercise(participation.exercise);
                     }
-                    const submission = participation.submissions![0];
+                    const submission = participation.submissions!.last()!;
                     let result;
                     if (resultId) {
                         result = getSubmissionResultById(submission, resultId);
diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
index f35fe3bb044d..7fe4e50a3b9a 100644
--- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
@@ -187,7 +187,7 @@ export class TextSubmissionAssessmentComponent extends TextAssessmentBaseCompone
         }
 
         this.participation = studentParticipation;
-        this.submission = this.participation!.submissions![0] as TextSubmission;
+        this.submission = this.participation!.submissions!.last() as TextSubmission;
         this.exercise = this.participation?.exercise as TextExercise;
         this.course = getCourseFromExercise(this.exercise);
         setLatestSubmissionResult(this.submission, getLatestSubmissionResult(this.submission));

From c79b54033770b3a9c1b31ef66d5a8fd5b8bb90c6 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 22 Aug 2024 12:53:38 +0200
Subject: [PATCH 08/99] Preliminary Feedback Server

---
 .../tum/in/www1/artemis/domain/Exercise.java  |   5 +
 .../artemis/service/ParticipationService.java |  16 ++
 .../service/TextExerciseFeedbackService.java  | 174 ++++++++++++++++++
 .../service/TextSubmissionService.java        |   5 +-
 .../web/rest/ParticipationResource.java       |  57 +++++-
 .../web/rest/TextExerciseResource.java        |  11 +-
 .../web/websocket/ResultWebsocketService.java |   4 +-
 7 files changed, 262 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
index 4c103dde0732..ef1d75fde4de 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
@@ -49,6 +49,7 @@
 import com.fasterxml.jackson.annotation.JsonView;
 
 import de.tum.in.www1.artemis.domain.competency.CourseCompetency;
+import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
 import de.tum.in.www1.artemis.domain.enumeration.ExerciseType;
 import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore;
 import de.tum.in.www1.artemis.domain.enumeration.InitializationState;
@@ -603,6 +604,10 @@ else if (resultDate1.isAfter(resultDate2)) {
     public Set<Result> findResultsFilteredForStudents(Participation participation) {
         boolean isAssessmentOver = getAssessmentDueDate() == null || getAssessmentDueDate().isBefore(ZonedDateTime.now());
         if (!isAssessmentOver) {
+            // This allows the showing of preliminary feedback in case the assessment due date is set before its over.
+            if (this instanceof TextExercise) {
+                return participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).collect(Collectors.toSet());
+            }
             return Set.of();
         }
         return participation.getResults().stream().filter(result -> result.getCompletionDate() != null).collect(Collectors.toSet());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
index f1cb7d607d93..7775d03aef79 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
@@ -31,6 +31,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.InitializationState;
 import de.tum.in.www1.artemis.domain.enumeration.SubmissionType;
 import de.tum.in.www1.artemis.domain.participation.Participant;
+import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
@@ -679,6 +680,21 @@ public List<StudentParticipation> findByExerciseAndStudentIdWithEagerSubmissions
         return studentParticipationRepository.findByExerciseIdAndStudentIdWithEagerLegalSubmissions(exercise.getId(), studentId);
     }
 
+    /**
+     * Get the text exercise participation with the Latest Submissions and its results
+     *
+     * @param participationId the id of the participation
+     * @return the participation with latest submission and result
+     * @throws EntityNotFoundException
+     */
+    public StudentParticipation findTextExerciseParticipationWithLatestSubmissionAndResult(Long participationId) throws EntityNotFoundException {
+        Optional<Participation> participation = participationRepository.findByIdWithLatestSubmissionAndResult(participationId);
+        if (participation.isEmpty() || !(participation.get() instanceof StudentParticipation)) {
+            throw new EntityNotFoundException("No text exercise participation found with id " + participationId);
+        }
+        return (StudentParticipation) participation.get();
+    }
+
     /**
      * Get all programming exercise participations belonging to exercise and student with eager results and submissions.
      *
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
new file mode 100644
index 000000000000..9a62965b6f48
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -0,0 +1,174 @@
+package de.tum.in.www1.artemis.service;
+
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+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.Feedback;
+import de.tum.in.www1.artemis.domain.Result;
+import de.tum.in.www1.artemis.domain.TextExercise;
+import de.tum.in.www1.artemis.domain.TextSubmission;
+import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
+import de.tum.in.www1.artemis.domain.enumeration.FeedbackType;
+import de.tum.in.www1.artemis.domain.participation.Participation;
+import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
+import de.tum.in.www1.artemis.repository.ResultRepository;
+import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
+import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService;
+import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
+import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
+import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
+
+@Profile(PROFILE_CORE)
+@Service
+public class TextExerciseFeedbackService {
+
+    private static final Logger log = LoggerFactory.getLogger(TextExerciseFeedbackService.class);
+
+    public static final String NON_GRADED_FEEDBACK_SUGGESTION = "NonGradedFeedbackSuggestion:";
+
+    private final Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService;
+
+    private final GroupNotificationService groupNotificationService;
+
+    private final ResultWebsocketService resultWebsocketService;
+
+    private final SubmissionService submissionService;
+
+    private final ParticipationService participationService;
+
+    private final ResultService resultService;
+
+    private final ResultRepository resultRepository;
+
+    private final TextSubmissionService textSubmissionService;
+
+    public TextExerciseFeedbackService(GroupNotificationService groupNotificationService, Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService,
+            SubmissionService submissionService, ResultService resultService, ResultRepository resultRepository, StudentParticipationRepository studentParticipationRepository,
+            ResultWebsocketService resultWebsocketService, ParticipationService participationService, TextSubmissionService textSubmissionService) {
+        this.groupNotificationService = groupNotificationService;
+        this.athenaFeedbackSuggestionsService = athenaFeedbackSuggestionsService;
+        this.submissionService = submissionService;
+        this.resultService = resultService;
+        this.resultRepository = resultRepository;
+        this.resultWebsocketService = resultWebsocketService;
+        this.participationService = participationService;
+        this.textSubmissionService = textSubmissionService;
+    }
+
+    private void checkRateLimitOrThrow(StudentParticipation participation) {
+
+        List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
+
+        long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count();
+
+        long countOfSuccessfulRequests = athenaResults.stream().filter(result -> result.isSuccessful() == Boolean.TRUE).count();
+
+        // TODO For testing purposes, will be configurable in the future
+        if (countOfAthenaResultsInProcessOrSuccessful >= 10) {
+            throw new BadRequestAlertException("Cannot send additional AI feedback requests now. Try again later!", "participation", "preconditions not met");
+        }
+        if (countOfSuccessfulRequests >= 10) {
+            throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "preconditions not met");
+        }
+    }
+
+    /**
+     * Handles the request for generating feedback for a text exercise.
+     * This method decides whether to generate feedback automatically using Athena,
+     * or notify a tutor to manually process the feedback.
+     *
+     * @param exerciseId    the id of the programming exercise.
+     * @param participation the student participation associated with the exercise.
+     * @param textExercise  the text exercise object.
+     * @return StudentParticipation updated text exercise for an AI assessment
+     */
+    public StudentParticipation handleNonGradedFeedbackRequest(Long exerciseId, StudentParticipation participation, TextExercise textExercise) {
+        if (this.athenaFeedbackSuggestionsService.isPresent()) {
+            this.checkRateLimitOrThrow(participation);
+            CompletableFuture.runAsync(() -> this.generateAutomaticNonGradedFeedback(participation, textExercise));
+            return participation;
+        }
+        else {
+            log.debug("tutor is responsible to process feedback request: {}", exerciseId);
+            groupNotificationService.notifyTutorGroupAboutNewFeedbackRequest(textExercise);
+            return participation;
+        }
+    }
+
+    /**
+     * Generates automatic non-graded feedback for a programming exercise submission.
+     * This method leverages the Athena service to generate feedback based on the latest submission.
+     *
+     * @param participation the student participation associated with the exercise.
+     * @param textExercise  the text exercise object.
+     */
+    public void generateAutomaticNonGradedFeedback(StudentParticipation participation, TextExercise textExercise) {
+        log.debug("Using athena to generate (text exercise) feedback request: {}", textExercise.getId());
+
+        // athena takes over the control here
+        var submissionOptional = participationService.findTextExerciseParticipationWithLatestSubmissionAndResult(participation.getId()).findLatestSubmission();
+
+        if (submissionOptional.isEmpty()) {
+            throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission");
+        }
+        var submission = submissionOptional.get();
+
+        var automaticResult = this.submissionService.saveNewEmptyResult(submission);
+        automaticResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA);
+        automaticResult.setRated(false);
+        automaticResult.setScore(0.0);
+        automaticResult.setSuccessful(null);
+        automaticResult.setCompletionDate(ZonedDateTime.now().plusSeconds(15));
+        automaticResult = this.resultRepository.save(automaticResult);
+
+        // This will create a new submission without results, this is important so that tutor assessment works as it used to.
+        textSubmissionService.handleTextSubmission((TextSubmission) submission, textExercise, participation.getStudent().get());
+
+        try {
+            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+
+            log.debug("Submission id: {}", submission.getId());
+
+            var athenaResponse = this.athenaFeedbackSuggestionsService.orElseThrow().getTextFeedbackSuggestions(textExercise, (TextSubmission) submission, false);
+
+            List<Feedback> feedbacks = athenaResponse.stream().filter(individualFeedbackItem -> individualFeedbackItem.description() != null).map(individualFeedbackItem -> {
+                var feedback = new Feedback();
+                feedback.setText(individualFeedbackItem.title());
+                feedback.setDetailText(individualFeedbackItem.description());
+                feedback.setHasLongFeedbackText(false);
+                feedback.setType(FeedbackType.AUTOMATIC);
+                feedback.setCredits(individualFeedbackItem.credits());
+                return feedback;
+            }).toList();
+
+            double totalFeedbacksScore = 0.0;
+            for (Feedback feedback : feedbacks) {
+                totalFeedbacksScore += feedback.getCredits();
+            }
+
+            automaticResult.setSuccessful(true);
+            automaticResult.setCompletionDate(ZonedDateTime.now());
+            automaticResult.setScore(totalFeedbacksScore / textExercise.getMaxPoints() * 100);
+            this.resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
+            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+
+        }
+        catch (Exception e) {
+            log.error("Could not generate feedback", e);
+            automaticResult.setSuccessful(false);
+            automaticResult.setCompletionDate(ZonedDateTime.now());
+            this.resultRepository.save(automaticResult);
+            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+
+        }
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
index 11110487e211..c010ff1ff005 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
@@ -81,6 +81,10 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
         if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {
             textSubmission.setSubmitted(true);
         }
+        // To ensure that a new submission is created when Athena Feedback is present
+        if (!textSubmission.getResults().isEmpty()) {
+            textSubmission.setId(null);
+        }
         textSubmission = save(textSubmission, participation, exercise, user);
         return textSubmission;
     }
@@ -104,7 +108,6 @@ private TextSubmission save(TextSubmission textSubmission, StudentParticipation
             participation.setInitializationState(InitializationState.FINISHED);
             studentParticipationRepository.save(participation);
         }
-
         // remove result from submission (in the unlikely case it is passed here), so that students cannot inject a result
         textSubmission.setResults(new ArrayList<>());
         textSubmission = textSubmissionRepository.save(textSubmission);
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index 3e8b82b2d8ed..06fe7bd8b43b 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -50,6 +50,7 @@
 import de.tum.in.www1.artemis.domain.Submission;
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.User;
+import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
 import de.tum.in.www1.artemis.domain.enumeration.ExerciseType;
 import de.tum.in.www1.artemis.domain.enumeration.InitializationState;
 import de.tum.in.www1.artemis.domain.enumeration.SubmissionType;
@@ -72,6 +73,7 @@
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository;
 import de.tum.in.www1.artemis.repository.TeamRepository;
+import de.tum.in.www1.artemis.repository.TextExerciseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.Role;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
@@ -83,6 +85,7 @@
 import de.tum.in.www1.artemis.service.GradingScaleService;
 import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService;
 import de.tum.in.www1.artemis.service.ParticipationService;
+import de.tum.in.www1.artemis.service.TextExerciseFeedbackService;
 import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService;
 import de.tum.in.www1.artemis.service.feature.Feature;
 import de.tum.in.www1.artemis.service.feature.FeatureToggle;
@@ -120,6 +123,8 @@ public class ParticipationResource {
 
     private final ExerciseRepository exerciseRepository;
 
+    private final TextExerciseRepository textExerciseRepository;
+
     private final ProgrammingExerciseRepository programmingExerciseRepository;
 
     private final CourseRepository courseRepository;
@@ -162,6 +167,8 @@ public class ParticipationResource {
 
     private final ProgrammingExerciseCodeReviewFeedbackService programmingExerciseCodeReviewFeedbackService;
 
+    private final TextExerciseFeedbackService textExerciseFeedbackService;
+
     public ParticipationResource(ParticipationService participationService, ProgrammingExerciseParticipationService programmingExerciseParticipationService,
             CourseRepository courseRepository, QuizExerciseRepository quizExerciseRepository, ExerciseRepository exerciseRepository,
             ProgrammingExerciseRepository programmingExerciseRepository, AuthorizationCheckService authCheckService,
@@ -171,7 +178,8 @@ public ParticipationResource(ParticipationService participationService, Programm
             ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository, SubmissionRepository submissionRepository,
             ResultRepository resultRepository, ExerciseDateService exerciseDateService, InstanceMessageSendService instanceMessageSendService, QuizBatchService quizBatchService,
             SubmittedAnswerRepository submittedAnswerRepository, QuizSubmissionService quizSubmissionService, GradingScaleService gradingScaleService,
-            ProgrammingExerciseCodeReviewFeedbackService programmingExerciseCodeReviewFeedbackService) {
+            ProgrammingExerciseCodeReviewFeedbackService programmingExerciseCodeReviewFeedbackService, TextExerciseFeedbackService textExerciseFeedbackService,
+            TextExerciseRepository textExerciseRepository) {
         this.participationService = participationService;
         this.programmingExerciseParticipationService = programmingExerciseParticipationService;
         this.quizExerciseRepository = quizExerciseRepository;
@@ -197,6 +205,8 @@ public ParticipationResource(ParticipationService participationService, Programm
         this.quizSubmissionService = quizSubmissionService;
         this.gradingScaleService = gradingScaleService;
         this.programmingExerciseCodeReviewFeedbackService = programmingExerciseCodeReviewFeedbackService;
+        this.textExerciseFeedbackService = textExerciseFeedbackService;
+        this.textExerciseRepository = textExerciseRepository;
     }
 
     /**
@@ -352,8 +362,16 @@ public ResponseEntity<ProgrammingExerciseStudentParticipation> resumeParticipati
     @PutMapping("exercises/{exerciseId}/request-feedback")
     @EnforceAtLeastStudent
     @FeatureToggle(Feature.ProgrammingExercises)
-    public ResponseEntity<ProgrammingExerciseStudentParticipation> requestFeedback(@PathVariable Long exerciseId, Principal principal) {
+    public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long exerciseId, Principal principal) {
         log.debug("REST request for feedback request: {}", exerciseId);
+
+        // Different approach for text Exercises, default else is programming exercises
+        Optional<TextExercise> textExerciseOpt = textExerciseRepository.findById(exerciseId);
+        if (textExerciseOpt.isPresent()) {
+            return handleTextExerciseFeedbackRequest(textExerciseOpt.get(), principal);
+            // TODO If we add a new submission right here it makes things easier with assessments...
+        }
+
         var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(exerciseId);
 
         if (programmingExercise.isExamExercise()) {
@@ -387,6 +405,38 @@ public ResponseEntity<ProgrammingExerciseStudentParticipation> requestFeedback(@
         return ResponseEntity.ok().body(participation);
     }
 
+    private ResponseEntity<StudentParticipation> handleTextExerciseFeedbackRequest(TextExercise textExercise, Principal principal) {
+
+        if (textExercise.isExamExercise()) {
+            throw new BadRequestAlertException("Not intended for the use in exams", "participation", "preconditions not met");
+        }
+
+        if (textExercise.getDueDate() != null && now().isAfter(textExercise.getDueDate())) {
+            throw new BadRequestAlertException("The due date is over", "participation", "preconditions not met");
+        }
+
+        var participation = studentParticipationRepository.findByExerciseIdAndStudentLogin(textExercise.getId(), principal.getName()).get();
+        User user = userRepository.getUserWithGroupsAndAuthorities();
+
+        checkAccessPermissionOwner(participation, user);
+
+        var studentParticipation = studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId());
+        var submissions = submissionRepository.findAllByParticipationId(studentParticipation.getId());
+
+        if (submissions.isEmpty()) {
+            throw new BadRequestAlertException("You need to submit at least once", "participation", "preconditions not met");
+        }
+
+        var currentDate = now();
+        var participationIndividualDueDate = participation.getIndividualDueDate();
+        if (participationIndividualDueDate != null && currentDate.isAfter(participationIndividualDueDate)) {
+            throw new BadRequestAlertException("Request has already been sent", "participation", "already sent");
+        }
+        participation = this.textExerciseFeedbackService.handleNonGradedFeedbackRequest(textExercise.getId(), studentParticipation, textExercise);
+
+        return ResponseEntity.ok().body(participation);
+    }
+
     /**
      * Checks if the student is currently allowed to participate in the course exercise using this participation
      *
@@ -580,7 +630,8 @@ public ResponseEntity<Set<StudentParticipation>> getAllParticipationsForExercise
             participations = findParticipationWithLatestResults(exercise);
             participations.forEach(participation -> {
                 participation.setSubmissionCount(participation.getSubmissions().size());
-                if (participation.getResults() != null && !participation.getResults().isEmpty()) {
+                if (participation.getResults() != null && !participation.getResults().isEmpty()
+                        && !(participation.getResults().stream().allMatch(result -> AssessmentType.AUTOMATIC_ATHENA.equals(result.getAssessmentType())))) {
                     participation.setSubmissions(null);
                 }
                 else if (participation.getSubmissions() != null && !participation.getSubmissions().isEmpty()) {
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java
index c06e0373b98c..4e9d4197208e 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java
@@ -2,12 +2,10 @@
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 import static de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse;
-import static java.util.Collections.emptySet;
 
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -41,6 +39,7 @@
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.TextSubmission;
 import de.tum.in.www1.artemis.domain.User;
+import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
 import de.tum.in.www1.artemis.domain.metis.conversation.Channel;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult;
@@ -424,8 +423,12 @@ public ResponseEntity<StudentParticipation> getDataForTextEditor(@PathVariable L
             textSubmission.setParticipation(null);
 
             if (!ExerciseDateService.isAfterAssessmentDueDate(textExercise)) {
-                textSubmission.setResults(Collections.emptyList());
-                participation.setResults(emptySet());
+                // We want to have the preliminary feedback before the assessment due date too
+                List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
+                textSubmission.setResults(athenaResults);
+                Set<Result> athenaResultsSet = new HashSet<Result>(athenaResults);
+                participation.setResults(athenaResultsSet);
+
             }
 
             Result result = textSubmission.getLatestResult();
diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/web/websocket/ResultWebsocketService.java
index a6bd18d212a7..5e65fde2de2a 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/websocket/ResultWebsocketService.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/websocket/ResultWebsocketService.java
@@ -84,8 +84,8 @@ private void broadcastNewResultToParticipants(StudentParticipation studentPartic
         // Don't send students results after the exam ended
         boolean isAfterExamEnd = isWorkingPeriodOver && exercise.isExamExercise() && !exercise.getExam().isTestExam();
         // If the assessment due date is not over yet, do not send manual feedback to students!
-        boolean isAutomaticAssessmentOrDueDateOver = AssessmentType.AUTOMATIC == result.getAssessmentType() || exercise.getAssessmentDueDate() == null
-                || ZonedDateTime.now().isAfter(exercise.getAssessmentDueDate());
+        boolean isAutomaticAssessmentOrDueDateOver = AssessmentType.AUTOMATIC == result.getAssessmentType() || AssessmentType.AUTOMATIC_ATHENA == result.getAssessmentType()
+                || exercise.getAssessmentDueDate() == null || ZonedDateTime.now().isAfter(exercise.getAssessmentDueDate());
 
         if (isAutomaticAssessmentOrDueDateOver && !isAfterExamEnd) {
             var students = studentParticipation.getStudents();

From 5405ae199cac3e20513b2d3cfc8654e06f8e329a Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 22 Aug 2024 12:56:26 +0200
Subject: [PATCH 09/99] Fix Assessment tutor side issues

---
 .../exercise-scores/exercise-scores.component.ts     | 12 ++++++++++--
 .../manage-assessment-buttons.component.html         |  3 ++-
 .../app/exercises/shared/result/result.component.ts  |  5 -----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
index 1b578e4ecbd4..3d878cbd18b4 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
@@ -171,8 +171,16 @@ export class ExerciseScoresComponent implements OnInit, OnDestroy {
             // the result of the first correction round will be at index 0,
             // the result of a complaints or the second correction at index 1.
             participation.results?.sort((result1, result2) => (result1.id ?? 0) - (result2.id ?? 0));
-            if (participation.results?.[0].submission) {
-                participation.submissions = [participation.results?.[0].submission];
+
+            const resultsWithoutAthena = participation.results?.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA);
+            if (resultsWithoutAthena && resultsWithoutAthena?.length != 0) {
+                if (resultsWithoutAthena?.[0].submission) {
+                    participation.submissions = [resultsWithoutAthena?.[0].submission];
+                } else if (participation.results?.[0].submission) {
+                    participation.submissions = [participation.results?.[0].submission];
+                }
+            } else {
+                participation.results = undefined;
             }
         });
         this.filteredParticipations = this.filterByScoreRange(this.participations);
diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html b/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
index 4417caebec48..1f06dc510d59 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
@@ -3,7 +3,7 @@
         @if (
             (correctionRound === 0 || participation.results?.[correctionRound - 1]?.completionDate) &&
             (newManualResultAllowed ||
-                (participation.results?.[correctionRound]?.assessmentType && participation.results?.[correctionRound]?.assessmentType !== AssessmentType.AUTOMATIC))
+                (participation.results?.[correctionRound]?.assessmentType && participation.results?.[correctionRound]?.assessmentType !== AssessmentType.AUTOMATIC && participation.results?.[correctionRound]?.assessmentType !== AssessmentType.AUTOMATIC_ATHENA))
         ) {
             <div>
                 <a
@@ -27,6 +27,7 @@
                             'artemisApp.assessment.dashboard.actions.' +
                                 (this.examMode ? 'examCorrectionRound.' : '') +
                                 (!participation.results?.[correctionRound]?.assessmentType || participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC
+                                || participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC_ATHENA
                                     ? 'assess'
                                     : participation.results?.[correctionRound]?.completionDate
                                       ? 'open'
diff --git a/src/main/webapp/app/exercises/shared/result/result.component.ts b/src/main/webapp/app/exercises/shared/result/result.component.ts
index 4c8ad8d3d6a0..f8982b0fe2f2 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.component.ts
@@ -185,11 +185,6 @@ export class ResultComponent implements OnInit, OnChanges, OnDestroy {
             this.textColorClass = getTextColorClass(this.result, this.templateStatus);
             this.resultIconClass = getResultIconClass(this.result, this.templateStatus);
             this.resultString = this.resultService.getResultString(this.result, this.exercise, this.short);
-        } else if (this.exercise!.type! === ExerciseType.TEXT && this.result && Result.isAthenaAIResult(this.result)) {
-            this.textColorClass = 'text-primary';
-            this.resultIconClass = getResultIconClass(this.result, this.templateStatus);
-            this.resultString = 'Preliminary AI Feedback';
-            this.resultTooltip = this.buildResultTooltip();
         } else if (
             this.result &&
             ((this.result.score !== undefined && (this.result.rated || this.result.rated == undefined || this.showUngradedResults)) || Result.isAthenaAIResult(this.result))

From 9ddc3d9498c904518c88d6580825626c0a48b8fe Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 22 Aug 2024 13:02:27 +0200
Subject: [PATCH 10/99] remove todo

---
 .../de/tum/in/www1/artemis/web/rest/ParticipationResource.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index 06fe7bd8b43b..8535ebf8f393 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -369,7 +369,6 @@ public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long e
         Optional<TextExercise> textExerciseOpt = textExerciseRepository.findById(exerciseId);
         if (textExerciseOpt.isPresent()) {
             return handleTextExerciseFeedbackRequest(textExerciseOpt.get(), principal);
-            // TODO If we add a new submission right here it makes things easier with assessments...
         }
 
         var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(exerciseId);

From a5b1c459d6b4158d49c70bd462c00d35131b7b61 Mon Sep 17 00:00:00 2001
From: EneaGore <73840596+EneaGore@users.noreply.github.com>
Date: Thu, 22 Aug 2024 13:46:37 +0200
Subject: [PATCH 11/99] prettier

---
 .../app/exercises/text/participate/text-editor.component.ts    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
index 856465d8aa82..b7193176fb95 100644
--- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
@@ -142,7 +142,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
         this.course = getCourseFromExercise(this.textExercise);
 
         if (participation.submissions?.length) {
-            this.submission = participation.submissions[participation.submissions.length-1] as TextSubmission;
+            this.submission = participation.submissions[participation.submissions.length - 1] as TextSubmission;
             setLatestSubmissionResult(this.submission, getLatestSubmissionResult(this.submission));
             if (this.submission?.results && participation.results && (this.isAfterAssessmentDueDate || this.isAfterPublishDate)) {
                 this.result = this.submission.latestResult!;
@@ -188,7 +188,6 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
     }
 
     get isAutomaticResult(): boolean {
-
         const isAutomatic = this.result?.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
         return isAutomatic;
     }

From da61ffa9b7faf8eac12cc575d455b6c4b1f5dd39 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 22 Aug 2024 14:24:27 +0200
Subject: [PATCH 12/99] Formattierung

---
 .../manage-assessment-buttons.component.html             | 9 ++++++---
 .../exercise-feedback-suggestion-options.component.html  | 2 +-
 .../exercises/text/participate/text-editor.component.ts  | 3 +--
 .../course-exercise-details.component.html               | 2 +-
 .../exercise-details-student-actions.component.html      | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html b/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
index 1f06dc510d59..ad4399e5e02a 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
@@ -3,7 +3,9 @@
         @if (
             (correctionRound === 0 || participation.results?.[correctionRound - 1]?.completionDate) &&
             (newManualResultAllowed ||
-                (participation.results?.[correctionRound]?.assessmentType && participation.results?.[correctionRound]?.assessmentType !== AssessmentType.AUTOMATIC && participation.results?.[correctionRound]?.assessmentType !== AssessmentType.AUTOMATIC_ATHENA))
+                (participation.results?.[correctionRound]?.assessmentType &&
+                    participation.results?.[correctionRound]?.assessmentType !== AssessmentType.AUTOMATIC &&
+                    participation.results?.[correctionRound]?.assessmentType !== AssessmentType.AUTOMATIC_ATHENA))
         ) {
             <div>
                 <a
@@ -26,8 +28,9 @@
                         {{
                             'artemisApp.assessment.dashboard.actions.' +
                                 (this.examMode ? 'examCorrectionRound.' : '') +
-                                (!participation.results?.[correctionRound]?.assessmentType || participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC
-                                || participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC_ATHENA
+                                (!participation.results?.[correctionRound]?.assessmentType ||
+                                participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC ||
+                                participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC_ATHENA
                                     ? 'assess'
                                     : participation.results?.[correctionRound]?.completionDate
                                       ? 'open'
diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
index e1be98ae8baa..55d7f5ce03a4 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
@@ -18,7 +18,7 @@
             ></label>
             <jhi-help-icon placement="right auto" [text]="'artemisApp.exercise.feedbackSuggestionsEnabledTooltip'" />
         </div>
-        @if (this.exercise.type === ExerciseType.TEXT){
+        @if (this.exercise.type === ExerciseType.TEXT) {
             <div class="form-check">
                 <input
                     type="checkbox"
diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
index 856465d8aa82..b7193176fb95 100644
--- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
@@ -142,7 +142,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
         this.course = getCourseFromExercise(this.textExercise);
 
         if (participation.submissions?.length) {
-            this.submission = participation.submissions[participation.submissions.length-1] as TextSubmission;
+            this.submission = participation.submissions[participation.submissions.length - 1] as TextSubmission;
             setLatestSubmissionResult(this.submission, getLatestSubmissionResult(this.submission));
             if (this.submission?.results && participation.results && (this.isAfterAssessmentDueDate || this.isAfterPublishDate)) {
                 this.result = this.submission.latestResult!;
@@ -188,7 +188,6 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
     }
 
     get isAutomaticResult(): boolean {
-
         const isAutomatic = this.result?.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
         return isAutomatic;
     }
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
index 7e5cf96357ff..2409b5d0f763 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
@@ -109,7 +109,7 @@
             <div class="col flex-grow-1">
                 <!-- EXERCISE ACTIONS END -->
                 <!-- RESULTS START -->
-               @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 0) || this.practiceStudentParticipation?.results?.length) {
+                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 0) || this.practiceStudentParticipation?.results?.length) {
                     <div class="row">
                         <div class="row mb-2 mt-2 align-items-baseline d-none d-md-flex">
                             <div class="col-auto">
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index 2ac90e15f4e4..e7997c78272c 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -258,7 +258,7 @@
                             class="btn btn-primary"
                             (click)="requestFeedback()"
                             [class.btn-sm]="smallButtons"
-                            [disabled]="gradedParticipation?.submissions?.length==1 && !gradedParticipation!.submissions![0].submitted"
+                            [disabled]="gradedParticipation?.submissions?.length == 1 && !gradedParticipation!.submissions![0].submitted"
                             [id]="'request-feedback-' + exercise.id"
                             [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate"
                         >

From f1cf351fd1b4cf094e6f7153e8bc0105e8ed99b0 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 06:21:54 +0200
Subject: [PATCH 13/99] Improve results for preliminary text AI Feedback

---
 .../shared/feedback/feedback.component.html   |  2 +-
 .../exercises/shared/result/result.service.ts | 44 ++++++++++++++++++-
 .../exercises/shared/result/result.utils.ts   | 11 +++--
 .../submission-result-status.component.ts     |  3 ++
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html
index 02ec4680e56e..81a741157773 100644
--- a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html
+++ b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html
@@ -90,7 +90,7 @@ <h4>
                     </div>
                 }
 
-                @if (result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA && showScoreChart && result.participation?.exercise) {
+                @if (showScoreChart && result.participation?.exercise) {
                     <div class="result-score-chart">
                         <div id="feedback-chart" #containerRef class="chart-space">
                             <ngx-charts-bar-horizontal-stacked
diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index 72390f6979c8..cb1382f57981 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -94,6 +94,9 @@ export class ResultService implements IResultService {
         const relativeScore = roundValueSpecifiedByCourseSettings(result.score!, getCourseFromExercise(exercise));
         const points = roundValueSpecifiedByCourseSettings((result.score! * exercise.maxPoints!) / 100, getCourseFromExercise(exercise));
         if (exercise.type !== ExerciseType.PROGRAMMING) {
+            if (Result.isAthenaAIResult(result)) {
+                return this.getResultStringNonProgrammingExerciseWithAIFeedback(result, relativeScore, points, short);
+            }
             return this.getResultStringNonProgrammingExercise(relativeScore, points, short);
         } else {
             return this.getResultStringProgrammingExercise(result, exercise as ProgrammingExercise, relativeScore, points, short);
@@ -101,7 +104,46 @@ export class ResultService implements IResultService {
     }
 
     /**
-     * Generates the result string for a programming exercise. Contains the score and points
+     * Generates the result string for a text exercise. Contains the score and points
+     * @param result the result object
+     * @param relativeScore the achieved score in percent
+     * @param points the amount of achieved points
+     * @param short flag that indicates if the resultString should use the short format
+     */
+    private getResultStringNonProgrammingExerciseWithAIFeedback(result: Result, relativeScore: number, points: number, short: boolean | undefined): string {
+        if (isAIResultAndFailed(result)) {
+            return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackFailed');
+        } else if (isAIResultAndIsBeingProcessed(result)) {
+            return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
+        } else if (isAIResultAndTimedOut(result)) {
+            return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackTimedOut');
+        } else if (isAIResultAndProcessed(result)) {
+            if (short) {
+                return (
+                    this.translateService.instant(`artemisApp.result.resultString.short`, {
+                        relativeScore,
+                    }) +
+                    ' (' +
+                    this.translateService.instant('artemisApp.result.preliminary') +
+                    ')'
+                );
+            } else {
+                return (
+                    this.translateService.instant(`artemisApp.result.resultString.nonProgramming`, {
+                        relativeScore,
+                        points,
+                    }) +
+                    ' (' +
+                    this.translateService.instant('artemisApp.result.preliminary') +
+                    ')'
+                );
+            }
+        }
+        return this.translateService.instant('artemisApp.result.preliminary');
+    }
+
+    /**
+     * Generates the result string for a non programming exercise. Contains the score and points
      * @param relativeScore the achieved score in percent
      * @param points the amount of achieved points
      * @param short flag that indicates if the resultString should use the short format
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 5db3973c6c8c..6a27fe1bb12c 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -309,9 +309,14 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
  * @param result the result. It must include a participation and exercise.
  */
 export const resultIsPreliminary = (result: Result) => {
-    return (
-        result.participation && isProgrammingExerciseStudentParticipation(result.participation) && isResultPreliminary(result, result.participation.exercise as ProgrammingExercise)
-    );
+    if (result.participation && result.participation.exercise && result.participation.exercise.type === ExerciseType.TEXT) {
+        return result.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
+    } else
+        return (
+            result.participation &&
+            isProgrammingExerciseStudentParticipation(result.participation) &&
+            isResultPreliminary(result, result.participation.exercise as ProgrammingExercise)
+        );
 };
 
 /**
diff --git a/src/main/webapp/app/overview/submission-result-status.component.ts b/src/main/webapp/app/overview/submission-result-status.component.ts
index 5fe0027a5adb..dc52487c927f 100644
--- a/src/main/webapp/app/overview/submission-result-status.component.ts
+++ b/src/main/webapp/app/overview/submission-result-status.component.ts
@@ -58,6 +58,9 @@ export class SubmissionResultStatusComponent implements OnChanges {
     }
 
     private setShouldShowResult(afterDueDate: boolean) {
+        if (this.exercise.type === ExerciseType.TEXT) {
+            this.showUngradedResults = !!this.exercise.allowFeedbackRequests;
+        }
         if (this.exercise.type === ExerciseType.QUIZ) {
             this.shouldShowResult = !!this.studentParticipation?.results?.length;
         } else if (this.exercise.type === ExerciseType.PROGRAMMING) {

From 1c6ac3ddf7407e38191b0824a557700d304b83ac Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 07:49:03 +0200
Subject: [PATCH 14/99] Fix result icon and color for Ai Feedback

---
 .../exercises/shared/result/result.service.ts | 33 +++++++------------
 .../exercises/shared/result/result.utils.ts   |  8 +++++
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index cb1382f57981..113eb5207668 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -111,35 +111,26 @@ export class ResultService implements IResultService {
      * @param short flag that indicates if the resultString should use the short format
      */
     private getResultStringNonProgrammingExerciseWithAIFeedback(result: Result, relativeScore: number, points: number, short: boolean | undefined): string {
+        let aiFeedbackMessage: string;
         if (isAIResultAndFailed(result)) {
-            return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackFailed');
+            aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackFailed');
         } else if (isAIResultAndIsBeingProcessed(result)) {
-            return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
+            aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
         } else if (isAIResultAndTimedOut(result)) {
-            return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackTimedOut');
+            aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackTimedOut');
         } else if (isAIResultAndProcessed(result)) {
             if (short) {
-                return (
-                    this.translateService.instant(`artemisApp.result.resultString.short`, {
-                        relativeScore,
-                    }) +
-                    ' (' +
-                    this.translateService.instant('artemisApp.result.preliminary') +
-                    ')'
-                );
+                aiFeedbackMessage = this.translateService.instant(`artemisApp.result.resultString.short`, {
+                    relativeScore,
+                });
             } else {
-                return (
-                    this.translateService.instant(`artemisApp.result.resultString.nonProgramming`, {
-                        relativeScore,
-                        points,
-                    }) +
-                    ' (' +
-                    this.translateService.instant('artemisApp.result.preliminary') +
-                    ')'
-                );
+                aiFeedbackMessage = this.translateService.instant(`artemisApp.result.resultString.nonProgramming`, {
+                    relativeScore,
+                    points,
+                });
             }
         }
-        return this.translateService.instant('artemisApp.result.preliminary');
+        return aiFeedbackMessage + ' (' + this.translateService.instant('artemisApp.result.preliminary') + ')';
     }
 
     /**
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 6a27fe1bb12c..57e1127fd268 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -243,6 +243,10 @@ export const getTextColorClass = (result: Result | undefined, templateStatus: Re
         return 'text-secondary';
     }
 
+    if (resultIsPreliminary(result) && !!result.participation?.exercise?.type === ExerciseType.TEXT) {
+        return 'text-secondary';
+    }
+
     if (templateStatus === ResultTemplateStatus.LATE) {
         return 'result-late';
     }
@@ -283,6 +287,10 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
         return faQuestionCircle;
     }
 
+    if (resultIsPreliminary(result) && !!result.participation?.exercise?.type === ExerciseType.TEXT) {
+        return faQuestionCircle;
+    }
+
     if (isBuildFailedAndResultIsAutomatic(result) || isAIResultAndFailed(result)) {
         return faTimesCircle;
     }

From 52083fed668edf19262b377213fbb9db6e71fde9 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 08:00:10 +0200
Subject: [PATCH 15/99] typo

---
 src/main/webapp/app/exercises/shared/result/result.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index 113eb5207668..f039fab5a2f8 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -111,7 +111,7 @@ export class ResultService implements IResultService {
      * @param short flag that indicates if the resultString should use the short format
      */
     private getResultStringNonProgrammingExerciseWithAIFeedback(result: Result, relativeScore: number, points: number, short: boolean | undefined): string {
-        let aiFeedbackMessage: string;
+        let aiFeedbackMessage: string = '';
         if (isAIResultAndFailed(result)) {
             aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackFailed');
         } else if (isAIResultAndIsBeingProcessed(result)) {

From 6070cb689949033db8096bb69051f3b2705b48d5 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 08:10:42 +0200
Subject: [PATCH 16/99] ups

---
 src/main/webapp/app/exercises/shared/result/result.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 57e1127fd268..b0ad77bca21b 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -243,7 +243,7 @@ export const getTextColorClass = (result: Result | undefined, templateStatus: Re
         return 'text-secondary';
     }
 
-    if (resultIsPreliminary(result) && !!result.participation?.exercise?.type === ExerciseType.TEXT) {
+    if (resultIsPreliminary(result) && result.participation?.exercise?.type === ExerciseType.TEXT) {
         return 'text-secondary';
     }
 

From 44f8cefbe18b2eafd1f1e116e17121fae7d66567 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 08:16:06 +0200
Subject: [PATCH 17/99] typo

---
 src/main/webapp/app/exercises/shared/result/result.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index b0ad77bca21b..bcf426f98c8e 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -287,7 +287,7 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
         return faQuestionCircle;
     }
 
-    if (resultIsPreliminary(result) && !!result.participation?.exercise?.type === ExerciseType.TEXT) {
+    if (resultIsPreliminary(result) && result.participation?.exercise?.type === ExerciseType.TEXT) {
         return faQuestionCircle;
     }
 

From ac360d424076167e044f60da4355aac003bfab63 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 08:52:20 +0200
Subject: [PATCH 18/99] improve result strings for text ai feedback

---
 .../exercises/shared/result/result.service.ts    | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index f039fab5a2f8..e6695eefa710 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -113,22 +113,16 @@ export class ResultService implements IResultService {
     private getResultStringNonProgrammingExerciseWithAIFeedback(result: Result, relativeScore: number, points: number, short: boolean | undefined): string {
         let aiFeedbackMessage: string = '';
         if (isAIResultAndFailed(result)) {
-            aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackFailed');
+            aiFeedbackMessage =
+                this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackFailed') +
+                ' ' +
+                this.getResultStringNonProgrammingExercise(relativeScore, points, short);
         } else if (isAIResultAndIsBeingProcessed(result)) {
             aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
         } else if (isAIResultAndTimedOut(result)) {
             aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackTimedOut');
         } else if (isAIResultAndProcessed(result)) {
-            if (short) {
-                aiFeedbackMessage = this.translateService.instant(`artemisApp.result.resultString.short`, {
-                    relativeScore,
-                });
-            } else {
-                aiFeedbackMessage = this.translateService.instant(`artemisApp.result.resultString.nonProgramming`, {
-                    relativeScore,
-                    points,
-                });
-            }
+            aiFeedbackMessage = this.getResultStringNonProgrammingExercise(relativeScore, points, short);
         }
         return aiFeedbackMessage + ' (' + this.translateService.instant('artemisApp.result.preliminary') + ')';
     }

From 3de99f02f965a1975946cf481d1a2c1bed231742 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 11:48:08 +0200
Subject: [PATCH 19/99] set ai feedback for text to graded

---
 .../artemis/service/TextExerciseFeedbackService.java     | 4 ++--
 .../webapp/app/exercises/shared/result/result.service.ts | 9 ++-------
 .../course-exercise-details.component.html               | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 9a62965b6f48..b13511b6d6ee 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -124,10 +124,10 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
 
         var automaticResult = this.submissionService.saveNewEmptyResult(submission);
         automaticResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA);
-        automaticResult.setRated(false);
+        automaticResult.setRated(true);
         automaticResult.setScore(0.0);
         automaticResult.setSuccessful(null);
-        automaticResult.setCompletionDate(ZonedDateTime.now().plusSeconds(15));
+        // automaticResult.setCompletionDate(ZonedDateTime.now().plusSeconds(30));
         automaticResult = this.resultRepository.save(automaticResult);
 
         // This will create a new submission without results, this is important so that tutor assessment works as it used to.
diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index e6695eefa710..8f7c1a1df328 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -112,16 +112,11 @@ export class ResultService implements IResultService {
      */
     private getResultStringNonProgrammingExerciseWithAIFeedback(result: Result, relativeScore: number, points: number, short: boolean | undefined): string {
         let aiFeedbackMessage: string = '';
-        if (isAIResultAndFailed(result)) {
-            aiFeedbackMessage =
-                this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackFailed') +
-                ' ' +
-                this.getResultStringNonProgrammingExercise(relativeScore, points, short);
-        } else if (isAIResultAndIsBeingProcessed(result)) {
+        if (isAIResultAndIsBeingProcessed(result)) {
             aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
         } else if (isAIResultAndTimedOut(result)) {
             aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackTimedOut');
-        } else if (isAIResultAndProcessed(result)) {
+        } else {
             aiFeedbackMessage = this.getResultStringNonProgrammingExercise(relativeScore, points, short);
         }
         return aiFeedbackMessage + ' (' + this.translateService.instant('artemisApp.result.preliminary') + ')';
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
index 2409b5d0f763..1406eb00af49 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
@@ -109,7 +109,7 @@
             <div class="col flex-grow-1">
                 <!-- EXERCISE ACTIONS END -->
                 <!-- RESULTS START -->
-                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 0) || this.practiceStudentParticipation?.results?.length) {
+                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 1) || this.practiceStudentParticipation?.results?.length) {
                     <div class="row">
                         <div class="row mb-2 mt-2 align-items-baseline d-none d-md-flex">
                             <div class="col-auto">

From 2f995410277e6ed4b8eaa5fa02d12475d25e2184 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 12:06:43 +0200
Subject: [PATCH 20/99] add spinner for ai feedback

---
 .../app/exercises/shared/result/result.component.html       | 6 +++++-
 src/main/webapp/app/exercises/shared/result/result.utils.ts | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.component.html b/src/main/webapp/app/exercises/shared/result/result.component.html
index f335b5b72c0e..18d047584306 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.html
+++ b/src/main/webapp/app/exercises/shared/result/result.component.html
@@ -40,7 +40,11 @@
         @case (ResultTemplateStatus.HAS_RESULT) {
             @if (result) {
                 @if (showIcon) {
-                    <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" size="lg" />
+                    @if (result.successful === undefined) {
+                        <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" animation="spin" size="lg" />
+                    } @else {
+                        <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" size="lg" />
+                    }
                 }
                 <span
                     [class]="textColorClass"
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index bcf426f98c8e..943767a8c5ea 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -10,6 +10,7 @@ import { ProgrammingSubmission } from 'app/entities/programming-submission.model
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
+import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 import { isModelingOrTextOrFileUpload, isParticipationInDueTime, isProgrammingOrQuiz } from 'app/exercises/shared/participation/participation.utils';
 import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
@@ -288,6 +289,9 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
     }
 
     if (resultIsPreliminary(result) && result.participation?.exercise?.type === ExerciseType.TEXT) {
+        if (isAIResultAndIsBeingProcessed(result)) {
+            return faSpinner;
+        }
         return faQuestionCircle;
     }
 

From d1a30f773983e3eb3a2d154d997a2fd9cff98967 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 12:54:30 +0200
Subject: [PATCH 21/99] small improvements

---
 .../exercise-scores/manage-assessment-buttons.component.html  | 4 +---
 src/main/webapp/app/exercises/shared/result/result.utils.ts   | 2 +-
 .../exercise-details/course-exercise-details.component.html   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html b/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
index ad4399e5e02a..614a4d3b4ff3 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/manage-assessment-buttons.component.html
@@ -28,9 +28,7 @@
                         {{
                             'artemisApp.assessment.dashboard.actions.' +
                                 (this.examMode ? 'examCorrectionRound.' : '') +
-                                (!participation.results?.[correctionRound]?.assessmentType ||
-                                participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC ||
-                                participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC_ATHENA
+                                (!participation.results?.[correctionRound]?.assessmentType || participation.results?.[correctionRound]?.assessmentType === AssessmentType.AUTOMATIC
                                     ? 'assess'
                                     : participation.results?.[correctionRound]?.completionDate
                                       ? 'open'
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 943767a8c5ea..57510287a0b6 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -289,7 +289,7 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
     }
 
     if (resultIsPreliminary(result) && result.participation?.exercise?.type === ExerciseType.TEXT) {
-        if (isAIResultAndIsBeingProcessed(result)) {
+        if (result.successful === undefined) {
             return faSpinner;
         }
         return faQuestionCircle;
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
index 1406eb00af49..07fbccb20ec1 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
@@ -109,7 +109,7 @@
             <div class="col flex-grow-1">
                 <!-- EXERCISE ACTIONS END -->
                 <!-- RESULTS START -->
-                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length >= 1) || this.practiceStudentParticipation?.results?.length) {
+                @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length > 1) || this.practiceStudentParticipation?.results?.length) {
                     <div class="row">
                         <div class="row mb-2 mt-2 align-items-baseline d-none d-md-flex">
                             <div class="col-auto">

From b19208044a7885010643d03234dde09138645a92 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 14:07:12 +0200
Subject: [PATCH 22/99] fix rate limit and editor sign when athena results

---
 .../in/www1/artemis/service/TextExerciseFeedbackService.java  | 4 +++-
 .../exercise-details-student-actions.component.ts             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index b13511b6d6ee..9ae92671de56 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -68,7 +68,9 @@ private void checkRateLimitOrThrow(StudentParticipation participation) {
 
         List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
 
-        long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count();
+        // long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count();
+
+        long countOfAthenaResultsInProcessOrSuccessful = athenaResults.size();
 
         long countOfSuccessfulRequests = athenaResults.stream().filter(result -> result.isSuccessful() == Boolean.TRUE).count();
 
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 9623dcdeaba2..8b3cc766fa37 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -162,7 +162,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
         this.gradedParticipation = this.participationService.getSpecificStudentParticipation(studentParticipations, false);
         this.practiceParticipation = this.participationService.getSpecificStudentParticipation(studentParticipations, true);
 
-        this.hasRatedGradedResult = !!this.gradedParticipation?.results?.some((result) => result.rated === true);
+        this.hasRatedGradedResult = !!this.gradedParticipation?.results?.some((result) => result.rated === true && result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA);
     }
 
     /**

From 69a179e8c310dc70e0789923c57aa1c2ce7ae844 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 15:55:54 +0200
Subject: [PATCH 23/99] clean up code

---
 ...exercise-feedback-suggestion-options.component.ts | 12 +++---------
 .../text/participate/text-editor.component.ts        |  7 +++----
 .../exercise-details-student-actions.component.html  |  5 +----
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
index 10425250ae3f..a25a5fa0599d 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
@@ -73,19 +73,13 @@ export class ExerciseFeedbackSuggestionOptionsComponent implements OnInit, OnCha
     toggleFeedbackSuggestions(event: any) {
         if (event.target.checked) {
             this.exercise.feedbackSuggestionModule = this.availableAthenaModules.first();
-        } else if (!this.exercise.allowFeedbackRequests) {
+        } else {
             this.exercise.feedbackSuggestionModule = undefined;
         }
     }
-    // this two toggle functions act weirdly together and they should be rewritten
+
     toggleFeedbackRequests(event: any) {
-        if (event.target.checked) {
-            this.exercise.feedbackSuggestionModule = this.availableAthenaModules.first();
-            this.exercise.allowFeedbackRequests = true;
-        } else {
-            this.exercise.feedbackSuggestionModule = undefined;
-            this.exercise.allowFeedbackRequests = false;
-        }
+        this.exercise.allowFeedbackRequests = !!event.target.checked;
     }
 
     private hasDueDatePassed() {
diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
index b7193176fb95..3b9ac80c8f87 100644
--- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
@@ -142,7 +142,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
         this.course = getCourseFromExercise(this.textExercise);
 
         if (participation.submissions?.length) {
-            this.submission = participation.submissions[participation.submissions.length - 1] as TextSubmission;
+            this.submission = participation.submissions.last() as TextSubmission;
             setLatestSubmissionResult(this.submission, getLatestSubmissionResult(this.submission));
             if (this.submission?.results && participation.results && (this.isAfterAssessmentDueDate || this.isAfterPublishDate)) {
                 this.result = this.submission.latestResult!;
@@ -188,8 +188,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
     }
 
     get isAutomaticResult(): boolean {
-        const isAutomatic = this.result?.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
-        return isAutomatic;
+        return this.result?.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
     }
     /**
      * True, if the due date is after the current date, or there is no due date, or the exercise is always active
@@ -290,7 +289,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
 
     /**
      * Stream of submissions being emitted on:
-     * 1. text editor input after a debounce time of  2 seconds
+     * 1. text editor input after a debounce time of 2 seconds
      * 2. manually triggered change on submission (e.g. when submit was clicked)
      */
     private buildSubmissionObservable() {
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index e7997c78272c..48a61608bfe4 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -227,9 +227,6 @@
                         ></button>
                     }
                 </span>
-                <!-- SPECIALTODO : Fix this so that it actually work conditionally rendering-->
-                <!-- @if (athenaEnabled) {  NOTE: exercise.allowFeedbackRequests &&  -->
-
                 @if (
                     (gradedParticipation?.initializationState === InitializationState.INITIALIZED && this.beforeDueDate) ||
                     gradedParticipation?.initializationState === InitializationState.FINISHED
@@ -253,7 +250,7 @@
                         [hideLabelMobile]="false"
                         [routerLink]="['/courses', courseId, 'exercises', exercise.type + '-exercises', exercise.id, 'participate', gradedParticipation!.id]"
                     ></button>
-                    @if (exercise.allowFeedbackRequests && athenaEnabled) {
+                    @if (exercise.allowFeedbackRequests && athenaEnabled && exercise.type === ExerciseType.TEXT) {
                         <button
                             class="btn btn-primary"
                             (click)="requestFeedback()"

From c8f5526deeec78e365df109a98e8a889d30f9585 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 16:24:59 +0200
Subject: [PATCH 24/99] revert last change partially

---
 .../exercise-feedback-suggestion-options.component.ts      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
index a25a5fa0599d..bbb77e388859 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
@@ -79,7 +79,12 @@ export class ExerciseFeedbackSuggestionOptionsComponent implements OnInit, OnCha
     }
 
     toggleFeedbackRequests(event: any) {
-        this.exercise.allowFeedbackRequests = !!event.target.checked;
+        if (event.target.checked) {
+            this.exercise.feedbackSuggestionModule = this.availableAthenaModules.first();
+            this.exercise.allowFeedbackRequests = true;
+        } else {
+            this.exercise.allowFeedbackRequests = false;
+        }
     }
 
     private hasDueDatePassed() {

From f6e5aef03057f449ce9d9e07b3ce72d2789b922b Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 23 Aug 2024 16:44:15 +0200
Subject: [PATCH 25/99] turn off automatic feedback requests if no module
 selected

---
 .../exercise-feedback-suggestion-options.component.ts            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
index bbb77e388859..993b4154c449 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
@@ -74,6 +74,7 @@ export class ExerciseFeedbackSuggestionOptionsComponent implements OnInit, OnCha
         if (event.target.checked) {
             this.exercise.feedbackSuggestionModule = this.availableAthenaModules.first();
         } else {
+            this.exercise.allowFeedbackRequests = false;
             this.exercise.feedbackSuggestionModule = undefined;
         }
     }

From 753c0504ae60a5cbd58a914254f66e1046954aa3 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Tue, 27 Aug 2024 20:25:57 +0200
Subject: [PATCH 26/99] update string for successful and failed athena feedback

---
 .../course-exercise-details.component.ts           | 14 +++++++++++++-
 src/main/webapp/i18n/de/exercise.json              |  2 ++
 src/main/webapp/i18n/en/exercise.json              |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
index 260428c680e3..af9e76e90f3e 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
@@ -249,7 +249,7 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
     private filterUnfinishedResults(participations?: StudentParticipation[]) {
         participations?.forEach((participation: Participation) => {
             if (participation.results) {
-                participation.results = participation.results.filter((result: Result) => result.completionDate);
+                participation.results = participation.results.filter((result: Result) => result.completionDate && result.successful !== undefined);
             }
         });
     }
@@ -313,6 +313,18 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
                     ) {
                         this.alertService.success('artemisApp.exercise.lateSubmissionResultReceived');
                     }
+                    if (
+                        changedParticipation.results?.length! > this.gradedStudentParticipation?.results?.length! &&
+                        changedParticipation.results?.last()!.assessmentType === AssessmentType.AUTOMATIC_ATHENA &&
+                        changedParticipation.results?.last()!.successful !== undefined
+                    ) {
+                        // undefined result success is being used to indicate the the feedback is being processed
+                        if (changedParticipation.results?.last()!.successful) {
+                            this.alertService.success('artemisApp.exercise.athenaFeedbackSuccessful');
+                        } else if (!changedParticipation.results?.last()!.successful) {
+                            this.alertService.error('artemisApp.exercise.athenaFeedbackFailed');
+                        }
+                    }
                     if (this.studentParticipations?.some((participation) => participation.id === changedParticipation.id)) {
                         this.exercise.studentParticipations = this.studentParticipations.map((participation) =>
                             participation.id === changedParticipation.id ? changedParticipation : participation,
diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json
index e198497deaa9..f1da11c84853 100644
--- a/src/main/webapp/i18n/de/exercise.json
+++ b/src/main/webapp/i18n/de/exercise.json
@@ -171,6 +171,8 @@
             "lockRepositoryWarning": "Dein Repository wird gesperrt. Du kannst erst weiterarbeiten wenn deine Feedbackanfrage beantwortet wird.",
             "feedbackRequestAfterDueDate": "Du kannst nach der Abgabefrist keine weiteren Anfragen einreichen.",
             "maxAthenaResultsReached": "Du hast die maximale Anzahl an KI-Feedbackanfragen erreicht.",
+            "athenaFeedbackSuccessful": "AI-Feedback erfolgreich generiert. Klicke auf das Ergenbis, um Details zu sehen.",
+            "athenaFeedbackFailed": "Etwas ist schief gelaufen... KI-Feedback konnte im Moment nicht generiert werden",
             "startError": "<strong>Uh oh! Etwas ist schief gelaufen... Bitte versuch es in wenigen Minuten noch einmal die Aufgabe zu starten.</strong>",
             "name": "Name",
             "studentId": "Login",
diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json
index fbc47e4093dc..cc167b0c65e4 100644
--- a/src/main/webapp/i18n/en/exercise.json
+++ b/src/main/webapp/i18n/en/exercise.json
@@ -171,6 +171,8 @@
             "lockRepositoryWarning": "Your repository will be locked. You can only continue working after you receive an answer.",
             "feedbackRequestAfterDueDate": "You cannot submit feedback requests after the due date.",
             "maxAthenaResultsReached": "You have reached the maximum number of AI feedback requests.",
+            "athenaFeedbackSuccessful": "AI feedback successfully generated. Click on the result to view details.",
+            "athenaFeedbackFailed": "Something went wrong... AI feedback could not be generated at the moment",
             "startError": "<strong>Uh oh! Something went wrong... Please try again to start the exercise in a few minutes.</strong>",
             "name": "Name",
             "studentId": "Login",

From a175663ebd99920957ab34e6d12bb5bdf4c37853 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Tue, 27 Aug 2024 20:31:50 +0200
Subject: [PATCH 27/99] refactor feedback request (Thanks Leon)

---
 .../web/rest/ParticipationResource.java       | 85 +++++++++----------
 1 file changed, 39 insertions(+), 46 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index 09587ccab19d..d7f3b7f60555 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -20,6 +20,7 @@
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 
+import org.apache.velocity.exception.ResourceNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -365,75 +366,67 @@ public ResponseEntity<ProgrammingExerciseStudentParticipation> resumeParticipati
     public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long exerciseId, Principal principal) {
         log.debug("REST request for feedback request: {}", exerciseId);
 
-        // Different approach for text Exercises, default else is programming exercises
-        Optional<TextExercise> textExerciseOpt = textExerciseRepository.findById(exerciseId);
-        if (textExerciseOpt.isPresent()) {
-            return handleTextExerciseFeedbackRequest(textExerciseOpt.get(), principal);
+        Exercise exercise = exerciseRepository.findById(exerciseId).orElseThrow(() -> new ResourceNotFoundException("Exercise not found"));
+
+        if (!(exercise instanceof TextExercise) && !(exercise instanceof ProgrammingExercise)) {
+            throw new BadRequestAlertException("Unsupported exercise type", "participation", "unsupported type");
         }
 
-        var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(exerciseId);
+        return handleExerciseFeedbackRequest(exercise, principal);
+    }
 
-        if (programmingExercise.isExamExercise()) {
+    private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exercise exercise, Principal principal) {
+        // Validate exercise and timing
+        if (exercise.isExamExercise()) {
             throw new BadRequestAlertException("Not intended for the use in exams", "participation", "preconditions not met");
         }
-
-        if (programmingExercise.getDueDate() != null && now().isAfter(programmingExercise.getDueDate())) {
+        if (exercise.getDueDate() != null && now().isAfter(exercise.getDueDate())) {
             throw new BadRequestAlertException("The due date is over", "participation", "preconditions not met");
         }
+        if (exercise instanceof ProgrammingExercise) {
+            ((ProgrammingExercise) exercise).validateSettingsForFeedbackRequest();
+        }
 
-        var participation = programmingExerciseParticipationService.findStudentParticipationByExerciseAndStudentId(programmingExercise, principal.getName());
+        // Get and validate participation
         User user = userRepository.getUserWithGroupsAndAuthorities();
+        StudentParticipation participation = (exercise instanceof ProgrammingExercise)
+                ? programmingExerciseParticipationService.findStudentParticipationByExerciseAndStudentId(exercise, principal.getName())
+                : studentParticipationRepository.findByExerciseIdAndStudentLogin(exercise.getId(), principal.getName())
+                        .orElseThrow(() -> new ResourceNotFoundException("Participation not found"));
 
         checkAccessPermissionOwner(participation, user);
-        programmingExercise.validateSettingsForFeedbackRequest();
+        participation = studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId());
 
-        var studentParticipation = (ProgrammingExerciseStudentParticipation) studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId());
-        var result = studentParticipation.findLatestLegalResult();
-        if (result == null) {
-            throw new BadRequestAlertException("User has not reached the conditions to submit a feedback request", "participation", "preconditions not met");
+        // Check submission requirements
+        if (exercise instanceof TextExercise) {
+            if (submissionRepository.findAllByParticipationId(participation.getId()).isEmpty()) {
+                throw new BadRequestAlertException("You need to submit at least once", "participation", "preconditions not met");
+            }
+        }
+        else if (exercise instanceof ProgrammingExercise) {
+            if (participation.findLatestLegalResult() == null) {
+                throw new BadRequestAlertException("User has not reached the conditions to submit a feedback request", "participation", "preconditions not met");
+            }
         }
 
+        // Check if feedback has already been requested
         var currentDate = now();
         var participationIndividualDueDate = participation.getIndividualDueDate();
         if (participationIndividualDueDate != null && currentDate.isAfter(participationIndividualDueDate)) {
             throw new BadRequestAlertException("Request has already been sent", "participation", "already sent");
         }
 
-        participation = this.programmingExerciseCodeReviewFeedbackService.handleNonGradedFeedbackRequest(exerciseId, studentParticipation, programmingExercise);
-
-        return ResponseEntity.ok().body(participation);
-    }
-
-    private ResponseEntity<StudentParticipation> handleTextExerciseFeedbackRequest(TextExercise textExercise, Principal principal) {
-
-        if (textExercise.isExamExercise()) {
-            throw new BadRequestAlertException("Not intended for the use in exams", "participation", "preconditions not met");
-        }
-
-        if (textExercise.getDueDate() != null && now().isAfter(textExercise.getDueDate())) {
-            throw new BadRequestAlertException("The due date is over", "participation", "preconditions not met");
+        // Process feedback request
+        StudentParticipation updatedParticipation;
+        if (exercise instanceof TextExercise) {
+            updatedParticipation = textExerciseFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(), participation, (TextExercise) exercise);
         }
-
-        var participation = studentParticipationRepository.findByExerciseIdAndStudentLogin(textExercise.getId(), principal.getName()).get();
-        User user = userRepository.getUserWithGroupsAndAuthorities();
-
-        checkAccessPermissionOwner(participation, user);
-
-        var studentParticipation = studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId());
-        var submissions = submissionRepository.findAllByParticipationId(studentParticipation.getId());
-
-        if (submissions.isEmpty()) {
-            throw new BadRequestAlertException("You need to submit at least once", "participation", "preconditions not met");
-        }
-
-        var currentDate = now();
-        var participationIndividualDueDate = participation.getIndividualDueDate();
-        if (participationIndividualDueDate != null && currentDate.isAfter(participationIndividualDueDate)) {
-            throw new BadRequestAlertException("Request has already been sent", "participation", "already sent");
+        else {
+            updatedParticipation = programmingExerciseCodeReviewFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(),
+                    (ProgrammingExerciseStudentParticipation) participation, (ProgrammingExercise) exercise);
         }
-        participation = this.textExerciseFeedbackService.handleNonGradedFeedbackRequest(textExercise.getId(), studentParticipation, textExercise);
 
-        return ResponseEntity.ok().body(participation);
+        return ResponseEntity.ok().body(updatedParticipation);
     }
 
     /**

From 4c97671fe73427164f3807a5a9884f6036142909 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Tue, 27 Aug 2024 20:44:20 +0200
Subject: [PATCH 28/99] show spinner, don't save or show empty or failed athena
 results

---
 .../app/exercises/shared/result/result.component.html | 10 +++++-----
 .../app/exercises/shared/result/result.component.ts   |  2 ++
 .../app/exercises/shared/result/result.service.ts     |  2 +-
 .../app/exercises/shared/result/result.utils.ts       |  2 +-
 .../result-history/result-history.component.ts        | 11 +++++------
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.component.html b/src/main/webapp/app/exercises/shared/result/result.component.html
index 18d047584306..4de14887ed9c 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.html
+++ b/src/main/webapp/app/exercises/shared/result/result.component.html
@@ -38,7 +38,7 @@
             }
         }
         @case (ResultTemplateStatus.HAS_RESULT) {
-            @if (result) {
+            @if (result && !(result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === false)) {
                 @if (showIcon) {
                     @if (result.successful === undefined) {
                         <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" animation="spin" size="lg" />
@@ -49,9 +49,9 @@
                 <span
                     [class]="textColorClass"
                     class="guided-tour result"
-                    [ngClass]="{ 'clickable-result': !isInSidebarCard && exercise?.type !== ExerciseType.QUIZ }"
+                    [ngClass]="{ 'clickable-result': !isInSidebarCard && exercise?.type !== ExerciseType.QUIZ && result.successful !== undefined }"
                     id="result-score"
-                    (click)="!isInSidebarCard ? showDetails(result!) : ''"
+                    (click)="!isInSidebarCard && result.successful !== undefined ? showDetails(result!) : ''"
                 >
                     <span [ngbTooltip]="resultTooltip | artemisTranslate">
                         {{ resultString }}
@@ -61,7 +61,7 @@
                             <fa-icon id="code-issue-warnings-icon" class="result-orange" [icon]="faExclamationTriangle" />
                         </span>
                     }
-                    @if (!isInSidebarCard) {
+                    @if (!isInSidebarCard && !!result!.successful) {
                         <span [ngbTooltip]="result!.completionDate | artemisDate"> ({{ result!.completionDate | artemisTimeAgo }}) </span>
                     }
                 </span>
@@ -73,7 +73,7 @@
                         </a>
                     </span>
                 }
-                @if (showBadge) {
+                @if (showBadge && !!result!.successful) {
                     <span class="badge" [ngClass]="badge.class" id="result-score-badge" ngbTooltip="{{ badge.tooltip | artemisTranslate }}">
                         {{ badge.text | artemisTranslate | uppercase }}
                     </span>
diff --git a/src/main/webapp/app/exercises/shared/result/result.component.ts b/src/main/webapp/app/exercises/shared/result/result.component.ts
index 9bad543faa64..f29e0e3b9e27 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.component.ts
@@ -305,4 +305,6 @@ export class ResultComponent implements OnInit, OnChanges, OnDestroy {
             });
         }
     }
+
+    protected readonly AssessmentType = AssessmentType;
 }
diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index 8f7c1a1df328..116cf0e8c034 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -113,7 +113,7 @@ export class ResultService implements IResultService {
     private getResultStringNonProgrammingExerciseWithAIFeedback(result: Result, relativeScore: number, points: number, short: boolean | undefined): string {
         let aiFeedbackMessage: string = '';
         if (isAIResultAndIsBeingProcessed(result)) {
-            aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
+            return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
         } else if (isAIResultAndTimedOut(result)) {
             aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackTimedOut');
         } else {
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 57510287a0b6..a738fa7c5d32 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -132,7 +132,7 @@ export function isAIResultAndProcessed(result: Result | undefined) {
 }
 
 export function isAIResultAndIsBeingProcessed(result: Result | undefined) {
-    return result && Result.isAthenaAIResult(result) && result.successful === undefined && result.completionDate && dayjs().isSameOrBefore(result.completionDate);
+    return result && Result.isAthenaAIResult(result) && result.successful === undefined; // && result.completionDate && dayjs().isSameOrBefore(result.completionDate
 }
 
 export const evaluateTemplateStatus = (
diff --git a/src/main/webapp/app/overview/result-history/result-history.component.ts b/src/main/webapp/app/overview/result-history/result-history.component.ts
index a467ae593779..02ad9066d4d2 100644
--- a/src/main/webapp/app/overview/result-history/result-history.component.ts
+++ b/src/main/webapp/app/overview/result-history/result-history.component.ts
@@ -2,6 +2,7 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { Result } from 'app/entities/result.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { MissingResultInformation, evaluateTemplateStatus, getResultIconClass, getTextColorClass } from 'app/exercises/shared/result/result.utils';
+import { AssessmentType } from 'app/entities/assessment-type.model';
 
 export const MAX_RESULT_HISTORY_LENGTH = 5;
 
@@ -26,12 +27,10 @@ export class ResultHistoryComponent implements OnChanges {
 
     ngOnChanges(): void {
         this.showPreviousDivider = this.results.length > MAX_RESULT_HISTORY_LENGTH;
-
-        if (this.results.length <= MAX_RESULT_HISTORY_LENGTH) {
-            this.displayedResults = this.results;
-        } else {
-            this.displayedResults = this.results.slice(this.results.length - MAX_RESULT_HISTORY_LENGTH);
-
+        this.displayedResults = this.results.filter((result) => !(result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && !result.successful));
+        const successfulResultsLength = this.displayedResults.length;
+        if (successfulResultsLength > MAX_RESULT_HISTORY_LENGTH) {
+            this.displayedResults = this.displayedResults.slice(successfulResultsLength - MAX_RESULT_HISTORY_LENGTH);
             const lastRatedResult = this.results.filter((result) => result.rated).last();
             if (!this.displayedResults.first()?.rated && lastRatedResult) {
                 this.displayedResults[0] = lastRatedResult;

From 0c4f088b6e0245fc3f22785e3b07dffddf817d5a Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Tue, 27 Aug 2024 20:48:08 +0200
Subject: [PATCH 29/99] dont save emppty result, new method for new submission
 after athena feedback

---
 .../service/TextExerciseFeedbackService.java  | 43 ++++++++++---------
 .../service/TextSubmissionService.java        | 22 ++++++++--
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 9ae92671de56..75cf6fbc8524 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -85,8 +85,7 @@ private void checkRateLimitOrThrow(StudentParticipation participation) {
 
     /**
      * Handles the request for generating feedback for a text exercise.
-     * This method decides whether to generate feedback automatically using Athena,
-     * or notify a tutor to manually process the feedback.
+     * Unlike programming exercises a tutor is not notified if Athena is not available.
      *
      * @param exerciseId    the id of the programming exercise.
      * @param participation the student participation associated with the exercise.
@@ -97,13 +96,8 @@ public StudentParticipation handleNonGradedFeedbackRequest(Long exerciseId, Stud
         if (this.athenaFeedbackSuggestionsService.isPresent()) {
             this.checkRateLimitOrThrow(participation);
             CompletableFuture.runAsync(() -> this.generateAutomaticNonGradedFeedback(participation, textExercise));
-            return participation;
-        }
-        else {
-            log.debug("tutor is responsible to process feedback request: {}", exerciseId);
-            groupNotificationService.notifyTutorGroupAboutNewFeedbackRequest(textExercise);
-            return participation;
         }
+        return participation;
     }
 
     /**
@@ -124,17 +118,13 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
         }
         var submission = submissionOptional.get();
 
-        var automaticResult = this.submissionService.saveNewEmptyResult(submission);
+        Result automaticResult = new Result();
         automaticResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA);
         automaticResult.setRated(true);
         automaticResult.setScore(0.0);
         automaticResult.setSuccessful(null);
-        // automaticResult.setCompletionDate(ZonedDateTime.now().plusSeconds(30));
-        automaticResult = this.resultRepository.save(automaticResult);
-
-        // This will create a new submission without results, this is important so that tutor assessment works as it used to.
-        textSubmissionService.handleTextSubmission((TextSubmission) submission, textExercise, participation.getStudent().get());
-
+        automaticResult.setSubmission(submission);
+        automaticResult.setParticipation(participation);
         try {
             this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
 
@@ -156,21 +146,32 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
             for (Feedback feedback : feedbacks) {
                 totalFeedbacksScore += feedback.getCredits();
             }
-
+            totalFeedbacksScore = totalFeedbacksScore / textExercise.getMaxPoints() * 100;
             automaticResult.setSuccessful(true);
             automaticResult.setCompletionDate(ZonedDateTime.now());
-            automaticResult.setScore(totalFeedbacksScore / textExercise.getMaxPoints() * 100);
+
+            // Limit between 0 and 100%
+            if (totalFeedbacksScore < 0) {
+                automaticResult.setScore(0.0);
+            }
+            else if (totalFeedbacksScore > 100) {
+                totalFeedbacksScore = 100.0;
+            }
+            automaticResult.setScore(totalFeedbacksScore);
+
+            automaticResult = this.resultRepository.save(automaticResult);
             this.resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
-            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+            submissionService.saveNewResult(submission, automaticResult);
 
+            // This will create a new submission without results, this is important so that tutor assessment works as it used to.
+            textSubmissionService.saveNewSubmissionAfterAthenaFeedback((TextSubmission) submission, textExercise, participation.getStudent().get());
+            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
         }
         catch (Exception e) {
             log.error("Could not generate feedback", e);
             automaticResult.setSuccessful(false);
-            automaticResult.setCompletionDate(ZonedDateTime.now());
-            this.resultRepository.save(automaticResult);
+            // Broadcast that something went wrong
             this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
-
         }
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
index c010ff1ff005..c2bdd567cd9e 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
@@ -81,14 +81,28 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
         if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {
             textSubmission.setSubmitted(true);
         }
-        // To ensure that a new submission is created when Athena Feedback is present
-        if (!textSubmission.getResults().isEmpty()) {
-            textSubmission.setId(null);
-        }
+
         textSubmission = save(textSubmission, participation, exercise, user);
         return textSubmission;
     }
 
+    /**
+     *
+     * @param textSubmission The submission to save
+     * @param textExercise   The corresponding text exercise
+     * @param user           The corresponding user
+     * @return the saved text submission
+     */
+    public TextSubmission saveNewSubmissionAfterAthenaFeedback(TextSubmission textSubmission, TextExercise textExercise, User user) {
+        // To ensure that a new submission is created when Athena Feedback is present
+        final var optionalParticipation = participationService.findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyState(textExercise, user.getLogin());
+        if (optionalParticipation.isEmpty()) {
+            throw new ResponseStatusException(HttpStatus.FAILED_DEPENDENCY, "No participation found for " + user.getLogin() + " in exercise " + textExercise.getId());
+        }
+        textSubmission.setId(null);
+        return save(textSubmission, optionalParticipation.get(), textExercise, user);
+    }
+
     /**
      * Saves the given submission. Is used for creating and updating text submissions.
      *

From 7269dcb20a7b9bc6e804a571083f42f165d9e432 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Tue, 27 Aug 2024 23:03:08 +0200
Subject: [PATCH 30/99] Improve error handling and better manage result
 templates

---
 .../service/TextExerciseFeedbackService.java      |  5 ++---
 .../exercises/shared/result/result.component.html | 15 ++++++---------
 .../app/exercises/shared/result/result.service.ts |  4 +---
 .../app/exercises/shared/result/result.utils.ts   |  5 ++++-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 75cf6fbc8524..d3d8816c2be2 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -25,6 +25,7 @@
 import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
+import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
 import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
 @Profile(PROFILE_CORE)
@@ -169,9 +170,7 @@ else if (totalFeedbacksScore > 100) {
         }
         catch (Exception e) {
             log.error("Could not generate feedback", e);
-            automaticResult.setSuccessful(false);
-            // Broadcast that something went wrong
-            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+            throw new InternalServerErrorException("Something went wrong... AI Feedback could not be generated");
         }
     }
 }
diff --git a/src/main/webapp/app/exercises/shared/result/result.component.html b/src/main/webapp/app/exercises/shared/result/result.component.html
index 4de14887ed9c..af511b4a6707 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.html
+++ b/src/main/webapp/app/exercises/shared/result/result.component.html
@@ -21,6 +21,7 @@
         }
         @case (ResultTemplateStatus.IS_GENERATING_FEEDBACK) {
             @if (result) {
+                <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" animation="spin" size="lg" />
                 <span [ngClass]="textColorClass" class="guided-tour result" [class.clickable-result]="false" id="result-score">
                     <span [ngbTooltip]="resultTooltip | artemisTranslate">
                         {{ resultString }}
@@ -38,20 +39,16 @@
             }
         }
         @case (ResultTemplateStatus.HAS_RESULT) {
-            @if (result && !(result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === false)) {
+            @if (result) {
                 @if (showIcon) {
-                    @if (result.successful === undefined) {
-                        <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" animation="spin" size="lg" />
-                    } @else {
-                        <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" size="lg" />
-                    }
+                    <fa-icon class="result-score-icon" [class]="textColorClass" [icon]="resultIconClass" size="lg" />
                 }
                 <span
                     [class]="textColorClass"
                     class="guided-tour result"
-                    [ngClass]="{ 'clickable-result': !isInSidebarCard && exercise?.type !== ExerciseType.QUIZ && result.successful !== undefined }"
+                    [ngClass]="{ 'clickable-result': !isInSidebarCard && exercise?.type !== ExerciseType.QUIZ }"
                     id="result-score"
-                    (click)="!isInSidebarCard && result.successful !== undefined ? showDetails(result!) : ''"
+                    (click)="!isInSidebarCard ? showDetails(result!) : ''"
                 >
                     <span [ngbTooltip]="resultTooltip | artemisTranslate">
                         {{ resultString }}
@@ -73,7 +70,7 @@
                         </a>
                     </span>
                 }
-                @if (showBadge && !!result!.successful) {
+                @if (showBadge) {
                     <span class="badge" [ngClass]="badge.class" id="result-score-badge" ngbTooltip="{{ badge.tooltip | artemisTranslate }}">
                         {{ badge.text | artemisTranslate | uppercase }}
                     </span>
diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index 116cf0e8c034..ef400b83314b 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -112,10 +112,8 @@ export class ResultService implements IResultService {
      */
     private getResultStringNonProgrammingExerciseWithAIFeedback(result: Result, relativeScore: number, points: number, short: boolean | undefined): string {
         let aiFeedbackMessage: string = '';
-        if (isAIResultAndIsBeingProcessed(result)) {
+        if (result && Result.isAthenaAIResult(result) && result.successful === undefined) {
             return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
-        } else if (isAIResultAndTimedOut(result)) {
-            aiFeedbackMessage = this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackTimedOut');
         } else {
             aiFeedbackMessage = this.getResultStringNonProgrammingExercise(relativeScore, points, short);
         }
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index a738fa7c5d32..869cb0b17605 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -132,7 +132,7 @@ export function isAIResultAndProcessed(result: Result | undefined) {
 }
 
 export function isAIResultAndIsBeingProcessed(result: Result | undefined) {
-    return result && Result.isAthenaAIResult(result) && result.successful === undefined; // && result.completionDate && dayjs().isSameOrBefore(result.completionDate
+    return result && Result.isAthenaAIResult(result) && result.successful === undefined && result.completionDate && dayjs().isSameOrBefore(result.completionDate);
 }
 
 export const evaluateTemplateStatus = (
@@ -168,6 +168,9 @@ export const evaluateTemplateStatus = (
             // Submission is in due time of exercise and has a result with score
             if (!assessmentDueDate || assessmentDueDate.isBefore(dayjs()) || !isManualResult(result)) {
                 // the assessment due date has passed (or there was none) (or it is not manual feedback)
+                if (result?.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result?.successful === undefined) {
+                    return ResultTemplateStatus.IS_GENERATING_FEEDBACK;
+                }
                 return ResultTemplateStatus.HAS_RESULT;
             } else {
                 // the assessment period is still active

From f73fad821cfd9c309e3a582826fb5e8a1a4b8173 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 10:02:12 +0200
Subject: [PATCH 31/99] Add integration tests

---
 .../service/TextExerciseFeedbackService.java  |  3 --
 .../ParticipationIntegrationTest.java         | 49 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index d3d8816c2be2..5fb5eea80d9a 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -38,8 +38,6 @@ public class TextExerciseFeedbackService {
 
     private final Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService;
 
-    private final GroupNotificationService groupNotificationService;
-
     private final ResultWebsocketService resultWebsocketService;
 
     private final SubmissionService submissionService;
@@ -55,7 +53,6 @@ public class TextExerciseFeedbackService {
     public TextExerciseFeedbackService(GroupNotificationService groupNotificationService, Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService,
             SubmissionService submissionService, ResultService resultService, ResultRepository resultRepository, StudentParticipationRepository studentParticipationRepository,
             ResultWebsocketService resultWebsocketService, ParticipationService participationService, TextSubmissionService textSubmissionService) {
-        this.groupNotificationService = groupNotificationService;
         this.athenaFeedbackSuggestionsService = athenaFeedbackSuggestionsService;
         this.submissionService = submissionService;
         this.resultService = resultService;
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 9fe056cdf668..7cd8363c946d 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -1,8 +1,10 @@
 package de.tum.in.www1.artemis.participation;
 
 import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST;
+import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;
 import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
@@ -35,6 +37,7 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -94,6 +97,8 @@
 import de.tum.in.www1.artemis.service.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.util.LocalRepository;
 import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO;
+import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
+import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
 class ParticipationIntegrationTest extends AbstractAthenaTest {
 
@@ -156,6 +161,9 @@ class ParticipationIntegrationTest extends AbstractAthenaTest {
     @Value("${artemis.version-control.default-branch:main}")
     private String defaultBranch;
 
+    @SpyBean
+    protected ResultWebsocketService resultWebsocketService;
+
     private Course course;
 
     private ModelingExercise modelingExercise;
@@ -547,9 +555,15 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         this.courseRepository.save(course);
 
         this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST);
+        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
         this.exerciseRepository.save(programmingExercise);
+        this.exerciseRepository.save(textExercise);
 
         athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("programming");
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("text");
+
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, programmingExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
 
         var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise,
                 userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
@@ -568,6 +582,12 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         result2.setCompletionDate(ZonedDateTime.now());
         resultRepository.save(result2);
 
+        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
+        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
+        resultText2.setAssessmentType(AssessmentType.MANUAL);
+        resultText2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultText2);
+
         doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(eq(programmingExercise), any());
         doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any());
 
@@ -582,6 +602,17 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         assertThat(invokedResult.isAthenaAutomatic()).isTrue();
         assertThat(invokedResult.getFeedbacks()).hasSize(1);
 
+        request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
+
+        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(resultCaptor.capture().getParticipation(), any());
+
+        Result invokedTextResult = resultCaptor.getAllValues().get(1);
+        assertThat(invokedTextResult).isNotNull();
+        assertThat(invokedTextResult.getId()).isNotNull();
+        assertThat(invokedTextResult.isSuccessful()).isTrue();
+        assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
+        assertThat(invokedTextResult.getFeedbacks()).hasSize(1);
+
         localRepo.resetLocalRepo();
     }
 
@@ -594,8 +625,14 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         this.courseRepository.save(course);
 
         this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST);
+        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
         this.exerciseRepository.save(programmingExercise);
-        this.athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("programming");
+        this.exerciseRepository.save(textExercise);
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("programming");
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("text");
+
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, programmingExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
 
         var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise,
                 userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
@@ -614,6 +651,16 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         result2.setCompletionDate(ZonedDateTime.now());
         resultRepository.save(result2);
 
+        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
+        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
+        resultText2.setAssessmentType(AssessmentType.MANUAL);
+        resultText2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultText2);
+
+        assertThrows(InternalServerErrorException.class, () -> {
+            request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
+        });
+
         doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(any(), any());
         doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any());
 

From 464dfe8d70d7b7c73bd2715bc979e8d61a8980c4 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 10:12:01 +0200
Subject: [PATCH 32/99] no junit 4

---
 .../artemis/participation/ParticipationIntegrationTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 7cd8363c946d..ee5c98330885 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -4,7 +4,7 @@
 import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;
 import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;

From 560af557469065713dbec85aded5c0e7a8e7957d Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 10:26:20 +0200
Subject: [PATCH 33/99] no assert Throws

---
 .../ParticipationIntegrationTest.java             | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index ee5c98330885..aeb7cb5b02a9 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -4,7 +4,6 @@
 import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;
 import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
@@ -97,7 +96,6 @@
 import de.tum.in.www1.artemis.service.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.util.LocalRepository;
 import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO;
-import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
 import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
 class ParticipationIntegrationTest extends AbstractAthenaTest {
@@ -657,15 +655,9 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         resultText2.setCompletionDate(ZonedDateTime.now());
         resultRepository.save(resultText2);
 
-        assertThrows(InternalServerErrorException.class, () -> {
-            request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
-        });
-
         doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(any(), any());
         doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any());
 
-        request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, ProgrammingExerciseStudentParticipation.class, HttpStatus.OK);
-
         verify(programmingMessagingService, timeout(2000).times(2)).notifyUserAboutNewResult(resultCaptor.capture(), any());
 
         Result invokedResult = resultCaptor.getAllValues().getFirst();
@@ -675,6 +667,13 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         assertThat(invokedResult.isAthenaAutomatic()).isTrue();
         assertThat(invokedResult.getFeedbacks()).hasSize(0);
 
+        request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
+
+        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(resultCaptor.capture().getParticipation(), any());
+
+        Result invokedTextResult = resultCaptor.getAllValues().get(1);
+        assertThat(invokedTextResult).isNull();
+
         localRepo.resetLocalRepo();
     }
 

From 23dd234973d4e4a55e98e68319b250c199a0e132 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 10:47:11 +0200
Subject: [PATCH 34/99] save transient instance in test

---
 .../participation/ParticipationIntegrationTest.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index aeb7cb5b02a9..24b622777346 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -571,6 +571,7 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
 
         participation.setRepositoryUri(ParticipationFactory.getMockFileRepositoryUri(localRepo).getURI().toString());
         participationRepo.save(participation);
+        participationRepo.save(textParticipation);
 
         gitService.getDefaultLocalPathOfRepo(participation.getVcsRepositoryUri());
 
@@ -640,7 +641,7 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
 
         participation.setRepositoryUri(ParticipationFactory.getMockFileRepositoryUri(localRepo).getURI().toString());
         participationRepo.save(participation);
-
+        participationRepo.save(textParticipation);
         gitService.getDefaultLocalPathOfRepo(participation.getVcsRepositoryUri());
 
         Result result1 = participationUtilService.createSubmissionAndResult(participation, 100, false);
@@ -668,11 +669,13 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         assertThat(invokedResult.getFeedbacks()).hasSize(0);
 
         request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
-
-        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(resultCaptor.capture().getParticipation(), any());
+        // only 1 broadcast is done to let the student know that feedback generation was started
+        verify(resultWebsocketService, timeout(2000).times(1)).broadcastNewResult(resultCaptor.capture().getParticipation(), any());
 
         Result invokedTextResult = resultCaptor.getAllValues().get(1);
-        assertThat(invokedTextResult).isNull();
+        assertThat(invokedTextResult).isNotNull();
+        assertThat(invokedResult.isSuccessful()).isNull();
+        assertThat(invokedResult.getFeedbacks()).hasSize(0);
 
         localRepo.resetLocalRepo();
     }

From db0e185ef6da2c628ce12644e648537b3ceef81f Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 11:13:46 +0200
Subject: [PATCH 35/99] use text exercise id for text participation test

---
 .../artemis/participation/ParticipationIntegrationTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 24b622777346..1fc539922417 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -560,7 +560,7 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("programming");
         athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("text");
 
-        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, programmingExercise,
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
                 userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
 
         var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise,
@@ -630,7 +630,7 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("programming");
         athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("text");
 
-        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, programmingExercise,
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
                 userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
 
         var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise,

From 4067400137064aeb2e2a0838661edb530edeb385 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 11:19:07 +0200
Subject: [PATCH 36/99] use text course

---
 .../artemis/participation/ParticipationIntegrationTest.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 1fc539922417..1db3fc5bf0b8 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -549,8 +549,11 @@ void requestFeedbackAlreadySent() throws Exception {
     void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
 
         var course = programmingExercise.getCourseViaExerciseGroupOrCourseMember();
+        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
         course.setRestrictedAthenaModulesAccess(true);
         this.courseRepository.save(course);
+        textCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(textCourse);
 
         this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST);
         this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
@@ -620,8 +623,11 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
     void requestFeedbackSuccess_withAthenaFailure() throws Exception {
 
         var course = programmingExercise.getCourseViaExerciseGroupOrCourseMember();
+        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
         course.setRestrictedAthenaModulesAccess(true);
         this.courseRepository.save(course);
+        textCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(textCourse);
 
         this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST);
         this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);

From d60b3720ff3f385c639d7ccad9ee9b584f9df7d9 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 12:04:09 +0200
Subject: [PATCH 37/99] separate programming and text athena tests

---
 .../ParticipationIntegrationTest.java         | 102 ++++++++++--------
 1 file changed, 59 insertions(+), 43 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 1db3fc5bf0b8..3ec4f9a55bdf 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -549,22 +549,13 @@ void requestFeedbackAlreadySent() throws Exception {
     void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
 
         var course = programmingExercise.getCourseViaExerciseGroupOrCourseMember();
-        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
         course.setRestrictedAthenaModulesAccess(true);
         this.courseRepository.save(course);
-        textCourse.setRestrictedAthenaModulesAccess(true);
-        this.courseRepository.save(textCourse);
 
         this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST);
-        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
         this.exerciseRepository.save(programmingExercise);
-        this.exerciseRepository.save(textExercise);
 
         athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("programming");
-        athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("text");
-
-        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
-                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
 
         var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise,
                 userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
@@ -574,7 +565,6 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
 
         participation.setRepositoryUri(ParticipationFactory.getMockFileRepositoryUri(localRepo).getURI().toString());
         participationRepo.save(participation);
-        participationRepo.save(textParticipation);
 
         gitService.getDefaultLocalPathOfRepo(participation.getVcsRepositoryUri());
 
@@ -584,12 +574,6 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         result2.setCompletionDate(ZonedDateTime.now());
         resultRepository.save(result2);
 
-        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
-        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
-        resultText2.setAssessmentType(AssessmentType.MANUAL);
-        resultText2.setCompletionDate(ZonedDateTime.now());
-        resultRepository.save(resultText2);
-
         doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(eq(programmingExercise), any());
         doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any());
 
@@ -604,18 +588,43 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         assertThat(invokedResult.isAthenaAutomatic()).isTrue();
         assertThat(invokedResult.getFeedbacks()).hasSize(1);
 
+        localRepo.resetLocalRepo();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception {
+
+        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
+        textCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(textCourse);
+
+        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
+        this.exerciseRepository.save(textExercise);
+
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("text");
+
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
+
+        participationRepo.save(textParticipation);
+
+        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
+        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
+        resultText2.setAssessmentType(AssessmentType.MANUAL);
+        resultText2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultText2);
+
         request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
 
-        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(resultCaptor.capture().getParticipation(), any());
+        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(any(), resultCaptor.capture());
 
-        Result invokedTextResult = resultCaptor.getAllValues().get(1);
+        Result invokedTextResult = resultCaptor.getAllValues().getFirst();
         assertThat(invokedTextResult).isNotNull();
         assertThat(invokedTextResult.getId()).isNotNull();
         assertThat(invokedTextResult.isSuccessful()).isTrue();
         assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
         assertThat(invokedTextResult.getFeedbacks()).hasSize(1);
-
-        localRepo.resetLocalRepo();
     }
 
     @Test
@@ -623,21 +632,12 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
     void requestFeedbackSuccess_withAthenaFailure() throws Exception {
 
         var course = programmingExercise.getCourseViaExerciseGroupOrCourseMember();
-        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
         course.setRestrictedAthenaModulesAccess(true);
         this.courseRepository.save(course);
-        textCourse.setRestrictedAthenaModulesAccess(true);
-        this.courseRepository.save(textCourse);
 
         this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST);
-        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
         this.exerciseRepository.save(programmingExercise);
-        this.exerciseRepository.save(textExercise);
         athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("programming");
-        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("text");
-
-        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
-                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
 
         var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise,
                 userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
@@ -647,7 +647,6 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
 
         participation.setRepositoryUri(ParticipationFactory.getMockFileRepositoryUri(localRepo).getURI().toString());
         participationRepo.save(participation);
-        participationRepo.save(textParticipation);
         gitService.getDefaultLocalPathOfRepo(participation.getVcsRepositoryUri());
 
         Result result1 = participationUtilService.createSubmissionAndResult(participation, 100, false);
@@ -656,12 +655,6 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         result2.setCompletionDate(ZonedDateTime.now());
         resultRepository.save(result2);
 
-        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
-        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
-        resultText2.setAssessmentType(AssessmentType.MANUAL);
-        resultText2.setCompletionDate(ZonedDateTime.now());
-        resultRepository.save(resultText2);
-
         doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(any(), any());
         doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any());
 
@@ -674,16 +667,39 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         assertThat(invokedResult.isAthenaAutomatic()).isTrue();
         assertThat(invokedResult.getFeedbacks()).hasSize(0);
 
+        localRepo.resetLocalRepo();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void requestTextFeedbackSuccess_withAthenaFailure() throws Exception {
+
+        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
+        textCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(textCourse);
+
+        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
+        this.exerciseRepository.save(textExercise);
+
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("text");
+
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
+
+        participationRepo.save(textParticipation);
+
+        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
+        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
+        resultText2.setAssessmentType(AssessmentType.MANUAL);
+        resultText2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultText2);
+
         request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
-        // only 1 broadcast is done to let the student know that feedback generation was started
-        verify(resultWebsocketService, timeout(2000).times(1)).broadcastNewResult(resultCaptor.capture().getParticipation(), any());
 
-        Result invokedTextResult = resultCaptor.getAllValues().get(1);
-        assertThat(invokedTextResult).isNotNull();
-        assertThat(invokedResult.isSuccessful()).isNull();
-        assertThat(invokedResult.getFeedbacks()).hasSize(0);
+        verify(resultWebsocketService, timeout(2000).times(1)).broadcastNewResult(any(), resultCaptor.capture());
 
-        localRepo.resetLocalRepo();
+        Result invokedTextResult = resultCaptor.getAllValues().getFirst();
+        assertThat(invokedTextResult).isNotNull();
     }
 
     @Test

From 5dc5b6e40b262ce26559698abc1453e0087cc9b7 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 12:36:27 +0200
Subject: [PATCH 38/99] better tests

---
 .../participation/ParticipationIntegrationTest.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 3ec4f9a55bdf..8dfe4922895f 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -619,7 +619,7 @@ void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception {
 
         verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(any(), resultCaptor.capture());
 
-        Result invokedTextResult = resultCaptor.getAllValues().getFirst();
+        Result invokedTextResult = resultCaptor.getAllValues().get(1);
         assertThat(invokedTextResult).isNotNull();
         assertThat(invokedTextResult.getId()).isNotNull();
         assertThat(invokedTextResult.isSuccessful()).isTrue();
@@ -637,7 +637,7 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
 
         this.programmingExercise.setFeedbackSuggestionModule(ATHENA_MODULE_PROGRAMMING_TEST);
         this.exerciseRepository.save(programmingExercise);
-        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("programming");
+        this.athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("programming");
 
         var participation = ParticipationFactory.generateProgrammingExerciseStudentParticipation(InitializationState.INACTIVE, programmingExercise,
                 userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
@@ -647,6 +647,7 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
 
         participation.setRepositoryUri(ParticipationFactory.getMockFileRepositoryUri(localRepo).getURI().toString());
         participationRepo.save(participation);
+
         gitService.getDefaultLocalPathOfRepo(participation.getVcsRepositoryUri());
 
         Result result1 = participationUtilService.createSubmissionAndResult(participation, 100, false);
@@ -658,6 +659,8 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         doNothing().when(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(any(), any());
         doNothing().when(programmingExerciseParticipationService).unlockStudentRepositoryAndParticipation(any());
 
+        request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, ProgrammingExerciseStudentParticipation.class, HttpStatus.OK);
+
         verify(programmingMessagingService, timeout(2000).times(2)).notifyUserAboutNewResult(resultCaptor.capture(), any());
 
         Result invokedResult = resultCaptor.getAllValues().getFirst();
@@ -700,6 +703,8 @@ void requestTextFeedbackSuccess_withAthenaFailure() throws Exception {
 
         Result invokedTextResult = resultCaptor.getAllValues().getFirst();
         assertThat(invokedTextResult).isNotNull();
+        assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
+        assertThat(invokedTextResult.getFeedbacks()).hasSize(0);
     }
 
     @Test

From 69ab55ee16c4e9c9229d8410de168e1fcfb65e0f Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 12:58:25 +0200
Subject: [PATCH 39/99] fix text case success

---
 .../artemis/participation/ParticipationIntegrationTest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 8dfe4922895f..4a5e03bfd71a 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -609,7 +609,7 @@ void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception {
 
         participationRepo.save(textParticipation);
 
-        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
+        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, true);
         Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
         resultText2.setAssessmentType(AssessmentType.MANUAL);
         resultText2.setCompletionDate(ZonedDateTime.now());
@@ -622,7 +622,6 @@ void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception {
         Result invokedTextResult = resultCaptor.getAllValues().get(1);
         assertThat(invokedTextResult).isNotNull();
         assertThat(invokedTextResult.getId()).isNotNull();
-        assertThat(invokedTextResult.isSuccessful()).isTrue();
         assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
         assertThat(invokedTextResult.getFeedbacks()).hasSize(1);
     }

From a9b224392b84f0011ea0fccb95f5532b16805eae Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 13:55:10 +0200
Subject: [PATCH 40/99] code clean up

---
 .../www1/artemis/service/TextExerciseFeedbackService.java  | 4 +---
 .../in/www1/artemis/web/rest/ParticipationResource.java    | 7 +------
 .../text/assess/text-submission-assessment.component.ts    | 2 +-
 .../exercise-details/course-exercise-details.component.ts  | 4 ++--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 5fb5eea80d9a..8cb70dbdffec 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -66,9 +66,7 @@ private void checkRateLimitOrThrow(StudentParticipation participation) {
 
         List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
 
-        // long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count();
-
-        long countOfAthenaResultsInProcessOrSuccessful = athenaResults.size();
+        long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count();
 
         long countOfSuccessfulRequests = athenaResults.stream().filter(result -> result.isSuccessful() == Boolean.TRUE).count();
 
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index d7f3b7f60555..1cddf6c882f8 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -74,7 +74,6 @@
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository;
 import de.tum.in.www1.artemis.repository.TeamRepository;
-import de.tum.in.www1.artemis.repository.TextExerciseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.Role;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
@@ -124,8 +123,6 @@ public class ParticipationResource {
 
     private final ExerciseRepository exerciseRepository;
 
-    private final TextExerciseRepository textExerciseRepository;
-
     private final ProgrammingExerciseRepository programmingExerciseRepository;
 
     private final CourseRepository courseRepository;
@@ -179,8 +176,7 @@ public ParticipationResource(ParticipationService participationService, Programm
             ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository, SubmissionRepository submissionRepository,
             ResultRepository resultRepository, ExerciseDateService exerciseDateService, InstanceMessageSendService instanceMessageSendService, QuizBatchService quizBatchService,
             SubmittedAnswerRepository submittedAnswerRepository, QuizSubmissionService quizSubmissionService, GradingScaleService gradingScaleService,
-            ProgrammingExerciseCodeReviewFeedbackService programmingExerciseCodeReviewFeedbackService, TextExerciseFeedbackService textExerciseFeedbackService,
-            TextExerciseRepository textExerciseRepository) {
+            ProgrammingExerciseCodeReviewFeedbackService programmingExerciseCodeReviewFeedbackService, TextExerciseFeedbackService textExerciseFeedbackService) {
         this.participationService = participationService;
         this.programmingExerciseParticipationService = programmingExerciseParticipationService;
         this.quizExerciseRepository = quizExerciseRepository;
@@ -207,7 +203,6 @@ public ParticipationResource(ParticipationService participationService, Programm
         this.gradingScaleService = gradingScaleService;
         this.programmingExerciseCodeReviewFeedbackService = programmingExerciseCodeReviewFeedbackService;
         this.textExerciseFeedbackService = textExerciseFeedbackService;
-        this.textExerciseRepository = textExerciseRepository;
     }
 
     /**
diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
index 7fe4e50a3b9a..ec57a258615c 100644
--- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
@@ -187,7 +187,7 @@ export class TextSubmissionAssessmentComponent extends TextAssessmentBaseCompone
         }
 
         this.participation = studentParticipation;
-        this.submission = this.participation!.submissions!.last() as TextSubmission;
+        this.submission = this.participation?.submissions?.last() as TextSubmission;
         this.exercise = this.participation?.exercise as TextExercise;
         this.course = getCourseFromExercise(this.exercise);
         setLatestSubmissionResult(this.submission, getLatestSubmissionResult(this.submission));
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
index af9e76e90f3e..89b791c04358 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
@@ -309,12 +309,12 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
                         hasExerciseDueDatePassed(changedParticipation.exercise, changedParticipation) &&
                         changedParticipation.id === this.gradedStudentParticipation?.id &&
                         // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                        changedParticipation.results?.length! > this.gradedStudentParticipation?.results?.length!
+                        changedParticipation.results?.length! > (this.gradedStudentParticipation?.results?.length || 0)
                     ) {
                         this.alertService.success('artemisApp.exercise.lateSubmissionResultReceived');
                     }
                     if (
-                        changedParticipation.results?.length! > this.gradedStudentParticipation?.results?.length! &&
+                        changedParticipation.results?.length! > (this.gradedStudentParticipation?.results?.length || 0) &&
                         changedParticipation.results?.last()!.assessmentType === AssessmentType.AUTOMATIC_ATHENA &&
                         changedParticipation.results?.last()!.successful !== undefined
                     ) {

From a2c1ecd799f2ccb233fe408652fe63f38a66e6c3 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 14:06:18 +0200
Subject: [PATCH 41/99] more code clean up

---
 .../webapp/app/overview/submission-result-status.component.ts  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/webapp/app/overview/submission-result-status.component.ts b/src/main/webapp/app/overview/submission-result-status.component.ts
index dc52487c927f..5fe0027a5adb 100644
--- a/src/main/webapp/app/overview/submission-result-status.component.ts
+++ b/src/main/webapp/app/overview/submission-result-status.component.ts
@@ -58,9 +58,6 @@ export class SubmissionResultStatusComponent implements OnChanges {
     }
 
     private setShouldShowResult(afterDueDate: boolean) {
-        if (this.exercise.type === ExerciseType.TEXT) {
-            this.showUngradedResults = !!this.exercise.allowFeedbackRequests;
-        }
         if (this.exercise.type === ExerciseType.QUIZ) {
             this.shouldShowResult = !!this.studentParticipation?.results?.length;
         } else if (this.exercise.type === ExerciseType.PROGRAMMING) {

From fca28bc930e1d03e77970f521aebd315b159044d Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 18:18:38 +0200
Subject: [PATCH 42/99] turn athena created submission external and fix
 successful = false bugs

---
 .../artemis/service/TextExerciseFeedbackService.java   | 10 ++--------
 .../in/www1/artemis/service/TextSubmissionService.java |  3 ++-
 .../app/exercises/shared/result/result.component.html  |  2 +-
 .../course-exercise-details.component.ts               |  7 +------
 .../exercise-details-student-actions.component.ts      |  6 ++++++
 .../result-history/result-history.component.ts         |  2 +-
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 8cb70dbdffec..cb170d132cb4 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -66,15 +66,9 @@ private void checkRateLimitOrThrow(StudentParticipation participation) {
 
         List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
 
-        long countOfAthenaResultsInProcessOrSuccessful = athenaResults.stream().filter(result -> result.isSuccessful() == null || result.isSuccessful() == Boolean.TRUE).count();
+        long countOfAthenaResults = athenaResults.size();
 
-        long countOfSuccessfulRequests = athenaResults.stream().filter(result -> result.isSuccessful() == Boolean.TRUE).count();
-
-        // TODO For testing purposes, will be configurable in the future
-        if (countOfAthenaResultsInProcessOrSuccessful >= 10) {
-            throw new BadRequestAlertException("Cannot send additional AI feedback requests now. Try again later!", "participation", "preconditions not met");
-        }
-        if (countOfSuccessfulRequests >= 10) {
+        if (countOfAthenaResults >= 10) {
             throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "preconditions not met");
         }
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
index c2bdd567cd9e..087a21c951aa 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
@@ -81,6 +81,7 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
         if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {
             textSubmission.setSubmitted(true);
         }
+        textSubmission.setType(SubmissionType.MANUAL);
 
         textSubmission = save(textSubmission, participation, exercise, user);
         return textSubmission;
@@ -100,6 +101,7 @@ public TextSubmission saveNewSubmissionAfterAthenaFeedback(TextSubmission textSu
             throw new ResponseStatusException(HttpStatus.FAILED_DEPENDENCY, "No participation found for " + user.getLogin() + " in exercise " + textExercise.getId());
         }
         textSubmission.setId(null);
+        textSubmission.setType(SubmissionType.EXTERNAL);
         return save(textSubmission, optionalParticipation.get(), textExercise, user);
     }
 
@@ -115,7 +117,6 @@ public TextSubmission saveNewSubmissionAfterAthenaFeedback(TextSubmission textSu
     private TextSubmission save(TextSubmission textSubmission, StudentParticipation participation, TextExercise textExercise, User user) {
         // update submission properties
         textSubmission.setSubmissionDate(ZonedDateTime.now());
-        textSubmission.setType(SubmissionType.MANUAL);
         participation.addSubmission(textSubmission);
 
         if (participation.getInitializationState() != InitializationState.FINISHED) {
diff --git a/src/main/webapp/app/exercises/shared/result/result.component.html b/src/main/webapp/app/exercises/shared/result/result.component.html
index af511b4a6707..5bf1dc983916 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.html
+++ b/src/main/webapp/app/exercises/shared/result/result.component.html
@@ -58,7 +58,7 @@
                             <fa-icon id="code-issue-warnings-icon" class="result-orange" [icon]="faExclamationTriangle" />
                         </span>
                     }
-                    @if (!isInSidebarCard && !!result!.successful) {
+                    @if (!isInSidebarCard) {
                         <span [ngbTooltip]="result!.completionDate | artemisDate"> ({{ result!.completionDate | artemisTimeAgo }}) </span>
                     }
                 </span>
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
index 89b791c04358..737aab4502bd 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
@@ -318,12 +318,7 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
                         changedParticipation.results?.last()!.assessmentType === AssessmentType.AUTOMATIC_ATHENA &&
                         changedParticipation.results?.last()!.successful !== undefined
                     ) {
-                        // undefined result success is being used to indicate the the feedback is being processed
-                        if (changedParticipation.results?.last()!.successful) {
-                            this.alertService.success('artemisApp.exercise.athenaFeedbackSuccessful');
-                        } else if (!changedParticipation.results?.last()!.successful) {
-                            this.alertService.error('artemisApp.exercise.athenaFeedbackFailed');
-                        }
+                        this.alertService.success('artemisApp.exercise.athenaFeedbackSuccessful');
                     }
                     if (this.studentParticipations?.some((participation) => participation.id === changedParticipation.id)) {
                         this.exercise.studentParticipations = this.studentParticipations.map((participation) =>
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 8b3cc766fa37..368f0ebe23b5 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -20,6 +20,7 @@ import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { PROFILE_ATHENA, PROFILE_LOCALVC, PROFILE_THEIA } from 'app/app.constants';
 import { AssessmentType } from 'app/entities/assessment-type.model';
+import { SubmissionType } from 'app/entities/submission.model';
 
 @Component({
     selector: 'jhi-exercise-details-student-actions',
@@ -251,6 +252,11 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
                 return;
             }
         }
+
+        if (this.exercise.type === ExerciseType.TEXT && this.gradedParticipation?.submissions!.last()!.type === SubmissionType.EXTERNAL) {
+            this.alertService.info('You have to submit again before receiving new Feedback');
+            return;
+        }
         this.courseExerciseService.requestFeedback(this.exercise.id!).subscribe({
             next: (participation: StudentParticipation) => {
                 if (participation) {
diff --git a/src/main/webapp/app/overview/result-history/result-history.component.ts b/src/main/webapp/app/overview/result-history/result-history.component.ts
index 02ad9066d4d2..ced329587d3f 100644
--- a/src/main/webapp/app/overview/result-history/result-history.component.ts
+++ b/src/main/webapp/app/overview/result-history/result-history.component.ts
@@ -27,7 +27,7 @@ export class ResultHistoryComponent implements OnChanges {
 
     ngOnChanges(): void {
         this.showPreviousDivider = this.results.length > MAX_RESULT_HISTORY_LENGTH;
-        this.displayedResults = this.results.filter((result) => !(result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && !result.successful));
+        this.displayedResults = this.results.filter((result) => result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful !== undefined);
         const successfulResultsLength = this.displayedResults.length;
         if (successfulResultsLength > MAX_RESULT_HISTORY_LENGTH) {
             this.displayedResults = this.displayedResults.slice(successfulResultsLength - MAX_RESULT_HISTORY_LENGTH);

From a684a4877401329640926b51b8c5fd6cc06cb70a Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 19:13:11 +0200
Subject: [PATCH 43/99] address change Request (part 1)

---
 .../in/www1/artemis/service/ParticipationService.java |  4 ++--
 .../artemis/service/TextExerciseFeedbackService.java  | 11 ++---------
 .../www1/artemis/service/TextSubmissionService.java   |  4 ++--
 .../www1/artemis/web/rest/ParticipationResource.java  |  2 +-
 .../exercise-scores/exercise-scores.component.ts      |  2 +-
 .../app/exercises/shared/result/result.component.ts   |  3 +--
 .../app/exercises/shared/result/result.service.ts     |  5 ++---
 .../course-exercise-details.component.ts              |  9 ++++-----
 .../exercise-details-student-actions.component.html   |  2 +-
 .../exercise-details-student-actions.component.ts     |  5 -----
 .../result-history/result-history.component.ts        |  9 ++++++---
 11 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
index 91017b0f55ec..dfaedef8431c 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
@@ -703,10 +703,10 @@ public List<StudentParticipation> findByExerciseAndStudentIdWithEagerSubmissions
      */
     public StudentParticipation findTextExerciseParticipationWithLatestSubmissionAndResult(Long participationId) throws EntityNotFoundException {
         Optional<Participation> participation = participationRepository.findByIdWithLatestSubmissionAndResult(participationId);
-        if (participation.isEmpty() || !(participation.get() instanceof StudentParticipation)) {
+        if (participation.isEmpty() || !(participation.get() instanceof StudentParticipation studentParticipation)) {
             throw new EntityNotFoundException("No text exercise participation found with id " + participationId);
         }
-        return (StudentParticipation) participation.get();
+        return studentParticipation;
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index cb170d132cb4..0494d7310b6e 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -140,17 +140,10 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
             automaticResult.setSuccessful(true);
             automaticResult.setCompletionDate(ZonedDateTime.now());
 
-            // Limit between 0 and 100%
-            if (totalFeedbacksScore < 0) {
-                automaticResult.setScore(0.0);
-            }
-            else if (totalFeedbacksScore > 100) {
-                totalFeedbacksScore = 100.0;
-            }
-            automaticResult.setScore(totalFeedbacksScore);
+            automaticResult.setScore(Math.clamp(totalFeedbacksScore, 0, 100));
 
             automaticResult = this.resultRepository.save(automaticResult);
-            this.resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
+            resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
             submissionService.saveNewResult(submission, automaticResult);
 
             // This will create a new submission without results, this is important so that tutor assessment works as it used to.
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
index 087a21c951aa..85378780dd79 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
@@ -81,7 +81,6 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
         if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {
             textSubmission.setSubmitted(true);
         }
-        textSubmission.setType(SubmissionType.MANUAL);
 
         textSubmission = save(textSubmission, participation, exercise, user);
         return textSubmission;
@@ -96,12 +95,12 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
      */
     public TextSubmission saveNewSubmissionAfterAthenaFeedback(TextSubmission textSubmission, TextExercise textExercise, User user) {
         // To ensure that a new submission is created when Athena Feedback is present
+        // final var optionalParticipation = participationService.findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyStateElseThrow(textExercise, user.getLogin());
         final var optionalParticipation = participationService.findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyState(textExercise, user.getLogin());
         if (optionalParticipation.isEmpty()) {
             throw new ResponseStatusException(HttpStatus.FAILED_DEPENDENCY, "No participation found for " + user.getLogin() + " in exercise " + textExercise.getId());
         }
         textSubmission.setId(null);
-        textSubmission.setType(SubmissionType.EXTERNAL);
         return save(textSubmission, optionalParticipation.get(), textExercise, user);
     }
 
@@ -117,6 +116,7 @@ public TextSubmission saveNewSubmissionAfterAthenaFeedback(TextSubmission textSu
     private TextSubmission save(TextSubmission textSubmission, StudentParticipation participation, TextExercise textExercise, User user) {
         // update submission properties
         textSubmission.setSubmissionDate(ZonedDateTime.now());
+        textSubmission.setType(SubmissionType.MANUAL);
         participation.addSubmission(textSubmission);
 
         if (participation.getInitializationState() != InitializationState.FINISHED) {
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index 1cddf6c882f8..8e5654e315d7 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -361,7 +361,7 @@ public ResponseEntity<ProgrammingExerciseStudentParticipation> resumeParticipati
     public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long exerciseId, Principal principal) {
         log.debug("REST request for feedback request: {}", exerciseId);
 
-        Exercise exercise = exerciseRepository.findById(exerciseId).orElseThrow(() -> new ResourceNotFoundException("Exercise not found"));
+        Exercise exercise = exerciseRepository.findByIdElseThrow(exerciseId);
 
         if (!(exercise instanceof TextExercise) && !(exercise instanceof ProgrammingExercise)) {
             throw new BadRequestAlertException("Unsupported exercise type", "participation", "unsupported type");
diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
index 3d878cbd18b4..4e1367c67812 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
@@ -173,7 +173,7 @@ export class ExerciseScoresComponent implements OnInit, OnDestroy {
             participation.results?.sort((result1, result2) => (result1.id ?? 0) - (result2.id ?? 0));
 
             const resultsWithoutAthena = participation.results?.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA);
-            if (resultsWithoutAthena && resultsWithoutAthena?.length != 0) {
+            if (resultsWithoutAthena?.length != 0) {
                 if (resultsWithoutAthena?.[0].submission) {
                     participation.submissions = [resultsWithoutAthena?.[0].submission];
                 } else if (participation.results?.[0].submission) {
diff --git a/src/main/webapp/app/exercises/shared/result/result.component.ts b/src/main/webapp/app/exercises/shared/result/result.component.ts
index f29e0e3b9e27..15bf4ae99295 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.component.ts
@@ -43,6 +43,7 @@ export class ResultComponent implements OnInit, OnChanges, OnDestroy {
     readonly ExerciseType = ExerciseType;
     readonly roundScoreSpecifiedByCourseSettings = roundValueSpecifiedByCourseSettings;
     readonly getCourseFromExercise = getCourseFromExercise;
+    protected readonly AssessmentType = AssessmentType;
 
     @Input() participation: Participation;
     @Input() isBuilding: boolean;
@@ -305,6 +306,4 @@ export class ResultComponent implements OnInit, OnChanges, OnDestroy {
             });
         }
     }
-
-    protected readonly AssessmentType = AssessmentType;
 }
diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index ef400b83314b..dc4859ec4ef0 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -114,10 +114,9 @@ export class ResultService implements IResultService {
         let aiFeedbackMessage: string = '';
         if (result && Result.isAthenaAIResult(result) && result.successful === undefined) {
             return this.translateService.instant('artemisApp.result.resultString.automaticAIFeedbackInProgress');
-        } else {
-            aiFeedbackMessage = this.getResultStringNonProgrammingExercise(relativeScore, points, short);
         }
-        return aiFeedbackMessage + ' (' + this.translateService.instant('artemisApp.result.preliminary') + ')';
+        aiFeedbackMessage = this.getResultStringNonProgrammingExercise(relativeScore, points, short);
+        return `${aiFeedbackMessage} (${this.translateService.instant('artemisApp.result.preliminary')})`;
     }
 
     /**
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
index 737aab4502bd..ebb8229290fd 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
@@ -308,15 +308,14 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
                         changedParticipation.exercise?.dueDate &&
                         hasExerciseDueDatePassed(changedParticipation.exercise, changedParticipation) &&
                         changedParticipation.id === this.gradedStudentParticipation?.id &&
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                        changedParticipation.results?.length! > (this.gradedStudentParticipation?.results?.length || 0)
+                        (changedParticipation.results?.length || 0) > (this.gradedStudentParticipation?.results?.length || 0)
                     ) {
                         this.alertService.success('artemisApp.exercise.lateSubmissionResultReceived');
                     }
                     if (
-                        changedParticipation.results?.length! > (this.gradedStudentParticipation?.results?.length || 0) &&
-                        changedParticipation.results?.last()!.assessmentType === AssessmentType.AUTOMATIC_ATHENA &&
-                        changedParticipation.results?.last()!.successful !== undefined
+                        (changedParticipation.results?.length || 0) > (this.gradedStudentParticipation?.results?.length || 0) &&
+                        changedParticipation.results?.last()?.assessmentType === AssessmentType.AUTOMATIC_ATHENA &&
+                        changedParticipation.results?.last()?.successful !== undefined
                     ) {
                         this.alertService.success('artemisApp.exercise.athenaFeedbackSuccessful');
                     }
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index 48a61608bfe4..48efef2148ec 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -260,7 +260,7 @@
                             [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate"
                         >
                             <fa-icon [icon]="faPenSquare" [fixedWidth]="true" />
-                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback">Send automatic feedback request</span>
+                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback"></span>
                         </button>
                     }
                 }
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 368f0ebe23b5..b1d0d9c04604 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -20,7 +20,6 @@ import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { PROFILE_ATHENA, PROFILE_LOCALVC, PROFILE_THEIA } from 'app/app.constants';
 import { AssessmentType } from 'app/entities/assessment-type.model';
-import { SubmissionType } from 'app/entities/submission.model';
 
 @Component({
     selector: 'jhi-exercise-details-student-actions',
@@ -253,10 +252,6 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
             }
         }
 
-        if (this.exercise.type === ExerciseType.TEXT && this.gradedParticipation?.submissions!.last()!.type === SubmissionType.EXTERNAL) {
-            this.alertService.info('You have to submit again before receiving new Feedback');
-            return;
-        }
         this.courseExerciseService.requestFeedback(this.exercise.id!).subscribe({
             next: (participation: StudentParticipation) => {
                 if (participation) {
diff --git a/src/main/webapp/app/overview/result-history/result-history.component.ts b/src/main/webapp/app/overview/result-history/result-history.component.ts
index ced329587d3f..14788b3a20be 100644
--- a/src/main/webapp/app/overview/result-history/result-history.component.ts
+++ b/src/main/webapp/app/overview/result-history/result-history.component.ts
@@ -1,8 +1,7 @@
 import { Component, Input, OnChanges } from '@angular/core';
 import { Result } from 'app/entities/result.model';
-import { Exercise } from 'app/entities/exercise.model';
+import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { MissingResultInformation, evaluateTemplateStatus, getResultIconClass, getTextColorClass } from 'app/exercises/shared/result/result.utils';
-import { AssessmentType } from 'app/entities/assessment-type.model';
 
 export const MAX_RESULT_HISTORY_LENGTH = 5;
 
@@ -27,7 +26,11 @@ export class ResultHistoryComponent implements OnChanges {
 
     ngOnChanges(): void {
         this.showPreviousDivider = this.results.length > MAX_RESULT_HISTORY_LENGTH;
-        this.displayedResults = this.results.filter((result) => result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful !== undefined);
+        if (this.exercise.type === ExerciseType.TEXT) {
+            this.displayedResults = this.results.filter((result) => result.successful !== undefined);
+        } else {
+            this.displayedResults = this.results;
+        }
         const successfulResultsLength = this.displayedResults.length;
         if (successfulResultsLength > MAX_RESULT_HISTORY_LENGTH) {
             this.displayedResults = this.displayedResults.slice(successfulResultsLength - MAX_RESULT_HISTORY_LENGTH);

From ce056ff268d5eaed2f715309f4140195f22082d9 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Wed, 28 Aug 2024 19:25:01 +0200
Subject: [PATCH 44/99] optional chain

---
 .../app/overview/result-history/result-history.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/app/overview/result-history/result-history.component.ts b/src/main/webapp/app/overview/result-history/result-history.component.ts
index 14788b3a20be..1fd9fa81a100 100644
--- a/src/main/webapp/app/overview/result-history/result-history.component.ts
+++ b/src/main/webapp/app/overview/result-history/result-history.component.ts
@@ -26,7 +26,7 @@ export class ResultHistoryComponent implements OnChanges {
 
     ngOnChanges(): void {
         this.showPreviousDivider = this.results.length > MAX_RESULT_HISTORY_LENGTH;
-        if (this.exercise.type === ExerciseType.TEXT) {
+        if (this.exercise?.type === ExerciseType.TEXT) {
             this.displayedResults = this.results.filter((result) => result.successful !== undefined);
         } else {
             this.displayedResults = this.results;

From 9de3a3f7d55dad21c06bf0d1986ab1cddfe159bb Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 00:49:36 +0200
Subject: [PATCH 45/99] disable feedback button when generating and address
 feedback (part 2)

---
 .../artemis/service/ParticipationService.java | 17 ++++++++++++-
 .../service/TextExerciseFeedbackService.java  |  8 +++---
 .../service/TextSubmissionService.java        |  9 ++-----
 .../web/rest/TextExerciseResource.java        |  1 -
 .../exercises/shared/result/result.utils.ts   |  8 ------
 .../course-exercise-details.component.html    |  2 ++
 .../course-exercise-details.component.ts      |  6 ++++-
 ...ise-details-student-actions.component.html |  2 +-
 ...rcise-details-student-actions.component.ts | 25 +++++++++++--------
 9 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
index dfaedef8431c..6e7eb69bf9c2 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
@@ -665,6 +665,21 @@ public Optional<StudentParticipation> findOneByExerciseAndStudentLoginWithEagerS
         return studentParticipationRepository.findWithEagerLegalSubmissionsByExerciseIdAndStudentLogin(exercise.getId(), username);
     }
 
+    /**
+     * Get one participation (in any state) by its student and exercise with eager submissions else throw exception.
+     *
+     * @param exercise the exercise for which to find a participation
+     * @param username the username of the student
+     * @return the participation of the given student and exercise with eager submissions in any state
+     */
+    public StudentParticipation findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyStateElseThrow(Exercise exercise, String username) {
+        Optional<StudentParticipation> optionalParticipation = findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyState(exercise, username);
+        if (optionalParticipation.isEmpty()) {
+            throw new EntityNotFoundException("No participation found in exercise with id " + exercise.getId() + " for user " + username);
+        }
+        return optionalParticipation.get();
+    }
+
     /**
      * Get all exercise participations belonging to exercise and student.
      *
@@ -701,7 +716,7 @@ public List<StudentParticipation> findByExerciseAndStudentIdWithEagerSubmissions
      * @return the participation with latest submission and result
      * @throws EntityNotFoundException
      */
-    public StudentParticipation findTextExerciseParticipationWithLatestSubmissionAndResult(Long participationId) throws EntityNotFoundException {
+    public StudentParticipation findTextExerciseParticipationWithLatestSubmissionAndResultOrElseThrow(Long participationId) throws EntityNotFoundException {
         Optional<Participation> participation = participationRepository.findByIdWithLatestSubmissionAndResult(participationId);
         if (participation.isEmpty() || !(participation.get() instanceof StudentParticipation studentParticipation)) {
             throw new EntityNotFoundException("No text exercise participation found with id " + participationId);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 0494d7310b6e..96af1ef41f85 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -23,7 +23,6 @@
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService;
-import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
 import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
 import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
@@ -50,8 +49,8 @@ public class TextExerciseFeedbackService {
 
     private final TextSubmissionService textSubmissionService;
 
-    public TextExerciseFeedbackService(GroupNotificationService groupNotificationService, Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService,
-            SubmissionService submissionService, ResultService resultService, ResultRepository resultRepository, StudentParticipationRepository studentParticipationRepository,
+    public TextExerciseFeedbackService(Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService, SubmissionService submissionService,
+            ResultService resultService, ResultRepository resultRepository, StudentParticipationRepository studentParticipationRepository,
             ResultWebsocketService resultWebsocketService, ParticipationService participationService, TextSubmissionService textSubmissionService) {
         this.athenaFeedbackSuggestionsService = athenaFeedbackSuggestionsService;
         this.submissionService = submissionService;
@@ -101,7 +100,7 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
         log.debug("Using athena to generate (text exercise) feedback request: {}", textExercise.getId());
 
         // athena takes over the control here
-        var submissionOptional = participationService.findTextExerciseParticipationWithLatestSubmissionAndResult(participation.getId()).findLatestSubmission();
+        var submissionOptional = participationService.findTextExerciseParticipationWithLatestSubmissionAndResultOrElseThrow(participation.getId()).findLatestSubmission();
 
         if (submissionOptional.isEmpty()) {
             throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission");
@@ -145,7 +144,6 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
             automaticResult = this.resultRepository.save(automaticResult);
             resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
             submissionService.saveNewResult(submission, automaticResult);
-
             // This will create a new submission without results, this is important so that tutor assessment works as it used to.
             textSubmissionService.saveNewSubmissionAfterAthenaFeedback((TextSubmission) submission, textExercise, participation.getStudent().get());
             this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
index 85378780dd79..22b53c5ba540 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
@@ -94,14 +94,9 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
      * @return the saved text submission
      */
     public TextSubmission saveNewSubmissionAfterAthenaFeedback(TextSubmission textSubmission, TextExercise textExercise, User user) {
-        // To ensure that a new submission is created when Athena Feedback is present
-        // final var optionalParticipation = participationService.findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyStateElseThrow(textExercise, user.getLogin());
-        final var optionalParticipation = participationService.findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyState(textExercise, user.getLogin());
-        if (optionalParticipation.isEmpty()) {
-            throw new ResponseStatusException(HttpStatus.FAILED_DEPENDENCY, "No participation found for " + user.getLogin() + " in exercise " + textExercise.getId());
-        }
+        final var participation = participationService.findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyStateElseThrow(textExercise, user.getLogin());
         textSubmission.setId(null);
-        return save(textSubmission, optionalParticipation.get(), textExercise, user);
+        return save(textSubmission, participation, textExercise, user);
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java
index 54831cde3b73..cb528fc8e38d 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java
@@ -428,7 +428,6 @@ public ResponseEntity<StudentParticipation> getDataForTextEditor(@PathVariable L
                 textSubmission.setResults(athenaResults);
                 Set<Result> athenaResultsSet = new HashSet<Result>(athenaResults);
                 participation.setResults(athenaResultsSet);
-
             }
 
             Result result = textSubmission.getLatestResult();
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 869cb0b17605..3bdae5417d4a 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -10,7 +10,6 @@ import { ProgrammingSubmission } from 'app/entities/programming-submission.model
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
-import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 import { isModelingOrTextOrFileUpload, isParticipationInDueTime, isProgrammingOrQuiz } from 'app/exercises/shared/participation/participation.utils';
 import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
@@ -291,13 +290,6 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
         return faQuestionCircle;
     }
 
-    if (resultIsPreliminary(result) && result.participation?.exercise?.type === ExerciseType.TEXT) {
-        if (result.successful === undefined) {
-            return faSpinner;
-        }
-        return faQuestionCircle;
-    }
-
     if (isBuildFailedAndResultIsAutomatic(result) || isAIResultAndFailed(result)) {
         return faTimesCircle;
     }
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
index 07fbccb20ec1..b01a29539b80 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
@@ -14,6 +14,8 @@
                 *jhiExtensionPoint="overrideStudentActions; context: { courseId: courseId, exercise: exercise }"
                 [courseId]="courseId"
                 [exercise]="exercise"
+                [isGeneratingFeedback]="isGeneratingFeedback"
+                (generatingFeedback)="this.isGeneratingFeedback = true"
             />
             @if (plagiarismCaseInfo && plagiarismCaseInfo.verdict !== PlagiarismVerdict.NO_PLAGIARISM) {
                 <a class="col-auto btn btn-danger btn-sm me-2" [routerLink]="['/courses', courseId, 'plagiarism-cases', plagiarismCaseInfo.id]">
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
index ebb8229290fd..1e7fffcfa2e7 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
@@ -99,12 +99,12 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
     profileSubscription?: Subscription;
     isProduction = true;
     isTestServer = false;
+    isGeneratingFeedback: boolean = false;
 
     exampleSolutionInfo?: ExampleSolutionInfo;
 
     // extension points, see shared/extension-point
     @ContentChild('overrideStudentActions') overrideStudentActions: TemplateRef<any>;
-
     // Icons
     faBook = faBook;
     faEye = faEye;
@@ -310,6 +310,7 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
                         changedParticipation.id === this.gradedStudentParticipation?.id &&
                         (changedParticipation.results?.length || 0) > (this.gradedStudentParticipation?.results?.length || 0)
                     ) {
+                        this.isGeneratingFeedback = false;
                         this.alertService.success('artemisApp.exercise.lateSubmissionResultReceived');
                     }
                     if (
@@ -317,6 +318,7 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
                         changedParticipation.results?.last()?.assessmentType === AssessmentType.AUTOMATIC_ATHENA &&
                         changedParticipation.results?.last()?.successful !== undefined
                     ) {
+                        this.isGeneratingFeedback = false;
                         this.alertService.success('artemisApp.exercise.athenaFeedbackSuccessful');
                     }
                     if (this.studentParticipations?.some((participation) => participation.id === changedParticipation.id)) {
@@ -449,4 +451,6 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
     changeExampleSolution() {
         this.exampleSolutionCollapsed = !this.exampleSolutionCollapsed;
     }
+
+    setIsGeneratingFeedback() {}
 }
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index 48efef2148ec..9cdfbdaaa4d6 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -255,7 +255,7 @@
                             class="btn btn-primary"
                             (click)="requestFeedback()"
                             [class.btn-sm]="smallButtons"
-                            [disabled]="gradedParticipation?.submissions?.length == 1 && !gradedParticipation!.submissions![0].submitted"
+                            [disabled]="!gradedParticipation?.submissions?.last()?.submitted || isGeneratingFeedback"
                             [id]="'request-feedback-' + exercise.id"
                             [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate"
                         >
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index b1d0d9c04604..3171790565dc 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -1,4 +1,4 @@
-import { Component, ContentChild, HostBinding, Input, OnChanges, OnInit, TemplateRef } from '@angular/core';
+import { Component, ContentChild, EventEmitter, HostBinding, Input, OnChanges, OnInit, Output, TemplateRef } from '@angular/core';
 import { Router } from '@angular/router';
 import { AlertService } from 'app/core/util/alert.service';
 import { ExternalCloningService } from 'app/exercises/programming/shared/service/external-cloning.service';
@@ -39,6 +39,9 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
     @Input() courseId: number;
     @Input() smallButtons: boolean;
     @Input() examMode: boolean;
+    @Input() isGeneratingFeedback: boolean;
+
+    @Output() generatingFeedback = new EventEmitter<void>();
 
     // extension points, see shared/extension-point
     @ContentChild('overrideCodeAndOnlineEditorButton') overrideCodeAndOnlineEditorButton: TemplateRef<any>;
@@ -243,9 +246,8 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
     }
 
     requestFeedback() {
+        if (!this.assureConditionsSatisfied()) return;
         if (this.exercise.type === ExerciseType.PROGRAMMING) {
-            if (!this.assureConditionsSatisfied()) return;
-
             const confirmLockRepository = this.translateService.instant('artemisApp.exercise.lockRepositoryWarning');
             if (!window.confirm(confirmLockRepository)) {
                 return;
@@ -255,6 +257,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
         this.courseExerciseService.requestFeedback(this.exercise.id!).subscribe({
             next: (participation: StudentParticipation) => {
                 if (participation) {
+                    this.generatingFeedback.emit();
                     this.feedbackSent = true;
                     this.alertService.success('artemisApp.exercise.feedbackRequestSent');
                 }
@@ -328,12 +331,14 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
      */
     assureConditionsSatisfied(): boolean {
         this.updateParticipations();
-        const latestResult = this.gradedParticipation?.results && this.gradedParticipation.results.find(({ assessmentType }) => assessmentType === AssessmentType.AUTOMATIC);
-        const someHiddenTestsPassed = latestResult?.score !== undefined;
-        const testsNotPassedWarning = this.translateService.instant('artemisApp.exercise.notEnoughPoints');
-        if (!someHiddenTestsPassed) {
-            window.alert(testsNotPassedWarning);
-            return false;
+        if (this.exercise.type === ExerciseType.PROGRAMMING) {
+            const latestResult = this.gradedParticipation?.results && this.gradedParticipation.results.find(({ assessmentType }) => assessmentType === AssessmentType.AUTOMATIC);
+            const someHiddenTestsPassed = latestResult?.score !== undefined;
+            const testsNotPassedWarning = this.translateService.instant('artemisApp.exercise.notEnoughPoints');
+            if (!someHiddenTestsPassed) {
+                window.alert(testsNotPassedWarning);
+                return false;
+            }
         }
 
         const afterDueDate = !this.exercise.dueDate || dayjs().isSameOrAfter(this.exercise.dueDate);
@@ -354,7 +359,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
             const athenaResults = this.gradedParticipation.results.filter((result) => result.assessmentType === 'AUTOMATIC_ATHENA');
             const countOfSuccessfulRequests = athenaResults.filter((result) => result.successful === true).length;
 
-            if (countOfSuccessfulRequests >= 20) {
+            if (countOfSuccessfulRequests >= 10) {
                 const rateLimitExceededWarning = this.translateService.instant('artemisApp.exercise.maxAthenaResultsReached');
                 window.alert(rateLimitExceededWarning);
                 return false;

From d8f292dff7b725590144ee5407deadd71cca4059 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 01:33:51 +0200
Subject: [PATCH 46/99] bring back the spinner

---
 src/main/webapp/app/exercises/shared/result/result.utils.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 3bdae5417d4a..d5291d539983 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -10,6 +10,7 @@ import { ProgrammingSubmission } from 'app/entities/programming-submission.model
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
+import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 import { isModelingOrTextOrFileUpload, isParticipationInDueTime, isProgrammingOrQuiz } from 'app/exercises/shared/participation/participation.utils';
 import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
@@ -290,6 +291,10 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
         return faQuestionCircle;
     }
 
+    if (resultIsPreliminary(result) && result.successful == undefined) {
+        return faSpinner;
+    }
+
     if (isBuildFailedAndResultIsAutomatic(result) || isAIResultAndFailed(result)) {
         return faTimesCircle;
     }

From 8d5187d73f2797bfef84d7ba938f98b6debc884a Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 02:14:51 +0200
Subject: [PATCH 47/99] better condition for spinner and some client tests

---
 .../app/exercises/shared/result/result.utils.ts       |  2 +-
 .../spec/component/utils/result.utils.spec.ts         | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index d5291d539983..163a7e685204 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -291,7 +291,7 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
         return faQuestionCircle;
     }
 
-    if (resultIsPreliminary(result) && result.successful == undefined) {
+    if (resultIsPreliminary(result) && result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === undefined) {
         return faSpinner;
     }
 
diff --git a/src/test/javascript/spec/component/utils/result.utils.spec.ts b/src/test/javascript/spec/component/utils/result.utils.spec.ts
index 8d5ea1eaeda3..182f7e635893 100644
--- a/src/test/javascript/spec/component/utils/result.utils.spec.ts
+++ b/src/test/javascript/spec/component/utils/result.utils.spec.ts
@@ -12,6 +12,7 @@ import { AssessmentType } from 'app/entities/assessment-type.model';
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
 import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
+import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { Result } from 'app/entities/result.model';
 
@@ -65,6 +66,11 @@ describe('ResultUtils', () => {
             expected: 'text-secondary',
         },
         { result: { score: undefined, successful: true }, templateStatus: ResultTemplateStatus.HAS_RESULT, expected: 'text-success' },
+        {
+            result: { score: undefined, successful: undefined, assessmentType: AssessmentType.AUTOMATIC_ATHENA },
+            templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK,
+            expected: 'text-secondary',
+        },
         { result: { score: undefined, successful: false }, templateStatus: ResultTemplateStatus.HAS_RESULT, expected: 'text-danger' },
         { result: { score: MIN_SCORE_GREEN, testCaseCount: 1 }, templateStatus: ResultTemplateStatus.HAS_RESULT, expected: 'text-success' },
         { result: { score: MIN_SCORE_ORANGE, testCaseCount: 1 }, templateStatus: ResultTemplateStatus.HAS_RESULT, expected: 'result-orange' },
@@ -116,6 +122,11 @@ describe('ResultUtils', () => {
             templateStatus: ResultTemplateStatus.HAS_RESULT,
             expected: faTimesCircle,
         },
+        {
+            result: { feedbacks: [{ type: FeedbackType.AUTOMATIC, text: 'AI result being generated test case' }], assessmentType: AssessmentType.AUTOMATIC_ATHENA },
+            templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK,
+            expected: faSpinner,
+        },
     ])('should correctly determine result icon', ({ result, templateStatus, expected }) => {
         expect(getResultIconClass(result, templateStatus!)).toBe(expected);
     });

From 03c3bd12ec92746bd2848b6bf317e40663f9cc06 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 02:36:11 +0200
Subject: [PATCH 48/99] fix result icon and color

---
 src/main/webapp/app/exercises/shared/result/result.utils.ts   | 4 ++--
 src/test/javascript/spec/component/utils/result.utils.spec.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 163a7e685204..3094a6bd3275 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -247,7 +247,7 @@ export const getTextColorClass = (result: Result | undefined, templateStatus: Re
         return 'text-secondary';
     }
 
-    if (resultIsPreliminary(result) && result.participation?.exercise?.type === ExerciseType.TEXT) {
+    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && reuslt.successful === undefined) {
         return 'text-secondary';
     }
 
@@ -291,7 +291,7 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
         return faQuestionCircle;
     }
 
-    if (resultIsPreliminary(result) && result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === undefined) {
+    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === undefined) {
         return faSpinner;
     }
 
diff --git a/src/test/javascript/spec/component/utils/result.utils.spec.ts b/src/test/javascript/spec/component/utils/result.utils.spec.ts
index 182f7e635893..a1ab8371a163 100644
--- a/src/test/javascript/spec/component/utils/result.utils.spec.ts
+++ b/src/test/javascript/spec/component/utils/result.utils.spec.ts
@@ -67,7 +67,7 @@ describe('ResultUtils', () => {
         },
         { result: { score: undefined, successful: true }, templateStatus: ResultTemplateStatus.HAS_RESULT, expected: 'text-success' },
         {
-            result: { score: undefined, successful: undefined, assessmentType: AssessmentType.AUTOMATIC_ATHENA },
+            result: { score: 0, successful: undefined, assessmentType: AssessmentType.AUTOMATIC_ATHENA },
             templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK,
             expected: 'text-secondary',
         },

From 4b72a4a84e361eb979a268fde1d91feaa1859215 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 02:42:32 +0200
Subject: [PATCH 49/99] typo

---
 src/main/webapp/app/exercises/shared/result/result.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 3094a6bd3275..4ed7bcc17cf2 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -247,7 +247,7 @@ export const getTextColorClass = (result: Result | undefined, templateStatus: Re
         return 'text-secondary';
     }
 
-    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && reuslt.successful === undefined) {
+    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === undefined) {
         return 'text-secondary';
     }
 

From b4dc9db379632d0ab7b6abae6f94c0c0c278bd39 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 13:03:56 +0200
Subject: [PATCH 50/99] back to gray for Athena results

---
 .../webapp/app/exercises/shared/result/result.utils.ts   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 4ed7bcc17cf2..b7628ccd919b 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -247,7 +247,7 @@ export const getTextColorClass = (result: Result | undefined, templateStatus: Re
         return 'text-secondary';
     }
 
-    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === undefined) {
+    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA) {
         return 'text-secondary';
     }
 
@@ -291,8 +291,11 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
         return faQuestionCircle;
     }
 
-    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful === undefined) {
-        return faSpinner;
+    if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA) {
+        if (result.successful === undefined) {
+            return faSpinner;
+        }
+        return faQuestionCircle;
     }
 
     if (isBuildFailedAndResultIsAutomatic(result) || isAIResultAndFailed(result)) {

From fc8c87383a3c148d34d51f2fb0bea55741a240b5 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 13:19:51 +0200
Subject: [PATCH 51/99] more result client tests

---
 .../component/exercises/shared/result.spec.ts | 30 +++++++++++++++++++
 .../spec/component/utils/result.utils.spec.ts | 20 +++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
index 65d663a7dd12..35984944b354 100644
--- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
@@ -23,6 +23,8 @@ import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import dayjs from 'dayjs/esm';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
+import { TextExercise } from 'app/entities/text-exercise.model';
+import { AssessmentType } from 'app/entities/assessment-type.model';
 
 describe('ResultComponent', () => {
     let fixture: ComponentFixture<ResultComponent>;
@@ -47,6 +49,15 @@ describe('ResultComponent', () => {
     };
     const modelingParticipation: StudentParticipation = { id: 4, type: ParticipationType.STUDENT, exercise: modelingExercise };
 
+    const textExercise: TextExercise = {
+        id: 5,
+        type: ExerciseType.TEXT,
+        numberOfAssessmentsOfCorrectionRounds: [],
+        secondCorrectionEnabled: false,
+        studentAssignedTeamIdComputed: false,
+    };
+    const textParticipation: StudentParticipation = { id: 6, type: ParticipationType.STUDENT, exercise: textExercise };
+
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, MockDirective(NgbTooltip)],
@@ -113,6 +124,25 @@ describe('ResultComponent', () => {
         expect(component.templateStatus).toBe(ResultTemplateStatus.HAS_RESULT);
     });
 
+    it('should set (automatic athena) results for text exercise', () => {
+        const submission1: Submission = { id: 1 };
+        const result1: Result = { id: 1, submission: submission1, score: 1, assessmentType: AssessmentType.AUTOMATIC_ATHENA, successful: true };
+        const result2: Result = { id: 2 };
+        const participation1 = cloneDeep(textParticipation);
+        participation1.results = [result1, result2];
+        component.participation = participation1;
+        component.showUngradedResults = true;
+
+        fixture.detectChanges();
+
+        expect(component.result).toEqual(result1);
+        expect(component.result!.participation).toEqual(participation1);
+        expect(component.submission).toEqual(submission1);
+        expect(component.textColorClass).toBe('text-secondary');
+        expect(component.resultIconClass).toEqual(faQuestionCircle);
+        expect(component.resultString).toBe('artemisApp.result.resultString.short (artemisApp.result.preliminary)');
+    });
+
     it.each([
         // never show icon in long format, the text already contains the relevant information
         { short: false, score: MIN_SCORE_ORANGE - 3, codeIssues: 1, iconShown: false },
diff --git a/src/test/javascript/spec/component/utils/result.utils.spec.ts b/src/test/javascript/spec/component/utils/result.utils.spec.ts
index a1ab8371a163..4a80c30831f7 100644
--- a/src/test/javascript/spec/component/utils/result.utils.spec.ts
+++ b/src/test/javascript/spec/component/utils/result.utils.spec.ts
@@ -127,6 +127,26 @@ describe('ResultUtils', () => {
             templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK,
             expected: faSpinner,
         },
+        {
+            result: {
+                feedbacks: [{ type: FeedbackType.AUTOMATIC, text: 'AI result >= 100' }],
+                participation: { type: ParticipationType.STUDENT, exercise: { type: ExerciseType.TEXT } },
+                successful: true,
+                assessmentType: AssessmentType.AUTOMATIC_ATHENA,
+            } as Result,
+            templateStatus: ResultTemplateStatus.HAS_RESULT,
+            expected: faQuestionCircle,
+        },
+        {
+            result: {
+                feedbacks: [{ type: FeedbackType.AUTOMATIC, text: 'AI result < 100' }],
+                participation: { type: ParticipationType.STUDENT, exercise: { type: ExerciseType.TEXT } },
+                successful: false,
+                assessmentType: AssessmentType.AUTOMATIC_ATHENA,
+            } as Result,
+            templateStatus: ResultTemplateStatus.HAS_RESULT,
+            expected: faQuestionCircle,
+        },
     ])('should correctly determine result icon', ({ result, templateStatus, expected }) => {
         expect(getResultIconClass(result, templateStatus!)).toBe(expected);
     });

From f59b2b363a64b1958d34965209e6b12fce8ce7a9 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 14:23:12 +0200
Subject: [PATCH 52/99] result spec ts conflict

---
 .../javascript/spec/component/exercises/shared/result.spec.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
index 35984944b354..ec393787a599 100644
--- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
@@ -23,6 +23,7 @@ import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import dayjs from 'dayjs/esm';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { TextExercise } from 'app/entities/text-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 
@@ -61,7 +62,7 @@ describe('ResultComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, MockDirective(NgbTooltip)],
-            declarations: [ResultComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisTimeAgoPipe), MockPipe(ArtemisDatePipe)],
+            declarations: [ResultComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisTimeAgoPipe), MockPipe(ArtemisDatePipe), MockDirective(TranslateDirective)],
             providers: [
                 { provide: LocalStorageService, useClass: MockSyncStorage },
                 { provide: SessionStorageService, useClass: MockSyncStorage },

From 2099628b8799a1b0f408fd14ac6c361f26411a6f Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 14:39:51 +0200
Subject: [PATCH 53/99] result spec ts conflict

---
 .../component/exercises/shared/result.spec.ts | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
index ec393787a599..3314be02465d 100644
--- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
@@ -24,8 +24,6 @@ import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import dayjs from 'dayjs/esm';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { AssessmentType } from 'app/entities/assessment-type.model';
 
 describe('ResultComponent', () => {
     let fixture: ComponentFixture<ResultComponent>;
@@ -50,15 +48,6 @@ describe('ResultComponent', () => {
     };
     const modelingParticipation: StudentParticipation = { id: 4, type: ParticipationType.STUDENT, exercise: modelingExercise };
 
-    const textExercise: TextExercise = {
-        id: 5,
-        type: ExerciseType.TEXT,
-        numberOfAssessmentsOfCorrectionRounds: [],
-        secondCorrectionEnabled: false,
-        studentAssignedTeamIdComputed: false,
-    };
-    const textParticipation: StudentParticipation = { id: 6, type: ParticipationType.STUDENT, exercise: textExercise };
-
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, MockDirective(NgbTooltip)],
@@ -125,25 +114,6 @@ describe('ResultComponent', () => {
         expect(component.templateStatus).toBe(ResultTemplateStatus.HAS_RESULT);
     });
 
-    it('should set (automatic athena) results for text exercise', () => {
-        const submission1: Submission = { id: 1 };
-        const result1: Result = { id: 1, submission: submission1, score: 1, assessmentType: AssessmentType.AUTOMATIC_ATHENA, successful: true };
-        const result2: Result = { id: 2 };
-        const participation1 = cloneDeep(textParticipation);
-        participation1.results = [result1, result2];
-        component.participation = participation1;
-        component.showUngradedResults = true;
-
-        fixture.detectChanges();
-
-        expect(component.result).toEqual(result1);
-        expect(component.result!.participation).toEqual(participation1);
-        expect(component.submission).toEqual(submission1);
-        expect(component.textColorClass).toBe('text-secondary');
-        expect(component.resultIconClass).toEqual(faQuestionCircle);
-        expect(component.resultString).toBe('artemisApp.result.resultString.short (artemisApp.result.preliminary)');
-    });
-
     it.each([
         // never show icon in long format, the text already contains the relevant information
         { short: false, score: MIN_SCORE_ORANGE - 3, codeIssues: 1, iconShown: false },

From 56982d00ac283426d0b887f1e8597c8f5ef039ef Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 14:52:32 +0200
Subject: [PATCH 54/99] add text athena result tests after conflict resolve

---
 .../component/exercises/shared/result.spec.ts | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
index 3314be02465d..c683821736f5 100644
--- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
@@ -24,6 +24,8 @@ import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import dayjs from 'dayjs/esm';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { TextExercise } from 'app/entities/text-exercise.model';
+import { AssessmentType } from 'app/entities/assessment-type.model';
 
 describe('ResultComponent', () => {
     let fixture: ComponentFixture<ResultComponent>;
@@ -48,6 +50,16 @@ describe('ResultComponent', () => {
     };
     const modelingParticipation: StudentParticipation = { id: 4, type: ParticipationType.STUDENT, exercise: modelingExercise };
 
+    const textExercise: TextExercise = {
+        id: 5,
+        type: ExerciseType.TEXT,
+        numberOfAssessmentsOfCorrectionRounds: [],
+        secondCorrectionEnabled: false,
+        studentAssignedTeamIdComputed: false,
+    };
+
+    const textParticipation: StudentParticipation = { id: 6, type: ParticipationType.STUDENT, exercise: textExercise };
+
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, MockDirective(NgbTooltip)],
@@ -114,6 +126,25 @@ describe('ResultComponent', () => {
         expect(component.templateStatus).toBe(ResultTemplateStatus.HAS_RESULT);
     });
 
+    it('should set (automatic athena) results for text exercise', () => {
+        const submission1: Submission = { id: 1 };
+        const result1: Result = { id: 1, submission: submission1, score: 1, assessmentType: AssessmentType.AUTOMATIC_ATHENA, successful: true };
+        const result2: Result = { id: 2 };
+        const participation1 = cloneDeep(textParticipation);
+        participation1.results = [result1, result2];
+        component.participation = participation1;
+        component.showUngradedResults = true;
+
+        fixture.detectChanges();
+
+        expect(component.result).toEqual(result1);
+        expect(component.result!.participation).toEqual(participation1);
+        expect(component.submission).toEqual(submission1);
+        expect(component.textColorClass).toBe('text-secondary');
+        expect(component.resultIconClass).toEqual(faQuestionCircle);
+        expect(component.resultString).toBe('artemisApp.result.resultString.short (artemisApp.result.preliminary)');
+    });
+
     it.each([
         // never show icon in long format, the text already contains the relevant information
         { short: false, score: MIN_SCORE_ORANGE - 3, codeIssues: 1, iconShown: false },

From 48d56c81f42a606121759a4da6f1de5e40a74540 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Thu, 29 Aug 2024 16:51:39 +0200
Subject: [PATCH 55/99] use notch instead of spinner

---
 .../de/tum/in/www1/artemis/service/ParticipationService.java  | 2 +-
 .../in/www1/artemis/service/TextExerciseFeedbackService.java  | 2 +-
 src/main/webapp/app/exercises/shared/result/result.utils.ts   | 4 ++--
 src/test/javascript/spec/component/utils/result.utils.spec.ts | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
index 6e7eb69bf9c2..23f8b350ca6b 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
@@ -716,7 +716,7 @@ public List<StudentParticipation> findByExerciseAndStudentIdWithEagerSubmissions
      * @return the participation with latest submission and result
      * @throws EntityNotFoundException
      */
-    public StudentParticipation findTextExerciseParticipationWithLatestSubmissionAndResultOrElseThrow(Long participationId) throws EntityNotFoundException {
+    public StudentParticipation findTextExerciseParticipationWithLatestSubmissionAndResultElseThrow(Long participationId) throws EntityNotFoundException {
         Optional<Participation> participation = participationRepository.findByIdWithLatestSubmissionAndResult(participationId);
         if (participation.isEmpty() || !(participation.get() instanceof StudentParticipation studentParticipation)) {
             throw new EntityNotFoundException("No text exercise participation found with id " + participationId);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 96af1ef41f85..a8745022cd69 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -100,7 +100,7 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
         log.debug("Using athena to generate (text exercise) feedback request: {}", textExercise.getId());
 
         // athena takes over the control here
-        var submissionOptional = participationService.findTextExerciseParticipationWithLatestSubmissionAndResultOrElseThrow(participation.getId()).findLatestSubmission();
+        var submissionOptional = participationService.findTextExerciseParticipationWithLatestSubmissionAndResultElseThrow(participation.getId()).findLatestSubmission();
 
         if (submissionOptional.isEmpty()) {
             throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission");
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index b7628ccd919b..0f9b39f507a5 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -10,7 +10,7 @@ import { ProgrammingSubmission } from 'app/entities/programming-submission.model
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
-import { faSpinner } from '@fortawesome/free-solid-svg-icons';
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
 import { isModelingOrTextOrFileUpload, isParticipationInDueTime, isProgrammingOrQuiz } from 'app/exercises/shared/participation/participation.utils';
 import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
@@ -293,7 +293,7 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
 
     if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA) {
         if (result.successful === undefined) {
-            return faSpinner;
+            return faCircleNotch;
         }
         return faQuestionCircle;
     }
diff --git a/src/test/javascript/spec/component/utils/result.utils.spec.ts b/src/test/javascript/spec/component/utils/result.utils.spec.ts
index 4a80c30831f7..83e272a9bc28 100644
--- a/src/test/javascript/spec/component/utils/result.utils.spec.ts
+++ b/src/test/javascript/spec/component/utils/result.utils.spec.ts
@@ -12,7 +12,7 @@ import { AssessmentType } from 'app/entities/assessment-type.model';
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
 import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
-import { faSpinner } from '@fortawesome/free-solid-svg-icons';
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { Result } from 'app/entities/result.model';
 
@@ -125,7 +125,7 @@ describe('ResultUtils', () => {
         {
             result: { feedbacks: [{ type: FeedbackType.AUTOMATIC, text: 'AI result being generated test case' }], assessmentType: AssessmentType.AUTOMATIC_ATHENA },
             templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK,
-            expected: faSpinner,
+            expected: faCircleNotch,
         },
         {
             result: {

From 901eff291632e8b5436c729614a27e151a814f18 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 30 Aug 2024 18:38:39 +0200
Subject: [PATCH 56/99] blue notch, no endless spin in more results, error
 alert from client side

---
 src/main/webapp/app/exercises/shared/result/result.utils.ts  | 5 ++++-
 .../exercise-details/course-exercise-details.component.ts    | 5 ++++-
 .../exercise-details-student-actions.component.ts            | 4 ++--
 .../javascript/spec/component/utils/result.utils.spec.ts     | 5 +++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 0f9b39f507a5..f3f7bc57704e 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -248,11 +248,14 @@ export const getTextColorClass = (result: Result | undefined, templateStatus: Re
     }
 
     if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA) {
+        if (result.successful == undefined) {
+            return 'text-primary';
+        }
         return 'text-secondary';
     }
 
     if (templateStatus === ResultTemplateStatus.LATE) {
-        return 'result-late';
+        return 'late';
     }
 
     if (isBuildFailedAndResultIsAutomatic(result) || isAIResultAndFailed(result)) {
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
index 1e7fffcfa2e7..e68d14c9caf6 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
@@ -257,7 +257,10 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
     sortResults() {
         if (this.studentParticipations?.length) {
             this.studentParticipations.forEach((participation) => participation.results?.sort(this.resultSortFunction));
-            this.sortedHistoryResults = this.studentParticipations.flatMap((participation) => participation.results ?? []).sort(this.resultSortFunction);
+            this.sortedHistoryResults = this.studentParticipations
+                .flatMap((participation) => participation.results ?? [])
+                .sort(this.resultSortFunction)
+                .filter((result) => !(result.assessmentType === AssessmentType.AUTOMATIC_ATHENA && result.successful == undefined));
         }
     }
 
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 3171790565dc..50697e2497d6 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -357,11 +357,11 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
 
         if (this.gradedParticipation?.results) {
             const athenaResults = this.gradedParticipation.results.filter((result) => result.assessmentType === 'AUTOMATIC_ATHENA');
-            const countOfSuccessfulRequests = athenaResults.filter((result) => result.successful === true).length;
+            const countOfSuccessfulRequests = athenaResults.filter((result) => result.successful !== undefined).length;
 
             if (countOfSuccessfulRequests >= 10) {
                 const rateLimitExceededWarning = this.translateService.instant('artemisApp.exercise.maxAthenaResultsReached');
-                window.alert(rateLimitExceededWarning);
+                this.alertService.error(rateLimitExceededWarning);
                 return false;
             }
         }
diff --git a/src/test/javascript/spec/component/utils/result.utils.spec.ts b/src/test/javascript/spec/component/utils/result.utils.spec.ts
index 83e272a9bc28..4796766de234 100644
--- a/src/test/javascript/spec/component/utils/result.utils.spec.ts
+++ b/src/test/javascript/spec/component/utils/result.utils.spec.ts
@@ -69,6 +69,11 @@ describe('ResultUtils', () => {
         {
             result: { score: 0, successful: undefined, assessmentType: AssessmentType.AUTOMATIC_ATHENA },
             templateStatus: ResultTemplateStatus.IS_GENERATING_FEEDBACK,
+            expected: 'text-primary',
+        },
+        {
+            result: { score: 0, successful: true, assessmentType: AssessmentType.AUTOMATIC_ATHENA },
+            templateStatus: ResultTemplateStatus.HAS_RESULT,
             expected: 'text-secondary',
         },
         { result: { score: undefined, successful: false }, templateStatus: ResultTemplateStatus.HAS_RESULT, expected: 'text-danger' },

From 9010ae1a4ef747a583c2f1f4e509285a28df18cc Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 30 Aug 2024 18:48:03 +0200
Subject: [PATCH 57/99] new submission only after student submits if athena
 results present, fix assessment

---
 .../service/TextExerciseFeedbackService.java   |  6 ++----
 .../artemis/service/TextSubmissionService.java | 18 +++++-------------
 .../web/rest/AbstractSubmissionResource.java   |  4 ++++
 .../webapp/app/entities/submission.model.ts    |  7 ++++---
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index a8745022cd69..ced754f61cba 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -76,7 +76,7 @@ private void checkRateLimitOrThrow(StudentParticipation participation) {
      * Handles the request for generating feedback for a text exercise.
      * Unlike programming exercises a tutor is not notified if Athena is not available.
      *
-     * @param exerciseId    the id of the programming exercise.
+     * @param exerciseId    the id of the text exercise.
      * @param participation the student participation associated with the exercise.
      * @param textExercise  the text exercise object.
      * @return StudentParticipation updated text exercise for an AI assessment
@@ -90,7 +90,7 @@ public StudentParticipation handleNonGradedFeedbackRequest(Long exerciseId, Stud
     }
 
     /**
-     * Generates automatic non-graded feedback for a programming exercise submission.
+     * Generates automatic non-graded feedback for a text exercise submission.
      * This method leverages the Athena service to generate feedback based on the latest submission.
      *
      * @param participation the student participation associated with the exercise.
@@ -144,8 +144,6 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
             automaticResult = this.resultRepository.save(automaticResult);
             resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
             submissionService.saveNewResult(submission, automaticResult);
-            // This will create a new submission without results, this is important so that tutor assessment works as it used to.
-            textSubmissionService.saveNewSubmissionAfterAthenaFeedback((TextSubmission) submission, textExercise, participation.getStudent().get());
             this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
         }
         catch (Exception e) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
index 22b53c5ba540..0454c5071b99 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
@@ -82,23 +82,15 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
             textSubmission.setSubmitted(true);
         }
 
+        // if athena results are present than create new submission on submit
+        if (!textSubmission.getResults().isEmpty()) {
+            textSubmission.setId(null);
+        }
+
         textSubmission = save(textSubmission, participation, exercise, user);
         return textSubmission;
     }
 
-    /**
-     *
-     * @param textSubmission The submission to save
-     * @param textExercise   The corresponding text exercise
-     * @param user           The corresponding user
-     * @return the saved text submission
-     */
-    public TextSubmission saveNewSubmissionAfterAthenaFeedback(TextSubmission textSubmission, TextExercise textExercise, User user) {
-        final var participation = participationService.findOneByExerciseAndStudentLoginWithEagerSubmissionsAnyStateElseThrow(textExercise, user.getLogin());
-        textSubmission.setId(null);
-        return save(textSubmission, participation, textExercise, user);
-    }
-
     /**
      * Saves the given submission. Is used for creating and updating text submissions.
      *
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
index cfd5595c9794..504f99e1c1c7 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
@@ -81,6 +81,10 @@ protected ResponseEntity<List<Submission>> getAllSubmissions(Long exerciseId, bo
             if (submission.getParticipation() != null && submission.getParticipation().getExercise() != null) {
                 submission.getParticipation().setExercise(null);
             }
+            // Important for text exercises with Athena results
+            if (assessedByTutor) {
+                submission.setResults(submission.getManualResults());
+            }
         });
 
         return ResponseEntity.ok().body(submissions);
diff --git a/src/main/webapp/app/entities/submission.model.ts b/src/main/webapp/app/entities/submission.model.ts
index ced9e0276d88..7d642d5f4289 100644
--- a/src/main/webapp/app/entities/submission.model.ts
+++ b/src/main/webapp/app/entities/submission.model.ts
@@ -2,6 +2,7 @@ import { BaseEntity } from 'app/shared/model/base-entity';
 import { Participation } from 'app/entities/participation/participation.model';
 import { Result } from 'app/entities/result.model';
 import dayjs from 'dayjs/esm';
+import { AssessmentType } from './assessment-type.model';
 
 export const enum SubmissionType {
     MANUAL = 'MANUAL',
@@ -63,14 +64,14 @@ export function getLatestSubmissionResult(submission: Submission | undefined): R
 
 /**
  * Used to access a submissions result for a specific correctionRound
- *
+ * Athena Results need to be excluded to avoid an assessment being locked by null
  * @param submission
  * @param correctionRound
  * @returns the results or undefined if submission or the result for the requested correctionRound is undefined
  */
 export function getSubmissionResultByCorrectionRound(submission: Submission | undefined, correctionRound: number): Result | undefined {
-    if (submission?.results && submission?.results.length >= correctionRound) {
-        return submission.results[correctionRound];
+    if (submission?.results && submission?.results.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA).length >= correctionRound) {
+        return submission.results.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA)[correctionRound];
     }
     return undefined;
 }

From ce159f4a6f152080077a2cd750c8ed000d7b45ea Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 30 Aug 2024 19:37:58 +0200
Subject: [PATCH 58/99] minor code improvements

---
 .../www1/artemis/service/TextExerciseFeedbackService.java  | 7 +------
 .../tum/in/www1/artemis/service/TextSubmissionService.java | 1 +
 .../www1/artemis/web/rest/AbstractSubmissionResource.java  | 2 +-
 src/main/webapp/app/entities/submission.model.ts           | 6 +++---
 .../webapp/app/exercises/shared/result/result.utils.ts     | 2 +-
 .../exercise-details-student-actions.component.ts          | 4 ++--
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index ced754f61cba..844f3cc20016 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -21,7 +21,6 @@
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.repository.ResultRepository;
-import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
 import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
@@ -47,18 +46,14 @@ public class TextExerciseFeedbackService {
 
     private final ResultRepository resultRepository;
 
-    private final TextSubmissionService textSubmissionService;
-
     public TextExerciseFeedbackService(Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService, SubmissionService submissionService,
-            ResultService resultService, ResultRepository resultRepository, StudentParticipationRepository studentParticipationRepository,
-            ResultWebsocketService resultWebsocketService, ParticipationService participationService, TextSubmissionService textSubmissionService) {
+            ResultService resultService, ResultRepository resultRepository, ResultWebsocketService resultWebsocketService, ParticipationService participationService) {
         this.athenaFeedbackSuggestionsService = athenaFeedbackSuggestionsService;
         this.submissionService = submissionService;
         this.resultService = resultService;
         this.resultRepository = resultRepository;
         this.resultWebsocketService = resultWebsocketService;
         this.participationService = participationService;
-        this.textSubmissionService = textSubmissionService;
     }
 
     private void checkRateLimitOrThrow(StudentParticipation participation) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
index 0454c5071b99..65e28f3db003 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java
@@ -84,6 +84,7 @@ public TextSubmission handleTextSubmission(TextSubmission textSubmission, TextEx
 
         // if athena results are present than create new submission on submit
         if (!textSubmission.getResults().isEmpty()) {
+            log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
             textSubmission.setId(null);
         }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
index 504f99e1c1c7..23a9f9d549c2 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
@@ -82,7 +82,7 @@ protected ResponseEntity<List<Submission>> getAllSubmissions(Long exerciseId, bo
                 submission.getParticipation().setExercise(null);
             }
             // Important for text exercises with Athena results
-            if (assessedByTutor) {
+            if (assessedByTutor && submission.getSubmissionExerciseType().equals("text")) {
                 submission.setResults(submission.getManualResults());
             }
         });
diff --git a/src/main/webapp/app/entities/submission.model.ts b/src/main/webapp/app/entities/submission.model.ts
index 7d642d5f4289..99501466f017 100644
--- a/src/main/webapp/app/entities/submission.model.ts
+++ b/src/main/webapp/app/entities/submission.model.ts
@@ -2,7 +2,6 @@ import { BaseEntity } from 'app/shared/model/base-entity';
 import { Participation } from 'app/entities/participation/participation.model';
 import { Result } from 'app/entities/result.model';
 import dayjs from 'dayjs/esm';
-import { AssessmentType } from './assessment-type.model';
 
 export const enum SubmissionType {
     MANUAL = 'MANUAL',
@@ -70,8 +69,9 @@ export function getLatestSubmissionResult(submission: Submission | undefined): R
  * @returns the results or undefined if submission or the result for the requested correctionRound is undefined
  */
 export function getSubmissionResultByCorrectionRound(submission: Submission | undefined, correctionRound: number): Result | undefined {
-    if (submission?.results && submission?.results.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA).length >= correctionRound) {
-        return submission.results.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA)[correctionRound];
+    const filteredResults = submission?.results?.filter((result) => Result.isAthenaAIResult(result));
+    if (filteredResults && filteredResults.length >= correctionRound) {
+        return filteredResults[correctionRound];
     }
     return undefined;
 }
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index f3f7bc57704e..409dbe53697a 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -255,7 +255,7 @@ export const getTextColorClass = (result: Result | undefined, templateStatus: Re
     }
 
     if (templateStatus === ResultTemplateStatus.LATE) {
-        return 'late';
+        return 'result-late';
     }
 
     if (isBuildFailedAndResultIsAutomatic(result) || isAIResultAndFailed(result)) {
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 50697e2497d6..6e8da78c46d5 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -41,7 +41,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
     @Input() examMode: boolean;
     @Input() isGeneratingFeedback: boolean;
 
-    @Output() generatingFeedback = new EventEmitter<void>();
+    @Output() generatingFeedback: EventEmitter<void> = new EventEmitter<void>();
 
     // extension points, see shared/extension-point
     @ContentChild('overrideCodeAndOnlineEditorButton') overrideCodeAndOnlineEditorButton: TemplateRef<any>;
@@ -357,7 +357,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
 
         if (this.gradedParticipation?.results) {
             const athenaResults = this.gradedParticipation.results.filter((result) => result.assessmentType === 'AUTOMATIC_ATHENA');
-            const countOfSuccessfulRequests = athenaResults.filter((result) => result.successful !== undefined).length;
+            const countOfSuccessfulRequests = athenaResults.length;
 
             if (countOfSuccessfulRequests >= 10) {
                 const rateLimitExceededWarning = this.translateService.instant('artemisApp.exercise.maxAthenaResultsReached');

From 4b0d29fb8304daf4d30eb553198df62ffafa6a8e Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 30 Aug 2024 20:07:40 +0200
Subject: [PATCH 59/99] small bugfix

---
 .../www1/artemis/web/rest/AbstractSubmissionResource.java   | 2 +-
 src/main/webapp/app/entities/submission.model.ts            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
index 23a9f9d549c2..504f99e1c1c7 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
@@ -82,7 +82,7 @@ protected ResponseEntity<List<Submission>> getAllSubmissions(Long exerciseId, bo
                 submission.getParticipation().setExercise(null);
             }
             // Important for text exercises with Athena results
-            if (assessedByTutor && submission.getSubmissionExerciseType().equals("text")) {
+            if (assessedByTutor) {
                 submission.setResults(submission.getManualResults());
             }
         });
diff --git a/src/main/webapp/app/entities/submission.model.ts b/src/main/webapp/app/entities/submission.model.ts
index 99501466f017..3dd3c6039acd 100644
--- a/src/main/webapp/app/entities/submission.model.ts
+++ b/src/main/webapp/app/entities/submission.model.ts
@@ -2,6 +2,7 @@ import { BaseEntity } from 'app/shared/model/base-entity';
 import { Participation } from 'app/entities/participation/participation.model';
 import { Result } from 'app/entities/result.model';
 import dayjs from 'dayjs/esm';
+import { AssessmentType } from 'app/entities/assessment-type.model';
 
 export const enum SubmissionType {
     MANUAL = 'MANUAL',
@@ -69,9 +70,8 @@ export function getLatestSubmissionResult(submission: Submission | undefined): R
  * @returns the results or undefined if submission or the result for the requested correctionRound is undefined
  */
 export function getSubmissionResultByCorrectionRound(submission: Submission | undefined, correctionRound: number): Result | undefined {
-    const filteredResults = submission?.results?.filter((result) => Result.isAthenaAIResult(result));
-    if (filteredResults && filteredResults.length >= correctionRound) {
-        return filteredResults[correctionRound];
+    if (submission?.results && submission?.results.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA).length >= correctionRound) {
+        return submission.results.filter((result) => result.assessmentType !== AssessmentType.AUTOMATIC_ATHENA)[correctionRound];
     }
     return undefined;
 }

From 75f88ac7b7a0e78ceb5ae3a35ac7618c302fd802 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 30 Aug 2024 21:04:44 +0200
Subject: [PATCH 60/99] turn window alerts to alert warning and update tests

---
 ...ercise-details-student-actions.component.ts |  6 +++---
 ...e-details-student-actions.component.spec.ts | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 6e8da78c46d5..8d8e6749506b 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -344,14 +344,14 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
         const afterDueDate = !this.exercise.dueDate || dayjs().isSameOrAfter(this.exercise.dueDate);
         const dueDateWarning = this.translateService.instant('artemisApp.exercise.feedbackRequestAfterDueDate');
         if (afterDueDate) {
-            window.alert(dueDateWarning);
+            this.alertService.warning(dueDateWarning);
             return false;
         }
 
         const requestAlreadySent = (this.gradedParticipation?.individualDueDate && this.gradedParticipation.individualDueDate.isBefore(Date.now())) ?? false;
         const requestAlreadySentWarning = this.translateService.instant('artemisApp.exercise.feedbackRequestAlreadySent');
         if (requestAlreadySent) {
-            window.alert(requestAlreadySentWarning);
+            this.alertService.warning(requestAlreadySentWarning);
             return false;
         }
 
@@ -361,7 +361,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
 
             if (countOfSuccessfulRequests >= 10) {
                 const rateLimitExceededWarning = this.translateService.instant('artemisApp.exercise.maxAthenaResultsReached');
-                this.alertService.error(rateLimitExceededWarning);
+                this.alertService.warning(rateLimitExceededWarning);
                 return false;
             }
         }
diff --git a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
index 9a0a2327c015..1ffeeb8708bd 100644
--- a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
@@ -14,6 +14,7 @@ import { QuizBatch, QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { Team } from 'app/entities/team.model';
 import { TextExercise } from 'app/entities/text-exercise.model';
 import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service';
+import { AlertService } from 'app/core/util/alert.service';
 import { ExerciseDetailsStudentActionsComponent } from 'app/overview/exercise-details/exercise-details-student-actions.component';
 import { CodeButtonComponent } from 'app/shared/components/code-button/code-button.component';
 import { ExerciseActionButtonComponent } from 'app/shared/components/exercise-action-button.component';
@@ -502,7 +503,8 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
     );
 
     it('assureConditionsSatisfied should alert and return false if the feedback request has already been sent', () => {
-        jest.spyOn(window, 'alert').mockImplementation(() => {});
+        const alertService = fixture.debugElement.injector.get(AlertService);
+        const alertServiceSpy = jest.spyOn(alertService, 'warning');
         comp.exercise = {
             type: ExerciseType.PROGRAMMING,
             dueDate: dayjs().add(5, 'minutes'),
@@ -522,12 +524,14 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
 
         const result = comp.assureConditionsSatisfied();
 
-        expect(window.alert).toHaveBeenCalledWith('artemisApp.exercise.feedbackRequestAlreadySent');
+        expect(alertServiceSpy).toHaveBeenCalledOnce();
+        expect(alertServiceSpy).toHaveBeenCalledWith('artemisApp.exercise.feedbackRequestAlreadySent');
         expect(result).toBeFalse();
     });
 
     it('assureConditionsSatisfied should alert and return false if the request is made after the due date', () => {
-        jest.spyOn(window, 'alert').mockImplementation(() => {});
+        const alertService = fixture.debugElement.injector.get(AlertService);
+        const alertServiceSpy = jest.spyOn(alertService, 'warning');
         comp.exercise = {
             type: ExerciseType.PROGRAMMING,
             dueDate: dayjs().subtract(5, 'minutes'),
@@ -546,7 +550,8 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
 
         const result = comp.assureConditionsSatisfied();
 
-        expect(window.alert).toHaveBeenCalledWith('artemisApp.exercise.feedbackRequestAfterDueDate');
+        expect(alertServiceSpy).toHaveBeenCalledOnce();
+        expect(alertServiceSpy).toHaveBeenCalledWith('artemisApp.exercise.feedbackRequestAfterDueDate');
         expect(result).toBeFalse();
     });
 
@@ -573,7 +578,8 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
     });
 
     it('assureConditionsSatisfied should alert and return false if the maximum number of successful Athena results is reached', () => {
-        jest.spyOn(window, 'alert').mockImplementation(() => {});
+        const alertService = fixture.debugElement.injector.get(AlertService);
+        const alertServiceSpy = jest.spyOn(alertService, 'warning');
         const numResults = 20;
         const results: Array<{ assessmentType: AssessmentType; successful: boolean }> = [];
 
@@ -601,7 +607,7 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
 
         const result = comp.assureConditionsSatisfied();
 
-        expect(window.alert).toHaveBeenCalledWith('artemisApp.exercise.maxAthenaResultsReached');
+        expect(alertServiceSpy).toHaveBeenCalledOnce();
         expect(result).toBeFalse();
     });
 

From 5b5554c82bb5c8511e15b02e0b55fe4ac437fdf6 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Sat, 31 Aug 2024 03:33:50 +0200
Subject: [PATCH 61/99] Add check if last submission already has results + test
 + getNonAthenaResults method

---
 .../in/www1/artemis/domain/Submission.java    |  5 ++++
 .../web/rest/AbstractSubmissionResource.java  |  4 +--
 ...rcise-details-student-actions.component.ts | 16 ++++++++++
 src/main/webapp/i18n/de/exercise.json         |  1 +
 src/main/webapp/i18n/en/exercise.json         |  1 +
 ...-details-student-actions.component.spec.ts | 30 +++++++++++++++++++
 6 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java
index 30f4275cc14f..96f23b493ee2 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java
@@ -213,6 +213,11 @@ public List<Result> getManualResults() {
         return results.stream().filter(result -> result != null && !result.isAutomatic() && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
     }
 
+    @JsonIgnore
+    public List<Result> getNonAthenaResults() {
+        return results.stream().filter(result -> result != null && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
+    }
+
     /**
      * Get the manual result by id of the submission
      *
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
index 504f99e1c1c7..21d2324ee4bc 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java
@@ -81,9 +81,9 @@ protected ResponseEntity<List<Submission>> getAllSubmissions(Long exerciseId, bo
             if (submission.getParticipation() != null && submission.getParticipation().getExercise() != null) {
                 submission.getParticipation().setExercise(null);
             }
-            // Important for text exercises with Athena results
+            // Important for exercises with Athena results
             if (assessedByTutor) {
-                submission.setResults(submission.getManualResults());
+                submission.setResults(submission.getNonAthenaResults());
             }
         });
 
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 8d8e6749506b..664888fe980e 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -366,6 +366,22 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
             }
         }
 
+        if (this.hasAthenaResultForlatestSubmission()) {
+            const submitFirstWarning = this.translateService.instant('artemisApp.exercise.submissionAlreadyHasAthenaResult');
+            this.alertService.warning(submitFirstWarning);
+            return false;
+        }
         return true;
     }
+
+    hasAthenaResultForlatestSubmission(): boolean {
+        if (this.gradedParticipation?.submissions && this.gradedParticipation?.results) {
+            // submissions.results is always undefined so this is neccessary
+            return (
+                this.gradedParticipation.submissions.last()?.id ===
+                this.gradedParticipation?.results.filter((result) => result.assessmentType == AssessmentType.AUTOMATIC_ATHENA).first()?.submission?.id
+            );
+        }
+        return false;
+    }
 }
diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json
index f1da11c84853..b7a7b5f1b260 100644
--- a/src/main/webapp/i18n/de/exercise.json
+++ b/src/main/webapp/i18n/de/exercise.json
@@ -173,6 +173,7 @@
             "maxAthenaResultsReached": "Du hast die maximale Anzahl an KI-Feedbackanfragen erreicht.",
             "athenaFeedbackSuccessful": "AI-Feedback erfolgreich generiert. Klicke auf das Ergenbis, um Details zu sehen.",
             "athenaFeedbackFailed": "Etwas ist schief gelaufen... KI-Feedback konnte im Moment nicht generiert werden",
+            "submissionAlreadyHasAthenaResult": "Für diese Abgabe liegt bereits ein KI-Ergebnis vor. Bitte reiche eine neue Abgabe ein, bevor du erneut einreichst.",
             "startError": "<strong>Uh oh! Etwas ist schief gelaufen... Bitte versuch es in wenigen Minuten noch einmal die Aufgabe zu starten.</strong>",
             "name": "Name",
             "studentId": "Login",
diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json
index cc167b0c65e4..9aac2cc65d14 100644
--- a/src/main/webapp/i18n/en/exercise.json
+++ b/src/main/webapp/i18n/en/exercise.json
@@ -173,6 +173,7 @@
             "maxAthenaResultsReached": "You have reached the maximum number of AI feedback requests.",
             "athenaFeedbackSuccessful": "AI feedback successfully generated. Click on the result to view details.",
             "athenaFeedbackFailed": "Something went wrong... AI feedback could not be generated at the moment",
+            "submissionAlreadyHasAthenaResult": "This submission already has an existing AI result. Please submit again before requesting further feedback.",
             "startError": "<strong>Uh oh! Something went wrong... Please try again to start the exercise in a few minutes.</strong>",
             "name": "Name",
             "studentId": "Login",
diff --git a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
index 1ffeeb8708bd..d30958816eb5 100644
--- a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
@@ -35,6 +35,7 @@ import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storag
 import { ArtemisTestModule } from '../../../test.module';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { PROFILE_THEIA } from 'app/app.constants';
+import { Submission } from 'app/entities/submission.model';
 
 describe('ExerciseDetailsStudentActionsComponent', () => {
     let comp: ExerciseDetailsStudentActionsComponent;
@@ -555,6 +556,35 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
         expect(result).toBeFalse();
     });
 
+    it('assureConditionsSatisfied should alert and return false if the latest submission already has athena result', () => {
+        const alertService = fixture.debugElement.injector.get(AlertService);
+        const alertServiceSpy = jest.spyOn(alertService, 'warning');
+        const submission: Submission = { id: 42 };
+        comp.exercise = {
+            type: ExerciseType.TEXT,
+            dueDate: dayjs().add(5, 'minutes'),
+            studentParticipations: [
+                {
+                    id: 2,
+                    results: [
+                        {
+                            assessmentType: AssessmentType.AUTOMATIC_ATHENA,
+                            score: 100,
+                            submission: submission,
+                        },
+                    ],
+                    submissions: [submission],
+                },
+            ] as StudentParticipation[],
+        } as TextExercise;
+
+        const result = comp.assureConditionsSatisfied();
+
+        expect(alertServiceSpy).toHaveBeenCalledOnce();
+        expect(alertServiceSpy).toHaveBeenCalledWith('artemisApp.exercise.submissionAlreadyHasAthenaResult');
+        expect(result).toBeFalse();
+    });
+
     it('assureConditionsSatisfied should return true if all conditions are satisfied', () => {
         comp.exercise = {
             type: ExerciseType.PROGRAMMING,

From 6d2a59426db6592c39f0d9169532a95abd0dfa78 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Mon, 2 Sep 2024 10:27:11 +0700
Subject: [PATCH 62/99] Update server code to also handle AI Feedback for
 Modeling Exercises

---
 .../tum/in/www1/artemis/domain/Exercise.java  |   2 +-
 .../ModelingExerciseFeedbackService.java      | 149 ++++++++++++++++++
 .../service/ModelingSubmissionService.java    |   6 +
 .../artemis/service/ParticipationService.java |   2 +-
 .../service/TextExerciseFeedbackService.java  |   2 +-
 .../web/rest/ParticipationResource.java       |  16 +-
 ...feedback-suggestion-options.component.html |   2 +-
 .../exercises/shared/result/result.utils.ts   |   6 +-
 ...ise-details-student-actions.component.html |   2 +-
 9 files changed, 178 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseFeedbackService.java

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
index ef1d75fde4de..20793cb7104f 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
@@ -605,7 +605,7 @@ public Set<Result> findResultsFilteredForStudents(Participation participation) {
         boolean isAssessmentOver = getAssessmentDueDate() == null || getAssessmentDueDate().isBefore(ZonedDateTime.now());
         if (!isAssessmentOver) {
             // This allows the showing of preliminary feedback in case the assessment due date is set before its over.
-            if (this instanceof TextExercise) {
+            if (this instanceof TextExercise || this instanceof ModelingExercise) {
                 return participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).collect(Collectors.toSet());
             }
             return Set.of();
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseFeedbackService.java
new file mode 100644
index 000000000000..97410ccb725d
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseFeedbackService.java
@@ -0,0 +1,149 @@
+package de.tum.in.www1.artemis.service;
+
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+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.Feedback;
+import de.tum.in.www1.artemis.domain.Result;
+import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
+import de.tum.in.www1.artemis.domain.enumeration.FeedbackType;
+import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
+import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
+import de.tum.in.www1.artemis.domain.participation.Participation;
+import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
+import de.tum.in.www1.artemis.repository.ResultRepository;
+import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService;
+import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
+import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
+import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
+
+@Profile(PROFILE_CORE)
+@Service
+public class ModelingExerciseFeedbackService {
+
+    private static final Logger log = LoggerFactory.getLogger(ModelingExerciseFeedbackService.class);
+
+    public static final String NON_GRADED_FEEDBACK_SUGGESTION = "NonGradedFeedbackSuggestion:";
+
+    private final Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService;
+
+    private final ResultWebsocketService resultWebsocketService;
+
+    private final SubmissionService submissionService;
+
+    private final ParticipationService participationService;
+
+    private final ResultService resultService;
+
+    private final ResultRepository resultRepository;
+
+    public ModelingExerciseFeedbackService(Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService, SubmissionService submissionService,
+            ResultService resultService, ResultRepository resultRepository, ResultWebsocketService resultWebsocketService, ParticipationService participationService) {
+        this.athenaFeedbackSuggestionsService = athenaFeedbackSuggestionsService;
+        this.submissionService = submissionService;
+        this.resultService = resultService;
+        this.resultRepository = resultRepository;
+        this.resultWebsocketService = resultWebsocketService;
+        this.participationService = participationService;
+    }
+
+    private void checkRateLimitOrThrow(StudentParticipation participation) {
+
+        List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
+
+        long countOfAthenaResults = athenaResults.size();
+
+        if (countOfAthenaResults >= 10) {
+            throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "preconditions not met");
+        }
+    }
+
+    /**
+     * Handles the request for generating feedback for a modeling exercise.
+     * Unlike programming exercises a tutor is not notified if Athena is not available.
+     *
+     * @param exerciseId       the id of the modeling exercise.
+     * @param participation    the student participation associated with the exercise.
+     * @param modelingExercise the modeling exercise object.
+     * @return StudentParticipation updated modeling exercise for an AI assessment
+     */
+    public StudentParticipation handleNonGradedFeedbackRequest(Long exerciseId, StudentParticipation participation, ModelingExercise modelingExercise) {
+        if (this.athenaFeedbackSuggestionsService.isPresent()) {
+            this.checkRateLimitOrThrow(participation);
+            CompletableFuture.runAsync(() -> this.generateAutomaticNonGradedFeedback(participation, modelingExercise));
+        }
+        return participation;
+    }
+
+    /**
+     * Generates automatic non-graded feedback for a modeling exercise submission.
+     * This method leverages the Athena service to generate feedback based on the latest submission.
+     *
+     * @param participation    the student participation associated with the exercise.
+     * @param modelingExercise the modeling exercise object.
+     */
+    public void generateAutomaticNonGradedFeedback(StudentParticipation participation, ModelingExercise modelingExercise) {
+        log.debug("Using athena to generate (modeling exercise) feedback request: {}", modelingExercise.getId());
+
+        // athena takes over the control here
+        var submissionOptional = participationService.findExerciseParticipationWithLatestSubmissionAndResultElseThrow(participation.getId()).findLatestSubmission();
+
+        if (submissionOptional.isEmpty()) {
+            throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission");
+        }
+        var submission = submissionOptional.get();
+
+        Result automaticResult = new Result();
+        automaticResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA);
+        automaticResult.setRated(true);
+        automaticResult.setScore(0.0);
+        automaticResult.setSuccessful(null);
+        automaticResult.setSubmission(submission);
+        automaticResult.setParticipation(participation);
+        try {
+            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+
+            log.debug("Submission id: {}", submission.getId());
+
+            var athenaResponse = this.athenaFeedbackSuggestionsService.orElseThrow().getModelingFeedbackSuggestions(modelingExercise, (ModelingSubmission) submission, false);
+
+            List<Feedback> feedbacks = athenaResponse.stream().filter(individualFeedbackItem -> individualFeedbackItem.description() != null).map(individualFeedbackItem -> {
+                var feedback = new Feedback();
+                feedback.setText(individualFeedbackItem.title());
+                feedback.setDetailText(individualFeedbackItem.description());
+                feedback.setHasLongFeedbackText(false);
+                feedback.setType(FeedbackType.AUTOMATIC);
+                feedback.setCredits(individualFeedbackItem.credits());
+                return feedback;
+            }).toList();
+
+            double totalFeedbacksScore = 0.0;
+            for (Feedback feedback : feedbacks) {
+                totalFeedbacksScore += feedback.getCredits();
+            }
+            totalFeedbacksScore = totalFeedbacksScore / modelingExercise.getMaxPoints() * 100;
+            automaticResult.setSuccessful(true);
+            automaticResult.setCompletionDate(ZonedDateTime.now());
+
+            automaticResult.setScore(Math.clamp(totalFeedbacksScore, 0, 100));
+
+            automaticResult = this.resultRepository.save(automaticResult);
+            resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
+            submissionService.saveNewResult(submission, automaticResult);
+            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+        }
+        catch (Exception e) {
+            log.error("Could not generate feedback", e);
+            throw new InternalServerErrorException("Something went wrong... AI Feedback could not be generated");
+        }
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/ModelingSubmissionService.java
index e89471238376..dd64fb7b342a 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ModelingSubmissionService.java
@@ -121,6 +121,12 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu
         // remove result from submission (in the unlikely case it is passed here), so that students cannot inject a result
         modelingSubmission.setResults(new ArrayList<>());
 
+        // if athena results are present than create new submission on submit
+        if (!modelingSubmission.getResults().isEmpty()) {
+            log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
+            modelingSubmission.setId(null);
+        }
+
         // update submission properties
         // NOTE: from now on we always set submitted to true to prevent problems here! Except for late submissions of course exercises to prevent issues in auto-save
         if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
index 23f8b350ca6b..b6204bf0b725 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java
@@ -716,7 +716,7 @@ public List<StudentParticipation> findByExerciseAndStudentIdWithEagerSubmissions
      * @return the participation with latest submission and result
      * @throws EntityNotFoundException
      */
-    public StudentParticipation findTextExerciseParticipationWithLatestSubmissionAndResultElseThrow(Long participationId) throws EntityNotFoundException {
+    public StudentParticipation findExerciseParticipationWithLatestSubmissionAndResultElseThrow(Long participationId) throws EntityNotFoundException {
         Optional<Participation> participation = participationRepository.findByIdWithLatestSubmissionAndResult(participationId);
         if (participation.isEmpty() || !(participation.get() instanceof StudentParticipation studentParticipation)) {
             throw new EntityNotFoundException("No text exercise participation found with id " + participationId);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
index 844f3cc20016..70d5d9d07d47 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java
@@ -95,7 +95,7 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
         log.debug("Using athena to generate (text exercise) feedback request: {}", textExercise.getId());
 
         // athena takes over the control here
-        var submissionOptional = participationService.findTextExerciseParticipationWithLatestSubmissionAndResultElseThrow(participation.getId()).findLatestSubmission();
+        var submissionOptional = participationService.findExerciseParticipationWithLatestSubmissionAndResultElseThrow(participation.getId()).findLatestSubmission();
 
         if (submissionOptional.isEmpty()) {
             throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission");
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index 8e5654e315d7..ce76b13310d3 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -83,6 +83,7 @@
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
 import de.tum.in.www1.artemis.service.ExerciseDateService;
 import de.tum.in.www1.artemis.service.GradingScaleService;
+import de.tum.in.www1.artemis.service.ModelingExerciseFeedbackService;
 import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService;
 import de.tum.in.www1.artemis.service.ParticipationService;
 import de.tum.in.www1.artemis.service.TextExerciseFeedbackService;
@@ -167,6 +168,8 @@ public class ParticipationResource {
 
     private final TextExerciseFeedbackService textExerciseFeedbackService;
 
+    private final ModelingExerciseFeedbackService modelingExerciseFeedbackService;
+
     public ParticipationResource(ParticipationService participationService, ProgrammingExerciseParticipationService programmingExerciseParticipationService,
             CourseRepository courseRepository, QuizExerciseRepository quizExerciseRepository, ExerciseRepository exerciseRepository,
             ProgrammingExerciseRepository programmingExerciseRepository, AuthorizationCheckService authCheckService,
@@ -176,7 +179,8 @@ public ParticipationResource(ParticipationService participationService, Programm
             ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository, SubmissionRepository submissionRepository,
             ResultRepository resultRepository, ExerciseDateService exerciseDateService, InstanceMessageSendService instanceMessageSendService, QuizBatchService quizBatchService,
             SubmittedAnswerRepository submittedAnswerRepository, QuizSubmissionService quizSubmissionService, GradingScaleService gradingScaleService,
-            ProgrammingExerciseCodeReviewFeedbackService programmingExerciseCodeReviewFeedbackService, TextExerciseFeedbackService textExerciseFeedbackService) {
+            ProgrammingExerciseCodeReviewFeedbackService programmingExerciseCodeReviewFeedbackService, TextExerciseFeedbackService textExerciseFeedbackService,
+            ModelingExerciseFeedbackService modelingExerciseFeedbackService) {
         this.participationService = participationService;
         this.programmingExerciseParticipationService = programmingExerciseParticipationService;
         this.quizExerciseRepository = quizExerciseRepository;
@@ -203,6 +207,7 @@ public ParticipationResource(ParticipationService participationService, Programm
         this.gradingScaleService = gradingScaleService;
         this.programmingExerciseCodeReviewFeedbackService = programmingExerciseCodeReviewFeedbackService;
         this.textExerciseFeedbackService = textExerciseFeedbackService;
+        this.modelingExerciseFeedbackService = modelingExerciseFeedbackService;
     }
 
     /**
@@ -363,7 +368,7 @@ public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long e
 
         Exercise exercise = exerciseRepository.findByIdElseThrow(exerciseId);
 
-        if (!(exercise instanceof TextExercise) && !(exercise instanceof ProgrammingExercise)) {
+        if (!(exercise instanceof TextExercise) && !(exercise instanceof ProgrammingExercise) && !(exercise instanceof ModelingExercise)) {
             throw new BadRequestAlertException("Unsupported exercise type", "participation", "unsupported type");
         }
 
@@ -371,6 +376,8 @@ public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long e
     }
 
     private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exercise exercise, Principal principal) {
+        var nonProgrammingExercise = exercise instanceof TextExercise || exercise instanceof ModelingExercise;
+
         // Validate exercise and timing
         if (exercise.isExamExercise()) {
             throw new BadRequestAlertException("Not intended for the use in exams", "participation", "preconditions not met");
@@ -393,7 +400,7 @@ private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exerc
         participation = studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId());
 
         // Check submission requirements
-        if (exercise instanceof TextExercise) {
+        if (nonProgrammingExercise) {
             if (submissionRepository.findAllByParticipationId(participation.getId()).isEmpty()) {
                 throw new BadRequestAlertException("You need to submit at least once", "participation", "preconditions not met");
             }
@@ -416,6 +423,9 @@ else if (exercise instanceof ProgrammingExercise) {
         if (exercise instanceof TextExercise) {
             updatedParticipation = textExerciseFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(), participation, (TextExercise) exercise);
         }
+        else if (exercise instanceof ModelingExercise) {
+            updatedParticipation = modelingExerciseFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(), participation, (ModelingExercise) exercise);
+        }
         else {
             updatedParticipation = programmingExerciseCodeReviewFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(),
                     (ProgrammingExerciseStudentParticipation) participation, (ProgrammingExercise) exercise);
diff --git a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
index 55d7f5ce03a4..95d72394f220 100644
--- a/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
+++ b/src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.html
@@ -18,7 +18,7 @@
             ></label>
             <jhi-help-icon placement="right auto" [text]="'artemisApp.exercise.feedbackSuggestionsEnabledTooltip'" />
         </div>
-        @if (this.exercise.type === ExerciseType.TEXT) {
+        @if (this.exercise.type === ExerciseType.TEXT || this.exercise.type === ExerciseType.MODELING) {
             <div class="form-check">
                 <input
                     type="checkbox"
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 409dbe53697a..9d94d55662e7 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -327,7 +327,11 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
  * @param result the result. It must include a participation and exercise.
  */
 export const resultIsPreliminary = (result: Result) => {
-    if (result.participation && result.participation.exercise && result.participation.exercise.type === ExerciseType.TEXT) {
+    if (
+        result.participation &&
+        result.participation.exercise &&
+        (result.participation.exercise.type === ExerciseType.TEXT || result.participation.exercise.type === ExerciseType.MODELING)
+    ) {
         return result.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
     } else
         return (
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index 9cdfbdaaa4d6..916e40e9efcd 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -250,7 +250,7 @@
                         [hideLabelMobile]="false"
                         [routerLink]="['/courses', courseId, 'exercises', exercise.type + '-exercises', exercise.id, 'participate', gradedParticipation!.id]"
                     ></button>
-                    @if (exercise.allowFeedbackRequests && athenaEnabled && exercise.type === ExerciseType.TEXT) {
+                    @if (exercise.allowFeedbackRequests && athenaEnabled && (exercise.type === ExerciseType.TEXT || exercise.type === ExerciseType.MODELING)) {
                         <button
                             class="btn btn-primary"
                             (click)="requestFeedback()"

From 9a3f61399a95b366804b8f950432da2cf69dfac1 Mon Sep 17 00:00:00 2001
From: Leon <58460654+LeonWehrhahn@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:28:12 +0000
Subject: [PATCH 63/99] Add athenaEnabled check

---
 .../exercise-details-student-actions.component.ts             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 664888fe980e..7543f2ced0a1 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -110,7 +110,6 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
             this.profileService.getProfileInfo().subscribe((profileInfo) => {
                 this.localVCEnabled = profileInfo.activeProfiles?.includes(PROFILE_LOCALVC);
                 this.athenaEnabled = profileInfo.activeProfiles?.includes(PROFILE_ATHENA);
-
                 // The online IDE is only available with correct SpringProfile and if it's enabled for this exercise
                 if (profileInfo.activeProfiles?.includes(PROFILE_THEIA)) {
                     this.theiaEnabled = true;
@@ -126,6 +125,9 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
             });
         } else if (this.exercise.type === ExerciseType.MODELING) {
             this.editorLabel = 'openModelingEditor';
+            this.profileService.getProfileInfo().subscribe((profileInfo) => {
+                this.athenaEnabled = profileInfo.activeProfiles?.includes(PROFILE_ATHENA);
+            });
         } else if (this.exercise.type === ExerciseType.TEXT) {
             this.editorLabel = 'openTextEditor';
             this.profileService.getProfileInfo().subscribe((profileInfo) => {

From c1df8b0e8ee1fba31aa64292e39067fb4bbc86f8 Mon Sep 17 00:00:00 2001
From: Leon <58460654+LeonWehrhahn@users.noreply.github.com>
Date: Wed, 4 Sep 2024 07:21:14 +0000
Subject: [PATCH 64/99] test: Add automatic Athena result test for modeling
 exercises

---
 .../component/exercises/shared/result.spec.ts | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
index c683821736f5..3da6d336adad 100644
--- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
@@ -126,6 +126,26 @@ describe('ResultComponent', () => {
         expect(component.templateStatus).toBe(ResultTemplateStatus.HAS_RESULT);
     });
 
+    it('should set (automatic athena) results for modeling exercise', () => {
+        const submission1: Submission = { id: 1 };
+        const result1: Result = { id: 1, submission: submission1, score: 0.8, assessmentType: AssessmentType.AUTOMATIC_ATHENA, successful: true };
+        const result2: Result = { id: 2 };
+        const participation1 = cloneDeep(modelingParticipation);
+        participation1.results = [result1, result2];
+        component.participation = participation1;
+        component.showUngradedResults = true;
+
+        fixture.detectChanges();
+
+        expect(component.result).toEqual(result1);
+        expect(component.result!.participation).toEqual(participation1);
+        expect(component.submission).toEqual(submission1);
+        expect(component.textColorClass).toBe('text-secondary');
+        expect(component.resultIconClass).toEqual(faQuestionCircle);
+        expect(component.resultString).toBe('artemisApp.result.resultString.short (artemisApp.result.preliminary)');
+        expect(component.templateStatus).toBe(ResultTemplateStatus.HAS_RESULT);
+    });
+
     it('should set (automatic athena) results for text exercise', () => {
         const submission1: Submission = { id: 1 };
         const result1: Result = { id: 1, submission: submission1, score: 1, assessmentType: AssessmentType.AUTOMATIC_ATHENA, successful: true };

From 287e20cc7e566532f3bb0d878f8c9e3e7e0e536d Mon Sep 17 00:00:00 2001
From: Enea Gore <73840596+EneaGore@users.noreply.github.com>
Date: Thu, 5 Sep 2024 01:49:37 +0200
Subject: [PATCH 65/99] after develop merge entities -> entities/text

---
 .../javascript/spec/component/exercises/shared/result.spec.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
index 5a10efd0a2b4..9571550efa84 100644
--- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
@@ -24,7 +24,7 @@ import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import dayjs from 'dayjs/esm';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 
 describe('ResultComponent', () => {

From f23244d6ca447740431aaee1206daef571aac804 Mon Sep 17 00:00:00 2001
From: = Enea_Gore <ge72git@mytum.de>
Date: Fri, 6 Sep 2024 18:51:54 +0200
Subject: [PATCH 66/99] Fix integration tests. Also send null results with non
 athena results

---
 .../java/de/tum/in/www1/artemis/domain/Submission.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java
index 96f23b493ee2..b6d819ca32e3 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java
@@ -213,9 +213,14 @@ public List<Result> getManualResults() {
         return results.stream().filter(result -> result != null && !result.isAutomatic() && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
     }
 
+    /**
+     * This method is necessary to ignore Athena results in the assessment view
+     *
+     * @return non athena automatic results including null results
+     */
     @JsonIgnore
     public List<Result> getNonAthenaResults() {
-        return results.stream().filter(result -> result != null && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
+        return results.stream().filter(result -> result == null || !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
     }
 
     /**

From ad97f5fb2570a19849e730727a07cb06997faf98 Mon Sep 17 00:00:00 2001
From: Enea Gore <73840596+EneaGore@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:43:08 +0200
Subject: [PATCH 67/99] Revert Integration Tests

To test if this causes the additional server restart
---
 .../ParticipationIntegrationTest.java         | 75 -------------------
 1 file changed, 75 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 4a5e03bfd71a..9fe056cdf668 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -1,7 +1,6 @@
 package de.tum.in.www1.artemis.participation;
 
 import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST;
-import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;
 import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
@@ -36,7 +35,6 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -96,7 +94,6 @@
 import de.tum.in.www1.artemis.service.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.util.LocalRepository;
 import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO;
-import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
 class ParticipationIntegrationTest extends AbstractAthenaTest {
 
@@ -159,9 +156,6 @@ class ParticipationIntegrationTest extends AbstractAthenaTest {
     @Value("${artemis.version-control.default-branch:main}")
     private String defaultBranch;
 
-    @SpyBean
-    protected ResultWebsocketService resultWebsocketService;
-
     private Course course;
 
     private ModelingExercise modelingExercise;
@@ -591,41 +585,6 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         localRepo.resetLocalRepo();
     }
 
-    @Test
-    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
-    void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception {
-
-        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
-        textCourse.setRestrictedAthenaModulesAccess(true);
-        this.courseRepository.save(textCourse);
-
-        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
-        this.exerciseRepository.save(textExercise);
-
-        athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("text");
-
-        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
-                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
-
-        participationRepo.save(textParticipation);
-
-        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, true);
-        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
-        resultText2.setAssessmentType(AssessmentType.MANUAL);
-        resultText2.setCompletionDate(ZonedDateTime.now());
-        resultRepository.save(resultText2);
-
-        request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
-
-        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(any(), resultCaptor.capture());
-
-        Result invokedTextResult = resultCaptor.getAllValues().get(1);
-        assertThat(invokedTextResult).isNotNull();
-        assertThat(invokedTextResult.getId()).isNotNull();
-        assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
-        assertThat(invokedTextResult.getFeedbacks()).hasSize(1);
-    }
-
     @Test
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void requestFeedbackSuccess_withAthenaFailure() throws Exception {
@@ -672,40 +631,6 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         localRepo.resetLocalRepo();
     }
 
-    @Test
-    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
-    void requestTextFeedbackSuccess_withAthenaFailure() throws Exception {
-
-        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
-        textCourse.setRestrictedAthenaModulesAccess(true);
-        this.courseRepository.save(textCourse);
-
-        this.textExercise.setFeedbackSuggestionModule(ATHENA_MODULE_TEXT_TEST);
-        this.exerciseRepository.save(textExercise);
-
-        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("text");
-
-        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
-                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
-
-        participationRepo.save(textParticipation);
-
-        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
-        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
-        resultText2.setAssessmentType(AssessmentType.MANUAL);
-        resultText2.setCompletionDate(ZonedDateTime.now());
-        resultRepository.save(resultText2);
-
-        request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
-
-        verify(resultWebsocketService, timeout(2000).times(1)).broadcastNewResult(any(), resultCaptor.capture());
-
-        Result invokedTextResult = resultCaptor.getAllValues().getFirst();
-        assertThat(invokedTextResult).isNotNull();
-        assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
-        assertThat(invokedTextResult.getFeedbacks()).hasSize(0);
-    }
-
     @Test
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void resumeProgrammingExerciseParticipation() throws Exception {

From 1bd4f9443d9504cb51388dc951d9e598539a7ebb Mon Sep 17 00:00:00 2001
From: Enea Gore <73840596+EneaGore@users.noreply.github.com>
Date: Mon, 9 Sep 2024 16:25:16 +0200
Subject: [PATCH 68/99] Try a signle import of AthenaRequestMockProvider

---
 .../ParticipationIntegrationTest.java         | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 9fe056cdf668..b25e3ee925fe 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -35,6 +35,7 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -94,6 +95,7 @@
 import de.tum.in.www1.artemis.service.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.util.LocalRepository;
 import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO;
+import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
 class ParticipationIntegrationTest extends AbstractAthenaTest {
 
@@ -156,6 +158,9 @@ class ParticipationIntegrationTest extends AbstractAthenaTest {
     @Value("${artemis.version-control.default-branch:main}")
     private String defaultBranch;
 
+    @SpyBean
+    protected ResultWebsocketService resultWebsocketService;
+
     private Course course;
 
     private ModelingExercise modelingExercise;
@@ -585,6 +590,41 @@ void requestFeedbackSuccess_withAthenaSuccess() throws Exception {
         localRepo.resetLocalRepo();
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception {
+
+        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
+        textCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(textCourse);
+
+        this.textExercise.setFeedbackSuggestionModule("module_text_test");
+        this.exerciseRepository.save(textExercise);
+
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("text");
+
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
+
+        participationRepo.save(textParticipation);
+
+        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, true);
+        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
+        resultText2.setAssessmentType(AssessmentType.MANUAL);
+        resultText2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultText2);
+
+        request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
+
+        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(any(), resultCaptor.capture());
+
+        Result invokedTextResult = resultCaptor.getAllValues().get(1);
+        assertThat(invokedTextResult).isNotNull();
+        assertThat(invokedTextResult.getId()).isNotNull();
+        assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
+        assertThat(invokedTextResult.getFeedbacks()).hasSize(1);
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void requestFeedbackSuccess_withAthenaFailure() throws Exception {
@@ -631,6 +671,40 @@ void requestFeedbackSuccess_withAthenaFailure() throws Exception {
         localRepo.resetLocalRepo();
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void requestTextFeedbackSuccess_withAthenaFailure() throws Exception {
+
+        var textCourse = textExercise.getCourseViaExerciseGroupOrCourseMember();
+        textCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(textCourse);
+
+        this.textExercise.setFeedbackSuggestionModule("module_text_test");
+        this.exerciseRepository.save(textExercise);
+
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("text");
+
+        var textParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, textExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
+
+        participationRepo.save(textParticipation);
+
+        Result resultText1 = participationUtilService.createSubmissionAndResult(textParticipation, 100, false);
+        Result resultText2 = participationUtilService.addResultToParticipation(textParticipation, resultText1.getSubmission());
+        resultText2.setAssessmentType(AssessmentType.MANUAL);
+        resultText2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultText2);
+
+        request.putWithResponseBody("/api/exercises/" + textExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
+
+        verify(resultWebsocketService, timeout(2000).times(1)).broadcastNewResult(any(), resultCaptor.capture());
+
+        Result invokedTextResult = resultCaptor.getAllValues().getFirst();
+        assertThat(invokedTextResult).isNotNull();
+        assertThat(invokedTextResult.isAthenaAutomatic()).isTrue();
+        assertThat(invokedTextResult.getFeedbacks()).hasSize(0);
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void resumeProgrammingExerciseParticipation() throws Exception {

From 3deaceb3e56b46787781fa0fa08486a1b8012c7f Mon Sep 17 00:00:00 2001
From: Enea Gore <73840596+EneaGore@users.noreply.github.com>
Date: Mon, 9 Sep 2024 16:55:41 +0200
Subject: [PATCH 69/99] Spy Bean -> Mock bean

---
 .../artemis/participation/ParticipationIntegrationTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index b25e3ee925fe..5567fbaf3dc2 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -35,7 +35,7 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -158,7 +158,7 @@ class ParticipationIntegrationTest extends AbstractAthenaTest {
     @Value("${artemis.version-control.default-branch:main}")
     private String defaultBranch;
 
-    @SpyBean
+    @MockBean
     protected ResultWebsocketService resultWebsocketService;
 
     private Course course;

From 69bf43b5f113a1343e7d3ca6bf2e1f5b038ecdec Mon Sep 17 00:00:00 2001
From: Enea Gore <73840596+EneaGore@users.noreply.github.com>
Date: Mon, 9 Sep 2024 20:08:28 +0200
Subject: [PATCH 70/99] Add websocket spy bean declaration

---
 .../artemis/AbstractSpringIntegrationJenkinsGitlabTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java
index 8850afe32f81..000735fd839c 100644
--- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java
@@ -47,6 +47,7 @@
 import de.tum.in.www1.artemis.service.exam.ExamLiveEventsService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService;
+import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
 @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest")
 // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory!
@@ -70,7 +71,10 @@ public abstract class AbstractSpringIntegrationJenkinsGitlabTest extends Abstrac
 
     @SpyBean
     protected ProgrammingMessagingService programmingMessagingService;
-
+    
+    @SpyBean
+    protected ResultWebsocketService resultWebsocketService;
+    
     @Autowired
     protected JenkinsRequestMockProvider jenkinsRequestMockProvider;
 

From 6684a2b7d3942df3e361c52068945c78433ee5cb Mon Sep 17 00:00:00 2001
From: Enea Gore <73840596+EneaGore@users.noreply.github.com>
Date: Mon, 9 Sep 2024 20:08:53 +0200
Subject: [PATCH 71/99] remvoe mock bean websocket from participipation
 integration test

---
 .../artemis/participation/ParticipationIntegrationTest.java  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 5567fbaf3dc2..d2f5c0676c5f 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -35,7 +35,6 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -95,7 +94,6 @@
 import de.tum.in.www1.artemis.service.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.util.LocalRepository;
 import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO;
-import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
 class ParticipationIntegrationTest extends AbstractAthenaTest {
 
@@ -158,9 +156,6 @@ class ParticipationIntegrationTest extends AbstractAthenaTest {
     @Value("${artemis.version-control.default-branch:main}")
     private String defaultBranch;
 
-    @MockBean
-    protected ResultWebsocketService resultWebsocketService;
-
     private Course course;
 
     private ModelingExercise modelingExercise;

From 20d3811b71a9b2d7f853ae94ad19816f6c0ca59e Mon Sep 17 00:00:00 2001
From: Enea Gore <73840596+EneaGore@users.noreply.github.com>
Date: Mon, 9 Sep 2024 20:13:44 +0200
Subject: [PATCH 72/99] java style

---
 .../artemis/AbstractSpringIntegrationJenkinsGitlabTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java
index 000735fd839c..b8ea7a96bc04 100644
--- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java
@@ -71,10 +71,10 @@ public abstract class AbstractSpringIntegrationJenkinsGitlabTest extends Abstrac
 
     @SpyBean
     protected ProgrammingMessagingService programmingMessagingService;
-    
+
     @SpyBean
     protected ResultWebsocketService resultWebsocketService;
-    
+
     @Autowired
     protected JenkinsRequestMockProvider jenkinsRequestMockProvider;
 

From b3203a8d9c5596ed51bcf5f0ace10d96baa5b1df Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Wed, 11 Sep 2024 21:49:04 +0700
Subject: [PATCH 73/99] Refactor exercise feedback request handling in
 ParticipationResource

---
 .../de/tum/in/www1/artemis/web/rest/ParticipationResource.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index ce76b13310d3..582d6a06319d 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -376,7 +376,6 @@ public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long e
     }
 
     private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exercise exercise, Principal principal) {
-        var nonProgrammingExercise = exercise instanceof TextExercise || exercise instanceof ModelingExercise;
 
         // Validate exercise and timing
         if (exercise.isExamExercise()) {
@@ -400,7 +399,7 @@ private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exerc
         participation = studentParticipationRepository.findByIdWithResultsElseThrow(participation.getId());
 
         // Check submission requirements
-        if (nonProgrammingExercise) {
+        if (exercise instanceof TextExercise || exercise instanceof ModelingExercise) {
             if (submissionRepository.findAllByParticipationId(participation.getId()).isEmpty()) {
                 throw new BadRequestAlertException("You need to submit at least once", "participation", "preconditions not met");
             }

From 02c80f90dc0ab97c05234f463a5afdfc495bf404 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 12 Sep 2024 11:52:46 +0700
Subject: [PATCH 74/99] Add ModelingAssessmentEditorComponent test for testing
 ngOnInit with submissionId set to new

---
 .../modeling-assessment-editor.component.ts   |  4 +-
 ...deling-assessment-editor.component.spec.ts | 62 +++++++++++++++++--
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts b/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts
index e6610b4edaf0..fe7a6017459f 100644
--- a/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts
+++ b/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts
@@ -237,8 +237,8 @@ export class ModelingAssessmentEditorComponent implements OnInit {
 
         if (this.result?.feedbacks) {
             this.result = this.modelingAssessmentService.convertResult(this.result);
-        } else {
-            this.result!.feedbacks = [];
+        } else if (this.result) {
+            this.result.feedbacks = [];
         }
 
         // Only load suggestions for new assessments, they don't make sense later.
diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
index 7bbd4b2e71a7..a9a440189041 100644
--- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
@@ -1,6 +1,6 @@
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import { ActivatedRoute, ParamMap, Router, convertToParamMap } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateService } from '@ngx-translate/core';
 import { AssessmentLayoutComponent } from 'app/assessment/assessment-layout/assessment-layout.component';
@@ -27,8 +27,7 @@ import { ModelingAssessmentEditorComponent } from 'app/exercises/modeling/assess
 import { ModelingAssessmentService } from 'app/exercises/modeling/assess/modeling-assessment.service';
 import { ModelingSubmissionService } from 'app/exercises/modeling/participate/modeling-submission.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
-import { of, throwError } from 'rxjs';
-import { mockedActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route-query-param-map';
+import { BehaviorSubject, of, throwError } from 'rxjs';
 import { MockAccountService } from '../../helpers/mocks/service/mock-account.service';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
@@ -57,8 +56,10 @@ describe('ModelingAssessmentEditorComponent', () => {
     let router: Router;
     let submissionService: SubmissionService;
     let exampleSubmissionService: ExampleSubmissionService;
+    let paramMapSubject: BehaviorSubject<ParamMap>;
 
     beforeEach(() => {
+        paramMapSubject = new BehaviorSubject(convertToParamMap({}));
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, RouterTestingModule],
             declarations: [
@@ -70,7 +71,22 @@ describe('ModelingAssessmentEditorComponent', () => {
             ],
             providers: [
                 JhiLanguageHelper,
-                mockedActivatedRoute({}, { showBackButton: 'false', submissionId: 'new', exerciseId: 1 }),
+                {
+                    provide: ActivatedRoute,
+                    useValue: {
+                        paramMap: paramMapSubject.asObservable(),
+                        queryParamMap: of(convertToParamMap({})),
+                        params: of({}),
+                        queryParams: of({}),
+                        snapshot: {
+                            paramMap: convertToParamMap({}),
+                            queryParamMap: convertToParamMap({}),
+                        },
+                        parent: {
+                            paramMap: of(convertToParamMap({})),
+                        },
+                    },
+                },
                 { provide: LocalStorageService, useClass: MockSyncStorage },
                 { provide: SessionStorageService, useClass: MockSyncStorage },
                 { provide: TranslateService, useClass: MockTranslateService },
@@ -163,7 +179,7 @@ describe('ModelingAssessmentEditorComponent', () => {
             const verifyFeedbackSpy = jest.spyOn(component, 'validateFeedback');
 
             component.ngOnInit();
-            tick(500);
+            tick(1000);
             expect(modelingSubmissionSpy).toHaveBeenCalledOnce();
             expect(component.isLoading).toBeFalse();
             expect(component.complaint).toEqual(complaint);
@@ -184,6 +200,42 @@ describe('ModelingAssessmentEditorComponent', () => {
             expect(modelingSubmissionSpy).toHaveBeenCalledOnce();
             modelingSubmissionSpy.mockRestore();
         }));
+
+        it('call ngOnInit with submissionId set to new', fakeAsync(() => {
+            paramMapSubject.next(
+                convertToParamMap({
+                    submissionId: 'new',
+                    // Include other necessary params here
+                    courseId: '1',
+                    exerciseId: '1',
+                }),
+            );
+
+            const mockSubmission: ModelingSubmission = {
+                id: 123,
+                submitted: true,
+                participation: {
+                    exercise: {
+                        id: 1,
+                        type: 'modeling',
+                    },
+                },
+            } as ModelingSubmission;
+
+            const modelingSubmissionSpy = jest.spyOn(modelingSubmissionService, 'getSubmissionWithoutAssessment').mockReturnValue(of(mockSubmission));
+
+            // Spy on the relevant service methods
+            const handleFeedbackSpy = jest.spyOn(submissionService, 'handleFeedbackCorrectionRoundTag');
+
+            // Initialize the component
+            component.ngOnInit();
+            tick(500);
+            expect(modelingSubmissionSpy).toHaveBeenCalledOnce();
+            expect(component.isLoading).toBeFalse();
+            expect(component.submission).toBeDefined();
+            expect(handleFeedbackSpy).toHaveBeenCalledOnce();
+            expect(component.assessmentsAreValid).toBeFalse();
+        }));
     });
 
     describe('should test the overwrite access rights and return true', () => {

From 2f9e0aac32ca99a6a8108b3a12bf2dfc4ca94898 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 12 Sep 2024 12:43:59 +0700
Subject: [PATCH 75/99] Add request modeling feedback participation integration
 test

---
 .../ParticipationIntegrationTest.java         | 35 +++++++++++++++++++
 ...deling-assessment-editor.component.spec.ts |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index d2f5c0676c5f..4a9bb04141ce 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -620,6 +620,41 @@ void requestTextFeedbackSuccess_withAthenaSuccess() throws Exception {
         assertThat(invokedTextResult.getFeedbacks()).hasSize(1);
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void requestModelingFeedbackSuccess_withAthenaSuccess() throws Exception {
+
+        var modelingCourse = modelingExercise.getCourseViaExerciseGroupOrCourseMember();
+        modelingCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(modelingCourse);
+
+        this.modelingExercise.setFeedbackSuggestionModule("module_modeling_test");
+        this.exerciseRepository.save(modelingExercise);
+
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsAndExpect("modeling");
+
+        var modelingParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, modelingExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
+
+        participationRepo.save(modelingParticipation);
+
+        Result resultModeling1 = participationUtilService.createSubmissionAndResult(modelingParticipation, 100, true);
+        Result resultModeling2 = participationUtilService.addResultToParticipation(modelingParticipation, resultModeling1.getSubmission());
+        resultModeling2.setAssessmentType(AssessmentType.MANUAL);
+        resultModeling2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultModeling2);
+
+        request.putWithResponseBody("/api/exercises/" + modelingExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
+
+        verify(resultWebsocketService, timeout(2000).times(2)).broadcastNewResult(any(), resultCaptor.capture());
+
+        Result invokedModelingResult = resultCaptor.getAllValues().get(1);
+        assertThat(invokedModelingResult).isNotNull();
+        assertThat(invokedModelingResult.getId()).isNotNull();
+        assertThat(invokedModelingResult.isAthenaAutomatic()).isTrue();
+        assertThat(invokedModelingResult.getFeedbacks()).hasSize(1);
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void requestFeedbackSuccess_withAthenaFailure() throws Exception {
diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
index a9a440189041..e2213c34c6f4 100644
--- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
@@ -179,7 +179,7 @@ describe('ModelingAssessmentEditorComponent', () => {
             const verifyFeedbackSpy = jest.spyOn(component, 'validateFeedback');
 
             component.ngOnInit();
-            tick(1000);
+            tick(500);
             expect(modelingSubmissionSpy).toHaveBeenCalledOnce();
             expect(component.isLoading).toBeFalse();
             expect(component.complaint).toEqual(complaint);

From 3f98504e2dcb3f65f49cdd2674438cb79b8ef027 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 12 Sep 2024 13:14:55 +0700
Subject: [PATCH 76/99] Add request modeling feedback participation integration
 test

---
 .../ParticipationIntegrationTest.java         | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 4a9bb04141ce..a82d1c089adb 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -735,6 +735,40 @@ void requestTextFeedbackSuccess_withAthenaFailure() throws Exception {
         assertThat(invokedTextResult.getFeedbacks()).hasSize(0);
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void requestModelingFeedbackSuccess_withAthenaFailure() throws Exception {
+
+        var modelingCourse = modelingExercise.getCourseViaExerciseGroupOrCourseMember();
+        modelingCourse.setRestrictedAthenaModulesAccess(true);
+        this.courseRepository.save(modelingCourse);
+
+        this.modelingExercise.setFeedbackSuggestionModule("module_modeling_test");
+        this.exerciseRepository.save(modelingExercise);
+
+        athenaRequestMockProvider.mockGetFeedbackSuggestionsWithFailure("modeling");
+
+        var modelingParticipation = ParticipationFactory.generateStudentParticipation(InitializationState.INACTIVE, modelingExercise,
+                userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
+
+        participationRepo.save(modelingParticipation);
+
+        Result resultModeling1 = participationUtilService.createSubmissionAndResult(modelingParticipation, 100, false);
+        Result resultModeling2 = participationUtilService.addResultToParticipation(modelingParticipation, resultModeling1.getSubmission());
+        resultModeling2.setAssessmentType(AssessmentType.MANUAL);
+        resultModeling2.setCompletionDate(ZonedDateTime.now());
+        resultRepository.save(resultModeling2);
+
+        request.putWithResponseBody("/api/exercises/" + modelingExercise.getId() + "/request-feedback", null, StudentParticipation.class, HttpStatus.OK);
+
+        verify(resultWebsocketService, timeout(2000).times(1)).broadcastNewResult(any(), resultCaptor.capture());
+
+        Result invokedModelingResult = resultCaptor.getAllValues().getFirst();
+        assertThat(invokedModelingResult).isNotNull();
+        assertThat(invokedModelingResult.isAthenaAutomatic()).isTrue();
+        assertThat(invokedModelingResult.getFeedbacks()).hasSize(0);
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void resumeProgrammingExerciseParticipation() throws Exception {

From 2d59db8fdbeb62ef486521027c966e2fa3835677 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 12 Sep 2024 15:48:06 +0700
Subject: [PATCH 77/99] Refactor ModelingAssessmentEditorComponent test to
 include AthenaService

---
 .../modeling-assessment-editor.component.spec.ts   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
index e2213c34c6f4..f4bb3c85fd6b 100644
--- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
@@ -43,6 +43,7 @@ import dayjs from 'dayjs/esm';
 import { AssessmentAfterComplaint } from 'app/complaints/complaints-for-tutor/complaints-for-tutor.component';
 import { AlertService } from 'app/core/util/alert.service';
 import { UMLDiagramType } from '@ls1intum/apollon';
+import { AthenaService } from 'app/assessment/athena.service';
 
 describe('ModelingAssessmentEditorComponent', () => {
     let component: ModelingAssessmentEditorComponent;
@@ -50,6 +51,7 @@ describe('ModelingAssessmentEditorComponent', () => {
     let service: ModelingAssessmentService;
     let mockAuth: MockAccountService;
     let modelingSubmissionService: ModelingSubmissionService;
+    let athenaService: AthenaService;
     let complaintService: ComplaintService;
     let modelingSubmissionSpy: jest.SpyInstance;
     let complaintSpy: jest.SpyInstance;
@@ -98,6 +100,7 @@ describe('ModelingAssessmentEditorComponent', () => {
                 component = fixture.componentInstance;
                 service = TestBed.inject(ModelingAssessmentService);
                 modelingSubmissionService = TestBed.inject(ModelingSubmissionService);
+                athenaService = TestBed.inject(AthenaService);
                 complaintService = TestBed.inject(ComplaintService);
                 submissionService = TestBed.inject(SubmissionService);
                 mockAuth = fixture.debugElement.injector.get(AccountService) as any as MockAccountService;
@@ -218,22 +221,19 @@ describe('ModelingAssessmentEditorComponent', () => {
                     exercise: {
                         id: 1,
                         type: 'modeling',
-                    },
+                        feedbackSuggestionModule: 'modeling',
+                    } as unknown as Exercise,
                 },
             } as ModelingSubmission;
 
             const modelingSubmissionSpy = jest.spyOn(modelingSubmissionService, 'getSubmissionWithoutAssessment').mockReturnValue(of(mockSubmission));
+            jest.spyOn(athenaService, 'getModelingFeedbackSuggestions').mockReturnValue(of([new Feedback(), new Feedback()]));
 
-            // Spy on the relevant service methods
-            const handleFeedbackSpy = jest.spyOn(submissionService, 'handleFeedbackCorrectionRoundTag');
-
-            // Initialize the component
             component.ngOnInit();
             tick(500);
+
             expect(modelingSubmissionSpy).toHaveBeenCalledOnce();
-            expect(component.isLoading).toBeFalse();
             expect(component.submission).toBeDefined();
-            expect(handleFeedbackSpy).toHaveBeenCalledOnce();
             expect(component.assessmentsAreValid).toBeFalse();
         }));
     });

From 51e07785709161b492445a136188bdefe1e7310b Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 12 Sep 2024 20:17:16 +0700
Subject: [PATCH 78/99] Refactor package and imports

---
 .../ModelingExerciseFeedbackService.java      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
index 97410ccb725d..216e98af20dd 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
@@ -1,6 +1,6 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.cit.aet.artemis.modeling.service;
 
-import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -12,19 +12,22 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
-import de.tum.in.www1.artemis.domain.Feedback;
-import de.tum.in.www1.artemis.domain.Result;
-import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
-import de.tum.in.www1.artemis.domain.enumeration.FeedbackType;
-import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
-import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
-import de.tum.in.www1.artemis.domain.participation.Participation;
-import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.repository.ResultRepository;
-import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService;
-import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
-import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
-import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
+import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
+import de.tum.cit.aet.artemis.assessment.domain.Feedback;
+import de.tum.cit.aet.artemis.assessment.domain.FeedbackType;
+import de.tum.cit.aet.artemis.assessment.domain.Result;
+import de.tum.cit.aet.artemis.assessment.repository.ResultRepository;
+import de.tum.cit.aet.artemis.assessment.service.ResultService;
+import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService;
+import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService;
+import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
+import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException;
+import de.tum.cit.aet.artemis.exercise.domain.participation.Participation;
+import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation;
+import de.tum.cit.aet.artemis.exercise.service.ParticipationService;
+import de.tum.cit.aet.artemis.exercise.service.SubmissionService;
+import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise;
+import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission;
 
 @Profile(PROFILE_CORE)
 @Service

From 9bad5dc373aa3be3061eda886a033e1ccdaef7d7 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 12 Sep 2024 20:37:28 +0700
Subject: [PATCH 79/99] Add ModelingExerciseFeedbackService import

---
 .../tum/cit/aet/artemis/exercise/web/ParticipationResource.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
index 550ff266794a..29ea91e99abe 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
@@ -82,6 +82,7 @@
 import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService;
 import de.tum.cit.aet.artemis.exercise.service.ParticipationService;
 import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise;
+import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseFeedbackService;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation;

From 4b10bfcc49438f2aec06f921fd0251172d607dcb Mon Sep 17 00:00:00 2001
From: Leon Laurin Wehrhahn <58460654+LeonWehrhahn@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:45:12 +0700
Subject: [PATCH 80/99] Update
 src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../modeling-assessment-editor.component.spec.ts                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
index f4bb3c85fd6b..0fdd9f641f8b 100644
--- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
@@ -203,7 +203,6 @@ describe('ModelingAssessmentEditorComponent', () => {
             expect(modelingSubmissionSpy).toHaveBeenCalledOnce();
             modelingSubmissionSpy.mockRestore();
         }));
-
         it('call ngOnInit with submissionId set to new', fakeAsync(() => {
             paramMapSubject.next(
                 convertToParamMap({

From dd29c9fefc230a1f2d55d2abd1697f44fb9cb285 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Fri, 13 Sep 2024 10:10:45 +0700
Subject: [PATCH 81/99] Show the ResultHistoryComponent for Modeling Exercises

---
 .../app/overview/result-history/result-history.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/app/overview/result-history/result-history.component.ts b/src/main/webapp/app/overview/result-history/result-history.component.ts
index 1fd9fa81a100..da6797cee749 100644
--- a/src/main/webapp/app/overview/result-history/result-history.component.ts
+++ b/src/main/webapp/app/overview/result-history/result-history.component.ts
@@ -26,7 +26,7 @@ export class ResultHistoryComponent implements OnChanges {
 
     ngOnChanges(): void {
         this.showPreviousDivider = this.results.length > MAX_RESULT_HISTORY_LENGTH;
-        if (this.exercise?.type === ExerciseType.TEXT) {
+        if (this.exercise?.type === ExerciseType.TEXT || this.exercise?.type === ExerciseType.MODELING) {
             this.displayedResults = this.results.filter((result) => result.successful !== undefined);
         } else {
             this.displayedResults = this.results;

From c1a326301c208ffa041a3702668334cacc182469 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Fri, 13 Sep 2024 14:09:57 +0700
Subject: [PATCH 82/99] Update ModelingSubmissionService to create new
 submissions for empty Results

---
 .../artemis/modeling/service/ModelingSubmissionService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
index 2563bb9219c8..0d13ed65d1d2 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
@@ -124,15 +124,15 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu
             throw new AccessForbiddenException();
         }
 
-        // remove result from submission (in the unlikely case it is passed here), so that students cannot inject a result
-        modelingSubmission.setResults(new ArrayList<>());
-
         // if athena results are present than create new submission on submit
         if (!modelingSubmission.getResults().isEmpty()) {
             log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
             modelingSubmission.setId(null);
         }
 
+        // remove result from submission (in the unlikely case it is passed here), so that students cannot inject a result
+        modelingSubmission.setResults(new ArrayList<>());
+
         // update submission properties
         // NOTE: from now on we always set submitted to true to prevent problems here! Except for late submissions of course exercises to prevent issues in auto-save
         if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {

From a4827329fb030212baea3e26c10ca6d4f817601d Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Fri, 13 Sep 2024 14:53:21 +0700
Subject: [PATCH 83/99] Update ModelingSubmissionService to remove results
 present check

---
 .../service/ModelingSubmissionService.java      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
index 0d13ed65d1d2..9811a7566f36 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
@@ -3,7 +3,6 @@
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -124,20 +123,18 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu
             throw new AccessForbiddenException();
         }
 
+        // update submission properties
+        // NOTE: from now on we always set submitted to true to prevent problems here! Except for late submissions of course exercises to prevent issues in auto-save
+        if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {
+            modelingSubmission.setSubmitted(true);
+        }
+
         // if athena results are present than create new submission on submit
         if (!modelingSubmission.getResults().isEmpty()) {
             log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
             modelingSubmission.setId(null);
         }
 
-        // remove result from submission (in the unlikely case it is passed here), so that students cannot inject a result
-        modelingSubmission.setResults(new ArrayList<>());
-
-        // update submission properties
-        // NOTE: from now on we always set submitted to true to prevent problems here! Except for late submissions of course exercises to prevent issues in auto-save
-        if (exercise.isExamExercise() || exerciseDateService.isBeforeDueDate(participation)) {
-            modelingSubmission.setSubmitted(true);
-        }
         modelingSubmission = save(modelingSubmission, exercise, user, participation);
         return modelingSubmission;
     }
@@ -161,8 +158,6 @@ private ModelingSubmission save(ModelingSubmission modelingSubmission, ModelingE
             studentParticipationRepository.save(participation);
         }
 
-        // remove result from submission (in the unlikely case it is passed here), so that students cannot inject a result
-        modelingSubmission.setResults(new ArrayList<>());
         modelingSubmission = modelingSubmissionRepository.save(modelingSubmission);
 
         // versioning of submission

From 9c910bda2a139af5b9937a110fc709f521561d4d Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Fri, 13 Sep 2024 15:40:43 +0700
Subject: [PATCH 84/99] Update ModelingSubmissionService add
 modelingSubmission.setResults

---
 .../artemis/modeling/service/ModelingSubmissionService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
index 9811a7566f36..a16ccb499435 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
@@ -3,6 +3,7 @@
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -158,6 +159,8 @@ private ModelingSubmission save(ModelingSubmission modelingSubmission, ModelingE
             studentParticipationRepository.save(participation);
         }
 
+        // remove result from submission (in the unlikely case it is passed here), so that students cannot inject a result
+        modelingSubmission.setResults(new ArrayList<>());
         modelingSubmission = modelingSubmissionRepository.save(modelingSubmission);
 
         // versioning of submission

From 3b2ac10ec873e0b5e3ffc3ad087c0c870e7719d1 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Fri, 13 Sep 2024 20:18:59 +0700
Subject: [PATCH 85/99] Update result retrieval for modeling exercises

---
 .../service/ModelingSubmissionService.java        |  2 +-
 .../modeling/web/ModelingSubmissionResource.java  | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
index a16ccb499435..d63d035c27c1 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
@@ -131,7 +131,7 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu
         }
 
         // if athena results are present than create new submission on submit
-        if (!modelingSubmission.getResults().isEmpty()) {
+        if (!modelingSubmission.getParticipation().getResults().isEmpty()) {
             log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
             modelingSubmission.setId(null);
         }
diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java
index 75ee0c51c4bb..2e59935071b4 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java
@@ -3,6 +3,7 @@
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
 import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion;
 import de.tum.cit.aet.artemis.assessment.domain.Result;
 import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository;
@@ -46,6 +48,7 @@
 import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository;
 import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository;
+import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService;
 import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource;
 import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise;
 import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission;
@@ -340,7 +343,6 @@ public ResponseEntity<ModelingSubmission> getLatestSubmissionForModelingEditor(@
 
         // make sure only the latest submission and latest result is sent to the client
         participation.setSubmissions(null);
-        participation.setResults(null);
 
         // do not send the result to the client if the assessment is not finished
         if (modelingSubmission.getLatestResult() != null
@@ -348,6 +350,17 @@ public ResponseEntity<ModelingSubmission> getLatestSubmissionForModelingEditor(@
             modelingSubmission.setResults(new ArrayList<>());
         }
 
+        if (!ExerciseDateService.isAfterAssessmentDueDate(modelingExercise)) {
+            // We want to have the preliminary feedback before the assessment due date too
+            Set<Result> participationResults = participation.getResults();
+            if (participationResults != null) {
+                List<Result> athenaResults = participationResults.stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
+                modelingSubmission.setResults(athenaResults);
+                Set<Result> athenaResultsSet = new HashSet<>(athenaResults);
+                participation.setResults(athenaResultsSet);
+            }
+        }
+
         if (modelingSubmission.getLatestResult() != null && !authCheckService.isAtLeastTeachingAssistantForExercise(modelingExercise)) {
             modelingSubmission.getLatestResult().filterSensitiveInformation();
         }

From f523991041380def5bd866dc7233b31082599255 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Sat, 14 Sep 2024 10:43:43 +0700
Subject: [PATCH 86/99] Add null check

---
 .../aet/artemis/modeling/service/ModelingSubmissionService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
index d63d035c27c1..e1d24f537f1c 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
@@ -131,7 +131,7 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu
         }
 
         // if athena results are present than create new submission on submit
-        if (!modelingSubmission.getParticipation().getResults().isEmpty()) {
+        if (modelingSubmission.getParticipation() != null && !modelingSubmission.getParticipation().getResults().isEmpty()) {
             log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
             modelingSubmission.setId(null);
         }

From 8e26c2ff2e2f761df60e9b0d0d128873c5e3efa1 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Sat, 14 Sep 2024 11:05:02 +0700
Subject: [PATCH 87/99] Add null check

---
 .../artemis/modeling/service/ModelingSubmissionService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
index e1d24f537f1c..b953d2076f06 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
@@ -131,7 +131,8 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu
         }
 
         // if athena results are present than create new submission on submit
-        if (modelingSubmission.getParticipation() != null && !modelingSubmission.getParticipation().getResults().isEmpty()) {
+        if (modelingSubmission.getParticipation() != null && modelingSubmission.getParticipation().getResults() != null
+                && !modelingSubmission.getParticipation().getResults().isEmpty()) {
             log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
             modelingSubmission.setId(null);
         }

From 7452923d77397291916e8f4525d64c7f640ffae2 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Sat, 14 Sep 2024 19:47:25 +0700
Subject: [PATCH 88/99] Update getModelSubmissionForModelingEditor to ensure
 that exercise is passed the assessment due date

---
 .../exercise/modeling/ModelingExerciseUtilService.java | 10 ++++++++++
 .../modeling/ModelingSubmissionIntegrationTest.java    |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java
index 59ff3b9ac1e9..e4e998a93daa 100644
--- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java
+++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java
@@ -118,6 +118,16 @@ public Course addCourseWithOneModelingExercise(String title) {
         return course;
     }
 
+    /**
+     * Updates an existing ModelingExercise in the database.
+     *
+     * @param exercise The ModelingExercise to be updated
+     * @return The updated ModelingExercise
+     */
+    public ModelingExercise updateExercise(ModelingExercise exercise) {
+        return modelingExerciseRepository.save(exercise);
+    }
+
     /**
      * Creates and saves a Course with a ModelingExercise. The ModelingExercise's DiagramType is set to ClassDiagram.
      *
diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java
index 1d0a96ae201c..97c71c1fc784 100644
--- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java
@@ -711,6 +711,9 @@ void getAllModelingSubmissions() throws Exception {
     @WithMockUser(username = TEST_PREFIX + "student1")
     void getModelSubmissionForModelingEditor() throws Exception {
         ModelingSubmission submission = ParticipationFactory.generateModelingSubmission(validModel, true);
+        classExercise.setDueDate(ZonedDateTime.now().minusHours(2));
+        classExercise.setAssessmentDueDate(ZonedDateTime.now().minusHours(1));
+        modelingExerciseUtilService.updateExercise(classExercise);
         submission = (ModelingSubmission) modelingExerciseUtilService.addModelingSubmissionWithFinishedResultAndAssessor(classExercise, submission, TEST_PREFIX + "student1",
                 TEST_PREFIX + "tutor1");
 

From 6480f4b42a02b20a072482a14e81552121a2151a Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Sun, 15 Sep 2024 00:17:17 +0700
Subject: [PATCH 89/99] Filter out null values, to correctly display
 assessments in Assessments Dashboard

---
 .../java/de/tum/cit/aet/artemis/exercise/domain/Submission.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java
index 8c7d55930eaa..dddd17219d21 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java
@@ -224,7 +224,7 @@ public List<Result> getManualResults() {
      */
     @JsonIgnore
     public List<Result> getNonAthenaResults() {
-        return results.stream().filter(result -> result == null || !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
+        return results.stream().filter(result -> result != null && !result.isAthenaAutomatic()).collect(Collectors.toCollection(ArrayList::new));
     }
 
     /**

From 33e53a780441ce11e0f4f1667aeac8f68e468ed0 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Sun, 15 Sep 2024 02:49:29 +0700
Subject: [PATCH 90/99] Only filter out null values, to correctly display
 assessments in Assessments Dashboard for no exam exercises

---
 .../aet/artemis/exercise/web/AbstractSubmissionResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java
index 337f58213e7b..16d94455b4bd 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java
@@ -82,7 +82,7 @@ protected ResponseEntity<List<Submission>> getAllSubmissions(Long exerciseId, bo
                 submission.getParticipation().setExercise(null);
             }
             // Important for exercises with Athena results
-            if (assessedByTutor) {
+            if (assessedByTutor && !exercise.isExamExercise()) {
                 submission.setResults(submission.getNonAthenaResults());
             }
         });

From 9fa7e44c35e48017e122002745107eed5a90d69d Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Sun, 15 Sep 2024 03:10:59 +0700
Subject: [PATCH 91/99] Update comment

---
 .../java/de/tum/cit/aet/artemis/exercise/domain/Submission.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java
index dddd17219d21..326507d47dd4 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java
@@ -220,7 +220,7 @@ public List<Result> getManualResults() {
     /**
      * This method is necessary to ignore Athena results in the assessment view
      *
-     * @return non athena automatic results including null results
+     * @return non athena automatic results excluding null results
      */
     @JsonIgnore
     public List<Result> getNonAthenaResults() {

From 52bd827ba82d42ffdffb41bf6f94ab64451dd7a6 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Mon, 16 Sep 2024 01:52:47 +0200
Subject: [PATCH 92/99] Implement change requests

---
 .../artemis/exercise/service/ParticipationService.java | 10 +++++-----
 .../artemis/exercise/web/ParticipationResource.java    |  3 +--
 .../service/ModelingExerciseFeedbackService.java       |  9 +++------
 .../modeling/service/ModelingSubmissionService.java    |  2 +-
 .../modeling/web/ModelingSubmissionResource.java       |  3 +++
 .../text/service/TextExerciseFeedbackService.java      |  2 --
 .../modeling-assessment-editor.component.spec.ts       |  3 +--
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationService.java
index 30e2f1d7a1cc..9074ad8ec1f8 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationService.java
@@ -715,16 +715,16 @@ public List<StudentParticipation> findByExerciseAndStudentIdWithEagerSubmissions
     }
 
     /**
-     * Get the text exercise participation with the Latest Submissions and its results
+     * Retrieves a StudentParticipation with its latest Submission and associated Result.
      *
-     * @param participationId the id of the participation
-     * @return the participation with latest submission and result
-     * @throws EntityNotFoundException
+     * @param participationId The unique identifier of the participation to retrieve.
+     * @return A StudentParticipation object containing the latest submission and result.
+     * @throws EntityNotFoundException If no StudentParticipation is found with the given ID.
      */
     public StudentParticipation findExerciseParticipationWithLatestSubmissionAndResultElseThrow(Long participationId) throws EntityNotFoundException {
         Optional<Participation> participation = participationRepository.findByIdWithLatestSubmissionAndResult(participationId);
         if (participation.isEmpty() || !(participation.get() instanceof StudentParticipation studentParticipation)) {
-            throw new EntityNotFoundException("No text exercise participation found with id " + participationId);
+            throw new EntityNotFoundException("No exercise participation found with id " + participationId);
         }
         return studentParticipation;
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
index 29ea91e99abe..2f360c2effb8 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
@@ -368,7 +368,7 @@ public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long e
 
         Exercise exercise = exerciseRepository.findByIdElseThrow(exerciseId);
 
-        if (!(exercise instanceof TextExercise) && !(exercise instanceof ProgrammingExercise) && !(exercise instanceof ModelingExercise)) {
+        if (exercise instanceof QuizExercise) {
             throw new BadRequestAlertException("Unsupported exercise type", "participation", "unsupported type");
         }
 
@@ -376,7 +376,6 @@ public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long e
     }
 
     private ResponseEntity<StudentParticipation> handleExerciseFeedbackRequest(Exercise exercise, Principal principal) {
-
         // Validate exercise and timing
         if (exercise.isExamExercise()) {
             throw new BadRequestAlertException("Not intended for the use in exams", "participation", "preconditions not met");
diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
index 216e98af20dd..c080362717e7 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
@@ -22,7 +22,6 @@
 import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService;
 import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
 import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException;
-import de.tum.cit.aet.artemis.exercise.domain.participation.Participation;
 import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation;
 import de.tum.cit.aet.artemis.exercise.service.ParticipationService;
 import de.tum.cit.aet.artemis.exercise.service.SubmissionService;
@@ -35,8 +34,6 @@ public class ModelingExerciseFeedbackService {
 
     private static final Logger log = LoggerFactory.getLogger(ModelingExerciseFeedbackService.class);
 
-    public static final String NON_GRADED_FEEDBACK_SUGGESTION = "NonGradedFeedbackSuggestion:";
-
     private final Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService;
 
     private final ResultWebsocketService resultWebsocketService;
@@ -113,7 +110,7 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
         automaticResult.setSubmission(submission);
         automaticResult.setParticipation(participation);
         try {
-            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+            this.resultWebsocketService.broadcastNewResult(participation, automaticResult);
 
             log.debug("Submission id: {}", submission.getId());
 
@@ -142,10 +139,10 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
             automaticResult = this.resultRepository.save(automaticResult);
             resultService.storeFeedbackInResult(automaticResult, feedbacks, true);
             submissionService.saveNewResult(submission, automaticResult);
-            this.resultWebsocketService.broadcastNewResult((Participation) participation, automaticResult);
+            this.resultWebsocketService.broadcastNewResult(participation, automaticResult);
         }
         catch (Exception e) {
-            log.error("Could not generate feedback", e);
+            log.error("Could not generate feedback for exercise ID: {} and participation ID: {}", modelingExercise.getId(), participation.getId(), e);
             throw new InternalServerErrorException("Something went wrong... AI Feedback could not be generated");
         }
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
index b953d2076f06..320d041325e9 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java
@@ -130,7 +130,7 @@ public ModelingSubmission handleModelingSubmission(ModelingSubmission modelingSu
             modelingSubmission.setSubmitted(true);
         }
 
-        // if athena results are present than create new submission on submit
+        // if athena results are present, then create a new submission on submit
         if (modelingSubmission.getParticipation() != null && modelingSubmission.getParticipation().getResults() != null
                 && !modelingSubmission.getParticipation().getResults().isEmpty()) {
             log.debug("Creating a new submission due to Athena results for user: {}", user.getLogin());
diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java
index 2e59935071b4..9de8e6fc31fa 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingSubmissionResource.java
@@ -343,6 +343,9 @@ public ResponseEntity<ModelingSubmission> getLatestSubmissionForModelingEditor(@
 
         // make sure only the latest submission and latest result is sent to the client
         participation.setSubmissions(null);
+        if (ExerciseDateService.isAfterAssessmentDueDate(modelingExercise)) {
+            participation.setResults(null);
+        }
 
         // do not send the result to the client if the assessment is not finished
         if (modelingSubmission.getLatestResult() != null
diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java
index 27e1af1c7589..14a2558f6c9d 100644
--- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java
@@ -35,8 +35,6 @@ public class TextExerciseFeedbackService {
 
     private static final Logger log = LoggerFactory.getLogger(TextExerciseFeedbackService.class);
 
-    public static final String NON_GRADED_FEEDBACK_SUGGESTION = "NonGradedFeedbackSuggestion:";
-
     private final Optional<AthenaFeedbackSuggestionsService> athenaFeedbackSuggestionsService;
 
     private final ResultWebsocketService resultWebsocketService;
diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
index 0fdd9f641f8b..65e4e0edb5b5 100644
--- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
@@ -207,7 +207,6 @@ describe('ModelingAssessmentEditorComponent', () => {
             paramMapSubject.next(
                 convertToParamMap({
                     submissionId: 'new',
-                    // Include other necessary params here
                     courseId: '1',
                     exerciseId: '1',
                 }),
@@ -232,7 +231,7 @@ describe('ModelingAssessmentEditorComponent', () => {
             tick(500);
 
             expect(modelingSubmissionSpy).toHaveBeenCalledOnce();
-            expect(component.submission).toBeDefined();
+            expect(component.submission).toBe(mockSubmission);
             expect(component.assessmentsAreValid).toBeFalse();
         }));
     });

From 9532cc37abc713b748e368ff85143c780d293dc5 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Mon, 16 Sep 2024 10:13:30 +0200
Subject: [PATCH 93/99] Add FileUploadExercise to unsupported Feedback
 Generation Exercise types

---
 .../cit/aet/artemis/exercise/web/ParticipationResource.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
index 2f360c2effb8..dff66bf5bba7 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
@@ -81,6 +81,7 @@
 import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService;
 import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService;
 import de.tum.cit.aet.artemis.exercise.service.ParticipationService;
+import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise;
 import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise;
 import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseFeedbackService;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise;
@@ -368,7 +369,7 @@ public ResponseEntity<StudentParticipation> requestFeedback(@PathVariable Long e
 
         Exercise exercise = exerciseRepository.findByIdElseThrow(exerciseId);
 
-        if (exercise instanceof QuizExercise) {
+        if (exercise instanceof QuizExercise || exercise instanceof FileUploadExercise) {
             throw new BadRequestAlertException("Unsupported exercise type", "participation", "unsupported type");
         }
 

From 5085800895e41d76fbef55ec3d3dd7bf73feadcd Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Mon, 16 Sep 2024 14:45:24 +0200
Subject: [PATCH 94/99] Refactor resultIsPreliminary function to use optional
 chaining for exercise type check

---
 .../webapp/app/exercises/shared/result/result.utils.ts     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 34912d004d5e..be0126c54db9 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -327,11 +327,8 @@ export const getResultIconClass = (result: Result | undefined, templateStatus: R
  * @param result the result. It must include a participation and exercise.
  */
 export const resultIsPreliminary = (result: Result) => {
-    if (
-        result.participation &&
-        result.participation.exercise &&
-        (result.participation.exercise.type === ExerciseType.TEXT || result.participation.exercise.type === ExerciseType.MODELING)
-    ) {
+    const exerciseType = result.participation?.exercise?.type;
+    if (exerciseType === ExerciseType.TEXT || exerciseType === ExerciseType.MODELING) {
         return result.assessmentType === AssessmentType.AUTOMATIC_ATHENA;
     } else
         return (

From cadab42d633cd301106fbbca9f76561fea1673cb Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Tue, 17 Sep 2024 10:06:12 +0200
Subject: [PATCH 95/99] Add setSuccessful(true), as this indicates to the
 client that the generation was successful

---
 .../modeling/service/ModelingExerciseFeedbackService.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
index c080362717e7..810b21eb7440 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
@@ -135,6 +135,7 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
             automaticResult.setCompletionDate(ZonedDateTime.now());
 
             automaticResult.setScore(Math.clamp(totalFeedbacksScore, 0, 100));
+            automaticResult.setSuccessful(true);
 
             automaticResult = this.resultRepository.save(automaticResult);
             resultService.storeFeedbackInResult(automaticResult, feedbacks, true);

From 5c71554ef93e80bd52115fcef68fde680afd1d12 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Tue, 17 Sep 2024 11:19:38 +0200
Subject: [PATCH 96/99] Restructure ModelingExerciseFeedbackService

---
 .../exercise/web/ParticipationResource.java   |   2 +-
 .../ModelingExerciseFeedbackService.java      | 117 ++++++++++++------
 2 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
index dff66bf5bba7..6559c28b9d93 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
@@ -423,7 +423,7 @@ else if (exercise instanceof ProgrammingExercise) {
             updatedParticipation = textExerciseFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(), participation, (TextExercise) exercise);
         }
         else if (exercise instanceof ModelingExercise) {
-            updatedParticipation = modelingExerciseFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(), participation, (ModelingExercise) exercise);
+            updatedParticipation = modelingExerciseFeedbackService.handleNonGradedFeedbackRequest(participation, (ModelingExercise) exercise);
         }
         else {
             updatedParticipation = programmingExerciseCodeReviewFeedbackService.handleNonGradedFeedbackRequest(exercise.getId(),
diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
index 810b21eb7440..35c525d30695 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
@@ -19,9 +19,12 @@
 import de.tum.cit.aet.artemis.assessment.repository.ResultRepository;
 import de.tum.cit.aet.artemis.assessment.service.ResultService;
 import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService;
+import de.tum.cit.aet.artemis.athena.dto.ModelingFeedbackDTO;
 import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService;
 import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
 import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException;
+import de.tum.cit.aet.artemis.core.exception.NetworkingException;
+import de.tum.cit.aet.artemis.exercise.domain.Submission;
 import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation;
 import de.tum.cit.aet.artemis.exercise.service.ParticipationService;
 import de.tum.cit.aet.artemis.exercise.service.SubmissionService;
@@ -60,9 +63,7 @@ private void checkRateLimitOrThrow(StudentParticipation participation) {
 
         List<Result> athenaResults = participation.getResults().stream().filter(result -> result.getAssessmentType() == AssessmentType.AUTOMATIC_ATHENA).toList();
 
-        long countOfAthenaResults = athenaResults.size();
-
-        if (countOfAthenaResults >= 10) {
+        if (athenaResults.size() >= 10) {
             throw new BadRequestAlertException("Maximum number of AI feedback requests reached.", "participation", "preconditions not met");
         }
     }
@@ -71,12 +72,11 @@ private void checkRateLimitOrThrow(StudentParticipation participation) {
      * Handles the request for generating feedback for a modeling exercise.
      * Unlike programming exercises a tutor is not notified if Athena is not available.
      *
-     * @param exerciseId       the id of the modeling exercise.
      * @param participation    the student participation associated with the exercise.
      * @param modelingExercise the modeling exercise object.
      * @return StudentParticipation updated modeling exercise for an AI assessment
      */
-    public StudentParticipation handleNonGradedFeedbackRequest(Long exerciseId, StudentParticipation participation, ModelingExercise modelingExercise) {
+    public StudentParticipation handleNonGradedFeedbackRequest(StudentParticipation participation, ModelingExercise modelingExercise) {
         if (this.athenaFeedbackSuggestionsService.isPresent()) {
             this.checkRateLimitOrThrow(participation);
             CompletableFuture.runAsync(() -> this.generateAutomaticNonGradedFeedback(participation, modelingExercise));
@@ -95,46 +95,28 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
         log.debug("Using athena to generate (modeling exercise) feedback request: {}", modelingExercise.getId());
 
         // athena takes over the control here
-        var submissionOptional = participationService.findExerciseParticipationWithLatestSubmissionAndResultElseThrow(participation.getId()).findLatestSubmission();
+        Optional<Submission> submissionOptional = participationService.findExerciseParticipationWithLatestSubmissionAndResultElseThrow(participation.getId())
+                .findLatestSubmission();
 
         if (submissionOptional.isEmpty()) {
             throw new BadRequestAlertException("No legal submissions found", "submission", "noSubmission");
         }
-        var submission = submissionOptional.get();
-
-        Result automaticResult = new Result();
-        automaticResult.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA);
-        automaticResult.setRated(true);
-        automaticResult.setScore(0.0);
-        automaticResult.setSuccessful(null);
-        automaticResult.setSubmission(submission);
-        automaticResult.setParticipation(participation);
+
+        Submission submission = submissionOptional.get();
+
+        Result automaticResult = createInitialResult(participation, submission);
+
         try {
             this.resultWebsocketService.broadcastNewResult(participation, automaticResult);
 
             log.debug("Submission id: {}", submission.getId());
 
-            var athenaResponse = this.athenaFeedbackSuggestionsService.orElseThrow().getModelingFeedbackSuggestions(modelingExercise, (ModelingSubmission) submission, false);
-
-            List<Feedback> feedbacks = athenaResponse.stream().filter(individualFeedbackItem -> individualFeedbackItem.description() != null).map(individualFeedbackItem -> {
-                var feedback = new Feedback();
-                feedback.setText(individualFeedbackItem.title());
-                feedback.setDetailText(individualFeedbackItem.description());
-                feedback.setHasLongFeedbackText(false);
-                feedback.setType(FeedbackType.AUTOMATIC);
-                feedback.setCredits(individualFeedbackItem.credits());
-                return feedback;
-            }).toList();
-
-            double totalFeedbacksScore = 0.0;
-            for (Feedback feedback : feedbacks) {
-                totalFeedbacksScore += feedback.getCredits();
-            }
-            totalFeedbacksScore = totalFeedbacksScore / modelingExercise.getMaxPoints() * 100;
-            automaticResult.setSuccessful(true);
-            automaticResult.setCompletionDate(ZonedDateTime.now());
+            List<Feedback> feedbacks = getAthenaFeedback(modelingExercise, (ModelingSubmission) submission);
 
-            automaticResult.setScore(Math.clamp(totalFeedbacksScore, 0, 100));
+            double totalFeedbackScore = calculateTotalFeedbackScore(feedbacks, modelingExercise);
+
+            automaticResult.setCompletionDate(ZonedDateTime.now());
+            automaticResult.setScore(Math.max(0, Math.min(totalFeedbackScore, 100)));
             automaticResult.setSuccessful(true);
 
             automaticResult = this.resultRepository.save(automaticResult);
@@ -147,4 +129,69 @@ public void generateAutomaticNonGradedFeedback(StudentParticipation participatio
             throw new InternalServerErrorException("Something went wrong... AI Feedback could not be generated");
         }
     }
+
+    /**
+     * Creates an initial Result object for the automatic feedback.
+     *
+     * @param participation the student participation
+     * @param submission    the submission to which the result is associated
+     * @return the initial Result object
+     */
+    private Result createInitialResult(StudentParticipation participation, Submission submission) {
+        Result result = new Result();
+        result.setAssessmentType(AssessmentType.AUTOMATIC_ATHENA);
+        result.setRated(true);
+        result.setScore(0.0);
+        result.setSuccessful(null);
+        result.setSubmission(submission);
+        result.setParticipation(participation);
+        return result;
+    }
+
+    /**
+     * Retrieves feedback from the Athena service.
+     *
+     * @param modelingExercise the modeling exercise
+     * @param submission       the modeling submission
+     * @return a list of Feedback objects
+     * @throws NetworkingException if there's a problem communicating with Athena
+     */
+    private List<Feedback> getAthenaFeedback(ModelingExercise modelingExercise, ModelingSubmission submission) throws NetworkingException {
+        return this.athenaFeedbackSuggestionsService.orElseThrow().getModelingFeedbackSuggestions(modelingExercise, submission, false).stream()
+                .filter(feedbackItem -> feedbackItem.description() != null).map(this::convertToFeedback).toList();
+    }
+
+    /**
+     * Converts an Athena feedback suggestion to a Feedback object.
+     *
+     * @param feedbackItem the Athena feedback suggestion
+     * @return the Feedback object
+     */
+    private Feedback convertToFeedback(ModelingFeedbackDTO feedbackItem) {
+        Feedback feedback = new Feedback();
+        feedback.setText(feedbackItem.title());
+        feedback.setDetailText(feedbackItem.description());
+        feedback.setHasLongFeedbackText(false);
+        feedback.setType(FeedbackType.AUTOMATIC);
+        feedback.setCredits(feedbackItem.credits());
+        return feedback;
+    }
+
+    /**
+     * Calculates the total feedback score based on the list of feedbacks and the exercise's max points.
+     *
+     * @param feedbacks        the list of feedbacks
+     * @param modelingExercise the modeling exercise
+     * @return the total feedback score
+     */
+    private double calculateTotalFeedbackScore(List<Feedback> feedbacks, ModelingExercise modelingExercise) {
+        double totalCredits = feedbacks.stream().mapToDouble(Feedback::getCredits).sum();
+        Double maxPoints = modelingExercise.getMaxPoints();
+
+        if (maxPoints == null || maxPoints == 0) {
+            throw new IllegalArgumentException("Maximum points must be greater than zero.");
+        }
+
+        return (totalCredits / maxPoints) * 100;
+    }
 }

From 1240732eaa0282f161997b43744accfbf358b19a Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Tue, 17 Sep 2024 14:09:56 +0200
Subject: [PATCH 97/99] Refactor exam exercise check to use examMode var

---
 .../aet/artemis/exercise/web/AbstractSubmissionResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java
index 16d94455b4bd..3dc507d37b64 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java
@@ -82,7 +82,7 @@ protected ResponseEntity<List<Submission>> getAllSubmissions(Long exerciseId, bo
                 submission.getParticipation().setExercise(null);
             }
             // Important for exercises with Athena results
-            if (assessedByTutor && !exercise.isExamExercise()) {
+            if (assessedByTutor && !examMode) {
                 submission.setResults(submission.getNonAthenaResults());
             }
         });

From bb6e04841b7b81cb21a7c1f3648eec91496a3fe5 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 19 Sep 2024 12:31:23 +0200
Subject: [PATCH 98/99] Adjust SubmissionService to filter out Athena results
 for complaints

---
 .../tum/cit/aet/artemis/exercise/service/SubmissionService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java
index fc72035f5f70..2669e856337f 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java
@@ -787,6 +787,7 @@ private List<SubmissionWithComplaintDTO> getSubmissionsWithComplaintsFromComplai
             // add each submission with its complaint to the DTO
             submissions.stream().filter(submission -> submission.getResultWithComplaint() != null).forEach(submission -> {
                 // get the complaint which belongs to the submission
+                submission.setResults(submission.getNonAthenaResults());
                 Complaint complaintOfSubmission = complaintMap.get(submission.getResultWithComplaint().getId());
                 prepareComplaintAndSubmission(complaintOfSubmission, submission);
                 submissionWithComplaintDTOs.add(new SubmissionWithComplaintDTO(submission, complaintOfSubmission));

From c7044a20b951df513b1530d55919bea12762f8f8 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Thu, 19 Sep 2024 16:23:15 +0200
Subject: [PATCH 99/99] Adjust hasAthenaResultForlatestSubmission check

---
 .../ModelingExerciseFeedbackService.java      |  1 -
 ...rcise-details-student-actions.component.ts | 25 +++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
index 35c525d30695..e6e229e79f6a 100644
--- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseFeedbackService.java
@@ -94,7 +94,6 @@ public StudentParticipation handleNonGradedFeedbackRequest(StudentParticipation
     public void generateAutomaticNonGradedFeedback(StudentParticipation participation, ModelingExercise modelingExercise) {
         log.debug("Using athena to generate (modeling exercise) feedback request: {}", modelingExercise.getId());
 
-        // athena takes over the control here
         Optional<Submission> submissionOptional = participationService.findExerciseParticipationWithLatestSubmissionAndResultElseThrow(participation.getId())
                 .findLatestSubmission();
 
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index 45f7bb532109..fcdf131a87c4 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -388,12 +388,27 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
 
     hasAthenaResultForlatestSubmission(): boolean {
         if (this.gradedParticipation?.submissions && this.gradedParticipation?.results) {
-            // submissions.results is always undefined so this is neccessary
-            return (
-                this.gradedParticipation.submissions.last()?.id ===
-                this.gradedParticipation?.results.filter((result) => result.assessmentType == AssessmentType.AUTOMATIC_ATHENA).first()?.submission?.id
-            );
+            const sortedSubmissions = this.gradedParticipation.submissions.slice().sort((a, b) => {
+                const dateA = this.getDateValue(a.submissionDate) ?? -Infinity;
+                const dateB = this.getDateValue(b.submissionDate) ?? -Infinity;
+                return dateB - dateA;
+            });
+
+            return this.gradedParticipation.results.some((result) => result.submission?.id === sortedSubmissions[0]?.id);
         }
         return false;
     }
+
+    private getDateValue = (date: any): number => {
+        if (dayjs.isDayjs(date)) {
+            return date.valueOf();
+        }
+        if (date instanceof Date) {
+            return date.valueOf();
+        }
+        if (typeof date === 'string') {
+            return new Date(date).valueOf();
+        }
+        return -Infinity; // fallback for null, undefined, or invalid dates
+    };
 }