diff --git a/alembic/versions/20250412_173617_d12715fe_update_fruit.py b/alembic/versions/20250412_173617_d12715fe_update_fruit.py new file mode 100644 index 0000000..0491a9b --- /dev/null +++ b/alembic/versions/20250412_173617_d12715fe_update_fruit.py @@ -0,0 +1,27 @@ +"""create fruits table +Revision ID: 0002 +Revises: 0001 +Create Date: 2024-01-20 10:00:00.000000 +""" +from alembic import op +import sqlalchemy as sa + +revision = '0002' +down_revision = '0001' +branch_labels = None +depends_on = None + +def upgrade(): + op.create_table( + 'fruits', + sa.Column('id', sa.String(36), primary_key=True), + sa.Column('name', sa.String(), nullable=False), + sa.Column('description', sa.String(), nullable=True), + sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()), + sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now()) + ) + op.create_index(op.f('ix_fruits_name'), 'fruits', ['name'], unique=True) + +def downgrade(): + op.drop_index(op.f('ix_fruits_name'), table_name='fruits') + op.drop_table('fruits') \ No newline at end of file diff --git a/endpoints/names.post.py b/endpoints/names.post.py index e69de29..ea5a512 100644 --- a/endpoints/names.post.py +++ b/endpoints/names.post.py @@ -0,0 +1,20 @@ +from fastapi import APIRouter, status +from typing import List + +router = APIRouter() + +@router.post("/names", status_code=status.HTTP_200_OK) +async def get_fruit_names() -> List[str]: + fruits = [ + "Apple", + "Banana", + "Orange", + "Mango", + "Pineapple", + "Grape", + "Strawberry", + "Blueberry", + "Peach", + "Pear" + ] + return fruits \ No newline at end of file diff --git a/helpers/fruit_helpers.py b/helpers/fruit_helpers.py new file mode 100644 index 0000000..f967108 --- /dev/null +++ b/helpers/fruit_helpers.py @@ -0,0 +1,138 @@ +from typing import List, Optional, Dict, Any +from uuid import UUID +from sqlalchemy.orm import Session +from sqlalchemy.exc import IntegrityError + +from models.fruit import Fruit +from schemas.fruit import FruitCreate, FruitUpdate + + +def get_all_fruits(db: Session) -> List[Fruit]: + """ + Retrieves all fruits from the database. + + Args: + db (Session): The database session. + + Returns: + List[Fruit]: A list of all fruit objects. + """ + return db.query(Fruit).all() + + +def get_fruit_by_id(db: Session, fruit_id: UUID) -> Optional[Fruit]: + """ + Retrieves a single fruit by its ID. + + Args: + db (Session): The database session. + fruit_id (UUID): The ID of the fruit to retrieve. + + Returns: + Optional[Fruit]: The fruit object if found, otherwise None. + """ + return db.query(Fruit).filter(Fruit.id == fruit_id).first() + + +def get_fruit_by_name(db: Session, name: str) -> Optional[Fruit]: + """ + Retrieves a single fruit by its name. + + Args: + db (Session): The database session. + name (str): The name of the fruit to retrieve. + + Returns: + Optional[Fruit]: The fruit object if found, otherwise None. + """ + return db.query(Fruit).filter(Fruit.name == name).first() + + +def create_fruit(db: Session, fruit_data: FruitCreate) -> Optional[Fruit]: + """ + Creates a new fruit in the database. + + Args: + db (Session): The database session. + fruit_data (FruitCreate): The data for the fruit to create. + + Returns: + Optional[Fruit]: The newly created fruit object, or None if creation fails. + """ + try: + db_fruit = Fruit(**fruit_data.dict()) + db.add(db_fruit) + db.commit() + db.refresh(db_fruit) + return db_fruit + except IntegrityError: + db.rollback() + return None + + +def update_fruit(db: Session, fruit_id: UUID, fruit_data: FruitUpdate) -> Optional[Fruit]: + """ + Updates an existing fruit in the database. + + Args: + db (Session): The database session. + fruit_id (UUID): The ID of the fruit to update. + fruit_data (FruitUpdate): The updated fruit data. + + Returns: + Optional[Fruit]: The updated fruit object if found and updated, otherwise None. + """ + db_fruit = get_fruit_by_id(db, fruit_id) + if not db_fruit: + return None + + update_data = fruit_data.dict(exclude_unset=True) + for field, value in update_data.items(): + setattr(db_fruit, field, value) + + try: + db.commit() + db.refresh(db_fruit) + return db_fruit + except IntegrityError: + db.rollback() + return None + + +def delete_fruit(db: Session, fruit_id: UUID) -> bool: + """ + Deletes a fruit from the database. + + Args: + db (Session): The database session. + fruit_id (UUID): The ID of the fruit to delete. + + Returns: + bool: True if the fruit was deleted, False if not found. + """ + db_fruit = get_fruit_by_id(db, fruit_id) + if not db_fruit: + return False + + db.delete(db_fruit) + db.commit() + return True + + +def validate_fruit_data(data: Dict[str, Any]) -> bool: + """ + Validates fruit input data dictionary. + + Args: + data (Dict[str, Any]): The input data to validate. + + Returns: + bool: True if the data is valid, False otherwise. + """ + if not data: + return False + if "name" not in data or not isinstance(data["name"], str) or len(data["name"]) < 1: + return False + if "description" in data and not isinstance(data["description"], (str, type(None))): + return False + return True \ No newline at end of file diff --git a/models/fruit.py b/models/fruit.py new file mode 100644 index 0000000..b1fa632 --- /dev/null +++ b/models/fruit.py @@ -0,0 +1,15 @@ +from sqlalchemy import Column, String, DateTime +from sqlalchemy.dialects.postgresql import UUID +from sqlalchemy.sql import func +from core.database import Base +import uuid + +class Fruit(Base): + __tablename__ = "fruits" + + id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) + name = Column(String, unique=True, nullable=False, index=True) + description = Column(String, nullable=True) + + created_at = Column(DateTime, default=func.now()) + updated_at = Column(DateTime, default=func.now(), onupdate=func.now()) \ No newline at end of file diff --git a/schemas/fruit.py b/schemas/fruit.py new file mode 100644 index 0000000..cbe46ea --- /dev/null +++ b/schemas/fruit.py @@ -0,0 +1,32 @@ +from pydantic import BaseModel, Field +from typing import Optional +from datetime import datetime +from uuid import UUID + +class FruitBase(BaseModel): + name: str = Field(..., description="Name of the fruit") + description: Optional[str] = Field(None, description="Description of the fruit") + +class FruitCreate(FruitBase): + pass + +class FruitUpdate(BaseModel): + name: Optional[str] = Field(None, description="Name of the fruit") + description: Optional[str] = Field(None, description="Description of the fruit") + +class FruitSchema(FruitBase): + id: UUID + created_at: datetime + updated_at: datetime + + class Config: + orm_mode = True + schema_extra = { + "example": { + "id": "f47ac10b-58cc-4372-a567-0e02b2c3d479", + "name": "Apple", + "description": "A sweet and crispy fruit", + "created_at": "2023-01-01T12:00:00", + "updated_at": "2023-01-01T12:00:00" + } + } \ No newline at end of file