updates

Author: ericsalesdeandrade

.python-version

@@ -0,0 +1 @@
+3.12.2

app/schemas.py

@@ -1,10 +1,13 @@
+from enum import Enum
 from datetime import datetime
 from typing import List
 from pydantic import BaseModel, Field
+from uuid import uuid4, UUID
 
 
 class UserBaseSchema(BaseModel):
- id: str | None = None
+
+ id: UUID | None = None
  first_name: str = Field(
  ..., description="The first name of the user", example="John"
  )
@@ -24,3 +27,13 @@ class ListUserResponse(BaseModel):
  status: str
  results: int
  users: List[UserBaseSchema]
+
+
+class Status(Enum):
+ Success = "Success"
+ Failed = "Failed"
+
+
+class CreateUserResponse(BaseModel):
+ Status: Status
+ User: UserBaseSchema

app/user.py

@@ -1,11 +1,45 @@
 import app.schemas as schemas, app.models as models
 from sqlalchemy.orm import Session
+from sqlalchemy.exc import IntegrityError
+from pydantic import ValidationError
 from fastapi import Depends, HTTPException, status, APIRouter
 from app.database import get_db
 
 router = APIRouter()
 
 
+@router.post(
+ "/", status_code=status.HTTP_201_CREATED, response_model=schemas.CreateUserResponse
+)
+def create_user(payload: schemas.UserBaseSchema, db: Session = Depends(get_db)):
+ try:
+ # Create a new user instance from the payload
+ new_user = models.User(**payload.dict())
+ db.add(new_user)
+ db.commit()
+ db.refresh(new_user)
+
+ except IntegrityError as e:
+ db.rollback()
+ # Log the error or handle it as needed
+ raise HTTPException(
+ status_code=status.HTTP_409_CONFLICT,
+ detail="A user with the given details already exists.",
+ ) from e
+ except Exception as e:
+ db.rollback()
+ # Handle other types of database errors
+ raise HTTPException(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ detail="An error occurred while creating the user.",
+ ) from e
+
+ # Convert the SQLAlchemy model instance to a Pydantic model
+ user_schema = schemas.UserBaseSchema.from_orm(new_user)
+ # Return the successful creation response
+ return schemas.CreateUserResponse(Status=schemas.Status.Success, User=user_schema)
+
+
 @router.get("/", status_code=status.HTTP_200_OK)
 def get_users(
  db: Session = Depends(get_db), limit: int = 10, page: int = 1, search: str = ""
@@ -22,15 +56,6 @@ def get_users(
  return {"Status": "Success", "Results": len(users), "Users": users}
 
 
-@router.post("/", status_code=status.HTTP_201_CREATED)
-def create_user(payload: schemas.UserBaseSchema, db: Session = Depends(get_db)):
- new_user = models.User(**payload.dict())
- db.add(new_user)
- db.commit()
- db.refresh(new_user)
- return {"Status": "Success", "User": new_user}
-
-
 @router.patch("/{userId}", status_code=status.HTTP_202_ACCEPTED)
 def update_user(
  userId: str, payload: schemas.UserBaseSchema, db: Session = Depends(get_db)

tests/conftest.py

@@ -11,18 +11,16 @@ def test_client():
 
 
 @pytest.fixture
-def user_id(scope="session"):
+def user_id():
  """Generate a random user id."""
  return str(uuid.uuid4())
 
 
 @pytest.fixture
-def user_payload(user_id):
+def user_payload():
  """Generate a user payload."""
  return {
- "id": user_id,
  "first_name": "PLACEHOLDER",
  "last_name": "PLACEHOLDER",
  "address": "PLACEHOLDER",
- "createdAt": "2024-04-30T16:39:23",
  }

tests/test_crud_api.py

@@ -7,18 +7,23 @@ def test_root(test_client):
 def test_create_user_success(test_client, user_payload, user_id):
  response = test_client.post("/api/users/", json=user_payload)
  assert response.status_code == 201
- assert response.json() == {
- "Status": "Success",
- "User": {
- "id": user_id,
- "activated": False,
- "createdAt": "2024-04-30T16:39:23",
- "first_name": "PLACEHOLDER",
- "last_name": "PLACEHOLDER",
- "address": "PLACEHOLDER",
- "updatedAt": None,
- },
- }
+ assert response.json()["Status"] == "Success"
+ assert response.json()["User"]["address"] == "PLACEHOLDER"
+ assert response.json()["User"]["first_name"] == "PLACEHOLDER"
+ assert response.json()["User"]["last_name"] == "PLACEHOLDER"
+
+ # assert response.json() == {
+ # "Status": "Success",
+ # "User": {
+ # "id": user_id,
+ # "activated": False,
+ # "createdAt": "2024-04-30T16:39:23",
+ # "first_name": "PLACEHOLDER",
+ # "last_name": "PLACEHOLDER",
+ # "address": "PLACEHOLDER",
+ # "updatedAt": None,
+ # },
+ # }
 
 
 # def test_create_user_fail(test_client, user_payload, user_id):