create brand crud operations and endpoints. Also, fix model errors

Author: RustamovAkrom

src/api/routers.py

@@ -1,13 +1,6 @@
 from fastapi import APIRouter
 
-from api.v1 import (  # noqa
-    admin,
-    auth,
-    category,
-    dashboard,
-    social_auth,
-    users,
-)
+from api.v1 import admin, auth, brand, category, dashboard, social_auth, users  # noqa
 from core.config import settings
 
 api_router = APIRouter(
@@ -22,5 +15,6 @@
 api_router.include_router(users.router, prefix="/users", tags=["Users"])
 api_router.include_router(admin.router, prefix="/admin", tags=["Admin"])
 api_router.include_router(category.router, prefix="/categories", tags=["Categories"])
+api_router.include_router(brand.router, prefix="/brands", tags=["Brands"])
 
 __all__ = ("api_router",)

src/api/v1/brand.py

@@ -0,0 +1,68 @@
+from fastapi import APIRouter, Depends, HTTPException, status
+
+from db.crud.brand import BrandCRUD
+from db.dependencies.auth import ADMIN_ROLE, SELLER_ROLE, require_roles
+from schemas.brand import (
+    BrandCreateScheme,
+    BrandOutScheme,
+    BrandUpdateScheme,
+)
+
+router = APIRouter(prefix="/brands", tags=["Brands"])
+
+
+@router.get("/", response_model=list[BrandOutScheme])
+async def get_brands(brands_crud: BrandCRUD = Depends(BrandCRUD)):
+    return await brands_crud.get_all()
+
+
+@router.get("/{slug}", response_model=BrandOutScheme)
+async def get_brand(slug: str, brands_crud: BrandCRUD = Depends(BrandCRUD)):
+    brand = await brands_crud.get_by_slug(slug)
+    if not brand:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Brand not found"
+        )
+    return brand
+
+
+@router.post(
+    "/",
+    response_model=BrandOutScheme,
+    status_code=status.HTTP_201_CREATED,
+    dependencies=[Depends(require_roles(ADMIN_ROLE, SELLER_ROLE))],
+)
+async def create_brand(
+    data: BrandCreateScheme, brands_crud: BrandCRUD = Depends(BrandCRUD)
+):
+    return await brands_crud.create(data)
+
+
+@router.put(
+    "/{slug}",
+    response_model=BrandOutScheme,
+    dependencies=[Depends(require_roles(ADMIN_ROLE, SELLER_ROLE))],
+)
+async def update_brand(
+    slug: str, data: BrandUpdateScheme, brands_crud: BrandCRUD = Depends(BrandCRUD)
+):
+    brand = await brands_crud.get_by_slug(slug)
+    if not brand:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Brand not found"
+        )
+    return await brands_crud.update(brand, data)
+
+
+@router.delete(
+    "/{slug}",
+    status_code=status.HTTP_204_NO_CONTENT,
+    dependencies=[Depends(require_roles(ADMIN_ROLE, SELLER_ROLE))],
+)
+async def delete_brand(slug: str, brands_crud: BrandCRUD = Depends(BrandCRUD)):
+    brand = await brands_crud.get_by_slug(slug)
+    if not brand:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Brand not found"
+        )
+    await brands_crud.delete(brand)

src/api/v1/category.py

@@ -1,8 +1,7 @@
 from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.exc import IntegrityError
 
 from db.crud.category import CategoryCRUD
