Skip to content

[BI-2641] WIP #493

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 1 commit into from
Jan 22, 2026
Merged

[BI-2641] WIP #493

Show file tree
Hide file tree
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
7 changes: 1 addition & 6 deletions .../importer/services/processors/experiment/create/workflow/CreateNewExperimentWorkflow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@

package org.breedinginsight.brapps.importer.services.processors.experiment.create.workflow;

import io.micronaut.context.annotation.Prototype;
import io.micronaut.http.HttpStatus;
import io.micronaut.http.exceptions.HttpStatusException;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.apache.commons.lang3.StringUtils;
import org.brapi.v2.model.pheno.BrAPIObservation;
import org.breedinginsight.api.model.v1.response.ValidationErrors;
Expand All @@ -35,7 +33,6 @@
import org.breedinginsight.brapps.importer.model.response.PendingImportObject;
import org.breedinginsight.brapps.importer.model.workflow.ImportContext;
import org.breedinginsight.brapps.importer.model.workflow.ProcessedData;
import org.breedinginsight.brapps.importer.model.workflow.Workflow;
import org.breedinginsight.brapps.importer.services.ImportStatusService;
import org.breedinginsight.brapps.importer.services.processors.experiment.ExperimentUtilities;
import org.breedinginsight.brapps.importer.services.processors.experiment.create.model.PendingData;
Expand All @@ -49,7 +46,6 @@
import org.breedinginsight.services.exceptions.ValidatorException;

import javax.inject.Inject;
import javax.inject.Named;
import java.util.*;

import lombok.Getter;
Expand Down Expand Up @@ -106,8 +102,7 @@ private ImportPreviewResponse runWorkflow(ImportContext context) throws Exceptio
statusService.updateMessage(upload, "Checking existing experiment objects in brapi service and mapping data");

ProcessedPhenotypeData phenotypeData = experimentPhenotypeService.extractPhenotypes(context);
// TODO: eliminate or modify unnecessary populateExistingPIO step as it relies on the user supplying existing observation unit ids
ProcessContext processContext = populateExistingPendingImportObjectsStep.process(context, phenotypeData);
ProcessContext processContext = populateExistingPendingImportObjectsStep.process(context);
populateNewPendingImportObjectsStep.process(processContext, phenotypeData);
ValidationErrors validationErrors = validatePendingImportObjectsStep.process(context, processContext.getPendingData(), phenotypeData, processedData);

Expand Down
Loading
Loading