Update app.py

app.py

@@ -8,12 +8,12 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 # ── Credentials ────────────────────────────────────────────────────────────────
-SLACK_TOKEN     = "xoxb-7025747032292-10683671864694-lhUNPKF1KSpYwRvrvZeP7CPy"
-CW_COMPANY_ID   = "Intrinsic"
-CW_PUBLIC_KEY   = "IkrljDywPCSE4s10"
-CW_PRIVATE_KEY  = "kOwo89oUO6SVVSYi"
-CW_CLIENT_ID    = "e45cf35f-24a8-4f5f-b47a-19376cafce64"
-BASE_URL        = "https://api-na.myconnectwise.net/v4_6_release/apis/3.0"
+SLACK_TOKEN    = "xoxb-7025747032292-10683671864694-lhUNPKF1KSpYwRvrvZeP7CPy"
+CW_COMPANY_ID  = "Intrinsic"
+CW_PUBLIC_KEY  = "IkrljDywPCSE4s10"
+CW_PRIVATE_KEY = "kOwo89oUO6SVVSYi"
+CW_CLIENT_ID   = "e45cf35f-24a8-4f5f-b47a-19376cafce64"
+BASE_URL       = "https://api-na.myconnectwise.net/v4_6_release/apis/3.0"
 
 auth         = f"{CW_COMPANY_ID}+{CW_PUBLIC_KEY}:{CW_PRIVATE_KEY}"
 encoded_auth = base64.b64encode(auth.encode()).decode()
@@ -24,55 +24,68 @@ CW_HEADERS = {
     "Content-Type":  "application/json",
 }
 
-# ── Fallback name lists (tried in order) ───────────────────────────────────────
-BOARD_FALLBACKS    = ["Service Desk", "Help Desk", "Support", "Technical Support",
-                      "IT Support", "Service Board", "Default", "General"]
-COMPANY_FALLBACKS  = ["Intrinsic", "intrinsic", "INTRINSIC", "IntrinsicIT",
-                      "intrinsicit", "Intrinsic IT"]
-PRIORITY_FALLBACKS = ["Priority 1", "P1", "High", "Critical", "Urgent",
-                      "Medium", "Normal", "Low", "Priority 2", "Priority 3"]
+COMPANY_NAME_VARIANTS = [
+    "Intrinsic", "intrinsic", "INTRINSIC", "IntrinsicIT", "Intrinsic IT"
+]
 
 
 # ── Discovery helpers ──────────────────────────────────────────────────────────
 
-def discover_boards():
-    """Return list of active service board names from ConnectWise."""
+def get_all_boards():
+    """Return list of (id, name) for all service boards (active + inactive)."""
     try:
         r = requests.get(
             f"{BASE_URL}/service/boards",
             headers=CW_HEADERS,
-            params={"conditions": "inactive=false", "pageSize": 50},
+            params={"pageSize": 100},
             timeout=10,
         )
+        logger.info("Boards %s: %s", r.status_code, r.text[:600])
         if r.status_code == 200:
-            names = [b.get("name") for b in r.json() if b.get("name")]
-            logger.info("Discovered boards: %s", names)
-            return names
+            return [(b.get("id"), b.get("name")) for b in r.json() if b.get("id")]
     except Exception as e:
-        logger.warning("Board discovery failed: %s", e)
+        logger.warning("Board fetch error: %s", e)
     return []
 
 
-def discover_companies():
-    """Return list of company identifiers from ConnectWise."""
+def get_company_id():
+    """Try multiple name variants; fall back to first company in system."""
+    for variant in COMPANY_NAME_VARIANTS:
+        try:
+            r = requests.get(
+                f"{BASE_URL}/company/companies",
+                headers=CW_HEADERS,
+                params={
+                    "conditions": f'name contains "{variant}"',
+                    "pageSize": 10,
+                },
+                timeout=10,
+            )
+            logger.info("Company search '%s' → %s: %s", variant, r.status_code, r.text[:300])
+            if r.status_code == 200 and r.json():
+                return r.json()[0].get("id")
+        except Exception as e:
+            logger.warning("Company search error '%s': %s", variant, e)
+
+    # Fall back to first company in the system
     try:
         r = requests.get(
             f"{BASE_URL}/company/companies",
             headers=CW_HEADERS,
-            params={"pageSize": 50},
+            params={"pageSize": 1},
             timeout=10,
         )
-        if r.status_code == 200:
-            ids = [c.get("identifier") for c in r.json() if c.get("identifier")]
-            logger.info("Discovered companies: %s", ids)
-            return ids
+        if r.status_code == 200 and r.json():
+            c = r.json()[0]
+            logger.warning("Using first company fallback: %s id=%s", c.get("name"), c.get("id"))
+            return c.get("id")
     except Exception as e:
