upd

backend/app/db/models.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, DateTime
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, DateTime, types
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 import uuid
@@ -7,6 +7,21 @@ import datetime
 from .database import Base
 
 
+class ChoiceType(types.TypeDecorator):
+
+    impl = types.String
+
+    def __init__(self, choices, **kw):
+        self.choices = dict(choices)
+        super(ChoiceType, self).__init__(**kw)
+
+    def process_bind_param(self, value, dialect):
+        return [k for k, v in self.choices.items() if v == value][0]
+
+    def process_result_value(self, value, dialect):
+        return self.choices[value]
+
+
 class User(Base):
     __tablename__ = "users"
 
@@ -47,8 +62,20 @@ class Queue(Base):
     description = Column(String, index=True)
     owner_id = Column(UUID(as_uuid=True), ForeignKey("users.id"))
     start_time = Column(DateTime, nullable=True)
+    status = Column(
+        ChoiceType(
+            {
+                "created": "created",
+                "waiting": "waiting",
+                "active": "active",
+                "finished": "finished",
+            }
+        ),
+        nullable=False,
+    )
 
     users = relationship("QueueUser", backref="queue", lazy="dynamic")
+    logs = relationship("QueueLog", backref="queue", lazy="dynamic")
 
 
 class QueueUser(Base):
@@ -66,6 +93,7 @@ class QueueLog(Base):
 
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     action = Column(String)
+    queue_id = Column(UUID(as_uuid=True), ForeignKey("queues.id"))
     created = Column(DateTime, default=datetime.datetime.utcnow)