Update app.py

app.py

@@ -1688,17 +1688,21 @@ def add_or_update_contact(contact_data):
     cursor.execute("SELECT id FROM contacts WHERE email = ?", (email,))
     contact = cursor.fetchone()
 
-    fields = ["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"]
-    transformed_data = {field: contact_data.get(field, "") for field in fields}
+    # List all fields for updating or inserting
+    fields = ["name", "phone", "email", "vk_id", "chat_id", "ws_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"]
+    
+    # Only include fields with non-empty values
+    fields_to_update = [field for field in fields if contact_data.get(field, '') != '']
+    placeholders = ", ".join([f"{field} = ?" for field in fields_to_update])
 
     if contact:
-        update_query = "UPDATE contacts SET " + ", ".join([f"{field} = ?" for field in fields]) + " WHERE id = ?"
-        cursor.execute(update_query, (*transformed_data.values(), contact[0]))
+        update_query = f"UPDATE contacts SET {placeholders} WHERE id = ?"
+        cursor.execute(update_query, (*[contact_data[field] for field in fields_to_update], contact[0]))
     else:
-        insert_query = "INSERT INTO contacts (" + ", ".join(fields) + ") VALUES (" + ", ".join(["?" for _ in fields]) + ")"
-        cursor.execute(insert_query, tuple(transformed_data.values()))
+        insert_query = f"INSERT INTO contacts ({', '.join(fields_to_update)}) VALUES ({', '.join(['?' for _ in fields_to_update])})"
+        cursor.execute(insert_query, tuple(contact_data[field] for field in fields_to_update))
 
     conn.commit()
     conn.close()
@@ -1745,36 +1749,7 @@ def add_data_ver():
         logging.error(f"Error adding/updating contact: {e}")
         return jsonify({'status': 'error', 'message': str(e)}), 500
 
-def add_or_update_contact(contact_data):
-    conn = sqlite3.connect(DATABASE_NAME)
-    cursor = conn.cursor()
-
-    email = contact_data.get('email')
-    if not email:
-        logging.error(f"Missing email in contact data: {contact_data}")
-        return
-
-    cursor.execute("SELECT id FROM contacts WHERE email = ?", (email,))
-    contact = cursor.fetchone()
-
-    # List all fields for updating or inserting
-    fields = ["name", "phone", "email", "vk_id", "chat_id", "ws_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"]
-    
-    # Only include fields with non-empty values
-    fields_to_update = [field for field in fields if contact_data.get(field, '') != '']
-    placeholders = ", ".join([f"{field} = ?" for field in fields_to_update])
-
-    if contact:
-        update_query = f"UPDATE contacts SET {placeholders} WHERE id = ?"
-        cursor.execute(update_query, (*[contact_data[field] for field in fields_to_update], contact[0]))
-    else:
-        insert_query = f"INSERT INTO contacts ({', '.join(fields_to_update)}) VALUES ({', '.join(['?' for _ in fields_to_update])})"
-        cursor.execute(insert_query, tuple(contact_data[field] for field in fields_to_update))
 
-    conn.commit()
-    conn.close()