Add recurring charges on billing and company associations to invoice

python/hubspot_billing.py

@@ -81,7 +81,9 @@ BILLING_PROPERTIES = [
     "hs_created_by_user_id",
     "hs_createdate",
     "connection_date",
-    "disconnect_date"
+    "disconnect_date",
+    "recurring_charges__value_",
+    "recurring_charges__daily_",
 ]
 
 PROPERTY_RENAME = {
@@ -289,6 +291,8 @@ def read_billing_by_ids(
                 "hubspot_created_at": parse_ts(p.get("hs_createdate")),
                 "connection_date": parse_ts(p.get("connection_date")),
                 "disconnect_date": parse_ts(p.get("disconnect_date")),
+                "recurring_charges_value": p.get("recurring_charges__value"),
+                "recurring_charges_daily": p.get("recurring_charges__daily"),
             }
             services.append(row)
 

python/hubspot_invoices.py

@@ -203,7 +203,7 @@ def search_invoice_ids_after_ms(since_ms: int) -> Tuple[List[str], str]:
 def read_invoice_by_ids(
     invoice_ids: List[str],
     cursor_prop: str,
-) -> Tuple[List[Dict], List[Dict], Optional[int]]:
+) -> Tuple[List[Dict], List[Dict], List[Dict], Optional[int]]:
     """
     Read invoices by ID including deal associations.
     Returns: (all_invoices, max_ts_ms_for_cursor_prop)
@@ -213,8 +213,9 @@ def read_invoice_by_ids(
 
     all_invoices: List[Dict] = []
     invoice_contact_links: List[Dict] = []
+    invoice_company_links: List[Dict] = []
 
-    assoc_types = ["contacts"]
+    assoc_types = ["contacts", "companies"]
 
     max_ts_ms: Optional[int] = None
 
@@ -244,6 +245,17 @@ def read_invoice_by_ids(
                                 "contact_id": try_parse_int(a.id),
                             })
 
+            # Companies
+            if getattr(record, "associations", None) and record.associations.get("companies"):
+                bucket = record.associations["companies"]
+                if getattr(bucket, "results", None):
+                    for a in bucket.results:
+                        if a.id and a.id.isdigit():
+                            invoice_company_links.append({
+                                "invoice_id": try_parse_int(record.id),
+                                "company_id": try_parse_int(a.id),
+                            })
+
             # Created date: accept either createdate or hs_createdate
             created_iso = p.get("createdate") or p.get("hs_createdate")
 
@@ -273,12 +285,12 @@ def read_invoice_by_ids(
         except (ObjectsApiException, httpx.HTTPError) as e:
             logging.error("Error reading invoice %s: %s", did, e)
 
-    return all_invoices, invoice_contact_links, max_ts_ms
+    return all_invoices, invoice_contact_links, invoice_company_links, max_ts_ms
 
 # -----------------------------------------------------------------------------
 # Upsert
 # -----------------------------------------------------------------------------
-def upsert_invoices(invoices: List[Dict], invoice_contact_links: List[Dict]) -> None:
+def upsert_invoices(invoices: List[Dict], invoice_contact_links: List[Dict], invoice_company_links: List[Dict]) -> None:
     if invoices:
         insert_into_supabase_table(supabase_client, "hubspot_invoices", invoices)
         print(f"Upserted {len(invoices)} invoices.")
@@ -292,6 +304,16 @@ def upsert_invoices(invoices: List[Dict], invoice_contact_links: List[Dict]) ->
             on_conflict=["invoice_id", "contact_id"],
         )
         print(f"Upserted {len(invoice_contact_links)} invoice-contact associations.")
+
+    if invoice_company_links:
+        invoice_company_links = deduplicate_by_key(invoice_company_links, key=("invoice_id", "company_id"))
+        insert_into_supabase_table(
+            supabase_client,
+            "hubspot_invoice_companies",
+            invoice_company_links,
+            on_conflict=["invoice_id", "company_id"],
+        )
+        print(f"Upserted {len(invoice_company_links)} invoice-company associations.")
     
 
 # -----------------------------------------------------------------------------
@@ -329,10 +351,10 @@ def main(since_ms: Optional[int] = None):
         return
 
     print("Reading invoices (with associations)...")
-    invoices, invoice_contact_links, max_ts_ms = read_invoice_by_ids(ids, cursor_prop)
+    invoices, invoice_contact_links, invoice_company_links, max_ts_ms = read_invoice_by_ids(ids, cursor_prop)
 
     print("Upserting into Supabase...")
-    upsert_invoices(invoices, invoice_contact_links)
+    upsert_invoices(invoices, invoice_contact_links, invoice_company_links)
 
     # Advance cursor to max timestamp we actually ingested for the chosen property
     new_cursor_ms = max_ts_ms if max_ts_ms is not None else since_ms