-        logger.warning("Company discovery failed: %s", e)
-    return []
+        logger.warning("Fallback company error: %s", e)
+    return None
 
 
-def discover_priorities():
-    """Return list of priority names from ConnectWise."""
+def get_priority_id():
+    """Return numeric id of the first available priority."""
     try:
         r = requests.get(
             f"{BASE_URL}/service/priorities",
@@ -80,106 +93,86 @@ def discover_priorities():
             params={"pageSize": 50},
             timeout=10,
         )
-        if r.status_code == 200:
-            names = [p.get("name") for p in r.json() if p.get("name")]
-            logger.info("Discovered priorities: %s", names)
-            return names
+        logger.info("Priorities %s: %s", r.status_code, r.text[:300])
+        if r.status_code == 200 and r.json():
+            return r.json()[0].get("id")
     except Exception as e:
-        logger.warning("Priority discovery failed: %s", e)
-    return []
+        logger.warning("Priority fetch error: %s", e)
+    return None
 
 
-def best_match(discovered, fallbacks):
-    """
-    Return the first discovered value that appears in fallbacks (case-insensitive),
-    then the first discovered value, then the first fallback.
-    """
-    lower_disc = {d.lower(): d for d in discovered}
-    for f in fallbacks:
-        if f.lower() in lower_disc:
-            return lower_disc[f.lower()]
-    if discovered:
-        return discovered[0]
-    return fallbacks[0]   # last resort: just try the first hardcoded name
-
+# ── Ticket creation with 4-level fallback ──────────────────────────────────────
 
-# ── Ticket creation with progressive fallbacks ─────────────────────────────────
-
-def try_create(payload):
+def post_ticket(payload):
     r = requests.post(
         f"{BASE_URL}/service/tickets",
         headers=CW_HEADERS,
         json=payload,
         timeout=10,
     )
-    logger.info("CW status=%s body=%s", r.status_code, r.text[:300])
+    logger.info("CW POST status=%s body=%s", r.status_code, r.text[:500])
     return r
 
 
 def create_ticket(issue):
-    # ── Step 1: discover real values ─────────────────────────────────────────
-    boards     = discover_boards()
-    companies  = discover_companies()
-    priorities = discover_priorities()
-
-    board_name    = best_match(boards,     BOARD_FALLBACKS)
-    company_id    = best_match(companies,  COMPANY_FALLBACKS)
-    priority_name = best_match(priorities, PRIORITY_FALLBACKS)
-
-    logger.info("Using board=%s company=%s priority=%s",
-                board_name, company_id, priority_name)
-
-    # ── Step 2: full payload ──────────────────────────────────────────────────
-    full_payload = {
-        "summary":            issue[:100],
-        "initialDescription": issue,
-        "board":    {"name":       board_name},
-        "company":  {"identifier": company_id},
-        "priority": {"name":       priority_name},
-    }
-    r = try_create(full_payload)
-    if r.status_code in (200, 201):
-        return r.json().get("id"), board_name
-
-    # ── Step 3: try every discovered board one-by-one ────────────────────────
-    for b in boards:
-        if b == board_name:
-            continue
-        payload = {**full_payload, "board": {"name": b}}
-        r = try_create(payload)
+    summary  = issue[:100]
+    boards   = get_all_boards()          # [(id, name), ...]
+    company_id  = get_company_id()       # numeric int
+    priority_id = get_priority_id()      # numeric int
+
+    logger.info("Resolved → boards=%s company_id=%s priority_id=%s",
+                boards, company_id, priority_id)
+
+    # ── Attempt 1: each board + company numeric ID ────────────────────────────
+    if company_id and boards:
+        for bid, bname in boards:
+            payload = {
+                "summary":            summary,
+                "initialDescription": issue,
+                "board":   {"id": bid},
+                "company": {"id": company_id},
+            }
+            if priority_id:
+                payload["priority"] = {"id": priority_id}
+            r = post_ticket(payload)
+            if r.status_code in (200, 201):
+                return r.json().get("id"), bname
+
+    # ── Attempt 2: company only (CW picks default board) ─────────────────────
+    if company_id:
+        payload = {
+            "summary":            summary,
+            "initialDescription": issue,
+            "company": {"id": company_id},
+        }
+        r = post_ticket(payload)
         if r.status_code in (200, 201):
