Skip to content

Commit 7b242ca

Browse files
authored
name_or_raise for workflow doesn't require project_id (Netflix#3119)
* name_or_raise for workflow doesn't require project_id * ruff unused import in migration file
1 parent 023b8a8 commit 7b242ca

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

src/dispatch/database/revisions/tenant/versions/2023-03-14_b48b245f9c4c.py

-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"""
88
from alembic import op
99
import sqlalchemy as sa
10-
from sqlalchemy.dialects import postgresql
1110

1211
# revision identifiers, used by Alembic.
1312
revision = "b48b245f9c4c"
@@ -26,19 +25,10 @@ def upgrade():
2625
sa.ForeignKeyConstraint(["workflow_id"], ["workflow.id"], ondelete="CASCADE"),
2726
sa.PrimaryKeyConstraint("signal_id", "workflow_id"),
2827
)
29-
op.create_table(
30-
"assoc_signal_instance_tags",
31-
sa.Column("signal_instance_id", postgresql.UUID(as_uuid=True), nullable=False),
32-
sa.Column("tag_id", sa.Integer(), nullable=False),
33-
sa.ForeignKeyConstraint(["signal_instance_id"], ["signal_instance.id"], ondelete="CASCADE"),
34-
sa.ForeignKeyConstraint(["tag_id"], ["tag.id"], ondelete="CASCADE"),
35-
sa.PrimaryKeyConstraint("signal_instance_id", "tag_id"),
36-
)
3728
# ### end Alembic commands ###
3829

3930

4031
def downgrade():
4132
# ### commands auto generated by Alembic - please adjust! ###
42-
op.drop_table("assoc_signal_instance_tags")
4333
op.drop_table("assoc_signal_workflows")
4434
# ### end Alembic commands ###

src/dispatch/signal/service.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,7 @@ def create(*, db_session: Session, signal_in: SignalCreate) -> Signal:
216216

217217
workflows = []
218218
for w in signal_in.workflows:
219-
workflow = workflow_service.get_by_name_or_raise(
220-
db_session=db_session, project_id=signal.project.id, workflow_in=w
221-
)
219+
workflow = workflow_service.get_by_name_or_raise(db_session=db_session, workflow_in=w)
222220
workflows.append(workflow)
223221

224222
signal.workflows = workflows
@@ -285,9 +283,7 @@ def update(*, db_session: Session, signal: Signal, signal_in: SignalUpdate) -> S
285283

286284
workflows = []
287285
for w in signal_in.workflows:
288-
workflow = workflow_service.get_by_name_or_raise(
289-
db_session=db_session, project_id=signal.project.id, workflow_in=w
290-
)
286+
workflow = workflow_service.get_by_name_or_raise(db_session=db_session, workflow_in=w)
291287
workflows.append(workflow)
292288

293289
signal.workflows = workflows

src/dispatch/workflow/service.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@ def get_by_name(*, db_session, name: str) -> Optional[Workflow]:
3434
return db_session.query(Workflow).filter(Workflow.name == name).one_or_none()
3535

3636

37-
def get_by_name_or_raise(
38-
*, db_session: Session, project_id: int, workflow_in=WorkflowRead
39-
) -> Workflow:
40-
workflow = get_by_name(db_session=db_session, project_id=project_id, name=workflow_in.name)
37+
def get_by_name_or_raise(*, db_session: Session, workflow_in=WorkflowRead) -> Workflow:
38+
workflow = get_by_name(db_session=db_session, name=workflow_in.name)
4139

4240
if not workflow:
4341
raise ValidationError(

0 commit comments

Comments
 (0)