From 7404cc4a59ceddfa01bcd07bc787ddbfd52a476d Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Thu, 25 Oct 2018 15:25:05 -0400
Subject: [PATCH] Commit after updating status

---
 atst/domain/requests/requests.py | 2 +-
 atst/models/request.py           | 4 ++--
 tests/routes/test_request_new.py | 8 ++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/atst/domain/requests/requests.py b/atst/domain/requests/requests.py
index 4e92c46f..0c966ed8 100644
--- a/atst/domain/requests/requests.py
+++ b/atst/domain/requests/requests.py
@@ -99,7 +99,7 @@ class Requests(object):
             new_status=status, revision=request.latest_revision
         )
         request.status_events.append(status_event)
-        return request
+        return RequestsQuery.add_and_commit(request)
 
     @classmethod
     def should_auto_approve(cls, request):
diff --git a/atst/models/request.py b/atst/models/request.py
index 443f3c9b..4d518274 100644
--- a/atst/models/request.py
+++ b/atst/models/request.py
@@ -119,11 +119,11 @@ class Request(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
 
     @property
     def latest_status(self):
-        return self.status_events[-1]
+        return self.status_events[-1] if self.status_events else None
 
     @property
     def status(self):
-        return self.latest_status.new_status
+        return self.latest_status.new_status if self.latest_status else None
 
     @property
     def status_displayname(self):
diff --git a/tests/routes/test_request_new.py b/tests/routes/test_request_new.py
index 87842c94..d64d21e0 100644
--- a/tests/routes/test_request_new.py
+++ b/tests/routes/test_request_new.py
@@ -237,13 +237,9 @@ def test_displays_ccpo_review_comment(user_session, client):
     ccpo = UserFactory.from_atat_role("ccpo")
     user_session(creator)
     request = RequestFactory.create(creator=creator)
-    status = RequestStatusEventFactory.create(
-        request=request,
-        revision=request.latest_revision,
-        new_status=RequestStatus.CHANGES_REQUESTED,
-    )
+    request = Requests.set_status(request, RequestStatus.CHANGES_REQUESTED)
     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))
     body = response.data.decode()
     assert review_comment in body