refine

msr.py

@@ -402,28 +402,44 @@ def fetch_all_review_metadata_streaming(conn, identifiers, start_date, end_date)
         query = f"""
         WITH review_events AS (
             SELECT
-                payload.pull_request.html_url as pr_url,
+                CONCAT(
+                    REPLACE(repo.url, 'api.github.com/repos/', 'github.com/'),
+                    '/pull/',
+                    CAST(payload.pull_request.number AS VARCHAR)
+                ) as pr_url,
                 actor.login as reviewer,
                 COALESCE(payload.review.submitted_at, created_at) as reviewed_at
             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 = 'PullRequestReviewEvent'
-                AND payload.pull_request.html_url IS NOT NULL
+                AND payload.pull_request.number IS NOT NULL
                 AND actor.login IN ({identifier_list})
         ),
         pr_status AS (
             SELECT
-                payload.pull_request.html_url as pr_url,
+                CONCAT(
+                    REPLACE(repo.url, 'api.github.com/repos/', 'github.com/'),
+                    '/pull/',
+                    CAST(payload.pull_request.number AS VARCHAR)
+                ) as pr_url,
                 payload.pull_request.merged as is_merged,
                 payload.pull_request.merged_at as merged_at,
                 payload.pull_request.closed_at as closed_at,
-                ROW_NUMBER() OVER (PARTITION BY payload.pull_request.html_url ORDER BY created_at DESC) as rn
+                ROW_NUMBER() OVER (PARTITION BY CONCAT(
+                    REPLACE(repo.url, 'api.github.com/repos/', 'github.com/'),
+                    '/pull/',
+                    CAST(payload.pull_request.number AS VARCHAR)
+                ) ORDER BY created_at DESC) as rn
             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 = 'PullRequestEvent'
                 AND payload.action = 'closed'
-                AND payload.pull_request.html_url IS NOT NULL
-                AND payload.pull_request.html_url IN (SELECT DISTINCT pr_url FROM review_events)
+                AND payload.pull_request.number IS NOT NULL
+                AND CONCAT(
+                    REPLACE(repo.url, 'api.github.com/repos/', 'github.com/'),
+                    '/pull/',
+                    CAST(payload.pull_request.number AS VARCHAR)
+                ) IN (SELECT DISTINCT pr_url FROM review_events)
         )
         SELECT
             re.reviewer,