Отедельные таблицы User и TelegramUser
This commit is contained in:
@@ -22,20 +22,20 @@ async def handle_subscription(
|
||||
log.warning('Placement not found for invite_link: %s', invite_link)
|
||||
return
|
||||
|
||||
subscriber = await self.database.get_user(telegram_id=user_telegram_id)
|
||||
subscriber = await self.database.get_telegram_user(telegram_id=user_telegram_id)
|
||||
if not subscriber:
|
||||
subscriber = domain.User(
|
||||
subscriber = domain.TelegramUser(
|
||||
telegram_id=user_telegram_id,
|
||||
username=username,
|
||||
first_name=first_name,
|
||||
last_name=last_name,
|
||||
)
|
||||
await self.database.create_user(subscriber)
|
||||
await self.database.create_telegram_user(subscriber)
|
||||
else:
|
||||
subscriber.username = username or subscriber.username
|
||||
subscriber.first_name = first_name or subscriber.first_name
|
||||
subscriber.last_name = last_name or subscriber.last_name
|
||||
await self.database.update_user(subscriber)
|
||||
await self.database.update_telegram_user(subscriber)
|
||||
|
||||
active_subscription = await self.database.get_active_subscription_by_subscriber_and_project(
|
||||
subscriber.id, placement.project_id
|
||||
@@ -74,7 +74,7 @@ async def handle_subscription(
|
||||
|
||||
subscription = domain.Subscription(
|
||||
placement_id=placement.id,
|
||||
subscriber_id=subscriber.id,
|
||||
telegram_user_id=subscriber.id,
|
||||
invite_link=invite_link,
|
||||
)
|
||||
await self.database.create_subscription(subscription)
|
||||
|
||||
@@ -12,7 +12,7 @@ log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def handle_unsubscription(self: 'Usecase', user_telegram_id: int, channel_telegram_id: int) -> None:
|
||||
subscriber = await self.database.get_user(telegram_id=user_telegram_id)
|
||||
subscriber = await self.database.get_telegram_user(telegram_id=user_telegram_id)
|
||||
if not subscriber:
|
||||
log.warning('Subscriber not found for telegram_id: %s', user_telegram_id)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user