Update app.py

app.py

@@ -1677,18 +1677,15 @@ def add_data_ver_cur():
 DATABASE2 = 'data_gc.db'
 
 def verify_phone_number(phone_number):
-    if verifikation_start == "1":
-        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"
+    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 "false"
+        return "Error"
 
 def parse_csv_data(data):
     parsed_data = []
@@ -1699,73 +1696,37 @@ def parse_csv_data(data):
             parsed_data.append(dict(zip(headers, row)))
     return parsed_data
 
-def insert_data(data):
+def insert_data(data, verify_phone, add_curator):
     global current_curator_index
     conn = sqlite3.connect(DATABASE2)
     cursor = conn.cursor()
 
     for row in data:
-        # Проверка наличия ключей перед их использованием и предоставление значений по умолчанию
         name = row.get('Name', '')
-        
-        # Удаление ведущего плюсика из номера телефона, если он есть
         phone = row.get('Phone', '').lstrip('+')
-        
         email = row.get('Email', '')
-        vk_id = row.get('vk_id', '')
-        chat_id = row.get('chat_id', '')
-        ws_st = row.get('ws_st', '')
-        ws_stop = row.get('ws_stop', '')
-        web_st = row.get('web_st', 0)
-        fin_prog = row.get('fin_prog', 0)
-        b_city = row.get('b_city', '')
-        b_fin = row.get('b_fin', '')
-        b_ban = row.get('b_ban', '')
-        b_ign = row.get('b_ign', '')
-        b_baners = row.get('b_baners', '')
-        b_butt = row.get('b_butt', '')
-        b_mess = row.get('b_mess', '')
-        shop_st = row.get('shop_st', '')
-        curator = row.get('curator', '')
-        pr1 = row.get('pr1', '')
-        pr2 = row.get('pr2', '')
-        pr3 = row.get('pr3', '')
-        pr4 = row.get('pr4', '')
-        pr5 = row.get('pr5', '')
-        ad_url = row.get('ad_url', '')
-        key_pr = row.get('key_pr', '')
-        n_con = row.get('n_con', '')
-        canal = row.get('canal', '')
-        utm_source = row.get('utm_source', '')
-        utm_medium = row.get('utm_medium', '')
-        utm_campaign = row.get('utm_campaign', '')
-        utm_term = row.get('utm_term', '')
-        utm_content = row.get('utm_content', '')
-
-        # Взятие даты из столбца CSV-таблицы и удаление кавычек
         data_t = row.get('Date', '').strip('"')
 
-        # Проверка существования пользователя в базе данных по email или телефону
         cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
         user_exists = cursor.fetchone()
 
-        # Если пользователь существует, пропускаем вставку
         if user_exists:
             print(f"User with email {email} or phone {phone} already exists. Skipping insert.")
             continue
 
-        # Добавление куратора, если curator_on_off == "1"
-        if curator_on_off == "1":
+        if add_curator == "1":
             curator = curators[current_curator_index]
             current_curator_index = (current_curator_index + 1) % len(curators)
+        else:
+            curator = row.get('curator', '')
 
-        # Верификация номера телефона, если verifikation_start == "1"
-        if verifikation_start == "1":
+        if verify_phone == "1":
             ws_st = verify_phone_number(phone)
+        else:
+            ws_st = row.get('ws_st', '')
 
-        # Создание динамического SQL-запроса для вставки данных
         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', 'ad_url', 'key_pr', 'n_con', 'canal', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content']
-        values = [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, ad_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('ad_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)
@@ -1798,7 +1759,11 @@ def upload_csv():
         csv_input = csv.DictReader(stream)
         data = [row for row in csv_input]
         parsed_data = parse_csv_data(data)
-        insert_data(parsed_data)
+        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}")
+        insert_data(parsed_data, verify_phone, add_curator)
         return jsonify({"message": "Data uploaded and inserted successfully"})
     return jsonify({"error": "Invalid file format"}), 400
 
@@ -1807,7 +1772,6 @@ def upload_csv():
 
 
 
-
 @app.route('/upl_csv', methods=['GET'])
 def se_upl_csv():
     api_sys_control = request.args.get('api_sys')