Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The project uses semantic versioning (see [SemVer](https://semver.org)).

## [Unreleased]

### Fixed

- Do not cancel already cancelled events

## v0.50.0 - 2025-02-01

### Added
Expand Down
3 changes: 2 additions & 1 deletion src/operationbot/eventDatabase.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ def cancel_empty_events(
now = datetime.now(cfg.TIME_ZONE)
for event in cls.events.values():
if (
event.date.astimezone(cfg.TIME_ZONE) - now < threshold
not event.cancelled
and event.date.astimezone(cfg.TIME_ZONE) - now < threshold
and event.is_empty()
):
events.append(event)
Expand Down
5 changes: 3 additions & 2 deletions tests/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ def _init_event(event: Event, signup=False) -> None:
assert len(db.events) == 4
assert len(db.eventsArchive) == 0
events = db.cancel_empty_events(timedelta(hours=2))
# print(events)
assert events[0].cancelled
assert len(events) == 1
assert events[0].cancelled
assert len(db.events) == 4
events = db.cancel_empty_events(timedelta(hours=2))
assert len(events) == 0