API 0.5.1/ Minor changes and improvements

api/main.py

@@ -3,7 +3,7 @@ from api.routes import users, keys, coupons, servers, tariffs, gifts, referrals,
 
 app = FastAPI(
     title="SoloBot API (Alpha)",
-    version="0.5.0",
+    version="0.5.1",
     docs_url="/api/docs",
     redoc_url="/api/redoc",
     openapi_url="/api/openapi.json",

api/routes/base_crud.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from fastapi import APIRouter, Depends, HTTPException, Path, Query
+from fastapi import APIRouter, Body, Depends, HTTPException, Path, Query
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm.attributes import InstrumentedAttribute
@@ -104,7 +104,7 @@ def generate_crud_router(
 
         @router.post("/", response_model=schema_response)
         async def create(
-            payload: Any,
+            payload: Any = Body(...),
             admin: Admin = Depends(verify_admin_token),
             session: AsyncSession = Depends(get_session),
         ):
@@ -122,7 +122,7 @@ def generate_crud_router(
 
         @router.patch(f"/{{{parameter_name}}}", response_model=schema_response)
         async def update(
-            payload: Any,
+            payload: Any = Body(...),
             value: int | str = Path(..., alias=parameter_name),
             admin: Admin = Depends(verify_admin_token),
             session: AsyncSession = Depends(get_session),

api/schemas/coupons.py

@@ -11,15 +11,34 @@ class CouponBase(BaseModel):
     is_used: bool = False
     days: int | None = Field(default=None)
 
+    percent: int | None = Field(default=None)
+    max_discount_amount: int | None = Field(default=None)
+    min_order_amount: int | None = Field(default=None)
+
+    new_users_only: bool = False
+
     @model_validator(mode="after")
-    def check_exactly_one_of_amount_or_days(self) -> "CouponBase":
+    def check_coupon_type(self) -> "CouponBase":
         has_amount = self.amount not in (None, 0)
         has_days = self.days is not None
+        has_percent = self.percent is not None
+
+        provided = int(has_amount) + int(has_days) + int(has_percent)
+        if provided != 1:
+            raise ValueError("Coupon must have exactly one of: 'amount', 'days', 'percent'")
+
+        if has_days and self.days is not None and self.days <= 0:
+            raise ValueError("'days' must be > 0")
+
+        if has_percent and self.percent is not None and not (1 <= self.percent <= 100):
+            raise ValueError("'percent' must be between 1 and 100")
+
+        if has_percent:
+            if self.min_order_amount is not None and self.min_order_amount < 0:
+                raise ValueError("'min_order_amount' must be >= 0")
+            if self.max_discount_amount is not None and self.max_discount_amount < 0:
+                raise ValueError("'max_discount_amount' must be >= 0")
 
-        if has_amount and has_days:
-            raise ValueError("Coupon must have exactly one of: 'amount' or 'days'")
-        if not has_amount and not has_days:
-            raise ValueError("Coupon must have exactly one of: 'amount' or 'days'")
         return self
 
 
@@ -38,12 +57,34 @@ class CouponUpdate(BaseModel):
     is_used: bool | None = None
     days: int | None = Field(default=None)
 
+    percent: int | None = None
+    max_discount_amount: int | None = None
+    min_order_amount: int | None = None
+
+    new_users_only: bool | None = None
+
     @model_validator(mode="after")
-    def validate_amount_or_days(self) -> "CouponUpdate":
-        if self.amount is None and self.days is None:
-            return self
-        if self.amount is not None and self.days is not None:
-            raise ValueError("Specify only one of: 'amount' or 'days'")
+    def validate_coupon_update(self) -> "CouponUpdate":
+        has_amount = self.amount not in (None, 0)
+        has_days = self.days is not None
+        has_percent = self.percent is not None
+
+        provided = int(has_amount) + int(has_days) + int(has_percent)
+        if provided > 1:
+            raise ValueError("Specify only one of: 'amount', 'days', 'percent'")
+
+        if has_days and self.days is not None and self.days <= 0:
+            raise ValueError("'days' must be > 0")
+
+        if has_percent and self.percent is not None and not (1 <= self.percent <= 100):
+            raise ValueError("'percent' must be between 1 and 100")
+
+        if has_percent:
+            if self.min_order_amount is not None and self.min_order_amount < 0:
+                raise ValueError("'min_order_amount' must be >= 0")
+            if self.max_discount_amount is not None and self.max_discount_amount < 0:
+                raise ValueError("'max_discount_amount' must be >= 0")
+
         return self