Skip to content

[BI-2187] Non-sequential GIDs After Circular Dependency Error #445

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
davedrp merged 2 commits into from
Mar 26, 2025
Merged

[BI-2187] Non-sequential GIDs After Circular Dependency Error #445

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79ee1c6
[BI-2187] call GermplasmProcessor::createPostOrder for commit and NOT…
davedrp Feb 21, 2025
05f25b5
[BI-2187] Fixed bug, caused by the gemplasm Pedigree string being di…
davedrp Mar 26, 2025
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
22 changes: 15 additions & 7 deletions ...main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,9 @@ public Map<String, ImportPreviewStatistics> process(ImportUpload upload, List<Br
// Construct pedigree
constructPedigreeString(importRows, mappedBrAPIImport, commit);

// Construct a dependency tree for POSTing order. Dependents on unique germplasm name, (<Name> [<Program Key> - <Accession Number>])
if (commit) {
createPostOrder();
}
// for commit: Construct a dependency tree for POSTing order. Dependents on unique germplasm name, (<Name> [<Program Key> - <Accession Number>])
// for !commit: Validate for circular pedigree dependencies.
createPostOrder(commit);

// Construct our response object
return getStatisticsMap(importRows);
Expand Down Expand Up @@ -556,9 +555,18 @@ private void validatePedigree(Germplasm germplasm, Integer rowNumber, Validation
}
}

private void createPostOrder() {
/*
This will set the postOrder and validate for circular pedigree dependencies.
*/
private void createPostOrder(boolean commit) {
Set<String> created = null;
// Construct a dependency tree for POSTing order
Set<String> created = existingGermplasm.stream().map(BrAPIGermplasm::getGermplasmName).collect(Collectors.toSet());
if(commit){
created = existingGermplasm.stream().map(BrAPIGermplasm::getGermplasmName).collect(Collectors.toSet());
}
else {
created = existingGermplasm.stream().map(BrAPIGermplasm::getDefaultDisplayName).collect(Collectors.toSet());
}

//todo this gets messy

Expand All @@ -569,7 +577,7 @@ private void createPostOrder() {
for (BrAPIGermplasm germplasm : newGermplasmList) {

// If we've already planned this germplasm, skip
if (created.contains(germplasm.getGermplasmName())) {
if ( (commit && created.contains(germplasm.getGermplasmName())) || (!commit && created.contains(germplasm.getDefaultDisplayName())) ) {
continue;
}

Expand Down
Loading