From 9a4b8660e5d45cd7dd1dbf37459b98507a03d7ad Mon Sep 17 00:00:00 2001 From: Ulincsys Date: Fri, 21 Feb 2025 13:30:01 -0600 Subject: [PATCH 1/2] Fix comparison with NoneType logical error Signed-off-by: Ulincsys --- augur/tasks/github/pull_requests/tasks.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/augur/tasks/github/pull_requests/tasks.py b/augur/tasks/github/pull_requests/tasks.py index b65da7f4f..d88a50394 100644 --- a/augur/tasks/github/pull_requests/tasks.py +++ b/augur/tasks/github/pull_requests/tasks.py @@ -231,9 +231,13 @@ def collect_pull_request_review_comments(repo_git: str, full_collection: bool) - repo_id = get_repo_by_repo_git(repo_git).repo_id if not full_collection: - # subtract 2 days to ensure all data is collected - core_data_last_collected = (get_core_data_last_collected(repo_id) - timedelta(days=2)).replace(tzinfo=timezone.utc) - review_msg_url += f"?since={core_data_last_collected.isoformat()}" + last_collected_date = get_core_data_last_collected(repo_id) + + # the full_collection parameter is hardcoded to False, so we must check if there actually is a last_collected date + if last_collected_date: + # subtract 2 days to ensure all data is collected + core_data_last_collected = (last_collected_date - timedelta(days=2)).replace(tzinfo=timezone.utc) + review_msg_url += f"?since={core_data_last_collected.isoformat()}" pr_reviews = get_pull_request_reviews_by_repo_id(repo_id) From 1e417caeb39acaa678745c1ff09093712b978f73 Mon Sep 17 00:00:00 2001 From: Ulincsys Date: Fri, 21 Feb 2025 18:16:01 -0600 Subject: [PATCH 2/2] Secondary task to use get_secondary_data_last_collected Signed-off-by: Ulincsys --- augur/tasks/github/pull_requests/tasks.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/augur/tasks/github/pull_requests/tasks.py b/augur/tasks/github/pull_requests/tasks.py index d88a50394..21ef9d8eb 100644 --- a/augur/tasks/github/pull_requests/tasks.py +++ b/augur/tasks/github/pull_requests/tasks.py @@ -231,13 +231,14 @@ def collect_pull_request_review_comments(repo_git: str, full_collection: bool) - repo_id = get_repo_by_repo_git(repo_git).repo_id if not full_collection: - last_collected_date = get_core_data_last_collected(repo_id) + last_collected_date = get_secondary_data_last_collected(repo_id) - # the full_collection parameter is hardcoded to False, so we must check if there actually is a last_collected date if last_collected_date: # subtract 2 days to ensure all data is collected core_data_last_collected = (last_collected_date - timedelta(days=2)).replace(tzinfo=timezone.utc) - review_msg_url += f"?since={core_data_last_collected.isoformat()}" + review_msg_url += f"?since={core_data_last_collected.isoformat()}" + else: + logger.warning(f"core_data_last_collected is NULL for recollection on repo: {repo_git}") pr_reviews = get_pull_request_reviews_by_repo_id(repo_id)