Update app.py

app.py

@@ -772,39 +772,42 @@ def send_request():
 DATABASE_NAME = 'data_gc.db'
 
 def update_or_insert_user(db_name, user_data, mapping_template):
-    conn = sqlite3.connect(db_name, timeout=10, check_same_thread=False)
+    conn = sqlite3.connect(db_name)
     cursor = conn.cursor()
 
     email = user_data.get('email')
-    vk_id = user_data.get('vk_id', 'default_vk_id')  # Используйте значение по умолчанию для vk_id
-    
     cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
 
+    transformed_data = {db_column: user_data.get(json_key, "") for json_key, db_column in mapping_template.items()}
+
+    required_fields = [
+        "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"
+    ]
+
+    for field in required_fields:
+        if field not in transformed_data:
+            transformed_data[field] = ""
+
     if user:
         web_st_value = int(user[0]) + 1
+
         update_query = "UPDATE contacts SET "
         update_values = []
-        for json_key, db_column in mapping_template.items():
-            value = user_data.get(json_key, "")
-            if isinstance(value, list):
-                value = "-1" if value else "0"
-            update_query += f"{db_column} = ?, "
-            update_values.append(str(value))
+        for column, value in transformed_data.items():
+            update_query += f"{column} = ?, "
+            update_values.append(value)
         update_query += "web_st = ? WHERE email = ?"
         update_values.extend([web_st_value, email])
         cursor.execute(update_query, update_values)
     else:
-        columns = ', '.join(mapping_template.values()) + ", web_st, vk_id"
-        placeholders = ', '.join('?' for _ in mapping_template) + ", ?, ?"
+        columns = ', '.join(transformed_data.keys()) + ", web_st"
+        placeholders = ', '.join('?' for _ in transformed_data) + ", ?"
         insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
-        insert_values = []
-        for json_key, db_column in mapping_template.items():
-            value = user_data.get(json_key, "")
-            if isinstance(value, list):
-                value = "-1" if value else "0"
-            insert_values.append(str(value))
-        insert_values.extend([0, vk_id])
+        insert_values = list(transformed_data.values()) + [0]
         cursor.execute(insert_query, insert_values)
 
     conn.commit()
@@ -864,7 +867,6 @@ def send_get_request():
 
 
 
-
 
 
 @app.route('/biz_v', methods=['GET'])