From b18b2386494f7e02c557595ff16eb23468e57a87 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Tue, 4 Sep 2018 14:18:25 -0400 Subject: [PATCH] Move action_required_by to Request model --- atst/domain/requests.py | 8 -------- atst/models/request.py | 8 ++++++++ tests/models/test_requests.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/atst/domain/requests.py b/atst/domain/requests.py index d44be200..dbe8326d 100644 --- a/atst/domain/requests.py +++ b/atst/domain/requests.py @@ -153,14 +153,6 @@ class Requests(object): request.status_events.append(status_event) return request - @classmethod - def action_required_by(cls, request): - return { - RequestStatus.STARTED: "mission_owner", - RequestStatus.PENDING_FINANCIAL_VERIFICATION: "mission_owner", - RequestStatus.PENDING_CCPO_APPROVAL: "ccpo", - }.get(request.status) - @classmethod def should_auto_approve(cls, request): try: diff --git a/atst/models/request.py b/atst/models/request.py index 466c6d91..a560429a 100644 --- a/atst/models/request.py +++ b/atst/models/request.py @@ -60,3 +60,11 @@ class Request(Base): if last_submission: return pendulum.instance(last_submission.time_created) return None + + @property + def action_required_by(self): + return { + RequestStatus.STARTED: "mission_owner", + RequestStatus.PENDING_FINANCIAL_VERIFICATION: "mission_owner", + RequestStatus.PENDING_CCPO_APPROVAL: "ccpo", + }.get(self.status) diff --git a/tests/models/test_requests.py b/tests/models/test_requests.py index ba9478df..563c88b9 100644 --- a/tests/models/test_requests.py +++ b/tests/models/test_requests.py @@ -4,21 +4,21 @@ from atst.domain.requests import Requests, RequestStatus def test_started_request_requires_mo_action(): request = RequestFactory.create() - assert Requests.action_required_by(request) == "mission_owner" + assert request.action_required_by == "mission_owner" def test_pending_financial_requires_mo_action(): request = RequestFactory.create() request = Requests.set_status(request, RequestStatus.PENDING_FINANCIAL_VERIFICATION) - assert Requests.action_required_by(request) == "mission_owner" + assert request.action_required_by == "mission_owner" def test_pending_ccpo_approval_requires_ccpo(): request = RequestFactory.create() request = Requests.set_status(request, RequestStatus.PENDING_CCPO_APPROVAL) - assert Requests.action_required_by(request) == "ccpo" + assert request.action_required_by == "ccpo" def test_request_has_creator():