CNDIT-1585: Fix phone comments for provider work phone entry (#18)

CDCgov · Aug 15, 2024 · f181dc2 · f181dc2
1 parent 5387e1c
commit f181dc2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/...n-service/src/main/java/gov/cdc/etldatapipeline/person/model/dto/PersonExtendedProps.java b/...n-service/src/main/java/gov/cdc/etldatapipeline/person/model/dto/PersonExtendedProps.java
@@ -26,7 +26,6 @@ default void setNmPrefix(String nmPrefix) {
     }
 
     default void setAliasNickname(String aliasNickname) {
-
     }
 
     void setStreetAddress1(String streetAddress1);
@@ -85,6 +84,8 @@ default void setPhoneExtWork(String phoneExtWork) {
     default void setPhoneHome(String phoneHome) {
     }
 
+    default void setPhoneComments(String phoneComments) {}
+
     default void setPhoneExtHome(String phoneExtHome) {
     }
 

diff --git a/...on-service/src/main/java/gov/cdc/etldatapipeline/person/model/dto/persondetail/Phone.java b/...on-service/src/main/java/gov/cdc/etldatapipeline/person/model/dto/persondetail/Phone.java
@@ -23,6 +23,8 @@ public class Phone implements ExtendPerson {
     private String cd;
     @JsonProperty("ph_tl_uid")
     private Long teleLocatorUid;
+    @JsonProperty("phone_comments")
+    private String phoneComments;
 
     public <T extends PersonExtendedProps> T updatePerson(T personFull) {
         personFull.setPhElpCd(cd);
@@ -32,6 +34,7 @@ public <T extends PersonExtendedProps> T updatePerson(T personFull) {
             if (useCd.equalsIgnoreCase("WP")) {
                 personFull.setPhoneWork(telephoneNbr);
                 personFull.setPhoneExtWork(extensionTxt);
+                personFull.setPhoneComments(phoneComments);
             } else if (useCd.equalsIgnoreCase("H")) {
                 personFull.setPhoneHome(telephoneNbr);
                 personFull.setPhoneExtHome(extensionTxt);

diff --git a/...-service/src/main/java/gov/cdc/etldatapipeline/person/transformer/PersonTransformers.java b/...-service/src/main/java/gov/cdc/etldatapipeline/person/transformer/PersonTransformers.java
@@ -32,7 +32,7 @@ public String processData(ProviderSp providerSp, PersonType personType) {
         return jsonGenerator.generateStringJson(processData(null, providerSp, personType));
     }
 
-    public <T extends PersonExtendedProps> T processData(PatientSp patientSp, ProviderSp providerSp,
+    public PersonExtendedProps processData(PatientSp patientSp, ProviderSp providerSp,
                                                          PersonType personType) {
         PersonExtendedProps transformedObj =
                 switch (personType) {
@@ -50,14 +50,14 @@ public <T extends PersonExtendedProps> T processData(PatientSp patientSp, Provid
             processor.processPersonEmail(patientSp.getEmailNested(), transformedObj);
             processor.processPersonRace(patientSp.getRaceNested(), transformedObj);
 
-        } else if (personType == PersonType.PROVIDER_REPORTING || personType == PersonType.PROVIDER_ELASTIC_SEARCH) {
+        } else {
             processor.processPersonName(providerSp.getNameNested(), transformedObj);
             processor.processPersonAddress(providerSp.getAddressNested(), transformedObj);
             processor.processPersonTelephone(providerSp.getTelephoneNested(), transformedObj);
             processor.processPersonEntityData(providerSp.getEntityDataNested(), transformedObj);
             processor.processPersonEmail(providerSp.getEmailNested(), transformedObj);
         }
-        return (T) transformedObj;
+        return transformedObj;
     }
 
     public PatientElasticSearch buildPatientElasticSearch(PatientSp p) {

diff --git a/person-service/src/test/resources/rawDataFiles/person/PersonTelephone.json b/person-service/src/test/resources/rawDataFiles/person/PersonTelephone.json
@@ -18,14 +18,16 @@
     "extensionTxt": "231",
     "ph_elp_use_cd": "WP",
     "ph_elp_cd": "PH",
-    "ph_tl_uid": 10000011
+    "ph_tl_uid": 10000011,
+    "phone_comments": "work phone comment ignored"
   },
   {
     "telephoneNbr": "2323222422",
     "extensionTxt": "232",
     "ph_elp_use_cd": "WP",
     "ph_elp_cd": "PH",
-    "ph_tl_uid": 10000012
+    "ph_tl_uid": 10000012,
+    "phone_comments": "work phone comment"
   },
   {
     "telephoneNbr": "2323252421",

diff --git a/person-service/src/test/resources/rawDataFiles/provider/ProviderReporting.json b/person-service/src/test/resources/rawDataFiles/provider/ProviderReporting.json
@@ -209,7 +209,7 @@
     "address_comments": "",
     "phone_work": "2323222422",
     "phone_ext_work": "232",
-    "phone_comments": null,
+    "phone_comments": "work phone comment",
     "phone_cell": "2823252423",
     "email_work": "[email protected]",
     "quick_code": "12314286",