refine

msr.py

@@ -398,8 +398,9 @@ def fetch_all_issue_metadata_streaming(conn, identifiers, start_date, end_date):
         # Build file patterns SQL for THIS BATCH
         file_patterns_sql = '[' + ', '.join([f"'{fp}'" for fp in file_patterns]) + ']'
 
-        # Query for this batch - IssuesEvent filtered by assignee
-        # Note: We check BOTH single assignee field AND assignees array
+        # Query for this batch - IssuesEvent (by author OR assignee) and IssueCommentEvent (by comment author)
+        # Note: For IssuesEvent, we check issue author, single assignee field, AND assignees array
+        # For IssueCommentEvent, we use the comment author
         query = f"""
         WITH issue_events AS (
             SELECT
@@ -408,37 +409,50 @@ def fetch_all_issue_metadata_streaming(conn, identifiers, start_date, end_date):
                     '/issues/',
                     CAST(payload.issue.number AS VARCHAR)
                 ) as url,
-                COALESCE(payload.issue.assignee.login,
-                         (SELECT a.login
-                          FROM (SELECT UNNEST(payload.issue.assignees) as a)
-                          WHERE a.login IN ({identifier_list})
-                          LIMIT 1)) as assignee,
+                CASE
+                    WHEN type = 'IssuesEvent' THEN
+                        COALESCE(
+                            CASE WHEN payload.issue.user.login IN ({identifier_list}) THEN payload.issue.user.login END,
+                            payload.issue.assignee.login,
+                            (SELECT a.login
+                             FROM (SELECT UNNEST(payload.issue.assignees) as a)
+                             WHERE a.login IN ({identifier_list})
+                             LIMIT 1)
+                        )
+                    WHEN type = 'IssueCommentEvent' THEN
+                        payload.comment.user.login
+                    ELSE NULL
+                END as agent_identifier,
                 created_at as event_time,
                 payload.issue.created_at as issue_created_at,
                 payload.issue.closed_at as issue_closed_at,
                 payload.issue.state_reason as state_reason
             FROM read_json({file_patterns_sql}, union_by_name=true, filename=true, compression='gzip', format='newline_delimited', ignore_errors=true, maximum_object_size=2147483648)
             WHERE
-                type = 'IssuesEvent'
+                type IN ('IssuesEvent', 'IssueCommentEvent')
                 AND payload.issue.number IS NOT NULL
                 AND payload.issue.pull_request IS NULL
                 AND (
-                    payload.issue.assignee.login IN ({identifier_list})
-                    OR EXISTS (
-                        SELECT 1 FROM (SELECT UNNEST(payload.issue.assignees) as a)
-                        WHERE a.login IN ({identifier_list})
-                    )
+                    (type = 'IssuesEvent' AND (
+                        payload.issue.user.login IN ({identifier_list})
+                        OR payload.issue.assignee.login IN ({identifier_list})
+                        OR EXISTS (
+                            SELECT 1 FROM (SELECT UNNEST(payload.issue.assignees) as a)
+                            WHERE a.login IN ({identifier_list})
+                        )
+                    ))
+                    OR (type = 'IssueCommentEvent' AND payload.comment.user.login IN ({identifier_list}))
                 )
         ),
         issue_timeline AS (
             SELECT
                 url,
-                assignee as agent_identifier,
+                agent_identifier,
                 MIN(issue_created_at) as created_at,
                 MAX(issue_closed_at) as closed_at,
                 MAX(state_reason) as state_reason
             FROM issue_events
-            GROUP BY url, assignee
+            GROUP BY url, agent_identifier
         )
         SELECT url, agent_identifier, created_at, closed_at, state_reason
         FROM issue_timeline