Skip to content

[BI-1825] add check for legacy trait names in ExperimentProcessor #270

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
dmeidlin merged 2 commits into from
Jul 7, 2023
Merged

[BI-1825] add check for legacy trait names in ExperimentProcessor #270

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
6d56ef1
[BI-1825] add check for legacy trait names in ExperimentProcessor
timparsons Jul 6, 2023
e8cc3ec
fix expcontrollerintegration test
dmeidlin Jul 7, 2023
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
8 changes: 7 additions & 1 deletion ...ain/java/org/breedinginsight/brapps/importer/services/processors/ExperimentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,6 +838,12 @@ private void addObsVarsToDatasetDetails(PendingImportObject<BrAPIListDetails> pi
BrAPIListDetails details = pio.getBrAPIObject();
referencedTraits.forEach(trait -> {
String id = Utilities.appendProgramKey(trait.getObservationVariableName(), program.getKey());

// Don't append the key if connected to a brapi service operating with legacy data(no appended program key)
if (trait.getFullName() == null) {
id = trait.getObservationVariableName();
}

if (!details.getData().contains(id) && ImportObjectState.EXISTING != pio.getState()) {
details.getData().add(id);
}
Expand Down Expand Up @@ -1582,4 +1588,4 @@ private String seasonDbIdToYearFromDatabase(String seasonDbId, UUID programId) {
Integer yearInt = (season == null) ? null : season.getYear();
return (yearInt == null) ? "" : yearInt.toString();
}
}
}
1 change: 1 addition & 0 deletions src/test/java/org/breedinginsight/brapi/v2/ExperimentControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ private List<Trait> createTraits(int numToCreate) {
String varName = "tt_test_" + (i + 1);
traits.add(Trait.builder()
.observationVariableName(varName)
.fullName(varName)
.entity("Plant " + i)
.attribute("height " + i)
.traitDescription("test")
Expand Down