Skip to content

[BI-2806] Remove trials cache #516

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

Open
jloux-brapi wants to merge 13 commits into
base: epic/BI-2862
Choose a base branch
from
Open

[BI-2806] Remove trials cache #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a04b36e
Add todos
jloux-brapi Apr 22, 2026
b8444e9
Merge branch 'develop' into feature/BI-2806
jloux-brapi Apr 23, 2026
df7affd
Remove unused method from BrAPITrialDAO
jloux-brapi Apr 23, 2026
d1ae3d9
Fix first get method
jloux-brapi Apr 24, 2026
c1b0174
Update getTrials(UUID) method to use brapi directly
jloux-brapi Apr 28, 2026
6b6a695
Udpate remaining getMethods, fix enough exRef things to pass unit tests
jloux-brapi May 4, 2026
bb30594
Remove code setting brapiId to exRef
jloux-brapi May 4, 2026
a36229b
Merge branch 'develop' into fix_exrefs
jloux-brapi May 4, 2026
35cde9c
Changes to support ExperimentControllerIntegrationTest
jloux-brapi May 5, 2026
af7ceda
Fix remaining test failures and alter some code to support dbIds
jloux-brapi May 5, 2026
6854606
Remove cache from last get method
jloux-brapi May 5, 2026
1f18377
Remove cache from trial update
jloux-brapi May 5, 2026
c2083d8
Remove cache from post method and remove entirely for trials
jloux-brapi May 5, 2026
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
5 changes: 1 addition & 4 deletions src/main/java/org/breedinginsight/brapi/v2/BrAPIStudiesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ public HttpResponse<Response<DataResponse<List<BrAPIStudy>>>> getStudies(
return ResponseUtils.getBrapiQueryResponse(authorizedStudies, studyQueryMapper, queryParams, searchRequest);
}

// TODO: Instead of getting all studies for a program and filtering, doing the filtering on brapi side
List<BrAPIStudy> studies = studyService.getStudies(programId)
.stream()
.peek(this::setDbIds)
Expand Down Expand Up @@ -172,10 +173,6 @@ private void setDbIds(BrAPIStudy study) {
.orElseThrow(() -> new IllegalStateException("No BI external reference found"))
.getReferenceID());

study.trialDbId(Utilities.getExternalReference(study.getExternalReferences(), Utilities.generateReferenceSource(referenceSource, ExternalReferenceSource.TRIALS))

@jloux-brapi jloux-brapi May 6, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kind of a get ahead of the curve change. It might be able to remain as is, but might be tough to find later on when we use trialDbIds directly for studies.

@nickpalladino nickpalladino May 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya probably ok for poc but could cause confusing issues mixing deltabreed UUIDs and BrAPI UUIDs.

.orElseThrow(() -> new IllegalStateException("No BI external reference found"))
.getReferenceID());

//TODO update locationDbId
}
}
5 changes: 2 additions & 3 deletions src/main/java/org/breedinginsight/brapi/v2/BrAPITrialsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import io.micronaut.security.rules.SecurityRule;
import lombok.extern.slf4j.Slf4j;
import org.brapi.client.v2.model.exceptions.ApiException;
import org.brapi.v2.model.BrAPIExternalReference;
import org.brapi.v2.model.core.BrAPITrial;
import org.brapi.v2.model.core.response.BrAPITrialSingleResponse;
import org.breedinginsight.api.auth.*;
Expand Down Expand Up @@ -158,10 +159,8 @@ public HttpResponse<?> trialsTrialDbIdPut(@PathVariable("programId") UUID progra
return HttpResponse.notFound();
}

// TODO: Remove for trialDbId once cache is removed for that entity
private void setDbIds(BrAPITrial trial) {
trial.trialDbId(Utilities.getExternalReference(trial.getExternalReferences(), Utilities.generateReferenceSource(referenceSource, ExternalReferenceSource.TRIALS))

@jloux-brapi jloux-brapi May 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was preventing the frontend effectively from being able to use brapiTrialDbIds in the router. Bit of a nasty bugger. Expecting more changes like this in the future for other entities.

@nickpalladino nickpalladino May 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another thing I think we'll need to resolve is having inconsistent UUIDs like using the BrAPI trialDbId here but then the DeltaBreed program UUID below.

.orElseThrow(() -> new IllegalStateException("No BI external reference found"))
.getReferenceID());
trial.programDbId(Utilities.getExternalReference(trial.getExternalReferences(), Utilities.generateReferenceSource(referenceSource, ExternalReferenceSource.PROGRAMS))
.orElseThrow(() -> new IllegalStateException("No BI external reference found"))
.getReferenceID());
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIStudyDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public List<BrAPIStudy> getStudiesByName(List<String> studyNames, Program progra
}

public List<BrAPIStudy> getStudiesByExperimentID(@NotNull UUID experimentId, Program program) throws ApiException {
// TODO: This should look up on trialDbId, and the trialDbId should be passed thru
BrAPIStudySearchRequest studySearch = new BrAPIStudySearchRequest();
studySearch.programDbIds(List.of(program.getBrapiProgram().getProgramDbId()));
studySearch.addExternalReferenceIdsItem(experimentId.toString());
Expand Down Expand Up @@ -167,11 +168,7 @@ public List<BrAPIStudy> getStudiesByEnvironmentIds(@NotNull Collection<UUID> env
public List<BrAPIStudy> getStudiesByExperimentIds(@NotNull Collection<UUID> experimentIds, Program program) throws ApiException {
BrAPIStudySearchRequest studySearch = new BrAPIStudySearchRequest();
studySearch.programDbIds(List.of(program.getBrapiProgram().getProgramDbId()));
// Add all experimentIds as xref ID search terms.
for (UUID experimentId : experimentIds) {
studySearch.addExternalReferenceIdsItem(experimentId.toString());
}
studySearch.addExternalReferenceSourcesItem(Utilities.generateReferenceSource(referenceSource, ExternalReferenceSource.TRIALS));
studySearch.trialDbIds(experimentIds.stream().map(UUID::toString).collect(Collectors.toList()));
StudiesApi api = brAPIEndpointProvider.get(programDAO.getCoreClient(program.getId()), StudiesApi.class);
return new ArrayList<>(processStudyForDisplay(brAPIDAOUtil.search(
api::searchStudiesPost,
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/breedinginsight/brapi/v2/dao/BrAPITrialDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,9 @@ List<BrAPITrial> createBrAPITrials(List<BrAPITrial> brAPITrialList, UUID program

Optional<BrAPITrial> getTrialById(UUID programId, UUID trialId) throws ApiException, DoesNotExistException;

Optional<BrAPITrial> getTrialByDbId(String trialDbId, Program program) throws ApiException;

List<BrAPITrial> getTrialsByDbIds(Collection<String> trialDbIds, Program program) throws ApiException;

List<BrAPITrial> getTrialsByExperimentIds(Collection<UUID> experimentIds, Program program) throws ApiException;

void deleteBrAPITrial(Program program, BrAPITrial trial, boolean hard) throws ApiException;

void repopulateCache(UUID programId);
}
Loading
Loading