Skip to content

[BI-1456] Ontology Share - Improvement #261

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
dmeidlin merged 1 commit into from
Jun 12, 2023
Merged

[BI-1456] Ontology Share - Improvement #261

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
31 changes: 29 additions & 2 deletions src/main/java/org/breedinginsight/services/OntologyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,42 @@ public List getSharedOntology(@NotNull UUID programId, @NotNull Boolean sharedOn
// Get program with that id
Program program = getProgram(programId);

// Get any programs targeted for sharing by this program
List<SharedOntology> formattedPrograms = getSharedProgramsFormatted(program);
Set<UUID> sharedProgramIds = formattedPrograms.stream().map(SharedOntology::getProgramId).collect(Collectors.toSet());

// Add other programs
// Add other sharable programs
if (!sharedOnly) {
// TODO: Test if localhost vs localhost/brapi/v2 makes a difference
List<Program> matchingPrograms = getMatchingPrograms(program);

// Collect the ids of any matching programs that are either sharing-sources or
// sharing-targets that have accepted
Set<UUID> shareSourceIds = new HashSet<>();
Set<UUID> shareTargetIds = new HashSet<>();
for (Program candidate: matchingPrograms) {
List<SharedOntology> shareTargetsFormatted = getSharedProgramsFormatted(candidate);
if (!shareTargetsFormatted.isEmpty()) {

// The program is sharing its ontology, so collect its id as a source
shareSourceIds.add(candidate.getId());

// Collect the ids of target-programs that have accepted
shareTargetIds.addAll(shareTargetsFormatted
.stream()
.filter(SharedOntology::getAccepted)
.map(SharedOntology::getProgramId)
.collect(Collectors.toSet())
);
}
}

Set<UUID> unsharableIds = new HashSet<>();
unsharableIds.addAll(sharedProgramIds);
unsharableIds.addAll(shareSourceIds);
unsharableIds.addAll(shareTargetIds);
formattedPrograms.addAll(matchingPrograms.stream()
.filter(matchingProgram -> !sharedProgramIds.contains(matchingProgram.getId()))
.filter(matchingProgram -> !unsharableIds.contains(matchingProgram.getId()))
.map(matchingProgram -> formatResponse(matchingProgram))
.collect(Collectors.toList()));
}
Expand Down