#135: Add another layer of state-check for enrollment

MORE-Platform · May 27, 2024 · a14b0a9 · a14b0a9
1 parent 08b1c31
commit a14b0a9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/io/redlink/more/data/repository/StudyRepository.java b/src/main/java/io/redlink/more/data/repository/StudyRepository.java
@@ -34,7 +34,7 @@
 public class StudyRepository {
 
     private static final String SQL_FIND_STUDY_BY_ID =
-            "SELECT * FROM studies WHERE study_id = ?";
+            "SELECT *, status IN ('active', 'preview') as study_active FROM studies WHERE study_id = ?";
 
     private static final String SQL_LIST_OBSERVATIONS_BY_STUDY =
             "SELECT * FROM observations WHERE study_id = ? AND ( study_group_id IS NULL OR study_group_id = ? )";
@@ -44,7 +44,7 @@ public class StudyRepository {
 
     private static final String SQL_ROUTING_INFO_BY_REG_TOKEN = """
             SELECT pt.study_id as study_id, pt.participant_id as participant_id, study_group_id,
-                s.status IN ('active', 'paused') as study_active,
+                s.status IN ('active', 'preview') as study_active,
                 pt.status = 'active' as participant_active
             FROM participants pt
                 INNER JOIN registration_tokens rt ON (pt.study_id = rt.study_id and pt.participant_id = rt.participant_id)
@@ -55,7 +55,7 @@ INNER JOIN studies s on (s.study_id = pt.study_id)
             SQL_ROUTING_INFO_BY_REG_TOKEN + " FOR UPDATE OF rt";
     private static final String GET_ROUTING_INFO = """
             SELECT pt.study_id as study_id, pt.participant_id as participant_id, study_group_id,
-                s.status IN ('active', 'paused') as study_active,
+                s.status IN ('active', 'preview') as study_active,
                 pt.status = 'active' as participant_active
             FROM participants pt
                 INNER JOIN studies s on (s.study_id = pt.study_id)
@@ -329,7 +329,7 @@ private static RowMapper<Study> getStudyRowMapper(List<Observation> observations
         return (rs, rowNum) -> new Study(
                 rs.getLong("study_id"),
                 rs.getString("title"),
-                "active".equalsIgnoreCase(rs.getString("status")),
+                rs.getBoolean("study_active"),
                 rs.getString("participant_info"),
                 rs.getString("finish_text"),
                 rs.getString("status"),