Fix some issues from a tricky merge

atst/domain/requests.py

@@ -31,8 +31,8 @@ class Requests(object):
     AUTO_APPROVE_THRESHOLD = 1000000
 
     @classmethod
-    def create(cls, creator_id, body):
-        request = Request(creator=creator_id, body=body)
+    def create(cls, creator, body):
+        request = Request(creator=creator, body=body)
         request = Requests.set_status(request, RequestStatus.STARTED)
 
         db.session.add(request)
@@ -41,11 +41,11 @@ class Requests(object):
         return request
 
     @classmethod
-    def exists(cls, request_id, creator_id):
+    def exists(cls, request_id, creator):
         try:
             return db.session.query(
                 exists().where(
-                    and_(Request.id == request_id, Request.creator == creator_id)
+                    and_(Request.id == request_id, Request.creator == creator)
                 )
             ).scalar()
         except exc.DataError:

atst/routes/requests/requests_form.py

@@ -111,7 +111,7 @@ def requests_submit(request_id=None):
 def _check_can_view_request(request_id):
     if Permissions.REVIEW_AND_APPROVE_JEDI_WORKSPACE_REQUEST in g.current_user.atat_permissions:
         pass
-    elif Requests.exists(request_id, g.current_user.id):
+    elif Requests.exists(request_id, g.current_user):
         pass
     else:
         raise UnauthorizedError(g.current_user, "view request {}".format(request_id))