Update app.py

app.py

@@ -78,11 +78,10 @@ def init_db(db_name):
             pr3 TEXT NOT NULL,
             pr4 TEXT NOT NULL,
             pr5 TEXT NOT NULL,
-            ad_url TEXT NOT NULLL,
+            ad_url TEXT NOT NULL,
             key_pr TEXT NOT NULL,
             canal TEXT NOT NULL,
             data_t TEXT NOT NULL
-            
         )
     ''')
     conn.commit()
@@ -98,6 +97,7 @@ for db in DATABASES:
 
 
 
+
 # Функция для выполнения HTTP запросов
 def fetch(url):
     try:
@@ -212,18 +212,6 @@ def export_user():
 
 
 
-def send_second_request(export_id):
-    if export_id is None:
-        raise Exception("export_id is None")
-    # Формирование URL для второго запроса
-    export_url_template = f"https://school.riverpsy.com/pl/api/account/exports/{export_id}?key=jqgxSMUnHWoKUcxF3MHSb77VUMk7HpFbO9SHnfVYwHtwqe1S81lqeKxrLPoSPWCephtYQuJwMFsCXEFmyByXdruDpDFgf6L7ij66K9ji0Kf2qAIwbTqEyJGB5MOHwyHl"
-    try:
-        response = requests.get(export_url_template)
-        response.raise_for_status()
-        return response.json()  # Возвращаем JSON-ответ сервера
-    except requests.RequestException as e:
-        raise Exception(f"Ошибка при выполнении запроса: {e}")
-
 def load_data_from_json(json_data):
     data = json_data
     items = data['info']['items']
@@ -250,6 +238,9 @@ def load_data_from_json(json_data):
         user_data.setdefault('pr4', '')
         user_data.setdefault('pr5', '')
         user_data.setdefault('ad_url', '')
+        user_data.setdefault('key_pr', '')
+        user_data.setdefault('canal', '')
+        user_data.setdefault('data_t', '')
 
         # Убираем плюс в начале телефона, если он присутствует
         if 'Телефон' in user_data and user_data['Телефон'].startswith('+'):
@@ -257,9 +248,9 @@ def load_data_from_json(json_data):
 
         query = '''
         INSERT INTO contacts (
-         name, phone, email, vk_id, chat_id, ws_statys, ws_stop, web_statys, fin_progress, shop_statys_full, pr1, pr2, pr3, pr4, pr5, ad_url, curator
+            name, phone, email, vk_id, chat_id, ws_statys, ws_stop, web_statys, fin_progress, shop_statys_full, pr1, pr2, pr3, pr4, pr5, ad_url, curator, key_pr, canal, data_t
         ) VALUES (
-         :Имя, :Телефон, :Email, :vk_id, :chat_id, :ws_st, :ws_stop, :web_st, :fin_prog, :shop_st, :pr1, :pr2, :pr3, :pr4, :pr5, :ad_url, :curator
+            :Имя, :Телефон, :Email, :vk_id, :chat_id, :ws_st, :ws_stop, :web_st, :fin_prog, :shop_st, :pr1, :pr2, :pr3, :pr4, :pr5, :ad_url, :curator, :key_pr, :canal, :data_t
         )
         '''
         cursor.execute(query, user_data)
@@ -267,6 +258,7 @@ def load_data_from_json(json_data):
     conn.commit()
     conn.close()
 
+
 @app.route('/start', methods=['GET'])
 def start():
     export_id = request.args.get('export_id')