diff --git a/app/models/nonsense.py b/app/models/nonsense.py index 8fcfad8..b031807 100644 --- a/app/models/nonsense.py +++ b/app/models/nonsense.py @@ -1,4 +1,5 @@ import uuid +from typing import Optional from fastapi import HTTPException, status from sqlalchemy import String, select @@ -13,8 +14,10 @@ class Nonsense(Base): __tablename__ = "nonsense" __table_args__ = ({"schema": "happy_hog"},) id: Mapped[uuid:UUID] = mapped_column(UUID(as_uuid=True), unique=True, default=uuid.uuid4, autoincrement=True) - name: Mapped[str] = mapped_column(String, nullable=False, primary_key=True, unique=True) - description: Mapped[str] = mapped_column(String, nullable=False) + name: Mapped[str] = mapped_column(String, primary_key=True, unique=True) + description: Mapped[Optional[str]] + # TODO: apply relation to other tables + @classmethod async def find(cls, db_session: AsyncSession, name: str): diff --git a/app/models/shakespeare.py b/app/models/shakespeare.py index a228fa6..a42dd9e 100644 --- a/app/models/shakespeare.py +++ b/app/models/shakespeare.py @@ -11,7 +11,7 @@ from sqlalchemy import ( select, ) from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import relationship, mapped_column, Mapped +from sqlalchemy.orm import relationship from app.models.base import Base diff --git a/app/models/stuff.py b/app/models/stuff.py index ec27086..b96f0b6 100644 --- a/app/models/stuff.py +++ b/app/models/stuff.py @@ -1,4 +1,5 @@ import uuid +from typing import Optional from fastapi import HTTPException, status from sqlalchemy import String, select @@ -13,8 +14,8 @@ class Stuff(Base): __tablename__ = "stuff" __table_args__ = ({"schema": "happy_hog"},) id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), unique=True, default=uuid.uuid4, autoincrement=True) - name: Mapped[str] = mapped_column(String, nullable=False, primary_key=True, unique=True) - description: Mapped[str] = mapped_column(String, nullable=False) + name: Mapped[str] = mapped_column(String, primary_key=True, unique=True) + description: Mapped[Optional[str]] @classmethod async def find(cls, db_session: AsyncSession, name: str):