Update app.py

app.py

@@ -1573,7 +1573,8 @@ def verify_phone_number(phone_number):
     else:
         return "Error"
 
-
+def clean_phone_number(phone):
+    return ''.join(filter(str.isdigit, phone))
 
 
 def parse_csv_data(data):
@@ -1590,59 +1591,58 @@ def parse_csv_data(data):
 
 
 
+def clean_phone_number(phone):
+    return ''.join(filter(str.isdigit, phone))
+
 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', '')
-        data_t = row.get('Date', '').strip('"')
+    with sqlite3.connect(DATABASE2) as conn:
+        cursor = conn.cursor()
 
-        cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
-        user_exists = cursor.fetchone()
+        for row in data:
+            name = row.get('Name', '')
+            phone = clean_phone_number(row.get('Phone', ''))
+            email = row.get('Email', '')
+            data_t = row.get('Date', '').strip('"')
 
-        if user_exists:
-            print(f"User with email {email} or phone {phone} already exists. Updating data.")
-        else:
-            print(f"User with email {email} or phone {phone} does not exist. Inserting new data.")
+            cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
+            user_exists = cursor.fetchone()
 
-        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":
-            verification_result = verify_phone_number(phone)
-            print(f"Verification result for phone {phone}: {verification_result}")  # Вывод результата верификации в консоль
-            if verification_result == "True":
-                ws_st = 1
-            elif verification_result == "False":
-                ws_st = 0
+            if user_exists:
+                print(f"User with email {email} or phone {phone} already exists. Updating data.")
             else:
-                ws_st = 0  # Или другое значение по умолчанию
-        else:
-            ws_st = row.get('ws_st', '')
+                print(f"User with email {email} or phone {phone} does not exist. Inserting new data.")
 
+            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":
+                verification_result = verify_phone_number(phone)
+                print(f"Verification result for phone {phone}: {verification_result}")  # Вывод результата верификации в консоль
+                if verification_result == "True":
+                    ws_st = 1
+                else:
+                    ws_st = 0
+            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_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc']
-        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', ''), row.get('data_on', ''), row.get('data_t', ''), row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', ''), row.get('gcpc', '')]
+            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_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc']
+            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', ''), row.get('data_on', ''), row.get('data_t', ''), row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', ''), row.get('gcpc', '')]
 
-        placeholders = ', '.join(['?' for _ in columns])
-        columns_str = ', '.join(columns)
+            placeholders = ', '.join(['?' for _ in columns])
+            columns_str = ', '.join(columns)
 
-        if user_exists:
-            update_query = f"UPDATE contacts SET {', '.join([f'{col} = ?' for col in columns])} WHERE email = ? OR phone = ?"
-            cursor.execute(update_query, values + [email, phone])
-        else:
-            insert_query = f"INSERT INTO contacts ({columns_str}) VALUES ({placeholders})"
-            cursor.execute(insert_query, values)
+            if user_exists:
+                update_query = f"UPDATE contacts SET {', '.join([f'{col} = ?' for col in columns])} WHERE email = ? OR phone = ?"
+                cursor.execute(update_query, values + [email, phone])
+            else:
+                insert_query = f"INSERT INTO contacts ({columns_str}) VALUES ({placeholders})"
+                cursor.execute(insert_query, values)
 
-    conn.commit()
-    conn.close()
+        conn.commit()
 
 @app.route('/upload_csv', methods=['POST'])
 def upload_csv():