MORE-Platform#393: added cleanup to the test

Author: Rupert Westenthaler

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

@@ -66,6 +66,9 @@ INSERT INTO goal_adherence_checks(study_id, check_id, title, time)
     private static final String DELETE_ADHERENCE_CHECKS = "DELETE FROM goal_adherence_checks WHERE study_id = ?";
     private static final String UPDATE_ADHERENCE_CHECK = "UPDATE goal_adherence_checks SET title = :title, time = :time WHERE study_id = :study_id AND check_id = :check_id";
 
+    private static final String DELETE_ALL = "DELETE FROM study_goal_config";
+
+
     private final JdbcTemplate template;
     private final NamedParameterJdbcTemplate namedTemplate;
 
@@ -196,6 +199,10 @@ public void deleteCheck(Long studyId, Integer checkId) {
         }
     }
 
+    public void clear() {
+        template.execute(DELETE_ALL);
+    }
+
     private MapSqlParameterSource toParams(StudyGoalConfig config) {
         return new MapSqlParameterSource()
                 .addValue("study_id", config.getStudyId())

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

@@ -47,14 +47,23 @@ class GoalRepositoryTest {
     @Autowired
     private ParticipantRepository participantRepository;
 
+    Long studyId = null;
+
     @BeforeEach
     void deleteAll() {
         goalRepository.clear();
+        participantRepository.clear();
+        goalTemplateRepository.clear();
+        goalConfigurationRepository.clear();
+        if(studyId != null) {
+            studyRepository.deleteById(studyId);
+            studyId = null;
+        }
     }
 
     @Test
     public void testInsertListUpdateDeleteAndFlexibleQueries() {
-        Long studyId = studyRepository.insert(new Study().setContact(new Contact().setPerson("test").setEmail("test"))).getStudyId();
+        studyId = studyRepository.insert(new Study().setContact(new Contact().setPerson("test").setEmail("test"))).getStudyId();
         Integer participantId = participantRepository.insert(new Participant().setStudyId(studyId).setRegistrationToken("t")).getParticipantId();
         Integer templateId = goalTemplateRepository.insert(new GoalTemplate().setStudyId(studyId).setType("test")).getTemplateId();
 
@@ -86,7 +95,7 @@ public void testInsertListUpdateDeleteAndFlexibleQueries() {
     @Test
     public void testFlexibleListQueriesWithMultipleGoalsPerParticipantAndTemplate() {
         // === Setup ===
-        Long studyId = studyRepository.insert(new Study().setContact(new Contact().setPerson("test").setEmail("test"))).getStudyId();
+        studyId = studyRepository.insert(new Study().setContact(new Contact().setPerson("test").setEmail("test"))).getStudyId();
 
         Integer p1 = participantRepository.insert(new Participant().setStudyId(studyId).setRegistrationToken("p1")).getParticipantId();
         Integer p2 = participantRepository.insert(new Participant().setStudyId(studyId).setRegistrationToken("p2")).getParticipantId();
@@ -189,7 +198,7 @@ public void testFlexibleListQueriesWithMultipleGoalsPerParticipantAndTemplate()
     @Test
     @DisplayName("Goal adherence checks are correctly saved, loaded and updated")
     void testGoalAdherenceChecksMapping() {
-        Long studyId = studyRepository.insert(new Study().setContact(new Contact().setPerson("test").setEmail("test"))).getStudyId();
+        studyId = studyRepository.insert(new Study().setContact(new Contact().setPerson("test").setEmail("test"))).getStudyId();
         Integer participantId = participantRepository.insert(new Participant().setStudyId(studyId).setRegistrationToken("t")).getParticipantId();
         Integer templateId = goalTemplateRepository.insert(new GoalTemplate().setStudyId(studyId).setType("test")).getTemplateId();