MORE-Platform#385: Fixed an issue while importing Adherence checks to a Study. Also added a unit test that validates that importing an adherence check does not override existing, but instead returns the existing

Author: Rupert Westenthaler

studymanager-services/src/main/java/io/redlink/more/studymanager/repository/goals/GoalConfigurationRepository.java

@@ -21,6 +21,7 @@
 
 import java.time.LocalTime;
 import java.util.List;
+import java.util.Objects;
 
 @Component
 public class GoalConfigurationRepository {
@@ -153,7 +154,7 @@ public GoalAdherenceCheck upsertCheck(GoalAdherenceCheck check) {
     @Transactional
     public GoalAdherenceCheck doImport(Long studyId, GoalAdherenceCheck check) {
         var existing = getCheckById(studyId, check.getCheckId());
-        if(existing != null) {
+        if(existing == null) {
             KeyHolder keyHolder = new GeneratedKeyHolder();
             namedTemplate.update(
                 IMPORT_ADHERENCE_CHECK,
@@ -163,7 +164,7 @@ public GoalAdherenceCheck doImport(Long studyId, GoalAdherenceCheck check) {
                 keyHolder,
                 new String[]{"check_id"}
             );
-            Integer checkId = keyHolder.getKey().intValue();
+            Integer checkId = Objects.requireNonNull(keyHolder.getKey()).intValue();
             return getCheckById(studyId, checkId);
         } else { //do not override existing adherence check in the study
             return existing;

studymanager-services/src/test/java/io/redlink/more/studymanager/repository/goals/GoalConfigurationRepositoryTest.java

@@ -253,6 +253,37 @@ void testDoImportAdherenceCheck() {
         assertThat(goalConfigurationRepository.listChecks(studyX)).isEmpty();
     }
 
+    @Test
+    @DisplayName("GoalAdherenceCheck import does not override existing")
+    void testDoSkipImportExistingAdherenceCheck() {
+        Long studyX = studyRepository.insert(new Study().setContact(new Contact().setPerson("X"))).getStudyId();
+        Long studyY = studyRepository.insert(new Study().setContact(new Contact().setPerson("Y"))).getStudyId();
+        //add an existing adherence check for the id=1 to studyY
+        goalConfigurationRepository.upsertCheck(new GoalAdherenceCheck()
+                .setStudyId(studyY)
+                .setCheckId(1)                     // pretend exported
+                .setTitle("Existing Check")
+                .setTime(LocalTime.of(14, 05)));
+
+        //now create a check for StudyX with the same id=1 but different title and time
+        GoalAdherenceCheck originalStudyX = new GoalAdherenceCheck()
+                .setStudyId(studyX)
+                .setCheckId(1)                     // pretend exported
+                .setTitle("Imported Check")
+                .setTime(LocalTime.of(14, 15));
+
+        //import the check from studyX and validate that the existing one is not overridden
+        GoalAdherenceCheck imported = goalConfigurationRepository.doImport(studyY, originalStudyX);
+
+        assertThat(imported.getStudyId()).isEqualTo(studyY);
+        assertThat(imported.getCheckId()).isEqualTo(1);
+        assertThat(imported.getTitle()).isEqualTo("Existing Check");
+        assertThat(imported.getTime()).isEqualTo(LocalTime.of(14, 05));
+
+        assertThat(goalConfigurationRepository.listChecks(studyY)).hasSize(1);
+        assertThat(goalConfigurationRepository.listChecks(studyX)).isEmpty();
+    }
+
     @Test
     @DisplayName("GoalTopic can be imported with forced studyId (upsert behavior)")
     void testDoImportGoalTopic() {