Update app.py

app.py

@@ -1559,6 +1559,8 @@ def add_data_ver_cur():
 
 
 
+DATABASE2 = 'data_gc.db'
+
 
 DATABASE2 = 'data_gc.db'
 
@@ -1573,10 +1575,6 @@ 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):
     parsed_data = []
     for item in data:
@@ -1586,74 +1584,56 @@ def parse_csv_data(data):
             parsed_data.append(dict(zip(headers, row)))
     return parsed_data
 
-
-
-
-
-
-def clean_phone_number(phone):
-    return ''.join(filter(str.isdigit, phone))
-
 def insert_data(data, verify_phone, add_curator):
     global current_curator_index
-    with sqlite3.connect(DATABASE2) as conn:
-        cursor = conn.cursor()
-
-        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('"')
+    conn = sqlite3.connect(DATABASE2)
+    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 = row.get('Phone', '').lstrip('+')
+        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
-                else:
-                    ws_st = 0
-            else:
-                ws_st = row.get('ws_st', '')
+        if user_exists:
+            print(f"User with email {email} or phone {phone} already exists. Skipping insert.")
+            continue
 
-            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', '')]
+        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 = verify_phone_number(phone)
+        else:
+            ws_st = row.get('ws_st', '')
 
-            placeholders = ', '.join(['?' for _ in columns])
-            columns_str = ', '.join(columns)
+        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, 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', '')]
 
-            query = f'''
-                INSERT INTO contacts ({columns_str})
-                VALUES ({placeholders})
-            '''
+        placeholders = ', '.join(['?' for _ in columns])
+        columns_str = ', '.join(columns)
 
-            try:
-                cursor.execute(query, values)
-                # Отправка данных в Google Forms
-                user_data = dict(zip(columns, values))
-            except Exception as e:
-                print(f"Error inserting row: {row}")
-                print(f"Error message: {str(e)}")
-                conn.rollback()
-                raise
+        query = f'''
+            INSERT INTO contacts ({columns_str})
+            VALUES ({placeholders})
+        '''
 
-        conn.commit()
-        conn.close()
+        try:
+            cursor.execute(query, values)
+        except Exception as e:
+            print(f"Error inserting row: {row}")
+            print(f"Error message: {str(e)}")
+            conn.rollback()
+            raise
 
+    conn.commit()
+    conn.close()
 
 @app.route('/upload_csv', methods=['POST'])
 def upload_csv():
@@ -1699,6 +1679,13 @@ def se_upl_csv():
 
 
 
+
+
+
+
+
+
+