From 3af630e4dd6d2bce78e3a17b93801d7b97e9c242 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Tue, 4 Sep 2018 13:09:27 -0400 Subject: [PATCH] Return pendulum instance from last_submission_timestamp --- atst/models/request.py | 6 ++++-- tests/domain/test_requests.py | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/atst/models/request.py b/atst/models/request.py index cf4f6cdd..466c6d91 100644 --- a/atst/models/request.py +++ b/atst/models/request.py @@ -2,6 +2,7 @@ from sqlalchemy import Column, func, ForeignKey from sqlalchemy.types import DateTime from sqlalchemy.dialects.postgresql import JSONB from sqlalchemy.orm import relationship +import pendulum from atst.models import Base from atst.models.types import Id @@ -51,10 +52,11 @@ class Request(Base): return False @property - def last_submission_date(self): + def last_submission_timestamp(self): def _is_submission(status_event): return status_event.new_status == RequestStatus.SUBMITTED last_submission = first_or_none(_is_submission, reversed(self.status_events)) if last_submission: - return last_submission.time_created + return pendulum.instance(last_submission.time_created) + return None diff --git a/tests/domain/test_requests.py b/tests/domain/test_requests.py index 6e9e2d5d..dfa6018a 100644 --- a/tests/domain/test_requests.py +++ b/tests/domain/test_requests.py @@ -70,13 +70,13 @@ def test_should_allow_submission(new_request): assert not Requests.should_allow_submission(new_request) -def test_request_knows_its_last_submission_date(new_request): +def test_request_knows_its_last_submission_timestamp(new_request): submitted_request = Requests.submit(new_request) - assert submitted_request.last_submission_date + assert submitted_request.last_submission_timestamp -def test_request_knows_if_it_has_no_last_submission_date(new_request): - assert new_request.last_submission_date is None +def test_request_knows_if_it_has_no_last_submission_timestamp(new_request): + assert new_request.last_submission_timestamp is None def test_exists(session):