fix null race pointer (#7209)

* fix null race pointer * add regression test
CDCgov · Jan 26, 2024 · 0831949 · 0831949
1 parent b852969
commit 0831949
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/api/converter/FhirConverter.java b/backend/src/main/java/gov/cdc/usds/simplereport/api/converter/FhirConverter.java
@@ -330,20 +330,21 @@ public Address convertToAddress(
     return address;
   }
 
-  public Extension convertToRaceExtension(@NotNull String race) {
+  public Extension convertToRaceExtension(String race) {
     var ext = new Extension();
     ext.setUrl(RACE_EXTENSION_URL);
     var codeable = new CodeableConcept();
     var coding = codeable.addCoding();
-    String raceKey = race.toLowerCase();
-    if (StringUtils.isNotBlank(race) && PersonUtils.raceMap.containsKey(raceKey)) {
+    boolean isParseableRace =
+        StringUtils.isNotBlank(race) && PersonUtils.raceMap.containsKey(race.toLowerCase());
+    if (isParseableRace) {
       if (MappingConstants.UNKNOWN_STRING.equalsIgnoreCase(race)
           || "refused".equalsIgnoreCase(race)) {
         coding.setSystem(NULL_CODE_SYSTEM);
       } else {
         coding.setSystem(RACE_CODING_SYSTEM);
       }
-      coding.setCode(PersonUtils.raceMap.get(raceKey));
+      coding.setCode(PersonUtils.raceMap.get(race.toLowerCase()));
       codeable.setText(race);
     } else {
       coding.setSystem(NULL_CODE_SYSTEM);

diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/api/converter/FhirConverterTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/api/converter/FhirConverterTest.java
@@ -1,6 +1,7 @@
 package gov.cdc.usds.simplereport.api.converter;
 
 import static gov.cdc.usds.simplereport.api.converter.FhirConstants.NOTE_TYPE_EXTENSION_URL;
+import static gov.cdc.usds.simplereport.api.converter.FhirConstants.NULL_CODE_SYSTEM;
 import static gov.cdc.usds.simplereport.api.model.TestEventExport.DEFAULT_LOCATION_CODE;
 import static gov.cdc.usds.simplereport.api.model.TestEventExport.DEFAULT_LOCATION_NAME;
 import static gov.cdc.usds.simplereport.api.model.TestEventExport.UNKNOWN_ADDRESS_INDICATOR;
@@ -12,6 +13,7 @@
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.parser.IParser;
+import gov.cdc.usds.simplereport.api.MappingConstants;
 import gov.cdc.usds.simplereport.db.model.DeviceType;
 import gov.cdc.usds.simplereport.db.model.DeviceTypeDisease;
 import gov.cdc.usds.simplereport.db.model.Facility;
@@ -307,6 +309,18 @@ void convertToRaceArgs_matches(
     assertThat(codeableConcept.getText()).isEqualTo(expectedText);
   }
 
+  @Test
+  void convertToRaceNull_convertsGracefully() {
+    var actual = fhirConverter.convertToRaceExtension(null);
+    var codeableConcept = actual.castToCodeableConcept(actual.getValue());
+    var code = codeableConcept.getCoding();
+
+    assertThat(code).hasSize(1);
+    assertThat(code.get(0).getSystem()).isEqualTo(NULL_CODE_SYSTEM);
+    assertThat(code.get(0).getCode()).isEqualTo(MappingConstants.UNK_CODE);
+    assertThat(codeableConcept.getText()).isEqualTo(MappingConstants.UNKNOWN_STRING);
+  }
+
   private static Stream<Arguments> raceArgs() {
     return Stream.of(
         arguments("native", raceCodeSystem, "1002-5", "native"),