Skip to content

BI-1798#255

Merged
nickpalladino merged 3 commits intodevelopfrom
bug/BI-1798
Jun 2, 2023
Merged

BI-1798#255
nickpalladino merged 3 commits intodevelopfrom
bug/BI-1798

Conversation

@nickpalladino
Copy link
Member

@nickpalladino nickpalladino commented May 25, 2023

Description

Story: https://breedinginsight.atlassian.net/browse/BI-1798?atlOrigin=eyJpIjoiNjU0OWI5OTNmZmRhNDA1Y2JmZjllZDQzOWM4YTQxNTAiLCJwIjoiaiJ9

  • Use additionalInfo GIDs

Dependencies

  • None

Testing

  • Test germplasm with different combinations of unknown parents and verify the downloaded list file matches

Checklist:

  • I have performed a self-review of my own code
  • I have tested my code and ensured it meets the acceptance criteria of the story
  • I have tested that my code works with both the brapi-java-server and BreedBase
  • I have create/modified unit tests to cover this change
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to documentation
  • I have run TAF: <please include a link to TAF run>

@github-actions github-actions bot added the bug Something isn't working label May 25, 2023
@nickpalladino nickpalladino requested review from a team, davedrp and mlm483 and removed request for a team May 30, 2023 15:15
@mlm483
Copy link
Contributor

mlm483 commented May 31, 2023

@nickpalladino
Copy link
Member Author

I ran TAF to be safe: https://github.com/Breeding-Insight/taf/actions/runs/5126064698

Thanks!

Copy link
Contributor

@mlm483 mlm483 left a comment

Choose a reason for hiding this comment

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

The Pedigree viewer looks good for Germplasm with an unknown parent specified by entry number 0 in the uploaded file! However, the Jira story suggests the Germplasm export file should also contain the 0 entry number (or maybe GID? - I'm unclear).

"Expect: the germplasm download to include Unknown GID 0 like observed in the pedigree tree and in the original import file. Notice that Mahan is the result of biparental cross (Schley/Unknown)." - https://breedinginsight.atlassian.net/browse/BI-1798

Can we discuss tomorrow?

@nickpalladino
Copy link
Member Author

The Pedigree viewer looks good for Germplasm with an unknown parent specified by entry number 0 in the uploaded file! However, the Jira story suggests the Germplasm export file should also contain the 0 entry number (or maybe GID? - I'm unclear).

"Expect: the germplasm download to include Unknown GID 0 like observed in the pedigree tree and in the original import file. Notice that Mahan is the result of biparental cross (Schley/Unknown)." - https://breedinginsight.atlassian.net/browse/BI-1798

Can we discuss tomorrow?

Updated to handle 0's the parent entry numbers. Included logging statements in case additionalinfo is missing properties we're expecting we can more easily figure out why. I don't think we have production data that would fail this but just in case.

@nickpalladino nickpalladino requested a review from mlm483 June 1, 2023 18:58
Copy link
Contributor

@mlm483 mlm483 left a comment

Choose a reason for hiding this comment

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

Looks good, I think exported data now matches imported data as closely as possible.


I wanted to make sure this is expected behavior for empty parent entry numbers. As long as this behavior is expected, I say go ahead and merge 🚀.

Has Female Parent Entry No. Empty Female Parent Entry No.
Has Male Parent Entry No. Upload Succeeds ✅ "Female parent is missing..." error message ❌ (first screenshot)
Empty Male Parent Entry No. Upload Succeeds ✅ (second screenshot) Upload Succeeds ✅
Screenshot 2023-06-01 at 4 13 09 PM Screenshot 2023-06-01 at 4 16 35 PM

@nickpalladino
Copy link
Member Author

Looks good, I think exported data now matches imported data as closely as possible.

I wanted to make sure this is expected behavior for empty parent entry numbers. As long as this behavior is expected, I say go ahead and merge 🚀.
Has Female Parent Entry No. Empty Female Parent Entry No.
Has Male Parent Entry No. Upload Succeeds ✅ "Female parent is missing..." error message ❌ (first screenshot)
Empty Male Parent Entry No. Upload Succeeds ✅ (second screenshot) Upload Succeeds ✅
Screenshot 2023-06-01 at 4 13 09 PM Screenshot 2023-06-01 at 4 16 35 PM

Thanks for the thorough testing! Ya, if you enter a pedigree it's required to have a female parent.

@nickpalladino nickpalladino merged commit 77d3cc3 into develop Jun 2, 2023
@nickpalladino nickpalladino deleted the bug/BI-1798 branch June 2, 2023 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants