Update app.py

app.py

@@ -265,10 +265,10 @@ 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, key_pr, n_con, canal, data_t,
-                b_fin, b_ban, b_ign, b_baners, b_butt, b_mess, shop_st
+                b_city, b_fin, b_ban, b_ign, b_baners, b_butt, b_mess, shop_st
             ) VALUES (
                 :Имя, :Телефон, :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, :n_con, :canal, :data_t,
-                :b_fin, :b_ban, :b_ign, :b_baners, :b_butt, :b_mess, :shop_st
+                :b_city, :b_fin, :b_ban, :b_ign, :b_baners, :b_butt, :b_mess, :shop_st
             )
             '''
             cursor.execute(query, user_data)
@@ -276,23 +276,9 @@ 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')
-    api_key_sys_control = request.args.get('api_sys')
 
-    if export_id is None:
-        return json.dumps({"error": "export_id is required"}), 400
 
-    if api_key_sys_control != api_key_sys:
-        return json.dumps({"error": "Unauthorized access"}), 403
 
-    try:
-        json_data = send_second_request(export_id)
-        load_data_from_json(json_data)
-        return "Data loaded successfully", 200
-    except Exception as e:
-        return json.dumps({"error": str(e)}), 500
 
 
 
@@ -308,6 +294,39 @@ def start():
 
 
 
+
+
+def send_second_request(export_id):
+    api_key = api_key_sys
+    api_url_template = 'https://school.riverpsy.com/pl/api/account/exports/{export_id}?key={api_key}'
+    api_url = api_url_template.format(export_id=export_id, api_key=api_key)
+    response = requests.get(api_url)
+    if response.status_code == 200:
+        return response.json()
+    else:
+        raise Exception(f"Failed to fetch data, status code: {response.status_code}")
+
+@app.route('/start', methods=['GET'])
+def start():
+    export_id = request.args.get('export_id')
+    api_key_sys_control = request.args.get('api_sys')
+
+    if export_id is None:
+        return jsonify({"error": "export_id is required"}), 400
+
+    if api_key_sys_control != api_key_sys:
+        return jsonify({"error": "Unauthorized access"}), 403
+
+    try:
+        json_data = send_second_request(export_id)
+        load_data_from_json(json_data)
+        return "Data loaded successfully", 200
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
+
+
     
 def randomize_message(template):
     def replace_placeholder(match):