Update app.py

app.py

@@ -1834,30 +1834,15 @@ def download_csv():
 
 
 
-DATABASE5 = 'data_gc.db'  # Убедитесь, что путь к базе данных правильный
-curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
-current_curator_index = 0
-
-# Функция для проверки номера телефона через API
-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'}
-    response = requests.post(full_url_ver, headers=headers, json=payload)
-    if response.status_code == 200:
-        response_body = response.json()
-        return response_body.get('existsWhatsapp', 'false')
-    else:
-        return "Error"
+DATABASE = 'data_gc.db'
 
 # Функция для очистки номера телефона
-def j_clean_phone_number(phone_number):
+def clean_phone_number(phone_number):
     return re.sub(r'\D', '', phone_number)
 
 # Функция для вставки данных в базу данных
-def j_insert_data(data, verify_phone, add_curator):
-    global current_curator_index
-    conn = sqlite3.connect(DATABASE5)  # Подключаемся к базе данных
+def insert_data(data):
+    conn = sqlite3.connect(DATABASE)  # Подключаемся к базе данных
     cursor = conn.cursor()
 
     for row in data:
@@ -1867,7 +1852,7 @@ def j_insert_data(data, verify_phone, add_curator):
         data_t = row.get('data_t', '').strip('"')
 
         # Очистка номера телефона
-        phone = j_clean_phone_number(phone)
+        phone = clean_phone_number(phone)
 
         cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
         user_exists = cursor.fetchone()
@@ -1876,19 +1861,8 @@ def j_insert_data(data, verify_phone, add_curator):
             print(f"User with email {email} or phone {phone} already exists. Skipping insert.")
             continue
 
-        if add_curator == "1":
-            curator = curators[current_curator_index]
-            current_curator_index = (current_curator_index + 1) % len(curators)
-        else:
-            curator = row.get('curator', '')
-
-        if verify_phone == "1":
-            ws_st = j_verify_phone_number(phone)
-        else:
-            ws_st = row.get('ws_st', '')
-
         columns = ['name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog', 'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'shop_st', 'curator', 'pr1', 'pr2', 'pr3', 'pr4', 'pr5', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content']
-        values = [name, phone, email, row.get('vk_id', ''), row.get('chat_id', ''), ws_st, row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('b_city', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('shop_st', ''), curator, row.get('pr1', ''), row.get('pr2', ''), row.get('pr3', ''), row.get('pr4', ''), row.get('pr5', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), data_t, row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', '')]
+        values = [name, phone, email, row.get('vk_id', ''), row.get('chat_id', ''), row.get('ws_st', ''), row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('b_city', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('shop_st', ''), row.get('curator', ''), row.get('pr1', ''), row.get('pr2', ''), row.get('pr3', ''), row.get('pr4', ''), row.get('pr5', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), data_t, row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', '')]
 
         placeholders = ', '.join(['?' for _ in columns])
         columns_str = ', '.join(columns)
@@ -1900,29 +1874,18 @@ 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:
             print(f"Error inserting row: {row}")
             print(f"Error message: {str(e)}")
             conn.rollback()
-            raise
+            continue
 
     conn.commit()
     conn.close()
 
-# Функция для отправки данных в Google Forms
-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}")
-
 # Маршрут для загрузки JSON-файла
 @app.route('/upload_json', methods=['POST'])
-def j_upload_json():
+def upload_json():
     if 'file' not in request.files:
         return jsonify({"error": "No file part"}), 400
     file = request.files['file']
@@ -1930,20 +1893,13 @@ def j_upload_json():
         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)
+        insert_data(data)
         return jsonify({"message": "Data uploaded and inserted successfully"})
     return jsonify({"error": "Invalid file format"}), 400
 
 # Маршрут для отображения формы загрузки JSON
 @app.route('/upl_json', methods=['GET'])
-def j_se_upl_json():
-    api_sys_control = request.args.get('api_sys')
-    if api_sys_control != api_key_sys:
-        return "EUR 22", 200
+def display_form():
     return render_template('upload_json.html')
 
 
@@ -1963,8 +1919,6 @@ def j_se_upl_json():
 
 
 
-
-
 
 
 @app.route('/gc_in', methods=['GET'])