Skip to content

Remove program keys from observations data #414

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

Draft
nickpalladino wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Remove program keys from observations data #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIObservationUnitDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.brapi.client.v2.modules.phenotype.ObservationUnitsApi;
import org.brapi.v2.model.BrAPIExternalReference;
import org.brapi.v2.model.germ.BrAPIGermplasm;
import org.brapi.v2.model.pheno.BrAPIObservation;
import org.brapi.v2.model.pheno.BrAPIObservationTreatment;
import org.brapi.v2.model.pheno.BrAPIObservationUnit;
import org.brapi.v2.model.pheno.BrAPIObservationUnitLevelRelationship;
Expand Down Expand Up @@ -408,6 +409,28 @@ private void processObservationUnits(Program program, List<BrAPIObservationUnit>
.getReferenceId());
}
}

// If we have an observations array, strip program keys from names
List<BrAPIObservation> observations = ou.getObservations();
if (observations != null) {
for (BrAPIObservation observation : observations) {
String germplasmName = observation.getGermplasmName();
if(StringUtils.isNotBlank(germplasmName)) {
observation.setGermplasmName(Utilities.removeProgramKeyAndUnknownAdditionalData(germplasmName, program.getKey()));
}

String observationUnitName = observation.getObservationUnitName();
if(StringUtils.isNotBlank(germplasmName)) {
observation.setObservationUnitName(Utilities.removeProgramKeyAndUnknownAdditionalData(observationUnitName, program.getKey()));
}

String observationVariableName = observation.getObservationVariableName();
if(StringUtils.isNotBlank(observationVariableName)) {
observation.setObservationVariableName(Utilities.removeProgramKey(observationVariableName, program.getKey()));
}
}
}

ou.setObservationUnitName(Utilities.removeProgramKeyAndUnknownAdditionalData(ou.getObservationUnitName(), program.getKey()));
if(StringUtils.isNotBlank(ou.getGermplasmName())) {
ou.setGermplasmName(Utilities.removeProgramKeyAndUnknownAdditionalData(ou.getGermplasmName(), program.getKey()));
Expand Down