feat: crud apis for users table

.dockerignore

@@ -1,3 +1,4 @@
 __pycache__
 storage
-data/*
+data/*
+venv

.gitignore

@@ -1,4 +1,5 @@
 __pycache__
 storage
 .env
-data/*
+data/*
+venv

.vscode/settings.json

@@ -1,3 +1,11 @@
 {
-    "jupyter.notebookFileRoot": "${workspaceFolder}"
+    "jupyter.notebookFileRoot": "${workspaceFolder}",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnSave": true,
+    },
+    "ms-python.black-formatter.args": [
+        "--line-length",
+        "119"
+    ]
 }

app/api/routers/user.py

@@ -0,0 +1,92 @@
+from typing import List
+from fastapi import APIRouter, Depends, HTTPException
+from sqlalchemy.orm import Session
+
+from app.engine.postgresdb import get_db
+from app.schema.index import UserCreate, User as UserSchema
+from app.model.user import User as UserModel
+
+
+user_router = r = APIRouter(prefix="/api/v1/users", tags=["users"])
+
+
+@r.post(
+    "/",
+    response_model=UserSchema,
+    responses={
+        200: {"description": "New user created"},
+        400: {"description": "Bad request"},
+        409: {"description": "Conflict"},
+        500: {"description": "Internal server error"},
+    },
+)
+async def create_user(user: UserCreate, db: Session = Depends(get_db)):
+    try:
+        db_user = (
+            db.query(UserModel).filter(UserModel.email == user.email).sort_by(UserModel.updated_at, desc=True).first()
+        )
+        if db_user and not db_user.is_deleted:
+            raise HTTPException(status_code=409, detail="User already exists")
+
+        db_user = UserModel(**user.dict())
+        db.add(db_user)
+        db.commit()
+        db.refresh(db_user)
+        return db_user
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@r.get(
+    "/{user_id}",
+    response_model=UserSchema,
+    responses={
+        200: {"description": "User found"},
+        404: {"description": "User not found"},
+        500: {"description": "Internal server error"},
+    },
+)
+async def get_user(user_id: int, db: Session = Depends(get_db)):
+    user = db.query(UserModel).get(user_id)
+    if not user:
+        raise HTTPException(status_code=404, detail="User not found")
+    return user
+
+
+@r.put(
+    "/{user_id}",
+    response_model=UserSchema,
+    responses={
+        200: {"description": "User updated"},
+        404: {"description": "User not found"},
+        500: {"description": "Internal server error"},
+    },
+)
+async def update_user(user_id: int, user_payload: UserCreate, db: Session = Depends(get_db)):
+    user = db.query(UserModel).get(user_id)
+    if not user:
+        raise HTTPException(status_code=404, detail="User not found")
+    user.name = user_payload.name
+    user.email = user_payload.email
+    db.commit()
+    db.refresh(user)
+    return user
+
+
+@r.delete(
+    "/{user_id}",
+    response_model=UserSchema,
+    responses={
+        200: {"description": "User deleted"},
+        404: {"description": "User not found"},
+        500: {"description": "Internal server error"},
+    },
+)
+async def delete_user(user_id: int, db: Session = Depends(get_db)):
+    user = db.query(UserModel).get(user_id)
+    if not user:
+        raise HTTPException(status_code=404, detail="User not found")
+    user.is_deleted = True
+    db.commit()
+    db.refresh(user)
+    return user

app/engine/postgresdb.py

@@ -2,14 +2,15 @@ import os
 import logging
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, declarative_base, Session
+from fastapi import Request
 
 from dotenv import load_dotenv
 
 load_dotenv()
 logger = logging.getLogger(__name__)
 
-SQLALCHEMY_DATABASE_URL = os.getenv('SQLALCHEMY_DATABASE_URL')
-assert SQLALCHEMY_DATABASE_URL, f'SQLALCHEMY_DATABASE_URL is not set'
+SQLALCHEMY_DATABASE_URL = os.getenv("SQLALCHEMY_DATABASE_URL")
+assert SQLALCHEMY_DATABASE_URL, f"SQLALCHEMY_DATABASE_URL is not set"
 logger.info(f"SQLALCHEMY_DATABASE_URL: {SQLALCHEMY_DATABASE_URL}")
 
 engine = create_engine(SQLALCHEMY_DATABASE_URL)
@@ -27,3 +28,8 @@ Base = declarative_base()
 #     finally:
 #         session.close()
 #         logger.info("Postgres Session closed successfully!")
+
+
+# Dependency
+def get_db(request: Request):
+    return request.state.db

app/model/user.py

@@ -1,13 +1,16 @@
-from sqlalchemy import Column, String
+from sqlalchemy import Column, String, Boolean
 from sqlalchemy.orm import relationship
 
 from app.model.base import BaseModel
 from app.engine.postgresdb import Base
 
+
 class User(Base, BaseModel):
     __tablename__ = "users"
 
     name = Column(String)
     email = Column(String)
+    hashed_password = Column(String)
+    is_deleted = Column(Boolean, default=False)
 
-    transactions = relationship("Transaction", back_populates="user")
+    transactions = relationship("Transaction", back_populates="user")

app/schema/base.py

@@ -8,4 +8,4 @@ class BaseModel(BaseModel):
     updated_at: datetime
 
     class Config:
-        orm_mode = True
+        from_attributes = True

app/schema/{transaction.py → index.py}

@@ -1,8 +1,8 @@
 from enum import Enum
 from datetime import datetime
+from typing import List
 
 from app.schema.base import BaseModel
-from app.schema.user import User
 
 
 class TransactionType(str, Enum):
@@ -10,6 +10,20 @@ class TransactionType(str, Enum):
     EXPENSE = "expense"
 
 
+class UserCreate(BaseModel):
+    name: str
+    email: str
+    hashed_password: str
+
+
+class User(BaseModel):
+    name: str
+    email: str
+    hashed_password: str
+    is_deleted: bool = False
+    transactions: "List[Transaction]"
+
+
 class Transaction(BaseModel):
     transaction_date: datetime
     category: str

app/schema/user.py

@@ -1,10 +0,0 @@
-from typing import List
-
-from app.schema.base import BaseModel
-from app.schema.transaction import Transaction
-
-
-class User(BaseModel):
-    name: str
-    email: str
-    transactions: "List[Transaction]"

main.py

@@ -10,6 +10,7 @@ from fastapi import FastAPI, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse
 from app.api.routers.chat import chat_router
+from app.api.routers.user import user_router
 from app.settings import init_settings
 from app.observability import init_observability
 from fastapi.staticfiles import StaticFiles
@@ -24,10 +25,12 @@ logger = logging.getLogger("uvicorn")
 # Create all tables in the database
 Base.metadata.create_all(bind=engine)
 
+
 def run_migrations():
     alembic_cfg = Config("alembic.ini")
     command.upgrade(alembic_cfg, "head")
 
+
 @asynccontextmanager
 async def lifespan(app_: FastAPI):
     logger.info("Starting up...")
@@ -36,8 +39,10 @@ async def lifespan(app_: FastAPI):
     yield
     logger.info("Shutting down...")
 
+
 app = FastAPI(lifespan=lifespan)
 
+
 @app.middleware("http")
 async def db_session_middleware(request: Request, call_next):
     response = Response("Internal server error", status_code=500)
@@ -49,10 +54,6 @@ async def db_session_middleware(request: Request, call_next):
     return response
 
 
-# Dependency
-def get_db(request: Request):
-    return request.state.db
-
 init_settings()
 init_observability()
 
@@ -77,6 +78,7 @@ if environment == "dev":
 if os.path.exists("data"):
     app.mount("/api/data", StaticFiles(directory="data"), name="static")
 app.include_router(chat_router, prefix="/api/chat")
+app.include_router(user_router)
 
 
 if __name__ == "__main__":

pyproject.toml

@@ -41,6 +41,9 @@ version = "^0.23.2"
 [tool.poetry.dependencies.llama-index-agent-openai]
 version = "0.2.2"
 
+[tool.black]
+line-length = 119
+
 [build-system]
 requires = [ "poetry-core" ]
 build-backend = "poetry.core.masonry.api"