From 186f0027b89ee6e2da733ff79e700193ad4d3087 Mon Sep 17 00:00:00 2001 From: David Randolph Phillips Date: Fri, 12 May 2023 11:13:51 -0400 Subject: [PATCH] [BI-1193] addressed bug in BI-1193 --- .../services/processors/ExperimentProcessor.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 d85b80329..d1210b138 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 @@ -284,21 +284,20 @@ public void postBrapiData(Map mappedBrAPIImport, Program AuthenticatedUser actingUser = new AuthenticatedUser(upload.getUpdatedByUser().getName(), new ArrayList<>(), upload.getUpdatedByUser().getId(), new ArrayList<>()); try { + List createdDatasets = new ArrayList<>(brAPIListDAO.createBrAPILists(newDatasetRequests, program.getId(), upload)); + createdDatasets.forEach(summary -> { + obsVarDatasetByName.get(summary.getListName()).getBrAPIObject().setListDbId(summary.getListDbId()); + }); + List createdTrials = new ArrayList<>(brapiTrialDAO.createBrAPITrials(newTrials, program.getId(), upload)); // set the DbId to the for each newly created trial for (BrAPITrial createdTrial : createdTrials) { String createdTrialName = Utilities.removeProgramKey(createdTrial.getTrialName(), program.getKey()); this.trialByNameNoScope.get(createdTrialName) - .getBrAPIObject() - .setTrialDbId(createdTrial.getTrialDbId()); + .getBrAPIObject() + .setTrialDbId(createdTrial.getTrialDbId()); } - - List createdDatasets = new ArrayList<>(brAPIListDAO.createBrAPILists(newDatasetRequests, program.getId(), upload)); - createdDatasets.forEach(summary -> { - obsVarDatasetByName.get(summary.getListName()).getBrAPIObject().setListDbId(summary.getListDbId()); - }); - List createdLocations = new ArrayList<>(locationService.create(actingUser, program.getId(), newLocations)); // set the DbId to the for each newly created trial for (ProgramLocation createdLocation : createdLocations) {