Fix tests

backend/app/main.py

@@ -2,13 +2,14 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from sqlalchemy.orm import Session
-from . import models
-from .routers import admin, employees, requests, auth, statistics
+
+from .models.base import Base
 from .database import engine, SessionLocal
+from .routers import admin, employees, requests, auth, statistics
 from .db.init_db import init_db
 
 # Создаем таблицы
-models.Base.metadata.create_all(bind=engine)
+Base.metadata.create_all(bind=engine)
 
 # Инициализируем базу данных
 db = SessionLocal()

backend/app/models/__init__.py

@@ -1,5 +1,7 @@
 """Models initialization"""
+from .base import Base
 from .employee import Employee
 from .request import Request
+from .token import Token
 
-__all__ = ['Employee', 'Request'] 
+__all__ = ['Base', 'Employee', 'Request', 'Token'] 

backend/app/models/base.py

@@ -1,7 +1,4 @@
-"""Base models and imports"""
+"""Base model class"""
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Enum
-from sqlalchemy.sql import func
-from sqlalchemy.orm import relationship
 
 Base = declarative_base() 

backend/app/models/employee.py

@@ -1,8 +1,8 @@
 """Employee model"""
-from sqlalchemy import Column, Integer, String, DateTime, Boolean
+from sqlalchemy import Column, Integer, String, DateTime
 from sqlalchemy.sql import func
 from sqlalchemy.orm import relationship
-from app.db.base_class import Base
+from .base import Base
 
 class Employee(Base):
     __tablename__ = "employees"

backend/app/models/request.py

@@ -3,7 +3,7 @@ from enum import Enum
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
 from sqlalchemy.sql import func
 from sqlalchemy.orm import relationship
-from app.db.base_class import Base
+from .base import Base
 
 class RequestStatus(str, Enum):
     NEW = "new"
@@ -20,7 +20,6 @@ class Request(Base):
     __tablename__ = "requests"
 
     id = Column(Integer, primary_key=True, index=True)
-    department = Column(String, index=True)
     request_type = Column(String, index=True)
     description = Column(String)
     priority = Column(String)

backend/app/models/token.py

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