Тесты для бекенда

backend/app/models/employee.py

@@ -1,25 +1,21 @@
 """Employee model"""
-from sqlalchemy import Column, Integer, String, DateTime
-from sqlalchemy.sql import func
+from sqlalchemy import Column, Integer, String
 from sqlalchemy.orm import relationship
-from ..database import Base
+from ..db.base import Base
 
 class Employee(Base):
     __tablename__ = "employees"
-    __table_args__ = {'extend_existing': True}
 
     id = Column(Integer, primary_key=True, index=True)
-    first_name = Column(String, nullable=False)
-    last_name = Column(String, nullable=False)
-    department = Column(String, nullable=False)
-    office = Column(String, nullable=False)
-    hashed_password = Column(String, nullable=False)
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
+    first_name = Column(String, index=True)
+    last_name = Column(String, index=True)
+    department = Column(String)
+    office = Column(String)
+    hashed_password = Column(String)
 
     # Определяем отношение к Request
     requests = relationship(
         "Request",
         back_populates="employee",
-        lazy="dynamic",
         cascade="all, delete-orphan"
     )

backend/app/models/request.py

@@ -1,17 +1,17 @@
 """Request model"""
+from enum import Enum
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
 from sqlalchemy.sql import func
 from sqlalchemy.orm import relationship
-from enum import Enum as PyEnum
-from ..database import Base
+from ..db.base import Base
 
-class RequestStatus(str, PyEnum):
+class RequestStatus(str, Enum):
     NEW = "new"
     IN_PROGRESS = "in_progress"
     COMPLETED = "completed"
     REJECTED = "rejected"
 
-class RequestPriority(str, PyEnum):
+class RequestPriority(str, Enum):
     LOW = "low"
     MEDIUM = "medium"
     HIGH = "high"
@@ -20,13 +20,13 @@ class Request(Base):
     __tablename__ = "requests"
 
     id = Column(Integer, primary_key=True, index=True)
-    title = Column(String, nullable=False)
-    description = Column(String, nullable=False)
-    status = Column(String, nullable=False, default=RequestStatus.NEW)
-    priority = Column(String, nullable=False)
+    department = Column(String, index=True)
+    request_type = Column(String, index=True)
+    description = Column(String)
+    priority = Column(String)
+    status = Column(String, default=RequestStatus.NEW)
     employee_id = Column(Integer, ForeignKey("employees.id"))
     created_at = Column(DateTime(timezone=True), server_default=func.now())
-    updated_at = Column(DateTime(timezone=True), onupdate=func.now())
 
     # Определяем отношение к Employee
     employee = relationship("Employee", back_populates="requests")

backend/app/models/token.py

@@ -1,12 +1,12 @@
-from sqlalchemy import Column, Integer, String, DateTime, ForeignKey
+"""Token model"""
+from sqlalchemy import Column, Integer, String, DateTime
 from sqlalchemy.sql import func
-from ..database import Base
+from ..db.base import Base
 
 class Token(Base):
     __tablename__ = "tokens"
 
     id = Column(Integer, primary_key=True, index=True)
-    access_token = Column(String, unique=True, index=True)
-    employee_id = Column(Integer, ForeignKey("employees.id", ondelete="CASCADE"))
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
-    expires_at = Column(DateTime(timezone=True)) 
+    token = Column(String, unique=True, index=True)
+    user_id = Column(Integer, index=True)  # -1 для админа, остальные для сотрудников
+    created_at = Column(DateTime(timezone=True), server_default=func.now())