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.

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

Allowing signals to override case types and case priorities #3289

Merged
merged 10 commits into from
Apr 20, 2023
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
"""Adds case override information to signal instances

Revision ID: 56eb1c0a3a92
Revises: 38a7fb709167
Create Date: 2023-04-20 12:42:17.734488

"""
from alembic import op
import sqlalchemy as sa

# revision identifiers, used by Alembic.
revision = "56eb1c0a3a92"
down_revision = "38a7fb709167"
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column("signal_instance", sa.Column("case_type_id", sa.Integer(), nullable=True))
op.add_column("signal_instance", sa.Column("case_priority_id", sa.Integer(), nullable=True))
op.create_foreign_key(None, "signal_instance", "case_priority", ["case_priority_id"], ["id"])
op.create_foreign_key(None, "signal_instance", "case_type", ["case_type_id"], ["id"])
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_constraint(None, "signal_instance", type_="foreignkey")
op.drop_constraint(None, "signal_instance", type_="foreignkey")
op.drop_column("signal_instance", "case_priority_id")
op.drop_column("signal_instance", "case_type_id")
# ### end Alembic commands ###
14 changes: 12 additions & 2 deletions src/dispatch/signal/flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,22 @@ def signal_instance_create_flow(
return signal_instance

# create a case if not duplicate or snoozed
if signal_instance.case_priority:
case_priority = signal_instance.case_priority
else:
case_priority = signal_instance.signal.case_priority

if signal_instance.case_type:
case_type = signal_instance.case_type
else:
case_type = signal_instance.signal.case_type

case_in = CaseCreate(
title=signal_instance.signal.name,
description=signal_instance.signal.description,
case_priority=signal_instance.signal.case_priority,
case_priority=case_priority,
project=signal_instance.project,
case_type=signal_instance.signal.case_type,
case_type=case_type,
)
case = case_service.create(db_session=db_session, case_in=case_in, current_user=current_user)
signal_instance.case = case
Expand Down
6 changes: 6 additions & 0 deletions src/dispatch/signal/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ class SignalInstance(Base, TimeStampMixin, ProjectMixin):
secondary=assoc_signal_instance_entities,
backref="signal_instances",
)
case_type_id = Column(Integer, ForeignKey(CaseType.id))
case_type = relationship("CaseType", backref="signal_instances")
case_priority_id = Column(Integer, ForeignKey(CasePriority.id))
case_priority = relationship("CasePriority", backref="signal_instances")
fingerprint = Column(String)
filter_action = Column(String)
raw = Column(JSONB)
Expand Down Expand Up @@ -356,6 +360,8 @@ class SignalInstanceBase(DispatchBase):

class SignalInstanceCreate(SignalInstanceBase):
signal: Optional[SignalRead]
case_priority: Optional[CasePriorityRead]
case_type: Optional[CaseTypeRead]


class SignalInstanceRead(SignalInstanceBase):
Expand Down
28 changes: 27 additions & 1 deletion src/dispatch/signal/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,12 +434,38 @@ def create_instance(

# we round trip the raw data to json-ify date strings
signal_instance = SignalInstance(
**signal_instance_in.dict(exclude={"case", "signal", "project", "entities", "raw"}),
**signal_instance_in.dict(
exclude={
"case",
"case_type",
"case_priority",
"signal",
"project",
"entities",
"raw",
}
),
raw=json.loads(json.dumps(signal_instance_in.raw)),
project=project,
signal=signal,
)

if signal_instance_in.case_priority:
case_priority = case_priority_service.get_by_name_or_default(
db_session=db_session,
project_id=project.id,
case_priority_in=signal_instance_in.case_priority,
)
signal_instance.case_priority = case_priority

if signal_instance_in.case_type:
case_type = case_type_service.get_by_name_or_default(
db_session=db_session,
project_id=project.id,
case_type_in=signal_instance_in.case_type,
)
signal_instance.case_type = case_type

db_session.add(signal_instance)
db_session.commit()
return signal_instance
Expand Down