Commit after updating status

This commit is contained in:
richard-dds 2018-10-25 15:25:05 -04:00
parent 09d3f33908
commit 7404cc4a59
3 changed files with 5 additions and 9 deletions

View File

@ -99,7 +99,7 @@ class Requests(object):
new_status=status, revision=request.latest_revision new_status=status, revision=request.latest_revision
) )
request.status_events.append(status_event) request.status_events.append(status_event)
return request return RequestsQuery.add_and_commit(request)
@classmethod @classmethod
def should_auto_approve(cls, request): def should_auto_approve(cls, request):

View File

@ -119,11 +119,11 @@ class Request(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
@property @property
def latest_status(self): def latest_status(self):
return self.status_events[-1] return self.status_events[-1] if self.status_events else None
@property @property
def status(self): def status(self):
return self.latest_status.new_status return self.latest_status.new_status if self.latest_status else None
@property @property
def status_displayname(self): def status_displayname(self):

View File

@ -237,13 +237,9 @@ def test_displays_ccpo_review_comment(user_session, client):
ccpo = UserFactory.from_atat_role("ccpo") ccpo = UserFactory.from_atat_role("ccpo")
user_session(creator) user_session(creator)
request = RequestFactory.create(creator=creator) request = RequestFactory.create(creator=creator)
status = RequestStatusEventFactory.create( request = Requests.set_status(request, RequestStatus.CHANGES_REQUESTED)
request=request,
revision=request.latest_revision,
new_status=RequestStatus.CHANGES_REQUESTED,
)
review_comment = "add all of the correct info, instead of the incorrect info" review_comment = "add all of the correct info, instead of the incorrect info"
RequestReviewFactory.create(reviewer=ccpo, comment=review_comment, status=status) RequestReviewFactory.create(reviewer=ccpo, comment=review_comment, status=request.status_events[-1])
response = client.get("/requests/new/1/{}".format(request.id)) response = client.get("/requests/new/1/{}".format(request.id))
body = response.data.decode() body = response.data.decode()
assert review_comment in body assert review_comment in body