diff --git a/atst/models/request.py b/atst/models/request.py index 4e7a2832..bd14b5db 100644 --- a/atst/models/request.py +++ b/atst/models/request.py @@ -23,3 +23,7 @@ class Request(Base): @property def status(self): return self.status_events[-1].new_status + + @property + def status_displayname(self): + return self.status_events[-1].displayname diff --git a/atst/models/request_status_event.py b/atst/models/request_status_event.py index 2e492ac4..26d042fa 100644 --- a/atst/models/request_status_event.py +++ b/atst/models/request_status_event.py @@ -29,3 +29,7 @@ class RequestStatusEvent(Base): sequence = Column( BigInteger, Sequence("request_status_events_sequence_seq"), nullable=False ) + + @property + def displayname(self): + return self.new_status.name.replace("_", " ").title() diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index 0a6e1524..ec9b566c 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -6,8 +6,6 @@ from atst.domain.requests import Requests def map_request(request): - - status_display_name = request.status.name.replace("_", " ").title() time_created = pendulum.instance(request.time_created) is_new = time_created.add(days=1) > pendulum.now() app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0) @@ -15,7 +13,7 @@ def map_request(request): return { "order_id": request.id, "is_new": is_new, - "status": status_display_name, + "status": request.status_displayname, "app_count": app_count, "date": time_created.format("M/DD/YYYY"), "full_name": request.creator.full_name,