Development: Remove quiz view and switch to DTOs

src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java

@@ -38,7 +38,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonView;
 
 import de.tum.cit.aet.artemis.assessment.ResultListener;
 import de.tum.cit.aet.artemis.core.domain.Course;
@@ -51,7 +50,6 @@
 import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise;
 import de.tum.cit.aet.artemis.programming.dto.ResultDTO;
-import de.tum.cit.aet.artemis.quiz.config.QuizView;
 import de.tum.cit.aet.artemis.quiz.domain.QuizExercise;
 import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission;
 
@@ -66,18 +64,15 @@
 public class Result extends DomainObject implements Comparable<Result> {
 
     @Column(name = "completion_date")
-    @JsonView(QuizView.Before.class)
     private ZonedDateTime completionDate;
 
     @Column(name = "jhi_successful")
-    @JsonView(QuizView.After.class)
     private Boolean successful;
 
     /**
      * Relative score in % (typically between 0 ... 100, can also be larger if bonus points are available)
      */
     @Column(name = "score")
-    @JsonView(QuizView.After.class)
     private Double score;
 
     /**
@@ -89,26 +84,22 @@ public class Result extends DomainObject implements Comparable<Result> {
      * be rated=true, then the result with the last completionDate counts towards the total score of a student - results are rated=false when students submit after the due date
      */
     @Column(name = "rated")
-    @JsonView(QuizView.Before.class)
     private Boolean rated;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JsonView(QuizView.Before.class)
     @JsonIgnoreProperties({ "results", "participation" })
     private Submission submission;
 
     @OneToMany(mappedBy = "result", cascade = CascadeType.ALL, orphanRemoval = true)
     @OrderColumn
     @JsonIgnoreProperties(value = "result", allowSetters = true)
     @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
-    @JsonView(QuizView.Before.class)
     private List<Feedback> feedbacks = new ArrayList<>();
 
     /**
      * @deprecated: Will be removed for 8.0, please use submission.participation instead
      */
     @ManyToOne
-    @JsonView(QuizView.Before.class)
     @Deprecated(since = "7.7", forRemoval = true)
     private Participation participation;
 
@@ -118,7 +109,6 @@ public class Result extends DomainObject implements Comparable<Result> {
 
     @Enumerated(EnumType.STRING)
     @Column(name = "assessment_type")
-    @JsonView(QuizView.After.class)
     private AssessmentType assessmentType;
 
     @Column(name = "has_complaint")

src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java

@@ -32,7 +32,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonView;
 
 import de.tum.cit.aet.artemis.atlas.domain.competency.Competency;
 import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath;
@@ -45,7 +44,6 @@
 import de.tum.cit.aet.artemis.lecture.domain.Lecture;
 import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage;
-import de.tum.cit.aet.artemis.quiz.config.QuizView;
 import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup;
 import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration;
 
@@ -63,73 +61,56 @@ public class Course extends DomainObject {
     private static final int DEFAULT_COMPLAINT_TEXT_LIMIT = 2000;
 
     @Column(name = "title")
-    @JsonView(QuizView.Before.class)
     private String title;
 
     @Column(name = "description")
-    @JsonView(QuizView.Before.class)
     private String description;
 
     @Column(name = "short_name", unique = true)
-    @JsonView(QuizView.Before.class)
     private String shortName;
 
     @Column(name = "student_group_name")
-    @JsonView(QuizView.Before.class)
     private String studentGroupName;
 
     @Column(name = "teaching_assistant_group_name")
-    @JsonView(QuizView.Before.class)
     private String teachingAssistantGroupName;
 
     @Column(name = "editor_group_name")
-    @JsonView(QuizView.Before.class)
     private String editorGroupName;
 
     @Column(name = "instructor_group_name")
-    @JsonView(QuizView.Before.class)
     private String instructorGroupName;
 
     @Column(name = "start_date")
-    @JsonView(QuizView.Before.class)
     private ZonedDateTime startDate;
 
     @Column(name = "end_date")
-    @JsonView(QuizView.Before.class)
     private ZonedDateTime endDate;
 
     @Column(name = "enrollment_start_date")
-    @JsonView(QuizView.Before.class)
     private ZonedDateTime enrollmentStartDate;
 
     @Column(name = "enrollment_end_date")
-    @JsonView(QuizView.Before.class)
     private ZonedDateTime enrollmentEndDate;
 
     @Column(name = "unenrollment_end_date")
-    @JsonView(QuizView.Before.class)
     private ZonedDateTime unenrollmentEndDate;
 
     @Column(name = "semester")
-    @JsonView(QuizView.Before.class)
     private String semester;
 
     @Column(name = "test_course", nullable = false)
-    @JsonView({ QuizView.Before.class })
     private boolean testCourse = false;
 
     @Enumerated(EnumType.STRING)
     @Column(name = "language")
-    @JsonView(QuizView.Before.class)
     private Language language;
 
     @Enumerated(EnumType.STRING)
     @Column(name = "default_programming_language")
-    @JsonView(QuizView.Before.class)
     private ProgrammingLanguage defaultProgrammingLanguage;
 
     @Column(name = "online_course")
-    @JsonView(QuizView.Before.class)
     private Boolean onlineCourse = false;
 
     @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@@ -138,34 +119,27 @@ public class Course extends DomainObject {
 
     @Enumerated(EnumType.ORDINAL)
     @Column(name = "info_sharing_config", nullable = false)
-    @JsonView(QuizView.Before.class)
     private CourseInformationSharingConfiguration courseInformationSharingConfiguration = CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING; // default value
 
     @Column(name = "info_sharing_messaging_code_of_conduct")
     private String courseInformationSharingMessagingCodeOfConduct;
 
     @Column(name = "max_complaints", nullable = false)
-    @JsonView(QuizView.Before.class)
     private Integer maxComplaints = 3;  // default value
 
     @Column(name = "max_team_complaints", nullable = false)
-    @JsonView(QuizView.Before.class)
     private Integer maxTeamComplaints = 3;  // default value
 
     @Column(name = "max_complaint_time_days", nullable = false)
-    @JsonView(QuizView.Before.class)
     private int maxComplaintTimeDays = 7;   // default value
 
     @Column(name = "max_request_more_feedback_time_days", nullable = false)
-    @JsonView(QuizView.Before.class)
     private int maxRequestMoreFeedbackTimeDays = 7;   // default value
 
     @Column(name = "max_complaint_text_limit")
-    @JsonView(QuizView.Before.class)
     private int maxComplaintTextLimit = DEFAULT_COMPLAINT_TEXT_LIMIT;
 
     @Column(name = "max_complaint_response_text_limit")
-    @JsonView(QuizView.Before.class)
     private int maxComplaintResponseTextLimit = DEFAULT_COMPLAINT_TEXT_LIMIT;
 
     @OneToMany(mappedBy = "course", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
@@ -201,7 +175,6 @@ public class Course extends DomainObject {
     private Integer maxPoints;
 
     @Column(name = "accuracy_of_scores", nullable = false)
-    @JsonView(QuizView.Before.class)
     private Integer accuracyOfScores = 1; // default value
 
     @Column(name = "restricted_athena_modules_access", nullable = false)

src/main/java/de/tum/cit/aet/artemis/core/domain/DomainObject.java

@@ -11,9 +11,6 @@
 import jakarta.persistence.MappedSuperclass;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonView;
-
-import de.tum.cit.aet.artemis.quiz.config.QuizView;
 
 /**
  * Base abstract class for entities which have an id that is generated automatically (basically all domain objects).
@@ -28,7 +25,6 @@ public abstract class DomainObject implements Serializable {
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @JsonView(QuizView.Before.class)
     private Long id;
 
     public Long getId() {

src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForQuizExerciseDTO.java

@@ -0,0 +1,35 @@
+package de.tum.cit.aet.artemis.core.dto;
+
+import java.time.ZonedDateTime;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.cit.aet.artemis.core.domain.Course;
+import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration;
+import de.tum.cit.aet.artemis.core.domain.Language;
+import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+// TODO: we should reduce the amount of information here, not all fields are needed for the quiz exercise
+public record CourseForQuizExerciseDTO(Long id, String title, String description, String shortName, String studentGroupName, String teachingAssistantGroupName,
+        String editorGroupName, String instructorGroupName, ZonedDateTime startDate, ZonedDateTime endDate, ZonedDateTime enrollmentStartDate, ZonedDateTime enrollmentEndDate,
+        ZonedDateTime unenrollmentEndDate, String semester, boolean testCourse, Language language, ProgrammingLanguage defaultProgrammingLanguage, Boolean onlineCourse,
+        CourseInformationSharingConfiguration courseInformationSharingConfiguration, Integer maxComplaints, Integer maxTeamComplaints, int maxComplaintTimeDays,
+        int maxRequestMoreFeedbackTimeDays, int maxComplaintTextLimit, int maxComplaintResponseTextLimit, Integer accuracyOfScores) {
+
+    /**
+     * Create a CourseForQuizExerciseDTO from a Course
+     *
+     * @param course the course to convert
+     * @return the converted CourseForQuizExerciseDTO
+     */
+    public static CourseForQuizExerciseDTO of(final Course course) {
+        return new CourseForQuizExerciseDTO(course.getId(), course.getTitle(), course.getDescription(), course.getShortName(), course.getStudentGroupName(),
+                course.getTeachingAssistantGroupName(), course.getEditorGroupName(), course.getInstructorGroupName(), course.getStartDate(), course.getEndDate(),
+                course.getEnrollmentStartDate(), course.getEnrollmentEndDate(), course.getUnenrollmentEndDate(), course.getSemester(), course.isTestCourse(), course.getLanguage(),
+                course.getDefaultProgrammingLanguage(), course.isOnlineCourse(), course.getCourseInformationSharingConfiguration(), course.getMaxComplaints(),
+                course.getMaxTeamComplaints(), course.getMaxComplaintTimeDays(), course.getMaxRequestMoreFeedbackTimeDays(), course.getMaxComplaintTextLimit(),
+                course.getMaxComplaintResponseTextLimit(), course.getAccuracyOfScores());
+    }
+
+}

src/main/java/de/tum/cit/aet/artemis/core/dto/DomainObjectDTO.java

@@ -0,0 +1,14 @@
+package de.tum.cit.aet.artemis.core.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.cit.aet.artemis.core.domain.DomainObject;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record DomainObjectDTO(Long id) {
+
+    public static DomainObjectDTO of(DomainObject domainObject) {
+        return new DomainObjectDTO(domainObject.getId());
+    }
+
+}

src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java

@@ -9,22 +9,18 @@
 import jakarta.persistence.MappedSuperclass;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonView;
 
 import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
 import de.tum.cit.aet.artemis.core.domain.DomainObject;
 import de.tum.cit.aet.artemis.core.util.StringUtil;
-import de.tum.cit.aet.artemis.quiz.config.QuizView;
 
 @MappedSuperclass
 public abstract class BaseExercise extends DomainObject {
 
     @Column(name = "title")
-    @JsonView(QuizView.Before.class)
     private String title;
 
     @Column(name = "short_name")
-    @JsonView(QuizView.Before.class)
     private String shortName;
 
     @Column(name = "max_points", nullable = false)
@@ -38,23 +34,19 @@ public abstract class BaseExercise extends DomainObject {
     private AssessmentType assessmentType;
 
     @Column(name = "release_date")
-    @JsonView(QuizView.Before.class)
     @Nullable
     private ZonedDateTime releaseDate;
 
     // TODO: Also use for quiz exercises
     @Column(name = "start_date")
-    @JsonView(QuizView.Before.class)
     @Nullable
     private ZonedDateTime startDate;
 
     @Column(name = "due_date")
-    @JsonView(QuizView.Before.class)
     @Nullable
     private ZonedDateTime dueDate;
 
     @Column(name = "assessment_due_date")
-    @JsonView(QuizView.Before.class)
     @Nullable
     private ZonedDateTime assessmentDueDate;
 
@@ -64,7 +56,6 @@ public abstract class BaseExercise extends DomainObject {
 
     @Enumerated(EnumType.STRING)
     @Column(name = "difficulty")
-    @JsonView(QuizView.Before.class)
     private DifficultyLevel difficulty;
 
     @Enumerated(EnumType.STRING)
@@ -189,7 +180,6 @@ public void setExampleSolutionPublicationDate(@Nullable ZonedDateTime exampleSol
      *
      * @return true, if students are allowed to see this exercise, otherwise false
      */
-    @JsonView(QuizView.Before.class)
     public boolean isVisibleToStudents() {
         if (isExamExercise()) {
             return false;

src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java

@@ -39,9 +39,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonIncludeProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonView;
 
 import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
 import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission;
@@ -66,7 +66,6 @@
 import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase;
 import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise;
-import de.tum.cit.aet.artemis.quiz.config.QuizView;
 import de.tum.cit.aet.artemis.quiz.domain.QuizExercise;
 import de.tum.cit.aet.artemis.text.domain.TextExercise;
 
@@ -112,13 +111,11 @@ public abstract class Exercise extends BaseExercise implements LearningObject {
 
     @OneToMany(mappedBy = "exercise", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnoreProperties("exercise")
-    @JsonView(QuizView.Before.class)
     private Set<CompetencyExerciseLink> competencyLinks = new HashSet<>();
 
     @ElementCollection(fetch = FetchType.LAZY)
     @CollectionTable(name = "exercise_categories", joinColumns = @JoinColumn(name = "exercise_id"))
     @Column(name = "categories")
-    @JsonView(QuizView.Before.class)
     private Set<String> categories = new HashSet<>();
 
     @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@@ -143,11 +140,9 @@ public abstract class Exercise extends BaseExercise implements LearningObject {
     private String feedbackSuggestionModule;
 
     @ManyToOne
-    @JsonView(QuizView.Before.class)
     private Course course;
 
     @ManyToOne
-    @JsonView(QuizView.Before.class)
     private ExerciseGroup exerciseGroup;
 
     @OneToMany(mappedBy = "exercise", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@@ -338,7 +333,7 @@ public void setTestRunParticipationsExist(Boolean testRunParticipationsExistTran
      *
      * @return the course class member
      */
-    @JsonInclude
+    @JsonProperty
     protected Course getCourse() {
         return course;
     }