handle null gender in the FHIR converter (#6216)

CDCgov · Jul 28, 2023 · ee87266 · ee87266
1 parent 527dddb
commit ee87266
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 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
@@ -200,15 +200,17 @@ public ContactPoint convertToContactPoint(
     return new ContactPoint().setUse(use).setSystem(system).setValue(value);
   }
 
-  public AdministrativeGender convertToAdministrativeGender(@NotNull String gender) {
-    switch (gender.toLowerCase()) {
-      case "male", "m":
-        return AdministrativeGender.MALE;
-      case "female", "f":
-        return AdministrativeGender.FEMALE;
-      default:
-        return AdministrativeGender.UNKNOWN;
+  public AdministrativeGender convertToAdministrativeGender(String gender) {
+
+    if (gender == null) {
+      return AdministrativeGender.UNKNOWN;
     }
+
+    return switch (gender.toLowerCase()) {
+      case "male", "m" -> AdministrativeGender.MALE;
+      case "female", "f" -> AdministrativeGender.FEMALE;
+      default -> AdministrativeGender.UNKNOWN;
+    };
   }
 
   public Date convertToDate(@NotNull LocalDate date) {

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
@@ -237,7 +237,8 @@ private static Stream<Arguments> genderArgs() {
         arguments("Female", AdministrativeGender.FEMALE),
         arguments("MALE", AdministrativeGender.MALE),
         arguments("M", AdministrativeGender.MALE),
-        arguments("fishperson", AdministrativeGender.UNKNOWN));
+        arguments("fishperson", AdministrativeGender.UNKNOWN),
+        arguments(null, AdministrativeGender.UNKNOWN));
   }
 
   @Test