Skip to content

[DT-3774] Fix missing dac_approval column in DacDAO.findAll() #2962

Merged
kevinmarete merged 3 commits into
developfrom
km-dt-3774-fix-dataset-counts
Jul 6, 2026
Merged

[DT-3774] Fix missing dac_approval column in DacDAO.findAll() #2962
kevinmarete merged 3 commits into
developfrom
km-dt-3774-fix-dataset-counts

Conversation

@kevinmarete

@kevinmarete kevinmarete commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Addresses

https://broadworkbench.atlassian.net/browse/DT-3774

Summary

GET /api/dac never selected dac_approval for the datasets embedded in each DAC, so dacApproval was always null on that response — causing the Manage DAC table's dataset counts to disagree with the DAC profile page (which uses a different endpoint that does select this column). Added the column to the query and mapped it in DacReducer, added a Dac.getDatasets() accessor, and added a DAO test covering approved vs. pending datasets.


Have you read CONTRIBUTING.md lately? If not, do that first.

  • Label PR with a Jira ticket number and include a link to the ticket
  • Label PR with a security risk modifier [no, low, medium, high]
  • PR describes scope of changes
  • Get a minimum of one thumbs worth of review, preferably two if enough team members are available
  • Get PO sign-off for all non-trivial UI or workflow changes
  • Verify all tests go green
  • Test this change deployed correctly and works on dev environment after deployment

@kevinmarete kevinmarete self-assigned this Jul 3, 2026
@kevinmarete kevinmarete changed the title Km dt 3774 fix dataset counts [DT-3774] Fix missing dac_approval column in DacDAO.findAll() Jul 3, 2026
@kevinmarete kevinmarete marked this pull request as ready for review July 3, 2026 19:55
@kevinmarete kevinmarete requested a review from a team as a code owner July 3, 2026 19:55
@kevinmarete kevinmarete requested review from Copilot, fboulnois and rushtong and removed request for a team July 3, 2026 19:55
@kevinmarete kevinmarete removed the request for review from Copilot July 3, 2026 19:56

@fboulnois fboulnois left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

@rushtong rushtong left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice catch, minor suggested improvement inline.

Comment thread src/main/java/org/broadinstitute/consent/http/db/mapper/DacReducer.java Outdated
@kevinmarete kevinmarete requested review from Copilot and removed request for Copilot July 6, 2026 15:01
@sonarqubecloud

sonarqubecloud Bot commented Jul 6, 2026

Copy link
Copy Markdown

@kevinmarete kevinmarete merged commit 895462e into develop Jul 6, 2026
12 checks passed
@kevinmarete kevinmarete deleted the km-dt-3774-fix-dataset-counts branch July 6, 2026 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants