Update app.py

app.py

@@ -384,71 +384,157 @@ def normalize_wholix_dropdown(val):
         return {"keys": [s], "values": [s]}
     return None
 
+def _first_non_empty(*vals):
+    for v in vals:
+        if isinstance(v, str) and v.strip():
+            return v.strip()
+        if v not in (None, "", [], {}):
+            return v
+    return None
+
+def _from_ci(d: dict, *keys, default=None):
+    if not isinstance(d, dict):
+        return default
+    for k in keys:
+        if k in d and str(d[k]).strip() != "":
+            return d[k]
+        for dk in d.keys():
+            if dk.lower() == k.lower() and str(d[dk]).strip() != "":
+                return d[dk]
+    return default
+
+def _join_nonempty(parts, sep=" "):
+    return sep.join([str(x).strip() for x in parts if str(x or "").strip()])
+
 def map_to_wholix_record(lead: dict, draft: dict, tag_text: str = "AI") -> dict:
-    """
-    JS mapToWholixContactsPayload → Python
-    """
     p   = (lead or {}).get("person")   or {}
     c   = (lead or {}).get("company")  or {}
     m   = (lead or {}).get("messages") or {}
     ctx = (lead or {}).get("context")  or {}
 
-    email = str(p.get("email") or "").strip()
+    # --- Email (REQUIRED) ---
+    email = str(_first_non_empty(p.get("email"), _from_ci(p, "mail", "email_address")) or "").strip()
     if not email:
         e = ValueError("E-Mail-Adresse fehlt – Wholix benötigt 'email' als Pflichtfeld.")
         e.name = "ValidationError"
         raise e
 
+    # --- Departments as TEXT + we’ll mirror into tags dropdown later ---
     depts_raw = p.get("departments")
     if isinstance(depts_raw, list):
-        departments = ", ".join([str(x) for x in depts_raw if str(x).strip()]) or None
+        departments_txt = ", ".join([str(x).strip() for x in depts_raw if str(x).strip()]) or None
+        depts_list_for_tags = [str(x).strip() for x in depts_raw if str(x).strip()]
     else:
-        departments = (str(depts_raw) if depts_raw is not None else None)
+        departments_txt = str(depts_raw).strip() if depts_raw not in (None, "", []) else None
+        depts_list_for_tags = [departments_txt] if departments_txt else []
+
+    # --- Company URL with wide fallbacks ---
+    company_url = _first_non_empty(
+        c.get("url"),
+        c.get("website"),
+        c.get("domain"),
+        c.get("homepage_url"),
+        c.get("website_url"),
+        c.get("url_normalized"),
+        ctx.get("url"),
+        (lead or {}).get("homepage_url"),
+    )
+
+    # --- Message fields: PULL FROM 'draft' (fix) ---
+    draft = draft or {}
+    draft_email  = draft.get("email") if isinstance(draft, dict) else {}
+    # tolerate shapes like {'email': {'subject','body','to'}} + followups at root
+    msg_subject  = _first_non_empty(
+        _from_ci(draft_email, "subject", "email_subject"),
+        _from_ci(draft, "subject", "email_subject", "Betreff"),
+        _from_ci(m, "message_mail_subject"),  # legacy
+    )
+    msg_body     = _first_non_empty(
+        _from_ci(draft_email, "body", "text", "content"),
+        _from_ci(draft, "body", "Text", "content", "email_body"),
+        _from_ci(m, "message_mail"),  # legacy
+    )
+    followup1    = _first_non_empty(
+        _from_ci(draft, "followup1", "FollowUp1", "LinkedIn", "linkedin", "li"),
+        _from_ci(m, "followup1", "message_followup1"),
+    )
+    followup2    = _first_non_empty(
+        _from_ci(draft, "followup2", "FollowUp2", "Facebook", "facebook", "fb"),
+        _from_ci(m, "followup2", "message_followup2"),
+    )
 
-    company_url = (
-        str(c.get("url") or c.get("website") or c.get("domain") or "").strip()
-        or str(ctx.get("url") or "").strip()
-        or None
+    # --- Address with wide fallbacks ---
+    street = _first_non_empty(
+        _join_nonempty([c.get("street_name"), c.get("street_number")]),
+        c.get("address"),
+        c.get("address1"),
+        c.get("address_line1"),
+        c.get("street"),
+        c.get("street_address"),
     )
 
-    mail = m.get("email") if isinstance(m, dict) else {}
-    mail_body    = (mail.get("body")    or "").strip() if isinstance(mail, dict) else ""
-    mail_subject = (mail.get("subject") or "").strip() if isinstance(mail, dict) else ""
-    followup1    = m.get("followup1")
-    followup2    = m.get("followup2")
+    city = _first_non_empty(
+        c.get("city"),
+        c.get("town"),
+        c.get("locality"),
+    )
 
-    street_parts = [c.get("street_name"), c.get("street_number")]
-    street = " ".join([str(x).strip() for x in street_parts if str(x or "").strip()]) or ""
-    street = street or None
+    postcode = _first_non_empty(
+        c.get("zip_code"),
+        c.get("postal_code"),
+        c.get("postcode"),
+        c.get("zip"),
+    )
+
+    # --- exclude_hash with fallbacks ---
+    exclude_hash = _first_non_empty(
+        lead.get("exclude_hash"),
+        c.get("exclude_hash"),
+        p.get("exclude_hash"),
+        lead.get("combined_id"),
+    )
+
+    # --- Build tags dropdown: keep existing tag_text and add departments (if any) ---
+    tag_items = [str(tag_text).strip("[]")] if str(tag_text).strip("[]") else []
+    for d in depts_list_for_tags:
+        if d and d not in tag_items:
+            tag_items.append(d)
+    tags_dropdown = {"keys": tag_items, "values": tag_items} if tag_items else None
 
     payload = {
+        # Person
         "firstname":    p.get("first_name") or None,
         "lastname":     p.get("last_name")  or None,
         "email":        email,
-        "adress":       street,                             # (sic)
-        "city":         c.get("city") or None,
-        "postcode":     c.get("zip_code") or None,
+        "adress":       street or None,       # (sic) exact key
+        "city":         city or None,
+        "postcode":     postcode or None,
         "phonenumber":  p.get("phone") or None,
         "job_title":    p.get("job_title") or None,
-        "departments":  departments,
+        "departments":  departments_txt,      # text field, as before
         "linkedin_url": p.get("linkedin_url") or None,
 
-        "company_name": c.get("name") or None,
-        "company_url":  company_url,
+        # Company
+        "company_name": c.get("name") or c.get("company_name") or None,
+        "company_url":  company_url or None,
 
-        "message_mail":          mail_body or None,
-        "message_mail_subject":  mail_subject or None,
+        # Message (now from 'draft')
+        "message_mail":          msg_body or None,
+        "message_mail_subject":  msg_subject or None,
         "message_followup1":     followup1 or None,
         "message_followup2":     followup2 or None,
 
-        "exclude_hash": (lead.get("exclude_hash") or None),
+        # Other
+        "exclude_hash": exclude_hash or None,
 
+        # Dropdowns
         "status_field": { "keys": ["Kontakt aufgenommen"], "values": ["Kontakt aufgenommen"] },
-        "tags":         { "keys": [str(tag_text).strip("[]") or "AI"], "values": [str(tag_text).strip("[]") or "AI"] },
+        "tags":         tags_dropdown,
     }
 
     normalized = filter_wholix_contact_fields(payload)
 
+    # Normalize dropdowns (status/tags). Departments stays text.
     if "status_field" in normalized:
         fixed = normalize_wholix_dropdown(normalized["status_field"])
         if fixed: normalized["status_field"] = fixed
@@ -461,6 +547,7 @@ def map_to_wholix_record(lead: dict, draft: dict, tag_text: str = "AI") -> dict:
 
     return normalized
 
+
 def wholix_store_contact(token: str, record: dict, module: str = "Contacts") -> dict:
     """
     JS wholixStoreContact exakt nachgebildet (mit Fallbacks)