Feature relative study start

.github/workflows/compile-test.yml

@@ -1,6 +1,10 @@
 name: Test and Compile
 on:
   workflow_dispatch:
+    inputs:
+      dockerTag:
+        description: If set, docker img is built and tagged accordingly
+        required: false
   push:
 
 jobs:
@@ -37,7 +41,7 @@ jobs:
   Build-and-Deploy:
     name: "Build and Push Docker Image"
     runs-on: ubuntu-latest
-    if: github.ref_name == 'main'
+    if: github.ref_name == 'main' || github.event.inputs.dockerTag != ''
     needs:
       - Compile-and-Test
     steps:
@@ -48,15 +52,17 @@ jobs:
           distribution: 'temurin'
           java-version: 17
       - name: Build JIB container and publish to GitHub Packages
-        run: ./mvnw -B -U
+        run:
+          TAG=${{github.event.inputs.dockerTag}} &&
+          ./mvnw -B -U
           --no-transfer-progress
           clean deploy
           -Drevision=${{github.run_number}}
           -Dchangelist=
           -Dsha1=.${GITHUB_SHA:0:7}
           -Dquick
           -Ddocker.namespace=${DOCKER_NAMESPACE,,}
-          -Djib.to.tags=latest
+          -Djib.to.tags=${TAG:=latest}
           -Djib.to.auth.username=${{ github.actor }}
           -Djib.to.auth.password=${{ secrets.GITHUB_TOKEN }}
         env:

studymanager/src/main/java/io/redlink/more/studymanager/configuration/WebSecurityConfiguration.java

