mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
чиним билд9
This commit is contained in:
@@ -3,6 +3,10 @@ from sqlalchemy.orm import Session
|
||||
from ..models.employee import Employee
|
||||
from ..utils.loggers import auth_logger
|
||||
|
||||
def get_employees(db: Session):
|
||||
"""Get all employees"""
|
||||
return db.query(Employee).all()
|
||||
|
||||
def get_employee(db: Session, employee_id: int):
|
||||
"""Get employee by ID"""
|
||||
return db.query(Employee).filter(Employee.id == employee_id).first()
|
||||
|
@@ -1,27 +1,11 @@
|
||||
"""Main application module"""
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.openapi.docs import get_swagger_ui_html
|
||||
from fastapi.openapi.utils import get_openapi
|
||||
import logging
|
||||
from logging.config import dictConfig
|
||||
from .logging_config import logging_config
|
||||
from .middleware import LoggingMiddleware
|
||||
from .routers import auth, employees, requests, admin
|
||||
|
||||
# Configure logging
|
||||
dictConfig(logging_config)
|
||||
logger = logging.getLogger(__name__)
|
||||
app = FastAPI()
|
||||
|
||||
app = FastAPI(
|
||||
title="Support Portal API",
|
||||
description="API for managing support requests and employees",
|
||||
version="1.0.0",
|
||||
docs_url=None,
|
||||
redoc_url=None
|
||||
)
|
||||
|
||||
# Add CORS middleware
|
||||
# Configure CORS
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=["*"],
|
||||
@@ -30,28 +14,8 @@ app.add_middleware(
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
# Add logging middleware
|
||||
app.add_middleware(LoggingMiddleware)
|
||||
|
||||
# Include routers
|
||||
app.include_router(auth.router, prefix="/api/auth", tags=["auth"])
|
||||
app.include_router(employees.router, prefix="/api/employees", tags=["employees"])
|
||||
app.include_router(requests.router, prefix="/api/requests", tags=["requests"])
|
||||
app.include_router(admin.router, prefix="/api/admin", tags=["admin"])
|
||||
|
||||
# Custom OpenAPI documentation
|
||||
@app.get("/api/docs", include_in_schema=False)
|
||||
async def custom_swagger_ui_html():
|
||||
return get_swagger_ui_html(
|
||||
openapi_url="/api/openapi.json",
|
||||
title="Support Portal API Documentation"
|
||||
)
|
||||
|
||||
@app.get("/api/openapi.json", include_in_schema=False)
|
||||
async def get_open_api_endpoint():
|
||||
return get_openapi(
|
||||
title="Support Portal API",
|
||||
version="1.0.0",
|
||||
description="API for managing support requests and employees",
|
||||
routes=app.routes
|
||||
)
|
||||
app.include_router(employees.router, prefix="/api", tags=["employees"])
|
||||
app.include_router(requests.router, prefix="/api", tags=["requests"])
|
||||
app.include_router(admin.router, prefix="/api/admin", tags=["admin"])
|
@@ -3,7 +3,6 @@ from sqlalchemy import Column, Integer, String, DateTime
|
||||
from sqlalchemy.sql import func
|
||||
from sqlalchemy.orm import relationship
|
||||
from ..database import Base
|
||||
from .request import Request
|
||||
|
||||
class Employee(Base):
|
||||
__tablename__ = "employees"
|
||||
@@ -18,4 +17,4 @@ class Employee(Base):
|
||||
password = Column(String, nullable=False)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
requests = relationship("Request", back_populates="employee")
|
||||
requests = relationship("app.models.request.Request", back_populates="employee")
|
@@ -10,6 +10,17 @@ from ..utils.auth import get_password_hash
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@router.get("/employees/", response_model=List[Employee])
|
||||
def get_employees(db: Session = Depends(get_db)):
|
||||
"""Get all employees"""
|
||||
try:
|
||||
return employees_crud.get_employees(db)
|
||||
except Exception as e:
|
||||
raise HTTPException(
|
||||
status_code=500,
|
||||
detail=f"Ошибка при получении списка сотрудников: {str(e)}"
|
||||
)
|
||||
|
||||
@router.post("/employees/", response_model=Employee)
|
||||
def create_employee(employee: EmployeeCreate, db: Session = Depends(get_db)):
|
||||
"""Create new employee"""
|
||||
|
Reference in New Issue
Block a user