create is_organization flag for potential organizations

Author: Stephen Poserina

src/server/alembic/versions/fd187937528b_create_pdp_contacts_table.py

@@ -19,18 +19,12 @@
 
 def upgrade():
 
-    op.create_table('pdp_contact_types',
-        sa.Column('contact_type_id', sa.String, primary_key=True)
-    )
-
-    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),
         sa.Column('matching_id', sa.Integer, primary_key=True),
         sa.Column('source_type', sa.String, nullable=False),
         sa.Column('source_id', sa.String, nullable=False),
-        sa.Column('contact_type_id', sa.String, sa.ForeignKey("pdp_contact_types.contact_type_id")),
+        sa.Column('is_organization', sa.Boolean),
         sa.Column('first_name', sa.String),
         sa.Column('last_name', sa.String),
         sa.Column('email', sa.String),

src/server/pipeline/match_data.py

@@ -97,15 +97,13 @@ 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))
 
-        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"])
+        is_organization = False
+        if "account_name" in row.keys():
+            if row["account_name"] != None and not row["account_name"].lower().endswith("household"):
+                is_organization = True
+        insert = text("insert into pdp_contacts(matching_id, source_type, source_id, is_organization, first_name, last_name, email, mobile, street_and_number, apartment, city, state, zip) \
+                    values(:matching_id, :source_type, :source_id, :is_organization, :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"], is_organization=is_organization, 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) }) )