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/assessment/dto/FeedbackAnalysisResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java index e56722f079cf..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) { + List errorCategories, long highestOccurrenceOfGroupedFeedback) { } 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..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 @@ -6,11 +6,11 @@ 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 record FeedbackDetailDTO(List feedbackIds, long count, double relativeCount, List detailTexts, 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 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 1f62ef78665b..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 @@ -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; @@ -25,7 +24,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.data.domain.Pageable; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; @@ -49,7 +48,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.dto.SortingOrder; 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; @@ -64,6 +63,7 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -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, @@ -570,10 +574,12 @@ 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 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 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 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. @@ -581,7 +587,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) { + public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, FeedbackPageableDTO data, boolean groupFeedback) { // 1. Fetch programming exercise with associated test cases ProgrammingExercise programmingExercise = programmingExerciseRepository.findWithTestCasesByIdElseThrow(exerciseId); @@ -598,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 @@ -614,22 +620,113 @@ 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 ? Pageable.unpaged() : PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.FEEDBACK_ANALYSIS); - // 9. Query the database to retrieve paginated and filtered feedback + // 9. Query the database based on groupFeedback attribute to retrieve paginated and filtered feedback final Page feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, - StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeUnassignedTasks, minOccurrence, + 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) { + // 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(), 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 { + // Fetch all feedback details + List allFeedbackDetails = feedbackDetailPage.getContent(); + + // Apply grouping and aggregation with a similarity threshold of 90% + List aggregatedFeedbackDetails = aggregateFeedback(allFeedbackDetails, SIMILARITY_THRESHOLD); + + highestOccurrenceOfGroupedFeedback = aggregatedFeedbackDetails.stream().mapToLong(FeedbackDetailDTO::count).max().orElse(0); + // 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); + 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(); + } - // 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(), - (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 + // 10. Predefined error categories available for filtering on the client side final List ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error"); - // 12. Return response containing processed feedback details, task names, active test case names, and error categories - return new FeedbackAnalysisResponseDTO(new SearchResultPageDTO<>(processedDetails, feedbackDetailPage.getTotalPages()), feedbackDetailPage.getTotalElements(), taskNames, - activeTestCaseNames, ERROR_CATEGORIES); + // 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, + highestOccurrenceOfGroupedFeedback); + } + + private Comparator getComparatorForFeedbackDetails(FeedbackPageableDTO search) { + Map> comparators = Map.of("count", Comparator.comparingLong(FeedbackDetailDTO::count), "detailTexts", + 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)); + + Comparator comparator = comparators.getOrDefault(search.getSortedColumn(), (a, b) -> 0); + return search.getSortingOrder() == SortingOrder.ASCENDING ? comparator : comparator.reversed(); + } + + private List aggregateFeedback(List feedbackDetails, double similarityThreshold) { + List processedDetails = new ArrayList<>(); + + for (FeedbackDetailDTO base : feedbackDetails) { + boolean isMerged = false; + + for (FeedbackDetailDTO processed : processedDetails) { + // Ensure feedbacks have the same testCaseName and taskName + if (base.testCaseName().equals(processed.testCaseName()) && base.taskName().equals(processed.taskName())) { + double similarity = NameSimilarity.levenshteinSimilarity(base.detailTexts().getFirst(), processed.detailTexts().getFirst()); + + if (similarity > similarityThreshold) { + // Merge the current base feedback into the processed feedback + List mergedFeedbackIds = new ArrayList<>(processed.feedbackIds()); + if (processed.feedbackIds().size() < MAX_FEEDBACK_IDS) { + mergedFeedbackIds.addAll(base.feedbackIds()); + } + + List mergedTexts = new ArrayList<>(processed.detailTexts()); + mergedTexts.add(base.detailTexts().getFirst()); + + long mergedCount = processed.count() + base.count(); + + // Replace the processed entry with the updated one + processedDetails.remove(processed); + FeedbackDetailDTO updatedProcessed = new FeedbackDetailDTO(mergedFeedbackIds, mergedCount, 0, mergedTexts, processed.testCaseName(), processed.taskName(), + processed.errorCategory()); + processedDetails.add(updatedProcessed); // Add the updated entry + isMerged = true; + break; // No need to check further + } + } + } + + if (!isMerged) { + // If not merged, add it as a new entry in processedDetails + FeedbackDetailDTO newEntry = new FeedbackDetailDTO(base.feedbackIds(), base.count(), 0, List.of(base.detailTexts().getFirst()), base.testCaseName(), + base.taskName(), base.errorCategory()); + processedDetails.add(newEntry); + } + } + + return processedDetails; } /** @@ -648,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. - * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. + * @return A {@link List} 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(); - PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); - return studentParticipationRepository.findAffectedStudentsByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); + public List getAffectedStudentsWithFeedbackIds(long exerciseId, List feedbackIds) { + return studentParticipationRepository.findAffectedStudentsByFeedbackIds(exerciseId, feedbackIds); } /** @@ -692,15 +784,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..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 @@ -7,14 +7,15 @@ 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; 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; @@ -23,7 +24,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; @@ -39,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; @@ -297,7 +296,7 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo * Pagination, sorting, and filtering options allow flexible data retrieval: *
    *
  • Pagination: Based on page number and page size, as specified in the request.
    • - *
  • Sorting: By column (e.g., "count" or "detailText") and sorting order (ASCENDING or DESCENDING). + *
  • Sorting: By column (e.g., "count" or "detailTexts") and sorting order (ASCENDING or DESCENDING). * If the specified column is not valid for sorting, the default sorting column is "count".
    • *
  • Filtering: *
      @@ -310,18 +309,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 groupFeedback Should the feedback be grouped + * @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.
      • @@ -333,8 +333,9 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo */ @GetMapping("exercises/{exerciseId}/feedback-details") @EnforceAtLeastEditorInExercise - public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @ModelAttribute FeedbackPageableDTO data) { - FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data); + public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @RequestParam("groupFeedback") boolean groupFeedback, + @ModelAttribute FeedbackPageableDTO data) { + FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data, groupFeedback); return ResponseEntity.ok(response); } @@ -359,32 +360,24 @@ 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. - * @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, @RequestHeader("feedbackIds") String feedbackIdsHeader, - @ModelAttribute PageableSearchDTO data) { + 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) { - Page participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, feedbackIdsHeader, data); + List feedbackIds = Stream.of(feedbackId1, feedbackId2, feedbackId3, feedbackId4, feedbackId5).filter(Objects::nonNull).toList(); + List participation = resultService.getAffectedStudentsWithFeedbackIds(exerciseId, feedbackIds); 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..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 @@ -1,7 +1,9 @@ package de.tum.cit.aet.artemis.communication.dto; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackChannelRequestDTO(ChannelDTO channel, String feedbackDetailText) { +public record FeedbackChannelRequestDTO(ChannelDTO channel, List feedbackDetailTexts, 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 ec61f3a8fe42..d16a17430138 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 @@ -418,15 +418,16 @@ private static String generateChannelNameFromTitle(@NotNull String prefix, Optio /** * Creates a feedback-specific channel for an exercise within a course. * - * @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. + * @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 feedbackDetailTexts used to identify the students affected by the feedback. + * @param requestingUser initiating the channel creation request. + * @param testCaseName to filter student submissions according to a specific feedback * @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, List feedbackDetailTexts, String testCaseName, User requestingUser) { Channel channelToCreate = new Channel(); channelToCreate.setName(channelDTO.getName()); channelToCreate.setIsPublic(channelDTO.getIsPublic()); @@ -440,7 +441,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, feedbackDetailTexts, 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 c9d2f0423380..ed1b4e45d478 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,12 +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(); - String 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, 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)); } 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 88f7bb7302e6..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 @@ -73,7 +73,7 @@ public enum ColumnMapping { )), FEEDBACK_ANALYSIS(Map.of( "count", "COUNT(f.id)", - "detailText", "f.detailText", + "detailTexts", "f.detailText", "testCaseName", "f.testCase.testName", "taskName", """ COALESCE(( @@ -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 d9cb4a6e205a..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 @@ -1277,13 +1277,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 @@ -1305,7 +1305,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. @@ -1317,8 +1317,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 @@ -1344,13 +1344,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 @@ -1365,12 +1365,10 @@ SELECT MAX(pr.id) * * @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. */ @Query(""" - SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( - p.exercise.course.id, + SELECT DISTINCT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( p.id, p.student.firstName, p.student.lastName, @@ -1378,63 +1376,56 @@ 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.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 f.id IN :feedbackIds AND p.testRun = FALSE ORDER BY p.student.firstName ASC """) - Page findAffectedStudentsByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); + List findAffectedStudentsByFeedbackIds(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds); - /** - * 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 + SELECT f.id FROM ProgrammingExerciseStudentParticipation p - INNER JOIN p.submissions s - INNER JOIN s.results r ON r.id = ( + INNER JOIN p.results r ON r.id = ( SELECT MAX(pr.id) - FROM s.results pr + FROM p.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 p.testRun = FALSE + ORDER BY p.student.firstName ASC """) - List findAffectedLoginsByFeedbackDetailText(@Param("exerciseId") long exerciseId, @Param("detailText") String detailText); + List findAffectedStudentsByFeedbackIds2(@Param("exerciseId") long exerciseId); /** - * 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. - *

      + * Retrieves the logins of students affected by a specific feedback detail text in a given exercise. * - * @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. + * @param exerciseId The ID of the exercise for which affected students are requested. + * @param detailTexts The feedback detail text to filter by. + * @param testCaseName The name of the test case for which the feedback is given. + * @return A list of student logins affected by the given feedback detail text in the specified exercise. */ @Query(""" - SELECT COUNT(DISTINCT p.student.id) + SELECT DISTINCT p.student.login FROM ProgrammingExerciseStudentParticipation p - INNER JOIN p.submissions s - INNER JOIN s.results r ON r.id = ( + INNER JOIN p.results r ON r.id = ( SELECT MAX(pr.id) - FROM s.results pr + FROM p.results pr WHERE pr.participation.id = p.id ) INNER JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId - AND f.detailText = :detailText + AND f.detailText IN :detailTexts + 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("detailTexts") List detailTexts, + @Param("testCaseName") String testCaseName); } 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..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 @@ -8,42 +8,40 @@

      - - - - - - - - - - - - - - - @for (item of participation().content; track item) { +
      + +
      + @if (isLoading()) { +
      + +
      + } @else { +
      + - - - + + + - } - -
      {{ item.firstName }} {{ item.lastName }}{{ item.login }} - -
      -
      - @if (participation().totalElements >= pageSize()) { - - } -
      - -
      -
      + + + @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 947f3f3d44cd..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,10 @@ -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({ selector: 'jhi-affected-students-modal', @@ -14,14 +14,15 @@ import { PageableResult, PageableSearch, SortingOrder } from 'app/shared/table/p standalone: true, }) export class AffectedStudentsModalComponent { + courseId = input.required(); exerciseId = input.required(); feedbackDetail = input.required(); - readonly participation = signal>({ content: [], totalPages: 0, totalElements: 0 }); + groupFeedback = input.required(); + 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); activeModal = inject(NgbActiveModal); feedbackService = inject(FeedbackAnalysisService); @@ -37,23 +38,14 @@ 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.getParticipationForFeedbackIds(this.exerciseId(), feedbackDetail.concatenatedFeedbackIds, pageable); + const response = await this.feedbackService.getParticipationForFeedbackDetailText(this.exerciseId(), feedbackDetail.feedbackIds); this.participation.set(response); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); + } finally { + 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/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..3cfab535a1a9 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,9 +58,10 @@

      +

      - +

      @@ -81,7 +82,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 e9b7963f0e78..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 @@ -15,8 +15,8 @@ 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(); + groupFeedback = input.required(); formSubmitted = output<{ channelDto: ChannelDTO; navigate: boolean }>(); isConfirmModalOpen = signal(false); @@ -53,7 +53,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/Modal/feedback-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html index c1b14669e1bb..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 }}

      +

      {{ 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 2c1d01040253..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 @@ -16,60 +16,77 @@
      -

      -
      - - +
      +

      +
      +
      + + +
      + + +
      - + - - @if (!content().resultsOnPage) { - - - - } @else { - @for (item of content().resultsOnPage; track item) { + @if (isLoading()) { +
      + +
      + } @else { + + @if (!content().resultsOnPage) { - - - - - - + } @else { + @for (item of content().resultsOnPage; track item) { + + + + + + + + + } } - } - + + }
      - -
      {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) - {{ item.detailText.length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText | slice: 0 : 100) + '...' : item.detailText }} - {{ item.taskName }}{{ item.testCaseName }}{{ item.errorCategory }} - - - @if (isCommunicationEnabled()) { - - } + +
      {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) + {{ item.detailTexts[0].length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailTexts[0] | slice: 0 : 100) + '...' : item.detailTexts[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 14da1cbe4cce..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 @@ -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 { faFilter, faMessage, faSort, faSortDown, faSortUp, faUsers } from '@fortawesome/free-solid-svg-icons'; +import { faCircleQuestion, 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'; @@ -54,8 +54,11 @@ export class FeedbackAnalysisComponent { readonly facDetails = facDetails; readonly faUsers = faUsers; readonly faMessage = faMessage; + readonly faCircleQuestion = faCircleQuestion; 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'; @@ -71,6 +74,7 @@ export class FeedbackAnalysisComponent { private isFeedbackDetailChannelModalOpen = false; private readonly debounceLoadData = BaseApiHttpService.debounce(this.loadData.bind(this), 300); + readonly groupFeedback = signal(false); constructor() { effect(() => { @@ -95,8 +99,9 @@ export class FeedbackAnalysisComponent { filterErrorCategories: this.errorCategories(), }; + this.isLoading.set(true); try { - const response = await this.feedbackAnalysisService.search(state, { + const response = await this.feedbackAnalysisService.search(state, this.groupFeedback(), { exerciseId: this.exerciseId(), filters: { tasks: this.selectedFiltersCount() !== 0 ? savedTasks : [], @@ -110,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.highestOccurrenceOfGroupedFeedback); } catch (error) { this.alertService.error(this.TRANSLATION_BASE + '.error'); + } finally { + this.isLoading.set(false); } } @@ -154,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.groupFeedback()) { + 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' }); @@ -198,8 +210,10 @@ 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()); } async openFeedbackDetailChannelModal(feedbackDetail: FeedbackDetail): Promise { @@ -208,13 +222,14 @@ export class FeedbackAnalysisComponent { } 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.groupFeedback = signal(this.groupFeedback()); modalRef.componentInstance.formSubmitted.subscribe(async ({ channelDto, navigate }: { channelDto: ChannelDTO; navigate: boolean }) => { 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); const channelName = createdChannel.name; @@ -237,4 +252,9 @@ export class FeedbackAnalysisComponent { this.isFeedbackDetailChannelModalOpen = false; } } + + toggleGroupFeedback(): void { + this.groupFeedback.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 d034cc56a506..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,7 +1,7 @@ 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 { HttpHeaders, HttpParams } from '@angular/common/http'; +import { HttpParams } from '@angular/common/http'; import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; @@ -11,18 +11,18 @@ export interface FeedbackAnalysisResponse { taskNames: string[]; testCaseNames: string[]; errorCategories: string[]; + highestOccurrenceOfGroupedFeedback: number; } export interface FeedbackDetail { - concatenatedFeedbackIds: number[]; + feedbackIds: number[]; count: number; relativeCount: number; - detailText: string; + detailTexts: string[]; testCaseName: string; taskName: string; errorCategory: string; } export interface FeedbackAffectedStudentDTO { - courseId: number; participationId: number; firstName: string; lastName: string; @@ -31,11 +31,12 @@ export interface FeedbackAffectedStudentDTO { } export interface FeedbackChannelRequestDTO { channel: ChannelDTO; - feedbackDetailText: string; + feedbackDetailTexts: string[]; + testCaseName: string; } @Injectable() export class FeedbackAnalysisService extends BaseApiHttpService { - search(pageable: SearchTermPageableSearch, options: { exerciseId: number; filters: FilterData }): Promise { + search(pageable: SearchTermPageableSearch, groupFeedback: boolean, options: { exerciseId: number; filters: FilterData }): Promise { const params = new HttpParams() .set('page', pageable.page.toString()) .set('pageSize', pageable.pageSize.toString()) @@ -45,7 +46,8 @@ export class FeedbackAnalysisService extends BaseApiHttpService { .set('filterTasks', options.filters.tasks.join(',')) .set('filterTestCases', options.filters.testCases.join(',')) .set('filterOccurrence', options.filters.occurrence.join(',')) - .set('filterErrorCategories', options.filters.errorCategories.join(',')); + .set('filterErrorCategories', options.filters.errorCategories.join(',')) + .set('groupFeedback', groupFeedback.toString()); return this.get(`exercises/${options.exerciseId}/feedback-details`, { params }); } @@ -54,26 +56,18 @@ export class FeedbackAnalysisService extends BaseApiHttpService { return this.get(`exercises/${exerciseId}/feedback-details-max-count`); } - async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: number[], pageable: PageableSearch): Promise> { - const feedbackIdsHeader = feedbackIds.join(','); - - const params = new HttpParams() - .set('page', pageable.page.toString()) - .set('pageSize', pageable.pageSize.toString()) - .set('sortedColumn', pageable.sortedColumn) - .set('sortingOrder', pageable.sortingOrder); + async getParticipationForFeedbackDetailText(exerciseId: number, feedbackIds: number[]): Promise { + let params = new HttpParams(); + const topFeedbackIds = feedbackIds.slice(0, 5); - const headers = new HttpHeaders().set('feedbackIds', feedbackIdsHeader); + topFeedbackIds.forEach((id, index) => { + params = params.set(`feedbackId${index + 1}`, id.toString()); + }); - return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params, headers }); + return this.get(`exercises/${exerciseId}/feedback-details-participation`, { params }); } createChannel(courseId: number, exerciseId: number, feedbackChannelRequest: FeedbackChannelRequestDTO): Promise { return this.post(`courses/${courseId}/${exerciseId}/feedback-channel`, feedbackChannelRequest); } - - 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/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 850fc2330e0d..b32aa33d0c33 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -358,6 +358,8 @@ "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 {{channelName}} erfolgreich erstellt.", + "groupFeedback": "Feedback gruppieren", + "groupFeedbackTooltip": "Feedback gruppieren ermöglicht es, ähnliche Feedback-Einträge mit demselben Testfall und derselben Aufgabenbezeichnung zu einem einzigen Eintrag zusammenzufassen. Dies ist nützlich, um die Anzahl der Einträge in der Tabelle zu reduzieren, insbesondere wenn zufällige Werte oder ähnliche Eingaben in den Testfällen verwendet und verglichen werden.", "feedbackModal": { "header": "Fehlerdetails", "feedbackTitle": "Feedback zu Testfällen", @@ -374,11 +376,11 @@ "apply": "Filter anwenden" }, "affectedStudentsModal": { - "header": "Betroffene Studierende", + "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": { @@ -394,9 +396,8 @@ "announcementChannelNo": "Nein", "createAndNavigateLabel": "Erstellen und Navigieren", "createAndNavigateDescription": "Erstellt den Kanal und navigiert automatisch zum Kanal.", - "createChannelLabel": "Kanal erstellen:", + "createChannelLabel": "Kanal erstellen", "createChannelDescription": "Erstellt den Kanal, ohne die Seite zu verlassen.", - "createChannelButton": "Kanal erstellen", "placeholder": "Dieses Feld bitte nicht leer lassen", "descriptionLabel": "Kanalbeschreibung", "requiredValidationErrorName": "Der Kanalname ist ein Pflichtfeld.", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 182a28afc520..0faa048e716e 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -358,6 +358,8 @@ "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 {{channelName}} successfully created.", + "groupFeedback": "Group Feedback", + "groupFeedbackTooltip": "Group feedback enables the grouping of similar feedback entries that share the same test case and task name into a single entry. This is useful for reducing the number of entries in the table, especially when random values or similar inputs are used and compared in the test cases.", "feedbackModal": { "header": "Error Details", "feedbackTitle": "Test Case Feedback", @@ -374,11 +376,11 @@ "apply": "Apply Filter" }, "affectedStudentsModal": { - "header": "Affected Students", + "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": { @@ -394,9 +396,8 @@ "announcementChannelNo": "No", "createAndNavigateLabel": "Create and Navigate", "createAndNavigateDescription": "Creates the channel and automatically navigates to the channel.", - "createChannelLabel": "Create Channel:", + "createChannelLabel": "Create Channel", "createChannelDescription": "Creates the channel without navigating away from this page.", - "createChannelButton": "Create Channel", "placeholder": "This field should not be empty", "descriptionLabel": "Description", "requiredValidationErrorName": "The channel name is required.", 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 b5834d6a66bf..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 @@ -22,13 +22,9 @@ 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; -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; @@ -145,6 +141,8 @@ class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocal private ProgrammingExerciseStudentParticipation programmingExerciseStudentParticipation; + private ProgrammingExerciseStudentParticipation programmingExerciseStudentParticipation2; + private StudentParticipation studentParticipation; private final int NUMBER_OF_STUDENTS = 3; @@ -158,6 +156,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(); @@ -179,6 +178,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()); } @@ -733,21 +738,17 @@ 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" - + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories="; + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=count&sortingOrder=ASCENDING" + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&groupFeedback=false"; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); @@ -755,7 +756,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("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"); @@ -765,11 +766,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); @@ -791,27 +789,28 @@ 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" - + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories="; + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=count&sortingOrder=ASCENDING" + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&groupFeedback=false"; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); List feedbackDetails = response.feedbackDetails().getResultsOnPage(); assertThat(feedbackDetails).hasSize(2); - FeedbackDetailDTO firstFeedbackDetail = feedbackDetails.stream().filter(feedbackDetail -> "Some feedback".equals(feedbackDetail.detailText())).findFirst().orElseThrow(); - - FeedbackDetailDTO secondFeedbackDetail = feedbackDetails.stream().filter(feedbackDetail -> "Some different 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.detailTexts())) + .findFirst().orElseThrow(); + assertThat(firstFeedbackDetail.count()).isEqualTo(2); assertThat(firstFeedbackDetail.relativeCount()).isEqualTo(100.0); - assertThat(firstFeedbackDetail.detailText()).isEqualTo("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("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"); @@ -820,32 +819,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); - ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); - testCase.setId(1L); - - Feedback feedback = new Feedback(); - feedback.setPositive(false); - feedback.setDetailText("Some feedback"); - feedback.setTestCase(testCase); - participationUtilService.addFeedbackToResult(feedback, result); - - long maxCount = request.get("/api/exercises/" + programmingExercise.getId() + "/feedback-details-max-count", HttpStatus.OK, Long.class); - - assertThat(maxCount).isEqualTo(1); - } - - @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); + void testGetAllFeedbackDetailsForExerciseWithGroupFeedbackAndMultipleSimilarFeedback() 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); @@ -857,89 +833,92 @@ void testGetMaxCountForExerciseWithMultipleFeedback() throws Exception { Feedback feedback2 = new Feedback(); feedback2.setPositive(false); - feedback2.setDetailText("Some feedback"); + feedback2.setDetailText("Some feedbacks"); feedback2.setTestCase(testCase); participationUtilService.addFeedbackToResult(feedback2, result2); - long maxCount = request.get("/api/exercises/" + programmingExercise.getId() + "/feedback-details-max-count", HttpStatus.OK, Long.class); + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=count&sortingOrder=ASCENDING" + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=&groupFeedback=true"; - assertThat(maxCount).isEqualTo(2); + 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 testGetParticipationForFeedbackId() throws Exception { - ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); - StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); + void testGetMaxCountForExercise() throws Exception { + 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("Feedback for student"); + feedback.setDetailText("Some feedback"); feedback.setTestCase(testCase); - feedback = feedbackRepository.saveAndFlush(feedback); - - 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"; - HttpHeaders headers = new HttpHeaders(); - headers.add("feedbackIds", String.valueOf(feedback.getId())); - - String jsonResponse = request.get(url, HttpStatus.OK, String.class, headers); + long maxCount = request.get("/api/exercises/" + programmingExercise.getId() + "/feedback-details-max-count", HttpStatus.OK, Long.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(); + assertThat(maxCount).isEqualTo(1); } @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); + void testGetMaxCountForExerciseWithMultipleFeedback() 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("SampleFeedback"); + feedback1.setDetailText("Some feedback"); feedback1.setTestCase(testCase); participationUtilService.addFeedbackToResult(feedback1, result1); Feedback feedback2 = new Feedback(); feedback2.setPositive(false); - feedback2.setDetailText("SampleFeedback"); + feedback2.setDetailText("Some feedback"); 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); + long maxCount = request.get("/api/exercises/" + programmingExercise.getId() + "/feedback-details-max-count", HttpStatus.OK, Long.class); - assertThat(affectedStudentsCount).isInstanceOf(Long.class); + assertThat(maxCount).isEqualTo(2); } @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testCountAffectedStudentsByFeedbackDetailText_NoMatch() throws Exception { - ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + void testGetParticipationForFeedbackDetailText() throws Exception { + 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("The AttributeTest test can only run if the structural oracle (test.json) is present. If you do not provide it, delete AttributeTest.java!"); + feedback.setTestCase(testCase); + feedback = feedbackRepository.saveAndFlush(feedback); + + participationUtilService.addFeedbackToResult(feedback, result); + + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?feedbackId1=" + feedback.getId(); - String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-detail/affected-students?detailText=NonexistentFeedback"; - long affectedStudentsCount = request.get(url, HttpStatus.OK, Long.class); + var response = request.get(url, HttpStatus.OK, List.class); + assertThat(response).hasSize(1); - 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 18fb5eb34cff..fcdaed430ebd 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,7 +937,7 @@ void createFeedbackChannel_asStudent_shouldReturnForbidden() { channelDTO.setIsPublic(true); channelDTO.setIsAnnouncementChannel(false); - FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, "Sample feedback text"); + FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, List.of("Sample feedback text"), "Sample testName"); String BASE_ENDPOINT = "api/courses/{courseId}/{exerciseId}/feedback-channel"; @@ -961,7 +961,7 @@ void createFeedbackChannel_asInstructor_shouldCreateChannel() { channelDTO.setIsPublic(true); channelDTO.setIsAnnouncementChannel(false); - FeedbackChannelRequestDTO feedbackChannelRequest = new FeedbackChannelRequestDTO(channelDTO, "Sample feedback text"); + 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.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index efba3a7ba4de..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 @@ -27,8 +27,8 @@ describe('FeedbackAnalysisComponent', () => { const feedbackMock: FeedbackDetail[] = [ { - concatenatedFeedbackIds: [1, 2], - detailText: 'Test feedback 1 detail', + feedbackIds: [1], + detailTexts: ['Test feedback 1 detail'], testCaseName: 'test1', count: 10, relativeCount: 50, @@ -36,8 +36,8 @@ describe('FeedbackAnalysisComponent', () => { errorCategory: 'Student Error', }, { - concatenatedFeedbackIds: [3, 4], - detailText: 'Test feedback 2 detail', + feedbackIds: [2], + detailTexts: ['Test feedback 2 detail'], testCaseName: 'test2', count: 5, relativeCount: 25, @@ -52,6 +52,7 @@ describe('FeedbackAnalysisComponent', () => { taskNames: ['task1', 'task2'], testCaseNames: ['test1', 'test2'], errorCategories: ['Student Error', 'AST Error', 'Ares Error'], + highestOccurrenceOfGroupedFeedback: 0, }; beforeEach(async () => { @@ -86,7 +87,6 @@ describe('FeedbackAnalysisComponent', () => { 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'); @@ -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(); + }); + }); }); 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 45bb903fe421..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 @@ -10,8 +10,8 @@ describe('FeedbackAnalysisService', () => { const feedbackDetailsMock: FeedbackDetail[] = [ { - concatenatedFeedbackIds: [1, 2], - detailText: 'Feedback 1', + feedbackIds: [1], + detailTexts: ['Feedback 1'], testCaseName: 'test1', count: 5, relativeCount: 25.0, @@ -19,8 +19,8 @@ describe('FeedbackAnalysisService', () => { errorCategory: 'StudentError', }, { - concatenatedFeedbackIds: [3, 4], - detailText: 'Feedback 2', + feedbackIds: [2], + detailTexts: ['Feedback 2'], testCaseName: 'test2', count: 3, relativeCount: 15.0, @@ -60,18 +60,16 @@ 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=&groupFeedback=false', ); expect(req.request.method).toBe('GET'); req.flush(feedbackAnalysisResponseMock); const result = await responsePromise; expect(result).toEqual(feedbackAnalysisResponseMock); - expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toStrictEqual([1, 2]); - expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toStrictEqual([3, 4]); }); }); @@ -88,65 +86,59 @@ describe('FeedbackAnalysisService', () => { }); }); - 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?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); + describe('getParticipationForFeedbackDetailText', () => { + it('should retrieve paginated participation details for up to 5 feedback details', async () => { + const feedbackDetailsId = [1, 2, 3, 4, 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'); }); - }); - - 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)}`); + it('should handle less than 5 feedback details gracefully', async () => { + const feedbackDetailsId = [1, 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(affectedStudentCountMock); + req.flush(participationResponseMock); const result = await responsePromise; - expect(result).toBe(affectedStudentCountMock); + expect(result).toEqual(participationResponseMock); + expect(result[0].firstName).toBe('A'); }); }); @@ -164,7 +156,8 @@ describe('FeedbackAnalysisService', () => { const feedbackChannelRequestMock = { channel: channelDtoMock, - feedbackDetailText: 'Sample feedback detail text', + feedbackDetailTexts: ['Sample feedback detail text'], + testCaseName: 'test1', }; const createdChannelMock = { 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 bf8b1b77141a..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'; @@ -13,20 +12,22 @@ describe('AffectedStudentsModalComponent', () => { let feedbackService: FeedbackAnalysisService; const feedbackDetailMock: FeedbackDetail = { - concatenatedFeedbackIds: [1, 2], + feedbackIds: [1, 2, 3, 4, 5], count: 5, relativeCount: 25.0, - detailText: 'Some feedback detail', + detailTexts: ['Some feedback detail'], testCaseName: 'testCase1', taskName: '1', errorCategory: 'StudentError', }; 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: 'A', lastName: 'Z', login: 'AZ', repositoryURI: 'repo1' }, + { participationId: 102, firstName: 'I', lastName: 'B', login: 'IB', repositoryURI: 'repo2' }, ]; + const groupFeedback = false; + beforeEach(async () => { await TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), AffectedStudentsModalComponent], @@ -36,7 +37,7 @@ describe('AffectedStudentsModalComponent', () => { { provide: FeedbackAnalysisService, useValue: { - getParticipationForFeedbackIds: jest.fn().mockReturnValue(of({ content: participationMock, totalPages: 1, totalElements: 2 })), + getParticipationForFeedbackDetailText: jest.fn().mockReturnValue(participationMock), }, }, ], @@ -46,27 +47,21 @@ 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); 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'))); + 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(() => {}); await component['loadAffected'](); - expect(component.participation().content).toEqual([]); + expect(component.participation()).toEqual([]); expect(alertServiceSpy).toHaveBeenCalled(); expect(consoleErrorSpy).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 index 74928d400dd3..1db978174340 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 @@ -21,10 +21,8 @@ describe('FeedbackDetailChannelModalComponent', () => { activeModal = TestBed.inject(NgbActiveModal); modalService = TestBed.inject(NgbModal); - fixture.componentRef.setInput('affectedStudentsCount', 42); fixture.componentRef.setInput('feedbackDetail', { - detailText: 'Sample feedback', - concatenatedFeedbackIds: [1], + detailTexts: ['Sample feedback'], count: 10, relativeCount: 50, testCaseName: 'testCase1', @@ -32,12 +30,12 @@ describe('FeedbackDetailChannelModalComponent', () => { errorCategory: 'StudentError', } as any); fixture.componentInstance.isConfirmModalOpen.set(false); + fixture.componentRef.setInput('groupFeedback', false); fixture.detectChanges(); }); it('should initialize form and inputs', () => { - expect(component.affectedStudentsCount()).toBe(42); - expect(component.feedbackDetail().detailText).toBe('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 cf31d3b2b9e0..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,10 +10,10 @@ describe('FeedbackModalComponent', () => { let activeModal: NgbActiveModal; const mockFeedbackDetail: FeedbackDetail = { - concatenatedFeedbackIds: [1, 2], + feedbackIds: [1, 2, 3, 4, 5], count: 5, relativeCount: 25.0, - detailText: 'Some feedback detail', + detailTexts: ['Some feedback detail'], testCaseName: 'testCase1', taskName: '1', errorCategory: 'StudentError', @@ -33,7 +33,7 @@ describe('FeedbackModalComponent', () => { it('should initialize with the provided feedback detail', () => { expect(component.feedbackDetail()).toEqual(mockFeedbackDetail); - expect(component.feedbackDetail().detailText).toBe('Some feedback detail'); + expect(component.feedbackDetail().detailTexts).toStrictEqual(['Some feedback detail']); expect(component.feedbackDetail().testCaseName).toBe('testCase1'); });