From 497ed0c2f068e99665ab0cd55ce2112ef5b25bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Casaj=C3=BAs?= Date: Wed, 16 Oct 2024 17:56:34 +0200 Subject: [PATCH] Rename --- app/models.py | 6 +++--- events/event_source.py | 2 +- tests/events/test_sent_events.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models.py b/app/models.py index 3962fc47a..c3dcac557 100644 --- a/app/models.py +++ b/app/models.py @@ -3771,12 +3771,12 @@ class SyncEvent(Base, ModelMixin): sa.Index("ix_sync_event_taken_time", "taken_time"), ) - def mark_as_taken(self, taken_older_than: Optional[Arrow] = None) -> bool: + def mark_as_taken(self, allow_taken_older_than: Optional[Arrow] = None) -> bool: taken_condition = ["taken_time IS NULL"] args = {"taken_time": arrow.now().datetime, "sync_event_id": self.id} - if taken_older_than: + if allow_taken_older_than: taken_condition.append("taken_time < :taken_older_than") - args["taken_older_than"] = taken_older_than.datetime + args["taken_older_than"] = allow_taken_older_than.datetime sql_taken_condition = "({})".format(" OR ".join(taken_condition)) sql = f"UPDATE sync_event SET taken_time = :taken_time WHERE id = :sync_event_id AND {sql_taken_condition}" res = Session.execute(sql, args) diff --git a/events/event_source.py b/events/event_source.py index 0e4734aaa..2b5920c3f 100644 --- a/events/event_source.py +++ b/events/event_source.py @@ -98,7 +98,7 @@ def execute_loop( "Custom/dead_letter_events_to_process", len(events) ) for event in events: - if event.mark_as_taken(taken_older_than=threshold): + if event.mark_as_taken(allow_taken_older_than=threshold): on_event(event) return events diff --git a/tests/events/test_sent_events.py b/tests/events/test_sent_events.py index fddbddefd..367cdf32c 100644 --- a/tests/events/test_sent_events.py +++ b/tests/events/test_sent_events.py @@ -45,14 +45,14 @@ def test_event_mark_as_taken_does_nothing_for_not_before_events(): now = arrow.utcnow() event = SyncEvent.create(content="test".encode("utf-8"), taken_time=now, flush=True) older_than = now.shift(minutes=-1) - assert not event.mark_as_taken(taken_older_than=older_than) + assert not event.mark_as_taken(allow_taken_older_than=older_than) def test_event_mark_as_taken_works_for_before_events(): now = arrow.utcnow() event = SyncEvent.create(content="test".encode("utf-8"), taken_time=now, flush=True) older_than = now.shift(minutes=+1) - assert event.mark_as_taken(taken_older_than=older_than) + assert event.mark_as_taken(allow_taken_older_than=older_than) def test_fire_event_on_alias_creation():