refactoring: polished some files, .env.example update
This commit is contained in:
@@ -7,6 +7,7 @@ from remnawave import RemnawaveSDK
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from bot.texts import NO_SUBSCRIPTION, NOTHING_PLACEHOLDER, SUBSCRIPTION_INFORMATION
|
||||
from config import settings
|
||||
from db.models.users import User
|
||||
from misc import utils
|
||||
from repositories import UserRepository
|
||||
@@ -14,7 +15,6 @@ from repositories.subscriptions import SubscriptionRepository
|
||||
from schemas.subscriptions import InternalSquads, SubscriptionPlan, SubscriptionStatus
|
||||
from schemas.users import NewUserDTO
|
||||
from services import rw
|
||||
from config import settings
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -168,6 +168,9 @@ class UserService:
|
||||
squad_uuids=squads,
|
||||
)
|
||||
|
||||
if not rw_user:
|
||||
raise Exception("RW User was NOT created, manual intervention required.")
|
||||
|
||||
db_subscription = await self.subscription_repository.get_subscription_by_user_id(
|
||||
session, user.id
|
||||
)
|
||||
@@ -222,11 +225,7 @@ class UserService:
|
||||
remaining_days = max(0, (rw_user.expire_at - datetime.datetime.now(datetime.UTC)).days)
|
||||
return math.floor(db_sub.plan_price_paid * remaining_days / db_sub.duration_days)
|
||||
|
||||
async def launch_promotion(
|
||||
self,
|
||||
session: AsyncSession,
|
||||
promo_msg: Message
|
||||
) -> int:
|
||||
async def launch_promotion(self, session: AsyncSession, promo_msg: Message) -> int:
|
||||
users = await self.user_repository.get_users(session)
|
||||
|
||||
sent = 0
|
||||
@@ -238,5 +237,5 @@ class UserService:
|
||||
sent += 1
|
||||
except Exception:
|
||||
logger.exception("caught an exception while launching promo, skipping user...")
|
||||
|
||||
return sent
|
||||
|
||||
return sent
|
||||
|
||||
Reference in New Issue
Block a user