APP-542 & APP-665: Add endpoints for admin report create and edit by JordanGuinn · Pull Request #3238 · CDCgov/NEDSS-Modernization

JordanGuinn · 2026-05-18T16:48:17Z

Description

This PR adds new endpoints to the reports module for admin report creation and editing (including filter support as part of that).

Tickets

Checklist before requesting a review

PR focuses on a single story
Code has been fully tested to meet acceptance criteria
PR is reasonably small and reviewable (Generally less than 10 files and 500 changed lines)
All new functions/classes/components reasonably small
Functions/classes/components focused on one responsibility
Code easy to understand and modify (clarity over concise/clever)
PRs containing TypeScript follow the Do's and Don'ts
PR does not contain hardcoded values (Uses constants)
All code is covered by unit or feature tests

JordanGuinn · 2026-05-20T19:29:25Z

-            });
-    assertThat(config.advancedFilter().reportFilterUid()).isEqualTo(6L);
-  }
+  @Nested


Ended up experimenting with @Nested test groups here, as a means to hopefully better distinguish between the things being tested, and to be able to use beforeEach meaningfully across those groups. Thoughts?

brick-green

a few Qs and Suggs

brick-green · 2026-05-29T18:13:24Z

+   * Necessary because `report_uid` is not marked as an IDENTITY column, nor does it have a
+   * corresponding sequence, so we have to use a custom query.
+   */
+  @Query("SELECT (MAX(r.id.reportUid)+1) FROM Report r")


q, b: two questions:

is there a possibility for a race condition if two people try to create a report at the same time?

Will this work if there aren't any reports? I think MAX() will return null in that case

The second question feels like a simple fix (maybe use COALESCE?) but the first may be trickier and a pretty unlikely edge case anyways as users aren't making reports that often. Should we even try to solve for it?

@mcmcgrath13 pointed out there's already an existing utility for this in 7, so I just ended up using that!

That doesn't necessarily address those questions specifically, but imo it does make this less of a problem that we wanna solve for as part of this work.

The Id Generation service exists (hopefully) to avoid these sorts of races. It dibs the ID for us and then we can use it knowing there won't be a clash

brick-green · 2026-05-29T20:13:19Z

@@ -0,0 +1,130 @@
+package gov.cdc.nbs.report;
+
+import gov.cdc.nbs.entity.odse.*;


sugg, b: list out the imports instead of the wildcard?

Will give that a shot manually - this was either the result of IntelliJ trying to be smart, or our Spotless formatter, definitely not something I intentionally did myself

Confirmed, it was an IntelliJ setting. Though that does make me wonder if we have a preference on a potential upper limit there? Like at what point do we prefer *, if ever?

Fair question. I set my upper limit to 999 lol

But I can't see a good reason to use the wildcard. Maybe imposing a somewhat reasonable limit (like 20ish?) would be an indicator that too much is happening in a single file and that some refactoring in needed. What do you think?

Works for me! Will bump mine to 20 - I suppose if you've got more than that many imports from a single location, maybe worth re-evaluating why that is 😁

