pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add portfolio to ShowTaskOrderWorkflow class

Browse Source
This commit is contained in:
Montana 2019-03-08 10:37:59 -05:00
parent aa206192be
commit 24886fc482
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atst/routes/task_orders/new.py
View File

@ -62,6 +62,12 @@ class ShowTaskOrderWorkflow:
return self._task_order return self._task_order
@property
def portfolio(self):
if self.task_order:
return self.task_order.portfolio
return Portfolios.get(self.user, self.portfolio_id)
@property @property
def form(self): def form(self):
form_type = ( form_type = (
@ -129,11 +135,6 @@ class ShowTaskOrderWorkflow:
return True return True
return False return False
def get_portfolio(self):
if self.task_order:
return self.task_order.portfolio
return Portfolios.get(self.user, self.portfolio_id)
class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow): class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
def __init__( def __init__(
@ -238,7 +239,7 @@ def new(screen, task_order_id=None, portfolio_id=None):
} }
if workflow.pf_attributes_read_only(): if workflow.pf_attributes_read_only():
template_args["portfolio"] = workflow.get_portfolio() template_args["portfolio"] = workflow.portfolio
if screen == 1: if screen == 1:
workflow.form = task_order_form.AppInfoWithExistingPortfolioForm( workflow.form = task_order_form.AppInfoWithExistingPortfolioForm(
obj=workflow.task_order obj=workflow.task_order

38
tests/routes/task_orders/test_new_task_order.py
View File

@ -9,6 +9,26 @@ from atst.utils.localization import translate
from tests.factories import UserFactory, TaskOrderFactory, PortfolioFactory from tests.factories import UserFactory, TaskOrderFactory, PortfolioFactory
class TestShowTaskOrderWorkflow:
def test_portfolio_when_task_order_exists(self):
portfolio = PortfolioFactory.create()
task_order = TaskOrderFactory(portfolio=portfolio)
assert portfolio.num_task_orders > 0
workflow = ShowTaskOrderWorkflow(
user=task_order.creator, task_order_id=task_order.id
)
assert portfolio == workflow.portfolio
def test_portfolio_with_portfolio_id(self):
user = UserFactory.create()
portfolio = PortfolioFactory.create(owner=user)
workflow = ShowTaskOrderWorkflow(
user=portfolio.owner, portfolio_id=portfolio.id
)
assert portfolio == workflow.portfolio
def test_new_task_order(client, user_session): def test_new_task_order(client, user_session):
creator = UserFactory.create() creator = UserFactory.create()
user_session() user_session()
@ -73,24 +93,6 @@ def test_to_on_pf_cannot_edit_pf_attributes():
assert second_workflow.pf_attributes_read_only() assert second_workflow.pf_attributes_read_only()
def test_get_portfolio_when_task_order_exists():
portfolio = PortfolioFactory.create()
task_order = TaskOrderFactory(portfolio=portfolio)
assert portfolio.num_task_orders > 0
workflow = ShowTaskOrderWorkflow(
user=task_order.creator, task_order_id=task_order.id
)
assert portfolio == workflow.get_portfolio()
def test_get_portfolio_with_portfolio_id():
user = UserFactory.create()
portfolio = PortfolioFactory.create(owner=user)
workflow = ShowTaskOrderWorkflow(user=portfolio.owner, portfolio_id=portfolio.id)
assert portfolio == workflow.get_portfolio()
# TODO: this test will need to be more complicated when we add validation to # TODO: this test will need to be more complicated when we add validation to
# the forms # the forms
def test_create_new_task_order(client, user_session, pdf_upload): def test_create_new_task_order(client, user_session, pdf_upload):