Add syphilis AOE data on result View Details #8150

mpbrown · 2024-09-24T13:54:48Z

BACKEND AND FRONTEND PULL REQUEST

Related Issue

Resolves [Syphilis] Add condition and new AOE questions to Results screen #8099

Changes Proposed

Adds AOE survey data as an object on the response from GetTestResultDetails query
Shows syphilis AOE responses on the View Details modal

Additional Information

The GraphQL change is backwards compatible for any old cached frontends since the AOE data will still be available from that query at the top level as well as within the new surveyData object. A follow up PR will clean up the query to remove the loose AOE responses at the top level.

Testing

Deployed on dev6

Screenshots

mpbrown · 2024-09-24T14:10:26Z

backend/src/main/resources/graphql/main.graphqls

@@ -295,12 +295,13 @@ type TestResult {
  symptomOnset: LocalDate
  genderOfSexualPartners: [String]
  deviceType: DeviceType
-  results: [MultiplexResult]
+  results: [MultiplexResult!]


⚠️ This is so that the TestResult type plays well with getResultForDisease without having to break too much further down with how MultiplexResults aka MultiplexResult[] is defined. I think this is safe to say that even if we already allow results to be null or undefined, if we have a defined, non-null list for results, the members of that list should not be null or undefined. If there are any null safety concerns here I can opt for the other route of updating MultiplexResults to handle a list with nullable entries

mpbrown · 2024-09-24T14:11:50Z

frontend/src/app/testResults/viewResults/actionMenuModals/TestResultDetailsModal.tsx

@@ -24,33 +27,6 @@ import "./TestResultPrintModal.scss";
 import { MULTIPLEX_DISEASES } from "../../constants";
 import { formatGenderOfSexualPartnersForDisplay } from "../../../utils/gender";

-type Result = {


⚠️ Removing this loose type in favor of getting the type directly from the query below.

type QueriedTestResult = NonNullable<GetTestResultDetailsQuery>["testResult"];

ooo nice! I prefer getting the types directly than defining/maintaining our own again!

mpbrown · 2024-09-24T14:13:57Z

frontend/src/app/testResults/viewResults/actionMenuModals/TestResultDetailsModal.tsx

@@ -199,11 +184,11 @@ export const DetachedTestResultDetailsModal = ({
          )}
          <DetailsRow
            label="Pregnant?"
-            value={pregnancy && pregnancyMap[pregnancy]}
+            value={pregnancy && pregnancyMap[pregnancy as keyof Pregnancy]}


⚠️ Since we are now using the type from the query rather than the loose Result type previously defined, this as keyof is necessary so that it handles us using the string value as the key

mpbrown · 2024-09-24T14:16:04Z

frontend/src/app/testResults/viewResults/actionMenuModals/TestResultDetailsModal.tsx

            removed={removed}
            aria-describedby="result-detail-title"
          />
-          {isHIVResult && (
+          {(isHIVResult || isSyphilisResult) && (


⚠️ There will come a day where we need to update how we handle the display logic for which diseases should show which AOE options, but today is not that day (prioritizing getting syphilis feature out)

This approach makes sense to me. Maybe we should make note that this is something we will have to scale differently for n diseases somewhere in the adding a disease doc that you've written?

mpbrown · 2024-09-24T14:18:55Z

frontend/src/app/utils/user.ts

-  firstName: OptionalString;
-  middleName: OptionalString;
-  lastName: OptionalString;
+  firstName?: OptionalString;


⚠️ Also a side effect of us using the type directly from the query - handling the possibility of one of the names in createdBy being null or undefined, but these are defined as OptionalString anyway so they can already have a value of null or undefined

mpbrown · 2024-09-24T14:19:54Z

backend/src/main/resources/graphql/main.graphqls

@@ -314,7 +315,7 @@ type AskOnEntrySurvey {
  symptoms: String
  symptomOnset: LocalDate
  noSymptoms: Boolean
-  genderOfSexualPartners: [String]
+  genderOfSexualPartners: [String!]


⚠️ similar to this comment

emyl3

Looks good to me! Tested on dev6!
Thank you for cleaning up types that we are using and making a decision not to refactor the aoe display logic in favor of getting this out quicker! I agree! 🙌

Left one non-blocking nit.

frontend/src/app/testResults/viewResults/actionMenuModals/TestResultDetailsModal.test.tsx

emyl3 · 2024-09-24T22:46:32Z

frontend/src/app/testResults/viewResults/actionMenuModals/TestResultDetailsModal.tsx

@@ -24,33 +27,6 @@ import "./TestResultPrintModal.scss";
 import { MULTIPLEX_DISEASES } from "../../constants";
 import { formatGenderOfSexualPartnersForDisplay } from "../../../utils/gender";

-type Result = {


ooo nice! I prefer getting the types directly than defining/maintaining our own again!

bobbywells52

LGTM!

sonarcloud · 2024-09-25T16:03:13Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

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

See analysis details on SonarCloud

emyl3

LGTM! Thank you!!!

mpbrown added 3 commits September 24, 2024 09:59

Add full AOE survey data on GetTestResultDetails

88bf164

Update typing on optional user fields

de82615

Update TestResultDetailsModal.test.tsx

f97e6cd

mpbrown force-pushed the mike/8099-aoe-on-result-detail branch from 855c6a1 to f97e6cd Compare September 24, 2024 14:00

mpbrown temporarily deployed to dev6 September 24, 2024 14:05 — with GitHub Actions Inactive

mpbrown commented Sep 24, 2024

View reviewed changes

mpbrown temporarily deployed to dev6 September 24, 2024 14:12 — with GitHub Actions Inactive

mpbrown commented Sep 24, 2024

View reviewed changes

mpbrown temporarily deployed to dev6 September 24, 2024 14:16 — with GitHub Actions Inactive

mpbrown commented Sep 24, 2024

View reviewed changes

Update test for new blurred vision code

8ec9453

mpbrown temporarily deployed to dev6 September 24, 2024 14:48 — with GitHub Actions Inactive

mpbrown temporarily deployed to dev6 September 24, 2024 14:55 — with GitHub Actions Inactive

mpbrown temporarily deployed to dev6 September 24, 2024 14:58 — with GitHub Actions Inactive

mpbrown marked this pull request as ready for review September 24, 2024 16:06

mpbrown requested review from mehansen, DanielSass, emyl3 and bobbywells52 September 24, 2024 16:07

mpbrown changed the title ~~Mike/8099 aoe on result detail~~ Add syphilis AOE data on result View Details Sep 24, 2024

emyl3 previously approved these changes Sep 24, 2024

View reviewed changes

bobbywells52 previously approved these changes Sep 25, 2024

View reviewed changes

mpbrown dismissed stale reviews from bobbywells52 and emyl3 via bbb2641 September 25, 2024 15:52

Update order of symptoms in test string

bbb2641

mpbrown requested review from emyl3 and bobbywells52 September 25, 2024 15:52

bobbywells52 approved these changes Sep 25, 2024

View reviewed changes

emyl3 approved these changes Sep 25, 2024

View reviewed changes

mpbrown added this pull request to the merge queue Sep 26, 2024

Merged via the queue into main with commit e5c2ccc Sep 26, 2024
36 checks passed

mpbrown deleted the mike/8099-aoe-on-result-detail branch September 26, 2024 17:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add syphilis AOE data on result View Details #8150

Add syphilis AOE data on result View Details #8150

mpbrown commented Sep 24, 2024 •

edited

Loading

mpbrown Sep 24, 2024

mpbrown Sep 24, 2024

emyl3 Sep 24, 2024

mpbrown Sep 24, 2024

mpbrown Sep 24, 2024

bobbywells52 Sep 25, 2024

mpbrown Sep 24, 2024

mpbrown Sep 24, 2024

emyl3 left a comment

emyl3 Sep 24, 2024

bobbywells52 left a comment

sonarcloud bot commented Sep 25, 2024

emyl3 left a comment

Add syphilis AOE data on result View Details #8150

Add syphilis AOE data on result View Details #8150

Conversation

mpbrown commented Sep 24, 2024 • edited Loading

BACKEND AND FRONTEND PULL REQUEST

Related Issue

Changes Proposed

Additional Information

Testing

Screenshots

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emyl3 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bobbywells52 left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Sep 25, 2024

Quality Gate passed

emyl3 left a comment

Choose a reason for hiding this comment

mpbrown commented Sep 24, 2024 •

edited

Loading