remove specific function strategies in favor of general one

CDCgov · May 16, 2024 · 70cd66f · 70cd66f
1 parent 6f68b66
commit 70cd66f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/CovidAoEForm.tsx b/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/CovidAoEForm.tsx
@@ -46,7 +46,7 @@ const CovidAoEForm = ({
   const { hasSymptoms } = generateSymptomAoeConstants(
     responses,
     hasAttemptedSubmit,
-    mapRespiratorySymptomBoolLiteralsToBool
+    respiratorySymptomDefinitions
   );
   return (
     <div className="grid-col-auto" id="covid-aoe-form">

diff --git a/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.ts b/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.ts
@@ -106,9 +106,7 @@ export function generateSexualActivityAoeConstants(
 export function generateSymptomAoeConstants(
   responses: AoeQuestionResponses,
   hasAttemptedSubmit: boolean,
-  symptomBoolLiteralToBoolTranslator: (
-    symptomsJsonString: string | null | undefined
-  ) => Record<string, boolean>
+  symptomDefinitionMap: SymptomDefinitionMap[]
 ) {
   const isSymptomsAnswered = typeof responses.noSymptoms == "boolean";
   const isSymptomOnsetDateAnswered = !!responses.symptomOnset;
@@ -127,23 +125,20 @@ export function generateSymptomAoeConstants(
   if (responses.noSymptoms === false) {
     hasSymptoms = "YES";
   }
+  const symptoms: Record<string, boolean> = mapSymptomBoolLiteralsToBool(
+    responses.symptoms,
+    symptomDefinitionMap
+  );
 
   const isSymptomOnsetAnswered =
-    !!responses.symptoms &&
-    Object.values(symptomBoolLiteralToBoolTranslator(responses.symptoms)).some(
-      (x) => x?.valueOf()
-    );
+    !!responses.symptoms && Object.values(symptoms).some((x) => x?.valueOf());
 
   const showSymptomOnsetError =
     hasAttemptedSubmit &&
     isSymptomsAnswered &&
     responses.noSymptoms === false &&
     !isSymptomOnsetAnswered;
 
-  const symptoms: Record<string, boolean> = symptomBoolLiteralToBoolTranslator(
-    responses.symptoms
-  );
-
   return {
     showSymptomsError,
     showSymptomOnsetDateError,
@@ -164,12 +159,12 @@ export function stringifySymptomJsonForAoeUpdate(
 
   if (_.isEqual(symptomKeys, Object.keys(respiratorySymptomsMap))) {
     symptomPayload = JSON.stringify(
-      mapRespiratorySymptomBoolLiteralsToBool(symptomJson)
+      mapSymptomBoolLiteralsToBool(symptomJson, respiratorySymptomDefinitions)
     );
   }
   if (_.isEqual(symptomKeys, Object.keys(syphilisSymptomsMap))) {
     symptomPayload = JSON.stringify(
-      mapSyphilisSymptomBoolLiteralsToBool(symptomJson)
+      mapSymptomBoolLiteralsToBool(symptomJson, syphilisSymptomDefinitions)
     );
   }
   return symptomPayload;
@@ -180,10 +175,16 @@ export function mapSpecifiedSymptomBoolLiteralsToBool(
   disease: AOEFormOption
 ) {
   if (disease === AOEFormOption.COVID) {
-    return mapRespiratorySymptomBoolLiteralsToBool(symptomsJsonString);
+    return mapSymptomBoolLiteralsToBool(
+      symptomsJsonString,
+      syphilisSymptomDefinitions
+    );
   }
   if (disease === AOEFormOption.SYPHILIS) {
-    return mapSyphilisSymptomBoolLiteralsToBool(symptomsJsonString);
+    return mapSymptomBoolLiteralsToBool(
+      symptomsJsonString,
+      syphilisSymptomDefinitions
+    );
   }
   // there are no symptoms for that test card, so return true
   return {
@@ -200,15 +201,6 @@ export const mapRespiratorySymptomBoolLiteralsToBool = (
   );
 };
 
-export const mapSyphilisSymptomBoolLiteralsToBool = (
-  symptomsJsonString: string | null | undefined
-) => {
-  return mapSymptomBoolLiteralsToBool(
-    symptomsJsonString,
-    syphilisSymptomDefinitions
-  );
-};
-
 export const mapSymptomBoolLiteralsToBool = (
   symptomsJsonString: string | null | undefined,
   symptomSelectionMap: SymptomDefinitionMap[]