From 446de0cf14afe56a69570e82b73e0c1b562acd63 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 14:44:03 +0200 Subject: [PATCH 01/25] Add endpoint that generates exam summary (for deletion) --- .../repository/BuildJobRepository.java | 12 +++++ .../repository/StudentExamRepository.java | 2 + .../metis/AnswerPostRepository.java | 2 + .../repository/metis/PostRepository.java | 2 + .../service/exam/ExamDeletionService.java | 51 ++++++++++++++++++- .../www1/artemis/web/rest/ExamResource.java | 11 ++++ .../web/rest/dto/ExamDeletionSummaryDTO.java | 8 +++ 7 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamDeletionSummaryDTO.java diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java index dbce9f159046..dc94f8aee64e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java @@ -103,4 +103,16 @@ Page findAllByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus """) List getBuildJobsResultsStatistics(@Param("fromDateTime") ZonedDateTime fromDateTime, @Param("courseId") Long courseId); + /** + * Get the number of build jobs for exercise id. + */ + @Query(""" + SELECT COUNT(b) + FROM BuildJob b + LEFT JOIN Result r ON b.result.id = r.id + LEFT JOIN Participation p ON r.participation.id = p.id + LEFT JOIN Exercise e ON p.exercise.id = e.id + WHERE e.id = :exerciseId + """) + long countBuildJobsByExerciseId(@Param("exerciseId") Long exerciseId); } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/StudentExamRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/StudentExamRepository.java index 864af9b0a336..9927f8f32509 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/StudentExamRepository.java @@ -270,6 +270,8 @@ SELECT MAX(se.workingTime) """) Set findAllUnsubmittedWithExercisesByExamId(@Param("examId") Long examId); + List findAllByExamId(Long examId); + List findAllByExamId_AndTestRunIsTrue(Long examId); @Query(""" diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/AnswerPostRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/metis/AnswerPostRepository.java index 83fe9accfead..b586253093df 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/AnswerPostRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/metis/AnswerPostRepository.java @@ -30,4 +30,6 @@ default AnswerPost findAnswerPostByIdElseThrow(Long answerPostId) { default AnswerPost findAnswerMessageByIdElseThrow(Long answerPostId) { return getValueElseThrow(findById(answerPostId).filter(answerPost -> answerPost.getPost().getConversation() != null), answerPostId); } + + long countAnswerPostsByPostIdIn(List postIds); } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/PostRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/metis/PostRepository.java index 60d6496bd049..899665395a41 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/PostRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/metis/PostRepository.java @@ -61,4 +61,6 @@ default Post findPostByIdElseThrow(Long postId) throws EntityNotFoundException { default Post findPostOrMessagePostByIdElseThrow(Long postId) throws EntityNotFoundException { return getValueElseThrow(findById(postId), postId); } + + List findAllByConversationId(Long conversationId); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java index 6311d2b0868d..e60c5e9e09fc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java @@ -22,11 +22,14 @@ import de.tum.in.www1.artemis.domain.Exercise; import de.tum.in.www1.artemis.domain.GradingScale; import de.tum.in.www1.artemis.domain.User; +import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; import de.tum.in.www1.artemis.domain.exam.Exam; import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; import de.tum.in.www1.artemis.domain.exam.StudentExam; +import de.tum.in.www1.artemis.domain.metis.Post; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.quiz.QuizPool; +import de.tum.in.www1.artemis.repository.BuildJobRepository; import de.tum.in.www1.artemis.repository.ExamLiveEventRepository; import de.tum.in.www1.artemis.repository.ExamRepository; import de.tum.in.www1.artemis.repository.GradingScaleRepository; @@ -34,10 +37,13 @@ import de.tum.in.www1.artemis.repository.StudentExamRepository; import de.tum.in.www1.artemis.repository.StudentParticipationRepository; import de.tum.in.www1.artemis.repository.UserRepository; +import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; +import de.tum.in.www1.artemis.repository.metis.PostRepository; import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; import de.tum.in.www1.artemis.service.ExerciseDeletionService; import de.tum.in.www1.artemis.service.ParticipationService; import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; +import de.tum.in.www1.artemis.web.rest.dto.ExamDeletionSummaryDTO; @Profile(PROFILE_CORE) @Service @@ -71,10 +77,17 @@ public class ExamDeletionService { private final QuizPoolRepository quizPoolRepository; + private final BuildJobRepository buildJobRepository; + + private final PostRepository postRepository; + + private final AnswerPostRepository answerPostRepository; + public ExamDeletionService(ExerciseDeletionService exerciseDeletionService, ParticipationService participationService, CacheManager cacheManager, UserRepository userRepository, ExamRepository examRepository, AuditEventRepository auditEventRepository, StudentExamRepository studentExamRepository, GradingScaleRepository gradingScaleRepository, StudentParticipationRepository studentParticipationRepository, ChannelRepository channelRepository, ChannelService channelService, - ExamLiveEventRepository examLiveEventRepository, QuizPoolRepository quizPoolRepository) { + ExamLiveEventRepository examLiveEventRepository, QuizPoolRepository quizPoolRepository, BuildJobRepository buildJobRepository, PostRepository postRepository, + AnswerPostRepository answerPostRepository) { this.exerciseDeletionService = exerciseDeletionService; this.participationService = participationService; this.cacheManager = cacheManager; @@ -88,6 +101,9 @@ public ExamDeletionService(ExerciseDeletionService exerciseDeletionService, Part this.channelService = channelService; this.examLiveEventRepository = examLiveEventRepository; this.quizPoolRepository = quizPoolRepository; + this.buildJobRepository = buildJobRepository; + this.postRepository = postRepository; + this.answerPostRepository = answerPostRepository; } /** @@ -240,4 +256,37 @@ public void deleteTestRun(Long testRunId) { log.info("Request to delete Test Run {}", testRunId); studentExamRepository.deleteById(testRunId); } + + /** + * Get the exam deletion summary for the given exam. + * + * @param examId the ID of the exam for which the deletion summary should be fetched + * @return the exam deletion summary + */ + public ExamDeletionSummaryDTO getExamDeletionSummary(@NotNull long examId) { + Exam exam = examRepository.findOneWithEagerExercisesGroupsAndStudentExams(examId); + long numberOfBuilds = 0; + for (ExerciseGroup exerciseGroup : exam.getExerciseGroups()) { + var programmingExercises = exerciseGroup.getExercises().stream().filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())).toList(); + + for (Exercise exercise : programmingExercises) { + numberOfBuilds += buildJobRepository.countBuildJobsByExerciseId(exercise.getId()); + } + } + Channel channel = channelRepository.findChannelByExamId(examId); + Long conversationId = channel.getId(); + + List posts = postRepository.findAllByConversationId(conversationId); + long numberOfCommunicationPosts = posts.size(); + long numberOfAnswerPosts = answerPostRepository.countAnswerPostsByPostIdIn(posts.stream().map(Post::getId).toList()); + + List studentExams = studentExamRepository.findAllByExamId(examId); + long numberRegisteredStudents = studentExams.size(); + + long notStartedExams = studentExams.stream().filter(studentExam -> !studentExam.isStarted()).count(); + long startedExams = studentExams.stream().filter(studentExam -> studentExam.isStarted() && !studentExam.isSubmitted()).count(); + long submittedExams = studentExams.stream().filter(StudentExam::isSubmitted).count(); + + return new ExamDeletionSummaryDTO(numberOfBuilds, numberOfCommunicationPosts, numberOfAnswerPosts, numberRegisteredStudents, notStartedExams, startedExams, submittedExams); + } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java index bc3cbf5f8dff..1a69fcb4e4e4 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java @@ -95,6 +95,7 @@ import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.dto.CourseWithIdDTO; import de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO; +import de.tum.in.www1.artemis.web.rest.dto.ExamDeletionSummaryDTO; import de.tum.in.www1.artemis.web.rest.dto.ExamInformationDTO; import de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO; import de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO; @@ -1321,4 +1322,14 @@ public ResponseEntity> getAllSuspiciousExamSessio analyzeSessionsIpOutsideOfRange); return ResponseEntity.ok(examSessionService.retrieveAllSuspiciousExamSessionsByExamId(examId, options, Optional.ofNullable(ipSubnet))); } + + @GetMapping("courses/{courseId}/exams/{examId}/deletion-summary") + @EnforceAtLeastInstructor + public ResponseEntity getDeletionSummary(@PathVariable long courseId, @PathVariable long examId) { + log.debug("REST request to get deletion summary for exam : {}", examId); + Course course = courseRepository.findByIdElseThrow(courseId); + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, course, null); + + return ResponseEntity.ok(examDeletionService.getExamDeletionSummary(examId)); + } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamDeletionSummaryDTO.java b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamDeletionSummaryDTO.java new file mode 100644 index 000000000000..d48babd11d16 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamDeletionSummaryDTO.java @@ -0,0 +1,8 @@ +package de.tum.in.www1.artemis.web.rest.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record ExamDeletionSummaryDTO(long numberOfBuilds, long numberOfCommunicationPosts, long numberOfAnswerPosts, long numberRegisteredStudents, long numberNotStartedExams, + long numberStartedExams, long numberSubmittedExams) { +} From 68f3eab299320d4de225e981b1346874f5d7c88c Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 14:57:07 +0200 Subject: [PATCH 02/25] Extend delete popup with summary of entity to be deleted --- .../delete-dialog/delete-button.directive.ts | 4 ++++ .../delete-dialog/delete-dialog.component.html | 15 +++++++++++++++ .../delete-dialog/delete-dialog.component.ts | 2 ++ .../shared/delete-dialog/delete-dialog.model.ts | 6 ++++++ .../shared/delete-dialog/delete-dialog.service.ts | 2 ++ 5 files changed, 29 insertions(+) diff --git a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts index 4f1476ae508b..fd2d89600490 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts @@ -9,6 +9,8 @@ import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; export class DeleteButtonDirective implements OnInit { @Input() entityTitle?: string; @Input() deleteQuestion: string; + @Input() entitySummaryTitle: string; + @Input() entitySummary: { [key: string]: unknown } = {}; @Input() translateValues: { [key: string]: unknown } = {}; @Input() deleteConfirmationText: string; @Input() buttonSize: ButtonSize = ButtonSize.SMALL; @@ -73,6 +75,8 @@ export class DeleteButtonDirective implements OnInit { translateValues: this.translateValues, deleteConfirmationText: this.deleteConfirmationText, additionalChecks: this.additionalChecks, + entitySummaryTitle: this.entitySummaryTitle, + entitySummary: this.entitySummary, actionType: this.actionType, buttonType: this.buttonType, delete: this.delete, diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html index eaadd2bb1acd..416f30c23c9a 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html @@ -29,6 +29,21 @@

Are you sure you want to delete?

+ + @if (entitySummary) { + Summary +
    + @for (summaryKey of objectKeys(entitySummary); track summaryKey; let i = $index) { + @if (entitySummary[summaryKey]) { +
  • + {{ summaryKey | artemisTranslate }}: {{ entitySummary[summaryKey] }} +
    • + } + } +
+ } + @if (additionalChecks) {
@for (checkKey of objectKeys(additionalChecks); track checkKey; let i = $index) { diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts index 6ce26216abf0..f9768ddef0e1 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts @@ -24,6 +24,8 @@ export class DeleteDialogComponent implements OnInit, OnDestroy { @ViewChild('deleteForm', { static: true }) deleteForm: NgForm; deleteQuestion: string; + entitySummaryTitle: string; + entitySummary: { [key: string]: unknown } = {}; translateValues: { [key: string]: unknown } = {}; deleteConfirmationText: string; requireConfirmationOnlyForAdditionalChecks: boolean; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts index c6fc632b98a4..8605a531e740 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts @@ -29,6 +29,12 @@ export class DeleteDialogData { // i18n key, that will be translated deleteQuestion: string; + // i18n key, that will be translated + entitySummaryTitle: string; + + // summary of the deletion. Key is i18n key, value is the value that will be displayed + entitySummary: { [key: string]: unknown }; + // parameters used for the delete question translateValues: { [key: string]: unknown }; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts index 5062a19518d6..e8da5d6c99a0 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts @@ -27,6 +27,8 @@ export class DeleteDialogService { this.modalRef.componentInstance.translateValues = { ...deleteDialogData.translateValues, title: deleteDialogData.entityTitle }; this.modalRef.componentInstance.deleteConfirmationText = deleteDialogData.deleteConfirmationText; this.modalRef.componentInstance.additionalChecks = deleteDialogData.additionalChecks; + this.modalRef.componentInstance.entitySummaryTitle = deleteDialogData.entitySummaryTitle; + this.modalRef.componentInstance.entitySummary = deleteDialogData.entitySummary; this.modalRef.componentInstance.actionType = deleteDialogData.actionType; this.modalRef.componentInstance.buttonType = deleteDialogData.buttonType; this.modalRef.componentInstance.delete = deleteDialogData.delete; From bd2579986da546ab86a604336e587604b22733db Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 14:57:36 +0200 Subject: [PATCH 03/25] Add service method and DTO for fetching exam deletion summary --- .../webapp/app/entities/exam-deletion-summary.model.ts | 9 +++++++++ .../webapp/app/exam/manage/exam-management.service.ts | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 src/main/webapp/app/entities/exam-deletion-summary.model.ts diff --git a/src/main/webapp/app/entities/exam-deletion-summary.model.ts b/src/main/webapp/app/entities/exam-deletion-summary.model.ts new file mode 100644 index 000000000000..1571ba26ead5 --- /dev/null +++ b/src/main/webapp/app/entities/exam-deletion-summary.model.ts @@ -0,0 +1,9 @@ +export class ExamDeletionSummaryDTO { + public numberOfBuilds: number; + public numberOfCommunicationPosts: number; + public numberOfAnswerPosts: number; + public numberRegisteredStudents: number; + public numberNotStartedExams: number; + public numberStartedExams: number; + public numberSubmittedExams: number; +} diff --git a/src/main/webapp/app/exam/manage/exam-management.service.ts b/src/main/webapp/app/exam/manage/exam-management.service.ts index 24fa83f28e40..351453dde320 100644 --- a/src/main/webapp/app/exam/manage/exam-management.service.ts +++ b/src/main/webapp/app/exam/manage/exam-management.service.ts @@ -21,6 +21,7 @@ import { EntityTitleService, EntityType } from 'app/shared/layouts/navbar/entity import { ExamExerciseStartPreparationStatus } from 'app/exam/manage/student-exams/student-exams.component'; import { Exercise } from 'app/entities/exercise.model'; import { ExamWideAnnouncementEvent } from 'app/exam/participate/exam-participation-live-events.service'; +import { ExamDeletionSummaryDTO } from 'app/entities/exam-deletion-summary.model'; type EntityResponseType = HttpResponse; type EntityArrayResponseType = HttpResponse; @@ -208,6 +209,15 @@ export class ExamManagementService { ); } + /** + * Returns a summary for the exam providing information potentially relevant for the deletion. + * @param courseId The course id. + * @param examId The exam id. + */ + getDeletionSummary(courseId: number, examId: number): Observable> { + return this.http.get(`${this.resourceUrl}/${courseId}/exams/${examId}/deletion-summary`, { observe: 'response' }); + } + /** * Delete an exam on the server using a DELETE request. * @param courseId The course id. From a52fde6761885a2ea9f241395aada6e00b537350 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 14:58:22 +0200 Subject: [PATCH 04/25] Add entity summary to exam details view deletion modal --- .../manage/exams/exam-detail.component.html | 2 + .../manage/exams/exam-detail.component.ts | 68 +++++++++++++++++++ src/main/webapp/i18n/de/exam.json | 21 +++++- src/main/webapp/i18n/en/exam.json | 21 +++++- 4 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html index a2308edbf6aa..29789f1b006e 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html @@ -87,6 +87,8 @@

jhiDeleteButton [buttonSize]="buttonSize" [entityTitle]="exam.title || ''" + entitySummaryTitle="artemisApp.examManagement.delete.summary.title" + [entitySummary]="examSummary" deleteQuestion="artemisApp.examManagement.delete.question" deleteConfirmationText="artemisApp.examManagement.delete.typeNameToConfirm" (delete)="deleteExam(exam.id!)" diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts index 582e72ad65d5..db5980e62417 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts @@ -17,6 +17,8 @@ import { GradeType } from 'app/entities/grading-scale.model'; import { DetailOverviewSection, DetailType } from 'app/detail-overview-list/detail-overview-list.component'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { scrollToTopOfPage } from 'app/shared/util/utils'; +import { ExerciseType } from 'app/entities/exercise.model'; +import { ExamDeletionSummaryDTO } from 'app/entities/exam-deletion-summary.model'; @Component({ selector: 'jhi-exam-detail', @@ -52,6 +54,8 @@ export class ExamDetailComponent implements OnInit, OnDestroy { examDetailSections: DetailOverviewSection[]; + examSummary: { [key: string]: unknown } = {}; + constructor( private route: ActivatedRoute, private artemisMarkdown: ArtemisMarkdownService, @@ -83,6 +87,9 @@ export class ExamDetailComponent implements OnInit, OnDestroy { this.canHaveBonus = gradingSystemResponse.body.gradeType === GradeType.GRADE; } }); + + this.setExistingSummaryEntries(); + this.fetchAndSetExamDeletionSummary(); }); } @@ -160,4 +167,65 @@ export class ExamDetailComponent implements OnInit, OnDestroy { error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message), }); } + + private setExistingSummaryEntries() { + const numberOfProgrammingExerciseParticipations = + this.exam.exerciseGroups + ?.flatMap((e) => e.exercises) + .filter((e) => e?.type === ExerciseType.PROGRAMMING) + .map((e) => e?.numberOfParticipations ?? 0) + .reduce((a, b) => a + b, 0) ?? 0; + + const numberOfExercisesPerType = new Map(); + this.exam.exerciseGroups?.forEach((exerciseGroup) => { + exerciseGroup.exercises?.forEach((exercise) => { + if (exercise.type === undefined) { + return; + } + const oldValue = numberOfExercisesPerType.get(exercise.type) ?? 0; + numberOfExercisesPerType.set(exercise.type, oldValue + 1); + }); + }); + + const numberOfExerciseGroups = this.exam.exerciseGroups?.length ?? 0; + const isTestExam = this.exam.testExam ?? false; + const isTestCourse = this.exam.course?.testCourse ?? false; + + this.examSummary = { + ...this.examSummary, + 'artemisApp.examManagement.delete.summary.numberExerciseGroups': numberOfExerciseGroups, + 'artemisApp.examManagement.delete.summary.numberProgrammingExercises': numberOfExercisesPerType.get(ExerciseType.PROGRAMMING), + 'artemisApp.examManagement.delete.summary.numberModelingExercises': numberOfExercisesPerType.get(ExerciseType.MODELING), + 'artemisApp.examManagement.delete.summary.numberTextExercises': numberOfExercisesPerType.get(ExerciseType.TEXT), + 'artemisApp.examManagement.delete.summary.numberFileUploadExercises': numberOfExercisesPerType.get(ExerciseType.FILE_UPLOAD), + 'artemisApp.examManagement.delete.summary.numberQuizExercises': numberOfExercisesPerType.get(ExerciseType.QUIZ), + 'artemisApp.examManagement.delete.summary.numberRepositories': numberOfProgrammingExerciseParticipations, + 'artemisApp.examManagement.delete.summary.isTestExam': isTestExam, + 'artemisApp.examManagement.delete.summary.isTestCourse': isTestCourse, + }; + } + + fetchAndSetExamDeletionSummary() { + this.examManagementService.getDeletionSummary(this.exam.course!.id!, this.exam.id!).subscribe({ + next: (res: HttpResponse) => { + const summary = res.body; + + if (summary === null) { + return; + } + + this.examSummary = { + ...this.examSummary, + 'artemisApp.examManagement.delete.summary.numberBuilds': summary.numberOfBuilds, + 'artemisApp.examManagement.delete.summary.numberRegisteredStudents': summary.numberRegisteredStudents, + 'artemisApp.examManagement.delete.summary.numberNotStartedExams': summary.numberNotStartedExams, + 'artemisApp.examManagement.delete.summary.numberStartedExams': summary.numberStartedExams, + 'artemisApp.examManagement.delete.summary.numberSubmittedExams': summary.numberSubmittedExams, + 'artemisApp.examManagement.delete.summary.numberCommunicationPosts': summary.numberOfCommunicationPosts, + 'artemisApp.examManagement.delete.summary.numberAnswerPosts': summary.numberOfAnswerPosts, + }; + }, + error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message), + }); + } } diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index e1cad7c5b597..d3319235cf57 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -600,7 +600,26 @@ "quizPool": "Quiz Pool", "delete": { "question": "Soll die Klausur {{ title }} wirklich dauerhaft gelöscht werden? Alle zugehörigen Elemente werden gelöscht, inklusive der Klausuren der Studierenden. Diese Aktion kann NICHT rückgängig gemacht werden!", - "typeNameToConfirm": "Bitte gib den Namen der Klausur zur Bestätigung ein." + "typeNameToConfirm": "Bitte gib den Namen der Klausur zur Bestätigung ein.", + "summary": { + "title": "Klausur Zusammenfassung", + "numberExerciseGroups": "Anzahl Aufgabengruppen", + "numberProgrammingExercises": "Anzahl Programmieraufgaben", + "numberModelingExercises": "Anzahl Modellierungsaufgaben", + "numberTextExercises": "Anzahl Textaufgaben", + "numberFileUploadExercises": "Anzahl Datei-Upload-Aufgaben", + "numberQuizExercises": "Anzahl Quiz-Aufgaben", + "numberRepositories": "Anzahl Repositories", + "numberBuilds": "Anzahl Builds", + "numberRegisteredStudents": "Anzahl angemeldeter Studierender", + "numberNotStartedExams": "Anzahl Klausuren (nicht gestartet)", + "numberStartedExams": "Anzahl Klausuren (gestartet, aber nicht abgegeben)", + "numberSubmittedExams": "Anzahl Klausuren (abgegeben)", + "numberCommunicationPosts": "Anzahl Kommunikationsbeiträge", + "numberAnswerPosts": "Anzahl Antwortbeiträge", + "isTestExam": "Testklausur", + "isTestCourse": "Testkurs" + } }, "reset": { "question": "Soll die Klausur {{ title }} wirklich dauerhaft zurückgesetzt werden? Alle Klausuren der Studierenden werden gelöscht. Teilnehmende an der Klausur und die Konfigurationen der Aufgaben bleiben erhalten. Diese Aktion kann NICHT rückgängig gemacht werden!", diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index 534c20eecdb5..ea25d79fb42f 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -601,7 +601,26 @@ "quizPool": "Quiz Pool", "delete": { "question": "Are you sure you want to permanently delete the Exam {{ title }}? All associated elements will be deleted including the Student Exams. This action can NOT be undone!", - "typeNameToConfirm": "Please type in the name of the exam to confirm." + "typeNameToConfirm": "Please type in the name of the exam to confirm.", + "summary": { + "title": "Exam Summary", + "numberExerciseGroups": "Number of Exercise Groups", + "numberProgrammingExercises": "Number of Programming Exercises", + "numberModelingExercises": "Number of Modeling Exercises", + "numberTextExercises": "Number of Text Exercises", + "numberFileUploadExercises": "Number of File Upload Exercises", + "numberQuizExercises": "Number of Quiz Exercises", + "numberRepositories": "Number of Repositories (Participations of programming exercises)", + "numberBuilds": "Number of Builds", + "numberRegisteredStudents": "Number of Registered Students", + "numberNotStartedExams": "Number of Exams (not started)", + "numberStartedExams": "Number of Exams (started, but not submitted)", + "numberSubmittedExams": "Number of Exams (submitted)", + "numberCommunicationPosts": "Number of Communication Posts", + "numberAnswerPosts": "Number of Answer Posts", + "isTestExam": "Test Exam", + "isTestCourse": "Test Course" + } }, "reset": { "question": "Are you sure you want to permanently reset the Exam {{ title }}? All Student Exams will be deleted. Registered students and the exercise configurations will remain. This action can NOT be undone!", From 3c41d9098bc26ea2407619f1eb05f6cf3777f089 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 15:10:57 +0200 Subject: [PATCH 05/25] Fix nullable --- .../webapp/app/shared/delete-dialog/delete-dialog.model.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts index 8605a531e740..162576784b52 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts @@ -30,10 +30,10 @@ export class DeleteDialogData { deleteQuestion: string; // i18n key, that will be translated - entitySummaryTitle: string; + entitySummaryTitle?: string; // summary of the deletion. Key is i18n key, value is the value that will be displayed - entitySummary: { [key: string]: unknown }; + entitySummary?: { [key: string]: unknown }; // parameters used for the delete question translateValues: { [key: string]: unknown }; From 51d64542c6517aaf09128ac6151923fc074eff99 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 15:13:06 +0200 Subject: [PATCH 06/25] Change DTO from class to interface --- .../app/entities/exam-deletion-summary.model.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/entities/exam-deletion-summary.model.ts b/src/main/webapp/app/entities/exam-deletion-summary.model.ts index 1571ba26ead5..ed98a32d1628 100644 --- a/src/main/webapp/app/entities/exam-deletion-summary.model.ts +++ b/src/main/webapp/app/entities/exam-deletion-summary.model.ts @@ -1,9 +1,9 @@ -export class ExamDeletionSummaryDTO { - public numberOfBuilds: number; - public numberOfCommunicationPosts: number; - public numberOfAnswerPosts: number; - public numberRegisteredStudents: number; - public numberNotStartedExams: number; - public numberStartedExams: number; - public numberSubmittedExams: number; +export interface ExamDeletionSummaryDTO { + numberOfBuilds: number; + numberOfCommunicationPosts: number; + numberOfAnswerPosts: number; + numberRegisteredStudents: number; + numberNotStartedExams: number; + numberStartedExams: number; + numberSubmittedExams: number; } From 0ad70208ac710f757bb3b719217004da42c10f3f Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 15:25:03 +0200 Subject: [PATCH 07/25] Add endpoint JavaDoc --- .../de/tum/in/www1/artemis/web/rest/ExamResource.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java index 1a69fcb4e4e4..6a708e546a9e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java @@ -1323,6 +1323,14 @@ public ResponseEntity> getAllSuspiciousExamSessio return ResponseEntity.ok(examSessionService.retrieveAllSuspiciousExamSessionsByExamId(examId, options, Optional.ofNullable(ipSubnet))); } + /** + * GET /courses/{courseId}/exams/{examId}/deletion-summary : Get a summary of the deletion of an exam. + * + * @param courseId the id of the course + * @param examId the id of the exam + * + * @return the ResponseEntity with status 200 (OK) and with body a summary of the deletion of the exam + */ @GetMapping("courses/{courseId}/exams/{examId}/deletion-summary") @EnforceAtLeastInstructor public ResponseEntity getDeletionSummary(@PathVariable long courseId, @PathVariable long examId) { From ef4d8f72376b860824d5faba1ffd1c20d330e31a Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 15:26:39 +0200 Subject: [PATCH 08/25] Nullable types on delete-dialog --- .../app/shared/delete-dialog/delete-dialog.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts index f9768ddef0e1..2d3497d9ad4d 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts @@ -24,8 +24,8 @@ export class DeleteDialogComponent implements OnInit, OnDestroy { @ViewChild('deleteForm', { static: true }) deleteForm: NgForm; deleteQuestion: string; - entitySummaryTitle: string; - entitySummary: { [key: string]: unknown } = {}; + entitySummaryTitle?: string; + entitySummary?: { [key: string]: unknown } = {}; translateValues: { [key: string]: unknown } = {}; deleteConfirmationText: string; requireConfirmationOnlyForAdditionalChecks: boolean; From 56cec856ecdda72bbf5d11ff5423c1a586d77cd2 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 16:28:48 +0200 Subject: [PATCH 09/25] Make nullable (for real) --- .../app/shared/delete-dialog/delete-button.directive.ts | 4 ++-- .../app/shared/delete-dialog/delete-dialog.component.html | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts index fd2d89600490..c4a36ed1dd01 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts @@ -9,8 +9,8 @@ import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; export class DeleteButtonDirective implements OnInit { @Input() entityTitle?: string; @Input() deleteQuestion: string; - @Input() entitySummaryTitle: string; - @Input() entitySummary: { [key: string]: unknown } = {}; + @Input() entitySummaryTitle?: string; + @Input() entitySummary?: { [key: string]: unknown } = {}; @Input() translateValues: { [key: string]: unknown } = {}; @Input() deleteConfirmationText: string; @Input() buttonSize: ButtonSize = ButtonSize.SMALL; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html index 416f30c23c9a..3988eabb403e 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html @@ -31,7 +31,9 @@

Are you sure you want to delete?

@if (entitySummary) { - Summary + @if (entitySummaryTitle) { + Summary + }
    @for (summaryKey of objectKeys(entitySummary); track summaryKey; let i = $index) { @if (entitySummary[summaryKey]) { From 29ebf6e9c6854bdaeae9ce899cbd2e0d99fa07fc Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 16:36:27 +0200 Subject: [PATCH 10/25] Use jhiTranslate over Angular pipe --- .../app/shared/delete-dialog/delete-dialog.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html index 3988eabb403e..825ecb75db55 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html @@ -30,15 +30,15 @@

    Are you sure you want to delete?

    + @if (entitySummaryTitle) { + Summary + } @if (entitySummary) { - @if (entitySummaryTitle) { - Summary - }
      @for (summaryKey of objectKeys(entitySummary); track summaryKey; let i = $index) { @if (entitySummary[summaryKey]) {
    • - {{ summaryKey | artemisTranslate }}{{ summaryKey }}: {{ entitySummary[summaryKey] }}
      • } From 1027d354149ee3c423c6e5a03e063425d01ad362 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 16:36:34 +0200 Subject: [PATCH 11/25] Minor translation --- src/main/webapp/i18n/en/exam.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index ea25d79fb42f..a32a690151eb 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -610,7 +610,7 @@ "numberTextExercises": "Number of Text Exercises", "numberFileUploadExercises": "Number of File Upload Exercises", "numberQuizExercises": "Number of Quiz Exercises", - "numberRepositories": "Number of Repositories (Participations of programming exercises)", + "numberRepositories": "Number of Repositories", "numberBuilds": "Number of Builds", "numberRegisteredStudents": "Number of Registered Students", "numberNotStartedExams": "Number of Exams (not started)", From ca035d89f8c647aaf89e47e27985d43cdbb78774 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 16:52:44 +0200 Subject: [PATCH 12/25] Specify angular template if-condition --- .../app/shared/delete-dialog/delete-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html index 825ecb75db55..2c0a839b7f0a 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html @@ -36,7 +36,7 @@

      @if (entitySummary) {
        @for (summaryKey of objectKeys(entitySummary); track summaryKey; let i = $index) { - @if (entitySummary[summaryKey]) { + @if (entitySummary[summaryKey] !== null) {
      • {{ summaryKey }}: {{ entitySummary[summaryKey] }} From 67fa93388acbff3542c691302e05296d14d571dc Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sun, 4 Aug 2024 17:01:59 +0200 Subject: [PATCH 13/25] Use @EnforceAtLeastInstructorInCourse --- .../java/de/tum/in/www1/artemis/web/rest/ExamResource.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java index 6a708e546a9e..40f640249b98 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java @@ -74,6 +74,7 @@ import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.in.www1.artemis.service.AssessmentDashboardService; import de.tum.in.www1.artemis.service.AuthorizationCheckService; import de.tum.in.www1.artemis.service.SubmissionService; @@ -1332,12 +1333,9 @@ public ResponseEntity> getAllSuspiciousExamSessio * @return the ResponseEntity with status 200 (OK) and with body a summary of the deletion of the exam */ @GetMapping("courses/{courseId}/exams/{examId}/deletion-summary") - @EnforceAtLeastInstructor + @EnforceAtLeastInstructorInCourse public ResponseEntity getDeletionSummary(@PathVariable long courseId, @PathVariable long examId) { log.debug("REST request to get deletion summary for exam : {}", examId); - Course course = courseRepository.findByIdElseThrow(courseId); - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, course, null); - return ResponseEntity.ok(examDeletionService.getExamDeletionSummary(examId)); } } From 53549df7b66358a9bcc3beaa62d2cb4f5106e067 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Mon, 5 Aug 2024 09:27:09 +0200 Subject: [PATCH 14/25] Comments --- .../tum/in/www1/artemis/repository/BuildJobRepository.java | 3 +++ .../app/shared/delete-dialog/delete-dialog.component.html | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java index dc94f8aee64e..558ea607bdbe 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java @@ -105,6 +105,9 @@ Page findAllByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus /** * Get the number of build jobs for exercise id. + * + * @param exerciseId the id of the exercise + * @return the number of build jobs */ @Query(""" SELECT COUNT(b) diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html index 2c0a839b7f0a..47e8a7fd5b6c 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.html @@ -31,15 +31,14 @@

        Are you sure you want to delete?

        @if (entitySummaryTitle) { - Summary + } @if (entitySummary) {
          @for (summaryKey of objectKeys(entitySummary); track summaryKey; let i = $index) { - @if (entitySummary[summaryKey] !== null) { + @if (entitySummary[summaryKey] !== undefined) {
        • - {{ summaryKey }}: {{ entitySummary[summaryKey] }} + : {{ entitySummary[summaryKey] }}
          • } } From 0b6d6649c72d9019baeaa919cf157e082579e498 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Mon, 5 Aug 2024 18:58:06 +0200 Subject: [PATCH 15/25] Comments --- .../repository/BuildJobRepository.java | 9 ++-- .../service/exam/ExamDeletionService.java | 18 ++++---- .../manage/exams/exam-detail.component.html | 2 +- .../manage/exams/exam-detail.component.ts | 42 ++++++++----------- .../delete-dialog/delete-button.directive.ts | 6 +-- .../delete-dialog/delete-dialog.component.ts | 4 +- .../delete-dialog/delete-dialog.model.ts | 12 +++++- .../delete-dialog/delete-dialog.service.ts | 23 ++++++++-- src/main/webapp/i18n/de/exam.json | 30 ++++++------- 9 files changed, 79 insertions(+), 67 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java index 558ea607bdbe..c630514bc319 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java @@ -104,10 +104,7 @@ Page findAllByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus List getBuildJobsResultsStatistics(@Param("fromDateTime") ZonedDateTime fromDateTime, @Param("courseId") Long courseId); /** - * Get the number of build jobs for exercise id. - * - * @param exerciseId the id of the exercise - * @return the number of build jobs + * Get the number of build jobs for a list of exercise ids. */ @Query(""" SELECT COUNT(b) @@ -115,7 +112,7 @@ SELECT COUNT(b) LEFT JOIN Result r ON b.result.id = r.id LEFT JOIN Participation p ON r.participation.id = p.id LEFT JOIN Exercise e ON p.exercise.id = e.id - WHERE e.id = :exerciseId + WHERE e.id IN :exerciseIds """) - long countBuildJobsByExerciseId(@Param("exerciseId") Long exerciseId); + long countBuildJobsByExerciseIds(@Param("exerciseIds") List exerciseIds); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java index e60c5e9e09fc..0e246690686d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import de.tum.in.www1.artemis.config.Constants; +import de.tum.in.www1.artemis.domain.DomainObject; import de.tum.in.www1.artemis.domain.Exercise; import de.tum.in.www1.artemis.domain.GradingScale; import de.tum.in.www1.artemis.domain.User; @@ -266,21 +267,18 @@ public void deleteTestRun(Long testRunId) { public ExamDeletionSummaryDTO getExamDeletionSummary(@NotNull long examId) { Exam exam = examRepository.findOneWithEagerExercisesGroupsAndStudentExams(examId); long numberOfBuilds = 0; - for (ExerciseGroup exerciseGroup : exam.getExerciseGroups()) { - var programmingExercises = exerciseGroup.getExercises().stream().filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())).toList(); + List programmingExerciseIds = exam.getExerciseGroups().stream().flatMap(exerciseGroup -> exerciseGroup.getExercises().stream()) + .filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())).map(DomainObject::getId).toList(); + numberOfBuilds += buildJobRepository.countBuildJobsByExerciseIds(programmingExerciseIds); - for (Exercise exercise : programmingExercises) { - numberOfBuilds += buildJobRepository.countBuildJobsByExerciseId(exercise.getId()); - } - } Channel channel = channelRepository.findChannelByExamId(examId); Long conversationId = channel.getId(); - List posts = postRepository.findAllByConversationId(conversationId); - long numberOfCommunicationPosts = posts.size(); - long numberOfAnswerPosts = answerPostRepository.countAnswerPostsByPostIdIn(posts.stream().map(Post::getId).toList()); + List postIds = postRepository.findAllByConversationId(conversationId).stream().map(Post::getId).toList(); + long numberOfCommunicationPosts = postIds.size(); + long numberOfAnswerPosts = answerPostRepository.countAnswerPostsByPostIdIn(postIds); - List studentExams = studentExamRepository.findAllByExamId(examId); + Set studentExams = exam.getStudentExams(); long numberRegisteredStudents = studentExams.size(); long notStartedExams = studentExams.stream().filter(studentExam -> !studentExam.isStarted()).count(); diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html index 29789f1b006e..e3744b67e4a5 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html @@ -88,7 +88,7 @@

          [buttonSize]="buttonSize" [entityTitle]="exam.title || ''" entitySummaryTitle="artemisApp.examManagement.delete.summary.title" - [entitySummary]="examSummary" + [fetchEntitySummary]="fetchExamDeletionSummary()" deleteQuestion="artemisApp.examManagement.delete.question" deleteConfirmationText="artemisApp.examManagement.delete.typeNameToConfirm" (delete)="deleteExam(exam.id!)" diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts index db5980e62417..294d106a9bfa 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts @@ -2,9 +2,9 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { SafeHtml } from '@angular/platform-browser'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { Subject } from 'rxjs'; +import { Observable, Subject, map } from 'rxjs'; import { Exam } from 'app/entities/exam.model'; -import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; +import { ActionType, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; import { ButtonSize } from 'app/shared/components/button.component'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { AccountService } from 'app/core/auth/account.service'; @@ -18,7 +18,6 @@ import { DetailOverviewSection, DetailType } from 'app/detail-overview-list/deta import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { scrollToTopOfPage } from 'app/shared/util/utils'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ExamDeletionSummaryDTO } from 'app/entities/exam-deletion-summary.model'; @Component({ selector: 'jhi-exam-detail', @@ -54,8 +53,6 @@ export class ExamDetailComponent implements OnInit, OnDestroy { examDetailSections: DetailOverviewSection[]; - examSummary: { [key: string]: unknown } = {}; - constructor( private route: ActivatedRoute, private artemisMarkdown: ArtemisMarkdownService, @@ -87,9 +84,6 @@ export class ExamDetailComponent implements OnInit, OnDestroy { this.canHaveBonus = gradingSystemResponse.body.gradeType === GradeType.GRADE; } }); - - this.setExistingSummaryEntries(); - this.fetchAndSetExamDeletionSummary(); }); } @@ -168,13 +162,13 @@ export class ExamDetailComponent implements OnInit, OnDestroy { }); } - private setExistingSummaryEntries() { + private getExistingSummaryEntries(): EntitySummary { const numberOfProgrammingExerciseParticipations = this.exam.exerciseGroups - ?.flatMap((e) => e.exercises) - .filter((e) => e?.type === ExerciseType.PROGRAMMING) - .map((e) => e?.numberOfParticipations ?? 0) - .reduce((a, b) => a + b, 0) ?? 0; + ?.flatMap((exerciseGroup) => exerciseGroup.exercises) + .filter((exercise) => exercise?.type === ExerciseType.PROGRAMMING) + .map((exercise) => exercise?.numberOfParticipations ?? 0) + .reduce((repositorySum, b) => repositorySum + b, 0) ?? 0; const numberOfExercisesPerType = new Map(); this.exam.exerciseGroups?.forEach((exerciseGroup) => { @@ -191,8 +185,7 @@ export class ExamDetailComponent implements OnInit, OnDestroy { const isTestExam = this.exam.testExam ?? false; const isTestCourse = this.exam.course?.testCourse ?? false; - this.examSummary = { - ...this.examSummary, + return { 'artemisApp.examManagement.delete.summary.numberExerciseGroups': numberOfExerciseGroups, 'artemisApp.examManagement.delete.summary.numberProgrammingExercises': numberOfExercisesPerType.get(ExerciseType.PROGRAMMING), 'artemisApp.examManagement.delete.summary.numberModelingExercises': numberOfExercisesPerType.get(ExerciseType.MODELING), @@ -205,17 +198,17 @@ export class ExamDetailComponent implements OnInit, OnDestroy { }; } - fetchAndSetExamDeletionSummary() { - this.examManagementService.getDeletionSummary(this.exam.course!.id!, this.exam.id!).subscribe({ - next: (res: HttpResponse) => { - const summary = res.body; + fetchExamDeletionSummary(): Observable { + return this.examManagementService.getDeletionSummary(this.exam.course!.id!, this.exam.id!).pipe( + map((response) => { + const summary = response.body; if (summary === null) { - return; + return {}; } - this.examSummary = { - ...this.examSummary, + return { + ...this.getExistingSummaryEntries(), 'artemisApp.examManagement.delete.summary.numberBuilds': summary.numberOfBuilds, 'artemisApp.examManagement.delete.summary.numberRegisteredStudents': summary.numberRegisteredStudents, 'artemisApp.examManagement.delete.summary.numberNotStartedExams': summary.numberNotStartedExams, @@ -224,8 +217,7 @@ export class ExamDetailComponent implements OnInit, OnDestroy { 'artemisApp.examManagement.delete.summary.numberCommunicationPosts': summary.numberOfCommunicationPosts, 'artemisApp.examManagement.delete.summary.numberAnswerPosts': summary.numberOfAnswerPosts, }; - }, - error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message), - }); + }), + ); } } diff --git a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts index c4a36ed1dd01..6fe508245dc8 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-button.directive.ts @@ -1,7 +1,7 @@ import { DeleteDialogService } from 'app/shared/delete-dialog/delete-dialog.service'; import { Directive, ElementRef, EventEmitter, HostListener, Input, OnInit, Output, Renderer2 } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { ActionType, DeleteDialogData } from 'app/shared/delete-dialog/delete-dialog.model'; +import { ActionType, DeleteDialogData, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; import { Observable } from 'rxjs'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; @@ -10,7 +10,7 @@ export class DeleteButtonDirective implements OnInit { @Input() entityTitle?: string; @Input() deleteQuestion: string; @Input() entitySummaryTitle?: string; - @Input() entitySummary?: { [key: string]: unknown } = {}; + @Input() fetchEntitySummary?: Observable; @Input() translateValues: { [key: string]: unknown } = {}; @Input() deleteConfirmationText: string; @Input() buttonSize: ButtonSize = ButtonSize.SMALL; @@ -76,7 +76,7 @@ export class DeleteButtonDirective implements OnInit { deleteConfirmationText: this.deleteConfirmationText, additionalChecks: this.additionalChecks, entitySummaryTitle: this.entitySummaryTitle, - entitySummary: this.entitySummary, + fetchEntitySummary: this.fetchEntitySummary, actionType: this.actionType, buttonType: this.buttonType, delete: this.delete, diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts index 2d3497d9ad4d..0a85965d0b38 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { mapValues } from 'lodash-es'; -import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; +import { ActionType, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; import { Observable, Subscription } from 'rxjs'; import { AlertService } from 'app/core/util/alert.service'; import { faBan, faCheck, faSpinner, faTimes, faTrash, faUndo } from '@fortawesome/free-solid-svg-icons'; @@ -25,7 +25,7 @@ export class DeleteDialogComponent implements OnInit, OnDestroy { deleteQuestion: string; entitySummaryTitle?: string; - entitySummary?: { [key: string]: unknown } = {}; + entitySummary?: EntitySummary = {}; translateValues: { [key: string]: unknown } = {}; deleteConfirmationText: string; requireConfirmationOnlyForAdditionalChecks: boolean; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts index 162576784b52..9920bcd69fdf 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.model.ts @@ -15,6 +15,14 @@ export enum ActionType { EndNow = 'endNow', } +/** + * Summary of the entity that will be deleted. + * Key is i18n key, value is the value that will be displayed + */ +export interface EntitySummary { + [key: string]: number | boolean | undefined; +} + /** * Data that will be passed to the delete dialog component */ @@ -32,8 +40,8 @@ export class DeleteDialogData { // i18n key, that will be translated entitySummaryTitle?: string; - // summary of the deletion. Key is i18n key, value is the value that will be displayed - entitySummary?: { [key: string]: unknown }; + // observable that will fetch the entity summary + fetchEntitySummary?: Observable; // parameters used for the delete question translateValues: { [key: string]: unknown }; diff --git a/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts b/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts index e8da5d6c99a0..02ab549f82a8 100644 --- a/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts +++ b/src/main/webapp/app/shared/delete-dialog/delete-dialog.service.ts @@ -1,9 +1,10 @@ import { Injectable } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; -import { DeleteDialogData } from 'app/shared/delete-dialog/delete-dialog.model'; -import { from } from 'rxjs'; +import { DeleteDialogData, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; +import { Observable, from } from 'rxjs'; import { AlertService } from 'app/core/util/alert.service'; +import { HttpErrorResponse } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) export class DeleteDialogService { @@ -28,13 +29,29 @@ export class DeleteDialogService { this.modalRef.componentInstance.deleteConfirmationText = deleteDialogData.deleteConfirmationText; this.modalRef.componentInstance.additionalChecks = deleteDialogData.additionalChecks; this.modalRef.componentInstance.entitySummaryTitle = deleteDialogData.entitySummaryTitle; - this.modalRef.componentInstance.entitySummary = deleteDialogData.entitySummary; + this.modalRef.componentInstance.fetchEntitySummary = deleteDialogData.fetchEntitySummary; this.modalRef.componentInstance.actionType = deleteDialogData.actionType; this.modalRef.componentInstance.buttonType = deleteDialogData.buttonType; this.modalRef.componentInstance.delete = deleteDialogData.delete; this.modalRef.componentInstance.dialogError = deleteDialogData.dialogError; this.modalRef.componentInstance.requireConfirmationOnlyForAdditionalChecks = deleteDialogData.requireConfirmationOnlyForAdditionalChecks; + if (deleteDialogData.fetchEntitySummary !== undefined) { + this.fetchAndSetEntitySummary(deleteDialogData.fetchEntitySummary, this.modalRef.componentInstance); + } + from(this.modalRef.result).subscribe(() => (this.modalRef = null)); } + + /** + * Fetches and sets entity summary by subscribing to fetchEntitySummary. + * @param fetchEntitySummary observable that fetches entity summary + * @param componentInstance instance of DeleteDialogComponent + */ + fetchAndSetEntitySummary(fetchEntitySummary: Observable, componentInstance: DeleteDialogComponent): void { + fetchEntitySummary.subscribe({ + next: (entitySummary: EntitySummary) => (componentInstance.entitySummary = entitySummary), + error: (error: HttpErrorResponse) => this.alertService.error('error.unexpectedError', { error: error.message }), + }); + } } diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index d3319235cf57..0ee83ff03be9 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -602,21 +602,21 @@ "question": "Soll die Klausur {{ title }} wirklich dauerhaft gelöscht werden? Alle zugehörigen Elemente werden gelöscht, inklusive der Klausuren der Studierenden. Diese Aktion kann NICHT rückgängig gemacht werden!", "typeNameToConfirm": "Bitte gib den Namen der Klausur zur Bestätigung ein.", "summary": { - "title": "Klausur Zusammenfassung", - "numberExerciseGroups": "Anzahl Aufgabengruppen", - "numberProgrammingExercises": "Anzahl Programmieraufgaben", - "numberModelingExercises": "Anzahl Modellierungsaufgaben", - "numberTextExercises": "Anzahl Textaufgaben", - "numberFileUploadExercises": "Anzahl Datei-Upload-Aufgaben", - "numberQuizExercises": "Anzahl Quiz-Aufgaben", - "numberRepositories": "Anzahl Repositories", - "numberBuilds": "Anzahl Builds", - "numberRegisteredStudents": "Anzahl angemeldeter Studierender", - "numberNotStartedExams": "Anzahl Klausuren (nicht gestartet)", - "numberStartedExams": "Anzahl Klausuren (gestartet, aber nicht abgegeben)", - "numberSubmittedExams": "Anzahl Klausuren (abgegeben)", - "numberCommunicationPosts": "Anzahl Kommunikationsbeiträge", - "numberAnswerPosts": "Anzahl Antwortbeiträge", + "title": "Klausur-Zusammenfassung", + "numberExerciseGroups": "Anzahl der Aufgabengruppen", + "numberProgrammingExercises": "Anzahl der Programmieraufgaben", + "numberModelingExercises": "Anzahl der Modellierungsaufgaben", + "numberTextExercises": "Anzahl der Textaufgaben", + "numberFileUploadExercises": "Anzahl der Datei-Upload-Aufgaben", + "numberQuizExercises": "Anzahl der Quiz-Aufgaben", + "numberRepositories": "Anzahl der Repositories", + "numberBuilds": "Anzahl der Builds", + "numberRegisteredStudents": "Anzahl der angemeldeten Studierenden", + "numberNotStartedExams": "Anzahl der Klausuren (nicht gestartet)", + "numberStartedExams": "Anzahl der Klausuren (gestartet, aber nicht abgegeben)", + "numberSubmittedExams": "Anzahl der Klausuren (abgegeben)", + "numberCommunicationPosts": "Anzahl der Kommunikationsbeiträge", + "numberAnswerPosts": "Anzahl der Antwortbeiträge", "isTestExam": "Testklausur", "isTestCourse": "Testkurs" } From cfeecfbb8bc1f0aefffe607c27197609f51be23c Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Mon, 5 Aug 2024 19:03:59 +0200 Subject: [PATCH 16/25] specify missing type --- src/main/webapp/app/exam/manage/exams/exam-detail.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts index 294d106a9bfa..f182ca3b0a58 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts @@ -168,7 +168,7 @@ export class ExamDetailComponent implements OnInit, OnDestroy { ?.flatMap((exerciseGroup) => exerciseGroup.exercises) .filter((exercise) => exercise?.type === ExerciseType.PROGRAMMING) .map((exercise) => exercise?.numberOfParticipations ?? 0) - .reduce((repositorySum, b) => repositorySum + b, 0) ?? 0; + .reduce((repositorySum, numberOfParticipationsForRepository) => repositorySum + numberOfParticipationsForRepository, 0) ?? 0; const numberOfExercisesPerType = new Map(); this.exam.exerciseGroups?.forEach((exerciseGroup) => { From 7cf6db4e21a0516899ef682b6c5a7ccc5414ab91 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Mon, 5 Aug 2024 19:10:32 +0200 Subject: [PATCH 17/25] smaller improvements --- .../in/www1/artemis/repository/BuildJobRepository.java | 3 +++ .../in/www1/artemis/service/exam/ExamDeletionService.java | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java index c630514bc319..24b4c302b6da 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java @@ -105,6 +105,9 @@ Page findAllByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus /** * Get the number of build jobs for a list of exercise ids. + * + * @param exerciseIds the list of exercise ids + * @return the number of build jobs */ @Query(""" SELECT COUNT(b) diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java index 0e246690686d..b75f2bbff7f6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java @@ -19,7 +19,6 @@ import org.springframework.stereotype.Service; import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.DomainObject; import de.tum.in.www1.artemis.domain.Exercise; import de.tum.in.www1.artemis.domain.GradingScale; import de.tum.in.www1.artemis.domain.User; @@ -266,10 +265,9 @@ public void deleteTestRun(Long testRunId) { */ public ExamDeletionSummaryDTO getExamDeletionSummary(@NotNull long examId) { Exam exam = examRepository.findOneWithEagerExercisesGroupsAndStudentExams(examId); - long numberOfBuilds = 0; - List programmingExerciseIds = exam.getExerciseGroups().stream().flatMap(exerciseGroup -> exerciseGroup.getExercises().stream()) - .filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())).map(DomainObject::getId).toList(); - numberOfBuilds += buildJobRepository.countBuildJobsByExerciseIds(programmingExerciseIds); + long numberOfBuilds = exam.getExerciseGroups().stream().flatMap(group -> group.getExercises().stream()) + .filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())) + .mapToLong(exercise -> buildJobRepository.countBuildJobsByExerciseIds(List.of(exercise.getId()))).sum(); Channel channel = channelRepository.findChannelByExamId(examId); Long conversationId = channel.getId(); From 771e9d15bbccc4b992679ff10ffcb444655e02be Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Thu, 15 Aug 2024 14:33:06 +0200 Subject: [PATCH 18/25] Fix nullable Boolean --- .../in/www1/artemis/service/exam/ExamDeletionService.java | 7 ++++--- src/main/webapp/i18n/de/exam.json | 2 +- src/main/webapp/i18n/en/exam.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java index b75f2bbff7f6..f6c9ea6d47db 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java @@ -279,9 +279,10 @@ public ExamDeletionSummaryDTO getExamDeletionSummary(@NotNull long examId) { Set studentExams = exam.getStudentExams(); long numberRegisteredStudents = studentExams.size(); - long notStartedExams = studentExams.stream().filter(studentExam -> !studentExam.isStarted()).count(); - long startedExams = studentExams.stream().filter(studentExam -> studentExam.isStarted() && !studentExam.isSubmitted()).count(); - long submittedExams = studentExams.stream().filter(StudentExam::isSubmitted).count(); + // Boolean.TRUE/Boolean.FALSE are used to handle the case where isStarted/isSubmitted is null + long notStartedExams = studentExams.stream().filter(studentExam -> studentExam.isStarted() == null || !studentExam.isStarted()).count(); + long startedExams = studentExams.stream().filter(studentExam -> Boolean.TRUE.equals(studentExam.isStarted())).count(); + long submittedExams = studentExams.stream().filter(studentExam -> Boolean.TRUE.equals(studentExam.isStarted()) && Boolean.TRUE.equals(studentExam.isSubmitted())).count(); return new ExamDeletionSummaryDTO(numberOfBuilds, numberOfCommunicationPosts, numberOfAnswerPosts, numberRegisteredStudents, notStartedExams, startedExams, submittedExams); } diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index 0ee83ff03be9..491ff121c7ed 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -613,7 +613,7 @@ "numberBuilds": "Anzahl der Builds", "numberRegisteredStudents": "Anzahl der angemeldeten Studierenden", "numberNotStartedExams": "Anzahl der Klausuren (nicht gestartet)", - "numberStartedExams": "Anzahl der Klausuren (gestartet, aber nicht abgegeben)", + "numberStartedExams": "Anzahl der Klausuren", "numberSubmittedExams": "Anzahl der Klausuren (abgegeben)", "numberCommunicationPosts": "Anzahl der Kommunikationsbeiträge", "numberAnswerPosts": "Anzahl der Antwortbeiträge", diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index a32a690151eb..9a5a522e6f37 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -614,7 +614,7 @@ "numberBuilds": "Number of Builds", "numberRegisteredStudents": "Number of Registered Students", "numberNotStartedExams": "Number of Exams (not started)", - "numberStartedExams": "Number of Exams (started, but not submitted)", + "numberStartedExams": "Number of Exams", "numberSubmittedExams": "Number of Exams (submitted)", "numberCommunicationPosts": "Number of Communication Posts", "numberAnswerPosts": "Number of Answer Posts", From aad6655ede8b8d2a660eb1590defedea6118a48b Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Thu, 15 Aug 2024 14:34:47 +0200 Subject: [PATCH 19/25] Add test --- .../exam/ExamDeletionIntegrationTest.java | 145 ++++++++++++++++++ .../in/www1/artemis/exam/ExamUtilService.java | 41 +++++ 2 files changed, 186 insertions(+) create mode 100644 src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java new file mode 100644 index 000000000000..c0963b8402f4 --- /dev/null +++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java @@ -0,0 +1,145 @@ +package de.tum.in.www1.artemis.exam; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.ZonedDateTime; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.test.context.support.WithMockUser; + +import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.in.www1.artemis.domain.BuildJob; +import de.tum.in.www1.artemis.domain.Course; +import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.in.www1.artemis.domain.Result; +import de.tum.in.www1.artemis.domain.User; +import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; +import de.tum.in.www1.artemis.domain.exam.Exam; +import de.tum.in.www1.artemis.domain.exam.StudentExam; +import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.in.www1.artemis.domain.metis.conversation.Channel; +import de.tum.in.www1.artemis.domain.participation.Participation; +import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.in.www1.artemis.participation.ParticipationUtilService; +import de.tum.in.www1.artemis.repository.BuildJobRepository; +import de.tum.in.www1.artemis.repository.StudentExamRepository; +import de.tum.in.www1.artemis.service.exam.ExamSessionService; +import de.tum.in.www1.artemis.web.rest.dto.ExamDeletionSummaryDTO; + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class ExamDeletionIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + private static final String TEST_PREFIX = "examdeletion"; + + @Autowired + private ExamUtilService examUtilService; + + @Autowired + private ExamSessionService examSessionService; + + @Autowired + private StudentExamRepository studentExamRepository; + + @Autowired + private ParticipationUtilService participationUtilService; + + @Autowired + private BuildJobRepository buildJobRepository; + + private static final int NUMBER_OF_STUDENTS = 4; + + private static final int NUMBER_OF_TUTORS = 1; + + private Course course; + + private Exam exam; + + private ProgrammingExercise programmingExercise; + + private User student1; + + private User student2; + + private User student3; + + private User student4; + + @BeforeAll + void setup() { + // setup users + userUtilService.addUsers(TEST_PREFIX, NUMBER_OF_STUDENTS, NUMBER_OF_TUTORS, 0, 1); + + student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + student2 = userUtilService.getUserByLogin(TEST_PREFIX + "student2"); + student3 = userUtilService.getUserByLogin(TEST_PREFIX + "student3"); + student4 = userUtilService.getUserByLogin(TEST_PREFIX + "student4"); + User instructor = userUtilService.getUserByLogin(TEST_PREFIX + "instructor1"); + + // reset courses + course = courseUtilService.addEmptyCourse(); + + exam = examUtilService.addExam(course); + exam = examUtilService.registerUsersForExamAndSaveExam(exam, TEST_PREFIX, NUMBER_OF_STUDENTS); + + Channel channel = examUtilService.addExamChannel(exam, "exam1 channel"); + Post instructorPost = examUtilService.addPost(channel, "Instructor Post", instructor); + examUtilService.addAnswerPost(instructorPost, "Student Answer", student1); + examUtilService.addAnswerPost(instructorPost, "Instructor Answer", instructor); + + exam = examUtilService.addTextModelingProgrammingExercisesToExam(exam, true, true); + programmingExercise = (ProgrammingExercise) exam.getExerciseGroups().stream().flatMap(exerciseGroup -> exerciseGroup.getExercises().stream()) + .filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())).findFirst().orElseThrow(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testDeleteExamSummary() throws Exception { + addStudentExam(student1, false, false); + addStudentExam(student2, false, false); + + addStudentExam(student3, true, false); + ProgrammingExerciseStudentParticipation participation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, student3.getLogin()); + Result result = participationUtilService.createSubmissionAndResult(participation, 1L, true); + createBuildJob(participation, result); + + addStudentExam(student4, true, true); + + var response = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/deletion-summary", HttpStatus.OK, ExamDeletionSummaryDTO.class); + assertThat(response.numberOfBuilds()).isEqualTo(1); + assertThat(response.numberOfCommunicationPosts()).isEqualTo(1); + assertThat(response.numberOfAnswerPosts()).isEqualTo(2); + assertThat(response.numberNotStartedExams()).isEqualTo(2); + assertThat(response.numberStartedExams()).isEqualTo(2); + assertThat(response.numberSubmittedExams()).isEqualTo(1); + } + + private void addStudentExam(User student, boolean isStarted, boolean isSubmitted) { + StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, student); + examSessionService.startExamSession(studentExam, null, null, null, null); + if (isStarted) { + studentExam.setStartedAndStartDate(ZonedDateTime.now()); + } + if (isSubmitted) { + studentExam.setSubmissionDate(ZonedDateTime.now()); + studentExam.setSubmitted(true); + } + + if (isStarted || isSubmitted) { + studentExamRepository.save(studentExam); + } + } + + private void createBuildJob(Participation participation, Result result) { + var buildJob = new BuildJob(); + buildJob.setExerciseId(programmingExercise.getId()); + buildJob.setCourseId(course.getId()); + buildJob.setParticipationId(participation.getId()); + buildJob.setResult(result); + + buildJobRepository.save(buildJob); + } +} diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java index cfda8a27741d..15fee5f86c39 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java @@ -35,6 +35,8 @@ import de.tum.in.www1.artemis.domain.exam.ExamUser; import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; import de.tum.in.www1.artemis.domain.exam.StudentExam; +import de.tum.in.www1.artemis.domain.metis.AnswerPost; +import de.tum.in.www1.artemis.domain.metis.Post; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; import de.tum.in.www1.artemis.domain.participation.StudentParticipation; @@ -63,6 +65,8 @@ import de.tum.in.www1.artemis.repository.StudentParticipationRepository; import de.tum.in.www1.artemis.repository.SubmissionRepository; import de.tum.in.www1.artemis.repository.UserRepository; +import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; +import de.tum.in.www1.artemis.repository.metis.PostRepository; import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; import de.tum.in.www1.artemis.service.quiz.QuizPoolService; import de.tum.in.www1.artemis.user.UserUtilService; @@ -128,6 +132,12 @@ public class ExamUtilService { @Autowired private ConversationRepository conversationRepository; + @Autowired + private PostRepository postRepository; + + @Autowired + private AnswerPostRepository answerPostRepository; + @Autowired private ParticipationUtilService participationUtilService; @@ -517,6 +527,37 @@ public Channel addExamChannel(Exam exam, String channelName) { return conversationRepository.save(channel); } + /** + * Creates and saves a Post for the given Channel. + * + * @param channel The Channel for which the Post should be created + * @param title The title of the Post + * @param author The author of the Post + * @return The newly created Post + */ + public Post addPost(Channel channel, String title, User author) { + Post post = new Post(); + post.setTitle(title); + post.setConversation(channel); + post.setAuthor(author); + return postRepository.save(post); + } + + /** + * Creates and saves an AnswerPost for the given Post. + * + * @param post The Post for which the AnswerPost should be created + * @param content The content of the AnswerPost + * @param author The author of the AnswerPost + */ + public void addAnswerPost(Post post, String content, User author) { + AnswerPost answerPost = new AnswerPost(); + answerPost.setContent(content); + answerPost.setPost(post); + answerPost.setAuthor(author); + answerPostRepository.save(answerPost); + } + /** * Creates and saves an Exam and corresponding StudentExam with a registered User. The Exam started 1 hour ago and ends in 1 hour. * From c6dc37c4fb02b3ef8703d2ada983e444e03f9aaf Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Thu, 15 Aug 2024 14:47:26 +0200 Subject: [PATCH 20/25] Naming --- .../in/www1/artemis/exam/ExamDeletionIntegrationTest.java | 8 ++++---- .../java/de/tum/in/www1/artemis/exam/ExamUtilService.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java index c0963b8402f4..f8f1ffce99a0 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamDeletionIntegrationTest.java @@ -86,9 +86,9 @@ void setup() { exam = examUtilService.registerUsersForExamAndSaveExam(exam, TEST_PREFIX, NUMBER_OF_STUDENTS); Channel channel = examUtilService.addExamChannel(exam, "exam1 channel"); - Post instructorPost = examUtilService.addPost(channel, "Instructor Post", instructor); - examUtilService.addAnswerPost(instructorPost, "Student Answer", student1); - examUtilService.addAnswerPost(instructorPost, "Instructor Answer", instructor); + Post instructorPost = examUtilService.createPost(channel, "Instructor Post", instructor); + examUtilService.createAnswerPost(instructorPost, "Student Answer", student1); + examUtilService.createAnswerPost(instructorPost, "Instructor Answer", instructor); exam = examUtilService.addTextModelingProgrammingExercisesToExam(exam, true, true); programmingExercise = (ProgrammingExercise) exam.getExerciseGroups().stream().flatMap(exerciseGroup -> exerciseGroup.getExercises().stream()) @@ -97,7 +97,7 @@ void setup() { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testDeleteExamSummary() throws Exception { + void testDeletionSummary() throws Exception { addStudentExam(student1, false, false); addStudentExam(student2, false, false); diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java index d95b356522f0..6a35ec4ecc4e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java @@ -539,7 +539,7 @@ public Channel addExamChannel(Exam exam, String channelName) { * @param author The author of the Post * @return The newly created Post */ - public Post addPost(Channel channel, String title, User author) { + public Post createPost(Channel channel, String title, User author) { Post post = new Post(); post.setTitle(title); post.setConversation(channel); @@ -554,7 +554,7 @@ public Post addPost(Channel channel, String title, User author) { * @param content The content of the AnswerPost * @param author The author of the AnswerPost */ - public void addAnswerPost(Post post, String content, User author) { + public void createAnswerPost(Post post, String content, User author) { AnswerPost answerPost = new AnswerPost(); answerPost.setContent(content); answerPost.setPost(post); From 2f2c8ebbdb1247684e604b3551f40788f94ac5a7 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sat, 28 Sep 2024 14:16:40 +0200 Subject: [PATCH 21/25] Revert unintended change --- .../app/course/manage/image-cropper-modal.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/course/manage/image-cropper-modal.component.html b/src/main/webapp/app/course/manage/image-cropper-modal.component.html index 73b5f5b4530d..3c2f6dacb96d 100644 --- a/src/main/webapp/app/course/manage/image-cropper-modal.component.html +++ b/src/main/webapp/app/course/manage/image-cropper-modal.component.html @@ -6,13 +6,14 @@

          From 01821cd157e2dd01ccf268615b84a75723af1f5a Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Sat, 28 Sep 2024 14:25:03 +0200 Subject: [PATCH 22/25] Merge aftermath --- .../aet/artemis/core/dto/ExamDeletionSummaryDTO.java | 0 .../aet/artemis/exam/dto/ExamDeletionSummaryDTO.java | 8 ++++++++ .../artemis/exam/service/ExamDeletionService.java | 12 ++++++------ .../tum/cit/aet/artemis/exam/web/ExamResource.java | 4 ++-- .../de/tum/cit/aet/artemis/exam/ExamUtilService.java | 8 ++++---- 5 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/core/dto/ExamDeletionSummaryDTO.java create mode 100644 src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamDeletionSummaryDTO.java diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/ExamDeletionSummaryDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/ExamDeletionSummaryDTO.java deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamDeletionSummaryDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamDeletionSummaryDTO.java new file mode 100644 index 000000000000..c0cd6608ec2c --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamDeletionSummaryDTO.java @@ -0,0 +1,8 @@ +package de.tum.cit.aet.artemis.exam.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record ExamDeletionSummaryDTO(long numberOfBuilds, long numberOfCommunicationPosts, long numberOfAnswerPosts, long numberRegisteredStudents, long numberNotStartedExams, + long numberStartedExams, long numberSubmittedExams) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java index b6e2f480ff0e..1c05e1d4be65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java @@ -20,7 +20,10 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -29,21 +32,18 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamDeletionSummaryDTO; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.repository.BuildJobRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.web.rest.dto.ExamDeletionSummaryDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java index 2cc871f38012..ae22a2fee5cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java @@ -77,6 +77,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; @@ -88,6 +89,7 @@ import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamDeletionSummaryDTO; import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; @@ -112,8 +114,6 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.web.rest.dto.ExamDeletionSummaryDTO; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java index 9d20f2c4fa44..baf92ffe96a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java @@ -15,7 +15,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; @@ -67,10 +71,6 @@ import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; /** * Service responsible for initializing the database with specific testdata related to exams for use in integration tests. From e9695e4a0140769a2205bd521406522f227c5d1e Mon Sep 17 00:00:00 2001 From: Ole Vester <73833780+ole-ve@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:43:57 +0200 Subject: [PATCH 23/25] General: Add course summary to course deletion dialog (#9186) --- .../artemis/communication/domain/Post.java | 4 ++ .../repository/PostRepository.java | 2 + .../core/dto/CourseDeletionSummaryDTO.java | 7 ++ .../artemis/core/service/CourseService.java | 33 ++++++++- .../core/web/admin/AdminCourseResource.java | 16 +++++ .../ProgrammingExerciseRepository.java | 2 + .../app/course/manage/course-admin.service.ts | 9 +++ .../course-management-tab-bar.component.html | 2 + .../course-management-tab-bar.component.ts | 68 ++++++++++++++++++- .../entities/course-deletion-summary.model.ts | 5 ++ src/main/webapp/i18n/de/course.json | 21 +++++- src/main/webapp/i18n/en/course.json | 21 +++++- .../artemis/post/ConversationUtilService.java | 1 + .../artemis/service/CourseServiceTest.java | 52 ++++++++++++++ 14 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 src/main/java/de/tum/cit/aet/artemis/core/dto/CourseDeletionSummaryDTO.java create mode 100644 src/main/webapp/app/entities/course-deletion-summary.model.ts diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java index d3bf4e217ea3..4ff2d48fedf5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java @@ -167,6 +167,10 @@ public void addTag(String tag) { this.tags.add(tag); } + public void setCourse(Course course) { + this.course = course; + } + public Conversation getConversation() { return conversation; } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java index b6b11bd06719..4516914df82f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java @@ -63,4 +63,6 @@ default Post findPostOrMessagePostByIdElseThrow(Long postId) throws EntityNotFou } List findAllByConversationId(Long conversationId); + + List findAllByCourseId(Long courseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseDeletionSummaryDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseDeletionSummaryDTO.java new file mode 100644 index 000000000000..2f3b8d51596c --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseDeletionSummaryDTO.java @@ -0,0 +1,7 @@ +package de.tum.cit.aet.artemis.core.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record CourseDeletionSummaryDTO(long numberOfBuilds, long numberOfCommunicationPosts, long numberOfAnswerPosts) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java index 9e3b69f269cc..5a05904d25fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java @@ -58,8 +58,11 @@ import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.communication.domain.NotificationType; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -67,6 +70,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.CourseContentCount; +import de.tum.cit.aet.artemis.core.dto.CourseDeletionSummaryDTO; import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; import de.tum.cit.aet.artemis.core.dto.DueDateStat; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; @@ -103,6 +107,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; @@ -198,6 +203,12 @@ public class CourseService { private final TutorialGroupNotificationRepository tutorialGroupNotificationRepository; + private final PostRepository postRepository; + + private final AnswerPostRepository answerPostRepository; + + private final BuildJobRepository buildJobRepository; + public CourseService(CourseRepository courseRepository, ExerciseService exerciseService, ExerciseDeletionService exerciseDeletionService, AuthorizationCheckService authCheckService, UserRepository userRepository, LectureService lectureService, GroupNotificationRepository groupNotificationRepository, ExerciseGroupRepository exerciseGroupRepository, AuditEventRepository auditEventRepository, UserService userService, ExamDeletionService examDeletionService, @@ -210,7 +221,8 @@ public CourseService(CourseRepository courseRepository, ExerciseService exercise TutorialGroupRepository tutorialGroupRepository, PlagiarismCaseRepository plagiarismCaseRepository, ConversationRepository conversationRepository, LearningPathService learningPathService, Optional irisSettingsService, LectureRepository lectureRepository, TutorialGroupNotificationRepository tutorialGroupNotificationRepository, TutorialGroupChannelManagementService tutorialGroupChannelManagementService, - PrerequisiteRepository prerequisiteRepository, CompetencyRelationRepository competencyRelationRepository) { + PrerequisiteRepository prerequisiteRepository, CompetencyRelationRepository competencyRelationRepository, PostRepository postRepository, + AnswerPostRepository answerPostRepository, BuildJobRepository buildJobRepository) { this.courseRepository = courseRepository; this.exerciseService = exerciseService; this.exerciseDeletionService = exerciseDeletionService; @@ -250,6 +262,9 @@ public CourseService(CourseRepository courseRepository, ExerciseService exercise this.tutorialGroupChannelManagementService = tutorialGroupChannelManagementService; this.prerequisiteRepository = prerequisiteRepository; this.competencyRelationRepository = competencyRelationRepository; + this.buildJobRepository = buildJobRepository; + this.postRepository = postRepository; + this.answerPostRepository = answerPostRepository; } /** @@ -440,6 +455,22 @@ public Set findAllOnlineCoursesForPlatformForUser(String registrationId, .collect(Collectors.toSet()); } + /** + * Get the course deletion summary for the given course. + * + * @param course the course for which to get the deletion summary + * @return the course deletion summary + */ + public CourseDeletionSummaryDTO getDeletionSummary(Course course) { + List programmingExerciseIds = course.getExercises().stream().map(Exercise::getId).toList(); + long numberOfBuilds = buildJobRepository.countBuildJobsByExerciseIds(programmingExerciseIds); + + List posts = postRepository.findAllByCourseId(course.getId()); + long numberOfCommunicationPosts = posts.size(); + long numberOfAnswerPosts = answerPostRepository.countAnswerPostsByPostIdIn(posts.stream().map(Post::getId).toList()); + return new CourseDeletionSummaryDTO(numberOfBuilds, numberOfCommunicationPosts, numberOfAnswerPosts); + } + /** * Deletes all elements associated with the course including: *
            diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index a75b2e2d4a0a..83c0647a8b62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; 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.CourseDeletionSummaryDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -183,6 +184,21 @@ public ResponseEntity deleteCourse(@PathVariable long courseId) { return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, Course.ENTITY_NAME, course.getTitle())).build(); } + /** + * GET /courses/:courseId/deletion-summary : get the deletion summary for the course with the given id. + * + * @param courseId the id of the course + * @return the ResponseEntity with status 200 (OK) and the deletion summary in the body + */ + @GetMapping("courses/{courseId}/deletion-summary") + @EnforceAdmin + public ResponseEntity getDeletionSummary(@PathVariable long courseId) { + log.debug("REST request to get deletion summary course: {}", courseId); + final Course course = courseRepository.findByIdWithEagerExercisesElseThrow(courseId); + + return ResponseEntity.ok().body(courseService.getDeletionSummary(course)); + } + /** * Creates a default channel with the given name and adds all students, tutors and instructors as participants. * diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 1e27f9a20b24..6bd819e1f8bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -116,6 +116,8 @@ Optional findWithTemplateAndSolutionParticipationTeamAssign List findAllByProjectKey(String projectKey); + List findAllByCourseId(Long courseId); + @EntityGraph(type = LOAD, attributePaths = "submissionPolicy") List findWithSubmissionPolicyByProjectKey(String projectKey); diff --git a/src/main/webapp/app/course/manage/course-admin.service.ts b/src/main/webapp/app/course/manage/course-admin.service.ts index fe7ceef20670..1185c439a8d2 100644 --- a/src/main/webapp/app/course/manage/course-admin.service.ts +++ b/src/main/webapp/app/course/manage/course-admin.service.ts @@ -5,6 +5,7 @@ import { map } from 'rxjs/operators'; import { Course } from 'app/entities/course.model'; import { objectToJsonBlob } from 'app/utils/blob-util'; import { CourseManagementService } from 'app/course/manage/course-management.service'; +import { CourseDeletionSummaryDTO } from 'app/entities/course-deletion-summary.model'; export type EntityResponseType = HttpResponse; export type EntityArrayResponseType = HttpResponse; @@ -51,4 +52,12 @@ export class CourseAdminService { delete(courseId: number): Observable> { return this.http.delete(`${this.resourceUrl}/${courseId}`, { observe: 'response' }); } + + /** + * Returns a summary for the course providing information potentially relevant for the deletion. + * @param courseId - the id of the course to get the deletion summary for + */ + getDeletionSummary(courseId: number): Observable> { + return this.http.get(`${this.resourceUrl}/${courseId}/deletion-summary`, { observe: 'response' }); + } } diff --git a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html index 3c953bcf4e3a..4ac525211528 100644 --- a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html +++ b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html @@ -101,6 +101,8 @@ [buttonSize]="ButtonSize.MEDIUM" jhiDeleteButton [entityTitle]="course.title || ''" + entitySummaryTitle="artemisApp.course.delete.summary.title" + [fetchEntitySummary]="fetchCourseDeletionSummary()" deleteQuestion="artemisApp.course.delete.question" deleteConfirmationText="artemisApp.course.delete.typeNameToConfirm" (delete)="deleteCourse(course.id!)" diff --git a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.ts b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.ts index c46c04bbcf5d..bfa9f0ef4dc4 100644 --- a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.ts +++ b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { HttpErrorResponse } from '@angular/common/http'; -import { Subject, Subscription } from 'rxjs'; +import { Observable, Subject, Subscription, map, of } from 'rxjs'; import { Course, isCommunicationEnabled } from 'app/entities/course.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ButtonSize } from 'app/shared/components/button.component'; @@ -33,6 +33,8 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_IRIS, PROFILE_LOCALCI, PROFILE_LTI } from 'app/app.constants'; import { CourseAccessStorageService } from 'app/course/course-access-storage.service'; import { scrollToTopOfPage } from 'app/shared/util/utils'; +import { ExerciseType } from 'app/entities/exercise.model'; +import { EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model'; @Component({ selector: 'jhi-course-management-tab-bar', @@ -198,4 +200,68 @@ export class CourseManagementTabBarComponent implements OnInit, OnDestroy, After const courseManagementRegex = /course-management\/[0-9]+(\/edit)?$/; return courseManagementRegex.test(this.router.url); } + + private getExistingSummaryEntries(): EntitySummary { + const numberRepositories = + this.course?.exercises + ?.filter((exercise) => exercise.type === 'programming') + .map((exercise) => exercise?.numberOfParticipations ?? 0) + .reduce((repositorySum, numberOfParticipationsForRepository) => repositorySum + numberOfParticipationsForRepository, 0) ?? 0; + + const numberOfExercisesPerType = new Map(); + this.course?.exercises?.forEach((exercise) => { + if (exercise.type === undefined) { + return; + } + const oldValue = numberOfExercisesPerType.get(exercise.type) ?? 0; + numberOfExercisesPerType.set(exercise.type, oldValue + 1); + }); + + const numberExams = this.course?.numberOfExams ?? 0; + const numberLectures = this.course?.lectures?.length ?? 0; + const numberStudents = this.course?.numberOfStudents ?? 0; + const numberTutors = this.course?.numberOfTeachingAssistants ?? 0; + const numberEditors = this.course?.numberOfEditors ?? 0; + const numberInstructors = this.course?.numberOfInstructors ?? 0; + const isTestCourse = this.course?.testCourse; + + return { + 'artemisApp.course.delete.summary.numberRepositories': numberRepositories, + 'artemisApp.course.delete.summary.numberProgrammingExercises': numberOfExercisesPerType.get(ExerciseType.PROGRAMMING) ?? 0, + 'artemisApp.course.delete.summary.numberModelingExercises': numberOfExercisesPerType.get(ExerciseType.MODELING) ?? 0, + 'artemisApp.course.delete.summary.numberTextExercises': numberOfExercisesPerType.get(ExerciseType.TEXT) ?? 0, + 'artemisApp.course.delete.summary.numberFileUploadExercises': numberOfExercisesPerType.get(ExerciseType.FILE_UPLOAD) ?? 0, + 'artemisApp.course.delete.summary.numberQuizExercises': numberOfExercisesPerType.get(ExerciseType.QUIZ) ?? 0, + 'artemisApp.course.delete.summary.numberExams': numberExams, + 'artemisApp.course.delete.summary.numberLectures': numberLectures, + 'artemisApp.course.delete.summary.numberStudents': numberStudents, + 'artemisApp.course.delete.summary.numberTutors': numberTutors, + 'artemisApp.course.delete.summary.numberEditors': numberEditors, + 'artemisApp.course.delete.summary.numberInstructors': numberInstructors, + 'artemisApp.course.delete.summary.isTestCourse': isTestCourse, + }; + } + + fetchCourseDeletionSummary(): Observable { + if (this.course?.id === undefined) { + return of({}); + } + + return this.courseAdminService.getDeletionSummary(this.course.id).pipe( + map((response) => { + const summary = response.body; + + if (summary === null) { + return {}; + } + + return { + ...this.getExistingSummaryEntries(), + 'artemisApp.course.delete.summary.numberBuilds': summary.numberOfBuilds, + 'artemisApp.course.delete.summary.numberCommunicationPosts': summary.numberOfCommunicationPosts, + 'artemisApp.course.delete.summary.numberAnswerPosts': summary.numberOfAnswerPosts, + }; + }), + ); + } } diff --git a/src/main/webapp/app/entities/course-deletion-summary.model.ts b/src/main/webapp/app/entities/course-deletion-summary.model.ts new file mode 100644 index 000000000000..606a9d440d49 --- /dev/null +++ b/src/main/webapp/app/entities/course-deletion-summary.model.ts @@ -0,0 +1,5 @@ +export interface CourseDeletionSummaryDTO { + numberOfBuilds: number; + numberOfCommunicationPosts: number; + numberOfAnswerPosts: number; +} diff --git a/src/main/webapp/i18n/de/course.json b/src/main/webapp/i18n/de/course.json index 7bc9274e7461..dd0d86837902 100644 --- a/src/main/webapp/i18n/de/course.json +++ b/src/main/webapp/i18n/de/course.json @@ -13,7 +13,26 @@ "delete": { "question": "Soll der Kurs {{ title }} wirklich dauerhaft gelöscht werden? Alle zugehörigen Elemente, inklusive der Klausuren, Aufgaben sowie Repositories und Build-Pläne werden gelöscht. Diese Aktion kann NICHT rückgängig gemacht werden!", "typeNameToConfirm": "Bitte gib den Namen des Kurses zur Bestätigung ein.", - "icon": "Kursicon löschen" + "icon": "Kursicon löschen", + "summary": { + "title": "Kurszusammenfassung", + "numberExams": "Anzahl der Klausuren", + "numberLectures": "Anzahl der Vorlesungen", + "numberStudents": "Anzahl der Studierenden", + "numberTutors": "Anzahl der Tutor:innen", + "numberEditors": "Anzahl der Editor:innen", + "numberInstructors": "Anzahl der Lehrenden", + "numberProgrammingExercises": "Anzahl der Programmieraufgaben", + "numberModelingExercises": "Anzahl der Modellierungsaufgaben", + "numberTextExercises": "Anzahl der Textaufgaben", + "numberFileUploadExercises": "Anzahl der Dateiupload-Aufgaben", + "numberQuizExercises": "Anzahl der Quizaufgaben", + "numberRepositories": "Anzahl der Repositories", + "numberBuilds": "Anzahl der Builds", + "numberCommunicationPosts": "Anzahl der Kommunikationsbeiträge", + "numberAnswerPosts": "Anzahl der Antwortbeiträge", + "isTestCourse": "Testkurs" + } }, "showActive": "Nur aktive Kurse anzeigen", "totalScore": "Gesamtergebnis:", diff --git a/src/main/webapp/i18n/en/course.json b/src/main/webapp/i18n/en/course.json index e977ca0d3f3f..e79ff114bc27 100644 --- a/src/main/webapp/i18n/en/course.json +++ b/src/main/webapp/i18n/en/course.json @@ -13,7 +13,26 @@ "delete": { "question": "Are you sure you want to permanently delete the course {{ title }}? All associated elements will be deleted, including exams, exercises, repositories and build plans. This action can NOT be undone!", "typeNameToConfirm": "Please type in the name of the course to confirm.", - "icon": "Remove Icon" + "icon": "Remove Icon", + "summary": { + "title": "Course Summary", + "numberExams": "Number of Exams", + "numberLectures": "Number of Lectures", + "numberStudents": "Number of Students", + "numberTutors": "Number of Tutors", + "numberEditors": "Number of Editors", + "numberInstructors": "Number of Instructors", + "numberProgrammingExercises": "Number of Programming Exercises", + "numberModelingExercises": "Number of Modeling Exercises", + "numberTextExercises": "Number of Text Exercises", + "numberFileUploadExercises": "Number of File Upload Exercises", + "numberQuizExercises": "Number of Quiz Exercises", + "numberRepositories": "Number of Repositories", + "numberBuilds": "Number of Builds", + "numberCommunicationPosts": "Number of Communication Posts", + "numberAnswerPosts": "Number of Answer Posts", + "isTestCourse": "Test Course" + } }, "showActive": "Show only active courses", "totalScore": "Total Score:", diff --git a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java index 081614632e1e..0d7ef94df485 100644 --- a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java @@ -660,6 +660,7 @@ private Post createMessageWithReactionForUser(String login, String messageText, message.setAuthor(userUtilService.getUserByLogin(login)); message.setContent(messageText); message.setCreationDate(ZonedDateTime.now()); + message.setCourse(conversation.getCourse()); conversation.setCreator(message.getAuthor()); addReactionForUserToPost(login, message); conversationRepository.save(conversation); diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index 680d96836fec..9f2413555a27 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -21,6 +21,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.dto.StudentDTO; @@ -29,11 +30,19 @@ import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; @@ -53,6 +62,9 @@ class CourseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { @Autowired private StudentParticipationRepository studentParticipationRepo; + @Autowired + private BuildJobRepository buildJobRepo; + @Autowired private ExerciseRepository exerciseRepo; @@ -62,6 +74,12 @@ class CourseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { @Autowired private CourseUtilService courseUtilService; + @Autowired + private ParticipationUtilService participationUtilService; + + @Autowired + private ConversationUtilService conversationUtilService; + @BeforeEach void initTestCase() { userUtilService.addUsers(TEST_PREFIX, 2, 0, 0, 1); @@ -310,9 +328,43 @@ else if (dto1.email() != null) { assertThat(registrationFailures).containsExactly(dto2); } + @Test + void testDeletionSummary() { + SecurityUtils.setAuthorizationObject(); + Course course = courseUtilService.addEmptyCourse(); + + var programmingExercise = ProgrammingExerciseFactory.generateProgrammingExercise(ZonedDateTime.now(), ZonedDateTime.now().plusDays(7), course); + programmingExercise.setBuildConfig(programmingExerciseBuildConfigRepository.save(programmingExercise.getBuildConfig())); + programmingExerciseRepository.save(programmingExercise); + + var student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + + conversationUtilService.addMessageInChannelOfCourseForUser(student1.getLogin(), course, TEST_PREFIX + "message"); + + ProgrammingExerciseStudentParticipation participation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, student1.getLogin()); + Result result = participationUtilService.createSubmissionAndResult(participation, 1L, true); + createBuildJob(programmingExercise, course, participation, result); + + course = courseRepository.findByIdWithEagerExercisesElseThrow(course.getId()); + var summary = courseService.getDeletionSummary(course); + assertThat(summary.numberOfCommunicationPosts()).isEqualTo(1L); + assertThat(summary.numberOfAnswerPosts()).isEqualTo(1L); + assertThat(summary.numberOfBuilds()).isEqualTo(1L); + } + private void setEnrollmentConfiguration(Course course, ZonedDateTime start, ZonedDateTime end) { course.setEnrollmentEnabled(true); course.setEnrollmentStartDate(start); course.setEnrollmentEndDate(end); } + + private void createBuildJob(ProgrammingExercise programmingExercise, Course course, Participation participation, Result result) { + var buildJob = new BuildJob(); + buildJob.setExerciseId(programmingExercise.getId()); + buildJob.setCourseId(course.getId()); + buildJob.setParticipationId(participation.getId()); + buildJob.setResult(result); + + buildJobRepo.save(buildJob); + } } From c60341685202d86fc5da4c2331a380978c58b3e4 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Fri, 11 Oct 2024 11:31:27 +0200 Subject: [PATCH 24/25] Merge aftermath --- .../aet/artemis/core/service/CourseServiceTest.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java index 089ae57e488a..cf4cd87c422f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/service/CourseServiceTest.java @@ -20,8 +20,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.util.ConversationUtilService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.dto.StudentDTO; @@ -32,15 +32,14 @@ import de.tum.cit.aet.artemis.core.util.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; -import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; @@ -64,9 +63,6 @@ class CourseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { @Autowired private BuildJobRepository buildJobRepo; - @Autowired - private ExerciseRepository exerciseRepo; - @Autowired private UserUtilService userUtilService; From c51bd33e45f706f5c08911af8b8ac2e7b396f3af Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Fri, 11 Oct 2024 11:31:48 +0200 Subject: [PATCH 25/25] Re-add test --- .../exam/ExamDeletionIntegrationTest.java | 146 ++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamDeletionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamDeletionIntegrationTest.java index e69de29bb2d1..8e3ae010acd7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamDeletionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamDeletionIntegrationTest.java @@ -0,0 +1,146 @@ +package de.tum.cit.aet.artemis.exam; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.ZonedDateTime; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.test.context.support.WithMockUser; + +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamDeletionSummaryDTO; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamSessionService; +import de.tum.cit.aet.artemis.exam.util.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class ExamDeletionIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + private static final String TEST_PREFIX = "examdeletion"; + + @Autowired + private ExamUtilService examUtilService; + + @Autowired + private ExamSessionService examSessionService; + + @Autowired + private StudentExamRepository studentExamRepository; + + @Autowired + private ParticipationUtilService participationUtilService; + + @Autowired + private BuildJobRepository buildJobRepository; + + private static final int NUMBER_OF_STUDENTS = 4; + + private static final int NUMBER_OF_TUTORS = 1; + + private Course course; + + private Exam exam; + + private ProgrammingExercise programmingExercise; + + private User student1; + + private User student2; + + private User student3; + + private User student4; + + @BeforeAll + void setup() { + // setup users + userUtilService.addUsers(TEST_PREFIX, NUMBER_OF_STUDENTS, NUMBER_OF_TUTORS, 0, 1); + + student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + student2 = userUtilService.getUserByLogin(TEST_PREFIX + "student2"); + student3 = userUtilService.getUserByLogin(TEST_PREFIX + "student3"); + student4 = userUtilService.getUserByLogin(TEST_PREFIX + "student4"); + User instructor = userUtilService.getUserByLogin(TEST_PREFIX + "instructor1"); + + // reset courses + course = courseUtilService.addEmptyCourse(); + + exam = examUtilService.addExam(course); + exam = examUtilService.registerUsersForExamAndSaveExam(exam, TEST_PREFIX, NUMBER_OF_STUDENTS); + + Channel channel = examUtilService.addExamChannel(exam, "exam1 channel"); + Post instructorPost = examUtilService.createPost(channel, "Instructor Post", instructor); + examUtilService.createAnswerPost(instructorPost, "Student Answer", student1); + examUtilService.createAnswerPost(instructorPost, "Instructor Answer", instructor); + + exam = examUtilService.addTextModelingProgrammingExercisesToExam(exam, true, true); + programmingExercise = (ProgrammingExercise) exam.getExerciseGroups().stream().flatMap(exerciseGroup -> exerciseGroup.getExercises().stream()) + .filter(exercise -> ExerciseType.PROGRAMMING.equals(exercise.getExerciseType())).findFirst().orElseThrow(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testDeletionSummary() throws Exception { + addStudentExam(student1, false, false); + addStudentExam(student2, false, false); + + addStudentExam(student3, true, false); + ProgrammingExerciseStudentParticipation participation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, student3.getLogin()); + Result result = participationUtilService.createSubmissionAndResult(participation, 1L, true); + createBuildJob(participation, result); + + addStudentExam(student4, true, true); + + var response = request.get("/api/courses/" + course.getId() + "/exams/" + exam.getId() + "/deletion-summary", HttpStatus.OK, ExamDeletionSummaryDTO.class); + assertThat(response.numberOfBuilds()).isEqualTo(1); + assertThat(response.numberOfCommunicationPosts()).isEqualTo(1); + assertThat(response.numberOfAnswerPosts()).isEqualTo(2); + assertThat(response.numberNotStartedExams()).isEqualTo(2); + assertThat(response.numberStartedExams()).isEqualTo(2); + assertThat(response.numberSubmittedExams()).isEqualTo(1); + } + + private void addStudentExam(User student, boolean isStarted, boolean isSubmitted) { + StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, student); + examSessionService.startExamSession(studentExam, null, null, null, null); + if (isStarted) { + studentExam.setStartedAndStartDate(ZonedDateTime.now()); + } + if (isSubmitted) { + studentExam.setSubmissionDate(ZonedDateTime.now()); + studentExam.setSubmitted(true); + } + + if (isStarted || isSubmitted) { + studentExamRepository.save(studentExam); + } + } + + private void createBuildJob(Participation participation, Result result) { + var buildJob = new BuildJob(); + buildJob.setExerciseId(programmingExercise.getId()); + buildJob.setCourseId(course.getId()); + buildJob.setParticipationId(participation.getId()); + buildJob.setResult(result); + + buildJobRepository.save(buildJob); + } +}