-            return r.json().get("id"), b
-
-    # ── Step 4: drop priority (might be wrong) ────────────────────────────────
-    logger.warning("Retrying without priority field")
-    no_priority = {k: v for k, v in full_payload.items() if k != "priority"}
-    r = try_create(no_priority)
-    if r.status_code in (200, 201):
-        return r.json().get("id"), board_name
-
-    # ── Step 5: drop company too ─────────────────────────��────────────────────
-    logger.warning("Retrying without company or priority")
-    minimal_board = {
-        "summary":            issue[:100],
-        "initialDescription": issue,
-        "board":              {"name": board_name},
-    }
-    r = try_create(minimal_board)
-    if r.status_code in (200, 201):
-        return r.json().get("id"), board_name
-
-    # ── Step 6: bare minimum — just summary ───────────────────────────────────
-    logger.warning("Retrying with bare minimum payload")
-    bare = {"summary": issue[:100], "initialDescription": issue}
-    r = try_create(bare)
+            return r.json().get("id"), "default"
+
+    # ── Attempt 3: string identifier variants ─────────────────────────────────
+    for variant in COMPANY_NAME_VARIANTS:
+        for bid, bname in (boards or [(None, None)]):
+            payload = {
+                "summary":            summary,
+                "initialDescription": issue,
+                "company": {"identifier": variant},
+            }
+            if bid:
+                payload["board"] = {"id": bid}
+            r = post_ticket(payload)
+            if r.status_code in (200, 201):
+                return r.json().get("id"), bname or "default"
+
+    # ── Attempt 4: absolute minimum (summary only) ────────────────────────────
+    r = post_ticket({"summary": summary, "initialDescription": issue})
     if r.status_code in (200, 201):
         return r.json().get("id"), "default"
 
-    logger.error("All ticket creation attempts failed")
+    logger.error("All ticket attempts failed")
     return None, None
 
 
-# ── Slack helpers ──────────────────────────────────────────────────────────────
+# ── Slack helper ───────────────────────────────────────────────────────────────
 
 def send_slack(channel, text):
     requests.post(
@@ -200,23 +193,41 @@ def home():
     return "Slack → ConnectWise Bot Running ✅"
 
 
-@app.route("/debug/cw", methods=["GET"])
+@app.route("/debug/cw")
 def debug_cw():
     """
-    Hit /debug/cw in your browser to see exactly what boards / companies /
-    priorities exist in your ConnectWise instance.
+    Visit this URL in your browser to see the REAL board names, company IDs,
+    and priority IDs in your ConnectWise instance.
     """
-    return jsonify({
-        "boards":     discover_boards(),
-        "companies":  discover_companies(),
-        "priorities": discover_priorities(),
-    })
+    out = {}
+
+    try:
+        r = requests.get(f"{BASE_URL}/service/boards", headers=CW_HEADERS,
+                         params={"pageSize": 100}, timeout=10)
+        out["boards"] = r.json() if r.status_code == 200 else {"error": r.text}
+    except Exception as e:
+        out["boards"] = {"error": str(e)}
+
+    try:
+        r = requests.get(f"{BASE_URL}/company/companies", headers=CW_HEADERS,
+                         params={"pageSize": 20}, timeout=10)
+        out["companies"] = r.json() if r.status_code == 200 else {"error": r.text}
+    except Exception as e:
+        out["companies"] = {"error": str(e)}
+
+    try:
+        r = requests.get(f"{BASE_URL}/service/priorities", headers=CW_HEADERS,
+                         params={"pageSize": 20}, timeout=10)
+        out["priorities"] = r.json() if r.status_code == 200 else {"error": r.text}
+    except Exception as e:
+        out["priorities"] = {"error": str(e)}
+
+    return jsonify(out)
 
 
 @app.route("/slack/events", methods=["POST"])
 def slack_events():
     data = request.get_json()
-    logger.info("Slack payload type=%s", data.get("type"))
 
     # URL verification handshake
     if data.get("type") == "url_verification":
@@ -224,7 +235,7 @@ def slack_events():
 
     event = data.get("event", {})
 
-    # Ignore bot messages to prevent loops
+    # Block bot messages to prevent infinite loops
     if event.get("bot_id") or event.get("subtype") == "bot_message":
         return "", 200
 
@@ -232,7 +243,6 @@ def slack_events():
         text    = event.get("text", "")
         channel = event.get("channel")
 
-        # Strip bot mention
         text = text.replace("<@U0AL3KRRELE>", "").strip()
         if not text:
             return "", 200
@@ -241,14 +251,14 @@ def slack_events():
 
         if ticket_id:
             reply = (
-                f"✅ Support ticket created!\n"
-                f"🎫 Ticket ID: `{ticket_id}`\n"
+                f"✅ Ticket created!\n"
+                f"🎫 ID: `{ticket_id}`\n"
                 f"📋 Board: {board_used}"
             )
         else:
             reply = (
-                "⚠️ Could not create a ConnectWise ticket right now.\n"
-                "Please contact support directly or try again shortly."
+                "⚠️ Could not create a ConnectWise ticket.\n"
+                "Visit /debug/cw to see available boards & companies."
             )
 
         send_slack(channel, reply)