diff --git a/app/handlers/admin/users.py b/app/handlers/admin/users.py index 94d3f117..cfc29f0d 100644 --- a/app/handlers/admin/users.py +++ b/app/handlers/admin/users.py @@ -3628,9 +3628,6 @@ async def set_user_devices_button(callback: types.CallbackQuery, db_user: User, await callback.answer() - - - logger.info(f'Админ {db_user.telegram_id} {action_text} модем для пользователя {user_id}') await callback.answer() diff --git a/app/keyboards/inline.py b/app/keyboards/inline.py index 8ef7adae..0a64ecdc 100644 --- a/app/keyboards/inline.py +++ b/app/keyboards/inline.py @@ -2620,7 +2620,6 @@ def get_updated_subscription_settings_keyboard( ] ) - keyboard.append( [ InlineKeyboardButton( diff --git a/app/services/user_service.py b/app/services/user_service.py index e2535417..77d77ee9 100644 --- a/app/services/user_service.py +++ b/app/services/user_service.py @@ -1105,7 +1105,9 @@ class UserService: try: if user.subscription: logger.info(f'🔄 Удаляем подписку {user.subscription.id}') - await db.execute(delete(SubscriptionServer).where(SubscriptionServer.subscription_id == user.subscription.id)) + await db.execute( + delete(SubscriptionServer).where(SubscriptionServer.subscription_id == user.subscription.id) + ) await db.execute(delete(Subscription).where(Subscription.user_id == user_id)) await db.flush() except Exception as e: diff --git a/app/utils/decorators.py b/app/utils/decorators.py index 646b0b75..b84292a6 100644 --- a/app/utils/decorators.py +++ b/app/utils/decorators.py @@ -173,6 +173,3 @@ def rate_limit(rate: float = 1.0, key: str = None): return wrapper return decorator - - - diff --git a/app/utils/pricing_utils.py b/app/utils/pricing_utils.py index f5175358..6ac48aea 100644 --- a/app/utils/pricing_utils.py +++ b/app/utils/pricing_utils.py @@ -248,10 +248,7 @@ async def compute_simple_subscription_price( ) total_before_discount = ( - base_price_original - + traffic_price_original - + devices_price_original - + servers_price_original + base_price_original + traffic_price_original + devices_price_original + servers_price_original ) total_discount = base_discount + traffic_discount + devices_discount + servers_discount_total diff --git a/app/webapi/routes/subscriptions.py b/app/webapi/routes/subscriptions.py index d694a25e..d22fffa7 100644 --- a/app/webapi/routes/subscriptions.py +++ b/app/webapi/routes/subscriptions.py @@ -321,5 +321,3 @@ async def delete_subscription( subscription = await _get_subscription(db, subscription.id) return _serialize_subscription(subscription) - - diff --git a/app/webapi/schemas/subscriptions.py b/app/webapi/schemas/subscriptions.py index aea035c4..6b05c4ac 100644 --- a/app/webapi/schemas/subscriptions.py +++ b/app/webapi/schemas/subscriptions.py @@ -50,5 +50,3 @@ class SubscriptionDevicesRequest(BaseModel): class SubscriptionSquadRequest(BaseModel): squad_uuid: str - -