Iris: Preserve settings on course and exercise update

src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java

@@ -143,7 +143,7 @@ SELECT CASE WHEN (count(c) > 0) THEN true ELSE false END
     @EntityGraph(type = LOAD, attributePaths = { "lectures", "lectures.lectureUnits" })
     Optional<Course> findWithEagerLecturesAndLectureUnitsById(long courseId);
 
-    @EntityGraph(type = LOAD, attributePaths = { "organizations", "competencies", "prerequisites", "tutorialGroupsConfiguration", "onlineCourseConfiguration" })
+    @EntityGraph(type = LOAD, attributePaths = { "organizations", "competencies", "prerequisites", "tutorialGroupsConfiguration", "onlineCourseConfiguration", "irisSettings" })
     Optional<Course> findWithEagerOrganizationsAndCompetenciesAndOnlineConfigurationById(long courseId);
 
     @EntityGraph(type = LOAD, attributePaths = { "exercises", "lectures", "lectures.lectureUnits", "competencies", "prerequisites" })

src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSettingsRepository.java

@@ -1,9 +1,11 @@
 package de.tum.in.www1.artemis.repository.iris;
 
+import java.util.Optional;
 import java.util.Set;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings;
 
@@ -15,8 +17,18 @@ public interface IrisSettingsRepository extends JpaRepository<IrisSettings, Long
     @Query("""
             SELECT irisSettings
             FROM IrisSettings irisSettings
-            LEFT JOIN FETCH irisSettings.irisChatSettings ics
+                LEFT JOIN FETCH irisSettings.irisChatSettings ics
             WHERE irisSettings.isGlobal = true
             """)
     Set<IrisSettings> findAllGlobalSettings();
+
+    @Query("""
+            SELECT irisSettings
+            FROM IrisSettings irisSettings
+                LEFT JOIN FETCH irisSettings.irisChatSettings ics
+                LEFT JOIN FETCH irisSettings.irisHestiaSettings ihs
+                LEFT JOIN ProgrammingExercise pe ON pe.irisSettings.id = irisSettings.id
+            WHERE pe.id = :programmingExerciseId
+            """)
+    Optional<IrisSettings> findByProgrammingExerciseId(@Param("programmingExerciseId") Long programmingExerciseId);
 }

src/main/java/de/tum/in/www1/artemis/service/iris/IrisSettingsService.java

@@ -375,6 +375,16 @@ public IrisSettings saveIrisSettings(ProgrammingExercise exercise, IrisSettings
         }
     }
 
