send_user_bot_status moved to notification_field_callback

Studio-Yandex-Practicum · Sep 14, 2024 · 7281231 · 7281231
1 parent 5ced8fb
commit 7281231
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/bot/handlers/notifications.py b/src/bot/handlers/notifications.py
@@ -45,12 +45,10 @@ async def confirm_notification_settings(
     context: ContextTypes.DEFAULT_TYPE,
     ext_site_user: ExternalSiteUser,
     user_service: UserService = Provide[Container.bot_services_container.bot_user_service],
-    procharity_api: ProcharityAPI = Provide[Container.core_services_container.procharity_api],
 ):
     query = update.callback_query
     telegram_id = update.effective_user.id
     user = await user_service.get_by_telegram_id(telegram_id)
-    await procharity_api.send_user_bot_status(user)
     text = "Настройки уведомлений сохранены. "
     if user.is_volunteer:
         text += "Ты можешь изменить их в любой момент в меню бота или в личном кабинете"
@@ -71,11 +69,13 @@ async def notification_field_callback(
     ext_site_user: ExternalSiteUser,
     user_service: UserService = Provide[Container.bot_services_container.bot_user_service],
     site_user_service: ExternalSiteUserService = Provide[Container.bot_services_container.bot_site_user_service],
+    procharity_api: ProcharityAPI = Provide[Container.core_services_container.procharity_api],
 ):
     query = update.callback_query
     user = await user_service.get_by_telegram_id(update.effective_user.id)
     field = context.match.group(1)
     await site_user_service.toggle_has_mailing(user.external_user.external_id, field)
+    await procharity_api.send_user_bot_status(user)
     text = text_notification_settings_volunteer if user.is_volunteer else text_notification_settings_fund
     await query.message.edit_text(
         text=text,

diff --git a/src/bot/services/external_site_user.py b/src/bot/services/external_site_user.py
@@ -47,9 +47,7 @@ async def toggle_has_mailing(self, site_user_id: int, field: HasMailingField) ->
         site_user = await self._repository.get_by_external_id(site_user_id)
         match field:
             case HasMailingField.profile:
-                print(f"step1 {site_user.has_mailing_profile}")
                 await self._repository.set_has_mailing_profile(site_user, not site_user.has_mailing_profile)
-                print(f"after step1 {site_user.has_mailing_profile}")
             case HasMailingField.my_tasks:
                 await self._repository.set_has_mailing_my_tasks(site_user, not site_user.has_mailing_my_tasks)
             case HasMailingField.procharity: