Merge pull request #196 from CodeForPhilly/fix-pdp_contacts_volgistics_address

fix-pdp_contacts_volgistics_address

Author: urirot

src/server/datasource_manager.py

@@ -71,29 +71,34 @@ def __clean_csv_headers(header):
 }
 
 
-def volgistics_address(index, street):
+def volgistics_address(street, index):
     result = ""
 
-    for item in street:
-        if isinstance(item, str):
-            if " " in item:
-                result = item.split()[index]
+    if isinstance(street, str):
+        if " " in street:
+            if index == 1:
+                result = " ".join(street.split()[1:])
+            else:
+                result = street.split()[index]
+
 
     return result
 
+
 def normalize_phone_number(number):
     if str(number) == 'nan':
         return ""
     parsed_number = phonenumbers.parse(number, "US")
     return phonenumbers.format_number(parsed_number, phonenumbers.PhoneNumberFormat.NATIONAL)
 
+
 SOURCE_NORMALIZATION_MAPPING = {
     "salesforcecontacts": {
         "source_id": "contact_id",
         "first_name": "first_name",
         "last_name": "last_name",
         "email": "email",
-        "mobile": lambda df: df["mobile"].combine_first(df["phone"]).apply(normalize_phone_number),
+        "mobile": lambda df: df["mobile"].combine_first(df["phone"]),
         "street_and_number": "mailing_street",
         "apartment": "mailing_street",
         "city": "mailing_city",
@@ -115,7 +120,7 @@ def normalize_phone_number(number):
         "first_name": "firstname",
         "last_name": "lastname",
         "email": "email",
-        "mobile": lambda df: df["phone"].apply(normalize_phone_number),
+        "mobile": lambda df: df["phone"],
         "street_and_number": "street",
         "apartment": "apartment",
         "city": "city",
@@ -130,9 +135,9 @@ def normalize_phone_number(number):
         "first_name": "first_name",
         "last_name": "last_name",
         "email": "email",
-        "mobile": lambda df: df["cell"].combine_first(df["home"]).apply(normalize_phone_number),
-        "street_and_number": lambda df: volgistics_address(1, df["street_1"]),
-        "apartment": lambda df: volgistics_address(0, df["street_1"]),
+        "mobile": lambda df: df["cell"].combine_first(df["home"]),
+        "street_and_number": lambda df: df["street_1"].apply(volgistics_address, index=1),
+        "apartment": lambda df: df["street_1"].apply(volgistics_address, index=0),
         "city": "city",
         "state": "state",
         "zip": "zip",