-from db.dependencies.auth import require_admin
+from db.dependencies.auth import ADMIN_ROLE, SELLER_ROLE, require_roles
 from schemas.category import (
     CategoryCreateScheme,
     CategoryOutScheme,
@@ -12,7 +11,7 @@
 router = APIRouter(prefix="/categories", tags=["Categories"])
 
 
-@router.get("/", response_model=CategoryOutScheme)
+@router.get("/", response_model=list[CategoryOutScheme])
 async def get_categories(categoryies_crud: CategoryCRUD = Depends(CategoryCRUD)):
     return await categoryies_crud.get_all()
 
@@ -31,24 +30,18 @@ async def get_category(
     "/",
     response_model=CategoryOutScheme,
     status_code=status.HTTP_201_CREATED,
-    dependencies=[Depends(require_admin)],
+    dependencies=[Depends(require_roles(ADMIN_ROLE, SELLER_ROLE))],
 )
 async def create_category(
     data: CategoryCreateScheme, categoryies_crud: CategoryCRUD = Depends(CategoryCRUD)
 ):
-    try:
-        return await categoryies_crud.create(data)
-    except HTTPException:
-        raise
-    except IntegrityError:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Slug or name already exists",
-        )
+    return await categoryies_crud.create(data)
 
 
 @router.put(
-    "/{slug}", response_model=CategoryOutScheme, dependencies=[Depends(require_admin)]
+    "/{slug}",
+    response_model=CategoryOutScheme,
+    dependencies=[Depends(require_roles(ADMIN_ROLE, SELLER_ROLE))],
 )
 async def update_category(
     slug: str,
@@ -59,13 +52,13 @@ async def update_category(
     if not category:
         raise HTTPException(status_code=404, detail="Category not found")
 
-    raise await categoryies_crud.update(category, data)
+    return await categoryies_crud.update(category, data)
 
 
 @router.delete(
-    "/{category_id}",
+    "/{slug}",
     status_code=status.HTTP_204_NO_CONTENT,
-    dependencies=[Depends(require_admin)],
+    dependencies=[Depends(require_roles(ADMIN_ROLE, SELLER_ROLE))],
 )
 async def delete_category(
     slug: str, categoryies_crud: CategoryCRUD = Depends(CategoryCRUD)

src/db/crud/brand.py

@@ -0,0 +1,58 @@
+from typing import Optional, Sequence
+
+from fastapi import Depends, HTTPException
+from sqlalchemy import select
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from db.dependencies.sessions import get_db_session
+from db.models.brands import Brand
+from schemas.brand import BrandCreateScheme, BrandUpdateScheme
+
+
+class BrandCRUD:
+    def __init__(self, session: AsyncSession = Depends(get_db_session)):
+        self.session = session
+
+    async def get_all(self) -> Sequence[Brand]:
+        result = await self.session.execute(select(Brand))
+        return result.scalars().all()
+
+    async def get_by_id(self, brand_id: int) -> Optional[Brand]:
+        result = await self.session.execute(select(Brand).where(Brand.id == brand_id))
+        return result.scalars().first()
+
+    async def get_by_slug(self, brand_slug: int) -> Optional[Brand]:
+        result = await self.session.execute(
+            select(Brand).where(Brand.slug == brand_slug)
+        )
+        return result.scalars().first()
+
+    async def create(self, data: BrandCreateScheme) -> Brand:
+        new_brand = Brand(**data.dict())
+        self.session.add(new_brand)
+        try:
+            await self.session.commit()
+            await self.session.refresh(new_brand)
+            return new_brand
+        except IntegrityError:
+            await self.session.rollback()
+            raise HTTPException(status_code=400, detail="Brand already exists")
+
+    async def update(self, brand: Brand, data: BrandUpdateScheme) -> Brand:
+        for field, value in data.dict(exclude_unset=True).items():
+            setattr(brand, field, value)
+
+        try:
+            self.session.add(brand)
+            await self.session.commit()
+            await self.session.refresh(brand)
+        except IntegrityError:
+            await self.session.rollback()
+            raise HTTPException(
+                status_code=400, detail="Update would violate constraints"
+            )
+
+    async def delete(self, brand: Brand) -> None:
+        await self.session.delete(brand)
+        await self.session.commit()

src/db/dependencies/auth.py

@@ -85,7 +85,12 @@ async def role_checker(user: User = Depends(get_current_user)):
 
 
 # READY-TO-USE SHORTCUTS
-require_admin = require_roles(UserRole.admin.value)
-require_seller = require_roles(UserRole.seller.value)
-require_buyer = require_roles(UserRole.buyer.value)
-require_courier = require_roles(UserRole.courier.value)
+ADMIN_ROLE = UserRole.admin.value
+SELLER_ROLE = UserRole.seller.value
+BUYER_ROLE = UserRole.buyer.value
+COURIER_ROLE = UserRole.courier.value
+
+require_admin = require_roles(ADMIN_ROLE)
+require_seller = require_roles(SELLER_ROLE)
+require_buyer = require_roles(BUYER_ROLE)
+require_courier = require_roles(COURIER_ROLE)

…/db/migrations/versions/cfa02231b685_.py …/db/migrations/versions/3d224d0e6065_.pysrc/db/migrations/versions/cfa02231b685_.py renamed to src/db/migrations/versions/3d224d0e6065_.py src/db/migrations/versions/cfa02231b685_.py renamed to src/db/migrations/versions/3d224d0e6065_.py

@@ -1,8 +1,8 @@
 """empty message
 
-Revision ID: cfa02231b685
+Revision ID: 3d224d0e6065
 Revises:
-Create Date: 2025-12-07 16:47:32.384365
+Create Date: 2025-12-08 12:48:54.428901
 
 """
 
@@ -12,7 +12,7 @@
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = 'cfa02231b685'
+revision: str = '3d224d0e6065'
 down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -24,6 +24,7 @@ def upgrade() -> None:
     op.create_table(
         'brands',
         sa.Column('name', sa.String(length=100), nullable=False),
+        sa.Column('slug', sa.String(length=200), nullable=False),
         sa.Column('description', sa.String(length=255), nullable=True),
         sa.Column('logo_url', sa.String(length=255), nullable=True),
         sa.Column('website_url', sa.String(length=255), nullable=True),
@@ -43,6 +44,7 @@ def upgrade() -> None:
         ),
         sa.PrimaryKeyConstraint('id', name=op.f('pk_brands')),
         sa.UniqueConstraint('name', name=op.f('uq_brands_name')),
+        sa.UniqueConstraint('slug', name=op.f('uq_brands_slug')),
     )
     op.create_table(
         'categories',
@@ -149,7 +151,7 @@ def upgrade() -> None:
     )
     op.create_index(op.f('ix_carts_user_id'), 'carts', ['user_id'], unique=True)
     op.create_table(
-        'courier_profiles',
+        'couriers',
         sa.Column('user_id', sa.Integer(), nullable=False),
         sa.Column(
             'transport_type',
@@ -170,10 +172,10 @@ def upgrade() -> None:
             nullable=False,
         ),
         sa.ForeignKeyConstraint(
-            ['user_id'], ['users.id'], name=op.f('fk_courier_profiles_user_id_users')
+            ['user_id'], ['users.id'], name=op.f('fk_couriers_user_id_users')
         ),
-        sa.PrimaryKeyConstraint('id', name=op.f('pk_courier_profiles')),
-        sa.UniqueConstraint('user_id', name=op.f('uq_courier_profiles_user_id')),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_couriers')),
+        sa.UniqueConstraint('user_id', name=op.f('uq_couriers_user_id')),
     )
     op.create_table(
         'delivery_addresses',
@@ -275,7 +277,9 @@ def upgrade() -> None:
             name=op.f('fk_deliveries_address_id_delivery_addresses'),
         ),
         sa.ForeignKeyConstraint(
-            ['courier_id'], ['users.id'], name=op.f('fk_deliveries_courier_id_users')
+            ['courier_id'],
+            ['couriers.id'],
+            name=op.f('fk_deliveries_courier_id_couriers'),
         ),
         sa.ForeignKeyConstraint(
             ['order_id'], ['orders.id'], name=op.f('fk_deliveries_order_id_orders')
@@ -503,7 +507,7 @@ def downgrade() -> None:
     op.drop_index(op.f('ix_orders_user_id'), table_name='orders')
     op.drop_table('orders')
     op.drop_table('delivery_addresses')
-    op.drop_table('courier_profiles')
+    op.drop_table('couriers')
     op.drop_index(op.f('ix_carts_user_id'), table_name='carts')
     op.drop_table('carts')
     op.drop_index(op.f('ix_users_username'), table_name='users')

…/db/migrations/versions/12ac55d9de47_.py …tions/versions/81fafec580d5_something.pysrc/db/migrations/versions/12ac55d9de47_.py renamed to src/db/migrations/versions/81fafec580d5_something.py src/db/migrations/versions/12ac55d9de47_.py renamed to src/db/migrations/versions/81fafec580d5_something.py

@@ -1,16 +1,16 @@
-"""empty message
+"""something
 
-Revision ID: 12ac55d9de47
-Revises: cfa02231b685
-Create Date: 2025-12-07 16:50:13.657790
+Revision ID: 81fafec580d5
+Revises: 3d224d0e6065
+Create Date: 2025-12-08 13:04:04.688986
 
 """
 
 from typing import Sequence, Union
 
 # revision identifiers, used by Alembic.
-revision: str = '12ac55d9de47'
-down_revision: Union[str, Sequence[str], None] = 'cfa02231b685'
+revision: str = '81fafec580d5'
+down_revision: Union[str, Sequence[str], None] = '3d224d0e6065'
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 

src/db/models/brands.py

@@ -10,6 +10,7 @@ class Brand(BaseModel):
     __tablename__ = "brands"
 
     name: Mapped[str] = mapped_column(String(100), nullable=False, unique=True)
+    slug: Mapped[str] = mapped_column(String(200), nullable=False, unique=True)
     description: Mapped[str | None] = mapped_column(String(255), nullable=True)
     logo_url: Mapped[str | None] = mapped_column(String(255), nullable=True)
     website_url: Mapped[str | None] = mapped_column(String(255), nullable=True)

src/db/models/courier_profile.py src/db/models/couriers.pysrc/db/models/courier_profile.py renamed to src/db/models/couriers.py

@@ -15,8 +15,8 @@ class TransportType(str, enum.Enum):
     moto = "moto"
 
 
-class CourierProfile(BaseModel):
-    __tablename__ = "courier_profiles"
+class Courier(BaseModel):
+    __tablename__ = "couriers"
 
     user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"), unique=True, nullable=False
@@ -37,4 +37,4 @@ class CourierProfile(BaseModel):
     latitude: Mapped[float | None] = mapped_column(Float, nullable=True)
     longitude: Mapped[float | None] = mapped_column(Float, nullable=True)
 
-    user: Mapped["User"] = relationship("User", back_populates="courier_profile")  # type: ignore # noqa: F821
+    user: Mapped["User"] = relationship("User", back_populates="couriers")  # type: ignore # noqa: F821

src/db/models/delivery.py

@@ -22,7 +22,7 @@ class Delivery(BaseModel):
     __tablename__ = "deliveries"
 
     order_id: Mapped[int] = mapped_column(ForeignKey("orders.id"), unique=True)
-    courier_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
+    courier_id: Mapped[int] = mapped_column(ForeignKey("couriers.id"))
     address_id: Mapped[int] = mapped_column(
         ForeignKey("delivery_addresses.id"), nullable=False
     )
@@ -37,5 +37,5 @@ class Delivery(BaseModel):
     delivered_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
 
     order: Mapped["Order"] = relationship("Order", back_populates="delivery")  # type: ignore # noqa: F821
-    courier: Mapped["User"] = relationship("User")  # type: ignore # noqa: F821
+    courier: Mapped["Courier"] = relationship("Courier")  # type: ignore # noqa: F821
     address: Mapped["DeliveryAddress"] = relationship("DeliveryAddress")  # type: ignore # noqa: F821