fix: skip epics by issue type and support items by label

README.md

@@ -15,9 +15,9 @@ A Discord embed containing:
 - Status breakdown — Done / In Review / In Progress / To Do
 - Completed deliverables with links to each issue/PR
 - Items currently in progress or in review
-- Count of support tickets excluded from calculations
+- Count of epics and support tickets excluded from calculations
 
-> Tickets labelled **`support`** are automatically filtered out from all calculations and the deliverables list.
+> Items with issue type **Epic**, items labelled **`support`**, and items from the `glific/support-process` repo are filtered out from all calculations and the deliverables list.
 
 **Example output**
 
@@ -118,7 +118,7 @@ All config lives in environment variables (or `.env` for local runs):
 | `PROJECT_NUMBER` | GitHub project number (`8`) |
 | `DISCORD_WEBHOOK` | Discord channel webhook URL |
 
-To change the support label filter, edit `SUPPORT_LABEL` at the top of `glific_iteration_update.py`.
+To change what is filtered out, edit `EPIC_ISSUE_TYPE`, `SUPPORT_LABEL` or `SUPPORT_REPO` at the top of `glific_iteration_update.py`.
 
 ---
 

glific_iteration_update.py

@@ -3,7 +3,7 @@
 Glific — Iteration Completion Rate + Deliverables Summary → Discord
 ────────────────────────────────────────────────────────────────────
 Fetches the current iteration from GitHub Projects v2, filters out
-support-process repo items and epics, calculates the completion rate, and posts
+epics and support items, calculates the completion rate, and posts
 a rich summary to Discord.
 
 Scheduled run : every Monday 9 AM IST via GitHub Actions cron
@@ -29,6 +29,10 @@
 
 STATUS_ORDER     = ["Done", "In Review", "In Progress", "To Do"]
 STATUS_CLOSED    = {"done", "closed"}
+EPIC_ISSUE_TYPE  = "Epic"
+SUPPORT_LABEL    = "support"
+# Closed support issues were left behind in this repo when open ones moved to glific/glific
+SUPPORT_REPO     = "glific/support-process"
 STATUS_ICONS     = {
     "Done":        "🟢",
     "In Review":   "🔍",
@@ -88,6 +92,7 @@
               number
               title
               url
+              issueType { name }
               labels(first: 10) { nodes { name } }
               repository { nameWithOwner }
               assignees(first: 5) { nodes { login name } }
@@ -209,10 +214,11 @@ def _paginate_items(org, number, token):
 
 
 def _should_skip(content):
-    """Return True if the item belongs to the support-process repo or is an Epic."""
+    """Return True if the item is an Epic, labelled support, or in the support-process repo."""
     repo = (content.get("repository") or {}).get("nameWithOwner", "")
-    title = content.get("title", "")
-    return repo == "glific/support-process" or title.startswith("[Epic]")
+    issue_type = (content.get("issueType") or {}).get("name")
+    labels = {l["name"].lower() for l in (content.get("labels") or {}).get("nodes", [])}
+    return issue_type == EPIC_ISSUE_TYPE or SUPPORT_LABEL in labels or repo == SUPPORT_REPO
 
 
 def _display_status(raw):
@@ -455,7 +461,7 @@ def item_line(i):
     iter_label    = f"{data['iteration_title']} ({date_range})"
     days_note     = f"Day {data['days_elapsed']} of {data['total_days']}"
     support_note  = (
-        f"\n> _{data['support_skipped']} item(s) excluded from calculations (support-process / epics)_"
+        f"\n> _{data['support_skipped']} item(s) excluded from calculations (epics / support)_"
         if data["support_skipped"] else ""
     )
 
@@ -535,7 +541,7 @@ def main():
     closed = sum(1 for i in data["items"] if i["status"] == "Done")
     pct    = round(closed / total * 100) if total else 0
     print(f"Iteration : {data['iteration_title']}  ({data['starts_at']} → {data['ends_at']})")
-    print(f"Items     : {total} total  |  {closed} done  |  {data['support_skipped']} skipped (support-process/epics)")
+    print(f"Items     : {total} total  |  {closed} done  |  {data['support_skipped']} skipped (epics/support)")
     print(f"Completion: {pct}%")
 
     payloads = build_messages(data)

tests/conftest.py

@@ -33,6 +33,7 @@ def make_issue_item(
     labels=None,
     assignees=None,
     has_pr_events=0,
+    issue_type=None,
 ):
     return {
         "id": f"item-{number}",
@@ -41,6 +42,7 @@ def make_issue_item(
             "number": number,
             "title": title,
             "url": f"https://github.com/{repo}/issues/{number}",
+            "issueType": {"name": issue_type} if issue_type else None,
             "labels": {"nodes": [{"name": l} for l in (labels or [])]},
             "repository": {"nameWithOwner": repo},
             "assignees": {"nodes": [{"login": a, "name": None} for a in (assignees or [])]},

tests/test_glific_iteration_update.py

@@ -155,13 +155,29 @@ def test_mapping(self, raw, expected):
 # ── _should_skip ──────────────────────────────────────────────────────────────
 
 class TestShouldSkip:
+    def test_epic_issue_type(self):
+        content = {"repository": {"nameWithOwner": "glific/glific"}, "title": "Big Feature", "issueType": {"name": "Epic"}}
+        assert _should_skip(content) is True
+
+    def test_support_label(self):
+        content = {"repository": {"nameWithOwner": "glific/glific"}, "title": "Org setup", "labels": {"nodes": [{"name": "support"}]}}
+        assert _should_skip(content) is True
+
+    def test_support_label_case_insensitive(self):
+        content = {"title": "Org setup", "labels": {"nodes": [{"name": "Support"}]}}
+        assert _should_skip(content) is True
+
     def test_support_process_repo(self):
         content = {"repository": {"nameWithOwner": "glific/support-process"}, "title": "Normal"}
         assert _should_skip(content) is True
 
-    def test_epic_title(self):
+    def test_epic_title_prefix_without_type_not_skipped(self):
         content = {"repository": {"nameWithOwner": "glific/glific"}, "title": "[Epic] Big Feature"}
-        assert _should_skip(content) is True
+        assert _should_skip(content) is False
+
+    def test_task_issue_type(self):
+        content = {"repository": {"nameWithOwner": "glific/glific"}, "title": "Fix bug", "issueType": {"name": "Task"}, "labels": {"nodes": [{"name": "bug"}]}}
+        assert _should_skip(content) is False
 
     def test_normal_item(self):
         content = {"repository": {"nameWithOwner": "glific/glific"}, "title": "Fix bug #123"}
@@ -349,6 +365,18 @@ def test_skips_support_process(self):
         assert len(result["items"]) == 1
         assert result["support_skipped"] == 1
 
+    def test_skips_epics_and_support_label(self):
+        meta = self._make_meta("iter-1")
+        items = [
+            make_issue_item(number=1, issue_type="Epic", iteration_id="iter-1"),
+            make_issue_item(number=2, labels=["support"], iteration_id="iter-1"),
+            make_issue_item(number=3, issue_type="Task", iteration_id="iter-1"),
+        ]
+        with patch("glific_iteration_update._gql", side_effect=[meta, paginate_response(items)]):
+            result = fetch_current_iteration("glific", 8, "token")
+        assert [i["identifier"] for i in result["items"]] == ["glific#3"]
+        assert result["support_skipped"] == 2
+
     def test_pr_has_pr_true(self):
         meta = self._make_meta("iter-1")
         items = [make_pr_item(number=5, iteration_id="iter-1")]