Compare commits

..
2 Commits
Author SHA1 Message Date
Ian Roddis 90cae15551 Allowing manufacturer urls to be null 2026-09-04 23:07:35 -03:00
Ian Roddis 16ba09f073 Fixing serialization for manufacturers in schema 2026-09-04 22:57:48 -03:00
5 changed files with 61 additions and 6 deletions

No files matched your search

@@ -0,0 +1,37 @@
"""manufacturers_url_nullable
Revision ID: 0fec09fb6ae6
Revises: 9a1c2f6e0b3d
Create Date: 2026-09-04 23:05:18.990806
"""
from collections.abc import Sequence
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision: str = "0fec09fb6ae6"
down_revision: str | None = "9a1c2f6e0b3d"
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
def upgrade() -> None:
with op.batch_alter_table("manufacturers", schema=None) as batch_op:
batch_op.alter_column(
"url",
existing_type=sa.String(),
nullable=True,
)
def downgrade() -> None:
op.execute("UPDATE manufacturers SET url = '' WHERE url IS NULL")
with op.batch_alter_table("manufacturers", schema=None) as batch_op:
batch_op.alter_column(
"url",
existing_type=sa.String(),
nullable=False,
)
+1 -1
View File
@@ -26,7 +26,7 @@ async def create(
db: AsyncSession,
*,
name: str,
url: str,
url: str | None = None,
logo_url: str | None = None,
) -> Manufacturer:
m = Manufacturer(name=name, url=url, logo_url=logo_url)
+1 -1
View File
@@ -8,5 +8,5 @@ class Manufacturer(Base):
id: Mapped[int] = mapped_column(primary_key=True)
name: Mapped[str] = mapped_column(nullable=False)
url: Mapped[str] = mapped_column(nullable=True)
url: Mapped[str | None] = mapped_column(nullable=True)
logo_url: Mapped[str | None] = mapped_column(nullable=True, default=None)
+16 -2
View File
@@ -1,11 +1,21 @@
from pydantic import BaseModel, ConfigDict, HttpUrl
from pydantic import BaseModel, ConfigDict, HttpUrl, field_validator
def _blank_to_none(value: str | None) -> str | None:
if isinstance(value, str) and not value.strip():
return None
return value
class ManufacturerBase(BaseModel):
name: str
url: HttpUrl
url: HttpUrl | None = None
logo_url: HttpUrl | None = None
_normalize_url = field_validator("url", "logo_url", mode="before")(
_blank_to_none
)
class ManufacturerCreate(ManufacturerBase):
pass
@@ -16,6 +26,10 @@ class ManufacturerUpdate(BaseModel):
url: HttpUrl | None = None
logo_url: HttpUrl | None = None
_normalize_url = field_validator("url", "logo_url", mode="before")(
_blank_to_none
)
class ManufacturerRead(ManufacturerBase):
model_config = ConfigDict(from_attributes=True)
+6 -2
View File
@@ -728,7 +728,7 @@ async def create_manufacturer(
created = await manufacturer_crud.create(
db,
name=name,
url=url,
url=url.strip() or None,
logo_url=logo_url.strip() or None,
)
await audit_crud.log(
@@ -789,7 +789,11 @@ async def update_manufacturer(
m = await manufacturer_crud.get(db, manufacturer_id)
if m is None:
raise HTTPException(status_code=404, detail="Manufacturer not found")
changes = {"name": name, "url": url, "logo_url": logo_url.strip() or None}
changes = {
"name": name,
"url": url.strip() or None,
"logo_url": logo_url.strip() or None,
}
await manufacturer_crud.update(db, m, changes)
await audit_crud.log(
db,