Refactored methods in FHIR converter

backend/src/main/java/gov/cdc/usds/simplereport/api/converter/ConvertToObservationProps.java

@@ -0,0 +1,20 @@
+package gov.cdc.usds.simplereport.api.converter;
+
+import gov.cdc.usds.simplereport.db.model.auxiliary.TestCorrectionStatus;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class ConvertToObservationProps {
+  private String diseaseCode;
+  private String diseaseName;
+  private String resultCode;
+  private TestCorrectionStatus correctionStatus;
+  private String correctionReason;
+  private String id;
+  private String resultDescription;
+  private String testkitNameId;
+  private String equipmentUid;
+  private String deviceModel;
+}

backend/src/main/java/gov/cdc/usds/simplereport/api/converter/ConvertToPatientProps.java

@@ -0,0 +1,25 @@
+package gov.cdc.usds.simplereport.api.converter;
+
+import gov.cdc.usds.simplereport.db.model.PhoneNumber;
+import gov.cdc.usds.simplereport.db.model.auxiliary.PersonName;
+import gov.cdc.usds.simplereport.db.model.auxiliary.StreetAddress;
+import java.time.LocalDate;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class ConvertToPatientProps {
+  private String id;
+  private PersonName name;
+  private List<PhoneNumber> phoneNumbers;
+  private List<String> emails;
+  private String gender;
+  private LocalDate dob;
+  private StreetAddress address;
+  private String country;
+  private String race;
+  private String ethnicity;
+  private List<String> tribalAffiliations;
+}

backend/src/main/java/gov/cdc/usds/simplereport/api/converter/CreateFhirBundleProps.java

@@ -0,0 +1,34 @@
+package gov.cdc.usds.simplereport.api.converter;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import lombok.Builder;
+import lombok.Getter;
+import org.hl7.fhir.r4.model.Device;
+import org.hl7.fhir.r4.model.DiagnosticReport;
+import org.hl7.fhir.r4.model.Observation;
+import org.hl7.fhir.r4.model.Organization;
+import org.hl7.fhir.r4.model.Patient;
+import org.hl7.fhir.r4.model.Practitioner;
+import org.hl7.fhir.r4.model.ServiceRequest;
+import org.hl7.fhir.r4.model.Specimen;
+import org.springframework.boot.info.GitProperties;
+
+@Builder
+@Getter
+public class CreateFhirBundleProps {
+  private Patient patient;
+  private Organization testingLab;
+  private Organization orderingFacility;
+  private Practitioner practitioner;
+  private Device device;
+  private Specimen specimen;
+  private List<Observation> resultObservations;
+  private Set<Observation> aoeObservations;
+  private ServiceRequest serviceRequest;
+  private DiagnosticReport diagnosticReport;
+  private Date currentDate;
+  private GitProperties gitProperties;
+  private String processingId;
+}