From ff82e39626f9abf87a45910723f74ee6ec4f94cc Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 10 Feb 2020 11:08:31 -0500 Subject: [PATCH] Remove unsigned from the display statuses, show unsigned TOs display status as DRAFT --- atst/models/task_order.py | 6 ++++-- tests/domain/test_task_orders.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/atst/models/task_order.py b/atst/models/task_order.py index d6aa63f8..3ab493a9 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -25,7 +25,6 @@ SORT_ORDERING = [ Status.DRAFT, Status.UPCOMING, Status.EXPIRED, - Status.UNSIGNED, ] @@ -148,7 +147,10 @@ class TaskOrder(Base, mixins.TimestampsMixin): @property def display_status(self): - return self.status.value + if self.status == Status.UNSIGNED: + return Status.DRAFT.value + else: + return self.status.value @property def portfolio_name(self): diff --git a/tests/domain/test_task_orders.py b/tests/domain/test_task_orders.py index 2db84c5c..93182df0 100644 --- a/tests/domain/test_task_orders.py +++ b/tests/domain/test_task_orders.py @@ -149,11 +149,12 @@ def test_task_order_sort_by_status(): ] sorted_by_status = TaskOrders.sort_by_status(initial_to_list) - assert len(sorted_by_status["Draft"]) == 3 + assert len(sorted_by_status["Draft"]) == 4 assert len(sorted_by_status["Active"]) == 1 assert len(sorted_by_status["Upcoming"]) == 1 assert len(sorted_by_status["Expired"]) == 2 - assert len(sorted_by_status["Unsigned"]) == 1 + with pytest.raises(KeyError): + sorted_by_status["Unsigned"] assert list(sorted_by_status.keys()) == [status.value for status in SORT_ORDERING]