Skip to content
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

Jump to bottom

Fix a condition where default was execting when it shouldn't #5194

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix a condition where default was execting when it shouldn't #5194

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cfaf37
Fix a condition where default was execting when it shouldn't
kevgliss Sep 12, 2024
d61137f
Revert cli
kevgliss Sep 12, 2024
a2ec0a3
Fix commit
kevgliss Sep 12, 2024
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
38 changes: 20 additions & 18 deletions src/dispatch/signal/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,26 @@ def filter_dedup(*, db_session: Session, signal_instance: SignalInstance) -> Sig
Returns:
SignalInstance: The filtered signal instance.
"""
if not signal_instance.signal.filters:
default_dedup_window = datetime.now(timezone.utc) - timedelta(hours=1)
instance = (
db_session.query(SignalInstance)
.filter(
SignalInstance.signal_id == signal_instance.signal_id,
SignalInstance.created_at >= default_dedup_window,
SignalInstance.id != signal_instance.id,
SignalInstance.case_id.isnot(None), # noqa
)
.with_entities(SignalInstance.case_id)
.order_by(desc(SignalInstance.created_at))
.first()
)

if instance:
signal_instance.case_id = instance.case_id
signal_instance.filter_action = SignalFilterAction.deduplicate
return signal_instance

for f in signal_instance.signal.filters:
if f.mode != SignalFilterMode.active:
continue
Expand Down Expand Up @@ -683,24 +703,6 @@ def filter_dedup(*, db_session: Session, signal_instance: SignalInstance) -> Sig
signal_instance.case_id = instances[0].case_id
signal_instance.filter_action = SignalFilterAction.deduplicate
break
# apply default deduplication rule
else:
default_dedup_window = datetime.now(timezone.utc) - timedelta(hours=1)
instance = (
db_session.query(SignalInstance)
.filter(
SignalInstance.signal_id == signal_instance.signal_id,
SignalInstance.created_at >= default_dedup_window,
SignalInstance.id != signal_instance.id,
SignalInstance.case_id.isnot(None), # noqa
)
.with_entities(SignalInstance.case_id)
.order_by(desc(SignalInstance.created_at))
.first()
)
if instance:
signal_instance.case_id = instance.case_id
signal_instance.filter_action = SignalFilterAction.deduplicate

return signal_instance

Expand Down
Loading