add check to determine if account is individual or organization

Author: Stephen Poserina

src/server/alembic/versions/fd187937528b_create_pdp_contacts_table.py

@@ -23,7 +23,7 @@ def upgrade():
         sa.Column('contact_type_id', sa.String, primary_key=True)
     )
 
-    op.execute("""insert into pdp_contact_types values ('PERSON'), ('ORGANIZATION');""")
+    op.execute("""insert into pdp_contact_types values ('HOUSEHOLD'), ('ORGANIZATION');""")
 
     op.create_table('pdp_contacts',
         sa.Column('_id', sa.Integer, primary_key=True, autoincrement=True),

src/server/datasource_manager.py

@@ -12,7 +12,7 @@ def __clean_csv_headers(header):
                          'Apartment', 'City', 'State', 'Zip', 'Email', 'Phone', 'Animal_ids'],
     'volgistics': ['Last name', 'First name', 'Middle name', 'Number', 'Complete address', 'Street 1', 'Street 2',
                    'Street 3', 'City', 'State', 'Zip', 'All phone numbers', 'Home', 'Work', 'Cell', 'Email'],
-    'salesforcecontacts': ['Contact ID 18', 'First Name', 'Last Name', 'Mailing Street', 'Mailing City',
+    'salesforcecontacts': ['Account Name', 'Contact ID 18', 'First Name', 'Last Name', 'Mailing Street', 'Mailing City',
                            'Mailing State/Province', 'Mailing Zip/Postal Code', 'Mailing Country', 'Phone', 'Mobile',
                            'Email', 'Account ID 18', 'Volgistics ID', 'Person ID'],
     'volgisticsshifts': ['Number', 'Place', 'Assignment', 'From date', 'To date', 'Hours'],
@@ -115,6 +115,7 @@ def normalize_phone_number(number):
         "city": "mailing_city",
         "state": "mailing_state_province",
         "zip": "mailing_zip_postal_code",
+        "account_name": "account_name",
         "others": {
             "should_drop_first_column": True
         }

src/server/pipeline/match_data.py

@@ -97,9 +97,15 @@ def start(connection, added_or_updated_rows, manual_matches_df, job_id):
                     connection.execute(query, matching_id=matching_id, old_id=old_id) 
                     current_app.logger.info("glue record found, changing id {} to {}".format(old_id, matching_id))
 
-        insert = text("insert into pdp_contacts(matching_id, source_type, source_id, first_name, last_name, email, mobile, street_and_number, apartment, city, state, zip) \
-                    values(:matching_id, :source_type, :source_id, :first_name, :last_name, :email, :mobile, :street_and_number, :apartment, :city, :state, :zip)")
-        connection.execute(insert, matching_id=matching_id, source_type=row["source_type"], source_id=row["source_id"], first_name=row["first_name"], last_name=row["last_name"], email=row["email"], mobile=row["mobile"], street_and_number=row["street_and_number"], apartment=row["apartment"], city=row["city"], state=row["state"], zip=row["zip"])
+        contact_type_id=None
+        if("account_name" in row.keys()):
+            if(row["account_name"].lower().endswith("household")):
+                contact_type_id="HOUSEHOLD"
+            else:
+                contact_type_id="ORGANIZATION"
+        insert = text("insert into pdp_contacts(matching_id, source_type, source_id, contact_type_id, first_name, last_name, email, mobile, street_and_number, apartment, city, state, zip) \
+                    values(:matching_id, :source_type, :source_id, :contact_type_id, :first_name, :last_name, :email, :mobile, :street_and_number, :apartment, :city, :state, :zip)")
+        connection.execute(insert, matching_id=matching_id, source_type=row["source_type"], source_id=row["source_id"], contact_type_id=contact_type_id, first_name=row["first_name"], last_name=row["last_name"], email=row["email"], mobile=row["mobile"], street_and_number=row["street_and_number"], apartment=row["apartment"], city=row["city"], state=row["state"], zip=row["zip"])
 
     current_app.logger.info("- Finished load to pdp_contacts table")
     log_db.log_exec_status(job_id, 'matching', 'executing', str({'at_row': len(rows), 'of_rows': len(rows) }) )