Skip to content

Commit f963ac7

Browse files
committed
fix(timezone): ensured consistent timezone conversion in PR processing
1 parent b715c16 commit f963ac7

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ def get_repo_pull_requests_data(
112112
if not prs:
113113
break
114114

115-
if prs[-1].updated_at.astimezone(tz=pytz.UTC) <= bookmark:
115+
if prs[-1].updated_at.replace(tzinfo=pytz.UTC) <= bookmark:
116116
prs_to_process += [
117-
pr for pr in prs if pr.updated_at.astimezone(tz=pytz.UTC) > bookmark
117+
pr for pr in prs if pr.updated_at.replace(tzinfo=pytz.UTC) > bookmark
118118
]
119119
break
120120

@@ -125,7 +125,7 @@ def get_repo_pull_requests_data(
125125
state_changed_at = pr.merged_at if pr.merged_at else pr.closed_at
126126
if (
127127
pr.state.upper() != PullRequestState.OPEN.value
128-
and state_changed_at.astimezone(tz=pytz.UTC) < bookmark
128+
and state_changed_at.replace(tzinfo=pytz.UTC) < bookmark
129129
):
130130
continue
131131
if pr not in filtered_prs:
@@ -224,9 +224,9 @@ def _to_pr_model(
224224
state_changed_at = None
225225
if state != PullRequestState.OPEN:
226226
state_changed_at = (
227-
pr.merged_at.astimezone(pytz.UTC)
227+
pr.merged_at.replace(tzinfo=pytz.UTC)
228228
if pr.merged_at
229-
else pr.closed_at.astimezone(pytz.UTC)
229+
else pr.closed_at.replace(tzinfo=pytz.UTC)
230230
)
231231

232232
merge_commit_sha: Optional[str] = self._get_merge_commit_sha(pr.raw_data, state)
@@ -236,8 +236,8 @@ def _to_pr_model(
236236
number=str(pr.number),
237237
title=pr.title,
238238
url=pr.html_url,
239-
created_at=pr.created_at.astimezone(pytz.UTC),
240-
updated_at=pr.updated_at.astimezone(pytz.UTC),
239+
created_at=pr.created_at.replace(tzinfo=pytz.UTC),
240+
updated_at=pr.updated_at.replace(tzinfo=pytz.UTC),
241241
state_changed_at=state_changed_at,
242242
state=state,
243243
base_branch=pr.base.ref,
@@ -300,7 +300,7 @@ def _to_pr_events(
300300
pull_request_id=str(pr_model.id),
301301
type=PullRequestEventType.REVIEW.value,
302302
data=review.raw_data,
303-
created_at=review.submitted_at.astimezone(pytz.UTC),
303+
created_at=review.submitted_at.replace(tzinfo=pytz.UTC),
304304
idempotency_key=str(review.id),
305305
org_repo_id=pr_model.repo_id,
306306
actor_username=username,

0 commit comments

Comments
 (0)