feat(analytics): enhance bot event filtering in create_pr_metrics and add corresponding tests

Author: Ayyanaruto

backend/analytics_server/mhq/service/code/sync/etl_code_analytics.py

@@ -10,6 +10,7 @@
     PullRequestState,
 )
 from mhq.utils.time import Interval
+import re
 
 
 class CodeETLAnalyticsService:
@@ -21,19 +22,9 @@ def create_pr_metrics(
     ) -> PullRequest:
         if pr.state == PullRequestState.OPEN:
             return pr
-        # Filter bots from PR events
-        pr_events = [
-            event
-            for event in pr_events
-            if (
-                not event.actor_username.endswith("[bot]")
-                and not (
-                    event.data.get("user")
-                    and event.data.get("user", {}).get("type") == "Bot"
-                )
-            )
-        ]
-        pr_performance = self.get_pr_performance(pr, pr_events)
+ 
+        non_bot_pr_events = self.filter_non_bot_events(pr_events)
+        pr_performance = self.get_pr_performance(pr, non_bot_pr_events)
 
         pr.first_response_time = (
             pr_performance.first_review_time
@@ -50,11 +41,11 @@ def create_pr_metrics(
             pr_performance.cycle_time if pr_performance.cycle_time != -1 else None
         )
         pr.reviewers = list(
-            {e.actor_username for e in pr_events if e.actor_username != pr.author}
+            {e.actor_username for e in non_bot_pr_events if e.actor_username != pr.author}
         )
 
         if pr_commits:
-            pr.rework_cycles = self.get_rework_cycles(pr, pr_events, pr_commits)
+            pr.rework_cycles = self.get_rework_cycles(pr, non_bot_pr_events, pr_commits)
             pr_commits.sort(key=lambda x: x.created_at)
             first_commit_to_open = pr.created_at - pr_commits[0].created_at
             if isinstance(first_commit_to_open, timedelta):
@@ -184,3 +175,20 @@ def get_rework_cycles(
                 rework_cycles += 1
 
         return rework_cycles
+    
+    def filter_non_bot_events(self, pr_events: List[PullRequestEvent]) -> List[PullRequestEvent]:
+        """Filter out events created by bot users using regex patterns."""
+        
+        bot_pattern = re.compile(r'bot|[bB][oO][tT]|\[bot\]|automated|jenkins|ci-|github-actions', re.IGNORECASE)
+        
+        return [
+            event
+            for event in pr_events
+            if (
+                not bool(bot_pattern.search(event.actor_username))
+                and not (
+                    event.data.get("user")
+                    and event.data.get("user", {}).get("type") == "Bot"
+                )
+            )
+        ]

backend/analytics_server/tests/service/code/sync/test_etl_code_analytics.py

@@ -601,3 +601,29 @@ def test_create_pr_metrics_no_human_rework_time():
         pr, [changes_requested_event, approval_event], []
     )
     assert pr_metrics.rework_time is None
+
+def test_create_pr_metrics_filters_bot_type_events():
+    pr_service = CodeETLAnalyticsService()
+    t1 = time_now()
+    t2 = t1 + timedelta(hours=1)
+    t3 = t2 + timedelta(hours=1)
+    pr = get_pull_request(state=PullRequestState.MERGED, created_at=t1, updated_at=t1)
+    
+    bot_event = get_pull_request_event(
+        pull_request_id=pr.id,
+        reviewer="github_app",
+        state=PullRequestEventState.COMMENTED.value,
+        created_at=t2,
+        data={"user": {"type": "Bot"}},
+    )
+    
+    human_event = get_pull_request_event(
+        pull_request_id=pr.id,
+        reviewer="human_user",
+        state=PullRequestEventState.APPROVED.value,
+        created_at=t3,
+    )
+    
+    pr_metrics = pr_service.create_pr_metrics(pr, [bot_event, human_event], [])
+    assert "human_user" in pr_metrics.reviewers
+    assert "github_app" not in pr_metrics.reviewers