Added several properties to companies, contacts, deals, and tickets

python/hubspot_companies.py

@@ -82,6 +82,14 @@ COMPANY_PROPERTIES = [
     "industry",
     "macro_industry_grouping",
     "closest_review_date___clone",
+    "region",
+    "industry_grouping",
+    "source_1",
+    "source_2",
+    "hs_object_source_label",
+    "hs_analytics_source",
+    "hs_analytics_latest_source",
+    "hs_object_source_detail_1",
 ]
 
 # -----------------------------------------------------------------------------
@@ -222,6 +230,7 @@ def _enrich_company_data_from_record(
     record,
     industry_map: Dict[str, str],
     macro_industry_map: Dict[str, str],
+    region_map: Dict[str, str],
 ) -> Dict:
     props = record.properties or {}
     company_data: Dict[str, Optional[str]] = {"id": record.id}
@@ -249,6 +258,10 @@ def _enrich_company_data_from_record(
     macro = company_data.get("macro_industry_grouping")
     company_data["macro_industry_grouping"] = macro_industry_map.get(
         macro) if macro in macro_industry_map else None
+    
+    region = company_data.get("region")
+    company_data["region"] = region_map.get(
+        region) if region in region_map else None
 
     return company_data
 
@@ -275,6 +288,13 @@ def read_companies_by_ids(company_ids: List[str], cursor_prop: str) -> Tuple[Lis
         logging.warning("Failed to fetch macro_industry_grouping map: %s", e)
         macro_industry_map = {}
 
+    try:
+        region_map = get_property_label_mapping(
+            hubspot_client, "companies", "region")
+    except Exception as e:
+        logging.warning("Failed to fetch region map: %s", e)
+        region_map = {}
+
     max_ts_ms: Optional[int] = None
 
     for i, cid in enumerate(company_ids, start=1):
@@ -293,7 +313,7 @@ def read_companies_by_ids(company_ids: List[str], cursor_prop: str) -> Tuple[Lis
                 max_ts_ms = ts_ms
 
             companies.append(_enrich_company_data_from_record(
-                record, industry_map, macro_industry_map))
+                record, industry_map, macro_industry_map, region_map))
 
             if i % 200 == 0:
                 logging.info("Read %d companies...", i)
@@ -333,6 +353,14 @@ def map_company_data_for_db(companies: List[Dict]) -> List[Dict]:
             "industry": c.get("industry"),
             "macro_industry_grouping": c.get("macro_industry_grouping"),
             "closest_review_date": parse_ts(c.get("closest_review_date___clone")),
+            "region": c.get(c.get("region")),
+            "closest_review_date": parse_ts(c.get("closest_review_date___clone")),
+            "source_1": c.get("source_1"),
+            "source_2": c.get("source_2"),
+            "record_source": c.get("hs_object_source_label"),
+            "record_source_detail_1": c.get("hs_object_source_detail_1"),
+            "original_traffic_source": c.get("hs_analytics_source"),
+            "latest_traffic_source": c.get("hs_analytics_latest_source"),
         }
         mapped.append(enrich_supabase_row(base_row))
     return mapped
@@ -345,6 +373,9 @@ def companies_are_different(new_row: Dict, old_row: Dict) -> bool:
         "number_of_active_clis", "number_of_clis",
         "number_of_associated_contacts", "number_of_associated_deals",
         "industry", "macro_industry_grouping", "closest_review_date",
+        "region", "source_1", "source_2", "record_source",
+        "record_source_detail_1", "original_traffic_source",
+        "latest_traffic_source",
     ]
     for key in compare_keys:
         if str(new_row.get(key)) != str(old_row.get(key)):

python/hubspot_contacts.py

@@ -70,6 +70,13 @@ CONTACT_PROPERTIES = [
     "hs_lastmodifieddate",
     "notes_last_updated",
     "associatedcompanyid",
+    "jobtitle",
+    "hs_object_source_label",
+    "source_1__cont_",
+    "source_2",
+    "hs_object_source_detail_1",
+    "hs_analytics_source",
+    "hs_latest_source",
 ]
 
 # -----------------------------------------------------------------------------
@@ -137,6 +144,12 @@ def map_contact_data_for_db(contacts: List[Dict]) -> List[Dict]:
             "hubspot_last_activity_date": parse_ts(c.get("notes_last_updated")) or None,
             "number_of_associated_deals": c.get("number_of_associated_deals", 0),
             "associated_company_id": try_parse_int(c.get("associatedcompanyid")),
+            "record_source": c.get("hs_object_source_label"),
+            "source_1": c.get("source_1__cont_"),
+            "source_2": c.get("source_2"),
+            "record_source_detail_1": c.get("hs_object_source_detail_1"),
+            "original_traffic_source": c.get("hs_analytics_source"),
+            "latest_traffic_source": c.get("hs_latest_source"),
         }
         mapped.append(enrich_supabase_row(base_row))
     return mapped
@@ -146,7 +159,9 @@ def contacts_are_different(new_row: Dict, old_row: Dict) -> bool:
         "full_name", "first_name", "last_name", "email", "phone_number",
         "hubspot_create_date", "hubspot_modified_date",
         "hubspot_last_activity_date", "number_of_associated_deals",
-        "associated_company_id"
+        "associated_company_id", "record_source", "source_1", "source_2",
+        "record_source_detail_1", "original_traffic_source",
+        "latest_traffic_source",
     ]
     for key in compare_keys:
         if str(new_row.get(key)) != str(old_row.get(key)):

python/hubspot_deals.py

@@ -68,6 +68,9 @@ DEAL_PROPERTIES = [
     "margin",
     "source_of_deal_2___migration",
     "hs_primary_associated_company",
+    "hs_object_source_label",
+    "hs_object_source_detail_1",
+    "dealtype",
     "hs_lastmodifieddate",   # for mapping/debugging
     "lastmodifieddate",
 ]
@@ -329,6 +332,9 @@ def read_deals_by_ids(
                 "total_contract_value": try_parse_float(p.get("hs_tcv")),
                 "margin": try_parse_float(p.get("margin")),
                 "source_of_deal": p.get("source_of_deal_2___migration"),
+                "record_source": p.get("hs_object_source_label"),
+                "record_source_detail_1": p.get("hs_object_source_detail_1"),
+                "dealtype": p.get("dealtype"),
                 "company_id": company_id,
             })
 

python/hubspot_tickets.py

@@ -83,6 +83,8 @@ TICKET_PROPERTIES = [
     "subject",
     "hubspot_owner_id",
     "source_type",
+    "hs_object_source_label",
+    "hs_object_source_detail_1",
 ]
 
 # -----------------------------------------------------------------------------
@@ -294,7 +296,9 @@ def read_tickets_by_ids(
                 "ticket_status_id": try_parse_int(p.get("hs_pipeline_stage")),
                 "ticket_status_label": stage_map.get(p.get("hs_pipeline_stage"), ""),
                 "ticket_priority": p.get("hs_ticket_priority"),
-                "source_type": p.get("source_type"),
+                "source": p.get("source_type"),
+                "record_source": p.get("hs_object_source_label"),
+                "record_source_detail_1": p.get("hs_object_source_detail_1"),
                 "hubspot_owner_id": try_parse_int(p.get("hubspot_owner_id")),
                 "hubspot_created_at": parse_ts(p.get("createdate")),
                 "hubspot_created_by": try_parse_int(p.get("hs_created_by_user_id")),