Stabilize staff concurrency and premium emoji; enable verified Drone deployment

src/display/conduct_draw.py

@@ -36,7 +36,7 @@ async def conduct_lottery_draw(lottery_id: int):
         # Выводим список участников
         print("\n👥 Список участников:")
         for i, user in enumerate(participants, 1):
-            accounts = user.account_number.split(',') if user.account_number else ['Нет счетов']
+            accounts = [p.account_number for p in lottery.participations if p.user_id == user.id and p.account_number]
             print(f"  {i}. {user.first_name} (@{user.username}) - {len(accounts)} счет(ов)")
         
         # Проводим розыгрыш
@@ -48,14 +48,13 @@ async def conduct_lottery_draw(lottery_id: int):
             
             if winners:
                 print(f"\n🎉 Победители определены:")
-                for i, winner_data in enumerate(winners, 1):
+                for i, winner_data in winners.items():
                     user = winner_data['user']
                     prize = winner_data['prize']
                     print(f"  🏆 {i} место: {user.first_name} (@{user.username})")
                     print(f"     💎 Приз: {prize}")
                     
                 # Обновляем статус розыгрыша
-                await LotteryService.set_lottery_completed(session, lottery_id, True)
                 print(f"\n✅ Розыгрыш завершен и помечен как завершенный")
                 
             else:
@@ -99,4 +98,4 @@ async def main():
             print("❌ Неверный ID розыгрыша")
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    asyncio.run(main())

src/display/demo_admin.py

@@ -3,7 +3,7 @@
 """
 import asyncio
 from ..core.database import async_session_maker, init_db
-from ..core.services import UserService, LotteryService
+from ..core.services import UserService, LotteryService, ParticipationService
 from ..utils.admin_utils import AdminUtils, ReportGenerator
 
 
@@ -87,17 +87,17 @@ async def demo_admin_features():
         participants_added = 0
         for user in users:
             # В первый розыгрыш добавляем всех
-            if await LotteryService.add_participant(session, lottery1.id, user.id):
+            if await ParticipationService.add_participant(session, lottery1.id, user.id):
                 participants_added += 1
             
             # Во второй - половину
             if user.id % 2 == 0:
-                if await LotteryService.add_participant(session, lottery2.id, user.id):
+                if await ParticipationService.add_participant(session, lottery2.id, user.id):
                     participants_added += 1
             
             # В третий - треть
             if user.id % 3 == 0:
-                if await LotteryService.add_participant(session, lottery3.id, user.id):
+                if await ParticipationService.add_participant(session, lottery3.id, user.id):
                     participants_added += 1
         
         print(f"✅ Добавлено {participants_added} участий")
@@ -188,4 +188,4 @@ async def demo_admin_features():
 
 
 if __name__ == "__main__":
-    asyncio.run(demo_admin_features())
+    asyncio.run(demo_admin_features())

src/display/winner_display.py

@@ -33,15 +33,16 @@ def format_winner_display(user: User, lottery: Lottery, show_sensitive_data: boo
     
     elif display_type == 'account_number':
         # Отображаем номер клиентского счета
-        if not user.account_number:
+        account_number = getattr(user, "account_number", None)
+        if not account_number:
             return "Счёт не указан"
         
         if show_sensitive_data:
             # Для админов показываем полный номер
-            return f"Счёт: {user.account_number}"
+            return f"Счёт: {account_number}"
         else:
             # Для публичного показа маскируем номер
-            masked = mask_account_number(user.account_number, show_last_digits=4)
+            masked = mask_account_number(account_number, show_last_digits=4)
             return f"Счёт: {masked}"
     
     else:
@@ -113,4 +114,4 @@ def validate_display_type(display_type: str) -> bool:
     Returns:
         bool: True если тип корректен
     """
-    return display_type in ['username', 'chat_id', 'account_number']
+    return display_type in ['username', 'chat_id', 'account_number']