brick-green · 2026-05-29T20:48:15Z

 @Table(name = "Report", catalog = "NBS_ODSE")
 public class Report {
-  @NonNull @EmbeddedId private ReportId id;
+  @EmbeddedId @NonNull ReportId id;


q, nb: should this be fully reverted?

Yep, should be removed from the diff now!

mcmcgrath13

🪇

brick-green

Good work here! Found a few more wildcards and had one question

brick-green · 2026-06-02T15:30:29Z

+    if (!reportSectionRepository.existsBySectionCd(request.sectionCode())) {
+      throw new IllegalArgumentException(
+          "No report section found for code " + request.sectionCode());
+    }


q, nb: this validation feels a little out of place for the method fetchReportMetadata(). Are there other validations we could group together into a valiate() method?

No other validations as of right now - I can change this fn from fetch to verify, if that's helpful?

sonarqubecloud · 2026-06-02T16:59:01Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
93.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

JordanGuinn added 7 commits May 12, 2026 19:53

bump

322b44c

bump

bd818ed

bump

290abfa

Merge branch 'main' into jg/APP-542-fix

360b915

Update ReportServiceTest.java

a85e67e

fdsa

bd8fb14

bump

0abc651

mcmcgrath13 reviewed May 19, 2026

View reviewed changes

Comment thread apps/modernization-api/src/main/java/gov/cdc/nbs/report/ReportService.java Outdated

JordanGuinn and others added 7 commits May 20, 2026 11:37

bump

3e6b15d

bump

74ddb23

Update ReportService.java

28928ff

bump

78534a2

Merge branch 'main' into jg/APP-542-fix

47d2322

bump

2cde97d

Merge branch 'main' into jg/APP-542-fix

ea2dabd

JordanGuinn commented May 20, 2026

View reviewed changes

Comment thread libs/database-entities/src/main/java/gov/cdc/nbs/entity/odse/Report.java Outdated

JordanGuinn commented May 20, 2026

View reviewed changes

Comment thread apps/modernization-api/src/main/java/gov/cdc/nbs/report/models/CreateFilterRequest.java Outdated

bump

c19257d

JordanGuinn commented May 20, 2026

View reviewed changes

JordanGuinn added 4 commits May 20, 2026 14:50

bump

f1ceedc

Update ReportControllerTest.java

5f23814

Update ReportTest.java

de9c624

Update ReportTest.java

463bc47

JordanGuinn changed the title ~~(WIP) APP-542: Add endpoint for report creation~~ APP-542: Add endpoint for report creation May 20, 2026

JordanGuinn marked this pull request as ready for review May 20, 2026 22:13

JordanGuinn requested a review from a team as a code owner May 20, 2026 22:14

JordanGuinn requested review from brick-green, emyl3 and mcmcgrath13 and removed request for a team May 20, 2026 22:14

JordanGuinn added 4 commits May 29, 2026 11:52

bump

887a280

bump

d9644b1

bump

488b0af

bump

37b74b5

brick-green reviewed May 29, 2026

View reviewed changes

JordanGuinn removed request for emyl3 and krista-skylight June 1, 2026 17:14

JordanGuinn added 6 commits June 1, 2026 10:39

Update ReportServiceTest.java

0fa5442

bump

880d76d

bump

2bed518

bump

33f9f39

Update ReportFilterBuilder.java

a42e026

bump

e78ed91

mcmcgrath13 reviewed Jun 1, 2026

View reviewed changes

Comment thread apps/modernization-api/src/main/java/gov/cdc/nbs/report/models/AdminReportRequest.java Outdated

bump

a70e190

JordanGuinn requested review from brick-green and mcmcgrath13 June 1, 2026 19:44

Update ReportSection.java

99f797f

mcmcgrath13 reviewed Jun 1, 2026

View reviewed changes

Comment thread testing/regression/cypress/step_definitions/reports-api/create.steps.js Outdated

mcmcgrath13 approved these changes Jun 1, 2026

View reviewed changes

JordanGuinn and others added 2 commits June 1, 2026 13:11

bump

95e472d

Merge branch 'main' into jg/APP-542-fix

9ee4b5d

brick-green approved these changes Jun 2, 2026

View reviewed changes

JordanGuinn added 4 commits June 2, 2026 09:32

Update ReportService.java

a6a0c23

Update ReportService.java

b63148b

bump

2c5d96b

Update ReportService.java

eef525f

JordanGuinn merged commit 8eddd59 into main Jun 2, 2026
6 checks passed

JordanGuinn deleted the jg/APP-542-fix branch June 2, 2026 17:28

		@@ -0,0 +1,130 @@
		package gov.cdc.nbs.report;

		import gov.cdc.nbs.entity.odse.*;

Uh oh!

Conversation

JordanGuinn commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Tickets

Checklist before requesting a review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

brick-green left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mcmcgrath13 left a comment

Choose a reason for hiding this comment

Uh oh!

brick-green left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sonarqubecloud Bot commented Jun 2, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

JordanGuinn commented May 18, 2026 •

edited

Loading