rate_limits and tiers endpoints, posts and user model updated, rate_limit schema updated

Author: igorbenav

src/app/api/v1/rate_limits.py

@@ -18,19 +18,19 @@
 
 router = fastapi.APIRouter(tags=["rate_limits"])
 
-@router.post("/tier/{tier_id}/rate_limit", dependencies=[Depends(get_current_superuser)], status_code=201)
+@router.post("/tier/{name}/rate_limit", dependencies=[Depends(get_current_superuser)], status_code=201)
 async def write_rate_limit(
     request: Request, 
-    tier_id: int,
+    name: str,
     rate_limit: RateLimitCreate, 
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_tier = await crud_tiers.exists(db=db, id=tier_id)
+    db_tier = await crud_tiers.get(db=db, name=name)
     if not db_tier:
         raise HTTPException(status_code=404, detail="Tier not found")
 
     rate_limit_internal_dict = rate_limit.model_dump()
-    rate_limit_internal_dict["tier_id"] = tier_id
+    rate_limit_internal_dict["tier_id"] = db_tier["id"]
 
     db_rate_limit = await crud_rate_limits.exists(db=db, name=rate_limit_internal_dict["name"])
     if db_rate_limit:
@@ -40,15 +40,15 @@ async def write_rate_limit(
     return await crud_rate_limits.create(db=db, object=rate_limit_internal)
 
 
-@router.get("/tier/{tier_id}/rate_limits", response_model=PaginatedListResponse[RateLimitRead])
+@router.get("/tier/{name}/rate_limits", response_model=PaginatedListResponse[RateLimitRead])
 async def read_rate_limits(
     request: Request,
-    tier_id: int,
+    name: str,
     db: Annotated[AsyncSession, Depends(async_get_db)],
     page: int = 1,
     items_per_page: int = 10
 ):
-    db_tier = await crud_tiers.exists(db=db, id=tier_id)
+    db_tier = await crud_tiers.get(db=db, name=name)
     if not db_tier:
         raise HTTPException(status_code=404, detail="Tier not found")
 
@@ -57,7 +57,7 @@ async def read_rate_limits(
         offset=compute_offset(page, items_per_page),
         limit=items_per_page,
         schema_to_select=RateLimitRead,
-        tier_id=tier_id
+        tier_id=db_tier["id"]
     )
 
     return paginated_response(
@@ -67,58 +67,73 @@ async def read_rate_limits(
     )
 
 
-@router.get("/tier/{tier_id}/rate_limit/{id}", response_model=RateLimitRead)
+@router.get("/tier/{tier_name}/rate_limit/{id}", response_model=RateLimitRead)
 async def read_rate_limit(
     request: Request,
-    tier_id: int,
-    id: int, 
+    tier_name: str,
+    id: int,
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_tier = await crud_tiers.exists(db=db, id=tier_id)
+    db_tier = await crud_tiers.get(db=db, name=tier_name)
     if not db_tier:
         raise HTTPException(status_code=404, detail="Tier not found")
 
-    db_rate_limit = await crud_rate_limits.get(db=db, schema_to_select=RateLimitRead, id=id)
+    db_rate_limit = await crud_rate_limits.get(
+        db=db, 
+        schema_to_select=RateLimitRead, 
+        tier_id=db_tier["id"],
+        id=id
+    )
     if db_rate_limit is None:
         raise HTTPException(status_code=404, detail="Rate Limit not found")
 
     return db_rate_limit
 
 
-@router.patch("/tier/{tier_id}/rate_limit/{id}", dependencies=[Depends(get_current_superuser)])
+@router.patch("/tier/{tier_name}/rate_limit/{path}", dependencies=[Depends(get_current_superuser)])
 async def patch_rate_limit(
     request: Request,
-    tier_id: int,
+    tier_name: str,
     id: int,
     values: RateLimitUpdate,
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_tier = await crud_tiers.exists(db=db, id=tier_id)
+    db_tier = await crud_tiers.get(db=db, name=tier_name)
     if not db_tier:
         raise HTTPException(status_code=404, detail="Tier not found")
 
-    db_rate_limit = await crud_rate_limits.get(db=db, schema_to_select=RateLimitRead, id=id)
+    db_rate_limit = await crud_rate_limits.get(
+        db=db, 
+        schema_to_select=RateLimitRead, 
+        tier_id=db_tier["id"],
+        id=id
+    )
     if db_rate_limit is None:
         raise HTTPException(status_code=404, detail="Rate Limit not found")
 
-    await crud_rate_limits.update(db=db, object=values, id=id)
+    await crud_rate_limits.update(db=db, object=values, id=db_rate_limit["id"])
     return {"message": "Rate Limit updated"}
 
 
-@router.delete("/tier/{tier_id}/rate_limit/{id}", dependencies=[Depends(get_current_superuser)])
+@router.delete("/tier/{tier_name}/rate_limit/{path}", dependencies=[Depends(get_current_superuser)])
 async def erase_rate_limit(
     request: Request,
-    tier_id: int,
-    id: int, 
+    tier_name: str,
+    id: int,
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_tier = await crud_tiers.exists(db=db, id=tier_id)
+    db_tier = await crud_tiers.get(db=db, name=tier_name)
     if not db_tier:
         raise HTTPException(status_code=404, detail="Tier not found")
 
-    db_rate_limit = await crud_rate_limits.get(db=db, schema_to_select=RateLimitRead, id=id)
+    db_rate_limit = await crud_rate_limits.get(
+        db=db, 
+        schema_to_select=RateLimitRead, 
+        tier_id=db_tier["id"],
+        id=id
+    )
     if db_rate_limit is None:
         raise HTTPException(status_code=404, detail="Rate Limit not found")
 
-    await crud_rate_limits.delete(db=db, db_row=db_rate_limit, id=id)
+    await crud_rate_limits.delete(db=db, db_row=db_rate_limit, id=db_rate_limit["id"])
     return {"message": "Rate Limit deleted"}

src/app/api/v1/tiers.py

@@ -53,43 +53,43 @@ async def read_tiers(
     )
 
 
-@router.get("/tier/{id}", response_model=TierRead)
+@router.get("/tier/{name}", response_model=TierRead)
 async def read_tier(
     request: Request,
-    id: int, 
+    name: str, 
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_tier = await crud_tiers.get(db=db, schema_to_select=TierRead, id=id)
+    db_tier = await crud_tiers.get(db=db, schema_to_select=TierRead, name=name)
     if db_tier is None:
         raise HTTPException(status_code=404, detail="Tier not found")
 
     return db_tier
 
 
-@router.patch("/tier/{id}", dependencies=[Depends(get_current_superuser)])
+@router.patch("/tier/{name}", dependencies=[Depends(get_current_superuser)])
 async def patch_tier(
     request: Request, 
     values: TierUpdate,
-    id: int,
+    name: str,
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_tier = await crud_tiers.get(db=db, schema_to_select=TierRead, id=id)
+    db_tier = await crud_tiers.get(db=db, schema_to_select=TierRead, name=name)
     if db_tier is None:
         raise HTTPException(status_code=404, detail="Tier not found")
 
-    await crud_tiers.update(db=db, object=values, id=id)
+    await crud_tiers.update(db=db, object=values, name=name)
     return {"message": "Tier updated"}
 
 
-@router.delete("/tier/{id}", dependencies=[Depends(get_current_superuser)])
+@router.delete("/tier/{name}", dependencies=[Depends(get_current_superuser)])
 async def erase_tier(
     request: Request,
-    id: int, 
+    name: str, 
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_tier = await crud_tiers.get(db=db, schema_to_select=TierRead, id=id)
+    db_tier = await crud_tiers.get(db=db, schema_to_select=TierRead, name=name)
     if db_tier is None:
         raise HTTPException(status_code=404, detail="Tier not found")
 
-    await crud_tiers.delete(db=db, db_row=db_tier, id=id)
+    await crud_tiers.delete(db=db, db_row=db_tier, name=name)
     return {"message": "Tier deleted"}

src/app/models/post.py

@@ -20,8 +20,6 @@ class Post(Base):
     )
     media_url: Mapped[str | None] = mapped_column(String, default=None)
 
-    user: Mapped["User"] = relationship(back_populates="posts", lazy="selectin", init=False)
-
     created_at: Mapped[datetime] = mapped_column(
         DateTime, default_factory=datetime.utcnow
     )

src/app/models/user.py

@@ -35,5 +35,3 @@ class User(Base):
 
     tier_id: Mapped[int | None] = mapped_column(ForeignKey("tier.id"), index=True, default=None)
 
-    posts: Mapped[List[Post]] = relationship(back_populates="user", cascade="all, delete", lazy="selectin", default_factory=list)
-    #tier: Mapped[Tier | None] = relationship(back_populates="users", lazy="selectin", default=None)

src/app/schemas/rate_limit.py

@@ -8,7 +8,7 @@
 class RateLimitBase(BaseModel):
     path: Annotated[
         str, 
-        Field(examples=["/users"])
+        Field(examples=["users"])
     ]
     limit: Annotated[
         int,
@@ -26,13 +26,14 @@ class RateLimit(TimestampModel, RateLimitBase):
         str | None,
         Field(
             default=None,
-            examples=["/users:5:60"]
+            examples=["users:5:60"]
         )
     ]
 
 
 class RateLimitRead(RateLimitBase):
     id: int
+    tier_id: int
     name: str
 
 
@@ -43,7 +44,7 @@ class RateLimitCreate(RateLimitBase):
         str | None,
         Field(
             default=None,
-            examples=["/users:5:60"]
+            examples=["api_v1_users:5:60"]
         )
     ]