@@ -84,6 +84,7 @@ protected SecurityFilterChain filterChain(HttpSecurity http,
                 //TODO specific handling of temporary sidecar
                 .requestMatchers("/api/v1/components/observation/lime-survey-observation/end.html").permitAll()
                 .requestMatchers("/api/v1/studies/*/export/studydata/*").permitAll()
+                .requestMatchers("/api/v1/studies/*/calendar.ics").permitAll()
                 .requestMatchers("/api/v1/**").authenticated()
                 .requestMatchers("/kibana/**").authenticated()
                 .requestMatchers("/login/init").authenticated()

studymanager/src/main/java/io/redlink/more/studymanager/controller/studymanager/CalendarApiV1Controller.java

@@ -0,0 +1,29 @@
+package io.redlink.more.studymanager.controller.studymanager;
+
+import io.redlink.more.studymanager.api.v1.webservices.CalendarApi;
+import io.redlink.more.studymanager.properties.GatewayProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/api/v1", produces = MediaType.APPLICATION_JSON_VALUE)
+@EnableConfigurationProperties(GatewayProperties.class)
+public class CalendarApiV1Controller implements CalendarApi {
+
+    private final GatewayProperties properties;
+
+    public CalendarApiV1Controller(GatewayProperties properties) {
+        this.properties = properties;
+    }
+
+    @Override
+    public ResponseEntity<String> getStudyCalendar(Long studyId) {
+        return ResponseEntity
+                .status(301)
+                .header("Location", properties.getBaseUrl() + "/api/v1/calendar/studies/" + studyId + "/calendar.ics")
+                .build();
+    }
+}

studymanager/src/main/java/io/redlink/more/studymanager/model/Intervention.java

@@ -8,6 +8,9 @@
  */
 package io.redlink.more.studymanager.model;
 
+import io.redlink.more.studymanager.model.scheduler.Event;
+import io.redlink.more.studymanager.model.scheduler.ScheduleEvent;
+
 import java.time.Instant;
 
 public class Intervention {
@@ -16,7 +19,7 @@ public class Intervention {
     private String title;
     private String purpose;
     private Integer studyGroupId;
-    private Event schedule;
+    private ScheduleEvent schedule;
     private Instant created;
     private Instant modified;
 
@@ -65,11 +68,11 @@ public Intervention setStudyGroupId(Integer studyGroupId) {
         return this;
     }
 
-    public Event getSchedule() {
+    public ScheduleEvent getSchedule() {
         return schedule;
     }
 
-    public Intervention setSchedule(Event schedule) {
+    public Intervention setSchedule(ScheduleEvent schedule) {
         this.schedule = schedule;
         return this;
     }

studymanager/src/main/java/io/redlink/more/studymanager/model/Observation.java

@@ -9,6 +9,7 @@
 package io.redlink.more.studymanager.model;
 
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
+import io.redlink.more.studymanager.model.scheduler.ScheduleEvent;
 
 import java.time.Instant;
 
@@ -21,7 +22,7 @@ public class Observation {
     private String type;
     private Integer studyGroupId;
     private ObservationProperties properties;
-    private Event schedule;
+    private ScheduleEvent schedule;
     private Instant created;
     private Instant modified;
     private Boolean hidden;
@@ -99,11 +100,11 @@ public Observation setProperties(ObservationProperties properties) {
         return this;
     }
 
-    public Event getSchedule() {
+    public ScheduleEvent getSchedule() {
         return schedule;
     }
 
-    public Observation setSchedule(Event schedule) {
+    public Observation setSchedule(ScheduleEvent schedule) {
         this.schedule = schedule;
         return this;
     }

studymanager/src/main/java/io/redlink/more/studymanager/model/Participant.java

@@ -17,6 +17,7 @@ public class Participant {
     private Status status;
     private Instant created;
     private Instant modified;
+    private Instant start;
 
     private String registrationToken;
 
@@ -51,6 +52,15 @@ public Participant setStatus(Status status) {
         return this;
     }
 
+    public Participant setStart( Instant start ) {
+        this.start = start;
+        return this;
+    }
+
+    public Instant getStart() {
+        return start;
+    }
+
     public Participant setStudyId(Long studyId) {
         this.studyId = studyId;
         return this;

studymanager/src/main/java/io/redlink/more/studymanager/model/Study.java

@@ -8,6 +8,8 @@
  */
 package io.redlink.more.studymanager.model;
 
+import io.redlink.more.studymanager.model.scheduler.Duration;
+
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Set;
@@ -19,6 +21,7 @@ public class Study {
     private String participantInfo;
     private String consentInfo;
     private String finishText;
+    private Duration duration;
     private Status studyState;
     private LocalDate startDate;
     private LocalDate endDate;
@@ -100,6 +103,15 @@ public Study setFinishText(String finishText) {
         return this;
     }
 
+    public Duration getDuration() {
+        return duration;
+    }
+
+    public Study setDuration(Duration duration) {
+        this.duration = duration;
+        return this;
+    }
+
     public Status getStudyState() {
         return studyState;
     }
@@ -192,6 +204,7 @@ public String toString() {
                 ", endDate=" + endDate +
                 ", plannedStartDate=" + plannedStartDate +
                 ", plannedEndDate=" + plannedEndDate +
+                ", duration=" + duration +
                 ", created=" + created +
                 ", modified=" + modified +
                 ", institute=" + contact.getInstitute() +

studymanager/src/main/java/io/redlink/more/studymanager/model/StudyGroup.java

@@ -8,13 +8,16 @@
  */
 package io.redlink.more.studymanager.model;
 
+import io.redlink.more.studymanager.model.scheduler.Duration;
+
 import java.time.Instant;
 
 public class StudyGroup {
     private Long studyId;
     private Integer studyGroupId;
     private String title;
     private String purpose;
+    private Duration duration;
     private Instant created;
     private Instant modified;
 
@@ -54,6 +57,15 @@ public StudyGroup setPurpose(String purpose) {
         return this;
     }
 
+    public Duration getDuration() {
+        return duration;
+    }
+
+    public StudyGroup setDuration(Duration duration) {
+        this.duration = duration;
+        return this;
+    }
+
     public Instant getCreated() {
         return created;
     }