Update app.py

app.py

@@ -1840,7 +1840,7 @@ current_curator_index = 0
 
 
 
-def J_verify_phone_number(phone_number):
+def j_verify_phone_number(phone_number):
     full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
     payload = {"phoneNumber": phone_number}
     headers = {'Content-Type': 'application/json'}
@@ -1851,12 +1851,13 @@ def J_verify_phone_number(phone_number):
     else:
         return "Error"
 
-def J_clean_phone_number(phone_number):
+def j_clean_phone_number(phone_number):
+    # Удаляем все символы, кроме цифр
     return re.sub(r'\D', '', phone_number)
 
-def J_insert_data(data, verify_phone, add_curator):
+def j_insert_data(data, verify_phone, add_curator):
     global current_curator_index
-    conn = sqlite3.connect(DATABASES5)
+    conn = sqlite3.connect(DATABASE5)  # Обновлено на DATABASE5
     cursor = conn.cursor()
 
     for row in data:
@@ -1865,7 +1866,8 @@ def J_insert_data(data, verify_phone, add_curator):
         email = row.get('email', '')
         data_t = row.get('data_t', '').strip('"')
 
-        phone = J_clean_phone_number(phone)
+        # Очистка номера телефона
+        phone = j_clean_phone_number(phone)
 
         cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
         user_exists = cursor.fetchone()
@@ -1881,7 +1883,7 @@ def J_insert_data(data, verify_phone, add_curator):
             curator = row.get('curator', '')
 
         if verify_phone == "1":
-            ws_st = J_verify_phone_number(phone)
+            ws_st = j_verify_phone_number(phone)
         else:
             ws_st = row.get('ws_st', '')
 
@@ -1898,6 +1900,7 @@ def J_insert_data(data, verify_phone, add_curator):
 
         try:
             cursor.execute(query, values)
+            # Отправка данных в Google Forms
             user_data = dict(zip(columns, values))
             send_to_google_forms(user_data, gog_url)
         except Exception as e:
@@ -1909,23 +1912,36 @@ def J_insert_data(data, verify_phone, add_curator):
     conn.commit()
     conn.close()
 
+def send_to_google_forms(user_data, gog_url):
+    headers = {'Content-Type': 'application/json'}
+    response = requests.post(gog_url, headers=headers, json=user_data)
+    if response.status_code != 200:
+        print(f"Failed to send data to Google Forms. Status code: {response.status_code}")
+        print(f"Response: {response.text}")
+
 @app.route('/upload_json', methods=['POST'])
-def J_upload_json():
-    data = request.get_json()
-    if not data:
-        return jsonify({"error": "Invalid JSON format"}), 400
-    verify_phone = request.form.get('verify_phone', '0')
-    add_curator = request.form.get('add_curator', '0')
-    print(f"JSON Data: {json.dumps(data, ensure_ascii=False, indent=4)}")
-    J_insert_data(data, verify_phone, add_curator)
-    return jsonify({"message": "Data uploaded and inserted successfully"})
+def j_upload_json():
+    if 'file' not in request.files:
+        return jsonify({"error": "No file part"}), 400
+    file = request.files['file']
+    if file.filename == '':
+        return jsonify({"error": "No selected file"}), 400
+    if file and file.filename.endswith('.json'):
+        data = json.load(file)
+        verify_phone = request.form.get('verify_phone', '0')
+        add_curator = request.form.get('add_curator', '0')
+        print(f"Verify Phone: {verify_phone}")
+        print(f"Add Curator: {add_curator}")
+        j_insert_data(data, verify_phone, add_curator)
+        return jsonify({"message": "Data uploaded and inserted successfully"})
+    return jsonify({"error": "Invalid file format"}), 400
 
 @app.route('/upl_json', methods=['GET'])
-def J_upl_json():
+def j_se_upl_json():
     api_sys_control = request.args.get('api_sys')
     if api_sys_control != api_key_sys:
         return "EUR 22", 200
-    return render_template('upl_json.html')
+    return render_template('upload_json.html')