diff --git a/app/api/core/dependencies/dependencies.py b/app/api/core/dependencies/dependencies.py new file mode 100644 index 0000000..1ba6818 --- /dev/null +++ b/app/api/core/dependencies/dependencies.py @@ -0,0 +1,8 @@ +from app.api.db.database import SessionLocal + +def get_db(): + db = SessionLocal() + try: + yield db + finally: + db.close() \ No newline at end of file diff --git a/app/api/core/middleware/activity_tracker.py b/app/api/core/middleware/activity_tracker.py new file mode 100644 index 0000000..a55b82c --- /dev/null +++ b/app/api/core/middleware/activity_tracker.py @@ -0,0 +1,16 @@ +import time +from starlette.middleware.base import BaseHTTPMiddleware +from loguru import logger + +class ActivityTrackerMiddleware(BaseHTTPMiddleware): + async def dispatch(self, request, call_next): + start_time = time.time() + method = request.method + url = str(request.url) + + response = await call_next(request) + process_time = time.time() - start_time + + logger.info(f"{method} {url} - {process_time:.6f} seconds") + + return response \ No newline at end of file diff --git a/app/api/db/database.py b/app/api/db/database.py new file mode 100644 index 0000000..5629890 --- /dev/null +++ b/app/api/db/database.py @@ -0,0 +1,11 @@ +from sqlalchemy import create_engine +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import sessionmaker + +SQLALCHEMY_DATABASE_URL = "sqlite:///./task_management.db" + +engine = create_engine( + SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False} +SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) + +Base = declarative_base() \ No newline at end of file diff --git a/app/api/v1/models/and.py b/app/api/v1/models/and.py new file mode 100644 index 0000000..942a713 --- /dev/null +++ b/app/api/v1/models/and.py @@ -0,0 +1,13 @@ +from sqlalchemy import Column, Integer, String, ForeignKey +from sqlalchemy.orm import relationship +from app.api.db.database import Base + +class And(Base): + __tablename__ = "ands" + + id = Column(Integer, primary_key=True, index=True) + name = Column(String, index=True) + description = Column(String, nullable=True) + task_id = Column(Integer, ForeignKey("tasks.id")) + + task = relationship("Task", back_populates="ands") \ No newline at end of file diff --git a/app/api/v1/models/teams.py b/app/api/v1/models/teams.py new file mode 100644 index 0000000..bb2295f --- /dev/null +++ b/app/api/v1/models/teams.py @@ -0,0 +1,9 @@ +from sqlalchemy import Column, Integer, String +from app.api.db.database import Base + +class Teams(Base): + __tablename__ = "teams" + + id = Column(Integer, primary_key=True, index=True) + name = Column(String, unique=True, index=True) + description = Column(String) \ No newline at end of file diff --git a/app/api/v1/models/user.py b/app/api/v1/models/user.py new file mode 100644 index 0000000..03dadc7 --- /dev/null +++ b/app/api/v1/models/user.py @@ -0,0 +1,12 @@ +from sqlalchemy import Column, Integer, String, Boolean +from app.api.db.database import Base + +class User(Base): + __tablename__ = "users" + + id = Column(Integer, primary_key=True, index=True) + username = Column(String, unique=True, index=True) + email = Column(String, unique=True, index=True) + password = Column(String) + is_active = Column(Boolean, default=True) + is_admin = Column(Boolean, default=False) \ No newline at end of file diff --git a/app/api/v1/routes/__init__.py b/app/api/v1/routes/__init__.py index e69de29..0e93d68 100644 --- a/app/api/v1/routes/__init__.py +++ b/app/api/v1/routes/__init__.py @@ -0,0 +1,9 @@ +from fastapi import APIRouter + +from .teams import router as teams_router +from .user import router as user_router + +router = APIRouter() + +router.include_router(teams_router, prefix="/teams", tags=["teams"]) +router.include_router(user_router, prefix="/users", tags=["users"]) \ No newline at end of file diff --git a/app/api/v1/routes/and.py b/app/api/v1/routes/and.py new file mode 100644 index 0000000..01af1d9 --- /dev/null +++ b/app/api/v1/routes/and.py @@ -0,0 +1,28 @@ +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from app.api.v1.models.and import And +from app.api.v1.schemas.and import AndCreate, AndOut +from app.api.core.dependencies.dependencies import get_db + +router = APIRouter() + +@router.get("/ands", response_model=list[AndOut]) +def read_ands(db: Session = Depends(get_db)): + ands = db.query(And).all() + return ands + +@router.post("/ands", response_model=AndOut) +def create_and(and_in: AndCreate, db: Session = Depends(get_db)): + and_data = And(**and_in.dict()) + db.add(and_data) + db.commit() + db.refresh(and_data) + return and_data + +@router.get("/ands/{id}", response_model=AndOut) +def read_and(id: int, db: Session = Depends(get_db)): + and_data = db.query(And).get(id) + if not and_data: + raise HTTPException(status_code=404, detail="And not found") + return and_data \ No newline at end of file diff --git a/app/api/v1/routes/teams.py b/app/api/v1/routes/teams.py new file mode 100644 index 0000000..acbbf28 --- /dev/null +++ b/app/api/v1/routes/teams.py @@ -0,0 +1,28 @@ +from typing import List +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from app.api.v1.models.teams import Teams +from app.api.v1.schemas.teams import TeamsCreate, TeamsResponse +from app.api.core.dependencies.dependencies import get_db + +router = APIRouter() + +@router.get("/teamss", response_model=List[TeamsResponse]) +def read_teamss(db: Session = Depends(get_db)): + return db.query(Teams).all() + +@router.post("/teamss", response_model=TeamsResponse) +def create_teams(teams: TeamsCreate, db: Session = Depends(get_db)): + db_teams = Teams(**teams.dict()) + db.add(db_teams) + db.commit() + db.refresh(db_teams) + return db_teams + +@router.get("/teamss/{id}", response_model=TeamsResponse) +def read_teams(id: int, db: Session = Depends(get_db)): + db_teams = db.query(Teams).get(id) + if not db_teams: + raise HTTPException(status_code=404, detail="Teams not found") + return db_teams \ No newline at end of file diff --git a/app/api/v1/routes/user.py b/app/api/v1/routes/user.py new file mode 100644 index 0000000..85cb192 --- /dev/null +++ b/app/api/v1/routes/user.py @@ -0,0 +1,29 @@ +from typing import List +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from app.api.v1.models.user import User +from app.api.v1.schemas.user import UserCreate, UserResponse +from app.api.core.dependencies.dependencies import get_db + +router = APIRouter() + +@router.get("/users", response_model=List[UserResponse]) +def read_users(db: Session = Depends(get_db)): + users = db.query(User).all() + return users + +@router.post("/users", response_model=UserResponse) +def create_user(user: UserCreate, db: Session = Depends(get_db)): + db_user = User(**user.dict()) + db.add(db_user) + db.commit() + db.refresh(db_user) + return db_user + +@router.get("/users/{user_id}", response_model=UserResponse) +def read_user(user_id: int, db: Session = Depends(get_db)): + db_user = db.query(User).filter(User.id == user_id).first() + if not db_user: + raise HTTPException(status_code=404, detail="User not found") + return db_user \ No newline at end of file diff --git a/app/api/v1/schemas/and.py b/app/api/v1/schemas/and.py new file mode 100644 index 0000000..7ed1361 --- /dev/null +++ b/app/api/v1/schemas/and.py @@ -0,0 +1,13 @@ +from pydantic import BaseModel + +class AndBase(BaseModel): + pass + +class AndCreate(AndBase): + pass + +class And(AndBase): + id: int + + class Config: + orm_mode = True \ No newline at end of file diff --git a/app/api/v1/schemas/teams.py b/app/api/v1/schemas/teams.py new file mode 100644 index 0000000..db3f33f --- /dev/null +++ b/app/api/v1/schemas/teams.py @@ -0,0 +1,13 @@ +from pydantic import BaseModel + +class TeamsCreate(BaseModel): + name: str + description: str | None = None + +class Teams(BaseModel): + id: int + name: str + description: str | None = None + + class Config: + orm_mode = True \ No newline at end of file diff --git a/app/api/v1/schemas/user.py b/app/api/v1/schemas/user.py new file mode 100644 index 0000000..fae7cc5 --- /dev/null +++ b/app/api/v1/schemas/user.py @@ -0,0 +1,18 @@ +from typing import Optional +from pydantic import BaseModel, EmailStr + +class UserBase(BaseModel): + email: Optional[EmailStr] = None + is_active: Optional[bool] = True + is_superuser: bool = False + full_name: Optional[str] = None + +class UserCreate(UserBase): + email: EmailStr + password: str + +class User(UserBase): + id: int + + class Config: + orm_mode = True \ No newline at end of file diff --git a/main.py b/main.py index dca5c44..b4c74ab 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,12 @@ from fastapi import FastAPI +from app.api.db.database import engine, Base +from app.api.v1.routes import router as v1_router +from app.api.core.middleware.activity_tracker import ActivityTrackerMiddleware -app = FastAPI(title="Generated Backend") +app = FastAPI() -@app.get("/") -def read_root(): - return {"message": "Welcome to the generated backend"} \ No newline at end of file +Base.metadata.create_all(bind=engine) + +app.include_router(v1_router, prefix="/v1") + +app.add_middleware(ActivityTrackerMiddleware) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index a70e8ac..5dcc60d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1 @@ -fastapi -uvicorn -sqlalchemy -pydantic \ No newline at end of file +# No valid code generated