Skip to content

Commit c964a2c

Browse files
committed
Do not cancel already cancelled events
1 parent 161b41c commit c964a2c

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ The project uses semantic versioning (see [SemVer](https://semver.org)).
55

66
## [Unreleased]
77

8+
### Fixed
9+
10+
- Do not cancel same events multiple times
11+
812
## v0.50.0 - 2025-02-01
913

1014
### Added

src/operationbot/eventDatabase.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ def cancel_empty_events(
227227
now = datetime.now(cfg.TIME_ZONE)
228228
for event in cls.events.values():
229229
if (
230-
event.date.astimezone(cfg.TIME_ZONE) - now < threshold
230+
not event.cancelled
231+
and event.date.astimezone(cfg.TIME_ZONE) - now < threshold
231232
and event.is_empty()
232233
):
233234
events.append(event)

tests/test_database.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ def _init_event(event: Event, signup=False) -> None:
121121
assert len(db.events) == 4
122122
assert len(db.eventsArchive) == 0
123123
events = db.cancel_empty_events(timedelta(hours=2))
124-
# print(events)
125-
assert events[0].cancelled
126124
assert len(events) == 1
125+
assert events[0].cancelled
127126
assert len(db.events) == 4
127+
events = db.cancel_empty_events(timedelta(hours=2))
128+
assert len(events) == 0

0 commit comments

Comments
 (0)