Skip to content

BI-2694 - Field Book pulling sub-entity observation units #480

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
nickpalladino merged 2 commits into from
Aug 1, 2025
Merged

BI-2694 - Field Book pulling sub-entity observation units #480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fa158e
Don't create empty treatments array in sub-entity obs units
nickpalladino Jul 18, 2025
7a6457f
Merge branch 'develop' into bug/BI-2694
nickpalladino Aug 1, 2025
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
16 changes: 9 additions & 7 deletions src/main/java/org/breedinginsight/brapi/v2/services/BrAPITrialService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,14 +501,16 @@ public BrAPIObservationUnit createSubObservationUnit(
}

// Set treatment factors.
List<BrAPIObservationTreatment> treatmentFactors = new ArrayList<>();
for (BrAPIObservationTreatment t : expUnit.getTreatments()) {
BrAPIObservationTreatment treatment = new BrAPIObservationTreatment();
treatment.setFactor(t.getFactor());
treatment.setModality(t.getModality());
treatmentFactors.add(treatment);
if (!expUnit.getTreatments().isEmpty()) {
List<BrAPIObservationTreatment> treatmentFactors = new ArrayList<>();
for (BrAPIObservationTreatment t : expUnit.getTreatments()) {
BrAPIObservationTreatment treatment = new BrAPIObservationTreatment();
treatment.setFactor(t.getFactor());
treatment.setModality(t.getModality());
treatmentFactors.add(treatment);
}
observationUnit.setTreatments(treatmentFactors);
}
observationUnit.setTreatments(treatmentFactors);

// Put level in additional info: keep this in case we decide to rename levels in future.
observationUnit.putAdditionalInfoItem(BrAPIAdditionalInfoFields.OBSERVATION_LEVEL, subEntityDatasetName);
Expand Down