Skip to content

feat: remove repeat-type and use and function for all fields #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbgap merged 1 commit into from
Apr 27, 2026
Merged

feat: remove repeat-type and use and function for all fields #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions alerta/database/backends/postgres/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,14 +1963,11 @@ def get_on_calls_active(self, alert):
SELECT *
FROM on_calls
WHERE ((start_time IS NULL OR start_time <= %(time)s) AND (end_time IS NULL OR end_time > %(time)s))
AND ((start_date IS NULL OR start_date <= %(date)s) AND (end_date IS NULL OR end_date >= %(date)s))
AND (
(start_date = %(date)s) OR (start_date < %(date)s AND end_date >= %(date)s)
OR (
repeat_type = 'list'
AND (repeat_days IS NULL OR repeat_days='{}' OR ARRAY[%(day)s] <@ repeat_days)
(repeat_days IS NULL OR repeat_days='{}' OR ARRAY[%(day)s] <@ repeat_days)
AND (repeat_weeks IS NULL OR repeat_weeks='{}' OR ARRAY[%(week)s] <@ repeat_weeks)
AND (repeat_months IS NULL OR repeat_months='{}' OR ARRAY[%(month)s] <@ repeat_months)
)
)

"""
Expand Down
Loading