From bb2681bff88eec0081056ce5639c6efdefbda0fc Mon Sep 17 00:00:00 2001 From: DIKER0K Date: Sat, 20 Dec 2025 19:56:13 +0500 Subject: [PATCH] fix promo max_uses --- app/api/promo.py | 53 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/app/api/promo.py b/app/api/promo.py index 95fe0c9..6b7c41d 100644 --- a/app/api/promo.py +++ b/app/api/promo.py @@ -42,35 +42,72 @@ async def admin_create_promo( clientToken: str = Form(...), code: str = Form(...), reward_coins: int = Form(...), - max_uses: int | None = Form(None), + max_uses: str | None = Form( + default=None, + description="Сколько всего раз можно активировать промокод. Пусто = бесконечно. 1 = одноразовый." + ), is_active: bool = Form(True), ): await validate_admin(accessToken, clientToken) + + # normalize max_uses + if max_uses is None or max_uses.strip() == "": + max_uses_int = None + else: + try: + max_uses_int = int(max_uses) + except ValueError: + raise HTTPException(status_code=400, detail="max_uses must be an integer") + if max_uses_int <= 0: + # 0 или отрицательные считаем как "бесконечно" + max_uses_int = None + payload = PromoCreate( code=code, reward_coins=reward_coins, - max_uses=max_uses, + max_uses=max_uses_int, is_active=is_active, ) return await promo_service.create(payload) + @router.put("/admin/promo/{promo_id}", response_model=dict) async def admin_update_promo( promo_id: str, accessToken: str = Form(...), clientToken: str = Form(...), reward_coins: int | None = Form(None), - max_uses: int | None = Form(None), + max_uses: str | None = Form( + default=None, + description="Пусто = не менять. '0' = бесконечно. '1' = одноразовый." + ), is_active: bool | None = Form(None), ): await validate_admin(accessToken, clientToken) - payload = PromoUpdate( - reward_coins=reward_coins, - max_uses=max_uses, - is_active=is_active - ) + + max_uses_int = None + max_uses_provided = max_uses is not None # отличаем “не прислали” от “прислали пусто/0” + + if max_uses_provided: + if max_uses.strip() == "": + # пусто -> бесконечно + max_uses_int = None + else: + try: + max_uses_int = int(max_uses) + except ValueError: + raise HTTPException(status_code=400, detail="max_uses must be an integer") + if max_uses_int <= 0: + max_uses_int = None + + data = {"reward_coins": reward_coins, "is_active": is_active} + if max_uses_provided: + data["max_uses"] = max_uses_int + + payload = PromoUpdate(**{k: v for k, v in data.items() if v is not None or k == "max_uses" and max_uses_provided}) return await promo_service.update(promo_id, payload) + @router.delete("/admin/promo/{promo_id}") async def admin_delete_promo( promo_id: str,