add notes and gender to patient bulk upload

backend/src/main/java/gov/cdc/usds/simplereport/api/Translators.java

@@ -279,7 +279,7 @@ public static String parseGender(String g) {
   public static final String NON_BINARY = "nonbinary";
   public static final String TRANS_MAN = "transman";
   public static final String TRANS_WOMAN = "transwoman";
-  private static final Set<String> GENDER_IDENTITIES =
+  public static final Set<String> GENDER_IDENTITIES =
       Set.of(FEMALE, MALE, TRANS_WOMAN, TRANS_MAN, NON_BINARY, OTHER, REFUSED);
 
   public static String parseGenderIdentity(String genderIdentityInput) {

backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/PatientUploadRow.java

@@ -6,6 +6,7 @@
 import static gov.cdc.usds.simplereport.validators.CsvValidatorUtils.validateEmail;
 import static gov.cdc.usds.simplereport.validators.CsvValidatorUtils.validateEthnicity;
 import static gov.cdc.usds.simplereport.validators.CsvValidatorUtils.validateFlexibleDate;
+import static gov.cdc.usds.simplereport.validators.CsvValidatorUtils.validateGenderIdentity;
 import static gov.cdc.usds.simplereport.validators.CsvValidatorUtils.validatePhoneNumber;
 import static gov.cdc.usds.simplereport.validators.CsvValidatorUtils.validatePhoneNumberType;
 import static gov.cdc.usds.simplereport.validators.CsvValidatorUtils.validateRace;
@@ -44,6 +45,8 @@ public class PatientUploadRow implements FileRow {
   final ValueOrError residentCongregateSetting;
   final ValueOrError role;
   final ValueOrError email;
+  final ValueOrError genderIdentity;
+  final ValueOrError notes;
 
   static final String FIRST_NAME = "first_name";
   static final String LAST_NAME = "last_name";
@@ -58,6 +61,8 @@ public class PatientUploadRow implements FileRow {
   static final String PHONE_NUMBER_TYPE = "phone_number_type";
   static final String EMPLOYED_IN_HEALTHCARE = "employed_in_healthcare";
   static final String RESIDENT_CONGREGATE_SETTING = "resident_congregate_setting";
+  static final String GENDER_IDENTITY = "gender_identity";
+  static final String ADDRESS_NOTES = "address_notes";
 
   private static final List<String> requiredFields =
       List.of(
@@ -99,6 +104,8 @@ public PatientUploadRow(Map<String, String> rawRow) {
         getValue(rawRow, RESIDENT_CONGREGATE_SETTING, isRequired(RESIDENT_CONGREGATE_SETTING));
     role = getValue(rawRow, "role", isRequired("role"));
     email = getValue(rawRow, "email", isRequired("email"));
+    genderIdentity = getValue(rawRow, GENDER_IDENTITY, isRequired("genderIdentity"));
+    notes = getValue(rawRow, ADDRESS_NOTES, isRequired("notes"));
   }
 
   @Override
@@ -124,6 +131,7 @@ public List<FeedbackMessage> validateIndividualValues() {
     errors.addAll(validateRace(race));
     errors.addAll(validateBiologicalSex(biologicalSex));
     errors.addAll(validateEthnicity(ethnicity));
+    errors.addAll(validateGenderIdentity(genderIdentity));
 
     // housing, work, and role
     errors.addAll(validateYesNoAnswer(residentCongregateSetting));

backend/src/main/java/gov/cdc/usds/simplereport/db/model/Person.java

@@ -24,6 +24,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+import lombok.Builder;
 import lombok.Getter;
 import org.hibernate.annotations.Type;
 
@@ -163,6 +164,56 @@ public Person(
     this.notes = notes;
   }
 
+  @Builder
+  public Person(
+      Organization organization,
+      Facility facility,
+      String lookupId,
+      String firstName,
+      String middleName,
+      String lastName,
+      String suffix,
+      LocalDate birthDate,
+      StreetAddress address,
+      String country,
+      PersonRole role,
+      List<String> emails,
+      String race,
+      String ethnicity,
+      List<String> tribalAffiliation,
+      String gender,
+      String genderIdentity,
+      Boolean residentCongregateSetting,
+      Boolean employedInHealthcare,
+      String preferredLanguage,
+      TestResultDeliveryPreference testResultDeliveryPreference,
+      String notes) {
+
+    this(
+        organization,
+        lookupId,
+        firstName,
+        middleName,
+        lastName,
+        suffix,
+        birthDate,
+        address,
+        country,
+        role,
+        emails,
+        race,
+        ethnicity,
+        tribalAffiliation,
+        gender,
+        genderIdentity,
+        residentCongregateSetting,
+        employedInHealthcare,
+        preferredLanguage,
+        testResultDeliveryPreference,
+        notes);
+    this.facility = facility;
+  }
+
   public Person(
       Organization organization,
       Facility facility,

backend/src/main/java/gov/cdc/usds/simplereport/service/PatientBulkUploadServiceAsync.java

@@ -116,30 +116,31 @@ public CompletableFuture<Set<Person>> savePatients(byte[] content, UUID facility
 
         // create new person with current organization, then add to new patients list
         Person newPatient =
-            new Person(
-                currentOrganization,
-                assignedFacility.orElse(null),
-                null, // lookupid
-                extractedData.getFirstName().getValue(),
-                extractedData.getMiddleName().getValue(),
-                extractedData.getLastName().getValue(),
-                extractedData.getSuffix().getValue(),
-                parseUserShortDate(extractedData.getDateOfBirth().getValue()),
-                address,
-                country,
-                parsePersonRole(extractedData.getRole().getValue(), false),
-                extractedData.getEmail().getValue() == null
-                    ? Collections.emptyList()
-                    : List.of(extractedData.getEmail().getValue()),
-                convertRaceToDatabaseValue(extractedData.getRace().getValue()),
-                convertEthnicityToDatabaseValue(extractedData.getEthnicity().getValue()),
-                null, // tribalAffiliation
-                convertSexToDatabaseValue(extractedData.getBiologicalSex().getValue()),
-                parseYesNoUnk(extractedData.getResidentCongregateSetting().getValue()),
-                parseYesNoUnk(extractedData.getEmployedInHealthcare().getValue()),
-                null, // preferredLanguage
-                null // testResultDeliveryPreference
-                );
+            Person.builder()
+                .organization(currentOrganization)
+                .facility(assignedFacility.orElse(null))
+                .birthDate(parseUserShortDate(extractedData.getDateOfBirth().getValue()))
+                .address(address)
+                .country(country)
+                .role(parsePersonRole(extractedData.getRole().getValue(), false))
+                .emails(
+                    extractedData.getEmail().getValue() == null
+                        ? Collections.emptyList()
+                        : List.of(extractedData.getEmail().getValue()))
+                .race(convertRaceToDatabaseValue(extractedData.getRace().getValue()))
+                .ethnicity(convertEthnicityToDatabaseValue(extractedData.getEthnicity().getValue()))
+                .gender(convertSexToDatabaseValue(extractedData.getBiologicalSex().getValue()))
+                .genderIdentity(extractedData.getGenderIdentity().getValue())
+                .residentCongregateSetting(
+                    parseYesNoUnk(extractedData.getResidentCongregateSetting().getValue()))
+                .employedInHealthcare(
+                    parseYesNoUnk(extractedData.getEmployedInHealthcare().getValue()))
+                .firstName(extractedData.getFirstName().getValue())
+                .middleName(extractedData.getMiddleName().getValue())
+                .lastName(extractedData.getLastName().getValue())
+                .suffix(extractedData.getSuffix().getValue())
+                .notes(extractedData.getNotes().getValue())
+                .build();
 
         if (!allPatients.contains(newPatient)) {
           // collect phone numbers and associate them with the patient

backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java

@@ -2,6 +2,7 @@
 
 import static gov.cdc.usds.simplereport.api.Translators.CANADIAN_STATE_CODES;
 import static gov.cdc.usds.simplereport.api.Translators.COUNTRY_CODES;
+import static gov.cdc.usds.simplereport.api.Translators.GENDER_IDENTITIES;
 import static gov.cdc.usds.simplereport.api.Translators.PAST_DATE_FLEXIBLE_FORMATTER;
 import static gov.cdc.usds.simplereport.api.Translators.STATE_CODES;
 import static gov.cdc.usds.simplereport.db.model.PersonUtils.BOARDING_HOUSE_LITERAL;
@@ -142,6 +143,7 @@ public class CsvValidatorUtils {
           "u", UNKNOWN_LITERAL,
           "a", "ambiguous",
           "n", "not applicable");
+
   private static final Set<String> ETHNICITY_VALUES =
       Set.of(
           HISPANIC_CODE, HISPANIC_LITERAL,
@@ -300,6 +302,10 @@ public static List<FeedbackMessage> validateBiologicalSex(ValueOrError input) {
     return validateInSet(input, GENDER_VALUES);
   }
 
+  public static List<FeedbackMessage> validateGenderIdentity(ValueOrError input) {
+    return validateInSet(input, GENDER_IDENTITIES);
+  }
+
   public static List<FeedbackMessage> validateState(ValueOrError input) {
     return validateInSet(input, VALID_STATE_CODES);
   }

backend/src/test/java/gov/cdc/usds/simplereport/service/PatientBulkUploadServiceAsyncTest.java

@@ -109,6 +109,9 @@ void validPerson_savedToDatabase() throws IOException, ExecutionException, Inter
     assertThat(patient.getEthnicity()).isEqualTo("not_hispanic");
     assertThat(patient.getBirthDate()).isEqualTo(LocalDate.of(1980, 11, 3));
     assertThat(patient.getGender()).isEqualTo("female");
+    assertThat(patient.getGenderIdentity()).isEqualTo("female");
+    assertThat(patient.getNotes()).isEqualTo("some address note");
+
     assertThat(patient.getRole()).isEqualTo(PersonRole.STAFF);
 
     assertThat(patient.getCountry()).isEqualTo("USA");
@@ -203,6 +206,8 @@ void validPersonWithEmptyOptional_savedToDatabase()
     assertThat(patient.getCountry()).isEqualTo("USA");
     assertThat(patient.getEmployedInHealthcare()).isFalse();
     assertThat(patient.getResidentCongregateSetting()).isFalse();
+    assertThat(patient.getGenderIdentity()).isNull();
+    assertThat(patient.getNotes()).isNull();
 
     List<PhoneNumber> phoneNumbers =
         phoneNumberRepository.findAllByPersonInternalId(patient.getInternalId());
@@ -246,6 +251,8 @@ void validPersonWithAlternateValues_savedToDatabase()
     assertThat(patient.getCountry()).isEqualTo("USA");
     assertThat(patient.getEmployedInHealthcare()).isNull();
     assertThat(patient.getResidentCongregateSetting()).isNull();
+    assertThat(patient.getGenderIdentity()).isEmpty();
+    assertThat(patient.getNotes()).isEmpty();
 
     List<PhoneNumber> phoneNumbers =
         phoneNumberRepository.findAllByPersonInternalId(patient.getInternalId());

backend/src/test/java/gov/cdc/usds/simplereport/validators/PatientUploadRowTest.java

@@ -44,7 +44,8 @@ class PatientUploadRowTest {
           "country",
           "phone_number",
           "phone_number_type",
-          "email");
+          "email",
+          "gender_identity");
 
   @BeforeEach
   public void init() {
@@ -69,6 +70,8 @@ public void init() {
     validRowMap.put("resident_congregate_setting", "No");
     validRowMap.put("role", "Staff");
     validRowMap.put("email", "[email protected]");
+    validRowMap.put("gender_identity", "female");
+    validRowMap.put("address_notes", "test address notes");
   }
 
   @Test
@@ -103,6 +106,9 @@ void processRowSetsAllValues() {
         .isEqualTo(validRowMap.get("resident_congregate_setting"));
     assertThat(patientUploadRow.getRole().getValue()).isEqualTo(validRowMap.get("role"));
     assertThat(patientUploadRow.getEmail().getValue()).isEqualTo(validRowMap.get("email"));
+    assertThat(patientUploadRow.getGenderIdentity().getValue())
+        .isEqualTo(validRowMap.get("gender_identity"));
+    assertThat(patientUploadRow.getNotes().getValue()).isEqualTo(validRowMap.get("address_notes"));
   }
 
   @Test
@@ -134,6 +140,7 @@ void validateIndividualFields() {
     invalidIndividualValues.put("phone_number", "1");
     invalidIndividualValues.put("phone_number_type", "cell");
     invalidIndividualValues.put("email", "email");
+    invalidIndividualValues.put("gender_identity", "not a gender identity");
 
     var patientUploadRow = new PatientUploadRow(invalidIndividualValues);
 

backend/src/test/resources/patientBulkUpload/alternateValues.csv

@@ -1,2 +1,2 @@
-last_name,first_name,middle_name,suffix,race,date_of_birth,biological_sex,ethnicity,street,street_2,city,county,state,zip_code,phone_number,phone_number_type,employed_in_healthcare,resident_congregate_setting,role,email
-Sporer,Foobar,,,2028-9,6/12/40,A,2186-5,838 Waelchi Extensions,,Palm Bay,,AK,99501,410-881-4268,Landline,U,Unk,Staff,[email protected]
+last_name,first_name,middle_name,suffix,race,date_of_birth,biological_sex,ethnicity,street,street_2,city,county,state,zip_code,phone_number,phone_number_type,employed_in_healthcare,resident_congregate_setting,role,email,gender_identity,address_notes
+Sporer,Foobar,,,2028-9,6/12/40,A,2186-5,838 Waelchi Extensions,,Palm Bay,,AK,99501,410-881-4268,Landline,U,Unk,Staff,[email protected],,

backend/src/test/resources/patientBulkUpload/valid.csv

@@ -1,2 +1,2 @@
-last_name,first_name,middle_name,suffix,race,date_of_birth,biological_sex,ethnicity,street,street_2,city,county,state,zip_code,phone_number,phone_number_type,employed_in_healthcare,resident_congregate_setting,role,email
-Doe,Jane,Amanda,,black or african american,11/3/80,Female,not hispanic or latino,1234 Main Street,Apt 2,Anchorage,,AK,99501,410-867-5309,mobile,No,No,Staff,[email protected]
+last_name,first_name,middle_name,suffix,race,date_of_birth,biological_sex,ethnicity,street,street_2,city,county,state,zip_code,phone_number,phone_number_type,employed_in_healthcare,resident_congregate_setting,role,email,gender_identity,address_notes
+Doe,Jane,Amanda,,black or african american,11/3/80,Female,not hispanic or latino,1234 Main Street,Apt 2,Anchorage,,AK,99501,410-867-5309,mobile,No,No,Staff,[email protected],female,some address note