+    /**
+     * Update the Iris settings for a programming exercise.
+     *
+     * @param programmingExerciseBeforeUpdate the programming exercise before the update
+     * @param updatedProgrammingExercise      the programming exercise after the update
+     */
+    public void updateIrisSettings(ProgrammingExercise programmingExerciseBeforeUpdate, ProgrammingExercise updatedProgrammingExercise) {
+        irisSettingsRepository.findByProgrammingExerciseId(programmingExerciseBeforeUpdate.getId()).ifPresent(updatedProgrammingExercise::setIrisSettings);
+    }
+
     private IrisSubSettings copyIrisSubSettings(IrisSubSettings target, IrisSubSettings source) {
         if (target == null || source == null) {
             return source;

src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java

@@ -49,6 +49,7 @@
 import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService;
 import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService;
 import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService;
+import de.tum.in.www1.artemis.service.iris.IrisSettingsService;
 import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService;
 import de.tum.in.www1.artemis.service.metis.conversation.ChannelService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService;
@@ -133,6 +134,8 @@ public class ProgrammingExerciseService {
 
     private final ChannelService channelService;
 
+    private final IrisSettingsService irisSettingsService;
+
     public ProgrammingExerciseService(ProgrammingExerciseRepository programmingExerciseRepository, GitService gitService, Optional<VersionControlService> versionControlService,
             Optional<ContinuousIntegrationService> continuousIntegrationService, Optional<ContinuousIntegrationTriggerService> continuousIntegrationTriggerService,
             TemplateProgrammingExerciseParticipationRepository templateProgrammingExerciseParticipationRepository,
@@ -143,7 +146,8 @@ public ProgrammingExerciseService(ProgrammingExerciseRepository programmingExerc
             ProgrammingExerciseSolutionEntryRepository programmingExerciseSolutionEntryRepository, ProgrammingExerciseTaskService programmingExerciseTaskService,
             ProgrammingExerciseGitDiffReportRepository programmingExerciseGitDiffReportRepository, ExerciseSpecificationService exerciseSpecificationService,
             ProgrammingExerciseRepositoryService programmingExerciseRepositoryService, AuxiliaryRepositoryService auxiliaryRepositoryService,
-            SubmissionPolicyService submissionPolicyService, Optional<ProgrammingLanguageFeatureService> programmingLanguageFeatureService, ChannelService channelService) {
+            SubmissionPolicyService submissionPolicyService, Optional<ProgrammingLanguageFeatureService> programmingLanguageFeatureService, ChannelService channelService,
+            IrisSettingsService irisSettingsService) {
         this.programmingExerciseRepository = programmingExerciseRepository;
         this.gitService = gitService;
         this.versionControlService = versionControlService;
@@ -169,6 +173,7 @@ public ProgrammingExerciseService(ProgrammingExerciseRepository programmingExerc
         this.submissionPolicyService = submissionPolicyService;
         this.programmingLanguageFeatureService = programmingLanguageFeatureService;
         this.channelService = channelService;
+        this.irisSettingsService = irisSettingsService;
     }
 
     /**
@@ -438,6 +443,7 @@ public ProgrammingExercise updateProgrammingExercise(ProgrammingExercise program
         connectAuxiliaryRepositoriesToExercise(updatedProgrammingExercise);
 
         channelService.updateExerciseChannel(programmingExerciseBeforeUpdate, updatedProgrammingExercise);
+        irisSettingsService.updateIrisSettings(programmingExerciseBeforeUpdate, updatedProgrammingExercise);
 
         ProgrammingExercise savedProgrammingExercise = programmingExerciseRepository.save(updatedProgrammingExercise);
 

src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java

@@ -208,6 +208,7 @@ public ResponseEntity<Course> updateCourse(@PathVariable Long courseId, @Request
         courseUpdate.setPrerequisites(existingCourse.getPrerequisites());
         courseUpdate.setTutorialGroupsConfiguration(existingCourse.getTutorialGroupsConfiguration());
         courseUpdate.setOnlineCourseConfiguration(existingCourse.getOnlineCourseConfiguration());
+        courseUpdate.setIrisSettings(existingCourse.getIrisSettings());
 
         courseUpdate.validateEnrollmentConfirmationMessage();
         courseUpdate.validateComplaintsAndRequestMoreFeedbackConfig();

src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java

@@ -75,6 +75,7 @@
 import de.tum.in.www1.artemis.service.dto.UserDTO;
 import de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO;
 import de.tum.in.www1.artemis.service.export.CourseExamExportService;
+import de.tum.in.www1.artemis.service.iris.IrisSettingsService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
 import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService;
 import de.tum.in.www1.artemis.team.TeamUtilService;
@@ -216,6 +217,9 @@ public class CourseTestService {
     @Autowired
     private ParticipantScoreScheduleService participantScoreScheduleService;
 
+    @Autowired
+    private IrisSettingsService irisSettingsService;
+
     private static final int numberOfStudents = 8;
 
     private static final int numberOfTutors = 5;
@@ -606,6 +610,23 @@ public void testEditCourseShouldPreserveAssociations() throws Exception {
         assertThat(updatedCourse.getPrerequisites()).containsExactlyElementsOf(prerequisites);
     }
 
+    // Test
+    public void testEditCourseShouldPreserveIrisSettings() throws Exception {
+        Course course = courseUtilService.createCourseWithOrganizations();
+        course = courseRepo.save(course);
+
+        var courseWithSettings = courseRepo.findByIdElseThrow(course.getId());
+        courseWithSettings = irisSettingsService.addDefaultIrisSettingsTo(courseWithSettings);
+        courseWithSettings.getIrisSettings().getIrisChatSettings().setEnabled(true);
+        courseWithSettings.getIrisSettings().getIrisChatSettings().setPreferredModel(null);
+        courseRepo.save(courseWithSettings);
+
+        request.getMvc().perform(buildUpdateCourse(course.getId(), course)).andExpect(status().isOk());
+
+        Course updatedCourse = courseRepo.findByIdWithOrganizationsAndCompetenciesAndOnlineConfigurationElseThrow(course.getId());
+        assertThat(updatedCourse.getIrisSettings()).isEqualTo(courseWithSettings.getIrisSettings());
+    }
+
     // Test
     public void testUpdateCourseGroups() throws Exception {
         Course course = programmingExerciseUtilService.addCourseWithOneProgrammingExercise();

src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseBitbucketBambooJiraIntegrationTest.java

@@ -169,6 +169,12 @@ void testEditCourseShouldPreserveAssociations() throws Exception {
         courseTestService.testEditCourseShouldPreserveAssociations();
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testEditCourseShouldPreserveIrisSettings() throws Exception {
+        courseTestService.testEditCourseShouldPreserveIrisSettings();
+    }
+
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN")
     void testUpdateCourseGroups() throws Exception {

src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseGitlabJenkinsIntegrationTest.java

@@ -171,6 +171,12 @@ void testEditCourseShouldPreserveAssociations() throws Exception {
         courseTestService.testEditCourseShouldPreserveAssociations();
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testEditCourseShouldPreserveIrisSettings() throws Exception {
+        courseTestService.testEditCourseShouldPreserveIrisSettings();
+    }
+
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN")
     void testUpdateCourseGroups() throws Exception {