remove workspaces task order association for now

This commit is contained in:
dandds 2018-08-16 16:46:00 -04:00 committed by richard-dds
parent ef153f5226
commit 75f41d4d2b
5 changed files with 34 additions and 10 deletions

View File

@ -0,0 +1,30 @@
"""remove workspaces task order association
Revision ID: f549c7cee17c
Revises: 4be312655ceb
Create Date: 2018-08-16 16:42:48.581510
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = 'f549c7cee17c'
down_revision = '4be312655ceb'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_constraint('workspaces_task_order_id_fkey', 'workspaces', type_='foreignkey')
op.drop_column('workspaces', 'task_order_id')
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('workspaces', sa.Column('task_order_id', sa.INTEGER(), autoincrement=False, nullable=False))
op.create_foreign_key('workspaces_task_order_id_fkey', 'workspaces', 'task_order', ['task_order_id'], ['id'])
# ### end Alembic commands ###

View File

@ -11,9 +11,9 @@ class Workspaces(object):
# workspace_roles table?
@classmethod
def create(cls, request, task_order, name=None):
def create(cls, request, name=None):
name = name or request.id
return Workspace(request=request, task_order=task_order, name=name)
return Workspace(request=request, name=name)
@classmethod
def get(cls, workspace_id):

View File

@ -13,7 +13,4 @@ class Workspace(Base):
request_id = Column(ForeignKey("requests.id"), nullable=False)
request = relationship("Request")
task_order_id = Column(ForeignKey("task_order.id"), nullable=False)
task_order = relationship("TaskOrder")
name = Column(String, unique=True)

View File

@ -9,13 +9,11 @@ from tests.factories import WorkspaceFactory, RequestFactory, TaskOrderFactory
def test_can_create_workspace():
request = RequestFactory.create()
to = TaskOrderFactory.create()
workspace = Workspaces.create(request, to)
workspace = Workspaces.create(request)
assert workspace.request == request
assert workspace.task_order == to
assert workspace.name == request.id
workspace = Workspaces.create(request, to, name="frugal-whale")
workspace = Workspaces.create(request, name="frugal-whale")
assert workspace.name == "frugal-whale"

View File

@ -110,6 +110,5 @@ class WorkspaceFactory(factory.alchemy.SQLAlchemyModelFactory):
model = Workspace
request = factory.SubFactory(RequestFactory)
task_order = factory.SubFactory(TaskOrderFactory)
# name it the same as the request ID by default
name = factory.LazyAttribute(lambda w: w.request.id)