Skip to content

Commit e137114

Browse files
committed
MORE-Platform#264: Observation reminder property extension
1 parent 1decf8b commit e137114

13 files changed

Lines changed: 32 additions & 10 deletions

src/main/java/io/redlink/more/data/controller/transformer/StudyTransformer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ public static ObservationDTO toDTO(ParticipantObservationSeed participantObserva
8888
._configuration(observation.properties())
8989
.version(BaseTransformers.toVersionTag(observation.modified()))
9090
.hidden(observation.hidden())
91-
.noSchedule(observation.noSchedule());
91+
.noSchedule(observation.noSchedule())
92+
.reminder(observation.reminder());
9293
if (observation.observationSchedule() != null && start != null) {
9394
dto.schedule(SchedulerUtils
9495
.parseToObservationSchedules(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ public record Observation(
2323
Instant created,
2424
Instant modified,
2525
boolean hidden,
26-
boolean noSchedule
26+
boolean noSchedule,
27+
boolean reminder
2728
) {
2829
public Observation withProperties(Object properties) {
2930
return new Observation(
30-
observationId, groupId, title, type, participantInfo, properties, observationSchedule, created, modified, hidden, noSchedule
31+
observationId, groupId, title, type, participantInfo, properties, observationSchedule, created, modified, hidden, noSchedule, reminder
3132
);
3233
}
3334
}

src/main/java/io/redlink/more/data/repository/StudyRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,8 @@ private static RowMapper<Observation> getObservationRowMapper() {
642642
toInstant(rs.getTimestamp("created")),
643643
toInstant(rs.getTimestamp("modified")),
644644
rs.getBoolean("hidden"),
645-
rs.getBoolean("no_schedule")
645+
rs.getBoolean("no_schedule"),
646+
rs.getBoolean("reminder")
646647
);
647648
}
648649

src/main/resources/openapi/MobileAppAPI.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,9 @@ components:
390390
noSchedule:
391391
type: boolean
392392
default: false
393+
reminder:
394+
type: boolean
395+
default: false
393396
version:
394397
$ref: '#/components/schemas/VersionTag'
395398
required:

src/test/java/io/redlink/more/data/service/AbstractGarminTransformerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ void transformToDataPointGarminTimeDataToDataPoint_buildsCorrectDataPoint() thro
173173
timestamp.minus(1, ChronoUnit.DAYS),
174174
timestamp.minus(1, ChronoUnit.DAYS),
175175
false,
176+
false,
176177
false
177178
);
178179

@@ -262,6 +263,7 @@ void transform_returnsDataPoints_whenObservationOverlaps() {
262263
garminStart.minusSeconds(300),
263264
garminStart.minusSeconds(300),
264265
false,
266+
false,
265267
false
266268
);
267269

@@ -310,6 +312,7 @@ void transform_returnsEmpty_whenNoOverlappingObservation() {
310312
garminStart.minusSeconds(3_600),
311313
garminStart.minusSeconds(3_600),
312314
false,
315+
false,
313316
false
314317
);
315318

src/test/java/io/redlink/more/data/service/ActivityDataPointTransformerTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ void transform_ToDataPoint_returnsDataPoint_whenValidEpoch() {
7171
start,
7272
start,
7373
false,
74+
false,
7475
false
7576
);
7677

@@ -106,6 +107,7 @@ void transform_ToDataPoint_returnsEmpty_whenActivityTypeNull() {
106107
start,
107108
start,
108109
false,
110+
false,
109111
false
110112
);
111113

@@ -137,6 +139,7 @@ void transform_ToDataPoint_returnsEmpty_whenMetNull() {
137139
start,
138140
start,
139141
false,
142+
false,
140143
false
141144
);
142145

@@ -168,6 +171,7 @@ void transform_ToDataPoint_returnsEmpty_whenMetNegative() {
168171
start,
169172
start,
170173
false,
174+
false,
171175
false
172176
);
173177

@@ -199,6 +203,7 @@ void transform_ToDataPoint_returnsEmpty_whenIntensityNull() {
199203
start,
200204
start,
201205
false,
206+
false,
202207
false
203208
);
204209

src/test/java/io/redlink/more/data/service/BloodPressureTransformerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ void transformGarminTimeDataToDataPoint_buildsDataPoint() {
6363
null,
6464
null,
6565
false,
66+
false,
6667
false
6768
);
6869

@@ -126,6 +127,7 @@ void transform_returnsDataPoint_whenObservationOverlaps() {
126127
null,
127128
null,
128129
false,
130+
false,
129131
false
130132
);
131133

@@ -192,6 +194,7 @@ void transform_returnsEmpty_whenNoOverlap() {
192194
null,
193195
null,
194196
false,
197+
false,
195198
false
196199
);
197200

src/test/java/io/redlink/more/data/service/DailyStepDataTransformerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ void transform_returnsDailyStepsDataPoint() {
6767
start,
6868
start,
6969
false,
70+
false,
7071
false
7172
);
7273

src/test/java/io/redlink/more/data/service/EpochStepDataTransformerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ void transform_returnsEpochStepsDataPoint() {
6565
start,
6666
start,
6767
false,
68+
false,
6869
false
6970
);
7071

src/test/java/io/redlink/more/data/service/GarminDataTransformationServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void transformData_dailiesWithHrSamples_buildsDataPointsAndGapSentinels() {
7878

7979
Observation garminObs = new Observation(
8080
1, 1, "Garmin", "garmin-heart-rate-observation",
81-
null, null, schedule, Instant.now(), Instant.now(), false, false
81+
null, null, schedule, Instant.now(), Instant.now(), false, false, false
8282
);
8383

8484
SimpleParticipant simpleParticipant = new SimpleParticipant(

0 commit comments

Comments
 (0)