Skip to content

#497 limesurvey datahealth lastpage #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
westei merged 2 commits into from
May 7, 2026
Merged

#497 limesurvey datahealth lastpage #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac59bd
#497: The QuestionObservationUtils now support SingleAnswerObservatio…
May 7, 2026
b1caa42
#497: Limesurvey Observation data health validation now uses the `las…
May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions ...n/java/io/redlink/more/studymanager/component/observation/lime/LimeSurveyObservation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,32 +211,27 @@ public ObservationValidationResult validateData(Instant start, Instant end, Obse
return new ObservationValidationResult(false, ObservationDataState.MISSING);
}
//(1) Use the default single Answer utility method
var validationResult = QuestionObservationUtils.validateSingleAnswerObservation(
var lastPageResult = QuestionObservationUtils.validateSingleAnswerObservation(
observationDataSummary,
LimeSurveyObservationFactory.MEASUREMENT_SEED //NOTE: This utility method only works with STRING fields!!
LimeSurveyObservationFactory.MEASUREMENT_LASTPAGE //NOTE: This utility method only works with STRING fields!!
);
//(2) Check of the ID property is present
MeasurementSummary answerMeasurementSummary = observationDataSummary.measurements().stream()
.filter(it -> LimeSurveyObservationFactory.MEASUREMENT_ID.equals(it.getMeasurement().getId()))
.findFirst()
.orElse(null);
//check that the field is present on all documents
boolean hasId = answerMeasurementSummary != null
&& answerMeasurementSummary.getNumericResult() != null
&& answerMeasurementSummary.getNumericResult().missing() == 0;
var idResult = QuestionObservationUtils.validateSingleAnswerObservation(
observationDataSummary,
LimeSurveyObservationFactory.MEASUREMENT_ID
);

//(3) Adapt the validation result where necessary
if(!validationResult.invalid() && validationResult.state() == ObservationDataState.COMPLETE && !hasId) {
//The required field seed is missing in the results!
return new ObservationValidationResult(
true,
ObservationDataState.INCOMPLETE
);
} else if(validationResult.state() == ObservationDataState.MISSING && hasId){
//if seed is missing, but ID is present ... return INCOMPLETE instead of MISSING as result
return new ObservationValidationResult(validationResult.invalid(), ObservationDataState.INCOMPLETE);
} else { //just return the original validation format
return validationResult;
boolean invalid = idResult.invalid() || lastPageResult.invalid();
if(idResult.invalid() && lastPageResult.invalid()) {
return idResult;
} else if(invalid){
return new ObservationValidationResult(invalid, ObservationDataState.INCOMPLETE);
} else {
ObservationDataState state = ObservationDataState.values()[Math.min(
idResult.state().ordinal(),
lastPageResult.state().ordinal())];
return new ObservationValidationResult(invalid, state);
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...io/redlink/more/studymanager/component/observation/lime/LimeSurveyObservationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class LimeSurveyObservationFactory<C extends LimeSurveyObservation<P>, P
);

public static String MEASUREMENT_ID = "id";
public static String MEASUREMENT_SEED = "seed";
public static String MEASUREMENT_LASTPAGE = "lastpage";
/**
* This measurementSet includes the id and seed of the LimeSurvey. All
* survey specific information are stored under the survey keys. Those keys
Expand All @@ -48,7 +48,7 @@ public class LimeSurveyObservationFactory<C extends LimeSurveyObservation<P>, P
private static MeasurementSet LIMESURVEY_METADATA = new MeasurementSet(
"LIMESURVEY", Set.of(
new Measurement(MEASUREMENT_ID, Measurement.Type.INTEGER),
new Measurement(MEASUREMENT_SEED, Measurement.Type.STRING))
new Measurement(MEASUREMENT_LASTPAGE, Measurement.Type.INTEGER))
);


Expand Down
19 changes: 16 additions & 3 deletions ...va/io/redlink/more/studymanager/component/observation/utils/QuestionObservationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,22 @@ public static ObservationValidationResult validateSingleAnswerObservation(
.filter(it -> fieldId.equals(it.getMeasurement().getId()))
.findFirst()
.orElse(null);
boolean hasAnswers = answerMeasurementSummary != null
&& answerMeasurementSummary.getStringResult() != null
&& answerMeasurementSummary.getStringResult().values().stream().noneMatch(it -> it.value() == null);
boolean hasAnswers = false;
if (answerMeasurementSummary != null) {
hasAnswers = switch (answerMeasurementSummary.getMeasurement().getType()){
case STRING -> answerMeasurementSummary.getStringResult() != null &&
answerMeasurementSummary.getStringResult().values().stream().noneMatch(it -> it.value() == null);
case BOOLEAN -> answerMeasurementSummary.getBooleanResult() != null &&
answerMeasurementSummary.getBooleanResult().values().stream().noneMatch(it -> it.value() == null);
case INTEGER, LONG, DOUBLE -> answerMeasurementSummary.getNumericResult() != null &&
answerMeasurementSummary.getNumericResult().missing() == 0;
case DATE -> answerMeasurementSummary.getDateResult() != null &&
answerMeasurementSummary.getDateResult().missing() == 0;
case ARRAY -> answerMeasurementSummary.getArrayResult() != null &&
!answerMeasurementSummary.getArrayResult().values().value().isEmpty();
case OBJECT -> throw new IllegalStateException("Checking for answers is not supported for Measurements of type OBJECT");
};
} //else no data -> no answers
return new ObservationValidationResult(!hasAnswers, hasAnswers ? ObservationDataState.COMPLETE : ObservationDataState.MISSING);
}
}
Expand Down
20 changes: 10 additions & 10 deletions ...va/io/redlink/more/studymanager/component/observation/lime/LimeSurveyObservationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,16 @@ public void testValidation() {

LimeSurveyObservation questionObservation = new LimeSurveyObservation(sdk, properties, null);

var seedSummary = new MeasurementSummary(
new Measurement(LimeSurveyObservationFactory.MEASUREMENT_SEED, Measurement.Type.STRING));
seedSummary.setStringResult(new StringMeasurementSummary(List.of(new FieldValue<>("seed_12345", 1))));
var lastPageSummary = new MeasurementSummary(
new Measurement(LimeSurveyObservationFactory.MEASUREMENT_LASTPAGE, Measurement.Type.INTEGER));
lastPageSummary.setNumericResult(new NumericMeasurementSummary(1.0,1.0, 1.0, 1.0, 0));
var idMs = new MeasurementSummary(
new Measurement(LimeSurveyObservationFactory.MEASUREMENT_ID, Measurement.Type.INTEGER));
idMs.setNumericResult(new NumericMeasurementSummary(1.0,1.0, 1.0, 1.0, 0));
ObservationDataSummary validSummary = new ObservationDataSummary(
1,
new DateMeasurementSummary(stored, stored, 0L),
List.of(idMs, seedSummary)
List.of(idMs, lastPageSummary)
);
var result = questionObservation.validateData(start, end, validSummary);
Assertions.assertFalse(result.invalid());
Expand All @@ -172,7 +172,7 @@ public void testValidation() {
ObservationDataSummary invalidMultipleAnswersSummary = new ObservationDataSummary(
2,
new DateMeasurementSummary(stored, stored, 0L),
List.of(idMs, seedSummary)
List.of(idMs, lastPageSummary)
);
result = questionObservation.validateData(start, end, invalidMultipleAnswersSummary);
Assertions.assertTrue(result.invalid());
Expand All @@ -187,13 +187,13 @@ public void testValidation() {
Assertions.assertFalse(result.invalid());
Assertions.assertEquals(ObservationDataState.MISSING, result.state());

var nullSeedMs = new MeasurementSummary(
new Measurement(LimeSurveyObservationFactory.MEASUREMENT_SEED, Measurement.Type.STRING));
nullSeedMs.setStringResult(new StringMeasurementSummary(List.of(new FieldValue<String>(null, 1))));
var missingLastPageMs = new MeasurementSummary(
new Measurement(LimeSurveyObservationFactory.MEASUREMENT_LASTPAGE, Measurement.Type.INTEGER));
missingLastPageMs.setNumericResult(new NumericMeasurementSummary(1.0,1.0, 1.0, 1.0, 1));
ObservationDataSummary nullSeedSummary = new ObservationDataSummary(
1,
new DateMeasurementSummary(stored, stored, 0L),
List.of(idMs, nullSeedMs)
List.of(idMs, missingLastPageMs)
);
result = questionObservation.validateData(start, end, nullSeedSummary);
Assertions.assertTrue(result.invalid());
Expand All @@ -205,7 +205,7 @@ public void testValidation() {
ObservationDataSummary missingIdSummary = new ObservationDataSummary(
1,
new DateMeasurementSummary(stored, stored, 0L),
List.of(missingIdMs, seedSummary)
List.of(missingIdMs, lastPageSummary)
);
result = questionObservation.validateData(start, end, missingIdSummary);
Assertions.assertTrue(result.invalid());
Expand Down
Loading