Skip to content

[BI-1632] - Unknown Pedigree not displaying for BrAPI-server programs#217

Merged
HMS17 merged 4 commits intodevelopfrom
bug/BI-1632
Oct 14, 2022
Merged

[BI-1632] - Unknown Pedigree not displaying for BrAPI-server programs#217
HMS17 merged 4 commits intodevelopfrom
bug/BI-1632

Conversation

@HMS17
Copy link
Contributor

@HMS17 HMS17 commented Oct 7, 2022

Description

Story: BI-1632 - Unknown Pedigree not displaying for BrAPI-server programs

Only valid GIDs can be stored in the backend, so in the case of Unknown or Unknown/Unknown pedigrees, what is stored in the backend for pedigree is null, with the Unknown information being stored in additionalInfo and retrieved upon display. However, BrAPIGermplasmDAO:processGermplasmForDisplay only sets pedigree values, including GERMPLASM_PEDIGREE_BY_NAME, when the pedigree stored is not null. This is not a problem in Breedbase because what is returned is always “NA/NA” so the logic to set pedigree string always triggers. For BrAPI, null was being returned in the case of pedigrees with only Unknown germplasm, so the display pedigree values were not being set.

This change removes the clause checking for non-null pedigree (as it effectively was already always true in the Breedbase case) to enable setting pedigree display values in Unknown and Unknown/Unknown cases.

Dependencies

bi-web/develop

Testing

For BB and BrAPI programs

  • Import germplasm with unknown parents (both in the form of Unknown, Unknown/Unknown, and /Unknown)
  • Go to All Germplasm table
  • Ensure pedigrees displaying as expected in Pedigree Column
  • Go to germplasm details, ensure pedigree also displaying properly there

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 Oct 7, 2022
@HMS17 HMS17 marked this pull request as ready for review October 7, 2022 18:53
@HMS17 HMS17 requested review from a team, davedrp and dmeidlin and removed request for a team October 7, 2022 21:21
Copy link
Contributor

@davedrp davedrp left a comment

Choose a reason for hiding this comment

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

Test Failed:

PROGRAM TYPE: breedbase or BrAPI
Scenario 1: Female Parent is "0" and Male Parent is a known Entry Number
Expected Results: Male Parent should be displayed in Import Confirmation Page, All Germplasm Table, and Germplasm Details page.
Actual Result: Male Parent is <BLANK> in Import Confirmation Page, All Germplasm Table, or Germplasm Details page.

PROGRAM TYPE: breedbase or BrAPI
Scenario 2: Female Parent is <BLANK> and Male Parent is "0" (UNKNOWN)
Expected Results: Male Parent should be displayed as "UNKNOWN" in Import Confirmation Page, All Germplasm Table, and Germplasm Details page.
Actual Result: Male Parent is <BLANK> in Import Confirmation Page, All Germplasm Table, or Germplasm Details page.

@HMS17
Copy link
Contributor Author

HMS17 commented Oct 11, 2022

Test Failed:

PROGRAM TYPE: breedbase or BrAPI Scenario 1: Female Parent is "0" and Male Parent is a known Entry Number Expected Results: Male Parent should be displayed in Import Confirmation Page, All Germplasm Table, and Germplasm Details page. Actual Result: Male Parent is <BLANK> in Import Confirmation Page, All Germplasm Table, or Germplasm Details page.

PROGRAM TYPE: breedbase or BrAPI Scenario 2: Female Parent is <BLANK> and Male Parent is "0" (UNKNOWN) Expected Results: Male Parent should be displayed as "UNKNOWN" in Import Confirmation Page, All Germplasm Table, and Germplasm Details page. Actual Result: Male Parent is <BLANK> in Import Confirmation Page, All Germplasm Table, or Germplasm Details page.

Presently we're not supporting pedigree combinations with only male parent or unknown female/known male.

Only "Unknown Female", "Unknown Female/Unknown Male", "Known Female/Unknown Male" are supported.

@HMS17 HMS17 requested a review from davedrp October 11, 2022 21:55
@HMS17 HMS17 changed the base branch from develop to release/0.7 October 14, 2022 16:34
@HMS17 HMS17 changed the base branch from release/0.7 to develop October 14, 2022 17:19
@HMS17 HMS17 merged commit e5c8dd7 into develop Oct 14, 2022
@HMS17 HMS17 deleted the bug/BI-1632 branch October 14, 2022 17:25
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