#287: Change logic for data previews to be modular

studymanager-core/src/main/java/io/redlink/more/studymanager/core/component/Observation.java

@@ -9,8 +9,13 @@
 package io.redlink.more.studymanager.core.component;
 
 import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
+import io.redlink.more.studymanager.core.io.TimeRange;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
 import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
+import io.redlink.more.studymanager.core.ui.DataView;
+import io.redlink.more.studymanager.core.ui.DataViewInfo;
+
+import java.util.Set;
 
 public abstract class Observation<C extends ObservationProperties> extends Component<C> {
 
@@ -20,6 +25,15 @@ protected Observation(MoreObservationSDK sdk, C properties) throws Configuration
         this.sdk = sdk;
     }
 
+    public Set<DataViewInfo> listViews() {
+        return Set.of();
+    }
+
+    public DataView getView(String viewId, Integer studyGroupId, Integer participantId, TimeRange timerange) {
+        return null;
+    }
+
+
     @Override
     public void activate() {
         // no action

studymanager-core/src/main/java/io/redlink/more/studymanager/core/factory/ObservationFactory.java

@@ -14,7 +14,6 @@
 import io.redlink.more.studymanager.core.measurement.MeasurementSet;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
 import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
-import io.redlink.more.studymanager.core.ui.DataPreview;
 
 public abstract class ObservationFactory<C extends Observation<P>, P extends ObservationProperties> extends ComponentFactory<C, P> {
     public abstract C create(MoreObservationSDK sdk, P properties) throws ConfigurationValidationException;
@@ -26,8 +25,6 @@ public Class<ObservationProperties> getPropertyClass() {
 
     public abstract MeasurementSet getMeasurementSet();
 
-    public abstract DataPreview getDataPreview();
-
     @Deprecated
     public Boolean getHidden() {
         return true;

studymanager-core/src/main/java/io/redlink/more/studymanager/core/measurement/MeasurementSet.java

@@ -15,7 +15,7 @@ public record MeasurementSet(String id, Set<Measurement> values) {
 
     public MeasurementSet {
         if (id == null || values == null) {
-            throw new IllegalArgumentException("Is and values must not be null");
+            throw new IllegalArgumentException("Id and values must not be null");
         }
     }
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/sdk/MoreObservationSDK.java

@@ -8,8 +8,12 @@
  */
 package io.redlink.more.studymanager.core.sdk;
 
+import io.redlink.more.studymanager.core.io.TimeRange;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
+import io.redlink.more.studymanager.core.ui.DataViewRow;
+import io.redlink.more.studymanager.core.ui.ViewConfig;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -22,5 +26,7 @@ public interface MoreObservationSDK extends MorePlatformSDK {
 
     void storeDataPoint(Integer participantId, String observationType, Map data);
 
+    List<DataViewRow> queryData(ViewConfig viewConfig, Integer participantId, TimeRange timerange);
+
     int getObservationId();
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/ui/DataView.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright LBI-DHP and/or licensed to LBI-DHP under one or more
+ * contributor license agreements (LBI-DHP: Ludwig Boltzmann Institute
+ * for Digital Health and Prevention -- A research institute of the
+ * Ludwig Boltzmann Gesellschaft, Österreichische Vereinigung zur
+ * Förderung der wissenschaftlichen Forschung).
+ * Licensed under the Elastic License 2.0.
+ */
+package io.redlink.more.studymanager.core.ui;
+
+import java.util.List;
+
+public record DataView(
+        DataViewInfo viewInfo,
+        ChartType chartType,
+        List<String> labels,
+        List<DataViewRow> data
+) {
+    public enum ChartType {
+        LINE,
+        BAR,
+        PIE
+    }
+}
+

studymanager-core/src/main/java/io/redlink/more/studymanager/core/ui/DataViewInfo.java

@@ -0,0 +1,16 @@
+/*
+ * Copyright LBI-DHP and/or licensed to LBI-DHP under one or more
+ * contributor license agreements (LBI-DHP: Ludwig Boltzmann Institute
+ * for Digital Health and Prevention -- A research institute of the
+ * Ludwig Boltzmann Gesellschaft, Österreichische Vereinigung zur
+ * Förderung der wissenschaftlichen Forschung).
+ * Licensed under the Elastic License 2.0.
+ */
+package io.redlink.more.studymanager.core.ui;
+
+public record DataViewInfo(
+        String id,
+        String title,
+        String description
+) {
+}

studymanager-core/src/main/java/io/redlink/more/studymanager/core/ui/DataViewRow.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright LBI-DHP and/or licensed to LBI-DHP under one or more
+ * contributor license agreements (LBI-DHP: Ludwig Boltzmann Institute
+ * for Digital Health and Prevention -- A research institute of the
+ * Ludwig Boltzmann Gesellschaft, Österreichische Vereinigung zur
+ * Förderung der wissenschaftlichen Forschung).
+ * Licensed under the Elastic License 2.0.
+ */
+package io.redlink.more.studymanager.core.ui;
+
+import java.util.List;
+
+public record DataViewRow(
+        String label,
+        List<Integer> values
+) {
+}

studymanager-core/src/main/java/io/redlink/more/studymanager/core/ui/ViewConfig.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright LBI-DHP and/or licensed to LBI-DHP under one or more
+ * contributor license agreements (LBI-DHP: Ludwig Boltzmann Institute
+ * for Digital Health and Prevention -- A research institute of the
+ * Ludwig Boltzmann Gesellschaft, Österreichische Vereinigung zur
+ * Förderung der wissenschaftlichen Forschung).
+ * Licensed under the Elastic License 2.0.
+ */
+package io.redlink.more.studymanager.core.ui;
+
+import java.util.List;
+
+public record ViewConfig(
+        List<Filter> filters,
+        Aggregation rowAggregation,
+        Aggregation seriesAggregation,
+        Operation operation
+) {
+
+    public record Filter(
+
+    ) {
+    }
+
+    public enum Aggregation {
+        TIME,
+        STUDY_GROUP,
+        PARTICIPANT,
+    }
+
+    public record Operation(
+            Operator operator,
+            String field
+    ) {
+    }
+
+    public enum Operator {
+        AVG,
+        SUM,
+        MIN,
+        MAX,
+        COUNT
+    }
+}

studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/AccMobileObservationFactory.java

@@ -9,14 +9,12 @@
 package io.redlink.more.studymanager.component.observation;
 
 import io.redlink.more.studymanager.component.observation.measurement.GenericMeasurementSets;
-import io.redlink.more.studymanager.component.observation.preview.GenericDataPreview;
 import io.redlink.more.studymanager.core.component.Observation;
 import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
 import io.redlink.more.studymanager.core.factory.ObservationFactory;
 import io.redlink.more.studymanager.core.measurement.MeasurementSet;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
 import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
-import io.redlink.more.studymanager.core.ui.DataPreview;
 
 public class AccMobileObservationFactory<C extends Observation<P>, P extends ObservationProperties>
         extends ObservationFactory<C, P> {
@@ -46,7 +44,4 @@ public AccMobileObservation create(MoreObservationSDK sdk, ObservationProperties
     public MeasurementSet getMeasurementSet() {
         return GenericMeasurementSets.ACCELEROMETER;
     }
-
-    @Override
-    public DataPreview getDataPreview() { return GenericDataPreview.ACCELEROMETER; }
 }

studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/ExternalObservationFactory.java

@@ -9,15 +9,13 @@
 package io.redlink.more.studymanager.component.observation;
 
 import io.redlink.more.studymanager.component.observation.measurement.GenericMeasurementSets;
-import io.redlink.more.studymanager.component.observation.preview.GenericDataPreview;
 import io.redlink.more.studymanager.core.component.Observation;
 import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
 import io.redlink.more.studymanager.core.factory.ObservationFactory;
 import io.redlink.more.studymanager.core.io.Visibility;
 import io.redlink.more.studymanager.core.measurement.MeasurementSet;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
 import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
-import io.redlink.more.studymanager.core.ui.DataPreview;
 
 public class ExternalObservationFactory<C extends Observation<P>, P extends ObservationProperties>
         extends ObservationFactory<C, P> {
@@ -58,7 +56,4 @@ public Boolean getHidden() {
     public Visibility getVisibility() {
         return visibility;
     }
-
-    @Override
-    public DataPreview getDataPreview() { return GenericDataPreview.NOT_SPECIFIED; }
 }

studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/GpsMobileObservationFactory.java

@@ -9,14 +9,12 @@
 package io.redlink.more.studymanager.component.observation;
 
 import io.redlink.more.studymanager.component.observation.measurement.GenericMeasurementSets;
-import io.redlink.more.studymanager.component.observation.preview.GenericDataPreview;
 import io.redlink.more.studymanager.core.component.Observation;
 import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
 import io.redlink.more.studymanager.core.factory.ObservationFactory;
 import io.redlink.more.studymanager.core.measurement.MeasurementSet;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
 import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
-import io.redlink.more.studymanager.core.ui.DataPreview;
 
 public class GpsMobileObservationFactory<C extends Observation<P>, P extends ObservationProperties> extends ObservationFactory<C, P> {
 
@@ -47,7 +45,4 @@ public GpsMobileObservation create(MoreObservationSDK sdk, ObservationProperties
     public MeasurementSet getMeasurementSet() {
         return GenericMeasurementSets.GEOLOCATION;
     }
-
-    @Override
-    public DataPreview getDataPreview() { return GenericDataPreview.NOT_SPECIFIED; }
 }

studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/PolarVerityObservation.java

@@ -10,11 +10,63 @@
 
 import io.redlink.more.studymanager.core.component.Observation;
 import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
+import io.redlink.more.studymanager.core.io.TimeRange;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
 import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
+import io.redlink.more.studymanager.core.ui.*;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class PolarVerityObservation<C extends ObservationProperties> extends Observation<C> {
     public PolarVerityObservation(MoreObservationSDK sdk, C properties) throws ConfigurationValidationException {
         super(sdk, properties);
     }
+
+    private enum DataViewInfoType {
+        HEART_RATE("heartRate", "Heart rate", "Heart rate per participant over time.");
+
+        private final DataViewInfo dataViewInfo;
+
+        DataViewInfoType(String key, String displayName, String description) {
+            this.dataViewInfo = new DataViewInfo(key, displayName, description);
+        }
+
+        public DataViewInfo getDataViewInfo() {
+            return dataViewInfo;
+        }
+    }
+
+    public Set<DataViewInfo> listViews() {
+        return Stream.of(DataViewInfoType.values())
+                .map(DataViewInfoType::getDataViewInfo)
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public DataView getView(String viewId, Integer studyGroupId, Integer participantId, TimeRange timerange) {
+        return switch (viewId) {
+            case "hr" -> createHeartRateView(studyGroupId, participantId, timerange);
+            default -> null;
+        };
+    }
+
+    private DataView createHeartRateView(Integer studyGroupId, Integer participantId, TimeRange timerange) {
+        var viewConfig = new ViewConfig(
+                List.of(),
+                ViewConfig.Aggregation.PARTICIPANT,
+                ViewConfig.Aggregation.TIME,
+                new ViewConfig.Operation(ViewConfig.Operator.AVG, "hr")
+        );
+
+        List<DataViewRow> rows = sdk.queryData(viewConfig, participantId, timerange);
+        return new DataView(
+                DataViewInfoType.HEART_RATE.getDataViewInfo(),
+                DataView.ChartType.LINE,
+                List.of(),
+                rows
+        );
+    }
 }

studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/PolarVerityObservationFactory.java

@@ -9,14 +9,12 @@
 package io.redlink.more.studymanager.component.observation;
 
 import io.redlink.more.studymanager.component.observation.measurement.GenericMeasurementSets;
-import io.redlink.more.studymanager.component.observation.preview.GenericDataPreview;
 import io.redlink.more.studymanager.core.component.Observation;
 import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
 import io.redlink.more.studymanager.core.factory.ObservationFactory;
 import io.redlink.more.studymanager.core.measurement.MeasurementSet;
 import io.redlink.more.studymanager.core.properties.ObservationProperties;
 import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
-import io.redlink.more.studymanager.core.ui.DataPreview;
 
 public class PolarVerityObservationFactory<C extends Observation<P>, P extends ObservationProperties> extends ObservationFactory<C, P> {
 
@@ -44,7 +42,4 @@ public PolarVerityObservation create(MoreObservationSDK sdk, ObservationProperti
     public MeasurementSet getMeasurementSet() {
         return GenericMeasurementSets.HEART_RATE;
     }
-
-    @Override
-    public DataPreview getDataPreview() { return GenericDataPreview.HEART_RATE; }
 }