From 6d56ef10fbb5abb240e6a44582ae918dc6131a99 Mon Sep 17 00:00:00 2001 From: Tim Parsons Date: Wed, 5 Jul 2023 22:30:17 -0400 Subject: [PATCH 1/2] [BI-1825] add check for legacy trait names in ExperimentProcessor --- .../importer/services/processors/ExperimentProcessor.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/ExperimentProcessor.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/ExperimentProcessor.java index d1210b138..ddea6296c 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/ExperimentProcessor.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/ExperimentProcessor.java @@ -838,6 +838,12 @@ private void addObsVarsToDatasetDetails(PendingImportObject 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); } @@ -1582,4 +1588,4 @@ private String seasonDbIdToYearFromDatabase(String seasonDbId, UUID programId) { Integer yearInt = (season == null) ? null : season.getYear(); return (yearInt == null) ? "" : yearInt.toString(); } -} \ No newline at end of file +} From e8cc3ecfe13b46c5f35d205062fd33b260c3b6ea Mon Sep 17 00:00:00 2001 From: dmeidlin <14339308+dmeidlin@users.noreply.github.com> Date: Fri, 7 Jul 2023 10:46:40 -0400 Subject: [PATCH 2/2] fix expcontrollerintegration test --- .../brapi/v2/ExperimentControllerIntegrationTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/breedinginsight/brapi/v2/ExperimentControllerIntegrationTest.java b/src/test/java/org/breedinginsight/brapi/v2/ExperimentControllerIntegrationTest.java index fb5f79f92..28cfd1c80 100644 --- a/src/test/java/org/breedinginsight/brapi/v2/ExperimentControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/brapi/v2/ExperimentControllerIntegrationTest.java @@ -292,6 +292,7 @@ private List 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")