Create Request.creator relationship

- Rename creator_id to user_id

atst/domain/requests.py

@@ -58,10 +58,10 @@ class Requests(object):
         return request
 
     @classmethod
-    def get_many(cls, creator_id=None):
+    def get_many(cls, creator=None):
         filters = []
-        if creator_id:
-            filters.append(Request.creator == creator_id)
+        if creator:
+            filters.append(Request.creator == creator)
 
         requests = (
             db.session.query(Request)

atst/models/request.py

@@ -1,6 +1,6 @@
-from sqlalchemy import Column, func
+from sqlalchemy import Column, func, ForeignKey
 from sqlalchemy.types import DateTime
-from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import relationship
 
 from atst.models import Base
@@ -11,13 +11,15 @@ class Request(Base):
     __tablename__ = "requests"
 
     id = Id()
-    creator = Column(UUID(as_uuid=True))
     time_created = Column(DateTime(timezone=True), server_default=func.now())
     body = Column(JSONB)
     status_events = relationship(
         "RequestStatusEvent", backref="request", order_by="RequestStatusEvent.sequence"
     )
 
+    user_id = Column(ForeignKey("users.id"), nullable=False)
+    creator = relationship("User")
+
     @property
     def status(self):
         return self.status_events[-1].new_status

atst/routes/requests/index.py

@@ -28,7 +28,7 @@ def requests_index():
     ):
         requests = Requests.get_many()
     else:
-        requests = Requests.get_many(creator_id=g.current_user.id)
+        requests = Requests.get_many(creator=g.current_user)
 
     mapped_requests = [map_request(g.current_user, r) for r in requests]
 

atst/routes/requests/jedi_request_flow.py

@@ -124,5 +124,5 @@ class JEDIRequestFlow(object):
         if self.request_id:
             Requests.update(self.request_id, request_data)
         else:
-            request = Requests.create(self.current_user.id, request_data)
+            request = Requests.create(self.current_user, request_data)
             self.request_id = request.id