Fix org discussion category lookup

Author: Timna Brown

.github/workflows/create_monthly_discussion.py

@@ -18,16 +18,9 @@
 
 QUERY_ORG = """
 query($org: String!) {
-  organization(login: $org) {
-    id
-    discussionCategories(first: 100) {
-      nodes {
+    organization(login: $org) {
         id
-        name
-        slug
-      }
     }
-  }
 }
 """
 
@@ -39,6 +32,10 @@
         id
         title
         url
+                category {
+                    id
+                    name
+                }
       }
       pageInfo {
         hasNextPage
@@ -138,12 +135,12 @@ def normalize_title(value):
     return (value or "").strip().lower()
 
 
-def fetch_org_info(org, token):
+def fetch_org_id(org, token):
     data = graphql_request(token, QUERY_ORG, {"org": org})
     org_data = data.get("organization")
-    if not org_data:
+    if not org_data or not org_data.get("id"):
         raise RuntimeError(f"Organization not found: {org}")
-    return org_data
+    return org_data.get("id")
 
 
 def fetch_discussions(org, token):
@@ -172,9 +169,10 @@ def fetch_discussions(org, token):
     return discussions
 
 
-def find_category_id(categories, name):
+def find_category_id_from_discussions(discussions, name):
     name_normalized = normalize_title(name)
-    for category in categories:
+    for discussion in discussions:
+        category = discussion.get("category") or {}
         if normalize_title(category.get("name")) == name_normalized:
             return category.get("id")
     return None
@@ -284,14 +282,10 @@ def main():
     prev_title = f"Catalog Index - {prev_month_name} {prev_year}"
     last_updated = datetime.now(timezone.utc).strftime("%Y-%m-%d")
 
-    org_info = fetch_org_info(org, TOKEN)
-    category_id = find_category_id(
-        org_info.get("discussionCategories", {}).get("nodes", []), CATEGORY_NAME
-    )
+    discussions = fetch_discussions(org, TOKEN)
+    category_id = find_category_id_from_discussions(discussions, CATEGORY_NAME)
     if not category_id:
         raise RuntimeError(f"Category not found: {CATEGORY_NAME}")
-
-    discussions = fetch_discussions(org, TOKEN)
     if find_discussion_by_title(discussions, title):
         print(f"Discussion already exists: {title}")
         return
@@ -335,7 +329,7 @@ def main():
         TOKEN,
         MUTATION_CREATE,
         {
-            "orgId": org_info.get("id"),
+            "orgId": fetch_org_id(org, TOKEN),
             "categoryId": category_id,
             "title": title,
             "body": body,

.github/workflows/ensure_welcome_discussion.py

@@ -12,31 +12,25 @@
 
 QUERY_ORG = """
 query($org: String!) {
-  organization(login: $org) {
-    id
-    discussionCategories(first: 100) {
-      nodes {
+    organization(login: $org) {
         id
-        name
-        slug
-      }
     }
-  }
 }
 """
 
 QUERY_DISCUSSIONS = """
 query($org: String!, $after: String) {
   organization(login: $org) {
     discussions(first: 50, after: $after) {
-      nodes {
-        id
-        title
-        url
+            nodes {
+                id
+                title
+                url
                 category {
+                    id
                     name
                 }
-      }
+            }
       pageInfo {
         hasNextPage
         endCursor
@@ -100,12 +94,12 @@ def normalize_title(value):
     return (value or "").strip().lower()
 
 
-def fetch_org_info(org, token):
+def fetch_org_id(org, token):
     data = graphql_request(token, QUERY_ORG, {"org": org})
     org_data = data.get("organization")
-    if not org_data:
+    if not org_data or not org_data.get("id"):
         raise RuntimeError(f"Organization not found: {org}")
-    return org_data
+    return org_data.get("id")
 
 
 def fetch_discussions(org, token):
@@ -134,9 +128,10 @@ def fetch_discussions(org, token):
     return discussions
 
 
-def find_category_id(categories, name):
+def find_category_id_from_discussions(discussions, name):
     name_normalized = normalize_title(name)
-    for category in categories:
+    for discussion in discussions:
+        category = discussion.get("category") or {}
         if normalize_title(category.get("name")) == name_normalized:
             return category.get("id")
     return None
@@ -175,26 +170,23 @@ def main():
         print("Organization is missing from config")
         sys.exit(1)
 
-    org_info = fetch_org_info(org, TOKEN)
-    category_id = find_category_id(
-        org_info.get("discussionCategories", {}).get("nodes", []), WELCOME_CATEGORY
-    )
+    discussions = fetch_discussions(org, TOKEN)
+    category_id = find_category_id_from_discussions(discussions, WELCOME_CATEGORY)
     if not category_id:
         raise RuntimeError(f"Category not found: {WELCOME_CATEGORY}")
-
-    discussions = fetch_discussions(org, TOKEN)
     existing = find_discussion_by_title(discussions, WELCOME_TITLE, WELCOME_CATEGORY)
 
     if existing:
         discussion_id = existing.get("id")
         discussion_url = existing.get("url")
     else:
         body = read_text(WELCOME_TEMPLATE)
+        org_id = fetch_org_id(org, TOKEN)
         create_data = graphql_request(
             TOKEN,
             MUTATION_CREATE,
             {
-                "orgId": org_info.get("id"),
+                "orgId": org_id,
                 "categoryId": category_id,
                 "title": WELCOME_TITLE,
                 "body": body,