From 2aef101f04abafb3a3002bb88809e84e907feef9 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Sun, 10 Nov 2024 21:43:39 +0100 Subject: [PATCH 01/64] added tests and documentation --- .../dto/FeedbackAffectedStudentDTO.java | 4 + .../assessment/dto/FeedbackDetailDTO.java | 2 +- .../assessment/service/ResultService.java | 118 +++++++++--------- .../assessment/web/ResultResource.java | 42 ++++++- .../cit/aet/artemis/core/util/PageUtil.java | 3 + .../StudentParticipationRepository.java | 46 ++++++- ...ack-affected-students-modal.component.html | 42 +++++++ ...dback-affected-students-modal.component.ts | 59 +++++++++ .../feedback-analysis.component.html | 34 ++--- .../feedback-analysis.component.ts | 10 +- .../feedback-analysis.service.ts | 22 +++- .../webapp/app/shared/table/pageable-table.ts | 6 + .../webapp/i18n/de/programmingExercise.json | 7 ++ .../webapp/i18n/en/programmingExercise.json | 7 ++ .../feedback-analysis.component.spec.ts | 18 ++- .../feedback-analysis.service.spec.ts | 72 ++++++++++- ...-affected-students-modal.component.spec.ts | 75 +++++++++++ .../modals/feedback-modal.component.spec.ts | 1 + 18 files changed, 473 insertions(+), 95 deletions(-) create mode 100644 src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts create mode 100644 src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java new file mode 100644 index 000000000000..76dc1e2deb72 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java @@ -0,0 +1,4 @@ +package de.tum.cit.aet.artemis.assessment.dto; + +public record FeedbackAffectedStudentDTO(long courseId, long participationId, String firstName, String lastName, String login, String repositoryName) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index 6d31e250f5d5..4b785d3d6b6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -3,5 +3,5 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackDetailDTO(long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { +public record FeedbackDetailDTO(Object concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index d0c25898b6a3..f9640a69ee06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -12,7 +12,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.function.Function; import java.util.stream.Collectors; import jakarta.annotation.Nullable; @@ -24,6 +23,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackAnalysisResponseDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackPageableDTO; @@ -46,6 +47,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -495,49 +497,45 @@ public Map getLogsAvailabilityForResults(List results, Par @NotNull private List saveFeedbackWithHibernateWorkaround(@NotNull Result result, List feedbackList) { + // Avoid hibernate exception List savedFeedbacks = new ArrayList<>(); + // Collect ids of feedbacks that have long feedback. + List feedbackIdsWithLongFeedback = feedbackList.stream().filter(feedback -> feedback.getId() != null && feedback.getHasLongFeedbackText()).map(Feedback::getId) + .toList(); + // Get long feedback list from the database. + List longFeedbackTextList = longFeedbackTextRepository.findByFeedbackIds(feedbackIdsWithLongFeedback); - // Fetch long feedback texts associated with the provided feedback list - Map longFeedbackTextMap = longFeedbackTextRepository - .findByFeedbackIds(feedbackList.stream().filter(feedback -> feedback.getId() != null && feedback.getHasLongFeedbackText()).map(Feedback::getId).toList()).stream() - .collect(Collectors.toMap(longFeedbackText -> longFeedbackText.getFeedback().getId(), Function.identity())); - + // Convert list to map for accessing later. + Map longLongFeedbackTextMap = longFeedbackTextList.stream() + .collect(Collectors.toMap(longFeedbackText -> longFeedbackText.getFeedback().getId(), longFeedbackText -> longFeedbackText)); feedbackList.forEach(feedback -> { - handleFeedbackPersistence(feedback, result, longFeedbackTextMap); - savedFeedbacks.add(feedback); - }); - - return savedFeedbacks; - } - - private void handleFeedbackPersistence(Feedback feedback, Result result, Map longFeedbackTextMap) { - // Temporarily detach feedback from the parent result to avoid Hibernate issues - feedback.setResult(null); + // cut association to parent object + feedback.setResult(null); + LongFeedbackText longFeedback = null; + // look for long feedback that parent feedback has and cut the association between them. + if (feedback.getId() != null && feedback.getHasLongFeedbackText()) { + longFeedback = longLongFeedbackTextMap.get(feedback.getId()); + if (longFeedback != null) { + feedback.clearLongFeedback(); + } + } + // persist the child object without an association to the parent object. + feedback = feedbackRepository.saveAndFlush(feedback); + // restore the association to the parent object + feedback.setResult(result); - // Clear the long feedback if it exists in the map - if (feedback.getId() != null && feedback.getHasLongFeedbackText()) { - LongFeedbackText longFeedback = longFeedbackTextMap.get(feedback.getId()); + // restore the association of the long feedback to the parent feedback if (longFeedback != null) { - feedback.clearLongFeedback(); + feedback.setDetailText(longFeedback.getText()); } - } - - // Persist the feedback entity without the parent association - feedback = feedbackRepository.saveAndFlush(feedback); - - // Restore associations to the result and long feedback after persistence - feedback.setResult(result); - LongFeedbackText longFeedback = longFeedbackTextMap.get(feedback.getId()); - if (longFeedback != null) { - feedback.setDetailText(longFeedback.getText()); - } + savedFeedbacks.add(feedback); + }); + return savedFeedbacks; } @NotNull private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) { if (shouldSave) { - // long feedback text is deleted as it otherwise causes duplicate entries errors and will be saved again with {@link resultRepository.save} - deleteLongFeedback(result.getFeedbacks(), result); // Note: This also saves the feedback objects in the database because of the 'cascade = CascadeType.ALL' option. return resultRepository.save(result); } @@ -618,8 +616,10 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee maxOccurrence, filterErrorCategories, pageable); // 10. Process and map feedback details, calculating relative count and assigning task names - List processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.count(), - (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); + List processedDetails = feedbackDetailPage.getContent().stream() + .map(detail -> new FeedbackDetailDTO(List.of(String.valueOf(detail.concatenatedFeedbackIds()).split(",")), detail.count(), + (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())) + .toList(); // 11. Predefined error categories available for filtering on the client side final List ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error"); @@ -643,31 +643,33 @@ public long getMaxCountForExercise(long exerciseId) { } /** - * Deletes long feedback texts for the provided list of feedback items to prevent duplicate entries in the {@link LongFeedbackTextRepository}. + * Retrieves a paginated list of students affected by specific feedback entries for a given exercise. *
- * This method processes the provided list of feedback items, identifies those with associated long feedback texts, and removes them in bulk - * from the repository to avoid potential duplicate entry errors when saving new feedback entries. - *

- * Primarily used to ensure data consistency in the {@link LongFeedbackTextRepository}, especially during operations where feedback entries are - * overridden or updated. The deletion is performed only for feedback items with a non-null ID and an associated long feedback text. - *

- * This approach reduces the need for individual deletion calls and performs batch deletion in a single database operation. - *

- * **Note:** This method should only be used for manually assessed submissions, not for fully automatic assessments, due to its dependency on the - * {@link Result#updateAllFeedbackItems} method, which is designed for manual feedback management. Using this method with automatic assessments could - * lead to unintended behavior or data inconsistencies. + * This method filters students based on feedback IDs and returns participation details for each affected student. It uses + * pagination and sorting to allow efficient retrieval and sorting of the results, thus supporting large datasets. + *
+ * Supports: + *

    + *
  • Pagination: Controls the page number and page size for the returned results.
    • + *
  • Sorting: Applies sorting by specified columns and sorting order based on the {@link PageUtil.ColumnMapping#AFFECTED_STUDENTS} configuration.
    • + *
* - * @param feedbackList The list of {@link Feedback} objects for which the long feedback texts are to be deleted. Only feedback items that have long feedback texts and a - * non-null ID will be processed. - * @param result The {@link Result} object associated with the feedback items, used to update feedback list before processing. + * @param exerciseId The ID of the exercise for which the affected student participation data is requested. + * @param feedbackIds A list of feedback IDs used to filter the participation to only those affected by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters: + *
    + *
  • Page number and page size for pagination
    • + *
  • Sorting order and column for sorting (e.g., "participationId")
    • + *
+ * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback, with: + *
    + *
  • Details about the affected students, including participation data and student information.
    • + *
  • Total count of affected students, allowing for pagination on the client side.
    • + *
*/ - public void deleteLongFeedback(List feedbackList, Result result) { - if (feedbackList == null) { - return; - } - List feedbackIdsWithLongText = feedbackList.stream().filter(feedback -> feedback.getHasLongFeedbackText() && feedback.getId() != null).map(Feedback::getId).toList(); - longFeedbackTextRepository.deleteByFeedbackIds(feedbackIdsWithLongText); - List feedbacks = new ArrayList<>(feedbackList); - result.updateAllFeedbackItems(feedbacks, true); + public Page getParticipationWithFeedbackId(long exerciseId, List feedbackIds, PageableSearchDTO data) { + List feedbackIdLongs = feedbackIds.stream().map(Long::valueOf).toList(); + PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); + return studentParticipationRepository.findParticipationByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 2a235145a04b..6bc8bb2bc160 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; +import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -28,6 +29,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackAnalysisResponseDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackPageableDTO; import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; @@ -36,13 +38,14 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -328,7 +331,7 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo * */ @GetMapping("exercises/{exerciseId}/feedback-details") - @EnforceAtLeastInstructorInExercise + @EnforceAtLeastEditorInExercise public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @ModelAttribute FeedbackPageableDTO data) { FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data); return ResponseEntity.ok(response); @@ -343,9 +346,42 @@ public ResponseEntity getFeedbackDetailsPaged(@Path * @return A {@link ResponseEntity} containing the maximum count of feedback occurrences (long). */ @GetMapping("exercises/{exerciseId}/feedback-details-max-count") - @EnforceAtLeastInstructorInExercise + @EnforceAtLeastEditorInExercise public ResponseEntity getMaxCount(@PathVariable long exerciseId) { long maxCount = resultService.getMaxCountForExercise(exerciseId); return ResponseEntity.ok(maxCount); } + + /** + * GET /exercises/{exerciseId}/feedback-details-participation : Retrieves paginated details of students affected by specific feedback entries for a specified exercise. + *
+ * This endpoint returns details of students whose submissions were impacted by specified feedback entries, including student information + * and participation details. This supports efficient loading of affected students' data by returning only the required information. + *
+ * Supports pagination and sorting, allowing the client to control the amount and order of returned data: + *
    + *
  • Pagination: Controls page number and page size for the response.
    • + *
  • Sorting: Allows sorting by specified columns (e.g., "participationId") in ascending or descending order.
    • + *
+ * + * @param exerciseId The ID of the exercise for which the participation data is requested. + * @param feedbackIds A list of feedback IDs to filter affected students by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters: + *
    + *
  • Page number and page size
    • + *
  • Sorted column and sorting order
    • + *
+ * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries, including: + *
    + *
  • List of affected students with participation details.
    • + *
  • Total number of students affected (for pagination).
    • + *
+ */ + @GetMapping("exercises/{exerciseId}/feedback-details-participation") + @EnforceAtLeastEditorInExercise + public ResponseEntity> getParticipationWithFeedback(@PathVariable long exerciseId, @RequestParam List feedbackIds, + @ModelAttribute PageableSearchDTO data) { + Page participation = resultService.getParticipationWithFeedbackId(exerciseId, feedbackIds, data); + return ResponseEntity.ok(participation); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java index 7417fe060e93..88f7bb7302e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java @@ -82,6 +82,9 @@ SELECT MAX(t.taskName) JOIN t.testCases tct WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName ), '')""" + )), + AFFECTED_STUDENTS(Map.of( + "participationId", "p.id" )); // @formatter:on diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 3681b3a94221..977433d27f4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; @@ -1217,7 +1218,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) * - Occurrence range: Filters feedback where the number of occurrences (COUNT) is between the specified minimum and maximum values (inclusive). * - Error categories: Filters feedback based on error categories, which can be "Student Error", "Ares Error", or "AST Error". *
- * Grouping is done by feedback detail text, test case name, and error category. The occurrence count is filtered using the HAVING clause. + * Grouping is done by feedback detail text, test case name and error category. The occurrence count is filtered using the HAVING clause. * * @param exerciseId The ID of the exercise for which feedback details should be retrieved. * @param searchTerm The search term used for filtering the feedback detail text (optional). @@ -1233,6 +1234,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) */ @Query(""" SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( + GROUP_CONCAT(f.id), COUNT(f.id), 0, f.detailText, @@ -1329,4 +1331,46 @@ SELECT MAX(pr.id) ) AS feedbackCounts """) long findMaxCountForExercise(@Param("exerciseId") long exerciseId); + + /** + * Retrieves a paginated list of students affected by specific feedback entries for a given programming exercise. + *
+ * This query joins `ProgrammingExerciseStudentParticipation`, `Submission`, `Result`, and `Feedback` entities to filter + * participation records based on feedback IDs and exercise ID. The results include information about each affected student, + * such as their course ID, participation ID, student details, and repository URI. + *
+ * Supports: + *
    + *
  • Pagination: The results are paginated using a {@link Pageable} parameter, allowing control over the page number and size.
    • + *
  • Sorting: The query sorts results by the student's first name in ascending order.
    • + *
+ * + * @param exerciseId The ID of the exercise for which the affected student participation data is requested. + * @param feedbackIds A list of feedback IDs used to filter the participation to only those affected by specific feedback entries. + * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. + * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback, containing: + *
    + *
  • Course ID, participation ID, and student information (first name, last name, login).
    • + *
  • Repository URI, linking the affected student's repository.
    • + *
  • Total count of affected students to facilitate pagination on the client side.
    • + *
+ */ + @Query(""" + SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( + p.exercise.course.id, + p.id, + p.student.firstName, + p.student.lastName, + p.student.login, + p.repositoryUri + ) + FROM ProgrammingExerciseStudentParticipation p + LEFT JOIN p.submissions s + JOIN s.results r + JOIN r.feedbacks f + WHERE p.exercise.id = :exerciseId + AND f.id IN :feedbackIds + ORDER BY p.student.firstName ASC + """) + Page findParticipationByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html new file mode 100644 index 000000000000..89cf9c63ff83 --- /dev/null +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -0,0 +1,42 @@ +
+

+ +
+
+ + + + + + + + + + + + + + + @for (item of participation().content; track item) { + + + + + + } + +
{{ item.firstName }} {{ item.lastName }}{{ item.login }} + +
+
+ +
+ +
+
+
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts new file mode 100644 index 000000000000..cbf558d928d6 --- /dev/null +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -0,0 +1,59 @@ +import { Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { AlertService } from 'app/core/util/alert.service'; +import { PageableResult, PageableSearch, SortingOrder } from 'app/shared/table/pageable-table'; + +@Component({ + selector: 'jhi-affected-students-modal', + templateUrl: './feedback-affected-students-modal.component.html', + imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule], + providers: [FeedbackAnalysisService], + standalone: true, +}) +export class AffectedStudentsModalComponent { + exerciseId = input.required(); + feedbackDetail = input.required(); + readonly participation = signal>({ content: [], totalPages: 0, totalElements: 0 }); + readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.affectedStudentsModal'; + + page = signal(1); + pageSize = signal(10); + readonly collectionsSize = computed(() => this.participation().totalPages * this.pageSize()); + + activeModal = inject(NgbActiveModal); + feedbackService = inject(FeedbackAnalysisService); + alertService = inject(AlertService); + + constructor() { + effect(() => { + untracked(async () => { + await this.loadAffected(); + }); + }); + } + + private async loadAffected() { + const feedbackDetail = this.feedbackDetail(); + const pageable: PageableSearch = { + page: this.page(), + pageSize: this.pageSize(), + sortedColumn: 'participationId', + sortingOrder: SortingOrder.ASCENDING, + }; + + try { + const response = await this.feedbackService.getParticipationForFeedbackIds(this.exerciseId(), feedbackDetail.concatenatedFeedbackIds, pageable); + this.participation.set(response); + } catch (error) { + this.alertService.error('There was an error while loading the affected Students for this feedback'); + } + } + + setPage(newPage: number): void { + this.page.set(newPage); + this.loadAffected(); + } +} diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 9a17640e3d72..20206a2c4ae3 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -1,5 +1,5 @@ - - + +
@if (column !== 'errorCategory') { @@ -33,21 +33,13 @@

- - - - - - - - - - - - - + + + + + @@ -69,6 +61,7 @@

{{ item.errorCategory }}

} @@ -76,16 +69,7 @@

+
- - +
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index b36b453109fd..9026d7cbb1ec 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -2,7 +2,7 @@ import { Component, computed, effect, inject, input, signal, untracked } from '@ import { FeedbackAnalysisService, FeedbackDetail } from './feedback-analysis.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { faFilter, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter } from '@fortawesome/free-solid-svg-icons'; +import { faFilter, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter, faUsers } from '@fortawesome/free-solid-svg-icons'; import { SearchResult, SortingOrder } from 'app/shared/table/pageable-table'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { FeedbackModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component'; @@ -10,6 +10,7 @@ import { FeedbackFilterModalComponent, FilterData } from 'app/exercises/programm import { LocalStorageService } from 'ngx-webstorage'; import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; import { SortIconComponent } from 'app/shared/sort/sort-icon.component'; +import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; @Component({ selector: 'jhi-feedback-analysis', @@ -44,6 +45,7 @@ export class FeedbackAnalysisComponent { readonly faSortDown = faSortDown; readonly faFilter = faFilter; readonly faUpRightAndDownLeftFromCenter = faUpRightAndDownLeftFromCenter; + readonly faUsers = faUsers; readonly SortingOrder = SortingOrder; readonly MAX_FEEDBACK_DETAIL_TEXT_LENGTH = 200; @@ -183,4 +185,10 @@ export class FeedbackAnalysisComponent { } return count; } + + async openAffectedStudentsModal(feedbackDetail: FeedbackDetail): Promise { + const modalRef = this.modalService.open(AffectedStudentsModalComponent, { centered: true, size: 'lg' }); + modalRef.componentInstance.exerciseId = this.exerciseId; + modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); + } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 4228e50c329a..2dc7abab2a8d 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; +import { PageableResult, PageableSearch, SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; import { HttpParams } from '@angular/common/http'; import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; @@ -12,6 +12,7 @@ export interface FeedbackAnalysisResponse { errorCategories: string[]; } export interface FeedbackDetail { + concatenatedFeedbackIds: string[]; count: number; relativeCount: number; detailText: string; @@ -19,6 +20,14 @@ export interface FeedbackDetail { taskName: string; errorCategory: string; } +export interface FeedbackAffectedStudentDTO { + courseId: number; + participationId: number; + firstName: string; + lastName: string; + login: string; + repositoryName: string; +} @Injectable() export class FeedbackAnalysisService extends BaseApiHttpService { search(pageable: SearchTermPageableSearch, options: { exerciseId: number; filters: FilterData }): Promise { @@ -39,4 +48,15 @@ export class FeedbackAnalysisService extends BaseApiHttpService { getMaxCount(exerciseId: number): Promise { return this.get(`exercises/${exerciseId}/feedback-details-max-count`); } + + async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: string[], pageable: PageableSearch): Promise> { + const params = new HttpParams() + .set('feedbackIds', feedbackIds.join(',')) + .set('page', pageable.page.toString()) + .set('pageSize', pageable.pageSize.toString()) + .set('sortedColumn', pageable.sortedColumn) + .set('sortingOrder', pageable.sortingOrder); + + return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params }); + } } diff --git a/src/main/webapp/app/shared/table/pageable-table.ts b/src/main/webapp/app/shared/table/pageable-table.ts index 82c9d4f0ef5e..131648d7737b 100644 --- a/src/main/webapp/app/shared/table/pageable-table.ts +++ b/src/main/webapp/app/shared/table/pageable-table.ts @@ -1,3 +1,9 @@ +export interface PageableResult { + content: T[]; + totalElements: number; + totalPages: number; +} + export interface SearchResult { resultsOnPage: T[]; numberOfPages: number; diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 79c6a18a57c8..1f1852efc9dc 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -371,6 +371,13 @@ "clear": "Filter zurücksetzen", "cancel": "Abbrechen", "apply": "Filter anwenden" + }, + "affectedStudentsModal": { + "header": "Betroffene Studierende", + "name": "Name", + "login": "Login", + "repository": "Repository", + "totalItems": "Insgesamt {{count}} Elemente" } }, "help": { diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 244334cb61c8..0ce0db4fb6f5 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -371,6 +371,13 @@ "clear": "Clear Filter", "cancel": "Cancel", "apply": "Apply Filter" + }, + "affectedStudentsModal": { + "header": "Affected Students", + "name": "Name", + "login": "Login", + "repository": "Repository", + "totalItems": "In total {{count}} items" } }, "help": { diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index 37e7821fe502..d20bddb3a978 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -8,6 +8,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { LocalStorageService } from 'ngx-webstorage'; import '@angular/localize/init'; import { FeedbackFilterModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; +import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; describe('FeedbackAnalysisComponent', () => { let fixture: ComponentFixture; @@ -18,6 +19,7 @@ describe('FeedbackAnalysisComponent', () => { const feedbackMock: FeedbackDetail[] = [ { + concatenatedFeedbackIds: ['1', '2'], detailText: 'Test feedback 1 detail', testCaseName: 'test1', count: 10, @@ -26,6 +28,7 @@ describe('FeedbackAnalysisComponent', () => { errorCategory: 'Student Error', }, { + concatenatedFeedbackIds: ['3', '4'], detailText: 'Test feedback 2 detail', testCaseName: 'test2', count: 5, @@ -62,9 +65,9 @@ describe('FeedbackAnalysisComponent', () => { localStorageService = fixture.debugElement.injector.get(LocalStorageService); jest.spyOn(localStorageService, 'retrieve').mockReturnValue([]); - searchSpy = jest.spyOn(feedbackAnalysisService, 'search').mockResolvedValue(feedbackResponseMock); + // Initial input setup fixture.componentRef.setInput('exerciseId', 1); fixture.componentRef.setInput('exerciseTitle', 'Sample Exercise Title'); @@ -238,4 +241,17 @@ describe('FeedbackAnalysisComponent', () => { expect(modalSpy).toHaveBeenCalledOnce(); }); }); + + describe('openAffectedStudentsModal', () => { + it('should open affected students modal with the correct feedback detail', () => { + const modalService = fixture.debugElement.injector.get(NgbModal); + const modalSpy = jest.spyOn(modalService, 'open').mockReturnValue({ componentInstance: {} } as any); + + const feedbackDetail = feedbackMock[1]; + component.openAffectedStudentsModal(feedbackDetail); + + expect(modalSpy).toHaveBeenCalledWith(AffectedStudentsModalComponent, { centered: true, size: 'lg' }); + expect(modalSpy).toHaveBeenCalledOnce(); + }); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 60b280966bb1..87ca7272cb2c 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -9,15 +9,32 @@ describe('FeedbackAnalysisService', () => { let httpMock: HttpTestingController; const feedbackDetailsMock: FeedbackDetail[] = [ - { detailText: 'Feedback 1', testCaseName: 'test1', count: 5, relativeCount: 25.0, taskName: '1', errorCategory: 'StudentError' }, - { detailText: 'Feedback 2', testCaseName: 'test2', count: 3, relativeCount: 15.0, taskName: '2', errorCategory: 'StudentError' }, + { + concatenatedFeedbackIds: ['1', '2'], + detailText: 'Feedback 1', + testCaseName: 'test1', + count: 5, + relativeCount: 25.0, + taskName: '1', + errorCategory: 'StudentError', + }, + { + concatenatedFeedbackIds: ['3', '4'], + detailText: 'Feedback 2', + testCaseName: 'test2', + count: 3, + relativeCount: 15.0, + taskName: '2', + errorCategory: 'StudentError', + }, ]; const feedbackAnalysisResponseMock = { feedbackDetails: { resultsOnPage: feedbackDetailsMock, numberOfPages: 1 }, totalItems: 2, - totalAmountOfTasks: 2, + taskNames: ['task1', 'task2'], testCaseNames: ['test1', 'test2'], + errorCategories: ['StudentError'], }; beforeEach(() => { @@ -34,7 +51,7 @@ describe('FeedbackAnalysisService', () => { }); describe('search', () => { - it('should retrieve feedback details for a given exercise', async () => { + it('should retrieve feedback details for a given exercise with concatenatedFeedbackIds', async () => { const pageable = { page: 1, pageSize: 10, @@ -53,6 +70,8 @@ describe('FeedbackAnalysisService', () => { const result = await responsePromise; expect(result).toEqual(feedbackAnalysisResponseMock); + expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toEqual(['1', '2']); + expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toEqual(['3', '4']); }); }); @@ -68,4 +87,49 @@ describe('FeedbackAnalysisService', () => { expect(result).toBe(10); }); }); + + describe('getParticipationForFeedbackIds', () => { + it('should retrieve paginated participation details for specified feedback IDs', async () => { + const feedbackIds = ['1', '2']; + const pageable = { + page: 1, + pageSize: 10, + sortedColumn: 'participationId', + sortingOrder: SortingOrder.ASCENDING, + }; + const participationResponseMock = { + content: [ + { + courseId: 1, + participationId: 101, + firstName: 'John', + lastName: 'Doe', + login: 'johndoe', + repositoryName: 'repo1', + }, + { + courseId: 1, + participationId: 102, + firstName: 'Jane', + lastName: 'Smith', + login: 'janesmith', + repositoryName: 'repo2', + }, + ], + numberOfPages: 1, + totalItems: 2, + }; + + const responsePromise = service.getParticipationForFeedbackIds(1, feedbackIds, pageable); + + const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?feedbackIds=1,2&page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); + expect(req.request.method).toBe('GET'); + req.flush(participationResponseMock); + + const result = await responsePromise; + expect(result).toEqual(participationResponseMock); + expect(result.content[0].firstName).toBe('John'); + expect(result.content[1].firstName).toBe('Jane'); + }); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts new file mode 100644 index 000000000000..16af4ecb8aec --- /dev/null +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -0,0 +1,75 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; +import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; +import { of } from 'rxjs'; +import { provideHttpClient } from '@angular/common/http'; +import '@angular/localize/init'; + +describe('AffectedStudentsModalComponent', () => { + let fixture: ComponentFixture; + let component: AffectedStudentsModalComponent; + let feedbackService: FeedbackAnalysisService; + + const feedbackDetailMock: FeedbackDetail = { + concatenatedFeedbackIds: ['1', '2'], + count: 5, + relativeCount: 25.0, + detailText: 'Some feedback detail', + testCaseName: 'testCase1', + taskName: '1', + errorCategory: 'StudentError', + }; + + const participationMock: FeedbackAffectedStudentDTO[] = [ + { courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryName: 'repo1' }, + { courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryName: 'repo2' }, + ]; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), AffectedStudentsModalComponent], + providers: [ + provideHttpClient(), + NgbActiveModal, + { + provide: FeedbackAnalysisService, + useValue: { + getParticipationForFeedbackIds: jest.fn().mockReturnValue(of({ content: participationMock, totalPages: 1, totalElements: 2 })), + }, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(AffectedStudentsModalComponent); + component = fixture.componentInstance; + feedbackService = TestBed.inject(FeedbackAnalysisService); + + fixture.componentRef.setInput('exerciseId', 1); + fixture.componentRef.setInput('feedbackDetail', feedbackDetailMock); + fixture.detectChanges(); + }); + + it('should update page and reload data when setPage is called', async () => { + const loadAffectedSpy = jest.spyOn(component as any, 'loadAffected'); + + component.setPage(2); + expect(component.page()).toBe(2); + expect(loadAffectedSpy).toHaveBeenCalledOnce(); + }); + + it('should handle error when loadAffected fails', async () => { + jest.spyOn(feedbackService, 'getParticipationForFeedbackIds').mockReturnValueOnce(Promise.reject(new Error('Error loading data'))); + const alertServiceSpy = jest.spyOn(component.alertService, 'error'); + const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); + + await component['loadAffected'](); + + expect(alertServiceSpy).toHaveBeenCalledWith('There was an error while loading the affected Students for this feedback'); + expect(component.participation().content).toEqual([]); + expect(consoleErrorSpy).toHaveBeenCalled(); + + consoleErrorSpy.mockRestore(); + }); +}); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts index f3a6c0361e9f..4de1fe16d168 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts @@ -10,6 +10,7 @@ describe('FeedbackModalComponent', () => { let activeModal: NgbActiveModal; const mockFeedbackDetail: FeedbackDetail = { + concatenatedFeedbackIds: ['1', '2'], count: 5, relativeCount: 25.0, detailText: 'Some feedback detail', From 862e9b0919e414faac59dbe553e952e70537897d Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Sun, 10 Nov 2024 22:01:10 +0100 Subject: [PATCH 02/64] fix --- .../assessment/service/ResultService.java | 91 +++++++++++++------ 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index f9640a69ee06..68fb02fbb821 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -12,6 +12,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; import jakarta.annotation.Nullable; @@ -497,45 +498,49 @@ public Map getLogsAvailabilityForResults(List results, Par @NotNull private List saveFeedbackWithHibernateWorkaround(@NotNull Result result, List feedbackList) { - // Avoid hibernate exception List savedFeedbacks = new ArrayList<>(); - // Collect ids of feedbacks that have long feedback. - List feedbackIdsWithLongFeedback = feedbackList.stream().filter(feedback -> feedback.getId() != null && feedback.getHasLongFeedbackText()).map(Feedback::getId) - .toList(); - // Get long feedback list from the database. - List longFeedbackTextList = longFeedbackTextRepository.findByFeedbackIds(feedbackIdsWithLongFeedback); - // Convert list to map for accessing later. - Map longLongFeedbackTextMap = longFeedbackTextList.stream() - .collect(Collectors.toMap(longFeedbackText -> longFeedbackText.getFeedback().getId(), longFeedbackText -> longFeedbackText)); - feedbackList.forEach(feedback -> { - // cut association to parent object - feedback.setResult(null); - LongFeedbackText longFeedback = null; - // look for long feedback that parent feedback has and cut the association between them. - if (feedback.getId() != null && feedback.getHasLongFeedbackText()) { - longFeedback = longLongFeedbackTextMap.get(feedback.getId()); - if (longFeedback != null) { - feedback.clearLongFeedback(); - } - } - // persist the child object without an association to the parent object. - feedback = feedbackRepository.saveAndFlush(feedback); - // restore the association to the parent object - feedback.setResult(result); + // Fetch long feedback texts associated with the provided feedback list + Map longFeedbackTextMap = longFeedbackTextRepository + .findByFeedbackIds(feedbackList.stream().filter(feedback -> feedback.getId() != null && feedback.getHasLongFeedbackText()).map(Feedback::getId).toList()).stream() + .collect(Collectors.toMap(longFeedbackText -> longFeedbackText.getFeedback().getId(), Function.identity())); - // restore the association of the long feedback to the parent feedback - if (longFeedback != null) { - feedback.setDetailText(longFeedback.getText()); - } + feedbackList.forEach(feedback -> { + handleFeedbackPersistence(feedback, result, longFeedbackTextMap); savedFeedbacks.add(feedback); }); + return savedFeedbacks; } + private void handleFeedbackPersistence(Feedback feedback, Result result, Map longFeedbackTextMap) { + // Temporarily detach feedback from the parent result to avoid Hibernate issues + feedback.setResult(null); + + // Clear the long feedback if it exists in the map + if (feedback.getId() != null && feedback.getHasLongFeedbackText()) { + LongFeedbackText longFeedback = longFeedbackTextMap.get(feedback.getId()); + if (longFeedback != null) { + feedback.clearLongFeedback(); + } + } + + // Persist the feedback entity without the parent association + feedback = feedbackRepository.saveAndFlush(feedback); + + // Restore associations to the result and long feedback after persistence + feedback.setResult(result); + LongFeedbackText longFeedback = longFeedbackTextMap.get(feedback.getId()); + if (longFeedback != null) { + feedback.setDetailText(longFeedback.getText()); + } + } + @NotNull private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) { if (shouldSave) { + // long feedback text is deleted as it otherwise causes duplicate entries errors and will be saved again with {@link resultRepository.save} + deleteLongFeedback(result.getFeedbacks(), result); // Note: This also saves the feedback objects in the database because of the 'cascade = CascadeType.ALL' option. return resultRepository.save(result); } @@ -620,7 +625,6 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee .map(detail -> new FeedbackDetailDTO(List.of(String.valueOf(detail.concatenatedFeedbackIds()).split(",")), detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())) .toList(); - // 11. Predefined error categories available for filtering on the client side final List ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error"); @@ -672,4 +676,33 @@ public Page getParticipationWithFeedbackId(long exer PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); return studentParticipationRepository.findParticipationByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); } + + /** + * Deletes long feedback texts for the provided list of feedback items to prevent duplicate entries in the {@link LongFeedbackTextRepository}. + *
+ * This method processes the provided list of feedback items, identifies those with associated long feedback texts, and removes them in bulk + * from the repository to avoid potential duplicate entry errors when saving new feedback entries. + *

+ * Primarily used to ensure data consistency in the {@link LongFeedbackTextRepository}, especially during operations where feedback entries are + * overridden or updated. The deletion is performed only for feedback items with a non-null ID and an associated long feedback text. + *

+ * This approach reduces the need for individual deletion calls and performs batch deletion in a single database operation. + *

+ * **Note:** This method should only be used for manually assessed submissions, not for fully automatic assessments, due to its dependency on the + * {@link Result#updateAllFeedbackItems} method, which is designed for manual feedback management. Using this method with automatic assessments could + * lead to unintended behavior or data inconsistencies. + * + * @param feedbackList The list of {@link Feedback} objects for which the long feedback texts are to be deleted. Only feedback items that have long feedback texts and a + * non-null ID will be processed. + * @param result The {@link Result} object associated with the feedback items, used to update feedback list before processing. + */ + public void deleteLongFeedback(List feedbackList, Result result) { + if (feedbackList == null) { + return; + } + List feedbackIdsWithLongText = feedbackList.stream().filter(feedback -> feedback.getHasLongFeedbackText() && feedback.getId() != null).map(Feedback::getId).toList(); + longFeedbackTextRepository.deleteByFeedbackIds(feedbackIdsWithLongText); + List feedbacks = new ArrayList<>(feedbackList); + result.updateAllFeedbackItems(feedbacks, true); + } } From 8fb7be185785c5d7d2b12c9c826ff5e90f16cb8a Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 11 Nov 2024 17:02:20 +0100 Subject: [PATCH 03/64] johannes feedback --- .../artemis/assessment/dto/FeedbackDetailDTO.java | 2 +- .../artemis/assessment/service/ResultService.java | 12 ++++++------ .../aet/artemis/assessment/web/ResultResource.java | 2 +- .../repository/StudentParticipationRepository.java | 2 +- .../feedback-analysis/feedback-analysis.service.ts | 6 +++--- .../assessment/ResultServiceIntegrationTest.java | 1 + 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index 4b785d3d6b6a..312cbf66e876 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -3,5 +3,5 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackDetailDTO(Object concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { +public record FeedbackDetailDTO(String concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 68fb02fbb821..56c8b85b98ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -4,6 +4,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.HashMap; @@ -621,10 +622,8 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee maxOccurrence, filterErrorCategories, pageable); // 10. Process and map feedback details, calculating relative count and assigning task names - List processedDetails = feedbackDetailPage.getContent().stream() - .map(detail -> new FeedbackDetailDTO(List.of(String.valueOf(detail.concatenatedFeedbackIds()).split(",")), detail.count(), - (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())) - .toList(); + List processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.concatenatedFeedbackIds(), detail.count(), + (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); // 11. Predefined error categories available for filtering on the client side final List ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error"); @@ -671,8 +670,9 @@ public long getMaxCountForExercise(long exerciseId) { *

  • Total count of affected students, allowing for pagination on the client side.
    • * */ - public Page getParticipationWithFeedbackId(long exerciseId, List feedbackIds, PageableSearchDTO data) { - List feedbackIdLongs = feedbackIds.stream().map(Long::valueOf).toList(); + public Page getParticipationWithFeedbackId(long exerciseId, String feedbackIds, PageableSearchDTO data) { + List feedbackIdsList = Arrays.asList(feedbackIds.split(",")); + List feedbackIdLongs = feedbackIdsList.stream().map(Long::valueOf).toList(); PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); return studentParticipationRepository.findParticipationByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 6bc8bb2bc160..408b0abd16e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -379,7 +379,7 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { */ @GetMapping("exercises/{exerciseId}/feedback-details-participation") @EnforceAtLeastEditorInExercise - public ResponseEntity> getParticipationWithFeedback(@PathVariable long exerciseId, @RequestParam List feedbackIds, + public ResponseEntity> getParticipationWithFeedback(@PathVariable long exerciseId, @RequestParam String feedbackIds, @ModelAttribute PageableSearchDTO data) { Page participation = resultService.getParticipationWithFeedbackId(exerciseId, feedbackIds, data); return ResponseEntity.ok(participation); diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 977433d27f4c..cc87e3231af8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1234,7 +1234,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) */ @Query(""" SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( - GROUP_CONCAT(f.id), + CAST(GROUP_CONCAT(f.id) AS string), COUNT(f.id), 0, f.detailText, diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 2dc7abab2a8d..2742b4d811e1 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -12,7 +12,7 @@ export interface FeedbackAnalysisResponse { errorCategories: string[]; } export interface FeedbackDetail { - concatenatedFeedbackIds: string[]; + concatenatedFeedbackIds: string; count: number; relativeCount: number; detailText: string; @@ -49,9 +49,9 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get(`exercises/${exerciseId}/feedback-details-max-count`); } - async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: string[], pageable: PageableSearch): Promise> { + async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: string, pageable: PageableSearch): Promise> { const params = new HttpParams() - .set('feedbackIds', feedbackIds.join(',')) + .set('feedbackIds', feedbackIds) .set('page', pageable.page.toString()) .set('pageSize', pageable.pageSize.toString()) .set('sortedColumn', pageable.sortedColumn) diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 2413dcab2078..445bc7999f76 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -861,4 +861,5 @@ void testGetMaxCountForExerciseWithMultipleFeedback() throws Exception { assertThat(maxCount).isEqualTo(2); } + } From ae13615143ce4edf3cfa1a23c48556729eccecbc Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 11 Nov 2024 17:26:47 +0100 Subject: [PATCH 04/64] johannes feedback --- .../ResultServiceIntegrationTest.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 445bc7999f76..da14e5a928ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -25,6 +25,9 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + 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.GradingCriterion; @@ -862,4 +865,43 @@ void testGetMaxCountForExerciseWithMultipleFeedback() throws Exception { assertThat(maxCount).isEqualTo(2); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetParticipationForFeedbackId() throws Exception { + ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); + ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); + testCase.setId(1L); + + Feedback feedback = new Feedback(); + feedback.setPositive(false); + feedback.setDetailText("Feedback for student"); + feedback.setTestCase(testCase); + feedback = feedbackRepository.saveAndFlush(feedback); + + Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); + participationUtilService.addFeedbackToResult(feedback, result); + + List feedbacks = feedbackRepository.findAll(); + System.out.println("Feedbacks in DB: " + feedbacks); + System.out.println("Using Feedback ID: " + feedback.getId()); + + String url = "/api/exercises/" + programmingExercise.getId() + + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&feedbackIds=" + feedback.getId(); + String jsonResponse = request.get(url, HttpStatus.OK, String.class); + + JsonNode jsonNode = new ObjectMapper().readTree(jsonResponse); + assertThat(jsonNode.has("content")).isTrue(); + assertThat(jsonNode.has("pageable")).isTrue(); + assertThat(jsonNode.has("last")).isTrue(); + assertThat(jsonNode.has("totalElements")).isTrue(); + assertThat(jsonNode.has("totalPages")).isTrue(); + assertThat(jsonNode.has("first")).isTrue(); + assertThat(jsonNode.has("size")).isTrue(); + assertThat(jsonNode.has("number")).isTrue(); + assertThat(jsonNode.has("sort")).isTrue(); + assertThat(jsonNode.has("numberOfElements")).isTrue(); + assertThat(jsonNode.has("empty")).isTrue(); + } + } From 15d3fba3fad76f3f8a77f507a3576cf29f6a1ab1 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 11 Nov 2024 17:44:01 +0100 Subject: [PATCH 05/64] johannes feedback --- .../exercise/repository/StudentParticipationRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index cc87e3231af8..c9682d8c9c58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1370,6 +1370,7 @@ SELECT MAX(pr.id) JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND f.id IN :feedbackIds + AND p.testRun = FALSE ORDER BY p.student.firstName ASC """) Page findParticipationByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); From 7f32c6f2636f02a05f687b02ba5609268759fad1 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 11 Nov 2024 18:11:12 +0100 Subject: [PATCH 06/64] tests fix --- .../artemis/assessment/ResultServiceIntegrationTest.java | 4 ---- .../feedback-analysis/feedback-analysis.component.spec.ts | 4 ++-- .../feedback-analysis/feedback-analysis.service.spec.ts | 8 ++++---- .../feedback-affected-students-modal.component.spec.ts | 2 +- .../modals/feedback-modal.component.spec.ts | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index da14e5a928ad..4113841c7673 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -882,10 +882,6 @@ void testGetParticipationForFeedbackId() throws Exception { Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); participationUtilService.addFeedbackToResult(feedback, result); - List feedbacks = feedbackRepository.findAll(); - System.out.println("Feedbacks in DB: " + feedbacks); - System.out.println("Using Feedback ID: " + feedback.getId()); - String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&feedbackIds=" + feedback.getId(); String jsonResponse = request.get(url, HttpStatus.OK, String.class); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index d20bddb3a978..f46725d0d394 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -19,7 +19,7 @@ describe('FeedbackAnalysisComponent', () => { const feedbackMock: FeedbackDetail[] = [ { - concatenatedFeedbackIds: ['1', '2'], + concatenatedFeedbackIds: '1,2', detailText: 'Test feedback 1 detail', testCaseName: 'test1', count: 10, @@ -28,7 +28,7 @@ describe('FeedbackAnalysisComponent', () => { errorCategory: 'Student Error', }, { - concatenatedFeedbackIds: ['3', '4'], + concatenatedFeedbackIds: '3,4', detailText: 'Test feedback 2 detail', testCaseName: 'test2', count: 5, diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 87ca7272cb2c..870e6437f4e3 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -10,7 +10,7 @@ describe('FeedbackAnalysisService', () => { const feedbackDetailsMock: FeedbackDetail[] = [ { - concatenatedFeedbackIds: ['1', '2'], + concatenatedFeedbackIds: '1, 2', detailText: 'Feedback 1', testCaseName: 'test1', count: 5, @@ -19,7 +19,7 @@ describe('FeedbackAnalysisService', () => { errorCategory: 'StudentError', }, { - concatenatedFeedbackIds: ['3', '4'], + concatenatedFeedbackIds: '3, 4', detailText: 'Feedback 2', testCaseName: 'test2', count: 3, @@ -70,8 +70,8 @@ describe('FeedbackAnalysisService', () => { const result = await responsePromise; expect(result).toEqual(feedbackAnalysisResponseMock); - expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toEqual(['1', '2']); - expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toEqual(['3', '4']); + expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toBe('1, 2'); + expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toBe('3, 4'); }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index 16af4ecb8aec..b0e52c74866f 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -13,7 +13,7 @@ describe('AffectedStudentsModalComponent', () => { let feedbackService: FeedbackAnalysisService; const feedbackDetailMock: FeedbackDetail = { - concatenatedFeedbackIds: ['1', '2'], + concatenatedFeedbackIds: '1,2', count: 5, relativeCount: 25.0, detailText: 'Some feedback detail', diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts index 4de1fe16d168..fd07d43fb1f1 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts @@ -10,7 +10,7 @@ describe('FeedbackModalComponent', () => { let activeModal: NgbActiveModal; const mockFeedbackDetail: FeedbackDetail = { - concatenatedFeedbackIds: ['1', '2'], + concatenatedFeedbackIds: '1,2', count: 5, relativeCount: 25.0, detailText: 'Some feedback detail', From 3703ca00e4f5ea4094758d4642defebeb0e5085b Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 11 Nov 2024 18:29:12 +0100 Subject: [PATCH 07/64] johannes feedback --- .../cit/aet/artemis/assessment/service/ResultService.java | 3 +-- .../feedback-analysis/feedback-analysis.service.spec.ts | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 56c8b85b98ad..90f9fabe77bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -671,8 +671,7 @@ public long getMaxCountForExercise(long exerciseId) { * */ public Page getParticipationWithFeedbackId(long exerciseId, String feedbackIds, PageableSearchDTO data) { - List feedbackIdsList = Arrays.asList(feedbackIds.split(",")); - List feedbackIdLongs = feedbackIdsList.stream().map(Long::valueOf).toList(); + List feedbackIdLongs = Arrays.stream(feedbackIds.split(",")).map(Long::valueOf).toList(); PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); return studentParticipationRepository.findParticipationByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); } diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 870e6437f4e3..e29b4737a6f4 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -90,7 +90,7 @@ describe('FeedbackAnalysisService', () => { describe('getParticipationForFeedbackIds', () => { it('should retrieve paginated participation details for specified feedback IDs', async () => { - const feedbackIds = ['1', '2']; + const feedbackIds = '1, 2'; const pageable = { page: 1, pageSize: 10, @@ -122,7 +122,9 @@ describe('FeedbackAnalysisService', () => { const responsePromise = service.getParticipationForFeedbackIds(1, feedbackIds, pageable); - const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?feedbackIds=1,2&page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); + const req = httpMock.expectOne( + 'api/exercises/1/feedback-details-participation?feedbackIds=1,%202&page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING', + ); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); From 3b32032198b8292f0189bb945d48c12b4fe6c983 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 12 Nov 2024 08:21:34 +0100 Subject: [PATCH 08/64] bilel feedback --- .../exercise/repository/StudentParticipationRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index c9682d8c9c58..2d15d50cad15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1234,7 +1234,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) */ @Query(""" SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( - CAST(GROUP_CONCAT(f.id) AS string), + LISTAGG(CAST(f.id AS string), ',') WITHIN GROUP (ORDER BY f.id), COUNT(f.id), 0, f.detailText, From f0b99a34aa3eb8f8258869f96c1d0bb68c6515c4 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 12 Nov 2024 13:38:57 +0100 Subject: [PATCH 09/64] florian feedback --- .../dto/FeedbackAffectedStudentDTO.java | 2 +- .../assessment/dto/FeedbackDetailDTO.java | 11 ++++- .../assessment/service/ResultService.java | 28 ++++--------- .../assessment/web/ResultResource.java | 28 ++++--------- .../StudentParticipationRepository.java | 40 ++++++------------- ...ack-affected-students-modal.component.html | 2 +- ...dback-affected-students-modal.component.ts | 2 +- .../feedback-analysis.service.ts | 8 ++-- .../webapp/i18n/de/programmingExercise.json | 3 +- .../webapp/i18n/en/programmingExercise.json | 3 +- .../feedback-analysis.component.spec.ts | 4 +- ...-affected-students-modal.component.spec.ts | 6 +-- .../modals/feedback-modal.component.spec.ts | 2 +- 13 files changed, 55 insertions(+), 84 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java index 76dc1e2deb72..71c6b73a208f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java @@ -1,4 +1,4 @@ package de.tum.cit.aet.artemis.assessment.dto; -public record FeedbackAffectedStudentDTO(long courseId, long participationId, String firstName, String lastName, String login, String repositoryName) { +public record FeedbackAffectedStudentDTO(long courseId, long participationId, String firstName, String lastName, String login, String repositoryURI) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index 312cbf66e876..d22a036e7489 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -1,7 +1,16 @@ package de.tum.cit.aet.artemis.assessment.dto; +import java.util.Arrays; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackDetailDTO(String concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { +public record FeedbackDetailDTO(List concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, + String errorCategory) { + + public FeedbackDetailDTO(String concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { + this(Arrays.stream(concatenatedFeedbackIds.split(",")).map(Long::valueOf).toList(), count, relativeCount, detailText, testCaseName, taskName, errorCategory); + } + } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 90f9fabe77bd..50576953916b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -649,31 +649,19 @@ public long getMaxCountForExercise(long exerciseId) { * Retrieves a paginated list of students affected by specific feedback entries for a given exercise. *
    * This method filters students based on feedback IDs and returns participation details for each affected student. It uses - * pagination and sorting to allow efficient retrieval and sorting of the results, thus supporting large datasets. + * pagination and sorting (order based on the {@link PageUtil.ColumnMapping#AFFECTED_STUDENTS}) to allow efficient retrieval and sorting of the results, thus supporting large + * datasets. *
    - * Supports: - *
      - *
    • Pagination: Controls the page number and page size for the returned results.
      • - *
    • Sorting: Applies sorting by specified columns and sorting order based on the {@link PageUtil.ColumnMapping#AFFECTED_STUDENTS} configuration.
      • - *
    * - * @param exerciseId The ID of the exercise for which the affected student participation data is requested. - * @param feedbackIds A list of feedback IDs used to filter the participation to only those affected by specific feedback entries. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters: - *
      - *
    • Page number and page size for pagination
      • - *
    • Sorting order and column for sorting (e.g., "participationId")
      • - *
    - * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback, with: - *
      - *
    • Details about the affected students, including participation data and student information.
      • - *
    • Total count of affected students, allowing for pagination on the client side.
      • - *
    + * @param exerciseId for which the affected student participation data is requested. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ - public Page getParticipationWithFeedbackId(long exerciseId, String feedbackIds, PageableSearchDTO data) { + public Page getAffectedStudentsWithFeedbackId(long exerciseId, String feedbackIds, PageableSearchDTO data) { List feedbackIdLongs = Arrays.stream(feedbackIds.split(",")).map(Long::valueOf).toList(); PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); - return studentParticipationRepository.findParticipationByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); + return studentParticipationRepository.findAffectedStudentsByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 408b0abd16e0..d4cf9b20f684 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -354,34 +354,20 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { /** * GET /exercises/{exerciseId}/feedback-details-participation : Retrieves paginated details of students affected by specific feedback entries for a specified exercise. - *
    * This endpoint returns details of students whose submissions were impacted by specified feedback entries, including student information - * and participation details. This supports efficient loading of affected students' data by returning only the required information. + * and participation details. *
    - * Supports pagination and sorting, allowing the client to control the amount and order of returned data: - *
      - *
    • Pagination: Controls page number and page size for the response.
      • - *
    • Sorting: Allows sorting by specified columns (e.g., "participationId") in ascending or descending order.
      • - *
    * - * @param exerciseId The ID of the exercise for which the participation data is requested. - * @param feedbackIds A list of feedback IDs to filter affected students by specific feedback entries. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters: - *
      - *
    • Page number and page size
      • - *
    • Sorted column and sorting order
      • - *
    - * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries, including: - *
      - *
    • List of affected students with participation details.
      • - *
    • Total number of students affected (for pagination).
      • - *
    + * @param exerciseId for which the participation data is requested. + * @param feedbackIds to filter affected students by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. */ @GetMapping("exercises/{exerciseId}/feedback-details-participation") @EnforceAtLeastEditorInExercise - public ResponseEntity> getParticipationWithFeedback(@PathVariable long exerciseId, @RequestParam String feedbackIds, + public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestParam String feedbackIds, @ModelAttribute PageableSearchDTO data) { - Page participation = resultService.getParticipationWithFeedbackId(exerciseId, feedbackIds, data); + Page participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, feedbackIds, data); return ResponseEntity.ok(participation); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 2d15d50cad15..66728627e4fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1242,7 +1242,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) COALESCE(( SELECT MAX(t.taskName) FROM ProgrammingExerciseTask t - JOIN t.testCases tct + LEFT JOIN t.testCases tct WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName ), 'Not assigned to task'), CASE @@ -1252,12 +1252,12 @@ SELECT MAX(t.taskName) END ) FROM StudentParticipation p - JOIN p.results r ON r.id = ( + LEFT JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id ) - JOIN r.feedbacks f + LEFT JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND f.positive = FALSE @@ -1266,7 +1266,7 @@ SELECT MAX(pr.id) AND (:#{#filterTaskNames != NULL && #filterTaskNames.size() < 1} = TRUE OR f.testCase.testName NOT IN ( SELECT tct.testName FROM ProgrammingExerciseTask t - JOIN t.testCases tct + LEFT JOIN t.testCases tct WHERE t.taskName IN (:filterTaskNames) )) AND (:#{#filterErrorCategories != NULL && #filterErrorCategories.size() < 1} = TRUE OR CASE @@ -1292,7 +1292,7 @@ Page findFilteredFeedbackByExerciseId(@Param("exerciseId") lo @Query(""" SELECT COUNT(DISTINCT r.id) FROM StudentParticipation p - JOIN p.results r ON r.id = ( + LEFT JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id @@ -1318,12 +1318,12 @@ SELECT MAX(feedbackCounts.feedbackCount) FROM ( SELECT COUNT(f.id) AS feedbackCount FROM StudentParticipation p - JOIN p.results r ON r.id = ( + LEFT JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id ) - JOIN r.feedbacks f + LEFT JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND f.positive = FALSE @@ -1335,25 +1335,11 @@ SELECT MAX(pr.id) /** * Retrieves a paginated list of students affected by specific feedback entries for a given programming exercise. *
    - * This query joins `ProgrammingExerciseStudentParticipation`, `Submission`, `Result`, and `Feedback` entities to filter - * participation records based on feedback IDs and exercise ID. The results include information about each affected student, - * such as their course ID, participation ID, student details, and repository URI. - *
    - * Supports: - *
      - *
    • Pagination: The results are paginated using a {@link Pageable} parameter, allowing control over the page number and size.
      • - *
    • Sorting: The query sorts results by the student's first name in ascending order.
      • - *
    * - * @param exerciseId The ID of the exercise for which the affected student participation data is requested. - * @param feedbackIds A list of feedback IDs used to filter the participation to only those affected by specific feedback entries. + * @param exerciseId for which the affected student participation data is requested. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. - * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback, containing: - *
      - *
    • Course ID, participation ID, and student information (first name, last name, login).
      • - *
    • Repository URI, linking the affected student's repository.
      • - *
    • Total count of affected students to facilitate pagination on the client side.
      • - *
    + * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ @Query(""" SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( @@ -1366,12 +1352,12 @@ SELECT MAX(pr.id) ) FROM ProgrammingExerciseStudentParticipation p LEFT JOIN p.submissions s - JOIN s.results r - JOIN r.feedbacks f + LEFT JOIN s.results r + LEFT JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND f.id IN :feedbackIds AND p.testRun = FALSE ORDER BY p.student.firstName ASC """) - Page findParticipationByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); + Page findAffectedStudentsByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html index 89cf9c63ff83..d5b4da2e12ed 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -25,7 +25,7 @@

    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index cbf558d928d6..947f3f3d44cd 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -48,7 +48,7 @@ export class AffectedStudentsModalComponent { const response = await this.feedbackService.getParticipationForFeedbackIds(this.exerciseId(), feedbackDetail.concatenatedFeedbackIds, pageable); this.participation.set(response); } catch (error) { - this.alertService.error('There was an error while loading the affected Students for this feedback'); + this.alertService.error(this.TRANSLATION_BASE + '.error'); } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 2742b4d811e1..a52e259d5b03 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -12,7 +12,7 @@ export interface FeedbackAnalysisResponse { errorCategories: string[]; } export interface FeedbackDetail { - concatenatedFeedbackIds: string; + concatenatedFeedbackIds: number[]; count: number; relativeCount: number; detailText: string; @@ -26,7 +26,7 @@ export interface FeedbackAffectedStudentDTO { firstName: string; lastName: string; login: string; - repositoryName: string; + repositoryURI: string; } @Injectable() export class FeedbackAnalysisService extends BaseApiHttpService { @@ -49,9 +49,9 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get(`exercises/${exerciseId}/feedback-details-max-count`); } - async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: string, pageable: PageableSearch): Promise> { + async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: number[], pageable: PageableSearch): Promise> { const params = new HttpParams() - .set('feedbackIds', feedbackIds) + .set('feedbackIds', feedbackIds.join(',')) .set('page', pageable.page.toString()) .set('pageSize', pageable.pageSize.toString()) .set('sortedColumn', pageable.sortedColumn) diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 1f1852efc9dc..ae9d8d88ce7f 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -377,7 +377,8 @@ "name": "Name", "login": "Login", "repository": "Repository", - "totalItems": "Insgesamt {{count}} Elemente" + "totalItems": "Insgesamt {{count}} Elemente", + "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten." } }, "help": { diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 0ce0db4fb6f5..fc73759dd829 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -377,7 +377,8 @@ "name": "Name", "login": "Login", "repository": "Repository", - "totalItems": "In total {{count}} items" + "totalItems": "In total {{count}} items", + "error": "There was an error while loading the affected Students for this feedback." } }, "help": { diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index f46725d0d394..09d22ab65dd6 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -19,7 +19,7 @@ describe('FeedbackAnalysisComponent', () => { const feedbackMock: FeedbackDetail[] = [ { - concatenatedFeedbackIds: '1,2', + concatenatedFeedbackIds: [1, 2], detailText: 'Test feedback 1 detail', testCaseName: 'test1', count: 10, @@ -28,7 +28,7 @@ describe('FeedbackAnalysisComponent', () => { errorCategory: 'Student Error', }, { - concatenatedFeedbackIds: '3,4', + concatenatedFeedbackIds: [3, 4], detailText: 'Test feedback 2 detail', testCaseName: 'test2', count: 5, diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index b0e52c74866f..457bc8be7085 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -13,7 +13,7 @@ describe('AffectedStudentsModalComponent', () => { let feedbackService: FeedbackAnalysisService; const feedbackDetailMock: FeedbackDetail = { - concatenatedFeedbackIds: '1,2', + concatenatedFeedbackIds: [1, 2], count: 5, relativeCount: 25.0, detailText: 'Some feedback detail', @@ -23,8 +23,8 @@ describe('AffectedStudentsModalComponent', () => { }; const participationMock: FeedbackAffectedStudentDTO[] = [ - { courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryName: 'repo1' }, - { courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryName: 'repo2' }, + { courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryURI: 'repo1' }, + { courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryURI: 'repo2' }, ]; beforeEach(async () => { diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts index fd07d43fb1f1..cf31d3b2b9e0 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts @@ -10,7 +10,7 @@ describe('FeedbackModalComponent', () => { let activeModal: NgbActiveModal; const mockFeedbackDetail: FeedbackDetail = { - concatenatedFeedbackIds: '1,2', + concatenatedFeedbackIds: [1, 2], count: 5, relativeCount: 25.0, detailText: 'Some feedback detail', From 4d5a609620ddc5b7b8e639c76289d59cd1951cfa Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 12 Nov 2024 13:56:26 +0100 Subject: [PATCH 10/64] client test feedback --- .../feedback-analysis.service.spec.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index e29b4737a6f4..326c0de0eaa2 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -10,7 +10,7 @@ describe('FeedbackAnalysisService', () => { const feedbackDetailsMock: FeedbackDetail[] = [ { - concatenatedFeedbackIds: '1, 2', + concatenatedFeedbackIds: [1, 2], detailText: 'Feedback 1', testCaseName: 'test1', count: 5, @@ -19,7 +19,7 @@ describe('FeedbackAnalysisService', () => { errorCategory: 'StudentError', }, { - concatenatedFeedbackIds: '3, 4', + concatenatedFeedbackIds: [3, 4], detailText: 'Feedback 2', testCaseName: 'test2', count: 3, @@ -70,8 +70,8 @@ describe('FeedbackAnalysisService', () => { const result = await responsePromise; expect(result).toEqual(feedbackAnalysisResponseMock); - expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toBe('1, 2'); - expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toBe('3, 4'); + expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toStrictEqual([1, 2]); + expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toStrictEqual([3, 4]); }); }); @@ -90,7 +90,7 @@ describe('FeedbackAnalysisService', () => { describe('getParticipationForFeedbackIds', () => { it('should retrieve paginated participation details for specified feedback IDs', async () => { - const feedbackIds = '1, 2'; + const feedbackIds = [1, 2]; const pageable = { page: 1, pageSize: 10, @@ -122,9 +122,7 @@ describe('FeedbackAnalysisService', () => { const responsePromise = service.getParticipationForFeedbackIds(1, feedbackIds, pageable); - const req = httpMock.expectOne( - 'api/exercises/1/feedback-details-participation?feedbackIds=1,%202&page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING', - ); + const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?feedbackIds=1,2&page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); From cfd94420c8851f2954159e11534bc4fbe94cbe73 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 12 Nov 2024 14:17:55 +0100 Subject: [PATCH 11/64] client test feedback --- .../modals/feedback-affected-students-modal.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index 457bc8be7085..3b991c19ef34 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -66,7 +66,7 @@ describe('AffectedStudentsModalComponent', () => { await component['loadAffected'](); - expect(alertServiceSpy).toHaveBeenCalledWith('There was an error while loading the affected Students for this feedback'); + expect(alertServiceSpy).toHaveBeenCalledTimes(2); expect(component.participation().content).toEqual([]); expect(consoleErrorSpy).toHaveBeenCalled(); From 30ebcb7cfc1b5db24aa3693c715ee89f3cccee45 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 12 Nov 2024 15:33:52 +0100 Subject: [PATCH 12/64] client test feedback --- .../modals/feedback-affected-students-modal.component.spec.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index 3b991c19ef34..6f80ebac01e2 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -61,12 +61,10 @@ describe('AffectedStudentsModalComponent', () => { it('should handle error when loadAffected fails', async () => { jest.spyOn(feedbackService, 'getParticipationForFeedbackIds').mockReturnValueOnce(Promise.reject(new Error('Error loading data'))); - const alertServiceSpy = jest.spyOn(component.alertService, 'error'); const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); await component['loadAffected'](); - expect(alertServiceSpy).toHaveBeenCalledTimes(2); expect(component.participation().content).toEqual([]); expect(consoleErrorSpy).toHaveBeenCalled(); From 72b482e74a094e072c10f28aa0abbdb33df7be83 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 12 Nov 2024 16:14:50 +0100 Subject: [PATCH 13/64] client test --- .../modals/feedback-affected-students-modal.component.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index 6f80ebac01e2..bf8b1b77141a 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -61,11 +61,13 @@ describe('AffectedStudentsModalComponent', () => { it('should handle error when loadAffected fails', async () => { jest.spyOn(feedbackService, 'getParticipationForFeedbackIds').mockReturnValueOnce(Promise.reject(new Error('Error loading data'))); + const alertServiceSpy = jest.spyOn(component.alertService, 'error'); const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); await component['loadAffected'](); expect(component.participation().content).toEqual([]); + expect(alertServiceSpy).toHaveBeenCalled(); expect(consoleErrorSpy).toHaveBeenCalled(); consoleErrorSpy.mockRestore(); From be2876929a65bd32514d4771c915b28f1ce4d19e Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Thu, 14 Nov 2024 19:01:41 +0100 Subject: [PATCH 14/64] ramona feedback --- ...eedback-affected-students-modal.component.html | 15 +++++++++++---- src/main/webapp/i18n/de/programmingExercise.json | 4 ++-- src/main/webapp/i18n/en/programmingExercise.json | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html index d5b4da2e12ed..4f53792a04e5 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -1,3 +1,8 @@ + + + + +

    @@ -11,9 +16,9 @@

    - - - + + + @@ -34,7 +39,9 @@

    - + @if (participation().totalElements >= pageSize()) { + + }
    diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index ae9d8d88ce7f..41533417cf1e 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -351,7 +351,7 @@ "task": "Aufgabe", "testcase": "Testfall", "errorCategory": "Fehlerkategorie", - "totalItems": "Insgesamt {{count}} Elemente", + "totalItems": "Insgesamt {{count}} Element(e)", "error": "Beim Laden des Feedbacks ist ein Fehler aufgetreten.", "search": "Suche ...", "filter": "Filter", @@ -377,7 +377,7 @@ "name": "Name", "login": "Login", "repository": "Repository", - "totalItems": "Insgesamt {{count}} Elemente", + "totalItems": "Insgesamt {{count}} Element(e)", "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten." } }, diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index fc73759dd829..d3a53f20f180 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -351,7 +351,7 @@ "task": "Task", "testcase": "Test Case", "errorCategory": "Error Category", - "totalItems": "In total {{count}} items", + "totalItems": "In total {{count}} item(s)", "error": "An error occurred while loading the feedback.", "search": "Search ...", "filter": "Filters", @@ -377,7 +377,7 @@ "name": "Name", "login": "Login", "repository": "Repository", - "totalItems": "In total {{count}} items", + "totalItems": "In total {{count}} item(s)", "error": "There was an error while loading the affected Students for this feedback." } }, From fe3cb3bf11dae5f7016898230b43db9099326c7c Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Thu, 14 Nov 2024 19:06:24 +0100 Subject: [PATCH 15/64] ramona feedback --- .../cit/aet/artemis/assessment/web/ResultResource.java | 7 +++++-- .../feedback-analysis/feedback-analysis.service.ts | 9 ++++++--- .../feedback-analysis/feedback-analysis.service.spec.ts | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index d4cf9b20f684..1510eea74b33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -365,9 +366,11 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { */ @GetMapping("exercises/{exerciseId}/feedback-details-participation") @EnforceAtLeastEditorInExercise - public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestParam String feedbackIds, + public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestHeader("feedbackIds") String feedbackIdsHeader, @ModelAttribute PageableSearchDTO data) { - Page participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, feedbackIds, data); + + Page participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, feedbackIdsHeader, data); + return ResponseEntity.ok(participation); } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index a52e259d5b03..214c9a4e4f4c 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { PageableResult, PageableSearch, SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; -import { HttpParams } from '@angular/common/http'; +import { HttpHeaders, HttpParams } from '@angular/common/http'; import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; export interface FeedbackAnalysisResponse { @@ -50,13 +50,16 @@ export class FeedbackAnalysisService extends BaseApiHttpService { } async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: number[], pageable: PageableSearch): Promise> { + const feedbackIdsHeader = feedbackIds.join(','); + const params = new HttpParams() - .set('feedbackIds', feedbackIds.join(',')) .set('page', pageable.page.toString()) .set('pageSize', pageable.pageSize.toString()) .set('sortedColumn', pageable.sortedColumn) .set('sortingOrder', pageable.sortingOrder); - return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params }); + const headers = new HttpHeaders().set('feedbackIds', feedbackIdsHeader); + + return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params, headers }); } } diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 326c0de0eaa2..23b9bfaf0f49 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -122,7 +122,7 @@ describe('FeedbackAnalysisService', () => { const responsePromise = service.getParticipationForFeedbackIds(1, feedbackIds, pageable); - const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?feedbackIds=1,2&page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); + const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); From 45942893f7e9c2506afdecae95403dbd64c280d9 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Thu, 14 Nov 2024 19:14:51 +0100 Subject: [PATCH 16/64] ramona feedback --- .../tum/cit/aet/artemis/assessment/web/ResultResource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 1510eea74b33..431fb66373e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -359,9 +359,9 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { * and participation details. *
    * - * @param exerciseId for which the participation data is requested. - * @param feedbackIds to filter affected students by specific feedback entries. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @param exerciseId for which the participation data is requested. + * @param feedbackIdsHeader to filter affected students by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. */ @GetMapping("exercises/{exerciseId}/feedback-details-participation") From 7d1b0392cecd7b692db4b49c2ce0f0d549ddd60e Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Thu, 14 Nov 2024 19:28:42 +0100 Subject: [PATCH 17/64] server style --- .../artemis/assessment/ResultServiceIntegrationTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 4113841c7673..6b02b3e4d247 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -22,6 +22,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.ArgumentMatchers; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; @@ -882,9 +883,11 @@ void testGetParticipationForFeedbackId() throws Exception { Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); participationUtilService.addFeedbackToResult(feedback, result); - String url = "/api/exercises/" + programmingExercise.getId() - + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&feedbackIds=" + feedback.getId(); - String jsonResponse = request.get(url, HttpStatus.OK, String.class); + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING"; + HttpHeaders headers = new HttpHeaders(); + headers.add("feedbackIds", String.valueOf(feedback.getId())); + + String jsonResponse = request.get(url, HttpStatus.OK, String.class, headers); JsonNode jsonNode = new ObjectMapper().readTree(jsonResponse); assertThat(jsonNode.has("content")).isTrue(); From a8f17b7adb2d6fb8471a4e1592aef081bea5746a Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Sat, 16 Nov 2024 23:56:09 +0100 Subject: [PATCH 18/64] communication feature added --- .../assessment/service/ResultService.java | 15 ++++ .../assessment/web/ResultResource.java | 14 ++++ .../service/conversation/ChannelService.java | 52 +++++++++++- .../web/conversation/ChannelResource.java | 40 +++++++++- .../StudentParticipationRepository.java | 44 +++++++++++ ...back-channel-creation-modal.component.html | 11 +++ ...edback-channel-creation-modal.component.ts | 24 ++++++ ...edback-detail-channel-modal.component.html | 79 +++++++++++++++++++ ...feedback-detail-channel-modal.component.ts | 69 ++++++++++++++++ .../feedback-analysis.component.html | 1 + .../feedback-analysis.component.ts | 35 +++++++- .../feedback-analysis.service.ts | 17 ++++ ...-exercise-configure-grading.component.html | 2 +- .../webapp/i18n/de/programmingExercise.json | 25 ++++++ .../webapp/i18n/en/programmingExercise.json | 25 ++++++ 15 files changed, 449 insertions(+), 4 deletions(-) create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.html create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 50576953916b..56357dd9f850 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -692,4 +692,19 @@ public void deleteLongFeedback(List feedbackList, Result result) { List feedbacks = new ArrayList<>(feedbackList); result.updateAllFeedbackItems(feedbacks, true); } + + /** + * Retrieves the number of students affected by a specific feedback detail text for a given exercise. + *

    + * This method queries the repository to count the distinct students whose submissions were impacted + * by feedback entries matching the provided detail text within the specified exercise. + *

    + * + * @param exerciseId the ID of the exercise for which the affected student count is requested. + * @param detailText the feedback detail text used to filter affected students. + * @return the total number of distinct students affected by the feedback detail text. + */ + public long getAffectedStudentCountByFeedbackDetailText(long exerciseId, String detailText) { + return studentParticipationRepository.countAffectedStudentsByFeedbackDetailText(exerciseId, detailText); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 431fb66373e8..ed6bc5ce12d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -373,4 +373,18 @@ public ResponseEntity> getAffectedStudentsWithF return ResponseEntity.ok(participation); } + + /** + * GET /exercises/{exerciseId}/feedback-detail/affected-students : Retrieves the count of students affected by a specific feedback detail text. + * + * @param exerciseId The ID of the exercise for which affected students are counted. + * @param detailText The feedback detail text to filter by. + * @return A {@link ResponseEntity} containing the count of affected students. + */ + @GetMapping("exercises/{exerciseId}/feedback-detail/affected-students") + @EnforceAtLeastEditorInExercise + public ResponseEntity countAffectedStudentsByFeedbackDetailText(@PathVariable long exerciseId, @RequestParam("detailText") String detailText) { + long affectedStudentCount = resultService.getAffectedStudentCountByFeedbackDetailText(exerciseId, detailText); + return ResponseEntity.ok(affectedStudentCount); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index c78f44893d8e..c637691d63a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -17,18 +17,21 @@ import org.springframework.util.StringUtils; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.errors.ChannelNameDuplicateException; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.lecture.domain.Lecture; @Profile(PROFILE_CORE) @@ -47,12 +50,18 @@ public class ChannelService { private final UserRepository userRepository; + private final StudentParticipationRepository studentParticipationRepository; + + private final SingleUserNotificationService singleUserNotificationService; + public ChannelService(ConversationParticipantRepository conversationParticipantRepository, ChannelRepository channelRepository, ConversationService conversationService, - UserRepository userRepository) { + UserRepository userRepository, StudentParticipationRepository studentParticipationRepository, SingleUserNotificationService singleUserNotificationService) { this.conversationParticipantRepository = conversationParticipantRepository; this.channelRepository = channelRepository; this.conversationService = conversationService; this.userRepository = userRepository; + this.studentParticipationRepository = studentParticipationRepository; + this.singleUserNotificationService = singleUserNotificationService; } /** @@ -405,4 +414,45 @@ private static String generateChannelNameFromTitle(@NotNull String prefix, Optio } return channelName; } + + /** + * Creates a feedback-specific channel for an exercise within a course. + *

    + * This method sets up a new channel and adds affected students based on the provided feedback detail text. + * It validates the channel name, creates the channel, and registers affected students as members. Additionally, + * it sends notifications to the added users about the new channel. + *

    + * + * @param course the course in which the channel is being created. + * @param exerciseId the ID of the exercise associated with the feedback channel. + * @param channelDTO the DTO containing the properties of the channel to be created, such as name, description, and visibility. + * @param feedbackDetailText the feedback detail text used to identify the students affected by the feedback. + * @param requestingUser the user initiating the channel creation request. + * @return the created {@link Channel} object with its properties. + * @throws BadRequestAlertException if the channel name starts with an invalid prefix (e.g., "$"). + */ + public Channel createFeedbackChannel(Course course, Long exerciseId, ChannelDTO channelDTO, String feedbackDetailText, User requestingUser) { + var channelToCreate = new Channel(); + channelToCreate.setName(channelDTO.getName()); + channelToCreate.setIsPublic(channelDTO.getIsPublic()); + channelToCreate.setIsAnnouncementChannel(channelDTO.getIsAnnouncementChannel()); + channelToCreate.setIsArchived(false); + channelToCreate.setDescription(channelDTO.getDescription()); + + if (channelToCreate.getName() != null && channelToCreate.getName().trim().startsWith("$")) { + throw new BadRequestAlertException("User generated channels cannot start with $", "channel", "channelNameInvalid"); + } + + var createdChannel = createChannel(course, channelToCreate, Optional.of(requestingUser)); + + List userLogins = studentParticipationRepository.findAffectedLoginsByFeedbackDetailText(exerciseId, feedbackDetailText); + + if (userLogins != null && !userLogins.isEmpty()) { + var registeredUsers = registerUsersToChannel(false, false, false, userLogins, course, createdChannel); + registeredUsers.forEach(user -> singleUserNotificationService.notifyClientAboutConversationCreationOrDeletion(createdChannel, user, requestingUser, + NotificationType.CONVERSATION_ADD_USER_CHANNEL)); + } + + return createdChannel; + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index 03c7445e02e0..9349a8bd981d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -51,6 +52,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; @Profile(PROFILE_CORE) @@ -80,10 +82,13 @@ public class ChannelResource extends ConversationManagementResource { private final ConversationParticipantRepository conversationParticipantRepository; + private final StudentParticipationRepository studentParticipationRepository; + public ChannelResource(ConversationParticipantRepository conversationParticipantRepository, SingleUserNotificationService singleUserNotificationService, ChannelService channelService, ChannelRepository channelRepository, ChannelAuthorizationService channelAuthorizationService, AuthorizationCheckService authorizationCheckService, ConversationDTOService conversationDTOService, CourseRepository courseRepository, UserRepository userRepository, - ConversationService conversationService, TutorialGroupChannelManagementService tutorialGroupChannelManagementService) { + ConversationService conversationService, TutorialGroupChannelManagementService tutorialGroupChannelManagementService, + StudentParticipationRepository studentParticipationRepository) { super(courseRepository); this.channelService = channelService; this.channelRepository = channelRepository; @@ -95,6 +100,7 @@ public ChannelResource(ConversationParticipantRepository conversationParticipant this.tutorialGroupChannelManagementService = tutorialGroupChannelManagementService; this.singleUserNotificationService = singleUserNotificationService; this.conversationParticipantRepository = conversationParticipantRepository; + this.studentParticipationRepository = studentParticipationRepository; } /** @@ -460,6 +466,38 @@ public ResponseEntity deregisterUsers(@PathVariable Long courseId, @PathVa return ResponseEntity.ok().build(); } + /** + * POST /api/courses/:courseId/channels/: Creates a new feedback-specific channel in a course. + *

    + * This endpoint allows authorized users to create a new channel within a course that is specifically designed for discussions + * around a particular exercise's feedback. The channel is populated with all affected students based on the provided feedback detail text. + *

    + * + * @param courseId the ID of the course where the channel is being created. + * @param exerciseId the ID of the exercise for which the feedback channel is being created. + * @param channelDTO the DTO containing the properties of the channel to be created, such as name, description, and visibility. + * @param feedbackDetailText a string representing the feedback detail text used to determine the affected students to be added to the channel. + * @return ResponseEntity with status 201 (Created) and the body containing the details of the created channel. + * @throws URISyntaxException if the URI for the created resource cannot be constructed. + * @throws BadRequestAlertException if the channel name starts with an invalid prefix (e.g., "$"). + */ + @PostMapping("{courseId}/{exerciseId}/feedback-channel") + @EnforceAtLeastStudent + public ResponseEntity createFeedbackChannel(@PathVariable Long courseId, @PathVariable Long exerciseId, @RequestBody ChannelDTO channelDTO, + @RequestHeader("feedback-detail-text") String feedbackDetailText) throws URISyntaxException { + log.debug("REST request to create feedback channel in course {} with properties: {}", courseId, channelDTO); + + var requestingUser = userRepository.getUserWithGroupsAndAuthorities(); + var course = courseRepository.findByIdElseThrow(courseId); + + checkCommunicationEnabledElseThrow(course); + channelAuthorizationService.isAllowedToCreateChannel(course, requestingUser); + + var createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailText, requestingUser); + + return ResponseEntity.created(new URI("/api/channels/" + createdChannel.getId())).body(conversationDTOService.convertChannelToDTO(requestingUser, createdChannel)); + } + private void checkEntityIdMatchesPathIds(Channel channel, Optional courseId, Optional conversationId) { courseId.ifPresent(courseIdValue -> { if (!channel.getCourse().getId().equals(courseIdValue)) { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 1101f94d4708..c67ec302ff3c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1361,4 +1361,48 @@ SELECT MAX(pr.id) ORDER BY p.student.firstName ASC """) Page findAffectedStudentsByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); + + /** + * Retrieves the logins of students affected by a specific feedback detail text in a given exercise. + * + * @param exerciseId The ID of the exercise for which affected students are requested. + * @param detailText The feedback detail text to filter by. + * @return A list of student logins affected by the given feedback detail text in the specified exercise. + */ + @Query(""" + SELECT DISTINCT p.student.login + FROM ProgrammingExerciseStudentParticipation p + LEFT JOIN p.submissions s + LEFT JOIN s.results r + LEFT JOIN r.feedbacks f + WHERE p.exercise.id = :exerciseId + AND f.detailText = :detailText + AND p.testRun = FALSE + AND f.positive = FALSE + """) + List findAffectedLoginsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText); + + /** + * Counts the number of distinct students affected by a specific feedback detail text for a given programming exercise. + *

    + * This query identifies students whose submissions were impacted by feedback entries matching the provided detail text + * within the specified exercise. Only students with non-test run submissions and negative feedback entries are considered. + *

    + * + * @param exerciseId the ID of the programming exercise for which the count is calculated. + * @param detailText the feedback detail text used to filter the affected students. + * @return the total number of distinct students affected by the feedback detail text. + */ + @Query(""" + SELECT COUNT(DISTINCT p.student.id) + FROM ProgrammingExerciseStudentParticipation p + LEFT JOIN p.submissions s + LEFT JOIN s.results r + LEFT JOIN r.feedbacks f + WHERE p.exercise.id = :exerciseId + AND f.detailText = :detailText + AND p.testRun = FALSE + AND f.positive = FALSE + """) + long countAffectedStudentsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText); } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.html new file mode 100644 index 000000000000..5e9f73b6f44e --- /dev/null +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.html @@ -0,0 +1,11 @@ +
    +

    + +
    +
    +

    +
    +
    + + +
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts new file mode 100644 index 000000000000..58d0471a844f --- /dev/null +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts @@ -0,0 +1,24 @@ +import { Component, input } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; + +@Component({ + selector: 'jhi-confirm-feedback-channel-creation-modal', + templateUrl: './confirm-feedback-channel-creation-modal.component.html', + imports: [ArtemisSharedCommonModule], + standalone: true, +}) +export class ConfirmFeedbackChannelCreationModalComponent { + affectedStudentsCount = input.required(); + readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel.confirmationModal'; + + constructor(private activeModal: NgbActiveModal) {} + + confirm(): void { + this.activeModal.close(true); + } + + dismiss(): void { + this.activeModal.dismiss(); + } +} diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html new file mode 100644 index 000000000000..82f7c24d9efe --- /dev/null +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -0,0 +1,79 @@ +
    +

    + +

    + +
    +
    +
    +

    +
    +
    +
    + + + @if (form.get('name')?.invalid && (form.get('name')?.dirty || form.get('name')?.touched)) { +
    + @if (form.get('name')?.errors?.['required']) { +
    + } + @if (form.get('name')?.errors?.['maxlength']) { +
    + } + @if (!form.get('name')?.errors?.['required'] && !form.get('name')?.errors?.['maxlength'] && form.get('name')?.errors?.['pattern']) { +
    + } +
    + } +
    +
    + + + @if (form.get('description')?.invalid && (form.get('description')?.dirty || form.get('description')?.touched)) { +
    + @if (form.get('description')?.errors?.['required']) { +
    + } + @if (form.get('description')?.errors?.['maxlength']) { +
    + } +
    + } +
    +
    + +
    + + + + +
    +
    +
    + +
    + + + + +
    +
    +
    +

    + +

    +
    +
    +

    + + +

    +

    + + +

    +
    + + +
    +
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts new file mode 100644 index 000000000000..28a040fc2374 --- /dev/null +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts @@ -0,0 +1,69 @@ +import { Component, input, output, signal } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; +import { FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; +import { ConfirmFeedbackChannelCreationModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; + +@Component({ + selector: 'jhi-feedback-detail-channel-modal', + templateUrl: './feedback-detail-channel-modal.component.html', + imports: [ArtemisSharedCommonModule], + standalone: true, +}) +export class FeedbackDetailChannelModalComponent { + affectedStudentsCount = input.required(); + feedbackDetail = input.required(); + formSubmitted = output<{ channelDto: ChannelDTO; navigate: boolean }>(); + + isConfirmModalOpen = signal(false); + form: FormGroup; + readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel'; + + constructor( + private fb: FormBuilder, + private activeModal: NgbActiveModal, + private modalService: NgbModal, + ) { + this.form = this.fb.group({ + name: ['', [Validators.required, Validators.maxLength(30), Validators.pattern('^[a-z0-9-]{1}[a-z0-9-]{0,30}$')]], + description: ['', [Validators.required, Validators.maxLength(250)]], + isPublic: [true, Validators.required], + isAnnouncementChannel: [false, Validators.required], + }); + } + + async submitForm(navigate: boolean): Promise { + if (this.form.valid && !this.isConfirmModalOpen()) { + this.isConfirmModalOpen.set(true); + const modalRef = this.modalService.open(ConfirmFeedbackChannelCreationModalComponent, { centered: true }); + modalRef.componentInstance.affectedStudentsCount = this.affectedStudentsCount; + try { + const result = await modalRef.result; + if (result) { + const channelDTO = new ChannelDTO(); + channelDTO.name = this.form.get('name')?.value; + channelDTO.description = this.form.get('description')?.value; + channelDTO.isPublic = this.form.get('isPublic')?.value; + channelDTO.isAnnouncementChannel = this.form.get('isAnnouncementChannel')?.value; + + this.formSubmitted.emit({ channelDto: channelDTO, navigate }); + this.closeModal(); + } + } catch (error) { + console.error(error); + } finally { + this.isConfirmModalOpen.set(false); + } + } + } + + closeModal(): void { + this.activeModal.close(); + } + + dismissModal(): void { + this.activeModal.dismiss(); + } +} diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 20206a2c4ae3..508f10ecb983 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -62,6 +62,7 @@

    + } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 9026d7cbb1ec..11daa26f5067 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -2,7 +2,7 @@ import { Component, computed, effect, inject, input, signal, untracked } from '@ import { FeedbackAnalysisService, FeedbackDetail } from './feedback-analysis.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { faFilter, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter, faUsers } from '@fortawesome/free-solid-svg-icons'; +import { faFilter, faMessage, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter, faUsers } from '@fortawesome/free-solid-svg-icons'; import { SearchResult, SortingOrder } from 'app/shared/table/pageable-table'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { FeedbackModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component'; @@ -11,6 +11,8 @@ import { LocalStorageService } from 'ngx-webstorage'; import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; import { SortIconComponent } from 'app/shared/sort/sort-icon.component'; import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; +import { FeedbackDetailChannelModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component'; +import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; @Component({ selector: 'jhi-feedback-analysis', @@ -23,6 +25,7 @@ import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage export class FeedbackAnalysisComponent { exerciseTitle = input.required(); exerciseId = input.required(); + courseId = input.required(); private feedbackAnalysisService = inject(FeedbackAnalysisService); private alertService = inject(AlertService); @@ -46,6 +49,7 @@ export class FeedbackAnalysisComponent { readonly faFilter = faFilter; readonly faUpRightAndDownLeftFromCenter = faUpRightAndDownLeftFromCenter; readonly faUsers = faUsers; + readonly faMessage = faMessage; readonly SortingOrder = SortingOrder; readonly MAX_FEEDBACK_DETAIL_TEXT_LENGTH = 200; @@ -60,6 +64,8 @@ export class FeedbackAnalysisComponent { readonly maxCount = signal(0); readonly errorCategories = signal([]); + private isFeedbackDetailChannelModalOpen = false; + private readonly debounceLoadData = BaseApiHttpService.debounce(this.loadData.bind(this), 300); constructor() { @@ -191,4 +197,31 @@ export class FeedbackAnalysisComponent { modalRef.componentInstance.exerciseId = this.exerciseId; modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); } + + async openFeedbackDetailChannelModal(feedbackDetail: FeedbackDetail): Promise { + if (this.isFeedbackDetailChannelModalOpen) { + return; + } + this.isFeedbackDetailChannelModalOpen = true; + const modalRef = this.modalService.open(FeedbackDetailChannelModalComponent, { centered: true, size: 'lg' }); + modalRef.componentInstance.affectedStudentsCount = await this.feedbackAnalysisService.getAffectedStudentCount(this.exerciseId(), feedbackDetail.detailText); + modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); + modalRef.componentInstance.formSubmitted.subscribe(async ({ channelDto, navigate }: { channelDto: ChannelDTO; navigate: boolean }) => { + try { + const createdChannel = await this.feedbackAnalysisService.createChannel(this.courseId(), this.exerciseId(), channelDto, feedbackDetail.detailText); + this.alertService.success(this.TRANSLATION_BASE + '.channelSuccess'); + if (navigate) { + window.location.href = `/courses/${this.courseId()}/communication?conversationId=${createdChannel.id}`; + } + } catch (error) { + this.alertService.error(error); + } + }); + try { + await modalRef.result; + } catch { + } finally { + this.isFeedbackDetailChannelModalOpen = false; + } + } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 214c9a4e4f4c..bbb7c2a7db73 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -3,6 +3,8 @@ import { PageableResult, PageableSearch, SearchResult, SearchTermPageableSearch import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; import { HttpHeaders, HttpParams } from '@angular/common/http'; import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; +import { Course } from 'app/entities/course.model'; +import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; export interface FeedbackAnalysisResponse { feedbackDetails: SearchResult; @@ -62,4 +64,19 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params, headers }); } + + getCourse(courseId: number): Promise { + return this.get(`courses/${courseId}`); + } + + createChannel(courseId: number, exerciseId: number, channelDTO: ChannelDTO, feedbackDetailText: string): Promise { + const headers = new HttpHeaders().set('feedback-detail-text', feedbackDetailText); + + return this.post(`courses/${courseId}/${exerciseId}/feedback-channel`, channelDTO, { headers }); + } + + getAffectedStudentCount(exerciseId: number, feedbackDetailText: string): Promise { + const params = new HttpParams().set('detailText', feedbackDetailText); + return this.get(`exercises/${exerciseId}/feedback-detail/affected-students`, { params }); + } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html index 147c35adea2f..608072471257 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html @@ -271,7 +271,7 @@

    @if (programmingExercise.isAtLeastEditor && activeTab === 'feedback-analysis') { - + }
    } diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 41533417cf1e..ac2489788ac3 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -357,6 +357,7 @@ "filter": "Filter", "noData": "Es konnten keine Feedback Einträge für die Programmieraufgabe gefunden werden.", "noDataFilter": "Für den spezifizierten Filter oder Suchbegriff konnten keine Feedback Einträge gefunden werden.", + "channelSuccess": "Kanal erfolgreich erstellt.", "feedbackModal": { "header": "Fehlerdetails", "feedbackTitle": "Feedback zu Testfällen", @@ -379,6 +380,30 @@ "repository": "Repository", "totalItems": "Insgesamt {{count}} Element(e)", "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten." + }, + "feedbackDetailChannel": { + "title": "Erstellen Sie einen Feedback-Diskussionskanal", + "studentNumber": "Anzahl der Studierende die dem Kanal hinzugefügt werden: {{count}}", + "description": "Dieser Kanal soll Diskussionen über spezifisches Feedback zur bereitgestellten Übung erleichtern. Es ermöglicht allen betroffenen Studierenden und Lehrenden, zusammenzuarbeiten und das Feedback effektiv anzugehen.", + "label": "Kanalname", + "channelVisibility": "Kanal Sichtbarkeit", + "visibilityPublic": "Öffentlich", + "visibilityPrivate": "Privat", + "announcementChannel": "Ankündigungskanal", + "announcementChannelYes": "Ja", + "announcementChannelNo": "Nein", + "createAndNavigateLabel": "Erstellen und Navigieren:", + "createAndNavigateDescription": "Erstellt den Kanal und navigiert automatisch zum Kanal.", + "createChannelLabel": "Kanal erstellen:", + "createChannelDescription": "Erstellt den Kanal, ohne die Seite zu verlassen.", + "createAndNavigateButton": "Erstellen und Navigieren", + "createChannelButton": "Kanal erstellen", + "confirmationModal": { + "header": "Kanal Erstellen bestätigen", + "confirmationMessage": "Sind Sie sicher, dass Sie diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", + "cancel": "Abbrechen", + "confirm": "Ja, erstellen" + } } }, "help": { diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index d3a53f20f180..3e41e3758e8f 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -357,6 +357,7 @@ "filter": "Filters", "noData": "No Feedback Entries could be found for the Programming Exercise.", "noDataFilter": "No Feedback Entries could be found for the specified filter or search Term.", + "channelSuccess": "Channel successfully created.", "feedbackModal": { "header": "Error Details", "feedbackTitle": "Test Case Feedback", @@ -379,6 +380,30 @@ "repository": "Repository", "totalItems": "In total {{count}} item(s)", "error": "There was an error while loading the affected Students for this feedback." + }, + "feedbackDetailChannel": { + "title": "Create Feedback Discussion Channel", + "studentNumber": "Number of students which will be added to the channel: {{count}}", + "description": "This channel is intended to facilitate discussions around specific feedback for the provided exercise feedback. It will allow all affected students and instructors to collaborate and address the feedback effectively.", + "label": "Channel Name", + "channelVisibility": "Channel Visibility", + "visibilityPublic": "Public", + "visibilityPrivate": "Private", + "announcementChannel": "Announcement Channel", + "announcementChannelYes": "Yes", + "announcementChannelNo": "No", + "createAndNavigateLabel": "Create and Navigate:", + "createAndNavigateDescription": "Creates the channel and automatically navigates to the channel.", + "createChannelLabel": "Create Channel:", + "createChannelDescription": "Creates the channel without navigating away from this page.", + "createAndNavigateButton": "Create and Navigate", + "createChannelButton": "Create Channel", + "confirmationModal": { + "header": "Confirm Channel Creation", + "confirmationMessage": "Are you sure you want to create this channel? This will create a channel with {{count}} student(s).", + "cancel": "Cancel", + "confirm": "Yes, Create" + } } }, "help": { From 8795e5e864fbdada34b884cf7c5f8230045ed6f4 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Sun, 17 Nov 2024 23:39:25 +0100 Subject: [PATCH 19/64] tests added --- .../web/conversation/ChannelResource.java | 3 +- ...feedback-detail-channel-modal.component.ts | 42 ++--- .../ResultServiceIntegrationTest.java | 39 +++++ .../communication/ChannelIntegrationTest.java | 32 ++++ .../feedback-analysis.component.spec.ts | 66 +++++++- .../feedback-analysis.service.spec.ts | 17 ++ ...k-channel-creation-modal.component.spec.ts | 39 +++++ ...ack-detail-channel-modal.component.spec.ts | 153 ++++++++++++++++++ 8 files changed, 371 insertions(+), 20 deletions(-) create mode 100644 src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts create mode 100644 src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index 9349a8bd981d..b466ee39d3d1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -51,6 +51,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; @@ -482,7 +483,7 @@ public ResponseEntity deregisterUsers(@PathVariable Long courseId, @PathVa * @throws BadRequestAlertException if the channel name starts with an invalid prefix (e.g., "$"). */ @PostMapping("{courseId}/{exerciseId}/feedback-channel") - @EnforceAtLeastStudent + @EnforceAtLeastEditorInCourse public ResponseEntity createFeedbackChannel(@PathVariable Long courseId, @PathVariable Long exerciseId, @RequestBody ChannelDTO channelDTO, @RequestHeader("feedback-detail-text") String feedbackDetailText) throws URISyntaxException { log.debug("REST request to create feedback channel in course {} with properties: {}", courseId, channelDTO); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts index 28a040fc2374..7f8806a99647 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts @@ -1,10 +1,11 @@ -import { Component, input, output, signal } from '@angular/core'; +import { Component, inject, input, output, signal } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; import { FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; import { ConfirmFeedbackChannelCreationModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { AlertService } from 'app/core/util/alert.service'; @Component({ selector: 'jhi-feedback-detail-channel-modal', @@ -20,6 +21,7 @@ export class FeedbackDetailChannelModalComponent { isConfirmModalOpen = signal(false); form: FormGroup; readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel'; + private alertService = inject(AlertService); constructor( private fb: FormBuilder, @@ -37,25 +39,29 @@ export class FeedbackDetailChannelModalComponent { async submitForm(navigate: boolean): Promise { if (this.form.valid && !this.isConfirmModalOpen()) { this.isConfirmModalOpen.set(true); - const modalRef = this.modalService.open(ConfirmFeedbackChannelCreationModalComponent, { centered: true }); - modalRef.componentInstance.affectedStudentsCount = this.affectedStudentsCount; - try { - const result = await modalRef.result; - if (result) { - const channelDTO = new ChannelDTO(); - channelDTO.name = this.form.get('name')?.value; - channelDTO.description = this.form.get('description')?.value; - channelDTO.isPublic = this.form.get('isPublic')?.value; - channelDTO.isAnnouncementChannel = this.form.get('isAnnouncementChannel')?.value; + const result = await this.handleModal(); + if (result) { + const channelDTO = new ChannelDTO(); + channelDTO.name = this.form.get('name')?.value; + channelDTO.description = this.form.get('description')?.value; + channelDTO.isPublic = this.form.get('isPublic')?.value; + channelDTO.isAnnouncementChannel = this.form.get('isAnnouncementChannel')?.value; - this.formSubmitted.emit({ channelDto: channelDTO, navigate }); - this.closeModal(); - } - } catch (error) { - console.error(error); - } finally { - this.isConfirmModalOpen.set(false); + this.formSubmitted.emit({ channelDto: channelDTO, navigate }); + this.closeModal(); } + this.isConfirmModalOpen.set(false); + } + } + + async handleModal(): Promise { + try { + const modalRef = this.modalService.open(ConfirmFeedbackChannelCreationModalComponent, { centered: true }); + modalRef.componentInstance.affectedStudentsCount = this.affectedStudentsCount; + return await modalRef.result; + } catch (error) { + this.alertService.error(error); + return false; } } diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 6b02b3e4d247..b5834d6a66bf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -903,4 +903,43 @@ void testGetParticipationForFeedbackId() throws Exception { assertThat(jsonNode.has("empty")).isTrue(); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testCountAffectedStudentsByFeedbackDetailText() throws Exception { + StudentParticipation participation1 = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); + StudentParticipation participation2 = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student2"); + Result result1 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation1); + Result result2 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation2); + participationUtilService.addVariousFeedbackTypeFeedbacksToResult(result1); + ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); + testCase.setId(1L); + + Feedback feedback1 = new Feedback(); + feedback1.setPositive(false); + feedback1.setDetailText("SampleFeedback"); + feedback1.setTestCase(testCase); + participationUtilService.addFeedbackToResult(feedback1, result1); + + Feedback feedback2 = new Feedback(); + feedback2.setPositive(false); + feedback2.setDetailText("SampleFeedback"); + feedback2.setTestCase(testCase); + participationUtilService.addFeedbackToResult(feedback2, result2); + + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-detail/affected-students?detailText=SampleFeedback"; + long affectedStudentsCount = request.get(url, HttpStatus.OK, Long.class); + + assertThat(affectedStudentsCount).isInstanceOf(Long.class); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testCountAffectedStudentsByFeedbackDetailText_NoMatch() throws Exception { + ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-detail/affected-students?detailText=NonexistentFeedback"; + long affectedStudentsCount = request.get(url, HttpStatus.OK, Long.class); + + assertThat(affectedStudentsCount).isEqualTo(0); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index c0aa140ae963..2d4e03ea7ce8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -9,12 +9,14 @@ import java.util.Set; import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; @@ -32,6 +34,8 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; @@ -63,6 +67,9 @@ class ChannelIntegrationTest extends AbstractConversationTest { @Autowired private ConversationUtilService conversationUtilService; + @Autowired + private ProgrammingExerciseUtilService programmingExerciseUtilService; + @BeforeEach @Override void setupTestScenario() throws Exception { @@ -901,6 +908,31 @@ void getLectureChannel_asCourseStudent_shouldGetLectureChannel() throws Exceptio lectureRepository.deleteById(lecture.getId()); } + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "STUDENT") + void createFeedbackChannel_asStudent_shouldReturnForbidden() { + Course course = programmingExerciseUtilService.addCourseWithOneProgrammingExercise(); + ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + ChannelDTO channelDTO = new ChannelDTO(); + channelDTO.setName("feedback-channel"); + channelDTO.setDescription("Discussion channel for feedback"); + channelDTO.setIsPublic(true); + channelDTO.setIsAnnouncementChannel(false); + + HttpHeaders headers = new HttpHeaders(); + headers.set("feedback-detail-text", "Sample feedback text"); + + String BASE_ENDPOINT = "api/courses/{courseId}/{exerciseId}/feedback-channel"; + + try { + request.postWithoutResponseBody(BASE_ENDPOINT.replace("{courseId}", course.getId().toString()).replace("{exerciseId}", programmingExercise.getId().toString()), + channelDTO, HttpStatus.FORBIDDEN, headers); + } + catch (Exception e) { + Assertions.fail("Request failed unexpectedly", e); + } + } + private void testArchivalChangeWorks(ChannelDTO channel, boolean isPublicChannel, boolean shouldArchive) throws Exception { // prepare channel in db if (shouldArchive) { diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index 09d22ab65dd6..efba3a7ba4de 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -9,6 +9,10 @@ import { LocalStorageService } from 'ngx-webstorage'; import '@angular/localize/init'; import { FeedbackFilterModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; +import { FeedbackDetailChannelModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component'; +import { Subject } from 'rxjs'; +import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; +import { AlertService } from 'app/core/util/alert.service'; describe('FeedbackAnalysisComponent', () => { let fixture: ComponentFixture; @@ -16,6 +20,10 @@ describe('FeedbackAnalysisComponent', () => { let feedbackAnalysisService: FeedbackAnalysisService; let searchSpy: jest.SpyInstance; let localStorageService: LocalStorageService; + let modalService: NgbModal; + let alertService: AlertService; + let modalSpy: jest.SpyInstance; + let createChannelSpy: jest.SpyInstance; const feedbackMock: FeedbackDetail[] = [ { @@ -63,11 +71,27 @@ describe('FeedbackAnalysisComponent', () => { component = fixture.componentInstance; feedbackAnalysisService = fixture.debugElement.injector.get(FeedbackAnalysisService); localStorageService = fixture.debugElement.injector.get(LocalStorageService); + modalService = fixture.debugElement.injector.get(NgbModal); + alertService = fixture.debugElement.injector.get(AlertService); jest.spyOn(localStorageService, 'retrieve').mockReturnValue([]); searchSpy = jest.spyOn(feedbackAnalysisService, 'search').mockResolvedValue(feedbackResponseMock); + const mockFormSubmitted = new Subject<{ channelDto: ChannelDTO; navigate: boolean }>(); + modalSpy = jest.spyOn(TestBed.inject(NgbModal), 'open').mockReturnValue({ + componentInstance: { + formSubmitted: mockFormSubmitted, + affectedStudentsCount: null, + feedbackDetail: null, + }, + result: Promise.resolve(), + } as any); + + jest.spyOn(feedbackAnalysisService, 'getAffectedStudentCount').mockResolvedValue(10); + createChannelSpy = jest.spyOn(feedbackAnalysisService, 'createChannel').mockResolvedValue({ id: 123 } as ChannelDTO); + + jest.spyOn(fixture.debugElement.injector.get(AlertService), 'success'); + jest.spyOn(fixture.debugElement.injector.get(AlertService), 'error'); - // Initial input setup fixture.componentRef.setInput('exerciseId', 1); fixture.componentRef.setInput('exerciseTitle', 'Sample Exercise Title'); @@ -254,4 +278,44 @@ describe('FeedbackAnalysisComponent', () => { expect(modalSpy).toHaveBeenCalledOnce(); }); }); + + it('should open the feedback detail channel modal', async () => { + const formSubmitted = new Subject<{ channelDto: ChannelDTO; navigate: boolean }>(); + const modalRef = { + result: Promise.resolve('mocked result'), + componentInstance: { + formSubmitted, + affectedStudentsCount: null, + feedbackDetail: null, + }, + } as any; + jest.spyOn(modalService, 'open').mockReturnValue(modalRef); + await component.openFeedbackDetailChannelModal(feedbackMock[0]); + expect(modalService.open).toHaveBeenCalledWith(FeedbackDetailChannelModalComponent, { centered: true, size: 'lg' }); + }); + + it('should handle errors during channel creation gracefully', async () => { + const formSubmitted = new Subject<{ channelDto: ChannelDTO; navigate: boolean }>(); + const modalRef = { + result: Promise.resolve('mocked result'), + componentInstance: { + formSubmitted, + affectedStudentsCount: null, + feedbackDetail: null, + }, + } as any; + jest.spyOn(modalService, 'open').mockReturnValue(modalRef); + createChannelSpy.mockRejectedValue(new Error('Error creating channel')); + await component.openFeedbackDetailChannelModal(feedbackMock[0]); + formSubmitted.next({ channelDto: { name: 'Test Channel' } as ChannelDTO, navigate: true }); + expect(alertService.error).toHaveBeenCalledOnce(); + }); + + it('should not proceed if modal is already open', async () => { + component['isFeedbackDetailChannelModalOpen'] = true; + const feedbackDetail = feedbackMock[0]; + await component.openFeedbackDetailChannelModal(feedbackDetail); + expect(component['isFeedbackDetailChannelModalOpen']).toBeTrue(); + expect(modalSpy).not.toHaveBeenCalled(); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 23b9bfaf0f49..b735a2e0f796 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -132,4 +132,21 @@ describe('FeedbackAnalysisService', () => { expect(result.content[1].firstName).toBe('Jane'); }); }); + + describe('getAffectedStudentCount', () => { + it('should retrieve the count of affected students for a feedback detail text', async () => { + const exerciseId = 1; + const feedbackDetailText = 'Test feedback detail'; + const affectedStudentCountMock = 42; + + const responsePromise = service.getAffectedStudentCount(exerciseId, feedbackDetailText); + + const req = httpMock.expectOne(`api/exercises/${exerciseId}/feedback-detail/affected-students?detailText=${encodeURIComponent(feedbackDetailText)}`); + expect(req.request.method).toBe('GET'); + req.flush(affectedStudentCountMock); + + const result = await responsePromise; + expect(result).toBe(affectedStudentCountMock); + }); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts new file mode 100644 index 000000000000..e3cc77fdbd09 --- /dev/null +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts @@ -0,0 +1,39 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ConfirmFeedbackChannelCreationModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; + +describe('ConfirmFeedbackChannelCreationModalComponent', () => { + let fixture: ComponentFixture; + let component: ConfirmFeedbackChannelCreationModalComponent; + let activeModal: NgbActiveModal; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), ConfirmFeedbackChannelCreationModalComponent], + providers: [NgbActiveModal], + }).compileComponents(); + + fixture = TestBed.createComponent(ConfirmFeedbackChannelCreationModalComponent); + component = fixture.componentInstance; + activeModal = TestBed.inject(NgbActiveModal); + fixture.componentRef.setInput('affectedStudentsCount', 42); + fixture.detectChanges(); + }); + + it('should initialize with the provided affectedStudentsCount', () => { + expect(component.affectedStudentsCount()).toBe(42); + }); + + it('should call close on activeModal with true when confirm is triggered', () => { + const closeSpy = jest.spyOn(activeModal, 'close'); + component.confirm(); + expect(closeSpy).toHaveBeenCalledWith(true); + }); + + it('should call dismiss on activeModal when dismiss is triggered', () => { + const dismissSpy = jest.spyOn(activeModal, 'dismiss'); + component.dismiss(); + expect(dismissSpy).toHaveBeenCalled(); + }); +}); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts new file mode 100644 index 000000000000..8842a307462b --- /dev/null +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts @@ -0,0 +1,153 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FeedbackDetailChannelModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { FormBuilder, ReactiveFormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; + +describe('FeedbackDetailChannelModalComponent', () => { + let fixture: ComponentFixture; + let component: FeedbackDetailChannelModalComponent; + let activeModal: NgbActiveModal; + let modalService: NgbModal; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), ReactiveFormsModule, FeedbackDetailChannelModalComponent], + providers: [NgbActiveModal, NgbModal, FormBuilder], + }).compileComponents(); + + fixture = TestBed.createComponent(FeedbackDetailChannelModalComponent); + component = fixture.componentInstance; + activeModal = TestBed.inject(NgbActiveModal); + modalService = TestBed.inject(NgbModal); + + fixture.componentRef.setInput('affectedStudentsCount', 42); + fixture.componentRef.setInput('feedbackDetail', { + detailText: 'Sample feedback', + concatenatedFeedbackIds: [1], + count: 10, + relativeCount: 50, + testCaseName: 'testCase1', + taskName: 'Task 1', + errorCategory: 'StudentError', + } as any); + fixture.componentInstance.isConfirmModalOpen.set(false); + fixture.detectChanges(); + }); + + it('should initialize form and inputs', () => { + expect(component.affectedStudentsCount()).toBe(42); + expect(component.feedbackDetail().detailText).toBe('Sample feedback'); + expect(component.form).toBeDefined(); + expect(component.form.valid).toBeFalse(); + }); + + it('should call activeModal.close when closeModal is triggered', () => { + const closeSpy = jest.spyOn(activeModal, 'close'); + component.closeModal(); + expect(closeSpy).toHaveBeenCalled(); + }); + + it('should call activeModal.dismiss when dismissModal is triggered', () => { + const dismissSpy = jest.spyOn(activeModal, 'dismiss'); + component.dismissModal(); + expect(dismissSpy).toHaveBeenCalled(); + }); + + it('should open confirmation modal and emit formSubmitted on successful confirmation', async () => { + jest.spyOn(component, 'handleModal').mockResolvedValue(true); + + component.form.setValue({ + name: 'channel', + description: 'channelDescription', + isPublic: true, + isAnnouncementChannel: false, + }); + + const formSubmittedSpy = jest.spyOn(component.formSubmitted, 'emit'); + await component.submitForm(false); + + expect(component.isConfirmModalOpen()).toBeFalse(); + expect(formSubmittedSpy).toHaveBeenCalledWith({ + channelDto: expect.objectContaining({ + creationDate: undefined, + creator: undefined, + description: 'channelDescription', + hasChannelModerationRights: undefined, + hasUnreadMessage: undefined, + id: undefined, + isAnnouncementChannel: false, + isArchived: undefined, + isChannelModerator: undefined, + isCourseWide: undefined, + isCreator: undefined, + isFavorite: undefined, + isHidden: undefined, + isMember: undefined, + isMuted: undefined, + isPublic: true, + lastMessageDate: undefined, + lastReadDate: undefined, + name: 'channel', + numberOfMembers: undefined, + subType: undefined, + subTypeReferenceId: undefined, + topic: undefined, + tutorialGroupId: undefined, + tutorialGroupTitle: undefined, + type: 'channel', + unreadMessagesCount: undefined, + }), + navigate: false, + }); + }); + + it('should call handleModal and proceed if confirmed', async () => { + jest.spyOn(component, 'handleModal').mockResolvedValue(true); + const formSubmittedSpy = jest.spyOn(component.formSubmitted, 'emit'); + + component.form.setValue({ + name: 'channel', + description: 'channelDescription', + isPublic: true, + isAnnouncementChannel: false, + }); + + await component.submitForm(false); + + expect(component.handleModal).toHaveBeenCalled(); + expect(formSubmittedSpy).toHaveBeenCalledWith({ + channelDto: expect.objectContaining({ + name: 'channel', + description: 'channelDescription', + isPublic: true, + isAnnouncementChannel: false, + }), + navigate: false, + }); + }); + + it('should not proceed if modal is dismissed', async () => { + jest.spyOn(component, 'handleModal').mockResolvedValue(false); + + const formSubmittedSpy = jest.spyOn(component.formSubmitted, 'emit'); + + component.form.setValue({ + name: 'channel', + description: 'channelDescription', + isPublic: true, + isAnnouncementChannel: false, + }); + + await component.submitForm(false); + + expect(component.handleModal).toHaveBeenCalled(); + expect(formSubmittedSpy).not.toHaveBeenCalled(); + }); + + it('should not open confirmation modal if form is invalid', async () => { + const modalSpy = jest.spyOn(modalService, 'open'); + await component.submitForm(true); + expect(modalSpy).not.toHaveBeenCalled(); + }); +}); From 45835c43cb4156057c11eb659707857123618673 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 18 Nov 2024 00:02:29 +0100 Subject: [PATCH 20/64] added translation field --- .../Modal/feedback-detail-channel-modal.component.html | 4 ++-- .../grading/feedback-analysis/feedback-analysis.service.ts | 5 ----- src/main/webapp/i18n/de/programmingExercise.json | 1 + src/main/webapp/i18n/en/programmingExercise.json | 1 + 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index 82f7c24d9efe..cf1da05ffc3d 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -11,7 +11,7 @@

    - + @if (form.get('name')?.invalid && (form.get('name')?.dirty || form.get('name')?.touched)) {
    @if (form.get('name')?.errors?.['required']) { @@ -28,7 +28,7 @@

    - + @if (form.get('description')?.invalid && (form.get('description')?.dirty || form.get('description')?.touched)) {
    @if (form.get('description')?.errors?.['required']) { diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index bbb7c2a7db73..906b699f19a5 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -3,7 +3,6 @@ import { PageableResult, PageableSearch, SearchResult, SearchTermPageableSearch import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; import { HttpHeaders, HttpParams } from '@angular/common/http'; import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; -import { Course } from 'app/entities/course.model'; import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; export interface FeedbackAnalysisResponse { @@ -65,10 +64,6 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params, headers }); } - getCourse(courseId: number): Promise { - return this.get(`courses/${courseId}`); - } - createChannel(courseId: number, exerciseId: number, channelDTO: ChannelDTO, feedbackDetailText: string): Promise { const headers = new HttpHeaders().set('feedback-detail-text', feedbackDetailText); diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index ac2489788ac3..4a2624f57f1e 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -398,6 +398,7 @@ "createChannelDescription": "Erstellt den Kanal, ohne die Seite zu verlassen.", "createAndNavigateButton": "Erstellen und Navigieren", "createChannelButton": "Kanal erstellen", + "placeholder": "Dieses Feld bitte nicht leer lassen", "confirmationModal": { "header": "Kanal Erstellen bestätigen", "confirmationMessage": "Sind Sie sicher, dass Sie diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 3e41e3758e8f..d493792af005 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -398,6 +398,7 @@ "createChannelDescription": "Creates the channel without navigating away from this page.", "createAndNavigateButton": "Create and Navigate", "createChannelButton": "Create Channel", + "placeholder": "This field should not be empty", "confirmationModal": { "header": "Confirm Channel Creation", "confirmationMessage": "Are you sure you want to create this channel? This will create a channel with {{count}} student(s).", From 71a4cdb8870efd70e9bb52d4115a8b474f831601 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 18 Nov 2024 00:17:26 +0100 Subject: [PATCH 21/64] server style --- .../cit/aet/artemis/communication/ChannelIntegrationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index 2d4e03ea7ce8..2d25889d9a15 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.communication; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.fail; import java.time.ZonedDateTime; import java.util.Arrays; @@ -9,7 +10,6 @@ import java.util.Set; import java.util.stream.Collectors; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -929,7 +929,7 @@ void createFeedbackChannel_asStudent_shouldReturnForbidden() { channelDTO, HttpStatus.FORBIDDEN, headers); } catch (Exception e) { - Assertions.fail("Request failed unexpectedly", e); + fail("There was an error executing the post request.", e); } } From 31fa70edbce5c89c30b270b1a0d36bd63825784c Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 18 Nov 2024 11:15:42 +0100 Subject: [PATCH 22/64] removed functionality for non communication courses --- .../feedback-detail-channel-modal.component.html | 12 ++++++++++-- .../feedback-analysis.component.html | 4 +++- .../feedback-analysis/feedback-analysis.component.ts | 1 + ...ramming-exercise-configure-grading.component.html | 7 ++++++- ...ogramming-exercise-configure-grading.component.ts | 4 +++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index cf1da05ffc3d..2984e211aff5 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -73,7 +73,15 @@

    - - +
    + + +
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 508f10ecb983..7b1d56c4ad81 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -62,7 +62,9 @@

    - + @if (isCommunicationEnabled()) { + + } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 11daa26f5067..cef97b1a270f 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -26,6 +26,7 @@ export class FeedbackAnalysisComponent { exerciseTitle = input.required(); exerciseId = input.required(); courseId = input.required(); + isCommunicationEnabled = input.required(); private feedbackAnalysisService = inject(FeedbackAnalysisService); private alertService = inject(AlertService); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html index 608072471257..b66b2a369076 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html @@ -271,7 +271,12 @@

    @if (programmingExercise.isAtLeastEditor && activeTab === 'feedback-analysis') { - + }
    } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts index c5ef675338f5..bb4afd12ab7c 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts @@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core'; import { AccountService } from 'app/core/auth/account.service'; import { AlertService } from 'app/core/util/alert.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; -import { Course } from 'app/entities/course.model'; +import { Course, isCommunicationEnabled } from 'app/entities/course.model'; import { IssuesMap, ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; @@ -788,4 +788,6 @@ export class ProgrammingExerciseConfigureGradingComponent implements OnInit, OnD this.staticCodeAnalysisCategoriesForCharts = this.staticCodeAnalysisCategoriesForTable; this.backupStaticCodeAnalysisCategories = this.staticCodeAnalysisCategoriesForTable; } + + protected readonly isCommunicationEnabled = isCommunicationEnabled; } From 319b1ca91a1c955b444990d56fee066fdc4b4342 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 18 Nov 2024 11:38:09 +0100 Subject: [PATCH 23/64] added missing translation and testfix --- .../feedback-detail-channel-modal.component.html | 2 +- src/main/webapp/i18n/de/programmingExercise.json | 1 + src/main/webapp/i18n/en/programmingExercise.json | 1 + ...back-channel-creation-modal.component.spec.ts | 4 ++-- ...edback-detail-channel-modal.component.spec.ts | 16 ++++++++-------- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index 2984e211aff5..a98d2b393eaf 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -27,7 +27,7 @@

    }

    - + @if (form.get('description')?.invalid && (form.get('description')?.dirty || form.get('description')?.touched)) {
    diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 4a2624f57f1e..331efb6f84cb 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -399,6 +399,7 @@ "createAndNavigateButton": "Erstellen und Navigieren", "createChannelButton": "Kanal erstellen", "placeholder": "Dieses Feld bitte nicht leer lassen", + "descriptionLabel": "Kanalbeschreibung", "confirmationModal": { "header": "Kanal Erstellen bestätigen", "confirmationMessage": "Sind Sie sicher, dass Sie diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index d493792af005..7828988a742b 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -399,6 +399,7 @@ "createAndNavigateButton": "Create and Navigate", "createChannelButton": "Create Channel", "placeholder": "This field should not be empty", + "descriptionLabel": "Description", "confirmationModal": { "header": "Confirm Channel Creation", "confirmationMessage": "Are you sure you want to create this channel? This will create a channel with {{count}} student(s).", diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts index e3cc77fdbd09..5c59597134d6 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/confirm-feedback-channel-creation-modal.component.spec.ts @@ -28,12 +28,12 @@ describe('ConfirmFeedbackChannelCreationModalComponent', () => { it('should call close on activeModal with true when confirm is triggered', () => { const closeSpy = jest.spyOn(activeModal, 'close'); component.confirm(); - expect(closeSpy).toHaveBeenCalledWith(true); + expect(closeSpy).toHaveBeenCalledExactlyOnceWith(true); }); it('should call dismiss on activeModal when dismiss is triggered', () => { const dismissSpy = jest.spyOn(activeModal, 'dismiss'); component.dismiss(); - expect(dismissSpy).toHaveBeenCalled(); + expect(dismissSpy).toHaveBeenCalledOnce(); }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts index 8842a307462b..74928d400dd3 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts @@ -45,13 +45,13 @@ describe('FeedbackDetailChannelModalComponent', () => { it('should call activeModal.close when closeModal is triggered', () => { const closeSpy = jest.spyOn(activeModal, 'close'); component.closeModal(); - expect(closeSpy).toHaveBeenCalled(); + expect(closeSpy).toHaveBeenCalledOnce(); }); it('should call activeModal.dismiss when dismissModal is triggered', () => { const dismissSpy = jest.spyOn(activeModal, 'dismiss'); component.dismissModal(); - expect(dismissSpy).toHaveBeenCalled(); + expect(dismissSpy).toHaveBeenCalledOnce(); }); it('should open confirmation modal and emit formSubmitted on successful confirmation', async () => { @@ -68,7 +68,7 @@ describe('FeedbackDetailChannelModalComponent', () => { await component.submitForm(false); expect(component.isConfirmModalOpen()).toBeFalse(); - expect(formSubmittedSpy).toHaveBeenCalledWith({ + expect(formSubmittedSpy).toHaveBeenCalledExactlyOnceWith({ channelDto: expect.objectContaining({ creationDate: undefined, creator: undefined, @@ -115,8 +115,8 @@ describe('FeedbackDetailChannelModalComponent', () => { await component.submitForm(false); - expect(component.handleModal).toHaveBeenCalled(); - expect(formSubmittedSpy).toHaveBeenCalledWith({ + expect(component.handleModal).toHaveBeenCalledOnce(); + expect(formSubmittedSpy).toHaveBeenCalledExactlyOnceWith({ channelDto: expect.objectContaining({ name: 'channel', description: 'channelDescription', @@ -141,13 +141,13 @@ describe('FeedbackDetailChannelModalComponent', () => { await component.submitForm(false); - expect(component.handleModal).toHaveBeenCalled(); - expect(formSubmittedSpy).not.toHaveBeenCalled(); + expect(component.handleModal).toHaveBeenCalledOnce(); + expect(formSubmittedSpy).not.toHaveBeenCalledOnce(); }); it('should not open confirmation modal if form is invalid', async () => { const modalSpy = jest.spyOn(modalService, 'open'); await component.submitForm(true); - expect(modalSpy).not.toHaveBeenCalled(); + expect(modalSpy).not.toHaveBeenCalledOnce(); }); }); From 7233d3cdfc32c403a6c37f9d7f8881dc75e4fb45 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 19 Nov 2024 13:06:19 +0100 Subject: [PATCH 24/64] flo feedback --- .../assessment/service/ResultService.java | 8 ++--- .../service/conversation/ChannelService.java | 19 ++++------- .../web/conversation/ChannelResource.java | 19 ++++------- ...edback-channel-creation-modal.component.ts | 7 ++-- ...edback-detail-channel-modal.component.html | 13 ++++--- ...feedback-detail-channel-modal.component.ts | 26 ++++++-------- .../webapp/i18n/de/programmingExercise.json | 5 +++ .../webapp/i18n/en/programmingExercise.json | 5 +++ .../communication/ChannelIntegrationTest.java | 34 +++++++++++++++++++ 9 files changed, 82 insertions(+), 54 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 56357dd9f850..1f62ef78665b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -695,13 +695,9 @@ public void deleteLongFeedback(List feedbackList, Result result) { /** * Retrieves the number of students affected by a specific feedback detail text for a given exercise. - *

    - * This method queries the repository to count the distinct students whose submissions were impacted - * by feedback entries matching the provided detail text within the specified exercise. - *

    * - * @param exerciseId the ID of the exercise for which the affected student count is requested. - * @param detailText the feedback detail text used to filter affected students. + * @param exerciseId for which the affected student count is requested. + * @param detailText used to filter affected students. * @return the total number of distinct students affected by the feedback detail text. */ public long getAffectedStudentCountByFeedbackDetailText(long exerciseId, String detailText) { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index c637691d63a8..791847b75670 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -417,22 +417,17 @@ private static String generateChannelNameFromTitle(@NotNull String prefix, Optio /** * Creates a feedback-specific channel for an exercise within a course. - *

    - * This method sets up a new channel and adds affected students based on the provided feedback detail text. - * It validates the channel name, creates the channel, and registers affected students as members. Additionally, - * it sends notifications to the added users about the new channel. - *

    * - * @param course the course in which the channel is being created. - * @param exerciseId the ID of the exercise associated with the feedback channel. - * @param channelDTO the DTO containing the properties of the channel to be created, such as name, description, and visibility. - * @param feedbackDetailText the feedback detail text used to identify the students affected by the feedback. - * @param requestingUser the user initiating the channel creation request. + * @param course in which the channel is being created. + * @param exerciseId of the exercise associated with the feedback channel. + * @param channelDTO containing the properties of the channel to be created, such as name, description, and visibility. + * @param feedbackDetailText used to identify the students affected by the feedback. + * @param requestingUser initiating the channel creation request. * @return the created {@link Channel} object with its properties. * @throws BadRequestAlertException if the channel name starts with an invalid prefix (e.g., "$"). */ public Channel createFeedbackChannel(Course course, Long exerciseId, ChannelDTO channelDTO, String feedbackDetailText, User requestingUser) { - var channelToCreate = new Channel(); + Channel channelToCreate = new Channel(); channelToCreate.setName(channelDTO.getName()); channelToCreate.setIsPublic(channelDTO.getIsPublic()); channelToCreate.setIsAnnouncementChannel(channelDTO.getIsAnnouncementChannel()); @@ -443,7 +438,7 @@ public Channel createFeedbackChannel(Course course, Long exerciseId, ChannelDTO throw new BadRequestAlertException("User generated channels cannot start with $", "channel", "channelNameInvalid"); } - var createdChannel = createChannel(course, channelToCreate, Optional.of(requestingUser)); + Channel createdChannel = createChannel(course, channelToCreate, Optional.of(requestingUser)); List userLogins = studentParticipationRepository.findAffectedLoginsByFeedbackDetailText(exerciseId, feedbackDetailText); diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index b466ee39d3d1..6e5c1b310f9c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -43,6 +43,7 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -469,14 +470,10 @@ public ResponseEntity deregisterUsers(@PathVariable Long courseId, @PathVa /** * POST /api/courses/:courseId/channels/: Creates a new feedback-specific channel in a course. - *

    - * This endpoint allows authorized users to create a new channel within a course that is specifically designed for discussions - * around a particular exercise's feedback. The channel is populated with all affected students based on the provided feedback detail text. - *

    * - * @param courseId the ID of the course where the channel is being created. - * @param exerciseId the ID of the exercise for which the feedback channel is being created. - * @param channelDTO the DTO containing the properties of the channel to be created, such as name, description, and visibility. + * @param courseId where the channel is being created. + * @param exerciseId for which the feedback channel is being created. + * @param channelDTO containing the properties of the channel to be created, such as name, description, and visibility. * @param feedbackDetailText a string representing the feedback detail text used to determine the affected students to be added to the channel. * @return ResponseEntity with status 201 (Created) and the body containing the details of the created channel. * @throws URISyntaxException if the URI for the created resource cannot be constructed. @@ -488,13 +485,11 @@ public ResponseEntity createFeedbackChannel(@PathVariable Long cours @RequestHeader("feedback-detail-text") String feedbackDetailText) throws URISyntaxException { log.debug("REST request to create feedback channel in course {} with properties: {}", courseId, channelDTO); - var requestingUser = userRepository.getUserWithGroupsAndAuthorities(); - var course = courseRepository.findByIdElseThrow(courseId); - + User requestingUser = userRepository.getUserWithGroupsAndAuthorities(); + Course course = courseRepository.findByIdElseThrow(courseId); checkCommunicationEnabledElseThrow(course); channelAuthorizationService.isAllowedToCreateChannel(course, requestingUser); - - var createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailText, requestingUser); + Channel createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailText, requestingUser); return ResponseEntity.created(new URI("/api/channels/" + createdChannel.getId())).body(conversationDTOService.convertChannelToDTO(requestingUser, createdChannel)); } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts index 58d0471a844f..352a0a657acc 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, input } from '@angular/core'; +import { Component, inject, input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; @@ -9,10 +9,9 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; standalone: true, }) export class ConfirmFeedbackChannelCreationModalComponent { - affectedStudentsCount = input.required(); readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel.confirmationModal'; - - constructor(private activeModal: NgbActiveModal) {} + affectedStudentsCount = input.required(); + private activeModal = inject(NgbActiveModal); confirm(): void { this.activeModal.close(true); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index a98d2b393eaf..e78a2b72e145 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -15,13 +15,13 @@

    @if (form.get('name')?.invalid && (form.get('name')?.dirty || form.get('name')?.touched)) {
    @if (form.get('name')?.errors?.['required']) { -
    +
    } @if (form.get('name')?.errors?.['maxlength']) { -
    +
    } @if (!form.get('name')?.errors?.['required'] && !form.get('name')?.errors?.['maxlength'] && form.get('name')?.errors?.['pattern']) { -
    +
    }
    } @@ -32,10 +32,13 @@

    @if (form.get('description')?.invalid && (form.get('description')?.dirty || form.get('description')?.touched)) {
    @if (form.get('description')?.errors?.['required']) { -
    +
    } @if (form.get('description')?.errors?.['maxlength']) { -
    +
    }
    } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts index 7f8806a99647..e9b7963f0e78 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts @@ -14,27 +14,23 @@ import { AlertService } from 'app/core/util/alert.service'; standalone: true, }) export class FeedbackDetailChannelModalComponent { + protected readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel'; affectedStudentsCount = input.required(); feedbackDetail = input.required(); formSubmitted = output<{ channelDto: ChannelDTO; navigate: boolean }>(); isConfirmModalOpen = signal(false); - form: FormGroup; - readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel'; - private alertService = inject(AlertService); - constructor( - private fb: FormBuilder, - private activeModal: NgbActiveModal, - private modalService: NgbModal, - ) { - this.form = this.fb.group({ - name: ['', [Validators.required, Validators.maxLength(30), Validators.pattern('^[a-z0-9-]{1}[a-z0-9-]{0,30}$')]], - description: ['', [Validators.required, Validators.maxLength(250)]], - isPublic: [true, Validators.required], - isAnnouncementChannel: [false, Validators.required], - }); - } + private alertService = inject(AlertService); + private readonly formBuilder = inject(FormBuilder); + private readonly activeModal = inject(NgbActiveModal); + private readonly modalService = inject(NgbModal); + form: FormGroup = this.formBuilder.group({ + name: ['', [Validators.required, Validators.maxLength(30), Validators.pattern('^[a-z0-9-]{1}[a-z0-9-]{0,30}$')]], + description: ['', [Validators.required, Validators.maxLength(250)]], + isPublic: [true, Validators.required], + isAnnouncementChannel: [false, Validators.required], + }); async submitForm(navigate: boolean): Promise { if (this.form.valid && !this.isConfirmModalOpen()) { diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 331efb6f84cb..047baac81211 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -400,6 +400,11 @@ "createChannelButton": "Kanal erstellen", "placeholder": "Dieses Feld bitte nicht leer lassen", "descriptionLabel": "Kanalbeschreibung", + "requiredValidationErrorName": "Der Kanalname ist ein Pflichtfeld.", + "maxLengthValidationErrorName": "Kanalname kann max {{ max }} Zeichen lang sein!", + "regexValidationError": "Namen können nur Kleinbuchstaben, Zahlen und Striche enthalten. Nur Artemis kann Kanäle erstellen, die mit $ beginnen.", + "requiredValidationErrorDescription": "Die Kanalbeschreibung ist ein Pflichtfeld.", + "maxLengthValidationErrorDescription": "Kanalbeschreibung kann max {{ max }} Zeichen lang sein!", "confirmationModal": { "header": "Kanal Erstellen bestätigen", "confirmationMessage": "Sind Sie sicher, dass Sie diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 7828988a742b..3d641b5c6f24 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -400,6 +400,11 @@ "createChannelButton": "Create Channel", "placeholder": "This field should not be empty", "descriptionLabel": "Description", + "requiredValidationErrorName": "The channel name is required.", + "maxLengthValidationErrorName": "Channel name can be max {{ max }} characters long!", + "regexValidationError": "Names can only contain lowercase letters, numbers, and dashes. Only Artemis can create channels that start with a $.", + "requiredValidationErrorDescription": "The channel description is required.", + "maxLengthValidationErrorDescription": "Channel description can be max {{ max }} characters long!", "confirmationModal": { "header": "Confirm Channel Creation", "confirmationMessage": "Are you sure you want to create this channel? This will create a channel with {{count}} student(s).", diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index 2d25889d9a15..8f3b01dadb9f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -10,6 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -933,6 +934,39 @@ void createFeedbackChannel_asStudent_shouldReturnForbidden() { } } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void createFeedbackChannel_asInstructor_shouldCreateChannel() { + // Given + Long courseId = 1L; // Existing course ID + Long exerciseId = 1L; // Existing exercise ID + ChannelDTO channelDTO = new ChannelDTO(); + channelDTO.setName("feedback-channel"); + channelDTO.setDescription("Discussion channel for feedback"); + channelDTO.setIsPublic(true); + channelDTO.setIsAnnouncementChannel(false); + + HttpHeaders headers = new HttpHeaders(); + headers.set("feedback-detail-text", "Sample feedback text"); + + String BASE_ENDPOINT = "/api/courses/{courseId}/{exerciseId}/feedback-channel"; + // When + ChannelDTO response = null; + try { + response = request.postWithResponseBody(BASE_ENDPOINT.replace("{courseId}", courseId.toString()).replace("{exerciseId}", exerciseId.toString()), channelDTO, + ChannelDTO.class, HttpStatus.OK, // Expecting 200 OK here instead of 201 Created + headers); + } + catch (Exception e) { + Assertions.fail("Failed to create feedback channel", e); + } + + // Then + assertThat(response).isNotNull(); + assertThat(response.getName()).isEqualTo("feedback-channel"); + assertThat(response.getDescription()).isEqualTo("Discussion channel for feedback"); + } + private void testArchivalChangeWorks(ChannelDTO channel, boolean isPublicChannel, boolean shouldArchive) throws Exception { // prepare channel in db if (shouldArchive) { From 5d944d78c442f541986d7bfc1d9b7bbf2cac4b60 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 19 Nov 2024 13:22:01 +0100 Subject: [PATCH 25/64] flo feedback --- .../feedback-analysis/feedback-analysis.component.ts | 4 +++- ...gramming-exercise-configure-grading.component.html | 8 ++++---- ...rogramming-exercise-configure-grading.component.ts | 3 +-- src/main/webapp/i18n/de/programmingExercise.json | 2 +- src/main/webapp/i18n/en/programmingExercise.json | 2 +- .../artemis/communication/ChannelIntegrationTest.java | 11 ++++------- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index cef97b1a270f..4b8c9202bf79 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -210,7 +210,8 @@ export class FeedbackAnalysisComponent { modalRef.componentInstance.formSubmitted.subscribe(async ({ channelDto, navigate }: { channelDto: ChannelDTO; navigate: boolean }) => { try { const createdChannel = await this.feedbackAnalysisService.createChannel(this.courseId(), this.exerciseId(), channelDto, feedbackDetail.detailText); - this.alertService.success(this.TRANSLATION_BASE + '.channelSuccess'); + const name = createdChannel.name; + this.alertService.success(this.TRANSLATION_BASE + '.channelSuccess', { name }); if (navigate) { window.location.href = `/courses/${this.courseId()}/communication?conversationId=${createdChannel.id}`; } @@ -221,6 +222,7 @@ export class FeedbackAnalysisComponent { try { await modalRef.result; } catch { + // modal dismissed } finally { this.isFeedbackDetailChannelModalOpen = false; } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html index b66b2a369076..39014c0f5657 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html @@ -270,11 +270,11 @@

    }

    - @if (programmingExercise.isAtLeastEditor && activeTab === 'feedback-analysis') { + @if (programmingExercise.isAtLeastEditor && activeTab === 'feedback-analysis' && programmingExercise.title && programmingExercise.id && course.id) { } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts index bb4afd12ab7c..13ce8237d382 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts @@ -92,6 +92,7 @@ export class ProgrammingExerciseConfigureGradingComponent implements OnInit, OnD readonly RESET_TABLE = ProgrammingGradingChartsDirective.RESET_TABLE; readonly chartFilterType = ChartFilterType; readonly ProgrammingLanguage = ProgrammingLanguage; + protected readonly isCommunicationEnabled = isCommunicationEnabled; // We have to separate these test cases in order to separate the table and chart presentation if the table is filtered by the chart staticCodeAnalysisCategoriesForTable: StaticCodeAnalysisCategory[] = []; @@ -788,6 +789,4 @@ export class ProgrammingExerciseConfigureGradingComponent implements OnInit, OnD this.staticCodeAnalysisCategoriesForCharts = this.staticCodeAnalysisCategoriesForTable; this.backupStaticCodeAnalysisCategories = this.staticCodeAnalysisCategoriesForTable; } - - protected readonly isCommunicationEnabled = isCommunicationEnabled; } diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 047baac81211..feed824a7254 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -357,7 +357,7 @@ "filter": "Filter", "noData": "Es konnten keine Feedback Einträge für die Programmieraufgabe gefunden werden.", "noDataFilter": "Für den spezifizierten Filter oder Suchbegriff konnten keine Feedback Einträge gefunden werden.", - "channelSuccess": "Kanal erfolgreich erstellt.", + "channelSuccess": "Kanal {{channelName}} erfolgreich erstellt.", "feedbackModal": { "header": "Fehlerdetails", "feedbackTitle": "Feedback zu Testfällen", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 3d641b5c6f24..cba315f1ea34 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -357,7 +357,7 @@ "filter": "Filters", "noData": "No Feedback Entries could be found for the Programming Exercise.", "noDataFilter": "No Feedback Entries could be found for the specified filter or search Term.", - "channelSuccess": "Channel successfully created.", + "channelSuccess": "Channel {{channelName}} successfully created.", "feedbackModal": { "header": "Error Details", "feedbackTitle": "Test Case Feedback", diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index 8f3b01dadb9f..c31d2fd4fdd4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -937,9 +937,8 @@ void createFeedbackChannel_asStudent_shouldReturnForbidden() { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void createFeedbackChannel_asInstructor_shouldCreateChannel() { - // Given - Long courseId = 1L; // Existing course ID - Long exerciseId = 1L; // Existing exercise ID + Long courseId = 1L; + Long exerciseId = 1L; ChannelDTO channelDTO = new ChannelDTO(); channelDTO.setName("feedback-channel"); channelDTO.setDescription("Discussion channel for feedback"); @@ -950,18 +949,16 @@ void createFeedbackChannel_asInstructor_shouldCreateChannel() { headers.set("feedback-detail-text", "Sample feedback text"); String BASE_ENDPOINT = "/api/courses/{courseId}/{exerciseId}/feedback-channel"; - // When + ChannelDTO response = null; try { response = request.postWithResponseBody(BASE_ENDPOINT.replace("{courseId}", courseId.toString()).replace("{exerciseId}", exerciseId.toString()), channelDTO, - ChannelDTO.class, HttpStatus.OK, // Expecting 200 OK here instead of 201 Created - headers); + ChannelDTO.class, HttpStatus.CREATED, headers); } catch (Exception e) { Assertions.fail("Failed to create feedback channel", e); } - // Then assertThat(response).isNotNull(); assertThat(response.getName()).isEqualTo("feedback-channel"); assertThat(response.getDescription()).isEqualTo("Discussion channel for feedback"); From bf0611efbb18fc6f74597ebd90cedb5134864fef Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 19 Nov 2024 13:45:10 +0100 Subject: [PATCH 26/64] flo feedback --- .../confirm-feedback-channel-creation-modal.component.ts | 2 +- .../Modal/feedback-detail-channel-modal.component.html | 5 +---- .../feedback-analysis/feedback-analysis.component.ts | 7 ++++++- src/main/webapp/i18n/de/programmingExercise.json | 2 +- src/main/webapp/i18n/en/programmingExercise.json | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts index 352a0a657acc..4a31192b6299 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/confirm-feedback-channel-creation-modal.component.ts @@ -9,7 +9,7 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; standalone: true, }) export class ConfirmFeedbackChannelCreationModalComponent { - readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel.confirmationModal'; + protected readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel.confirmationModal'; affectedStudentsCount = input.required(); private activeModal = inject(NgbActiveModal); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index e78a2b72e145..f36eeba33e0b 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -35,10 +35,7 @@

    } @if (form.get('description')?.errors?.['maxlength']) { -
    +
    }

    } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 4b8c9202bf79..335183139636 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -13,6 +13,7 @@ import { SortIconComponent } from 'app/shared/sort/sort-icon.component'; import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; import { FeedbackDetailChannelModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component'; import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; +import { Router } from '@angular/router'; @Component({ selector: 'jhi-feedback-analysis', @@ -32,6 +33,7 @@ export class FeedbackAnalysisComponent { private alertService = inject(AlertService); private modalService = inject(NgbModal); private localStorage = inject(LocalStorageService); + private router = inject(Router); readonly page = signal(1); readonly pageSize = signal(25); @@ -213,7 +215,10 @@ export class FeedbackAnalysisComponent { const name = createdChannel.name; this.alertService.success(this.TRANSLATION_BASE + '.channelSuccess', { name }); if (navigate) { - window.location.href = `/courses/${this.courseId()}/communication?conversationId=${createdChannel.id}`; + const urlTree = this.router.createUrlTree(['courses', this.courseId(), 'communication'], { + queryParams: { conversationId: createdChannel.id }, + }); + await this.router.navigateByUrl(urlTree); } } catch (error) { this.alertService.error(error); diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index feed824a7254..ac011d498daa 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -402,7 +402,7 @@ "descriptionLabel": "Kanalbeschreibung", "requiredValidationErrorName": "Der Kanalname ist ein Pflichtfeld.", "maxLengthValidationErrorName": "Kanalname kann max {{ max }} Zeichen lang sein!", - "regexValidationError": "Namen können nur Kleinbuchstaben, Zahlen und Striche enthalten. Nur Artemis kann Kanäle erstellen, die mit $ beginnen.", + "regexValidationErrorName": "Namen können nur Kleinbuchstaben, Zahlen und Striche enthalten. Nur Artemis kann Kanäle erstellen, die mit $ beginnen.", "requiredValidationErrorDescription": "Die Kanalbeschreibung ist ein Pflichtfeld.", "maxLengthValidationErrorDescription": "Kanalbeschreibung kann max {{ max }} Zeichen lang sein!", "confirmationModal": { diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index cba315f1ea34..f1dd00faa0b7 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -402,7 +402,7 @@ "descriptionLabel": "Description", "requiredValidationErrorName": "The channel name is required.", "maxLengthValidationErrorName": "Channel name can be max {{ max }} characters long!", - "regexValidationError": "Names can only contain lowercase letters, numbers, and dashes. Only Artemis can create channels that start with a $.", + "regexValidationErrorName": "Names can only contain lowercase letters, numbers, and dashes. Only Artemis can create channels that start with a $.", "requiredValidationErrorDescription": "The channel description is required.", "maxLengthValidationErrorDescription": "Channel description can be max {{ max }} characters long!", "confirmationModal": { From ec4dc71425cee46f67b68093b2ff47aa2e3c576f Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 19 Nov 2024 14:55:47 +0100 Subject: [PATCH 27/64] server style --- .../cit/aet/artemis/communication/ChannelIntegrationTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index c31d2fd4fdd4..27fa2f02c36f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -10,7 +10,6 @@ import java.util.Set; import java.util.stream.Collectors; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -956,7 +955,7 @@ void createFeedbackChannel_asInstructor_shouldCreateChannel() { ChannelDTO.class, HttpStatus.CREATED, headers); } catch (Exception e) { - Assertions.fail("Failed to create feedback channel", e); + fail("Failed to create feedback channel", e); } assertThat(response).isNotNull(); From 32cf02368777d3538509433b935d455d5db0b610 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 19 Nov 2024 23:20:45 +0100 Subject: [PATCH 28/64] markus feedback --- .../dto/FeedbackChannelRequestDTO.java | 7 ++++ .../web/conversation/ChannelResource.java | 20 +++++----- .../StudentParticipationRepository.java | 22 ++++++---- .../feedback-analysis.component.ts | 8 +++- .../feedback-analysis.service.ts | 10 +++-- .../communication/ChannelIntegrationTest.java | 15 ++++--- .../feedback-analysis.service.spec.ts | 40 +++++++++++++++++++ 7 files changed, 91 insertions(+), 31 deletions(-) create mode 100644 src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java new file mode 100644 index 000000000000..d38b1c1d90f2 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java @@ -0,0 +1,7 @@ +package de.tum.cit.aet.artemis.communication.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record FeedbackChannelRequestDTO(ChannelDTO channel, String feedbackDetailText) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index 6e5c1b310f9c..cbb59c4b7e46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -36,6 +35,7 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; import de.tum.cit.aet.artemis.communication.dto.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.communication.dto.FeedbackChannelRequestDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; @@ -471,24 +471,26 @@ public ResponseEntity deregisterUsers(@PathVariable Long courseId, @PathVa /** * POST /api/courses/:courseId/channels/: Creates a new feedback-specific channel in a course. * - * @param courseId where the channel is being created. - * @param exerciseId for which the feedback channel is being created. - * @param channelDTO containing the properties of the channel to be created, such as name, description, and visibility. - * @param feedbackDetailText a string representing the feedback detail text used to determine the affected students to be added to the channel. + * @param courseId where the channel is being created. + * @param exerciseId for which the feedback channel is being created. + * @param feedbackChannelRequest containing a DTO with the properties of the channel (e.g., name, description, visibility) + * and the feedback detail text used to determine the affected students to be added to the channel. * @return ResponseEntity with status 201 (Created) and the body containing the details of the created channel. * @throws URISyntaxException if the URI for the created resource cannot be constructed. * @throws BadRequestAlertException if the channel name starts with an invalid prefix (e.g., "$"). */ @PostMapping("{courseId}/{exerciseId}/feedback-channel") @EnforceAtLeastEditorInCourse - public ResponseEntity createFeedbackChannel(@PathVariable Long courseId, @PathVariable Long exerciseId, @RequestBody ChannelDTO channelDTO, - @RequestHeader("feedback-detail-text") String feedbackDetailText) throws URISyntaxException { - log.debug("REST request to create feedback channel in course {} with properties: {}", courseId, channelDTO); + public ResponseEntity createFeedbackChannel(@PathVariable Long courseId, @PathVariable Long exerciseId, + @RequestBody FeedbackChannelRequestDTO feedbackChannelRequest) throws URISyntaxException { + log.debug("REST request to create feedback channel for course {} and exercise {} with properties: {}", courseId, exerciseId, feedbackChannelRequest); + + ChannelDTO channelDTO = feedbackChannelRequest.channel(); + String feedbackDetailText = feedbackChannelRequest.feedbackDetailText(); User requestingUser = userRepository.getUserWithGroupsAndAuthorities(); Course course = courseRepository.findByIdElseThrow(courseId); checkCommunicationEnabledElseThrow(course); - channelAuthorizationService.isAllowedToCreateChannel(course, requestingUser); Channel createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailText, requestingUser); return ResponseEntity.created(new URI("/api/channels/" + createdChannel.getId())).body(conversationDTOService.convertChannelToDTO(requestingUser, createdChannel)); diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index c67ec302ff3c..03d2485f0f0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1372,13 +1372,16 @@ SELECT MAX(pr.id) @Query(""" SELECT DISTINCT p.student.login FROM ProgrammingExerciseStudentParticipation p - LEFT JOIN p.submissions s - LEFT JOIN s.results r - LEFT JOIN r.feedbacks f + INNER JOIN p.submissions s + INNER JOIN s.results r ON r.id = ( + SELECT MAX(pr.id) + FROM s.results pr + WHERE pr.participation.id = p.id + ) + INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND f.detailText = :detailText AND p.testRun = FALSE - AND f.positive = FALSE """) List findAffectedLoginsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText); @@ -1396,13 +1399,16 @@ SELECT MAX(pr.id) @Query(""" SELECT COUNT(DISTINCT p.student.id) FROM ProgrammingExerciseStudentParticipation p - LEFT JOIN p.submissions s - LEFT JOIN s.results r - LEFT JOIN r.feedbacks f + INNER JOIN p.submissions s + INNER JOIN s.results r ON r.id = ( + SELECT MAX(pr.id) + FROM s.results pr + WHERE pr.participation.id = p.id + ) + INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND f.detailText = :detailText AND p.testRun = FALSE - AND f.positive = FALSE """) long countAffectedStudentsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText); } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 335183139636..9c41949f3393 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -1,5 +1,5 @@ import { Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; -import { FeedbackAnalysisService, FeedbackDetail } from './feedback-analysis.service'; +import { FeedbackAnalysisService, FeedbackChannelRequestDTO, FeedbackDetail } from './feedback-analysis.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; import { faFilter, faMessage, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter, faUsers } from '@fortawesome/free-solid-svg-icons'; @@ -211,7 +211,11 @@ export class FeedbackAnalysisComponent { modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); modalRef.componentInstance.formSubmitted.subscribe(async ({ channelDto, navigate }: { channelDto: ChannelDTO; navigate: boolean }) => { try { - const createdChannel = await this.feedbackAnalysisService.createChannel(this.courseId(), this.exerciseId(), channelDto, feedbackDetail.detailText); + const feedbackChannelRequest: FeedbackChannelRequestDTO = { + channel: channelDto, + feedbackDetailText: feedbackDetail.detailText, + }; + const createdChannel = await this.feedbackAnalysisService.createChannel(this.courseId(), this.exerciseId(), feedbackChannelRequest); const name = createdChannel.name; this.alertService.success(this.TRANSLATION_BASE + '.channelSuccess', { name }); if (navigate) { diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 906b699f19a5..d034cc56a506 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -29,6 +29,10 @@ export interface FeedbackAffectedStudentDTO { login: string; repositoryURI: string; } +export interface FeedbackChannelRequestDTO { + channel: ChannelDTO; + feedbackDetailText: string; +} @Injectable() export class FeedbackAnalysisService extends BaseApiHttpService { search(pageable: SearchTermPageableSearch, options: { exerciseId: number; filters: FilterData }): Promise { @@ -64,10 +68,8 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params, headers }); } - createChannel(courseId: number, exerciseId: number, channelDTO: ChannelDTO, feedbackDetailText: string): Promise { - const headers = new HttpHeaders().set('feedback-detail-text', feedbackDetailText); - - return this.post(`courses/${courseId}/${exerciseId}/feedback-channel`, channelDTO, { headers }); + createChannel(courseId: number, exerciseId: number, feedbackChannelRequest: FeedbackChannelRequestDTO): Promise { + return this.post(`courses/${courseId}/${exerciseId}/feedback-channel`, feedbackChannelRequest); } getAffectedStudentCount(exerciseId: number, feedbackDetailText: string): Promise { diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index 27fa2f02c36f..3bb88f191080 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -16,7 +16,6 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; @@ -24,6 +23,7 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; import de.tum.cit.aet.artemis.communication.dto.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.communication.dto.FeedbackChannelRequestDTO; import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; import de.tum.cit.aet.artemis.communication.util.ConversationUtilService; import de.tum.cit.aet.artemis.core.domain.Course; @@ -913,20 +913,20 @@ void getLectureChannel_asCourseStudent_shouldGetLectureChannel() throws Exceptio void createFeedbackChannel_asStudent_shouldReturnForbidden() { Course course = programmingExerciseUtilService.addCourseWithOneProgrammingExercise(); ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + ChannelDTO channelDTO = new ChannelDTO(); channelDTO.setName("feedback-channel"); channelDTO.setDescription("Discussion channel for feedback"); channelDTO.setIsPublic(true); channelDTO.setIsAnnouncementChannel(false); - HttpHeaders headers = new HttpHeaders(); - headers.set("feedback-detail-text", "Sample feedback text"); + FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, "Sample feedback text"); String BASE_ENDPOINT = "api/courses/{courseId}/{exerciseId}/feedback-channel"; try { request.postWithoutResponseBody(BASE_ENDPOINT.replace("{courseId}", course.getId().toString()).replace("{exerciseId}", programmingExercise.getId().toString()), - channelDTO, HttpStatus.FORBIDDEN, headers); + feedbackChannelRequest, HttpStatus.FORBIDDEN); } catch (Exception e) { fail("There was an error executing the post request.", e); @@ -944,15 +944,14 @@ void createFeedbackChannel_asInstructor_shouldCreateChannel() { channelDTO.setIsPublic(true); channelDTO.setIsAnnouncementChannel(false); - HttpHeaders headers = new HttpHeaders(); - headers.set("feedback-detail-text", "Sample feedback text"); + FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, "Sample feedback text"); String BASE_ENDPOINT = "/api/courses/{courseId}/{exerciseId}/feedback-channel"; ChannelDTO response = null; try { - response = request.postWithResponseBody(BASE_ENDPOINT.replace("{courseId}", courseId.toString()).replace("{exerciseId}", exerciseId.toString()), channelDTO, - ChannelDTO.class, HttpStatus.CREATED, headers); + response = request.postWithResponseBody(BASE_ENDPOINT.replace("{courseId}", courseId.toString()).replace("{exerciseId}", exerciseId.toString()), feedbackChannelRequest, + ChannelDTO.class, HttpStatus.CREATED); } catch (Exception e) { fail("Failed to create feedback channel", e); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index b735a2e0f796..45bb903fe421 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -149,4 +149,44 @@ describe('FeedbackAnalysisService', () => { expect(result).toBe(affectedStudentCountMock); }); }); + + describe('createChannel', () => { + it('should send a POST request to create a feedback-specific channel and return the created channel DTO', async () => { + const courseId = 1; + const exerciseId = 2; + + const channelDtoMock = { + name: 'feedback-channel', + description: 'Discussion channel for feedback', + isPublic: true, + isAnnouncementChannel: false, + }; + + const feedbackChannelRequestMock = { + channel: channelDtoMock, + feedbackDetailText: 'Sample feedback detail text', + }; + + const createdChannelMock = { + id: 1001, + name: 'feedback-channel', + description: 'Discussion channel for feedback', + isPublic: true, + isAnnouncementChannel: false, + }; + + const responsePromise = service.createChannel(courseId, exerciseId, feedbackChannelRequestMock); + + const req = httpMock.expectOne(`api/courses/${courseId}/${exerciseId}/feedback-channel`); + expect(req.request.method).toBe('POST'); + expect(req.request.body).toEqual(feedbackChannelRequestMock); + + req.flush(createdChannelMock); + + const result = await responsePromise; + expect(result).toEqual(createdChannelMock); + expect(result.name).toBe('feedback-channel'); + expect(result.description).toBe('Discussion channel for feedback'); + }); + }); }); From fdbc64cb30a08bcdcb64c1451764369a6d533c83 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 25 Nov 2024 13:18:35 +0100 Subject: [PATCH 29/64] ramona feedback --- .../feedback-detail-channel-modal.component.html | 8 ++++---- .../feedback-analysis.component.html | 2 +- .../feedback-analysis.component.ts | 7 ++++--- src/main/webapp/content/icons/icons.ts | 15 +++++++++++++++ src/main/webapp/i18n/de/programmingExercise.json | 7 +++---- src/main/webapp/i18n/en/programmingExercise.json | 5 ++--- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index f36eeba33e0b..36d5b08ed5b9 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -12,7 +12,7 @@

    - @if (form.get('name')?.invalid && (form.get('name')?.dirty || form.get('name')?.touched)) { + @if (form.controls['name'].invalid && (form.controls['name'].dirty || form.controls['name'].touched)) {
    @if (form.get('name')?.errors?.['required']) {
    @@ -20,7 +20,7 @@

    @if (form.get('name')?.errors?.['maxlength']) {
    } - @if (!form.get('name')?.errors?.['required'] && !form.get('name')?.errors?.['maxlength'] && form.get('name')?.errors?.['pattern']) { + @if (form.get('name')?.errors?.['pattern']) {
    }

    @@ -29,7 +29,7 @@

    - @if (form.get('description')?.invalid && (form.get('description')?.dirty || form.get('description')?.touched)) { + @if (form.controls['description'].invalid && (form.controls['description'].dirty || form.controls['description'].touched)) {
    @if (form.get('description')?.errors?.['required']) {
    @@ -79,7 +79,7 @@

    type="button" class="btn btn-primary me-2" [disabled]="!form.valid" - [jhiTranslate]="TRANSLATION_BASE + '.createAndNavigateButton'" + [jhiTranslate]="TRANSLATION_BASE + '.createAndNavigateLabel'" >

    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 7b1d56c4ad81..2c1d01040253 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -60,7 +60,7 @@

    {{ item.testCaseName }} {{ item.errorCategory }} - + @if (isCommunicationEnabled()) { diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 9c41949f3393..329ecce44e25 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -2,7 +2,8 @@ import { Component, computed, effect, inject, input, signal, untracked } from '@ import { FeedbackAnalysisService, FeedbackChannelRequestDTO, FeedbackDetail } from './feedback-analysis.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { faFilter, faMessage, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter, faUsers } from '@fortawesome/free-solid-svg-icons'; +import { faFilter, faMessage, faSort, faSortDown, faSortUp, faUsers } from '@fortawesome/free-solid-svg-icons'; +import { facDetails } from '../../../../../../content/icons/icons'; import { SearchResult, SortingOrder } from 'app/shared/table/pageable-table'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { FeedbackModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component'; @@ -50,7 +51,7 @@ export class FeedbackAnalysisComponent { readonly faSortUp = faSortUp; readonly faSortDown = faSortDown; readonly faFilter = faFilter; - readonly faUpRightAndDownLeftFromCenter = faUpRightAndDownLeftFromCenter; + readonly facDetails = facDetails; readonly faUsers = faUsers; readonly faMessage = faMessage; readonly SortingOrder = SortingOrder; @@ -126,7 +127,7 @@ export class FeedbackAnalysisComponent { } openFeedbackModal(feedbackDetail: FeedbackDetail): void { - const modalRef = this.modalService.open(FeedbackModalComponent, { centered: true }); + const modalRef = this.modalService.open(FeedbackModalComponent, { centered: true, size: 'lg' }); modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); } diff --git a/src/main/webapp/content/icons/icons.ts b/src/main/webapp/content/icons/icons.ts index f5588768724b..cabc6c1d4613 100644 --- a/src/main/webapp/content/icons/icons.ts +++ b/src/main/webapp/content/icons/icons.ts @@ -42,8 +42,23 @@ export const facSaveWarning: IconDefinition = { ], } as IconDefinition; +export const facDetails: IconDefinition = { + prefix: 'fac' as IconPrefix, + iconName: 'details' as IconName, + icon: [ + 24, // SVG view box width + 24, // SVG view box height + [], + '', + [ + 'M2.25 21C2.25 21.4125 2.5875 21.75 3 21.75H12.1424C13.196 22.3848 14.4303 22.75 15.75 22.75C16.3886 22.75 17.0073 22.6645 17.5951 22.5043C17.0752 23.3981 16.1068 24 15 24H3C1.34531 24 0 22.6547 0 21V3C0 1.34531 1.34531 0 3 0H10.7578C11.5547 0 12.3141 0.314063 12.8766 0.876563L17.1234 5.11875C17.6859 5.68125 18 6.44531 18 7.24219V9.11945C17.2939 8.87991 16.5371 8.75 15.75 8.75V7.5H12C11.1703 7.5 10.5 6.82969 10.5 6V2.25H3C2.5875 2.25 2.25 2.5875 2.25 3V21Z M9.83815 12H5.625C5.00156 12 4.5 12.5016 4.5 13.125C4.5 13.7484 5.00156 14.25 5.625 14.25H8.91109C9.08828 13.4384 9.40626 12.6795 9.83815 12Z M8.78971 16.5H5.625C5.00156 16.5 4.5 17.0016 4.5 17.625C4.5 18.2484 5.00156 18.75 5.625 18.75H9.42363C9.09363 18.0553 8.87467 17.2977 8.78971 16.5Z M21.3756 15.6867C21.3756 16.9416 20.9681 18.1008 20.2818 19.0413L23.7436 22.5052C24.0855 22.8469 24.0855 23.4019 23.7436 23.7437C23.4018 24.0854 22.8467 24.0854 22.5049 23.7437L19.043 20.2797C18.1023 20.9687 16.9429 21.3733 15.6878 21.3733C12.5458 21.3733 10 18.828 10 15.6867C10 12.5453 12.5458 10 15.6878 10C18.8297 10 21.3756 12.5453 21.3756 15.6867ZM15.6878 19.6236C16.2049 19.6236 16.7169 19.5218 17.1947 19.3239C17.6724 19.1261 18.1065 18.8361 18.4721 18.4705C18.8378 18.1049 19.1278 17.6709 19.3257 17.1933C19.5236 16.7156 19.6255 16.2037 19.6255 15.6867C19.6255 15.1697 19.5236 14.6577 19.3257 14.1801C19.1278 13.7024 18.8378 13.2684 18.4721 12.9028C18.1065 12.5373 17.6724 12.2473 17.1947 12.0494C16.7169 11.8516 16.2049 11.7497 15.6878 11.7497C15.1707 11.7497 14.6586 11.8516 14.1809 12.0494C13.7031 12.2473 13.2691 12.5373 12.9034 12.9028C12.5378 13.2684 12.2477 13.7024 12.0498 14.1801C11.8519 14.6577 11.7501 15.1697 11.7501 15.6867C11.7501 16.2037 11.8519 16.7156 12.0498 17.1933C12.2477 17.6709 12.5378 18.1049 12.9034 18.4705C13.2691 18.8361 13.7031 19.1261 14.1809 19.3239C14.6586 19.5218 15.1707 19.6236 15.6878 19.6236Z', + ], + ], +} as IconDefinition; + export const artemisIconPack: IconPack = { facSidebar, facSaveSuccess, facSaveWarning, + facDetails, }; diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index ac011d498daa..871f98e201ba 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -392,11 +392,10 @@ "announcementChannel": "Ankündigungskanal", "announcementChannelYes": "Ja", "announcementChannelNo": "Nein", - "createAndNavigateLabel": "Erstellen und Navigieren:", + "createAndNavigateLabel": "Erstellen und Navigieren", "createAndNavigateDescription": "Erstellt den Kanal und navigiert automatisch zum Kanal.", "createChannelLabel": "Kanal erstellen:", "createChannelDescription": "Erstellt den Kanal, ohne die Seite zu verlassen.", - "createAndNavigateButton": "Erstellen und Navigieren", "createChannelButton": "Kanal erstellen", "placeholder": "Dieses Feld bitte nicht leer lassen", "descriptionLabel": "Kanalbeschreibung", @@ -407,9 +406,9 @@ "maxLengthValidationErrorDescription": "Kanalbeschreibung kann max {{ max }} Zeichen lang sein!", "confirmationModal": { "header": "Kanal Erstellen bestätigen", - "confirmationMessage": "Sind Sie sicher, dass Sie diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", + "confirmationMessage": "Bist du sicher, dass du diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", "cancel": "Abbrechen", - "confirm": "Ja, erstellen" + "confirm": "Erstellen" } } }, diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index f1dd00faa0b7..feff9adb303d 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -392,11 +392,10 @@ "announcementChannel": "Announcement Channel", "announcementChannelYes": "Yes", "announcementChannelNo": "No", - "createAndNavigateLabel": "Create and Navigate:", + "createAndNavigateLabel": "Create and Navigate", "createAndNavigateDescription": "Creates the channel and automatically navigates to the channel.", "createChannelLabel": "Create Channel:", "createChannelDescription": "Creates the channel without navigating away from this page.", - "createAndNavigateButton": "Create and Navigate", "createChannelButton": "Create Channel", "placeholder": "This field should not be empty", "descriptionLabel": "Description", @@ -409,7 +408,7 @@ "header": "Confirm Channel Creation", "confirmationMessage": "Are you sure you want to create this channel? This will create a channel with {{count}} student(s).", "cancel": "Cancel", - "confirm": "Yes, Create" + "confirm": "Create" } } }, From 72e849ed04a4beb49fd188da1b4eace8120e9d53 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 25 Nov 2024 13:29:42 +0100 Subject: [PATCH 30/64] translation --- src/main/webapp/i18n/de/programmingExercise.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 871f98e201ba..9a84f1b04a8e 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -382,7 +382,7 @@ "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten." }, "feedbackDetailChannel": { - "title": "Erstellen Sie einen Feedback-Diskussionskanal", + "title": "Erstelle einen Feedback-Diskussionskanal", "studentNumber": "Anzahl der Studierende die dem Kanal hinzugefügt werden: {{count}}", "description": "Dieser Kanal soll Diskussionen über spezifisches Feedback zur bereitgestellten Übung erleichtern. Es ermöglicht allen betroffenen Studierenden und Lehrenden, zusammenzuarbeiten und das Feedback effektiv anzugehen.", "label": "Kanalname", From 551c964e88cc74937c48b50a6eb6b86b893b693e Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Mon, 25 Nov 2024 22:55:29 +0100 Subject: [PATCH 31/64] refactored --- .../assessment/dto/FeedbackDetailDTO.java | 11 +-- .../assessment/service/ResultService.java | 25 ++---- .../assessment/web/ResultResource.java | 27 ++----- .../dto/FeedbackChannelRequestDTO.java | 2 +- .../service/conversation/ChannelService.java | 4 +- .../web/conversation/ChannelResource.java | 3 +- .../StudentParticipationRepository.java | 77 ++++++++----------- ...dback-affected-students-modal.component.ts | 2 +- ...edback-detail-channel-modal.component.html | 2 +- ...feedback-detail-channel-modal.component.ts | 3 +- .../feedback-analysis.component.html | 9 +++ .../feedback-analysis.component.ts | 11 ++- .../feedback-analysis.service.ts | 26 +++---- .../communication/ChannelIntegrationTest.java | 4 +- .../feedback-analysis.component.spec.ts | 3 - .../feedback-analysis.service.spec.ts | 25 +----- 16 files changed, 87 insertions(+), 147 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index d22a036e7489..6d31e250f5d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -1,16 +1,7 @@ package de.tum.cit.aet.artemis.assessment.dto; -import java.util.Arrays; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackDetailDTO(List concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, - String errorCategory) { - - public FeedbackDetailDTO(String concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { - this(Arrays.stream(concatenatedFeedbackIds.split(",")).map(Long::valueOf).toList(), count, relativeCount, detailText, testCaseName, taskName, errorCategory); - } - +public record FeedbackDetailDTO(long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 1f62ef78665b..646e624b7497 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -4,7 +4,6 @@ import java.time.ZonedDateTime; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.HashMap; @@ -622,7 +621,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee maxOccurrence, filterErrorCategories, pageable); // 10. Process and map feedback details, calculating relative count and assigning task names - List processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.concatenatedFeedbackIds(), detail.count(), + List processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); // 11. Predefined error categories available for filtering on the client side final List ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error"); @@ -653,15 +652,14 @@ public long getMaxCountForExercise(long exerciseId) { * datasets. *
    * - * @param exerciseId for which the affected student participation data is requested. - * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @param exerciseId for which the affected student participation data is requested. + * @param detailText used to filter the participation to only those affected by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ - public Page getAffectedStudentsWithFeedbackId(long exerciseId, String feedbackIds, PageableSearchDTO data) { - List feedbackIdLongs = Arrays.stream(feedbackIds.split(",")).map(Long::valueOf).toList(); + public Page getAffectedStudentsWithFeedbackId(long exerciseId, String detailText, String testCaseName, PageableSearchDTO data) { PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); - return studentParticipationRepository.findAffectedStudentsByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); + return studentParticipationRepository.findAffectedStudentsByFeedbackId(exerciseId, detailText, testCaseName, pageRequest); } /** @@ -692,15 +690,4 @@ public void deleteLongFeedback(List feedbackList, Result result) { List feedbacks = new ArrayList<>(feedbackList); result.updateAllFeedbackItems(feedbacks, true); } - - /** - * Retrieves the number of students affected by a specific feedback detail text for a given exercise. - * - * @param exerciseId for which the affected student count is requested. - * @param detailText used to filter affected students. - * @return the total number of distinct students affected by the feedback detail text. - */ - public long getAffectedStudentCountByFeedbackDetailText(long exerciseId, String detailText) { - return studentParticipationRepository.countAffectedStudentsByFeedbackDetailText(exerciseId, detailText); - } } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index ed6bc5ce12d3..910a903ba3a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -359,32 +358,18 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { * and participation details. *
    * - * @param exerciseId for which the participation data is requested. - * @param feedbackIdsHeader to filter affected students by specific feedback entries. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @param exerciseId for which the participation data is requested. + * @param detailText to filter affected students by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. */ @GetMapping("exercises/{exerciseId}/feedback-details-participation") @EnforceAtLeastEditorInExercise - public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestHeader("feedbackIds") String feedbackIdsHeader, - @ModelAttribute PageableSearchDTO data) { + public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestParam("detailText") String detailText, + @RequestParam("testCaseName") String testCaseName, @ModelAttribute PageableSearchDTO data) { - Page participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, feedbackIdsHeader, data); + Page participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, detailText, testCaseName, data); return ResponseEntity.ok(participation); } - - /** - * GET /exercises/{exerciseId}/feedback-detail/affected-students : Retrieves the count of students affected by a specific feedback detail text. - * - * @param exerciseId The ID of the exercise for which affected students are counted. - * @param detailText The feedback detail text to filter by. - * @return A {@link ResponseEntity} containing the count of affected students. - */ - @GetMapping("exercises/{exerciseId}/feedback-detail/affected-students") - @EnforceAtLeastEditorInExercise - public ResponseEntity countAffectedStudentsByFeedbackDetailText(@PathVariable long exerciseId, @RequestParam("detailText") String detailText) { - long affectedStudentCount = resultService.getAffectedStudentCountByFeedbackDetailText(exerciseId, detailText); - return ResponseEntity.ok(affectedStudentCount); - } } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java index d38b1c1d90f2..e0d0a8a1beb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java @@ -3,5 +3,5 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackChannelRequestDTO(ChannelDTO channel, String feedbackDetailText) { +public record FeedbackChannelRequestDTO(ChannelDTO channel, String feedbackDetailText, String testCaseName) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index 791847b75670..0135a8cce061 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -426,7 +426,7 @@ private static String generateChannelNameFromTitle(@NotNull String prefix, Optio * @return the created {@link Channel} object with its properties. * @throws BadRequestAlertException if the channel name starts with an invalid prefix (e.g., "$"). */ - public Channel createFeedbackChannel(Course course, Long exerciseId, ChannelDTO channelDTO, String feedbackDetailText, User requestingUser) { + public Channel createFeedbackChannel(Course course, Long exerciseId, ChannelDTO channelDTO, String feedbackDetailText, String testCaseName, User requestingUser) { Channel channelToCreate = new Channel(); channelToCreate.setName(channelDTO.getName()); channelToCreate.setIsPublic(channelDTO.getIsPublic()); @@ -440,7 +440,7 @@ public Channel createFeedbackChannel(Course course, Long exerciseId, ChannelDTO Channel createdChannel = createChannel(course, channelToCreate, Optional.of(requestingUser)); - List userLogins = studentParticipationRepository.findAffectedLoginsByFeedbackDetailText(exerciseId, feedbackDetailText); + List userLogins = studentParticipationRepository.findAffectedLoginsByFeedbackDetailText(exerciseId, feedbackDetailText, testCaseName); if (userLogins != null && !userLogins.isEmpty()) { var registeredUsers = registerUsersToChannel(false, false, false, userLogins, course, createdChannel); diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index cbb59c4b7e46..41ec06a3d9f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -487,11 +487,12 @@ public ResponseEntity createFeedbackChannel(@PathVariable Long cours ChannelDTO channelDTO = feedbackChannelRequest.channel(); String feedbackDetailText = feedbackChannelRequest.feedbackDetailText(); + String testCaseName = feedbackChannelRequest.testCaseName(); User requestingUser = userRepository.getUserWithGroupsAndAuthorities(); Course course = courseRepository.findByIdElseThrow(courseId); checkCommunicationEnabledElseThrow(course); - Channel createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailText, requestingUser); + Channel createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailText, testCaseName, requestingUser); return ResponseEntity.created(new URI("/api/channels/" + createdChannel.getId())).body(conversationDTOService.convertChannelToDTO(requestingUser, createdChannel)); } diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 03d2485f0f0a..2073bbfe7a28 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1234,7 +1234,6 @@ SELECT COALESCE(AVG(p.presentationScore), 0) */ @Query(""" SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( - LISTAGG(CAST(f.id AS string), ',') WITHIN GROUP (ORDER BY f.id), COUNT(f.id), 0, f.detailText, @@ -1251,13 +1250,13 @@ SELECT MAX(t.taskName) ELSE 'Student Error' END ) - FROM StudentParticipation p - LEFT JOIN p.results r ON r.id = ( + FROM ProgrammingExerciseStudentParticipation p + INNER JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id ) - LEFT JOIN r.feedbacks f + INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND f.positive = FALSE @@ -1291,8 +1290,8 @@ Page findFilteredFeedbackByExerciseId(@Param("exerciseId") lo */ @Query(""" SELECT COUNT(DISTINCT r.id) - FROM StudentParticipation p - LEFT JOIN p.results r ON r.id = ( + FROM ProgrammingExerciseStudentParticipation p + INNER JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id @@ -1318,13 +1317,13 @@ SELECT MAX(pr.id) SELECT MAX(feedbackCounts.feedbackCount) FROM ( SELECT COUNT(f.id) AS feedbackCount - FROM StudentParticipation p - LEFT JOIN p.results r ON r.id = ( + FROM ProgrammingExerciseStudentParticipation p + INNER JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id ) - LEFT JOIN r.feedbacks f + INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND f.positive = FALSE @@ -1337,9 +1336,9 @@ SELECT MAX(pr.id) * Retrieves a paginated list of students affected by specific feedback entries for a given programming exercise. *
    * - * @param exerciseId for which the affected student participation data is requested. - * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. - * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. + * @param exerciseId for which the affected student participation data is requested. + * @param detailText used to filter the participation to only those affected by specific feedback entries. + * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ @Query(""" @@ -1352,15 +1351,25 @@ SELECT MAX(pr.id) p.repositoryUri ) FROM ProgrammingExerciseStudentParticipation p - LEFT JOIN p.submissions s - LEFT JOIN s.results r - LEFT JOIN r.feedbacks f + INNER JOIN p.submissions s ON s.id = ( + SELECT MAX(sub.id) + FROM p.submissions sub + WHERE sub.participation.id = p.id + ) + INNER JOIN s.results r ON r.id = ( + SELECT MAX(pr.id) + FROM s.results pr + WHERE pr.participation.id = p.id + ) + INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId - AND f.id IN :feedbackIds + AND f.detailText = :detailText + AND f.testCase.testName = :testCaseName AND p.testRun = FALSE ORDER BY p.student.firstName ASC """) - Page findAffectedStudentsByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); + Page findAffectedStudentsByFeedbackId(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText, + @Param("testCaseName") String testCaseName, Pageable pageable); /** * Retrieves the logins of students affected by a specific feedback detail text in a given exercise. @@ -1372,34 +1381,11 @@ SELECT MAX(pr.id) @Query(""" SELECT DISTINCT p.student.login FROM ProgrammingExerciseStudentParticipation p - INNER JOIN p.submissions s - INNER JOIN s.results r ON r.id = ( - SELECT MAX(pr.id) - FROM s.results pr - WHERE pr.participation.id = p.id + INNER JOIN p.submissions s ON s.id = ( + SELECT MAX(sub.id) + FROM p.submissions sub + WHERE sub.participation.id = p.id ) - INNER JOIN r.feedbacks f - WHERE p.exercise.id = :exerciseId - AND f.detailText = :detailText - AND p.testRun = FALSE - """) - List findAffectedLoginsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText); - - /** - * Counts the number of distinct students affected by a specific feedback detail text for a given programming exercise. - *

    - * This query identifies students whose submissions were impacted by feedback entries matching the provided detail text - * within the specified exercise. Only students with non-test run submissions and negative feedback entries are considered. - *

    - * - * @param exerciseId the ID of the programming exercise for which the count is calculated. - * @param detailText the feedback detail text used to filter the affected students. - * @return the total number of distinct students affected by the feedback detail text. - */ - @Query(""" - SELECT COUNT(DISTINCT p.student.id) - FROM ProgrammingExerciseStudentParticipation p - INNER JOIN p.submissions s INNER JOIN s.results r ON r.id = ( SELECT MAX(pr.id) FROM s.results pr @@ -1408,7 +1394,8 @@ SELECT MAX(pr.id) INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND f.detailText = :detailText + AND f.testCase.testName = :testCaseName AND p.testRun = FALSE """) - long countAffectedStudentsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText); + List findAffectedLoginsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText, @Param("testCaseName") String testCaseName); } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index 947f3f3d44cd..edc4155381ac 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -45,7 +45,7 @@ export class AffectedStudentsModalComponent { }; try { - const response = await this.feedbackService.getParticipationForFeedbackIds(this.exerciseId(), feedbackDetail.concatenatedFeedbackIds, pageable); + const response = await this.feedbackService.getParticipationForFeedbackIds(this.exerciseId(), feedbackDetail.detailText, feedbackDetail.testCaseName, pageable); this.participation.set(response); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index 36d5b08ed5b9..c46e0ffc5086 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -60,7 +60,7 @@

    - +

    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts index e9b7963f0e78..c73979146939 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts @@ -15,7 +15,6 @@ import { AlertService } from 'app/core/util/alert.service'; }) export class FeedbackDetailChannelModalComponent { protected readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel'; - affectedStudentsCount = input.required(); feedbackDetail = input.required(); formSubmitted = output<{ channelDto: ChannelDTO; navigate: boolean }>(); @@ -53,7 +52,7 @@ export class FeedbackDetailChannelModalComponent { async handleModal(): Promise { try { const modalRef = this.modalService.open(ConfirmFeedbackChannelCreationModalComponent, { centered: true }); - modalRef.componentInstance.affectedStudentsCount = this.affectedStudentsCount; + modalRef.componentInstance.affectedStudentsCount = this.feedbackDetail().count; return await modalRef.result; } catch (error) { this.alertService.error(error); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 2c1d01040253..49600ba77a4a 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -18,6 +18,15 @@

    +
    + + +
    +
    + +
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index e229170410eb..74ccc916807a 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -16,36 +16,36 @@
    -

    -
    -
    - -
    -
    +
    +

    +
    +
    + + +
    + -
    - -
    @@ -70,7 +70,7 @@

    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index e6b2cec38b5f..f5ffcf5c9ca5 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -72,12 +72,7 @@ export class FeedbackAnalysisComponent { private isFeedbackDetailChannelModalOpen = false; private readonly debounceLoadData = BaseApiHttpService.debounce(this.loadData.bind(this), 300); - readonly levinStein = signal(false); // Signal for toggle state - - toggleLevinStein(): void { - this.levinStein.update((current) => !current); // Toggle the signal state - this.loadData(); // Optionally reload data based on the toggle state - } + readonly levinStein = signal(false); constructor() { effect(() => { @@ -244,4 +239,9 @@ export class FeedbackAnalysisComponent { this.isFeedbackDetailChannelModalOpen = false; } } + + toggleLevinStein(): void { + this.levinStein.update((current) => !current); + this.loadData(); + } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 55fec325fa39..1072d5f5c3c5 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -15,7 +15,7 @@ export interface FeedbackAnalysisResponse { export interface FeedbackDetail { count: number; relativeCount: number; - detailText: string; + detailText: string[]; testCaseName: string; taskName: string; errorCategory: string; @@ -30,7 +30,7 @@ export interface FeedbackAffectedStudentDTO { } export interface FeedbackChannelRequestDTO { channel: ChannelDTO; - feedbackDetailText: string; + feedbackDetailText: string[]; testCaseName: string; } @Injectable() @@ -55,7 +55,7 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get(`exercises/${exerciseId}/feedback-details-max-count`); } - async getParticipationForFeedbackIds( + async getParticipationForFeedbackDetailText( exerciseId: number, detailText: string, testCaseName: string, diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 760f761fa601..ed9f7d0ecdd8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -146,6 +146,8 @@ class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocal private ProgrammingExerciseStudentParticipation programmingExerciseStudentParticipation; + private ProgrammingExerciseStudentParticipation programmingExerciseStudentParticipation2; + private StudentParticipation studentParticipation; private final int NUMBER_OF_STUDENTS = 3; @@ -159,6 +161,7 @@ void setupTest() { // This is done to avoid proxy issues in the processNewResult method of the ResultService. solutionParticipation = solutionProgrammingExerciseRepository.findWithEagerResultsAndSubmissionsByProgrammingExerciseId(programmingExercise.getId()).orElseThrow(); programmingExerciseStudentParticipation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, TEST_PREFIX + "student1"); + programmingExerciseStudentParticipation2 = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, TEST_PREFIX + "student2"); participationUtilService.addStudentParticipationForProgrammingExercise(programmingExerciseWithStaticCodeAnalysis, TEST_PREFIX + "student1"); Course secondCourse = modelingExerciseUtilService.addCourseWithOneModelingExercise(); @@ -180,6 +183,12 @@ void setupTest() { result.setFeedbacks(feedbacks); result.setAssessmentType(AssessmentType.SEMI_AUTOMATIC); + Result result2 = ParticipationFactory.generateResult(true, 200D).participation(programmingExerciseStudentParticipation); + List feedbacks2 = ParticipationFactory.generateFeedback().stream().peek(feedback -> feedback.setText("Good work here")) + .collect(Collectors.toCollection(ArrayList::new)); + result2.setFeedbacks(feedbacks2); + result2.setAssessmentType(AssessmentType.SEMI_AUTOMATIC); + String dummyHash = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d"; doReturn(ObjectId.fromString(dummyHash)).when(gitService).getLastCommitHash(ArgumentMatchers.any()); } @@ -734,17 +743,13 @@ void testGetAssessmentCountByCorrectionRoundForProgrammingExercise() { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testGetAllFeedbackDetailsForExercise() throws Exception { - ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation); ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); testCase.setId(1L); - Feedback feedback = new Feedback(); feedback.setPositive(false); feedback.setDetailText("Some feedback"); feedback.setTestCase(testCase); - - StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); - Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); participationUtilService.addFeedbackToResult(feedback, result); String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=detailText&sortingOrder=ASCENDING" @@ -766,11 +771,8 @@ void testGetAllFeedbackDetailsForExercise() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception { - ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); - StudentParticipation participation1 = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); - StudentParticipation participation2 = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student2"); - Result result1 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation1); - Result result2 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation2); + Result result1 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation); + Result result2 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation2); ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); testCase.setId(1L); @@ -822,12 +824,9 @@ void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testGetMaxCountForExercise() throws Exception { - ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); - StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); - Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); + Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation); ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); testCase.setId(1L); - Feedback feedback = new Feedback(); feedback.setPositive(false); feedback.setDetailText("Some feedback"); @@ -842,11 +841,8 @@ void testGetMaxCountForExercise() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testGetMaxCountForExerciseWithMultipleFeedback() throws Exception { - ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); - StudentParticipation participation1 = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); - StudentParticipation participation2 = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student2"); - Result result1 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation1); - Result result2 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation2); + Result result1 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation); + Result result2 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation2); ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); testCase.setId(1L); diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java index e0e950cd1646..c9d3d1a9dc92 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java @@ -920,7 +920,7 @@ void createFeedbackChannel_asStudent_shouldReturnForbidden() { channelDTO.setIsPublic(true); channelDTO.setIsAnnouncementChannel(false); - FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, "Sample feedback text", "Sample testName"); + FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, List.of("Sample feedback text"), "Sample testName"); String BASE_ENDPOINT = "api/courses/{courseId}/{exerciseId}/feedback-channel"; @@ -944,7 +944,7 @@ void createFeedbackChannel_asInstructor_shouldCreateChannel() { channelDTO.setIsPublic(true); channelDTO.setIsAnnouncementChannel(false); - FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, "Sample feedback text", "Sample testName"); + FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, List.of("Sample feedback text"), "Sample testName"); String BASE_ENDPOINT = "/api/courses/{courseId}/{exerciseId}/feedback-channel"; diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 1a4cd99304a4..4b8d09e5290f 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -58,10 +58,10 @@ describe('FeedbackAnalysisService', () => { sortedColumn: 'detailText', }; const filters = { tasks: [], testCases: [], occurrence: [], errorCategories: [] }; - const responsePromise = service.search(pageable, { exerciseId: 1, filters }); + const responsePromise = service.search(pageable, false, { exerciseId: 1, filters }); const req = httpMock.expectOne( - 'api/exercises/1/feedback-details?page=1&pageSize=10&searchTerm=&sortingOrder=ASCENDING&sortedColumn=detailText&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=', + 'api/exercises/1/feedback-details?page=1&pageSize=10&searchTerm=&sortingOrder=ASCENDING&sortedColumn=detailText&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levinStein=false', ); expect(req.request.method).toBe('GET'); req.flush(feedbackAnalysisResponseMock); @@ -84,7 +84,7 @@ describe('FeedbackAnalysisService', () => { }); }); - describe('getParticipationForFeedbackIds', () => { + describe('getParticipationForFeedbackDetailText', () => { it('should retrieve paginated participation details for specified feedback IDs', async () => { const feedbackIds = '1, 2'; const pageable = { @@ -116,9 +116,11 @@ describe('FeedbackAnalysisService', () => { totalItems: 2, }; - const responsePromise = service.getParticipationForFeedbackIds(1, feedbackIds, 'Placeholder', pageable); + const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackIds, 'Placeholder', pageable); - const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); + const req = httpMock.expectOne( + 'api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&detailText=1,%202&testCaseName=Placeholder', + ); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index c2c60585b34a..0713f5c9cfbd 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -59,7 +59,7 @@ describe('AffectedStudentsModalComponent', () => { }); it('should handle error when loadAffected fails', async () => { - jest.spyOn(feedbackService, 'getParticipationForFeedbackIds').mockReturnValueOnce(Promise.reject(new Error('Error loading data'))); + jest.spyOn(feedbackService, 'getParticipationForFeedbackDetailText').mockReturnValueOnce(Promise.reject(new Error('Error loading data'))); const alertServiceSpy = jest.spyOn(component.alertService, 'error'); const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts index cf31d3b2b9e0..f3a6c0361e9f 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts @@ -10,7 +10,6 @@ describe('FeedbackModalComponent', () => { let activeModal: NgbActiveModal; const mockFeedbackDetail: FeedbackDetail = { - concatenatedFeedbackIds: [1, 2], count: 5, relativeCount: 25.0, detailText: 'Some feedback detail', From 0ea5d268bfb9723e6bc515a6b3ee7427c09e2bff Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Sat, 30 Nov 2024 18:13:07 +0100 Subject: [PATCH 37/64] implementation first draft with levenshtein --- .../assessment/service/ResultService.java | 15 +++--- .../assessment/web/ResultResource.java | 52 +++++++++++------- .../StudentParticipationRepository.java | 6 +-- ...ack-affected-students-modal.component.html | 8 +++ ...dback-affected-students-modal.component.ts | 8 +-- ...edback-detail-channel-modal.component.html | 10 +++- ...feedback-detail-channel-modal.component.ts | 1 + .../feedback-analysis.component.html | 13 ++--- .../feedback-analysis.component.ts | 10 ++-- .../feedback-analysis.service.ts | 15 ++++-- .../webapp/i18n/de/programmingExercise.json | 11 ++-- .../webapp/i18n/en/programmingExercise.json | 11 ++-- .../ResultServiceIntegrationTest.java | 13 ++--- .../feedback-analysis.component.spec.ts | 4 +- .../feedback-analysis.service.spec.ts | 53 ++++++++++++++++--- ...-affected-students-modal.component.spec.ts | 7 ++- ...ack-detail-channel-modal.component.spec.ts | 5 +- .../modals/feedback-modal.component.spec.ts | 4 +- 18 files changed, 163 insertions(+), 83 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 1823c8f9b445..de2db2ad43f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -573,6 +573,7 @@ private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) { * Pagination and sorting: * - Sorting is applied based on the specified column and order (ascending or descending). * - The result is paginated according to the provided page number and page size. + * Additionally one can group by the Levenshtein distance of the feedback detail text. * * @param exerciseId The ID of the exercise for which feedback details should be retrieved. * @param data The {@link FeedbackPageableDTO} containing page number, page size, search term, sorting options, and filtering parameters @@ -584,7 +585,7 @@ private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) { * - A list of active test case names used in the feedback. * - A list of predefined error categories ("Student Error," "Ares Error," "AST Error") available for filtering. */ - public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, FeedbackPageableDTO data, String levinStein) { + public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, FeedbackPageableDTO data, String levenshtein) { // 1. Fetch programming exercise with associated test cases ProgrammingExercise programmingExercise = programmingExerciseRepository.findWithTestCasesByIdElseThrow(exerciseId); @@ -619,11 +620,11 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee // 8. Set up pagination and sorting based on input data final var pageable = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.FEEDBACK_ANALYSIS); - // 9. Query the database to retrieve paginated and filtered feedback + // 9. Query the database based on levenshtein attribute to retrieve paginated and filtered feedback final Page feedbackDetailPage; List processedDetails; int totalPages = 0; - if (levinStein.equals("false")) { + if (levenshtein.equals("false")) { feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeUnassignedTasks, minOccurrence, maxOccurrence, filterErrorCategories, pageable); @@ -641,8 +642,8 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee // Fetch all feedback details List allFeedbackDetails = feedbackDetailPage.getContent(); - // Apply Levenshtein-based grouping and aggregation - List aggregatedFeedbackDetails = aggregateUsingLevenshtein(allFeedbackDetails, 0.5); + // Apply Levenshtein-based grouping and aggregation with a similarity threshold of 90% + List aggregatedFeedbackDetails = aggregateUsingLevenshtein(allFeedbackDetails, 0.9); // Apply manual pagination int page = data.getPage(); @@ -688,7 +689,7 @@ private List aggregateUsingLevenshtein(List aggregatedTexts = new ArrayList<>(); - aggregatedTexts.add(base.detailText().getFirst()); // Add the primary text + aggregatedTexts.add(base.detailText().getFirst()); long totalCount = base.count(); for (int j = i + 1; j < feedbackDetails.size(); j++) { @@ -745,7 +746,7 @@ public long getMaxCountForExercise(long exerciseId) { * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ - public Page getAffectedStudentsWithFeedbackText(long exerciseId, String detailText, String testCaseName, PageableSearchDTO data) { + public Page getAffectedStudentsWithFeedbackText(long exerciseId, List detailText, String testCaseName, PageableSearchDTO data) { PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); return studentParticipationRepository.findAffectedStudentsByFeedbackText(exerciseId, detailText, testCaseName, pageRequest); } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index ed164d33f90b..ec3e80a617de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -7,8 +7,10 @@ import java.time.ZonedDateTime; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -309,18 +311,19 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo * * * - * @param exerciseId The unique identifier of the exercise for which feedback details are requested. - * @param data A {@link FeedbackPageableDTO} object containing pagination, sorting, and filtering parameters, including: - *
      - *
    • Page number and page size
      • - *
    • Search term (optional)
      • - *
    • Sorting order (ASCENDING or DESCENDING)
      • - *
    • Sorted column
      • - *
    • Filter task names (optional)
      • - *
    • Filter test case names (optional)
      • - *
    • Occurrence range (optional)
      • - *
    • Error categories (optional)
      • - *
    + * @param exerciseId The unique identifier of the exercise for which feedback details are requested. + * @param levenshtein Should the feedback be grouped via Levenshtein distance. + * @param data A {@link FeedbackPageableDTO} object containing pagination, sorting, and filtering parameters, including: + *
      + *
    • Page number and page size
      • + *
    • Search term (optional)
      • + *
    • Sorting order (ASCENDING or DESCENDING)
      • + *
    • Sorted column
      • + *
    • Filter task names (optional)
      • + *
    • Filter test case names (optional)
      • + *
    • Occurrence range (optional)
      • + *
    • Error categories (optional)
      • + *
    * @return A {@link ResponseEntity} containing a {@link FeedbackAnalysisResponseDTO}, which includes: *
      *
    • {@link SearchResultPageDTO < FeedbackDetailDTO >} feedbackDetails: Paginated and filtered feedback details for the exercise.
      • @@ -332,9 +335,9 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo */ @GetMapping("exercises/{exerciseId}/feedback-details") @EnforceAtLeastEditorInExercise - public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @RequestParam("levinStein") String levinStein, + public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @RequestParam("levenshtein") String levenshtein, @ModelAttribute FeedbackPageableDTO data) { - FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data, levinStein); + FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data, levenshtein); return ResponseEntity.ok(response); } @@ -359,15 +362,26 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { * and participation details. *
      * - * @param exerciseId for which the participation data is requested. - * @param detailText to filter affected students by specific feedback entries. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @param exerciseId for which the participation data is requested. + * @param detailText1 Optional first detail text to filter affected students by specific feedback entries. + * @param detailText2 Optional second detail text to filter affected students by specific feedback entries. + * @param detailText3 Optional third detail text to filter affected students by specific feedback entries. + * @param detailText4 Optional fourth detail text to filter affected students by specific feedback entries. + * @param detailText5 Optional fifth detail text to filter affected students by specific feedback entries. + * @param testCaseName The test case name to filter affected students by specific test cases. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. */ @GetMapping("exercises/{exerciseId}/feedback-details-participation") @EnforceAtLeastEditorInExercise - public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestParam("detailText") String detailText, - @RequestParam("testCaseName") String testCaseName, @ModelAttribute PageableSearchDTO data) { + public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, + @RequestParam(value = "detailText1", required = false) String detailText1, @RequestParam(value = "detailText2", required = false) String detailText2, + @RequestParam(value = "detailText3", required = false) String detailText3, @RequestParam(value = "detailText4", required = false) String detailText4, + @RequestParam(value = "detailText5", required = false) String detailText5, @RequestParam("testCaseName") String testCaseName, + @ModelAttribute PageableSearchDTO data) { + + List detailText = Stream.of(detailText1, detailText2, detailText3, detailText4, detailText5).filter(Objects::nonNull).toList(); + Page participation = resultService.getAffectedStudentsWithFeedbackText(exerciseId, detailText, testCaseName, data); return ResponseEntity.ok(participation); } diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 5ac311e01aea..a74f872c9e0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1345,7 +1345,7 @@ SELECT MAX(pr.id) * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ @Query(""" - SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( + SELECT DISTINCT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( p.exercise.course.id, p.id, p.student.firstName, @@ -1366,12 +1366,12 @@ SELECT MAX(pr.id) ) INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId - AND f.detailText = :detailText + AND f.detailText IN :detailText AND f.testCase.testName = :testCaseName AND p.testRun = FALSE ORDER BY p.student.firstName ASC """) - Page findAffectedStudentsByFeedbackText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText, + Page findAffectedStudentsByFeedbackText(@Param("exerciseId") long exerciseId, @Param("detailText") List detailText, @Param("testCaseName") String testCaseName, Pageable pageable); /** diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html index 4f53792a04e5..d473eede0086 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -8,6 +8,14 @@

      + @if (levenshtein()) { +
      +

      + + +

      +
      + }
    {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) - {{ item.detailText.length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText | slice: 0 : 100) + '...' : item.detailText }} + {{ item.detailText[0].length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText[0] | slice: 0 : 100) + '...' : item.detailText[0] }} {{ item.taskName }} {{ item.testCaseName }}
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index 39577189f9be..b64019dfc0db 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -16,6 +16,7 @@ import { PageableResult, PageableSearch, SortingOrder } from 'app/shared/table/p export class AffectedStudentsModalComponent { exerciseId = input.required(); feedbackDetail = input.required(); + levenshtein = input.required(); readonly participation = signal>({ content: [], totalPages: 0, totalElements: 0 }); readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.affectedStudentsModal'; @@ -45,12 +46,7 @@ export class AffectedStudentsModalComponent { }; try { - const response = await this.feedbackService.getParticipationForFeedbackDetailText( - this.exerciseId(), - feedbackDetail.detailText[0], - feedbackDetail.testCaseName, - pageable, - ); + const response = await this.feedbackService.getParticipationForFeedbackDetailText(this.exerciseId(), feedbackDetail.detailText, feedbackDetail.testCaseName, pageable); this.participation.set(response); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index c46e0ffc5086..417e7a5536a9 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -58,6 +58,14 @@

    + @if (levenshtein()) { +
    +

    + + +

    +
    + }

    @@ -81,7 +89,7 @@

    [disabled]="!form.valid" [jhiTranslate]="TRANSLATION_BASE + '.createAndNavigateLabel'" > - +

    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts index c73979146939..d15fdb840fd9 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts @@ -16,6 +16,7 @@ import { AlertService } from 'app/core/util/alert.service'; export class FeedbackDetailChannelModalComponent { protected readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel'; feedbackDetail = input.required(); + levenshtein = input.required(); formSubmitted = output<{ channelDto: ChannelDTO; navigate: boolean }>(); isConfirmModalOpen = signal(false); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 74ccc916807a..4df4b80fbb3f 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -20,17 +20,10 @@

    - +
    } -

    - - - - - - - - - - - - - - @for (item of participation().content; track item) { + @if (isLoading()) { +
    + +
    + } @else { +
    + + + + + + - - - + + + + + + @for (item of participation().content; track item) { + + + + + + } + +
    {{ item.firstName }} {{ item.lastName }}{{ item.login }} - -
    {{ item.firstName }} {{ item.lastName }}{{ item.login }} + +
    +
    + @if (participation().totalElements >= pageSize()) { + } - - -
    - @if (participation().totalElements >= pageSize()) { - - } -
    - +
    + +
    -
    + }
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index b64019dfc0db..fb26a457fae7 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -5,6 +5,7 @@ import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } f import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; import { PageableResult, PageableSearch, SortingOrder } from 'app/shared/table/pageable-table'; +import { faSpinner } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'jhi-affected-students-modal', @@ -23,6 +24,8 @@ export class AffectedStudentsModalComponent { page = signal(1); pageSize = signal(10); readonly collectionsSize = computed(() => this.participation().totalPages * this.pageSize()); + readonly faSpinner = faSpinner; + readonly isLoading = signal(false); activeModal = inject(NgbActiveModal); feedbackService = inject(FeedbackAnalysisService); @@ -45,11 +48,14 @@ export class AffectedStudentsModalComponent { sortingOrder: SortingOrder.ASCENDING, }; + this.isLoading.set(true); try { const response = await this.feedbackService.getParticipationForFeedbackDetailText(this.exerciseId(), feedbackDetail.detailText, feedbackDetail.testCaseName, pageable); this.participation.set(response); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); + } finally { + this.isLoading.set(false); } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 4df4b80fbb3f..39eae395e53b 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -51,34 +51,42 @@

    - - @if (!content().resultsOnPage) { - - - - - - } @else { - @for (item of content().resultsOnPage; track item) { + @if (isLoading()) { +
    + +
    + } @else { + + @if (!content().resultsOnPage) { - {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) - - {{ item.detailText[0].length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText[0] | slice: 0 : 100) + '...' : item.detailText[0] }} - - {{ item.taskName }} - {{ item.testCaseName }} - {{ item.errorCategory }} - - - - @if (isCommunicationEnabled()) { - - } + + + } @else { + @for (item of content().resultsOnPage; track item) { + + {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) + + {{ item.detailText[0].length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText[0] | slice: 0 : 100) + '...' : item.detailText[0] }} + + {{ item.taskName }} + {{ item.testCaseName }} + {{ item.errorCategory }} + + + + @if (isCommunicationEnabled()) { + + } + + + } } - } - + + }
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 32511720b947..650f57c8d53f 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -2,7 +2,7 @@ import { Component, computed, effect, inject, input, signal, untracked } from '@ import { FeedbackAnalysisService, FeedbackChannelRequestDTO, FeedbackDetail } from './feedback-analysis.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { faCircleInfo, faFilter, faMessage, faSort, faSortDown, faSortUp, faUsers } from '@fortawesome/free-solid-svg-icons'; +import { faCircleInfo, faFilter, faMessage, faSort, faSortDown, faSortUp, faSpinner, faUsers } from '@fortawesome/free-solid-svg-icons'; import { facDetails } from '../../../../../../content/icons/icons'; import { SearchResult, SortingOrder } from 'app/shared/table/pageable-table'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; @@ -57,6 +57,8 @@ export class FeedbackAnalysisComponent { readonly faCircleInfo = faCircleInfo; readonly SortingOrder = SortingOrder; readonly MAX_FEEDBACK_DETAIL_TEXT_LENGTH = 200; + readonly faSpinner = faSpinner; + readonly isLoading = signal(false); readonly FILTER_TASKS_KEY = 'feedbackAnalysis.tasks'; readonly FILTER_TEST_CASES_KEY = 'feedbackAnalysis.testCases'; @@ -97,6 +99,7 @@ export class FeedbackAnalysisComponent { filterErrorCategories: this.errorCategories(), }; + this.isLoading.set(true); try { const response = await this.feedbackAnalysisService.search(state, this.levenshtein(), { exerciseId: this.exerciseId(), @@ -112,8 +115,11 @@ export class FeedbackAnalysisComponent { this.taskNames.set(response.taskNames); this.testCaseNames.set(response.testCaseNames); this.errorCategories.set(response.errorCategories); + this.maxCount.set(response.levenshteinMaxCount); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); + } finally { + this.isLoading.set(false); } } @@ -156,7 +162,11 @@ export class FeedbackAnalysisComponent { const savedOccurrence = this.localStorage.retrieve(this.FILTER_OCCURRENCE_KEY); const savedErrorCategories = this.localStorage.retrieve(this.FILTER_ERROR_CATEGORIES_KEY); this.minCount.set(0); - this.maxCount.set(await this.feedbackAnalysisService.getMaxCount(this.exerciseId())); + if (this.levenshtein()) { + this.maxCount.set(this.maxCount()); + } else { + this.maxCount.set(await this.feedbackAnalysisService.getMaxCount(this.exerciseId())); + } const modalRef = this.modalService.open(FeedbackFilterModalComponent, { centered: true, size: 'lg' }); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 9119af0fc0a2..61670f45a46e 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -11,6 +11,7 @@ export interface FeedbackAnalysisResponse { taskNames: string[]; testCaseNames: string[]; errorCategories: string[]; + levenshteinMaxCount: number; } export interface FeedbackDetail { count: number; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index d2a8bfabe107..81a37627fb30 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -753,7 +753,7 @@ void testGetAllFeedbackDetailsForExercise() throws Exception { participationUtilService.addFeedbackToResult(feedback, result); String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=detailText&sortingOrder=ASCENDING" - + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levinStein=false"; + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levenshtein=false"; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); @@ -795,7 +795,7 @@ void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception participationUtilService.addFeedbackToResult(feedback3, result1); String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=detailText&sortingOrder=ASCENDING" - + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levinStein=false"; + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levenshtein=false"; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index c89349ea2c61..ddcf509ed8ea 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -50,6 +50,7 @@ describe('FeedbackAnalysisComponent', () => { taskNames: ['task1', 'task2'], testCaseNames: ['test1', 'test2'], errorCategories: ['Student Error', 'AST Error', 'Ares Error'], + levenshteinMaxCount: 0, }; beforeEach(async () => { From 83c986e5a61a0dc19c6a8be1566a7e4b8ec5dc91 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Sat, 30 Nov 2024 19:11:39 +0100 Subject: [PATCH 39/64] icon colour updated --- .../feedback-analysis/feedback-analysis.component.html | 2 +- .../grading/feedback-analysis/feedback-analysis.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 39eae395e53b..2e6c99749dd3 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -23,7 +23,7 @@

    } @else { - - - - - diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index fb26a457fae7..69cf0ee19729 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -50,7 +50,7 @@ export class AffectedStudentsModalComponent { this.isLoading.set(true); try { - const response = await this.feedbackService.getParticipationForFeedbackDetailText(this.exerciseId(), feedbackDetail.detailText, feedbackDetail.testCaseName, pageable); + const response = await this.feedbackService.getParticipationForFeedbackDetailText(this.exerciseId(), feedbackDetail.detailTexts, feedbackDetail.testCaseName, pageable); this.participation.set(response); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html index b40b90e22569..84d44d6eeba9 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html @@ -21,7 +21,7 @@

    -

    {{ feedbackDetail().detailText[0] }}

    +

    {{ feedbackDetail().detailTexts[0] }}

    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 2e6c99749dd3..e5fb2f920c72 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -26,7 +26,7 @@

    - @@ -45,7 +45,7 @@

    - + @@ -70,7 +70,7 @@

    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index ed856466a78e..1b5344ac2a2d 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -227,7 +227,7 @@ export class FeedbackAnalysisComponent { try { const feedbackChannelRequest: FeedbackChannelRequestDTO = { channel: channelDto, - feedbackDetailText: feedbackDetail.detailText, + feedbackDetailTexts: feedbackDetail.detailTexts, testCaseName: feedbackDetail.testCaseName, }; const createdChannel = await this.feedbackAnalysisService.createChannel(this.courseId(), this.exerciseId(), feedbackChannelRequest); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 61670f45a46e..c2dc4979368e 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -16,7 +16,7 @@ export interface FeedbackAnalysisResponse { export interface FeedbackDetail { count: number; relativeCount: number; - detailText: string[]; + detailTexts: string[]; testCaseName: string; taskName: string; errorCategory: string; @@ -31,7 +31,7 @@ export interface FeedbackAffectedStudentDTO { } export interface FeedbackChannelRequestDTO { channel: ChannelDTO; - feedbackDetailText: string[]; + feedbackDetailTexts: string[]; testCaseName: string; } @Injectable() diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 81a37627fb30..df22123edb29 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -752,7 +752,7 @@ void testGetAllFeedbackDetailsForExercise() throws Exception { feedback.setTestCase(testCase); participationUtilService.addFeedbackToResult(feedback, result); - String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=detailText&sortingOrder=ASCENDING" + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=count&sortingOrder=ASCENDING" + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levenshtein=false"; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); @@ -761,7 +761,7 @@ void testGetAllFeedbackDetailsForExercise() throws Exception { FeedbackDetailDTO feedbackDetail = response.feedbackDetails().getResultsOnPage().getFirst(); assertThat(feedbackDetail.count()).isEqualTo(1); assertThat(feedbackDetail.relativeCount()).isEqualTo(100.0); - assertThat(feedbackDetail.detailText()).isEqualTo(List.of("Some feedback")); + assertThat(feedbackDetail.detailTexts()).isEqualTo(List.of("Some feedback")); assertThat(feedbackDetail.testCaseName()).isEqualTo("test1"); assertThat(response.errorCategories()).containsExactlyInAnyOrder("Student Error", "Ares Error", "AST Error"); @@ -794,7 +794,7 @@ void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception feedback3.setTestCase(testCase); participationUtilService.addFeedbackToResult(feedback3, result1); - String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=detailText&sortingOrder=ASCENDING" + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=count&sortingOrder=ASCENDING" + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levenshtein=false"; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); @@ -802,20 +802,20 @@ void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception List feedbackDetails = response.feedbackDetails().getResultsOnPage(); assertThat(feedbackDetails).hasSize(2); - FeedbackDetailDTO firstFeedbackDetail = feedbackDetails.stream().filter(feedbackDetail -> List.of("Some feedback").equals(feedbackDetail.detailText())).findFirst() + FeedbackDetailDTO firstFeedbackDetail = feedbackDetails.stream().filter(feedbackDetail -> List.of("Some feedback").equals(feedbackDetail.detailTexts())).findFirst() .orElseThrow(); - FeedbackDetailDTO secondFeedbackDetail = feedbackDetails.stream().filter(feedbackDetail -> List.of("Some different feedback").equals(feedbackDetail.detailText())) + FeedbackDetailDTO secondFeedbackDetail = feedbackDetails.stream().filter(feedbackDetail -> List.of("Some different feedback").equals(feedbackDetail.detailTexts())) .findFirst().orElseThrow(); assertThat(firstFeedbackDetail.count()).isEqualTo(2); assertThat(firstFeedbackDetail.relativeCount()).isEqualTo(100.0); - assertThat(firstFeedbackDetail.detailText()).isEqualTo(List.of("Some feedback")); + assertThat(firstFeedbackDetail.detailTexts()).isEqualTo(List.of("Some feedback")); assertThat(firstFeedbackDetail.testCaseName()).isEqualTo("test1"); assertThat(secondFeedbackDetail.count()).isEqualTo(1); assertThat(secondFeedbackDetail.relativeCount()).isEqualTo(50.0); - assertThat(secondFeedbackDetail.detailText()).isEqualTo(List.of("Some different feedback")); + assertThat(secondFeedbackDetail.detailTexts()).isEqualTo(List.of("Some different feedback")); assertThat(secondFeedbackDetail.testCaseName()).isEqualTo("test1"); assertThat(response.errorCategories()).containsExactlyInAnyOrder("Student Error", "Ares Error", "AST Error"); @@ -884,7 +884,7 @@ void testGetParticipationForFeedbackDetailText() throws Exception { String detailTextEncoded = URLEncoder.encode(feedback.getDetailText(), StandardCharsets.UTF_8); String testCaseName = testCase.getTestName(); String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING" - + "&detailText=" + detailTextEncoded + "&testCaseName=" + testCaseName; + + "&detailTexts=" + detailTextEncoded + "&testCaseName=" + testCaseName; String jsonResponse = request.get(url, HttpStatus.OK, String.class); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index ddcf509ed8ea..e4b4db7e4ef6 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -27,7 +27,7 @@ describe('FeedbackAnalysisComponent', () => { const feedbackMock: FeedbackDetail[] = [ { - detailText: ['Test feedback 1 detail'], + detailTexts: ['Test feedback 1 detail'], testCaseName: 'test1', count: 10, relativeCount: 50, @@ -35,7 +35,7 @@ describe('FeedbackAnalysisComponent', () => { errorCategory: 'Student Error', }, { - detailText: ['Test feedback 2 detail'], + detailTexts: ['Test feedback 2 detail'], testCaseName: 'test2', count: 5, relativeCount: 25, diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 40c0a1f5c048..3e830eeb1997 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -10,7 +10,7 @@ describe('FeedbackAnalysisService', () => { const feedbackDetailsMock: FeedbackDetail[] = [ { - detailText: ['Feedback 1'], + detailTexts: ['Feedback 1'], testCaseName: 'test1', count: 5, relativeCount: 25.0, @@ -18,7 +18,7 @@ describe('FeedbackAnalysisService', () => { errorCategory: 'StudentError', }, { - detailText: ['Feedback 2'], + detailTexts: ['Feedback 2'], testCaseName: 'test2', count: 3, relativeCount: 15.0, @@ -181,7 +181,7 @@ describe('FeedbackAnalysisService', () => { const feedbackChannelRequestMock = { channel: channelDtoMock, - feedbackDetailText: ['Sample feedback detail text'], + feedbackDetailTexts: ['Sample feedback detail text'], testCaseName: 'test1', }; diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index a032bdf6381e..6a80e71e9a2e 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -15,7 +15,7 @@ describe('AffectedStudentsModalComponent', () => { const feedbackDetailMock: FeedbackDetail = { count: 5, relativeCount: 25.0, - detailText: ['Some feedback detail'], + detailTexts: ['Some feedback detail'], testCaseName: 'testCase1', taskName: '1', errorCategory: 'StudentError', diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts index df9bd07a1bef..1fe5a961864f 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-detail-channel-modal.component.spec.ts @@ -22,7 +22,7 @@ describe('FeedbackDetailChannelModalComponent', () => { modalService = TestBed.inject(NgbModal); fixture.componentRef.setInput('feedbackDetail', { - detailText: ['Sample feedback'], + detailTexts: ['Sample feedback'], count: 10, relativeCount: 50, testCaseName: 'testCase1', @@ -35,7 +35,7 @@ describe('FeedbackDetailChannelModalComponent', () => { }); it('should initialize form and inputs', () => { - expect(component.feedbackDetail().detailText).toStrictEqual(['Sample feedback']); + expect(component.feedbackDetail().detailTexts).toStrictEqual(['Sample feedback']); expect(component.form).toBeDefined(); expect(component.form.valid).toBeFalse(); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts index 5ad0e625b2d5..bf2ff4f48106 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts @@ -12,7 +12,7 @@ describe('FeedbackModalComponent', () => { const mockFeedbackDetail: FeedbackDetail = { count: 5, relativeCount: 25.0, - detailText: ['Some feedback detail'], + detailTexts: ['Some feedback detail'], testCaseName: 'testCase1', taskName: '1', errorCategory: 'StudentError', @@ -32,7 +32,7 @@ describe('FeedbackModalComponent', () => { it('should initialize with the provided feedback detail', () => { expect(component.feedbackDetail()).toEqual(mockFeedbackDetail); - expect(component.feedbackDetail().detailText).toStrictEqual(['Some feedback detail']); + expect(component.feedbackDetail().detailTexts).toStrictEqual(['Some feedback detail']); expect(component.feedbackDetail().testCaseName).toBe('testCase1'); }); diff --git a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts index 89c6a7755334..b852e6da8880 100644 --- a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts +++ b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts @@ -84,7 +84,7 @@ describe('ProgrammingFeedbackItemService', () => { it('should create grading instruction feedback item', () => { const gradingInstruction = { feedback: 'gradingInstruction.feedback', - detailText: 'gradingInstruction.detailText', + detailText: 'gradingInstruction.detailTexts', } as Partial; const feedback = { From 783ee736b770b2312baf0032f2ef5cb83581166f Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Wed, 4 Dec 2024 12:53:18 +0100 Subject: [PATCH 50/64] server style --- .../exercise/repository/StudentParticipationRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index ea4924333ca6..e7410b1bde67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1363,7 +1363,7 @@ SELECT MAX(pr.id) *
    * * @param exerciseId for which the affected student participation data is requested. - * @param detailText used to filter the participation to only those affected by specific feedback entries. + * @param detailTexts used to filter the participation to only those affected by specific feedback entries. * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. * @param testCaseName The name of the test case for which the feedback is given. * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. From 33bb40ca6a6cdd4c2dce68cbb1de794c4873c2a0 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 10 Dec 2024 09:04:22 +0100 Subject: [PATCH 51/64] server test --- .../assessment/service/ResultService.java | 7 +++- .../ResultServiceIntegrationTest.java | 41 +++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 6bcb761e3185..9b7ff47c9203 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -624,6 +624,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee final Page feedbackDetailPage; List processedDetails; int totalPages = 0; + long totalCount = 0; long levenshteinMaxCount = 0; if (!Boolean.parseBoolean(levenshtein)) { feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, @@ -634,6 +635,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailTexts(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); totalPages = feedbackDetailPage.getTotalPages(); + totalCount = feedbackDetailPage.getTotalElements(); } else { feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, @@ -659,14 +661,15 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee processedDetails = processedDetails.stream().map(detail -> new FeedbackDetailDTO(detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailTexts(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); totalPages = (int) Math.ceil((double) processedDetailsPreSort.size() / pageSize); + totalCount = aggregatedFeedbackDetails.size(); } // 10. Predefined error categories available for filtering on the client side final List ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error"); // 11. Return response containing processed feedback details, task names, active test case names, and error categories - return new FeedbackAnalysisResponseDTO(new SearchResultPageDTO<>(processedDetails, totalPages), feedbackDetailPage.getTotalElements(), taskNames, activeTestCaseNames, - ERROR_CATEGORIES, levenshteinMaxCount); + return new FeedbackAnalysisResponseDTO(new SearchResultPageDTO<>(processedDetails, totalPages), totalCount, taskNames, activeTestCaseNames, ERROR_CATEGORIES, + levenshteinMaxCount); } private Comparator getComparatorForFeedbackDetails(FeedbackPageableDTO search) { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index df22123edb29..96fb0a415553 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -822,6 +822,47 @@ void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception assertThat(response.totalItems()).isEqualTo(2); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetAllFeedbackDetailsForExerciseWithLevenshteinAndMultipleSimilarFeedback() throws Exception { + Result result1 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation); + Result result2 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation2); + ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); + testCase.setId(1L); + + Feedback feedback1 = new Feedback(); + feedback1.setPositive(false); + feedback1.setDetailText("Some feedback"); + feedback1.setTestCase(testCase); + participationUtilService.addFeedbackToResult(feedback1, result1); + + Feedback feedback2 = new Feedback(); + feedback2.setPositive(false); + feedback2.setDetailText("Some feedbacks"); + feedback2.setTestCase(testCase); + participationUtilService.addFeedbackToResult(feedback2, result2); + + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=count&sortingOrder=ASCENDING" + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&levenshtein=true"; + + FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); + + List feedbackDetails = response.feedbackDetails().getResultsOnPage(); + assertThat(feedbackDetails).hasSize(1); + + FeedbackDetailDTO firstFeedbackDetail = feedbackDetails.stream().filter(feedbackDetail -> List.of("Some feedback", "Some feedbacks").equals(feedbackDetail.detailTexts())) + .findFirst().orElseThrow(); + + assertThat(firstFeedbackDetail.count()).isEqualTo(2); + assertThat(firstFeedbackDetail.relativeCount()).isEqualTo(100.0); + assertThat(firstFeedbackDetail.detailTexts()).isEqualTo(List.of("Some feedback", "Some feedbacks")); + assertThat(firstFeedbackDetail.testCaseName()).isEqualTo("test1"); + + assertThat(response.errorCategories()).containsExactlyInAnyOrder("Student Error", "Ares Error", "AST Error"); + + assertThat(response.totalItems()).isEqualTo(1); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testGetMaxCountForExercise() throws Exception { From f806050afb8b1ebcab1d8b8b3461e549df2a7094 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 10 Dec 2024 09:11:26 +0100 Subject: [PATCH 52/64] server test --- .../artemis/communication/dto/FeedbackChannelRequestDTO.java | 2 +- .../communication/web/conversation/ChannelResource.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java index b3fa3cd3a317..ca47c30d1be4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/FeedbackChannelRequestDTO.java @@ -5,5 +5,5 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackChannelRequestDTO(ChannelDTO channel, List feedbackDetailText, String testCaseName) { +public record FeedbackChannelRequestDTO(ChannelDTO channel, List feedbackDetailTexts, String testCaseName) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index c4851272536d..d64c578002fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -486,13 +486,13 @@ public ResponseEntity createFeedbackChannel(@PathVariable Long cours log.debug("REST request to create feedback channel for course {} and exercise {} with properties: {}", courseId, exerciseId, feedbackChannelRequest); ChannelDTO channelDTO = feedbackChannelRequest.channel(); - List feedbackDetailText = feedbackChannelRequest.feedbackDetailText(); + List feedbackDetailTexts = feedbackChannelRequest.feedbackDetailTexts(); String testCaseName = feedbackChannelRequest.testCaseName(); User requestingUser = userRepository.getUserWithGroupsAndAuthorities(); Course course = courseRepository.findByIdElseThrow(courseId); checkCommunicationEnabledElseThrow(course); - Channel createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailText, testCaseName, requestingUser); + Channel createdChannel = channelService.createFeedbackChannel(course, exerciseId, channelDTO, feedbackDetailTexts, testCaseName, requestingUser); return ResponseEntity.created(new URI("/api/channels/" + createdChannel.getId())).body(conversationDTOService.convertChannelToDTO(requestingUser, createdChannel)); } From 24d88da3c407b7ccb69d650cd6492e3a22b4eea8 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 10 Dec 2024 14:53:16 +0100 Subject: [PATCH 53/64] renamed variables --- .../dto/FeedbackAnalysisResponseDTO.java | 2 +- .../assessment/service/ResultService.java | 20 ++++++------- .../assessment/web/ResultResource.java | 30 +++++++++---------- .../StudentParticipationRepository.java | 2 +- .../feedback-analysis.component.html | 2 +- .../feedback-analysis.component.ts | 16 +++++----- .../feedback-analysis.service.ts | 6 ++-- .../ResultServiceIntegrationTest.java | 8 ++--- .../feedback-analysis.component.spec.ts | 2 +- .../feedback-analysis.service.spec.ts | 2 +- ...ack-detail-channel-modal.component.spec.ts | 2 +- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java index 62e6fd213220..59e9667c68fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java @@ -9,5 +9,5 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FeedbackAnalysisResponseDTO(SearchResultPageDTO feedbackDetails, long totalItems, Set taskNames, List testCaseNames, - List errorCategories, long levenshteinMaxCount) { + List errorCategories, long groupFeedbackMaxCount) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 9b7ff47c9203..9c0beab2f3a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -574,10 +574,10 @@ private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) { * - The result is paginated according to the provided page number and page size. * Additionally one can group by the Levenshtein distance of the feedback detail text. * - * @param exerciseId The ID of the exercise for which feedback details should be retrieved. - * @param data The {@link FeedbackPageableDTO} containing page number, page size, search term, sorting options, and filtering parameters - * (task names, test cases, occurrence range, error categories). - * @param levenshtein The flag to enable Levenshtein-based grouping and aggregation of feedback details. + * @param exerciseId The ID of the exercise for which feedback details should be retrieved. + * @param data The {@link FeedbackPageableDTO} containing page number, page size, search term, sorting options, and filtering parameters + * (task names, test cases, occurrence range, error categories). + * @param groupFeedback The flag to enable Levenshtein-based grouping and aggregation of feedback details. * @return A {@link FeedbackAnalysisResponseDTO} object containing: * - A {@link SearchResultPageDTO} of paginated feedback details. * - The total number of distinct results for the exercise. @@ -585,7 +585,7 @@ private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) { * - A list of active test case names used in the feedback. * - A list of predefined error categories ("Student Error," "Ares Error," "AST Error") available for filtering. */ - public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, FeedbackPageableDTO data, String levenshtein) { + public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, FeedbackPageableDTO data, boolean groupFeedback) { // 1. Fetch programming exercise with associated test cases ProgrammingExercise programmingExercise = programmingExerciseRepository.findWithTestCasesByIdElseThrow(exerciseId); @@ -625,8 +625,8 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List processedDetails; int totalPages = 0; long totalCount = 0; - long levenshteinMaxCount = 0; - if (!Boolean.parseBoolean(levenshtein)) { + long groupFeedbackMaxCount = 0; + if (!groupFeedback) { feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeUnassignedTasks, minOccurrence, maxOccurrence, filterErrorCategories, pageable); @@ -646,9 +646,9 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List allFeedbackDetails = feedbackDetailPage.getContent(); // Apply Levenshtein-based grouping and aggregation with a similarity threshold of 90% - List aggregatedFeedbackDetails = aggregateUsingLevenshtein(allFeedbackDetails, 0.9); + List aggregatedFeedbackDetails = aggregateUsingLevenshtein(allFeedbackDetails, 0.5); - levenshteinMaxCount = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); + groupFeedbackMaxCount = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); // Apply manual pagination int page = data.getPage(); int pageSize = data.getPageSize(); @@ -669,7 +669,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee // 11. Return response containing processed feedback details, task names, active test case names, and error categories return new FeedbackAnalysisResponseDTO(new SearchResultPageDTO<>(processedDetails, totalPages), totalCount, taskNames, activeTestCaseNames, ERROR_CATEGORIES, - levenshteinMaxCount); + groupFeedbackMaxCount); } private Comparator getComparatorForFeedbackDetails(FeedbackPageableDTO search) { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 189bfd59c2a7..48386a79d4b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -311,19 +311,19 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo * * * - * @param exerciseId The unique identifier of the exercise for which feedback details are requested. - * @param levenshtein Should the feedback be grouped via Levenshtein distance. - * @param data A {@link FeedbackPageableDTO} object containing pagination, sorting, and filtering parameters, including: - *
      - *
    • Page number and page size
      • - *
    • Search term (optional)
      • - *
    • Sorting order (ASCENDING or DESCENDING)
      • - *
    • Sorted column
      • - *
    • Filter task names (optional)
      • - *
    • Filter test case names (optional)
      • - *
    • Occurrence range (optional)
      • - *
    • Error categories (optional)
      • - *
    + * @param exerciseId The unique identifier of the exercise for which feedback details are requested. + * @param groupFeedback Should the feedback be grouped via Levenshtein distance. + * @param data A {@link FeedbackPageableDTO} object containing pagination, sorting, and filtering parameters, including: + *
      + *
    • Page number and page size
      • + *
    • Search term (optional)
      • + *
    • Sorting order (ASCENDING or DESCENDING)
      • + *
    • Sorted column
      • + *
    • Filter task names (optional)
      • + *
    • Filter test case names (optional)
      • + *
    • Occurrence range (optional)
      • + *
    • Error categories (optional)
      • + *
    * @return A {@link ResponseEntity} containing a {@link FeedbackAnalysisResponseDTO}, which includes: *
      *
    • {@link SearchResultPageDTO < FeedbackDetailDTO >} feedbackDetails: Paginated and filtered feedback details for the exercise.
      • @@ -335,9 +335,9 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo */ @GetMapping("exercises/{exerciseId}/feedback-details") @EnforceAtLeastEditorInExercise - public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @RequestParam("levenshtein") String levenshtein, + public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @RequestParam("groupFeedback") boolean groupFeedback, @ModelAttribute FeedbackPageableDTO data) { - FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data, levenshtein); + FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data, groupFeedback); return ResponseEntity.ok(response); } diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index e7410b1bde67..553f2dee35fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1304,7 +1304,7 @@ HAVING COUNT(f.id) BETWEEN :minOccurrence AND :maxOccurrence """) Page findFilteredFeedbackByExerciseId(@Param("exerciseId") long exerciseId, @Param("searchTerm") String searchTerm, @Param("filterTestCases") List filterTestCases, @Param("filterTaskNames") List filterTaskNames, @Param("minOccurrence") long minOccurrence, - @Param("maxOccurrence") long maxOccurrence, @Param("filterErrorCategories") List filterErrorCategories, Pageable pageable); + @Param("maxOccurrence") long maxOccurrence, @Param("filterErrorCategories") List filterErrorCategories, @Param("pageable") Pageable pageable); /** * Counts the distinct number of latest results for a given exercise, excluding those in practice mode. diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index e5fb2f920c72..8be98d2b3782 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -20,7 +20,7 @@

      - +
      - @if (levenshtein()) { + @if (groupFeedback()) {

      diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts index d15fdb840fd9..12f65c9710f2 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.ts @@ -16,7 +16,7 @@ import { AlertService } from 'app/core/util/alert.service'; export class FeedbackDetailChannelModalComponent { protected readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedbackDetailChannel'; feedbackDetail = input.required(); - levenshtein = input.required(); + groupFeedback = input.required(); formSubmitted = output<{ channelDto: ChannelDTO; navigate: boolean }>(); isConfirmModalOpen = signal(false); diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 5b1aa537dfa6..6e92e03cec51 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -382,8 +382,8 @@ "repository": "Repository", "totalItems": "Insgesamt {{count}} Element(e)", "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten.", - "levenshteinInfoTitle": "Feedback Gruppierung aktiviert", - "levenshteinInfoDescription": "Die Anzahl der von dem gruppierten Feedback betroffenen Studierenden könnte höher sein, da nur die betroffenen Studierenden für bis zu fünf Feedbackdetails überprüft werden. Mehr Feedbackdetails einzubeziehen ist für die Analyse eines gemeinsamen gruppierten Feedbacks nicht notwendig und könnte zu Leistungseinbußen führen." + "groupFeedbackInfoTitle": "Feedback Gruppierung aktiviert", + "groupFeedbackInfoDescription": "Die Anzahl der von dem gruppierten Feedback betroffenen Studierenden könnte höher sein, da nur die betroffenen Studierenden für bis zu fünf Feedbackdetails überprüft werden. Mehr Feedbackdetails einzubeziehen ist für die Analyse eines gemeinsamen gruppierten Feedbacks nicht notwendig und könnte zu Leistungseinbußen führen." }, "feedbackDetailChannel": { "title": "Erstelle einen Feedback-Diskussionskanal", @@ -407,8 +407,8 @@ "regexValidationErrorName": "Namen können nur Kleinbuchstaben, Zahlen und Striche enthalten. Nur Artemis kann Kanäle erstellen, die mit $ beginnen.", "requiredValidationErrorDescription": "Die Kanalbeschreibung ist ein Pflichtfeld.", "maxLengthValidationErrorDescription": "Kanalbeschreibung kann max {{ max }} Zeichen lang sein!", - "levenshteinInfoTitle": "Feedback Gruppierung aktiviert", - "levenshteinInfoDescription": "Die Anzahl der zum Kanal hinzugefügten Studierenden stellt eine Obergrenze dar. Die tatsächliche Anzahl könnte geringer sein, da mehrere Studierende für einen einzelnen Testfall ähnliches Feedback erhalten könnten.", + "groupFeedbackInfoTitle": "Feedback Gruppierung aktiviert", + "groupFeedbackInfoDescription": "Die Anzahl der zum Kanal hinzugefügten Studierenden stellt eine Obergrenze dar. Die tatsächliche Anzahl könnte geringer sein, da mehrere Studierende für einen einzelnen Testfall ähnliches Feedback erhalten könnten.", "confirmationModal": { "header": "Kanal Erstellen bestätigen", "confirmationMessage": "Bist du sicher, dass du diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index b72e2fd95005..7de2d4ad465c 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -382,8 +382,8 @@ "repository": "Repository", "totalItems": "In total {{count}} item(s)", "error": "There was an error while loading the affected Students for this feedback.", - "levenshteinInfoTitle": "Group feedback feature enabled", - "levenshteinInfoDescription": "The amount of students affected by the grouped feedback might be higher because only affected students for up to 5 feedbackdetails is sent as more is not really necessary to analyse a common grouped feedback and would lead to performance overhead." + "groupFeedbackInfoTitle": "Group feedback feature enabled", + "groupFeedbackInfoDescription": "The amount of students affected by the grouped feedback might be higher because only affected students for up to 5 feedbackdetails is sent as more is not really necessary to analyse a common grouped feedback and would lead to performance overhead." }, "feedbackDetailChannel": { "title": "Create Feedback Discussion Channel", @@ -407,8 +407,8 @@ "regexValidationErrorName": "Names can only contain lowercase letters, numbers, and dashes. Only Artemis can create channels that start with a $.", "requiredValidationErrorDescription": "The channel description is required.", "maxLengthValidationErrorDescription": "Channel description can be max {{ max }} characters long!", - "levenshteinInfoTitle": "Group feedback feature enabled", - "levenshteinInfoDescription": "The number of students added to the channel is an upper limit. The actual number of students added to a feedback channel might be lower, as multiple students could share similar feedback for a single test case.", + "groupFeedbackInfoTitle": "Group feedback feature enabled", + "groupFeedbackInfoDescription": "The number of students added to the channel is an upper limit. The actual number of students added to a feedback channel might be lower, as multiple students could share similar feedback for a single test case.", "confirmationModal": { "header": "Confirm Channel Creation", "confirmationMessage": "Are you sure you want to create this channel? This will create a channel with {{count}} student(s).", From 9ae990fc7c1f01245a6d471a3e98250a5769f453 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 10 Dec 2024 14:59:34 +0100 Subject: [PATCH 55/64] renamed variables --- .../tum/cit/aet/artemis/assessment/service/ResultService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 51f159681231..b310190689c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -646,7 +646,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List allFeedbackDetails = feedbackDetailPage.getContent(); // Apply grouping and aggregation with a similarity threshold of 90% - List aggregatedFeedbackDetails = aggregateUsingLevenshtein(allFeedbackDetails, 0.5); + List aggregatedFeedbackDetails = aggregateUsingLevenshtein(allFeedbackDetails, 0.9); groupFeedbackMaxCount = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); // Apply manual pagination From 7b1ae823007f1afac9576df6852187ad41a7d808 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 10 Dec 2024 15:04:21 +0100 Subject: [PATCH 56/64] renamed variables --- .../cit/aet/artemis/assessment/service/ResultService.java | 4 ++-- .../tum/cit/aet/artemis/assessment/web/ResultResource.java | 2 +- .../Modal/feedback-affected-students-modal.component.html | 6 +++--- .../Modal/feedback-affected-students-modal.component.ts | 2 +- .../Modal/feedback-detail-channel-modal.component.html | 4 ++-- .../feedback-affected-students-modal.component.spec.ts | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index b310190689c4..5ce9e2f1a605 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -646,7 +646,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List allFeedbackDetails = feedbackDetailPage.getContent(); // Apply grouping and aggregation with a similarity threshold of 90% - List aggregatedFeedbackDetails = aggregateUsingLevenshtein(allFeedbackDetails, 0.9); + List aggregatedFeedbackDetails = aggregateUsingGroupFeedback(allFeedbackDetails, 0.9); groupFeedbackMaxCount = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); // Apply manual pagination @@ -683,7 +683,7 @@ private Comparator getComparatorForFeedbackDetails(FeedbackPa return search.getSortingOrder() == SortingOrder.ASCENDING ? comparator : comparator.reversed(); } - private List aggregateUsingLevenshtein(List feedbackDetails, double similarityThreshold) { + private List aggregateUsingGroupFeedback(List feedbackDetails, double similarityThreshold) { List processedDetails = new ArrayList<>(); for (FeedbackDetailDTO base : feedbackDetails) { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 48386a79d4b6..e2d7730689d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -312,7 +312,7 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo *

    * * @param exerciseId The unique identifier of the exercise for which feedback details are requested. - * @param groupFeedback Should the feedback be grouped via Levenshtein distance. + * @param groupFeedback Should the feedback be grouped * @param data A {@link FeedbackPageableDTO} object containing pagination, sorting, and filtering parameters, including: *
      *
    • Page number and page size
      • diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html index 4b85d5bbe236..7fb84282817d 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -8,11 +8,11 @@

      - @if (levenshtein()) { + @if (groupFeedback()) {

      - - + +

      } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index 69cf0ee19729..2a29daf9ee0c 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -17,7 +17,7 @@ import { faSpinner } from '@fortawesome/free-solid-svg-icons'; export class AffectedStudentsModalComponent { exerciseId = input.required(); feedbackDetail = input.required(); - levenshtein = input.required(); + groupFeedback = input.required(); readonly participation = signal>({ content: [], totalPages: 0, totalElements: 0 }); readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.affectedStudentsModal'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html index 3011bae40427..52b4307a3d50 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-detail-channel-modal.component.html @@ -61,8 +61,8 @@

      @if (groupFeedback()) {

      - - + +

      } diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index 6a80e71e9a2e..3af595609222 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -26,7 +26,7 @@ describe('AffectedStudentsModalComponent', () => { { courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryURI: 'repo2' }, ]; - const levenshtein = false; + const groupFeedback = false; beforeEach(async () => { await TestBed.configureTestingModule({ @@ -49,7 +49,7 @@ describe('AffectedStudentsModalComponent', () => { fixture.componentRef.setInput('exerciseId', 1); fixture.componentRef.setInput('feedbackDetail', feedbackDetailMock); - fixture.componentRef.setInput('levenshtein', levenshtein); + fixture.componentRef.setInput('groupFeedback', groupFeedback); fixture.detectChanges(); }); From ccf1d27b803fb3660aa9a134a7469776236fcef3 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Tue, 10 Dec 2024 22:59:39 +0100 Subject: [PATCH 57/64] renamed variables --- .../assessment/dto/FeedbackAnalysisResponseDTO.java | 2 +- .../cit/aet/artemis/assessment/service/ResultService.java | 8 ++++---- .../feedback-analysis/feedback-analysis.component.ts | 2 +- .../feedback-analysis/feedback-analysis.service.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java index 59e9667c68fb..c93578cd10c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java @@ -9,5 +9,5 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FeedbackAnalysisResponseDTO(SearchResultPageDTO feedbackDetails, long totalItems, Set taskNames, List testCaseNames, - List errorCategories, long groupFeedbackMaxCount) { + List errorCategories, long highestOccurrenceOfGroupedFeedback) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 5ce9e2f1a605..b190ae8e6f84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -625,7 +625,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List processedDetails; int totalPages = 0; long totalCount = 0; - long groupFeedbackMaxCount = 0; + long highestOccurrenceOfGroupedFeedback = 0; if (!groupFeedback) { feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeUnassignedTasks, minOccurrence, @@ -646,9 +646,9 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List allFeedbackDetails = feedbackDetailPage.getContent(); // Apply grouping and aggregation with a similarity threshold of 90% - List aggregatedFeedbackDetails = aggregateUsingGroupFeedback(allFeedbackDetails, 0.9); + List aggregatedFeedbackDetails = aggregateUsingGroupFeedback(allFeedbackDetails, 0.5); - groupFeedbackMaxCount = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); + highestOccurrenceOfGroupedFeedback = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); // Apply manual pagination int page = data.getPage(); int pageSize = data.getPageSize(); @@ -669,7 +669,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee // 11. Return response containing processed feedback details, task names, active test case names, and error categories return new FeedbackAnalysisResponseDTO(new SearchResultPageDTO<>(processedDetails, totalPages), totalCount, taskNames, activeTestCaseNames, ERROR_CATEGORIES, - groupFeedbackMaxCount); + highestOccurrenceOfGroupedFeedback); } private Comparator getComparatorForFeedbackDetails(FeedbackPageableDTO search) { diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 173df8a0f936..247ec9f834c6 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -115,7 +115,7 @@ export class FeedbackAnalysisComponent { this.taskNames.set(response.taskNames); this.testCaseNames.set(response.testCaseNames); this.errorCategories.set(response.errorCategories); - this.maxCount.set(response.groupFeedbackMaxCount); + this.maxCount.set(response.highestOccurrenceOfGroupedFeedback); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); } finally { diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index cffa2814bdc5..8a267cd13c5a 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -11,7 +11,7 @@ export interface FeedbackAnalysisResponse { taskNames: string[]; testCaseNames: string[]; errorCategories: string[]; - groupFeedbackMaxCount: number; + highestOccurrenceOfGroupedFeedback: number; } export interface FeedbackDetail { count: number; From 7a9173e1b0f13f5ab16ee3b57eae7427e9d43c43 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Wed, 11 Dec 2024 11:51:46 +0100 Subject: [PATCH 58/64] reworked affected students --- .../assessment/dto/FeedbackDetailDTO.java | 7 ++-- .../assessment/service/ResultService.java | 32 ++++++++++++------- .../assessment/web/ResultResource.java | 20 ++++++------ .../StudentParticipationRepository.java | 7 ++-- ...ack-affected-students-modal.component.html | 8 ----- ...dback-affected-students-modal.component.ts | 2 +- ...edback-detail-channel-modal.component.html | 9 +----- .../feedback-analysis.service.ts | 9 +++--- .../webapp/i18n/de/programmingExercise.json | 8 ++--- .../webapp/i18n/en/programmingExercise.json | 8 ++--- 10 files changed, 49 insertions(+), 61 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index d4f9aa5250e4..9daf75ca4aa6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -1,13 +1,14 @@ package de.tum.cit.aet.artemis.assessment.dto; +import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackDetailDTO(long count, double relativeCount, List detailTexts, String testCaseName, String taskName, String errorCategory) { +public record FeedbackDetailDTO(List feedbackIds, long count, double relativeCount, List detailTexts, String testCaseName, String taskName, String errorCategory) { - public FeedbackDetailDTO(long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { - this(count, relativeCount, List.of(detailText), testCaseName, taskName, errorCategory); + public FeedbackDetailDTO(String feedbackId, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { + this(Arrays.stream(feedbackId.split(",")).map(Long::valueOf).toList(), count, relativeCount, List.of(detailText), testCaseName, taskName, errorCategory); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index b190ae8e6f84..0be78bcd2790 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -632,8 +632,10 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee maxOccurrence, filterErrorCategories, pageable); // Process and map feedback details, calculating relative count and assigning task names - processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.count(), (detail.count() * 100.00) / distinctResultCount, - detail.detailTexts(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); + processedDetails = feedbackDetailPage.getContent().stream() + .map(detail -> new FeedbackDetailDTO(detail.feedbackIds().subList(0, Math.min(detail.feedbackIds().size(), 5)), detail.count(), + (detail.count() * 100.00) / distinctResultCount, detail.detailTexts(), detail.testCaseName(), detail.taskName(), detail.errorCategory())) + .toList(); totalPages = feedbackDetailPage.getTotalPages(); totalCount = feedbackDetailPage.getTotalElements(); } @@ -646,7 +648,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List allFeedbackDetails = feedbackDetailPage.getContent(); // Apply grouping and aggregation with a similarity threshold of 90% - List aggregatedFeedbackDetails = aggregateUsingGroupFeedback(allFeedbackDetails, 0.5); + List aggregatedFeedbackDetails = aggregateFeedback(allFeedbackDetails, 0.5); highestOccurrenceOfGroupedFeedback = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); // Apply manual pagination @@ -658,8 +660,9 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee int start = Math.max(0, (page - 1) * pageSize); int end = Math.min(start + pageSize, processedDetailsPreSort.size()); processedDetails = processedDetailsPreSort.subList(start, end); - processedDetails = processedDetails.stream().map(detail -> new FeedbackDetailDTO(detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailTexts(), - detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); + processedDetails = processedDetails.stream().map(detail -> new FeedbackDetailDTO(detail.feedbackIds().subList(0, Math.min(detail.feedbackIds().size(), 5)), + detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailTexts(), detail.testCaseName(), detail.taskName(), detail.errorCategory())) + .toList(); totalPages = (int) Math.ceil((double) processedDetailsPreSort.size() / pageSize); totalCount = aggregatedFeedbackDetails.size(); } @@ -683,7 +686,7 @@ private Comparator getComparatorForFeedbackDetails(FeedbackPa return search.getSortingOrder() == SortingOrder.ASCENDING ? comparator : comparator.reversed(); } - private List aggregateUsingGroupFeedback(List feedbackDetails, double similarityThreshold) { + private List aggregateFeedback(List feedbackDetails, double similarityThreshold) { List processedDetails = new ArrayList<>(); for (FeedbackDetailDTO base : feedbackDetails) { @@ -696,6 +699,11 @@ private List aggregateUsingGroupFeedback(List similarityThreshold) { // Merge the current base feedback into the processed feedback + List mergedFeedbackIds = new ArrayList<>(processed.feedbackIds()); + if (processed.feedbackIds().size() < 5) { + mergedFeedbackIds.addAll(base.feedbackIds()); + } + List mergedTexts = new ArrayList<>(processed.detailTexts()); mergedTexts.add(base.detailTexts().getFirst()); @@ -703,7 +711,7 @@ private List aggregateUsingGroupFeedback(List aggregateUsingGroupFeedback(List * * @param exerciseId for which the affected student participation data is requested. - * @param detailTexts used to filter the participation to only those affected by specific feedback entries. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. * @param testCaseName used to filter the participation to only those feedbacks for a specific testCaseName. * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ - public Page getAffectedStudentsWithFeedbackText(long exerciseId, List detailTexts, String testCaseName, PageableSearchDTO data) { + public Page getAffectedStudentsWithFeedbackIds(long exerciseId, List feedbackIds, String testCaseName, PageableSearchDTO data) { PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); - return studentParticipationRepository.findAffectedStudentsByFeedbackText(exerciseId, detailTexts, testCaseName, pageRequest); + return studentParticipationRepository.findAffectedStudentsByFeedbackIds(exerciseId, feedbackIds, testCaseName, pageRequest); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index e2d7730689d2..c2289072d1c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -363,11 +363,11 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { *
      * * @param exerciseId for which the participation data is requested. - * @param detailText1 Optional first detail text to filter affected students by specific feedback entries. - * @param detailText2 Optional second detail text to filter affected students by specific feedback entries. - * @param detailText3 Optional third detail text to filter affected students by specific feedback entries. - * @param detailText4 Optional fourth detail text to filter affected students by specific feedback entries. - * @param detailText5 Optional fifth detail text to filter affected students by specific feedback entries. + * @param feedbackId1 Optional first detail text id to filter affected students by specific feedback entries. + * @param feedbackId2 Optional second detail text id to filter affected students by specific feedback entries. + * @param feedbackId3 Optional third detail text id to filter affected students by specific feedback entries. + * @param feedbackId4 Optional fourth detail text id to filter affected students by specific feedback entries. + * @param feedbackId5 Optional fifth detail text id to filter affected students by specific feedback entries. * @param testCaseName The test case name to filter affected students by specific test cases. * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. @@ -375,14 +375,14 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { @GetMapping("exercises/{exerciseId}/feedback-details-participation") @EnforceAtLeastEditorInExercise public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, - @RequestParam(value = "detailText1", required = false) String detailText1, @RequestParam(value = "detailText2", required = false) String detailText2, - @RequestParam(value = "detailText3", required = false) String detailText3, @RequestParam(value = "detailText4", required = false) String detailText4, - @RequestParam(value = "detailText5", required = false) String detailText5, @RequestParam("testCaseName") String testCaseName, + @RequestParam(value = "feedbackId1", required = false) Long feedbackId1, @RequestParam(value = "feedbackId2", required = false) Long feedbackId2, + @RequestParam(value = "feedbackId3", required = false) Long feedbackId3, @RequestParam(value = "feedbackId4", required = false) Long feedbackId4, + @RequestParam(value = "feedbackId5", required = false) Long feedbackId5, @RequestParam("testCaseName") String testCaseName, @ModelAttribute PageableSearchDTO data) { - List detailTexts = Stream.of(detailText1, detailText2, detailText3, detailText4, detailText5).filter(Objects::nonNull).toList(); + List feedbackIds = Stream.of(feedbackId1, feedbackId2, feedbackId3, feedbackId4, feedbackId5).filter(Objects::nonNull).toList(); - Page participation = resultService.getAffectedStudentsWithFeedbackText(exerciseId, detailTexts, testCaseName, data); + Page participation = resultService.getAffectedStudentsWithFeedbackIds(exerciseId, feedbackIds, testCaseName, data); return ResponseEntity.ok(participation); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 553f2dee35fb..c9f99ec5463b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1260,6 +1260,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) */ @Query(""" SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( + LISTAGG(CAST(f.id AS string), ',') WITHIN GROUP (ORDER BY f.id), COUNT(f.id), 0, f.detailText, @@ -1363,7 +1364,7 @@ SELECT MAX(pr.id) *
      * * @param exerciseId for which the affected student participation data is requested. - * @param detailTexts used to filter the participation to only those affected by specific feedback entries. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. * @param testCaseName The name of the test case for which the feedback is given. * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. @@ -1385,12 +1386,12 @@ SELECT MAX(pr.id) ) INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId - AND f.detailText IN :detailTexts + AND f.id IN :feedbackIds AND f.testCase.testName = :testCaseName AND p.testRun = FALSE ORDER BY p.student.firstName ASC """) - Page findAffectedStudentsByFeedbackText(@Param("exerciseId") long exerciseId, @Param("detailTexts") List detailTexts, + Page findAffectedStudentsByFeedbackIds(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, @Param("testCaseName") String testCaseName, Pageable pageable); /** diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html index 7fb84282817d..bdfcd9405bf6 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -8,14 +8,6 @@

      - @if (groupFeedback()) { -
      -

      - - -

      -
      - } @if (isLoading()) {
      - @if (groupFeedback()) { -
      -

      - - -

      -
      - } +

      diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 8a267cd13c5a..b275b758700a 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -14,6 +14,7 @@ export interface FeedbackAnalysisResponse { highestOccurrenceOfGroupedFeedback: number; } export interface FeedbackDetail { + feedbackIds: number[]; count: number; relativeCount: number; detailTexts: string[]; @@ -58,7 +59,7 @@ export class FeedbackAnalysisService extends BaseApiHttpService { async getParticipationForFeedbackDetailText( exerciseId: number, - detailText: string[], + feedbackIds: number[], testCaseName: string, pageable: PageableSearch, ): Promise> { @@ -69,10 +70,10 @@ export class FeedbackAnalysisService extends BaseApiHttpService { .set('sortingOrder', pageable.sortingOrder) .set('testCaseName', testCaseName); - const topDetailTexts = detailText.slice(0, 5); + const topFeedbackIds = feedbackIds.slice(0, 5); - topDetailTexts.forEach((text, index) => { - params = params.set(`detailText${index + 1}`, text); + topFeedbackIds.forEach((id, index) => { + params = params.set(`feedbackId${index + 1}`, id.toString()); }); return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params }); diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 6e92e03cec51..1b6927ab97bd 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -376,14 +376,12 @@ "apply": "Filter anwenden" }, "affectedStudentsModal": { - "header": "Betroffene Studierende", + "header": "Stichprobe für Betroffene Studierende", "name": "Name", "login": "Login", "repository": "Repository", "totalItems": "Insgesamt {{count}} Element(e)", - "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten.", - "groupFeedbackInfoTitle": "Feedback Gruppierung aktiviert", - "groupFeedbackInfoDescription": "Die Anzahl der von dem gruppierten Feedback betroffenen Studierenden könnte höher sein, da nur die betroffenen Studierenden für bis zu fünf Feedbackdetails überprüft werden. Mehr Feedbackdetails einzubeziehen ist für die Analyse eines gemeinsamen gruppierten Feedbacks nicht notwendig und könnte zu Leistungseinbußen führen." + "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten." }, "feedbackDetailChannel": { "title": "Erstelle einen Feedback-Diskussionskanal", @@ -407,8 +405,6 @@ "regexValidationErrorName": "Namen können nur Kleinbuchstaben, Zahlen und Striche enthalten. Nur Artemis kann Kanäle erstellen, die mit $ beginnen.", "requiredValidationErrorDescription": "Die Kanalbeschreibung ist ein Pflichtfeld.", "maxLengthValidationErrorDescription": "Kanalbeschreibung kann max {{ max }} Zeichen lang sein!", - "groupFeedbackInfoTitle": "Feedback Gruppierung aktiviert", - "groupFeedbackInfoDescription": "Die Anzahl der zum Kanal hinzugefügten Studierenden stellt eine Obergrenze dar. Die tatsächliche Anzahl könnte geringer sein, da mehrere Studierende für einen einzelnen Testfall ähnliches Feedback erhalten könnten.", "confirmationModal": { "header": "Kanal Erstellen bestätigen", "confirmationMessage": "Bist du sicher, dass du diesen Kanal erstellen möchten? Dies wird einen Kanal mit {{count}} Student(en) erstellen.", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 7de2d4ad465c..9e515e8210e8 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -376,14 +376,12 @@ "apply": "Apply Filter" }, "affectedStudentsModal": { - "header": "Affected Students", + "header": "Sample for Affected Students", "name": "Name", "login": "Login", "repository": "Repository", "totalItems": "In total {{count}} item(s)", - "error": "There was an error while loading the affected Students for this feedback.", - "groupFeedbackInfoTitle": "Group feedback feature enabled", - "groupFeedbackInfoDescription": "The amount of students affected by the grouped feedback might be higher because only affected students for up to 5 feedbackdetails is sent as more is not really necessary to analyse a common grouped feedback and would lead to performance overhead." + "error": "There was an error while loading the affected Students for this feedback." }, "feedbackDetailChannel": { "title": "Create Feedback Discussion Channel", @@ -407,8 +405,6 @@ "regexValidationErrorName": "Names can only contain lowercase letters, numbers, and dashes. Only Artemis can create channels that start with a $.", "requiredValidationErrorDescription": "The channel description is required.", "maxLengthValidationErrorDescription": "Channel description can be max {{ max }} characters long!", - "groupFeedbackInfoTitle": "Group feedback feature enabled", - "groupFeedbackInfoDescription": "The number of students added to the channel is an upper limit. The actual number of students added to a feedback channel might be lower, as multiple students could share similar feedback for a single test case.", "confirmationModal": { "header": "Confirm Channel Creation", "confirmationMessage": "Are you sure you want to create this channel? This will create a channel with {{count}} student(s).", From 962aee526b1fa313b9f90aa3e036cc57e8d4030d Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Wed, 11 Dec 2024 12:38:07 +0100 Subject: [PATCH 59/64] reworked affected students --- .../dto/FeedbackAffectedStudentDTO.java | 2 +- .../StudentParticipationRepository.java | 1 - ...ack-affected-students-modal.component.html | 20 +++---------- ...dback-affected-students-modal.component.ts | 1 + .../feedback-analysis.component.ts | 1 + .../feedback-analysis.service.ts | 1 - .../webapp/i18n/de/programmingExercise.json | 2 +- .../webapp/i18n/en/programmingExercise.json | 2 +- .../communication/PostingServiceUnitTest.java | 28 ++++------------- .../service/SavedPostServiceTest.java | 30 ++++--------------- .../feedback-analysis.component.spec.ts | 4 ++- .../feedback-analysis.service.spec.ts | 17 +++++------ ...-affected-students-modal.component.spec.ts | 6 ++-- .../modals/feedback-modal.component.spec.ts | 1 + 14 files changed, 36 insertions(+), 80 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java index 71c6b73a208f..3919ec9cd858 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java @@ -1,4 +1,4 @@ package de.tum.cit.aet.artemis.assessment.dto; -public record FeedbackAffectedStudentDTO(long courseId, long participationId, String firstName, String lastName, String login, String repositoryURI) { +public record FeedbackAffectedStudentDTO(long participationId, String firstName, String lastName, String login, String repositoryURI) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index c9f99ec5463b..609b8dadcfb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1371,7 +1371,6 @@ SELECT MAX(pr.id) */ @Query(""" SELECT DISTINCT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( - p.exercise.course.id, p.id, p.student.firstName, p.student.lastName, diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html index bdfcd9405bf6..0d903c5555dd 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -8,6 +8,9 @@

      +
      + +
      @if (isLoading()) {
    }
    {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) - {{ item.detailText[0].length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText[0] | slice: 0 : 100) + '...' : item.detailText[0] }} + {{ item.detailTexts[0].length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailTexts[0] | slice: 0 : 100) + '...' : item.detailTexts[0] }} {{ item.taskName }} {{ item.testCaseName }}
    -
    - @if (participation().totalElements >= pageSize()) { - - } -
    - -
    -
    }
    diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index a8f3578f85b9..4e27b31d931c 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -15,6 +15,7 @@ import { faSpinner } from '@fortawesome/free-solid-svg-icons'; standalone: true, }) export class AffectedStudentsModalComponent { + courseId = input.required(); exerciseId = input.required(); feedbackDetail = input.required(); groupFeedback = input.required(); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 247ec9f834c6..a787eeecf13a 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -210,6 +210,7 @@ export class FeedbackAnalysisComponent { async openAffectedStudentsModal(feedbackDetail: FeedbackDetail): Promise { const modalRef = this.modalService.open(AffectedStudentsModalComponent, { centered: true, size: 'lg' }); + modalRef.componentInstance.courseId = this.courseId; modalRef.componentInstance.exerciseId = this.exerciseId; modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); modalRef.componentInstance.groupFeedback = signal(this.groupFeedback()); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index b275b758700a..4a2411b392f7 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -23,7 +23,6 @@ export interface FeedbackDetail { errorCategory: string; } export interface FeedbackAffectedStudentDTO { - courseId: number; participationId: number; firstName: string; lastName: string; diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 1b6927ab97bd..ef796eb420e1 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -377,10 +377,10 @@ }, "affectedStudentsModal": { "header": "Stichprobe für Betroffene Studierende", + "description": "Die folgende Liste ist eine Stichprobe der betroffenen Studierenden für den ausgewählten Feedback-Eintrag, da diese ausreichend ist, um das Feedback zu analysieren. Die Liste ist auf 5 Studierende begrenzt. Insgesamt haben {{count}} Studierende dieses Feedback erhalten.", "name": "Name", "login": "Login", "repository": "Repository", - "totalItems": "Insgesamt {{count}} Element(e)", "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten." }, "feedbackDetailChannel": { diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 9e515e8210e8..db2a0d7f25db 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -377,10 +377,10 @@ }, "affectedStudentsModal": { "header": "Sample for Affected Students", + "description": "The following is a sample of affected students for the selected feedback entry, as this is sufficient to analyze the feedback. The list is limited to 5 students. In total, {{count}} students received this feedback.", "name": "Name", "login": "Login", "repository": "Repository", - "totalItems": "In total {{count}} item(s)", "error": "There was an error while loading the affected Students for this feedback." }, "feedbackDetailChannel": { diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java index ced0b420a7a7..af03891f4cac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java @@ -220,42 +220,26 @@ void testParseUserMentionsMissingClosingTag() throws InvocationTargetException, @Test void shouldSetCorrectFlagsWhenPostsAreSaved() { - when(savedPostRepository.findSavedPostIdsByUserIdAndPostType( - testUser.getId(), - PostingType.POST - )).thenReturn(List.of(savedPost.getPostId())); + when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(testUser.getId(), PostingType.POST)).thenReturn(List.of(savedPost.getPostId())); - when(savedPostRepository.findSavedPostIdsByUserIdAndPostType( - testUser.getId(), - PostingType.ANSWER - )).thenReturn(List.of(savedAnswer.getPostId(), savedAnswer2.getPostId())); + when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(testUser.getId(), PostingType.ANSWER)).thenReturn(List.of(savedAnswer.getPostId(), savedAnswer2.getPostId())); postingService.preparePostForBroadcast(testPost); assertThat(testPost.getIsSaved()).isTrue(); - testPost.getAnswers().forEach(answer -> - assertThat(answer.getIsSaved()).isTrue() - ); + testPost.getAnswers().forEach(answer -> assertThat(answer.getIsSaved()).isTrue()); } @Test void shouldSetCorrectFlagsWhenPostsAreNotSaved() { - when(savedPostRepository.findSavedPostIdsByUserIdAndPostType( - testUser.getId(), - PostingType.POST - )).thenReturn(List.of()); + when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(testUser.getId(), PostingType.POST)).thenReturn(List.of()); - when(savedPostRepository.findSavedPostIdsByUserIdAndPostType( - testUser.getId(), - PostingType.ANSWER - )).thenReturn(List.of()); + when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(testUser.getId(), PostingType.ANSWER)).thenReturn(List.of()); postingService.preparePostForBroadcast(testPost); assertThat(testPost.getIsSaved()).isFalse(); - testPost.getAnswers().forEach(answer -> - assertThat(answer.getIsSaved()).isFalse() - ); + testPost.getAnswers().forEach(answer -> assertThat(answer.getIsSaved()).isFalse()); } /** diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostServiceTest.java index 19db6d11d46b..aa8333b4de69 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostServiceTest.java @@ -57,11 +57,7 @@ void setUp() { @Test void shouldSavePostSuccessfullyWhenPostIsNotSavedYet() { - when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType( - testUser.getId(), - testPost.getId(), - PostingType.POST - )).thenReturn(null); + when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(testUser.getId(), testPost.getId(), PostingType.POST)).thenReturn(null); savedPostService.savePostForCurrentUser(testPost); @@ -70,11 +66,7 @@ void shouldSavePostSuccessfullyWhenPostIsNotSavedYet() { @Test void shouldNotSavePostWhenPostIsSavedAlready() { - when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType( - testUser.getId(), - testPost.getId(), - PostingType.POST - )).thenReturn(testSavedPost); + when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(testUser.getId(), testPost.getId(), PostingType.POST)).thenReturn(testSavedPost); savedPostService.savePostForCurrentUser(testPost); @@ -83,11 +75,7 @@ void shouldNotSavePostWhenPostIsSavedAlready() { @Test void shouldRemoveSavedPostWhenPostIsBookmarked() { - when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType( - testUser.getId(), - testPost.getId(), - PostingType.POST - )).thenReturn(testSavedPost); + when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(testUser.getId(), testPost.getId(), PostingType.POST)).thenReturn(testSavedPost); savedPostService.removeSavedPostForCurrentUser(testPost); @@ -96,11 +84,7 @@ void shouldRemoveSavedPostWhenPostIsBookmarked() { @Test void shouldNotRemoveSavedPostWhenPostIsNotBookmarked() { - when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType( - testUser.getId(), - testPost.getId(), - PostingType.POST - )).thenReturn(null); + when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(testUser.getId(), testPost.getId(), PostingType.POST)).thenReturn(null); savedPostService.removeSavedPostForCurrentUser(testPost); @@ -109,11 +93,7 @@ void shouldNotRemoveSavedPostWhenPostIsNotBookmarked() { @Test void shouldUpdateStatusAndCompletedAtOfSavedPostWhenPostIsInProgress() { - when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType( - testUser.getId(), - testPost.getId(), - PostingType.POST - )).thenReturn(testSavedPost); + when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(testUser.getId(), testPost.getId(), PostingType.POST)).thenReturn(testSavedPost); savedPostService.updateStatusOfSavedPostForCurrentUser(testPost, SavedPostStatus.COMPLETED); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index 57f1be6dfd2e..c5d4cbbfa192 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -27,6 +27,7 @@ describe('FeedbackAnalysisComponent', () => { const feedbackMock: FeedbackDetail[] = [ { + feedbackIds: [1], detailTexts: ['Test feedback 1 detail'], testCaseName: 'test1', count: 10, @@ -35,6 +36,7 @@ describe('FeedbackAnalysisComponent', () => { errorCategory: 'Student Error', }, { + feedbackIds: [2], detailTexts: ['Test feedback 2 detail'], testCaseName: 'test2', count: 5, @@ -50,7 +52,7 @@ describe('FeedbackAnalysisComponent', () => { taskNames: ['task1', 'task2'], testCaseNames: ['test1', 'test2'], errorCategories: ['Student Error', 'AST Error', 'Ares Error'], - groupFeedbackMaxCount: 0, + highestOccurrenceOfGroupedFeedback: 0, }; beforeEach(async () => { diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index b64a0c70ed25..94b9167aa598 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -10,6 +10,7 @@ describe('FeedbackAnalysisService', () => { const feedbackDetailsMock: FeedbackDetail[] = [ { + feedbackIds: [1], detailTexts: ['Feedback 1'], testCaseName: 'test1', count: 5, @@ -18,6 +19,7 @@ describe('FeedbackAnalysisService', () => { errorCategory: 'StudentError', }, { + feedbackIds: [2], detailTexts: ['Feedback 2'], testCaseName: 'test2', count: 3, @@ -86,7 +88,7 @@ describe('FeedbackAnalysisService', () => { describe('getParticipationForFeedbackDetailText', () => { it('should retrieve paginated participation details for up to 5 feedback details', async () => { - const feedbackDetails = ['Feedback 1', 'Feedback 2', 'Feedback 3', 'Feedback 4', 'Feedback 5', 'Feedback 6']; + const feedbackDetailsId = [1, 2, 3, 4, 5]; const pageable = { page: 1, pageSize: 10, @@ -96,7 +98,6 @@ describe('FeedbackAnalysisService', () => { const participationResponseMock = { content: [ { - courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', @@ -104,7 +105,6 @@ describe('FeedbackAnalysisService', () => { repositoryName: 'repo1', }, { - courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', @@ -116,10 +116,10 @@ describe('FeedbackAnalysisService', () => { totalItems: 2, }; - const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetails, 'test1', pageable); + const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetailsId, 'test1', pageable); const req = httpMock.expectOne( - 'api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&testCaseName=test1&detailText1=Feedback%201&detailText2=Feedback%202&detailText3=Feedback%203&detailText4=Feedback%204&detailText5=Feedback%205', + 'api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&testCaseName=test1&feedbackId1=1&feedbackId2=2&feedbackId3=3&feedbackId4=4&feedbackId5=5', ); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); @@ -131,7 +131,7 @@ describe('FeedbackAnalysisService', () => { }); it('should handle less than 5 feedback details gracefully', async () => { - const feedbackDetails = ['Feedback 1', 'Feedback 2']; + const feedbackDetailsId = [1, 2]; const pageable = { page: 1, pageSize: 10, @@ -141,7 +141,6 @@ describe('FeedbackAnalysisService', () => { const participationResponseMock = { content: [ { - courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', @@ -153,10 +152,10 @@ describe('FeedbackAnalysisService', () => { totalItems: 1, }; - const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetails, 'test1', pageable); + const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetailsId, 'test1', pageable); const req = httpMock.expectOne( - 'api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&testCaseName=test1&detailText1=Feedback%201&detailText2=Feedback%202', + 'api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&testCaseName=test1&feedbackId1=1&feedbackId2=2', ); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index 3af595609222..d90170588da9 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -13,6 +13,7 @@ describe('AffectedStudentsModalComponent', () => { let feedbackService: FeedbackAnalysisService; const feedbackDetailMock: FeedbackDetail = { + feedbackIds: [1, 2, 3, 4, 5], count: 5, relativeCount: 25.0, detailTexts: ['Some feedback detail'], @@ -22,8 +23,8 @@ describe('AffectedStudentsModalComponent', () => { }; const participationMock: FeedbackAffectedStudentDTO[] = [ - { courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryURI: 'repo1' }, - { courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryURI: 'repo2' }, + { participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryURI: 'repo1' }, + { participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryURI: 'repo2' }, ]; const groupFeedback = false; @@ -47,6 +48,7 @@ describe('AffectedStudentsModalComponent', () => { component = fixture.componentInstance; feedbackService = TestBed.inject(FeedbackAnalysisService); + fixture.componentRef.setInput('courseId', 1); fixture.componentRef.setInput('exerciseId', 1); fixture.componentRef.setInput('feedbackDetail', feedbackDetailMock); fixture.componentRef.setInput('groupFeedback', groupFeedback); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts index bf2ff4f48106..228a1d6b8f0f 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts @@ -10,6 +10,7 @@ describe('FeedbackModalComponent', () => { let activeModal: NgbActiveModal; const mockFeedbackDetail: FeedbackDetail = { + feedbackIds: [1, 2, 3, 4, 5], count: 5, relativeCount: 25.0, detailTexts: ['Some feedback detail'], From c363d1b350989afacc70ef6bf95db926c07b9ce0 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Wed, 11 Dec 2024 12:43:56 +0100 Subject: [PATCH 60/64] revert --- .../service/feedback/programming-feedback-item.service.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts index b852e6da8880..89c6a7755334 100644 --- a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts +++ b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts @@ -84,7 +84,7 @@ describe('ProgrammingFeedbackItemService', () => { it('should create grading instruction feedback item', () => { const gradingInstruction = { feedback: 'gradingInstruction.feedback', - detailText: 'gradingInstruction.detailTexts', + detailText: 'gradingInstruction.detailText', } as Partial; const feedback = { From 24e2c3a025df602c190ded216fac95b7b9589ac4 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Wed, 11 Dec 2024 13:41:42 +0100 Subject: [PATCH 61/64] removed unnecessary overhead --- .../assessment/service/ResultService.java | 19 ++-- .../assessment/web/ResultResource.java | 25 ++--- .../cit/aet/artemis/core/util/PageUtil.java | 3 - .../StudentParticipationRepository.java | 25 +++-- ...ack-affected-students-modal.component.html | 4 +- ...dback-affected-students-modal.component.ts | 22 +---- .../feedback-analysis.service.ts | 19 +--- .../ResultServiceIntegrationTest.java | 33 ++----- .../feedback-analysis.service.spec.ts | 96 +++++++------------ ...-affected-students-modal.component.spec.ts | 17 +--- 10 files changed, 89 insertions(+), 174 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 0be78bcd2790..cd90b1adbd93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -50,7 +49,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -747,20 +745,15 @@ public long getMaxCountForExercise(long exerciseId) { /** * Retrieves a paginated list of students affected by specific feedback entries for a given exercise. *
    - * This method filters students based on feedback IDs and returns participation details for each affected student. It uses - * pagination and sorting (order based on the {@link PageUtil.ColumnMapping#AFFECTED_STUDENTS}) to allow efficient retrieval and sorting of the results, thus supporting large - * datasets. + * This method filters students based on feedback IDs and returns participation details for each affected student. *
    * - * @param exerciseId for which the affected student participation data is requested. - * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. - * @param testCaseName used to filter the participation to only those feedbacks for a specific testCaseName. - * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. + * @param exerciseId for which the affected student participation data is requested. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. + * @return A {@link List} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ - public Page getAffectedStudentsWithFeedbackIds(long exerciseId, List feedbackIds, String testCaseName, PageableSearchDTO data) { - PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); - return studentParticipationRepository.findAffectedStudentsByFeedbackIds(exerciseId, feedbackIds, testCaseName, pageRequest); + public List getAffectedStudentsWithFeedbackIds(long exerciseId, List feedbackIds) { + return studentParticipationRepository.findAffectedStudentsByFeedbackIds(exerciseId, feedbackIds); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index c2289072d1c1..a78718f35a39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; -import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -40,7 +39,6 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -362,27 +360,24 @@ public ResponseEntity getMaxCount(@PathVariable long exerciseId) { * and participation details. *
    * - * @param exerciseId for which the participation data is requested. - * @param feedbackId1 Optional first detail text id to filter affected students by specific feedback entries. - * @param feedbackId2 Optional second detail text id to filter affected students by specific feedback entries. - * @param feedbackId3 Optional third detail text id to filter affected students by specific feedback entries. - * @param feedbackId4 Optional fourth detail text id to filter affected students by specific feedback entries. - * @param feedbackId5 Optional fifth detail text id to filter affected students by specific feedback entries. - * @param testCaseName The test case name to filter affected students by specific test cases. - * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. - * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. + * @param exerciseId for which the participation data is requested. + * @param feedbackId1 Optional first detail text id to filter affected students by specific feedback entries. + * @param feedbackId2 Optional second detail text id to filter affected students by specific feedback entries. + * @param feedbackId3 Optional third detail text id to filter affected students by specific feedback entries. + * @param feedbackId4 Optional fourth detail text id to filter affected students by specific feedback entries. + * @param feedbackId5 Optional fifth detail text id to filter affected students by specific feedback entries. + * @return A {@link ResponseEntity} containing a {@link List} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. */ @GetMapping("exercises/{exerciseId}/feedback-details-participation") @EnforceAtLeastEditorInExercise - public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, + public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestParam(value = "feedbackId1", required = false) Long feedbackId1, @RequestParam(value = "feedbackId2", required = false) Long feedbackId2, @RequestParam(value = "feedbackId3", required = false) Long feedbackId3, @RequestParam(value = "feedbackId4", required = false) Long feedbackId4, - @RequestParam(value = "feedbackId5", required = false) Long feedbackId5, @RequestParam("testCaseName") String testCaseName, - @ModelAttribute PageableSearchDTO data) { + @RequestParam(value = "feedbackId5", required = false) Long feedbackId5) { List feedbackIds = Stream.of(feedbackId1, feedbackId2, feedbackId3, feedbackId4, feedbackId5).filter(Objects::nonNull).toList(); - Page participation = resultService.getAffectedStudentsWithFeedbackIds(exerciseId, feedbackIds, testCaseName, data); + List participation = resultService.getAffectedStudentsWithFeedbackIds(exerciseId, feedbackIds); return ResponseEntity.ok(participation); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java index 5264ca50a46f..124430b9386d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java @@ -82,9 +82,6 @@ SELECT MAX(t.taskName) JOIN t.testCases tct WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName ), '')""" - )), - AFFECTED_STUDENTS(Map.of( - "participationId", "p.id" )); // @formatter:on diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 609b8dadcfb1..26deb8669fdc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1363,10 +1363,8 @@ SELECT MAX(pr.id) * Retrieves a paginated list of students affected by specific feedback entries for a given programming exercise. *
    * - * @param exerciseId for which the affected student participation data is requested. - * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. - * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. - * @param testCaseName The name of the test case for which the feedback is given. + * @param exerciseId for which the affected student participation data is requested. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. */ @Query(""" @@ -1386,12 +1384,25 @@ SELECT MAX(pr.id) INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND f.id IN :feedbackIds - AND f.testCase.testName = :testCaseName AND p.testRun = FALSE ORDER BY p.student.firstName ASC """) - Page findAffectedStudentsByFeedbackIds(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, - @Param("testCaseName") String testCaseName, Pageable pageable); + List findAffectedStudentsByFeedbackIds(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds); + + @Query(""" + SELECT f.id + FROM ProgrammingExerciseStudentParticipation p + INNER JOIN p.results r ON r.id = ( + SELECT MAX(pr.id) + FROM p.results pr + WHERE pr.participation.id = p.id + ) + INNER JOIN r.feedbacks f + WHERE p.exercise.id = :exerciseId + AND p.testRun = FALSE + ORDER BY p.student.firstName ASC + """) + List findAffectedStudentsByFeedbackIds2(@Param("exerciseId") long exerciseId); /** * Retrieves the logins of students affected by a specific feedback detail text in a given exercise. diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html index 0d903c5555dd..b17fe5a2dd46 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html @@ -9,7 +9,7 @@

    - +
    @if (isLoading()) {
    @@ -27,7 +27,7 @@

    - @for (item of participation().content; track item) { + @for (item of participation(); track item) { {{ item.firstName }} {{ item.lastName }} {{ item.login }} diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts index 4e27b31d931c..ed5b2d2fb36a 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -1,10 +1,9 @@ -import { Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; +import { Component, effect, inject, input, signal, untracked } from '@angular/core'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { PageableResult, PageableSearch, SortingOrder } from 'app/shared/table/pageable-table'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; @Component({ @@ -19,12 +18,9 @@ export class AffectedStudentsModalComponent { exerciseId = input.required(); feedbackDetail = input.required(); groupFeedback = input.required(); - readonly participation = signal>({ content: [], totalPages: 0, totalElements: 0 }); + readonly participation = signal([]); readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.affectedStudentsModal'; - page = signal(1); - pageSize = signal(10); - readonly collectionsSize = computed(() => this.participation().totalPages * this.pageSize()); readonly faSpinner = faSpinner; readonly isLoading = signal(false); @@ -42,16 +38,9 @@ export class AffectedStudentsModalComponent { private async loadAffected() { const feedbackDetail = this.feedbackDetail(); - const pageable: PageableSearch = { - page: this.page(), - pageSize: this.pageSize(), - sortedColumn: 'participationId', - sortingOrder: SortingOrder.ASCENDING, - }; - this.isLoading.set(true); try { - const response = await this.feedbackService.getParticipationForFeedbackDetailText(this.exerciseId(), feedbackDetail.feedbackIds, feedbackDetail.testCaseName, pageable); + const response = await this.feedbackService.getParticipationForFeedbackDetailText(this.exerciseId(), feedbackDetail.feedbackIds); this.participation.set(response); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); @@ -59,9 +48,4 @@ export class AffectedStudentsModalComponent { this.isLoading.set(false); } } - - setPage(newPage: number): void { - this.page.set(newPage); - this.loadAffected(); - } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index 4a2411b392f7..db2589719120 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { PageableResult, PageableSearch, SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; +import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; import { HttpParams } from '@angular/common/http'; import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; @@ -56,26 +56,15 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get(`exercises/${exerciseId}/feedback-details-max-count`); } - async getParticipationForFeedbackDetailText( - exerciseId: number, - feedbackIds: number[], - testCaseName: string, - pageable: PageableSearch, - ): Promise> { - let params = new HttpParams() - .set('page', pageable.page.toString()) - .set('pageSize', pageable.pageSize.toString()) - .set('sortedColumn', pageable.sortedColumn) - .set('sortingOrder', pageable.sortingOrder) - .set('testCaseName', testCaseName); - + async getParticipationForFeedbackDetailText(exerciseId: number, feedbackIds: number[]): Promise { + let params = new HttpParams(); const topFeedbackIds = feedbackIds.slice(0, 5); topFeedbackIds.forEach((id, index) => { params = params.set(`feedbackId${index + 1}`, id.toString()); }); - return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params }); + return this.get(`exercises/${exerciseId}/feedback-details-participation`, { params }); } createChannel(courseId: number, exerciseId: number, feedbackChannelRequest: FeedbackChannelRequestDTO): Promise { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 0b07c579dad6..ab7eaa018065 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -4,8 +4,6 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.doReturn; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; @@ -27,9 +25,6 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; - 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.GradingCriterion; @@ -908,8 +903,7 @@ void testGetMaxCountForExerciseWithMultipleFeedback() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testGetParticipationForFeedbackDetailText() throws Exception { - ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); - StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); + Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, this.programmingExerciseStudentParticipation); ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); testCase.setId(1L); @@ -919,27 +913,12 @@ void testGetParticipationForFeedbackDetailText() throws Exception { feedback.setTestCase(testCase); feedback = feedbackRepository.saveAndFlush(feedback); - Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); participationUtilService.addFeedbackToResult(feedback, result); - String detailTextEncoded = URLEncoder.encode(feedback.getDetailText(), StandardCharsets.UTF_8); - String testCaseName = testCase.getTestName(); - String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING" - + "&detailTexts=" + detailTextEncoded + "&testCaseName=" + testCaseName; - - String jsonResponse = request.get(url, HttpStatus.OK, String.class); - - JsonNode jsonNode = new ObjectMapper().readTree(jsonResponse); - assertThat(jsonNode.has("content")).isTrue(); - assertThat(jsonNode.has("pageable")).isTrue(); - assertThat(jsonNode.has("last")).isTrue(); - assertThat(jsonNode.has("totalElements")).isTrue(); - assertThat(jsonNode.has("totalPages")).isTrue(); - assertThat(jsonNode.has("first")).isTrue(); - assertThat(jsonNode.has("size")).isTrue(); - assertThat(jsonNode.has("number")).isTrue(); - assertThat(jsonNode.has("sort")).isTrue(); - assertThat(jsonNode.has("numberOfElements")).isTrue(); - assertThat(jsonNode.has("empty")).isTrue(); + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?feedbackId1=" + feedback.getId(); + + var response = request.get(url, HttpStatus.OK, List.class); + assertThat(response).hasSize(1); + } } diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 94b9167aa598..54c6d6d5a5e3 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -89,80 +89,56 @@ describe('FeedbackAnalysisService', () => { describe('getParticipationForFeedbackDetailText', () => { it('should retrieve paginated participation details for up to 5 feedback details', async () => { const feedbackDetailsId = [1, 2, 3, 4, 5]; - const pageable = { - page: 1, - pageSize: 10, - sortedColumn: 'participationId', - sortingOrder: SortingOrder.ASCENDING, - }; - const participationResponseMock = { - content: [ - { - participationId: 101, - firstName: 'John', - lastName: 'Doe', - login: 'johndoe', - repositoryName: 'repo1', - }, - { - participationId: 102, - firstName: 'Jane', - lastName: 'Smith', - login: 'janesmith', - repositoryName: 'repo2', - }, - ], - numberOfPages: 1, - totalItems: 2, - }; - - const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetailsId, 'test1', pageable); - - const req = httpMock.expectOne( - 'api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&testCaseName=test1&feedbackId1=1&feedbackId2=2&feedbackId3=3&feedbackId4=4&feedbackId5=5', - ); + const participationResponseMock = [ + { + participationId: 101, + firstName: 'A', + lastName: 'Z', + login: 'AZ', + repositoryName: 'repo1', + }, + { + participationId: 102, + firstName: 'I', + lastName: 'B', + login: 'IB', + repositoryName: 'repo2', + }, + ]; + + const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetailsId); + + const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?feedbackId1=1&feedbackId2=2&feedbackId3=3&feedbackId4=4&feedbackId5=5'); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); const result = await responsePromise; expect(result).toEqual(participationResponseMock); - expect(result.content[0].firstName).toBe('John'); - expect(result.content[1].firstName).toBe('Jane'); + expect(result[0].firstName).toBe('A'); + expect(result[1].firstName).toBe('I'); }); it('should handle less than 5 feedback details gracefully', async () => { const feedbackDetailsId = [1, 2]; - const pageable = { - page: 1, - pageSize: 10, - sortedColumn: 'participationId', - sortingOrder: SortingOrder.ASCENDING, - }; - const participationResponseMock = { - content: [ - { - participationId: 101, - firstName: 'John', - lastName: 'Doe', - login: 'johndoe', - repositoryName: 'repo1', - }, - ], - numberOfPages: 1, - totalItems: 1, - }; - - const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetailsId, 'test1', pageable); - - const req = httpMock.expectOne( - 'api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING&testCaseName=test1&feedbackId1=1&feedbackId2=2', - ); + const participationResponseMock = [ + { + participationId: 101, + firstName: 'A', + lastName: 'Z', + login: 'AZ', + repositoryName: 'repo1', + }, + ]; + + const responsePromise = service.getParticipationForFeedbackDetailText(1, feedbackDetailsId); + + const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?feedbackId1=1&feedbackId2=2'); expect(req.request.method).toBe('GET'); req.flush(participationResponseMock); const result = await responsePromise; expect(result).toEqual(participationResponseMock); - expect(result.content[0].firstName).toBe('John'); + expect(result[0].firstName).toBe('A'); }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts index d90170588da9..748bfe6ab1fc 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -3,7 +3,6 @@ import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { of } from 'rxjs'; import { provideHttpClient } from '@angular/common/http'; import '@angular/localize/init'; @@ -23,8 +22,8 @@ describe('AffectedStudentsModalComponent', () => { }; const participationMock: FeedbackAffectedStudentDTO[] = [ - { participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryURI: 'repo1' }, - { participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryURI: 'repo2' }, + { participationId: 101, firstName: 'A', lastName: 'Z', login: 'AZ', repositoryURI: 'repo1' }, + { participationId: 102, firstName: 'I', lastName: 'B', login: 'IB', repositoryURI: 'repo2' }, ]; const groupFeedback = false; @@ -38,7 +37,7 @@ describe('AffectedStudentsModalComponent', () => { { provide: FeedbackAnalysisService, useValue: { - getParticipationForFeedbackDetailText: jest.fn().mockReturnValue(of({ content: participationMock, totalPages: 1, totalElements: 2 })), + getParticipationForFeedbackDetailText: jest.fn().mockReturnValue(participationMock), }, }, ], @@ -55,14 +54,6 @@ describe('AffectedStudentsModalComponent', () => { fixture.detectChanges(); }); - it('should update page and reload data when setPage is called', async () => { - const loadAffectedSpy = jest.spyOn(component as any, 'loadAffected'); - - component.setPage(2); - expect(component.page()).toBe(2); - expect(loadAffectedSpy).toHaveBeenCalledOnce(); - }); - it('should handle error when loadAffected fails', async () => { jest.spyOn(feedbackService, 'getParticipationForFeedbackDetailText').mockReturnValueOnce(Promise.reject(new Error('Error loading data'))); const alertServiceSpy = jest.spyOn(component.alertService, 'error'); @@ -70,7 +61,7 @@ describe('AffectedStudentsModalComponent', () => { await component['loadAffected'](); - expect(component.participation().content).toEqual([]); + expect(component.participation()).toEqual([]); expect(alertServiceSpy).toHaveBeenCalled(); expect(consoleErrorSpy).toHaveBeenCalled(); From aed9401dd0dc555ef47f0a7a0e5e0f4d13091354 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Wed, 11 Dec 2024 15:03:55 +0100 Subject: [PATCH 62/64] client test --- .../feedback-analysis.component.spec.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index c5d4cbbfa192..0f66fb88c5f7 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -318,4 +318,16 @@ describe('FeedbackAnalysisComponent', () => { expect(component['isFeedbackDetailChannelModalOpen']).toBeTrue(); expect(modalSpy).not.toHaveBeenCalled(); }); + + describe('toggleGroupFeedback', () => { + it('should toggle groupFeedback and call loadData', () => { + const loadDataSpy = jest.spyOn(component, 'loadData' as any); + const initialGroupFeedback = component.groupFeedback(); + + component.toggleGroupFeedback(); + + expect(component.groupFeedback()).toBe(!initialGroupFeedback); + expect(loadDataSpy).toHaveBeenCalledOnce(); + }); + }); }); From 56fb11b9e66c40f60b5533d809306ade7f6f498f Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Fri, 13 Dec 2024 00:21:42 +0100 Subject: [PATCH 63/64] markus feedback --- .../assessment/dto/FeedbackDetailDTO.java | 2 + .../assessment/service/ResultService.java | 40 +++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index 9daf75ca4aa6..0fee28e9672c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -9,6 +9,8 @@ public record FeedbackDetailDTO(List feedbackIds, long count, double relativeCount, List detailTexts, String testCaseName, String taskName, String errorCategory) { public FeedbackDetailDTO(String feedbackId, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { + // Feedback IDs are gathered in the query using a comma separator, and the detail texts are stored in a list because, in case aggregation is applied, the detail texts are + // grouped together this(Arrays.stream(feedbackId.split(",")).map(Long::valueOf).toList(), count, relativeCount, List.of(detailText), testCaseName, taskName, errorCategory); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index cd90b1adbd93..9794811928c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -126,6 +126,10 @@ public class ResultService { private final ProgrammingExerciseRepository programmingExerciseRepository; + private static final int MAX_FEEDBACK_IDS = 5; + + private static final double SIMILARITY_THRESHOLD = 0.9; + public ResultService(UserRepository userRepository, ResultRepository resultRepository, Optional ltiNewResultService, ResultWebsocketService resultWebsocketService, ComplaintResponseRepository complaintResponseRepository, RatingRepository ratingRepository, FeedbackRepository feedbackRepository, LongFeedbackTextRepository longFeedbackTextRepository, ComplaintRepository complaintRepository, @@ -600,12 +604,12 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee Set taskNames = tasks.stream().map(ProgrammingExerciseTask::getTaskName).collect(Collectors.toSet()); // 5. Include unassigned tasks if specified by the filter; otherwise, only include specified tasks - List includeUnassignedTasks = new ArrayList<>(taskNames); + List includeNotAssignedToTask = new ArrayList<>(taskNames); if (!data.getFilterTasks().isEmpty()) { - includeUnassignedTasks.removeAll(data.getFilterTasks()); + includeNotAssignedToTask.removeAll(data.getFilterTasks()); } else { - includeUnassignedTasks.clear(); + includeNotAssignedToTask.clear(); } // 6. Define the occurrence range based on filter parameters @@ -616,45 +620,41 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List filterErrorCategories = data.getFilterErrorCategories(); // 8. Set up pagination and sorting based on input data - final var pageable = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.FEEDBACK_ANALYSIS); + final Pageable pageable = groupFeedback ? PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.FEEDBACK_ANALYSIS) : Pageable.unpaged(); // 9. Query the database based on groupFeedback attribute to retrieve paginated and filtered feedback - final Page feedbackDetailPage; + final Page feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, + StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeNotAssignedToTask, minOccurrence, + maxOccurrence, filterErrorCategories, pageable); + ; List processedDetails; int totalPages = 0; long totalCount = 0; long highestOccurrenceOfGroupedFeedback = 0; if (!groupFeedback) { - feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, - StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeUnassignedTasks, minOccurrence, - maxOccurrence, filterErrorCategories, pageable); - // Process and map feedback details, calculating relative count and assigning task names processedDetails = feedbackDetailPage.getContent().stream() - .map(detail -> new FeedbackDetailDTO(detail.feedbackIds().subList(0, Math.min(detail.feedbackIds().size(), 5)), detail.count(), + .map(detail -> new FeedbackDetailDTO(detail.feedbackIds().subList(0, Math.min(detail.feedbackIds().size(), MAX_FEEDBACK_IDS)), detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailTexts(), detail.testCaseName(), detail.taskName(), detail.errorCategory())) .toList(); totalPages = feedbackDetailPage.getTotalPages(); totalCount = feedbackDetailPage.getTotalElements(); } else { - feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, - StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeUnassignedTasks, minOccurrence, - maxOccurrence, filterErrorCategories, Pageable.unpaged()); - // Fetch all feedback details List allFeedbackDetails = feedbackDetailPage.getContent(); // Apply grouping and aggregation with a similarity threshold of 90% - List aggregatedFeedbackDetails = aggregateFeedback(allFeedbackDetails, 0.5); + List aggregatedFeedbackDetails = aggregateFeedback(allFeedbackDetails, SIMILARITY_THRESHOLD); highestOccurrenceOfGroupedFeedback = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); - // Apply manual pagination - int page = data.getPage(); - int pageSize = data.getPageSize(); + // Apply manual sorting Comparator comparator = getComparatorForFeedbackDetails(data); List processedDetailsPreSort = new ArrayList<>(aggregatedFeedbackDetails); processedDetailsPreSort.sort(comparator); + // Apply manual pagination + int page = data.getPage(); + int pageSize = data.getPageSize(); int start = Math.max(0, (page - 1) * pageSize); int end = Math.min(start + pageSize, processedDetailsPreSort.size()); processedDetails = processedDetailsPreSort.subList(start, end); @@ -678,7 +678,7 @@ private Comparator getComparatorForFeedbackDetails(FeedbackPa Comparator.comparing(detail -> detail.detailTexts().isEmpty() ? "" : detail.detailTexts().getFirst(), // Sort by the first element of the list String.CASE_INSENSITIVE_ORDER), "testCaseName", Comparator.comparing(FeedbackDetailDTO::testCaseName, String.CASE_INSENSITIVE_ORDER), "taskName", - Comparator.comparing(FeedbackDetailDTO::taskName, String.CASE_INSENSITIVE_ORDER), "relativeCount", Comparator.comparingDouble(FeedbackDetailDTO::relativeCount)); + Comparator.comparing(FeedbackDetailDTO::taskName, String.CASE_INSENSITIVE_ORDER)); Comparator comparator = comparators.getOrDefault(search.getSortedColumn(), (a, b) -> 0); return search.getSortingOrder() == SortingOrder.ASCENDING ? comparator : comparator.reversed(); @@ -698,7 +698,7 @@ private List aggregateFeedback(List feedba if (similarity > similarityThreshold) { // Merge the current base feedback into the processed feedback List mergedFeedbackIds = new ArrayList<>(processed.feedbackIds()); - if (processed.feedbackIds().size() < 5) { + if (processed.feedbackIds().size() < MAX_FEEDBACK_IDS) { mergedFeedbackIds.addAll(base.feedbackIds()); } From 80a43dd6ae76b2460a018c899a5353b906715966 Mon Sep 17 00:00:00 2001 From: aniruddhzaveri Date: Fri, 13 Dec 2024 00:27:05 +0100 Subject: [PATCH 64/64] markus feedback --- .../tum/cit/aet/artemis/assessment/service/ResultService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 9794811928c3..1dce0090c001 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -620,7 +620,7 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee List filterErrorCategories = data.getFilterErrorCategories(); // 8. Set up pagination and sorting based on input data - final Pageable pageable = groupFeedback ? PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.FEEDBACK_ANALYSIS) : Pageable.unpaged(); + final Pageable pageable = groupFeedback ? Pageable.unpaged() : PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.FEEDBACK_ANALYSIS); // 9. Query the database based on groupFeedback attribute to retrieve paginated and filtered feedback final Page feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId,