Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.breedinginsight.utilities.Utilities;

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.util.*;
import java.util.stream.Collectors;
Expand All @@ -72,67 +71,31 @@ public class BrAPIGermplasmDAO {

private final BrAPIEndpointProvider brAPIEndpointProvider;

private final int brapiMaxPageSize;

@Inject
public BrAPIGermplasmDAO(ProgramDAO programDAO,
ImportDAO importDAO,
BrAPIDAOUtil brAPIDAOUtil,
BrAPIEndpointProvider brAPIEndpointProvider,
@Property(name = "brapi.cache.fetch-page-size") int brapiFetchPageSize,
ObjectMapper objectMapper,
BrAPIListDAO brAPIListDAO) {
this.programDAO = programDAO;
this.importDAO = importDAO;
this.brAPIDAOUtil = brAPIDAOUtil;
this.brAPIEndpointProvider = brAPIEndpointProvider;
this.brapiMaxPageSize = brapiFetchPageSize;
this.objectMapper = objectMapper;
this.brAPIListDAO = brAPIListDAO;
}

/**
* Fetch the germplasm for this program, and process it to remove storage specific values
* @param programId
* @return this program's germplasm
* @throws ApiException
*/
public List<BrAPIGermplasm> getGermplasm(UUID programId) throws ApiException {
Program program = programDAO.get(programId)
.stream()
.findFirst()
.orElseThrow();

if (program.getId() == null) {
throw new InternalServerException("BI-API Program or Program ID is null");
}

String brapiProgramDbId = Optional.of(program)
.map(Program::getBrapiProgram)
.map(BrAPIProgram::getProgramDbId)
.orElse(null);

if (brapiProgramDbId == null) {
brapiProgramDbId = programDAO.getProgramBrAPI(program).getProgramDbId();
}

GermplasmQueryParams germplasmQueryParams = GermplasmQueryParams.builder()
.programDbId(brapiProgramDbId)
.build();

return getBrAPIGermplasmUsingBrAPIProgramId(germplasmQueryParams, program);
}

/**
* Fetch the germplasm for this program as it was stored in the program's BrAPI server
* @param programId
* @return this program's germplasm as it is stored on its BrAPI server
* @throws ApiException
*/
public List<BrAPIGermplasm> getRawGermplasm(UUID programId) throws ApiException {
// TODO: This method is used for checking if germplasm already exist in the system. Once a generalized BrAPI exists check is made, we should update this method [BI-2938]
// TODO: This method is used for checking if germplasm already exist in the system. Once a generalized BrAPI exists check is made, we should update this method to optimize it [BI-2938]
Program program = new Program(programDAO.fetchOneById(programId));
List<BrAPIGermplasm> programGermplasm = getGermplasm(programId);
List<BrAPIGermplasm> programGermplasm = brapiGermplasmSearchReturnList(program, new BrAPIGermplasmSearchRequest());
return programGermplasm.stream().map(germplasm -> {
germplasm.setGermplasmName(Utilities.appendProgramKey(germplasm.getDefaultDisplayName(), program.getKey(), germplasm.getAccessionNumber()));
if(germplasm.getAdditionalInfo() != null && germplasm.getAdditionalInfo().has(BrAPIAdditionalInfoFields.GERMPLASM_RAW_PEDIGREE)
Expand Down Expand Up @@ -334,7 +297,7 @@ private Map<String, String> getPedigreeGermplasmDbIdByBICreatedExRef(List<BrAPIG
// This will use CACHE_BRAPI_FETCH_PAGE_SIZE env variable to lookup at maximum 65k pedigree germplasm at once.
// This should not be normal though, as we should try not to exceed 1k lookups at once using this code.
// If there is a need to look up a large amount of germplasm records at once, alternative methods should be used.
List<BrAPIGermplasm> germplasmSearchedWithExRef = brAPIDAOUtil.searchNoPaging(
List<BrAPIGermplasm> germplasmSearchedWithExRef = brAPIDAOUtil.searchNoPageThru(
api::searchGermplasmPost,
api::searchGermplasmSearchResultsDbIdGet,
searchRequest);
Expand All @@ -352,27 +315,6 @@ private Map<String, String> getPedigreeGermplasmDbIdByBICreatedExRef(List<BrAPIG
return germplasmDbIdByGeneratedExRef;
}

/**
* This method requires a BI-API program. If the BrAPIProgram inside this data model is not set,
* this method will retrieve it.
*/
private List<BrAPIGermplasm> getBrAPIGermplasmUsingBrAPIProgramId(GermplasmQueryParams germplasmQueryParams, Program program) throws ApiException {
if (germplasmQueryParams.page() == null) {
germplasmQueryParams.setPage(0);
}

if (germplasmQueryParams.pageSize() == null) {
germplasmQueryParams.setPageSize(brapiMaxPageSize);
}

GermplasmApi api = brAPIEndpointProvider.get(programDAO.getCoreClient(program.getId()), GermplasmApi.class);

List<BrAPIGermplasm> result = brAPIDAOUtil.get(api::germplasmGet, germplasmQueryParams);

// TODO: Once cache is removed for this class, fix processGermplasmForDisplay to return List<BrAPIGermplasm> [BI-2906]
return processGermplasmForDisplay(result, program);
}

// TODO: hack for now, probably should update breedbase
// Made a JIRA card BI-1883 for this
// Breedbase will return NA/NA for no pedigree or NA/father, mother/NA
Expand Down Expand Up @@ -481,8 +423,9 @@ public BrAPIGermplasmListResponse brapiGermplasmSearchReturnResponse(Program pro
BrAPIGermplasmSearchRequest brAPIGermplasmSearchRequest = buildSearchRequest(program, searchRequest, germplasmQuery);

BrAPIGermplasmListResponse brAPIResponse =
brAPIDAOUtil.simpleSearch(
brAPIDAOUtil.searchReturnResponse(
api::searchGermplasmPost,
api::searchGermplasmSearchResultsDbIdGet,
brAPIGermplasmSearchRequest
);

Expand Down Expand Up @@ -527,7 +470,7 @@ public BrAPIGermplasm getGermplasmByUUID(String germplasmId, UUID programId) thr
}

public List<BrAPIGermplasm> getGermplasmsByDBID(Collection<String> germplasmDbIds, UUID programId) throws ApiException {
// TODO: This method is mainly used by the download experiment export tool. This method will fail until we address the parameter limit for async Germplasm requests for germplasmDbIds > 4. Return to this use case during [BI-3021]
// This method is mainly used by the download experiment export tool.
Program program = new Program(programDAO.fetchOneById(programId));

BrAPIGermplasmSearchRequest searchRequest = new BrAPIGermplasmSearchRequest();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,19 +188,19 @@ public List<BrAPIObservation> getObservationsByObservationUnits(Collection<Strin
return searchBrapiObservations(observationSearchRequest, program);
}

public BrAPIObservationListResponse getObservationsByFilters(Program program, String studyDbId, Integer page, Integer pageSize) throws ApiException, DoesNotExistException {
public BrAPIObservationListResponse getObservationsByFilters(Program program, String studyDbId, Integer page, Integer pageSize) throws ApiException {
BrAPIObservationSearchRequest observationSearchRequest = new BrAPIObservationSearchRequest()
.programDbIds(List.of(program.getBrapiProgram().getProgramDbId()));

if (studyDbId != null) {
observationSearchRequest.setStudyDbIds(List.of(studyDbId));
}
observationSearchRequest.setPage(page == null ? 0 : page);
observationSearchRequest.setPageSize(pageSize == null ? 1000 : pageSize);
observationSearchRequest.setPage(page);
observationSearchRequest.setPageSize(pageSize);

ObservationsApi api = brAPIEndpointProvider.get(programDAO.getCoreClient(program.getId()), ObservationsApi.class);

BrAPIObservationListResponse brAPIResponse = brAPIDAOUtil.simpleSearch(api::searchObservationsPost, observationSearchRequest);
BrAPIObservationListResponse brAPIResponse = brAPIDAOUtil.searchReturnResponse(api::searchObservationsPost, api::searchObservationsSearchResultsDbIdGet, observationSearchRequest);

List<BrAPIObservation> observations = brAPIDAOUtil.getListResult(brAPIResponse);
processObservations(program.getKey(), observations);
Expand All @@ -223,37 +223,6 @@ public List<BrAPIObservation> createBrAPIObservations(List<BrAPIObservation> brA
}
}

private List<BrAPIObservation> getBrAPIObservationsUsingBrAPIProgramId(Program program) throws ApiException {

if (program == null || program.getId() == null) {
throw new InternalServerException("BI-API Program or Program ID is null");
}

String brapiProgramDbId = Optional.of(program)
.map(Program::getBrapiProgram)
.map(BrAPIProgram::getProgramDbId)
.orElse(null);

if (brapiProgramDbId == null) {
brapiProgramDbId = programDAO.getProgramBrAPI(program).getProgramDbId();
}

ObservationQueryParams observationQueryParams =
ObservationQueryParams.builder()
.programDbId(brapiProgramDbId)
.pageSize(brapiMaxPageSize)
.page(0)
.build();

ObservationsApi api = brAPIEndpointProvider.get(programDAO.getCoreClient(program.getId()), ObservationsApi.class);

List<BrAPIObservation> result = brAPIDAOUtil.get(api::observationsGet, observationQueryParams);

processObservations(program.getKey(), result);

return result;
}

public List<BrAPIObservation> updateBrAPIObservation(Map<String, BrAPIObservation> mutatedObservationByDbId, UUID programId) throws ApiException {
ObservationsApi api = brAPIEndpointProvider.get(programDAO.getCoreClient(programId), ObservationsApi.class);
var program = programDAO.fetchOneById(programId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,62 +85,19 @@ public BrAPIObservationUnitDAO(ProgramDAO programDAO,
this.brapiMaxPageSize = brapiFetchPageSize;
}

/**
* Get all observation units for a program from the cache.
*/
public List<BrAPIObservationUnit> getProgramObservationUnits(UUID programId) throws ApiException {
Program program = programDAO.get(programId)
.stream()
.findFirst()
.orElseThrow();

if (program.getId() == null) {
throw new InternalServerException("BI-API Program or Program ID is null");
}

String brapiProgramDbId = Optional.of(program)
.map(Program::getBrapiProgram)
.map(BrAPIProgram::getProgramDbId)
.orElse(null);

if (brapiProgramDbId == null) {
brapiProgramDbId = programDAO.getProgramBrAPI(program).getProgramDbId();
}

ObservationUnitQueryParams observationUnitQueryParams = ObservationUnitQueryParams.builder()
.programDbId(brapiProgramDbId)
.build();

return getBrAPIObservationUnitsUsingQueryParams(observationUnitQueryParams, program);
}

private List<BrAPIObservationUnit> getBrAPIObservationUnitsUsingQueryParams(ObservationUnitQueryParams observationUnitQueryParams,
Program program) throws ApiException {

if (observationUnitQueryParams.page() == null) {
observationUnitQueryParams.setPage(0);
}

if (observationUnitQueryParams.pageSize() == null) {
observationUnitQueryParams.setPageSize(brapiMaxPageSize);
}

ObservationUnitsApi api = brAPIEndpointProvider.get(programDAO.getCoreClient(program.getId()), ObservationUnitsApi.class);

List<BrAPIObservationUnit> result = brAPIDAOUtil.get(api::observationunitsGet, observationUnitQueryParams);

processObservationUnits(program, result, true);

return result;
}

private List<BrAPIObservationUnit> searchBrapiObservationUnits(BrAPIObservationUnitSearchRequest observationUnitSearchRequest,
public List<BrAPIObservationUnit> searchBrapiObservationUnits(BrAPIObservationUnitSearchRequest observationUnitSearchRequest,
Program program) throws ApiException {
ObservationUnitsApi api = brAPIEndpointProvider.get(programDAO.getCoreClient(program.getId()), ObservationUnitsApi.class);

if (observationUnitSearchRequest.getProgramDbIds() == null || observationUnitSearchRequest.getProgramDbIds().isEmpty()) {
String brapiProgramDbId = brAPIDAOUtil.getBrAPIProgramDbId(program.getId());
observationUnitSearchRequest.setProgramDbIds(List.of(brapiProgramDbId));
}

BrAPIObservationUnitListResponse brAPIResponse =
brAPIDAOUtil.simpleSearch(
brAPIDAOUtil.searchReturnResponse(
api::searchObservationunitsPost,
api::searchObservationunitsSearchResultsDbIdGet,
observationUnitSearchRequest
);

Expand Down Expand Up @@ -194,7 +151,7 @@ public List<BrAPIObservationUnit> getObservationUnitsById(Collection<String> obs
}

// TODO: Optimize and change to search/get on observationUnitDbId. This will cause sample submission tests to fail until we have a better solution for exists checks for tabular errors. [BI-2987]
return getProgramObservationUnits(program.getId()).stream()
return searchBrapiObservationUnits(new BrAPIObservationUnitSearchRequest(), program).stream()
.filter(ou -> observationUnitDbIds.contains(ou.getObservationUnitDbId()))
.collect(Collectors.toList());
}
Expand Down Expand Up @@ -224,7 +181,7 @@ public List<BrAPIObservationUnit> getObservationUnitsForTrialDbId(@NotNull UUID
public List<BrAPIObservationUnit> getObservationUnitsForDataset(@NotNull String datasetId, @NotNull Program program) throws ApiException {
String datasetReferenceSource = Utilities.generateReferenceSource(referenceSource, ExternalReferenceSource.DATASET);
// TODO: Optimize and change this to search/get on dataset id once a solution is in place to relate ous to datasets [BI-2961]
return getProgramObservationUnits(program.getId()).stream()
return searchBrapiObservationUnits(new BrAPIObservationUnitSearchRequest(), program).stream()
.filter(ou -> {
Optional<BrAPIExternalReference> exRef = Utilities.getExternalReference(ou.getExternalReferences(), datasetReferenceSource);
return exRef.map(brAPIExternalReference -> brAPIExternalReference.getReferenceId().equals(datasetId)).orElse(false);
Expand All @@ -234,8 +191,8 @@ public List<BrAPIObservationUnit> getObservationUnitsForDataset(@NotNull String

public List<BrAPIObservationUnit> getObservationUnitsForDatasetAndEnvs(@NotNull String datasetId, Collection<String> envIds, @NotNull Program program) throws ApiException {
String datasetReferenceSource = Utilities.generateReferenceSource(referenceSource, ExternalReferenceSource.DATASET);

return getProgramObservationUnits(program.getId())
// TODO: Optimize and change this to search/get on dataset id once a solution is in place to relate ous to datasets [BI-2961]
return searchBrapiObservationUnits(new BrAPIObservationUnitSearchRequest(), program)
.stream()
.filter(ou -> {
Optional<BrAPIExternalReference> datasetExRef =
Expand Down Expand Up @@ -353,7 +310,7 @@ private void processObservationUnits(Program program, List<BrAPIObservationUnit>

HashMap<String, BrAPIGermplasm> germplasmByDbId = new HashMap<>();
if( withGID ){
// TODO: Optimize this to use germplasm information directly in BrAPIObservationUnit by searching on ou.germplasmDbIds in a GermplasmSearchRequest [BI-3006]
// TODO: Optimize this to use germplasm information directly in BrAPIObservationUnit by searching on ou.germplasmDbIds in a GermplasmSearchRequest [BI-3105]
this.germplasmService.getGermplasm(program.getId()).forEach((germplasm -> germplasmByDbId.put(germplasm.getGermplasmDbId(), germplasm)));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.brapi.client.v2.model.exceptions.ApiException;
import org.brapi.client.v2.model.queryParams.core.StudyQueryParams;
import org.brapi.client.v2.modules.core.StudiesApi;
import org.brapi.v2.model.BrAPIExternalReference;
import org.brapi.v2.model.core.BrAPIProgram;
import org.brapi.v2.model.core.BrAPIStudy;
import org.brapi.v2.model.core.request.BrAPIStudySearchRequest;
Expand Down Expand Up @@ -95,7 +94,7 @@ public BrAPIStudyListResponse brapiStudySearch(Program program, List<UUID> brapi

BrAPIStudySearchRequest brAPIStudySearchRequest = buildSearchRequest(program, brapiTrialIds, studyQuery);

BrAPIStudyListResponse brAPIResponse = brAPIDAOUtil.simpleSearch(api::searchStudiesPost, brAPIStudySearchRequest);
BrAPIStudyListResponse brAPIResponse = brAPIDAOUtil.searchReturnResponse(api::searchStudiesPost, api::searchStudiesSearchResultsDbIdGet, brAPIStudySearchRequest);

List<BrAPIStudy> processedStudies = processStudyForDisplay(brAPIDAOUtil.getListResult(brAPIResponse), program.getKey());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@
import lombok.extern.slf4j.Slf4j;
import okhttp3.HttpUrl;
import okhttp3.Request;
import org.apache.commons.lang3.StringUtils;
import org.brapi.client.v2.ApiResponse;
import org.brapi.client.v2.model.exceptions.ApiException;
import org.brapi.client.v2.model.queryParams.core.TrialQueryParams;
import org.brapi.client.v2.modules.core.TrialsApi;
import org.brapi.v2.model.BrAPIFilterBy;
import org.brapi.v2.model.BrAPISortBy;
import org.brapi.v2.model.core.BrAPIProgram;
import org.brapi.v2.model.core.BrAPITrial;
import org.brapi.v2.model.core.request.BrAPITrialSearchRequest;
Expand Down Expand Up @@ -227,8 +223,9 @@ public BrAPITrialListResponse brapiTrialSearch(Program program,
BrAPITrialSearchRequest brAPITrialSearchRequest = buildSearchRequest(program, brapiTrialIds, experimentQuery);

BrAPITrialListResponse brAPIResponse =
brAPIDAOUtil.simpleSearch(
brAPIDAOUtil.searchReturnResponse(
api::searchTrialsPost,
api::searchTrialsSearchResultsDbIdGet,
brAPITrialSearchRequest
);

Expand Down
Loading
Loading