Iris: Rework settings system

src/main/java/de/tum/in/www1/artemis/domain/Course.java

@@ -26,7 +26,6 @@
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
 import de.tum.in.www1.artemis.domain.exam.Exam;
-import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings;
 import de.tum.in.www1.artemis.domain.metis.Post;
 import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup;
 import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration;
@@ -255,10 +254,6 @@ public class Course extends DomainObject {
     @JsonIgnoreProperties("course")
     private TutorialGroupsConfiguration tutorialGroupsConfiguration;
 
-    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
-    @JoinColumn(name = "iris_settings_id")
-    private IrisSettings irisSettings;
-
     // NOTE: Helpers variable names must be different from Getter name, so that Jackson ignores the @Transient annotation, but Hibernate still respects it
     @Transient
     private Long numberOfInstructorsTransient;
@@ -1030,12 +1025,4 @@ public String getCourseInformationSharingMessagingCodeOfConduct() {
     public void setCourseInformationSharingMessagingCodeOfConduct(String courseInformationSharingMessagingCodeOfConduct) {
         this.courseInformationSharingMessagingCodeOfConduct = courseInformationSharingMessagingCodeOfConduct;
     }
-
-    public IrisSettings getIrisSettings() {
-        return irisSettings;
-    }
-
-    public void setIrisSettings(IrisSettings irisSettings) {
-        this.irisSettings = irisSettings;
-    }
 }

src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java

@@ -21,7 +21,6 @@
 import de.tum.in.www1.artemis.domain.enumeration.*;
 import de.tum.in.www1.artemis.domain.hestia.ExerciseHint;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
-import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings;
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
@@ -143,10 +142,6 @@ public String getType() {
     @Column(name = "release_tests_with_example_solution", table = "programming_exercise_details")
     private boolean releaseTestsWithExampleSolution;
 
-    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
-    @JoinColumn(name = "iris_settings_id", table = "programming_exercise_details")
-    private IrisSettings irisSettings;
-
     /**
      * This boolean flag determines whether the solution repository should be checked out during the build (additional to the student's submission).
      * This property is only used when creating the exercise (the client sets this value when POSTing the new exercise to the server).
@@ -855,10 +850,6 @@ public void generateAndSetBuildPlanAccessSecret() {
         buildPlanAccessSecret = UUID.randomUUID().toString();
     }
 
-    public IrisSettings getIrisSettings() {
-        return irisSettings;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -868,8 +859,4 @@ public void disconnectRelatedEntities() {
 
         super.disconnectRelatedEntities();
     }
-
-    public void setIrisSettings(IrisSettings irisSettings) {
-        this.irisSettings = irisSettings;
-    }
 }

src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisChatSubSettings.java

@@ -0,0 +1,58 @@
+package de.tum.in.www1.artemis.domain.iris.settings;
+
+import javax.annotation.Nullable;
+import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.iris.IrisTemplate;
+
+/**
+ * An {@link IrisSubSettings} implementation for chat settings.
+ * Chat settings notably provide settings for the rate limit.
+ * Chat settings provide a single {@link IrisTemplate} for the chat messages.
+ */
+@Entity
+@DiscriminatorValue("CHAT")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class IrisChatSubSettings extends IrisSubSettings {
+
+    @Nullable
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private IrisTemplate template;
+
+    @Nullable
+    @Column(name = "rate_limit")
+    private Integer rateLimit;
+
+    @Nullable
+    @Column(name = "rate_limit_timeframe_hours")
+    private Integer rateLimitTimeframeHours;
+
+    @Nullable
+    public IrisTemplate getTemplate() {
+        return template;
+    }
+
+    public void setTemplate(@Nullable IrisTemplate template) {
+        this.template = template;
+    }
+
+    @Nullable
+    public Integer getRateLimit() {
+        return rateLimit;
+    }
+
+    public void setRateLimit(@Nullable Integer rateLimit) {
+        this.rateLimit = rateLimit;
+    }
+
+    @Nullable
+    public Integer getRateLimitTimeframeHours() {
+        return rateLimitTimeframeHours;
+    }
+
+    public void setRateLimitTimeframeHours(@Nullable Integer rateLimitTimeframeHours) {
+        this.rateLimitTimeframeHours = rateLimitTimeframeHours;
+    }
+}

src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCodeEditorSubSettings.java

@@ -0,0 +1,89 @@
+package de.tum.in.www1.artemis.domain.iris.settings;
+
+import javax.annotation.Nullable;
+import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.iris.IrisTemplate;
+
+/**
+ * An {@link IrisSubSettings} implementation for code editor settings.
+ * Code editor settings notably provide multiple {@link IrisTemplate}s for the different steps in the code generation.
+ */
+@Entity
+@DiscriminatorValue("CODE_EDITOR")
+@SecondaryTable(name = "iris_code_editor_sub_settings")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class IrisCodeEditorSubSettings extends IrisSubSettings {
+
+    @Nullable
+    @JoinColumn(table = "iris_code_editor_sub_settings")
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private IrisTemplate chatTemplate;
+
+    @Nullable
+    @JoinColumn(table = "iris_code_editor_sub_settings")
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private IrisTemplate problemStatementGenerationTemplate;
+
+    @Nullable
+    @JoinColumn(table = "iris_code_editor_sub_settings")
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private IrisTemplate templateRepoGenerationTemplate;
+
+    @Nullable
+    @JoinColumn(table = "iris_code_editor_sub_settings")
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private IrisTemplate solutionRepoGenerationTemplate;
+
+    @Nullable
+    @JoinColumn(table = "iris_code_editor_sub_settings")
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private IrisTemplate testRepoGenerationTemplate;
+
+    @Nullable
+    public IrisTemplate getChatTemplate() {
+        return chatTemplate;
+    }
+
+    public void setChatTemplate(@Nullable IrisTemplate chatTemplate) {
+        this.chatTemplate = chatTemplate;
+    }
+
+    @Nullable
+    public IrisTemplate getProblemStatementGenerationTemplate() {
+        return problemStatementGenerationTemplate;
+    }
+
+    public void setProblemStatementGenerationTemplate(@Nullable IrisTemplate problemStatementGenerationTemplate) {
+        this.problemStatementGenerationTemplate = problemStatementGenerationTemplate;
+    }
+
+    @Nullable
+    public IrisTemplate getTemplateRepoGenerationTemplate() {
+        return templateRepoGenerationTemplate;
+    }
+
+    public void setTemplateRepoGenerationTemplate(@Nullable IrisTemplate templateRepoGenerationTemplate) {
+        this.templateRepoGenerationTemplate = templateRepoGenerationTemplate;
+    }
+
+    @Nullable
+    public IrisTemplate getSolutionRepoGenerationTemplate() {
+        return solutionRepoGenerationTemplate;
+    }
+
+    public void setSolutionRepoGenerationTemplate(@Nullable IrisTemplate solutionRepoGenerationTemplate) {
+        this.solutionRepoGenerationTemplate = solutionRepoGenerationTemplate;
+    }
+
+    @Nullable
+    public IrisTemplate getTestRepoGenerationTemplate() {
+        return testRepoGenerationTemplate;
+    }
+
+    public void setTestRepoGenerationTemplate(@Nullable IrisTemplate testRepoGenerationTemplate) {
+        this.testRepoGenerationTemplate = testRepoGenerationTemplate;
+    }
+}

src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCourseSettings.java

@@ -0,0 +1,72 @@
+package de.tum.in.www1.artemis.domain.iris.settings;
+
+import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.Course;
+
+/**
+ * An {@link IrisSettings} implementation for course specific settings.
+ * Course settings are used to override global settings and allows all sub setting types.
+ */
+@Entity
+@DiscriminatorValue("COURSE")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class IrisCourseSettings extends IrisSettings {
+
+    @OneToOne(optional = false)
+    @JoinColumn(name = "course_id", unique = true, nullable = false)
+    private Course course;
+
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    @JoinColumn(name = "iris_chat_settings_id")
+    private IrisChatSubSettings irisChatSettings;
+
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    @JoinColumn(name = "iris_hestia_settings_id")
+    private IrisHestiaSubSettings irisHestiaSettings;
+
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    @JoinColumn(name = "iris_code_editor_settings_id")
+    private IrisCodeEditorSubSettings irisCodeEditorSettings;
+
+    @Override
+    public boolean isValid() {
+        return course != null;
+    }
+
+    public Course getCourse() {
+        return course;
+    }
+
+    public void setCourse(Course course) {
+        this.course = course;
+    }
+
+    public IrisChatSubSettings getIrisChatSettings() {
+        return irisChatSettings;
+    }
+
+    public void setIrisChatSettings(IrisChatSubSettings irisChatSettings) {
+        this.irisChatSettings = irisChatSettings;
+    }
+
+    public IrisHestiaSubSettings getIrisHestiaSettings() {
+        return irisHestiaSettings;
+    }
+
+    public void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings) {
+        this.irisHestiaSettings = irisHestiaSettings;
+    }
+
+    @Override
+    public IrisCodeEditorSubSettings getIrisCodeEditorSettings() {
+        return irisCodeEditorSettings;
+    }
+
+    @Override
+    public void setIrisCodeEditorSettings(IrisCodeEditorSubSettings irisCodeEditorSettings) {
+        this.irisCodeEditorSettings = irisCodeEditorSettings;
+    }
+}

src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisExerciseSettings.java

@@ -0,0 +1,66 @@
+package de.tum.in.www1.artemis.domain.iris.settings;
+
+import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.Exercise;
+
+/**
+ * An {@link IrisSettings} implementation for exercise specific settings.
+ * Exercise settings are used to override course settings and currently only allow setting the {@link IrisChatSubSettings}.
+ */
+@Entity
+@DiscriminatorValue("EXERCISE")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class IrisExerciseSettings extends IrisSettings {
+
+    @OneToOne(optional = false)
+    @JoinColumn(name = "exercise_id", unique = true, nullable = false)
+    private Exercise exercise;
+
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    @JoinColumn(name = "iris_chat_settings_id")
+    private IrisChatSubSettings irisChatSettings;
+
+    @Override
+    public boolean isValid() {
+        return exercise != null;
+    }
+
+    public Exercise getExercise() {
+        return exercise;
+    }
+
+    public void setExercise(Exercise exercise) {
+        this.exercise = exercise;
+    }
+
+    public IrisChatSubSettings getIrisChatSettings() {
+        return irisChatSettings;
+    }
+
+    public void setIrisChatSettings(IrisChatSubSettings irisChatSettings) {
+        this.irisChatSettings = irisChatSettings;
+    }
+
+    @Override
+    public IrisHestiaSubSettings getIrisHestiaSettings() {
+        return null;
+    }
+
+    @Override
+    public void setIrisHestiaSettings(IrisHestiaSubSettings irisHestiaSettings) {
+
+    }
+
+    @Override
+    public IrisCodeEditorSubSettings getIrisCodeEditorSettings() {
+        return null;
+    }
+
+    @Override
+    public void setIrisCodeEditorSettings(IrisCodeEditorSubSettings irisCodeEditorSettings) {
+
+    }
+}