From 15b702f8ce3b9a3cfa819fcf565d8aac4f8059e8 Mon Sep 17 00:00:00 2001
From: Vlad <curov2014@yandex.ru>
Date: Sat, 21 Sep 2024 00:56:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B4=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handlers/__pycache__/keys.cpython-310.pyc | Bin 7272 -> 7362 bytes
 handlers/keys.py                          |  27 +++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/handlers/__pycache__/keys.cpython-310.pyc b/handlers/__pycache__/keys.cpython-310.pyc
index 5b23c2fdb32b603107ef2bacfa09ff55692bc3ab..2099e2e5737ad00eb459de1dace594a9c00ca068 100644
GIT binary patch
delta 3464
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

delta 3431
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

diff --git a/handlers/keys.py b/handlers/keys.py
index f03a708e..0e1e46e8 100644
--- a/handlers/keys.py
+++ b/handlers/keys.py
@@ -18,7 +18,7 @@ async def process_callback_view_keys(callback_query: types.CallbackQuery):
         conn = await asyncpg.connect(DATABASE_URL)
         try:
             records = await conn.fetch('''
-                SELECT email FROM keys WHERE tg_id = $1
+                SELECT email, client_id FROM keys WHERE tg_id = $1
             ''', tg_id)
 
             if records:
@@ -26,7 +26,8 @@ async def process_callback_view_keys(callback_query: types.CallbackQuery):
                 buttons = []
                 for record in records:
                     key_name = record['email']  # Предполагается, что email - это название ключа
-                    button = types.InlineKeyboardButton(text=key_name, callback_data=f'view_key_{key_name}')
+                    client_id = record['client_id']
+                    button = types.InlineKeyboardButton(text=key_name, callback_data=f'view_key_{key_name}_{client_id}')
                     buttons.append([button])
 
                 # Создаем клавиатуру с кнопками
@@ -58,7 +59,7 @@ async def process_callback_view_keys(callback_query: types.CallbackQuery):
 @router.callback_query(lambda c: c.data.startswith('view_key_'))
 async def process_callback_view_key(callback_query: types.CallbackQuery):
     tg_id = callback_query.from_user.id
-    key_name = callback_query.data.split('_', 2)[2]  # Получаем имя ключа
+    key_name, client_id = callback_query.data.split('_')[2], callback_query.data.split('_')[3]  # Получаем имя ключа и client_id
 
     try:
         conn = await asyncpg.connect(DATABASE_URL)
@@ -66,7 +67,6 @@ async def process_callback_view_key(callback_query: types.CallbackQuery):
             record = await conn.fetchrow('''
                 SELECT k.key, k.expiry_time 
                 FROM keys k
-                JOIN connections c ON k.tg_id = c.tg_id
                 WHERE k.tg_id = $1 AND k.email = $2
             ''', tg_id, key_name)
 
@@ -83,7 +83,7 @@ async def process_callback_view_key(callback_query: types.CallbackQuery):
                                     f"{days_left_message}")
 
                 # Кнопки для продления и инструкций
-                renew_button = types.InlineKeyboardButton(text='Продлить ключ', callback_data='renew_key')
+                renew_button = types.InlineKeyboardButton(text='Продлить ключ', callback_data=f'renew_key_{client_id}')
                 instructions_button = types.InlineKeyboardButton(text='Инструкции по использованию', callback_data='instructions')
                 back_button = types.InlineKeyboardButton(text='Назад в профиль', callback_data='view_profile')
                 keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[renew_button], [instructions_button], [back_button]])
@@ -102,17 +102,17 @@ async def process_callback_view_key(callback_query: types.CallbackQuery):
 
 
 # Обработка запроса на продление ключа
-@router.callback_query(lambda c: c.data == 'renew_key')
+@router.callback_query(lambda c: c.data.startswith('renew_key_'))
 async def process_callback_renew_key(callback_query: types.CallbackQuery):
     tg_id = callback_query.from_user.id
+    client_id = callback_query.data.split('_')[2]  # Получаем client_id
 
     try:
         conn = await asyncpg.connect(DATABASE_URL)
         try:
-            record = await conn.fetchrow('SELECT client_id, email, expiry_time FROM keys WHERE tg_id = $1', tg_id)
+            record = await conn.fetchrow('SELECT email, expiry_time FROM keys WHERE client_id = $1', client_id)
 
             if record:
-                client_id = record['client_id']
                 email = record['email']
                 expiry_time = record['expiry_time']
                 current_time = datetime.utcnow().timestamp() * 1000
@@ -123,8 +123,8 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery):
 
                 # Создаем клавиатуру для выбора плана продления
                 keyboard = types.InlineKeyboardMarkup(inline_keyboard=[
-                    [types.InlineKeyboardButton(text='Продлить на 1 месяц (100 руб.)', callback_data='renew_1_month')],
-                    [types.InlineKeyboardButton(text='Продлить на 3 месяца (250 руб.)', callback_data='renew_3_months')],
+                    [types.InlineKeyboardButton(text='Продлить на 1 месяц (100 руб.)', callback_data=f'renew_1_month_{client_id}')],
+                    [types.InlineKeyboardButton(text='Продлить на 3 месяца (250 руб.)', callback_data=f'renew_3_months_{client_id}')],
                     [types.InlineKeyboardButton(text='Назад', callback_data='view_profile')]
                 ])
 
@@ -149,16 +149,17 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery):
 @router.callback_query(lambda c: c.data.startswith('renew_'))
 async def process_callback_renew_plan(callback_query: types.CallbackQuery):
     tg_id = callback_query.from_user.id
-    plan = callback_query.data.split('_')[1]  # '1' или '3'
+    plan, client_id = callback_query.data.split('_')[1], callback_query.data.split('_')[3]  # '1' или '3' и client_id
     days_to_extend = 30 * int(plan)  # 30 дней или 90 дней
+    print(plan, client_id, days_to_extend)
 
     try:
         conn = await asyncpg.connect(DATABASE_URL)
         try:
-            record = await conn.fetchrow('SELECT client_id, email, expiry_time FROM keys WHERE tg_id = $1', tg_id)
+            record = await conn.fetchrow('SELECT email, expiry_time FROM keys WHERE client_id = $1', client_id)
+            print(record)
 
             if record:
-                client_id = record['client_id']
                 email = record['email']
                 expiry_time = record['expiry_time']
                 current_time = datetime.utcnow().timestamp() * 1000