Update app.py

app.py

@@ -100,7 +100,7 @@ for db in DATABASES:
 
 
 
-template = {
+mapping_template = {
     "username": "name",
     "phone": "phone",
     "email": "email",
@@ -122,7 +122,6 @@ template = {
 
 
 
-
 # Функция для выполнения HTTP запросов
 def fetch(url):
     try:
@@ -781,41 +780,30 @@ def update_or_insert_user(db_name, user_data, mapping_template):
     cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
 
-    transformed_data = {}
-    for json_key, db_column in mapping_template.items():
-        value = user_data.get(json_key, "")
-        if isinstance(value, list):
-            transformed_data[db_column] = "-1" if value else "0"
-        else:
-            transformed_data[db_column] = str(value)
-
-    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 column, value in transformed_data.items():
-            update_query += f"{column} = ?, "
-            update_values.append(value)
+        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))
         update_query += "web_st = ? WHERE email = ?"
         update_values.extend([web_st_value, email])
         cursor.execute(update_query, update_values)
     else:
-        columns = ', '.join(transformed_data.keys()) + ", web_st"
-        placeholders = ', '.join('?' for _ in transformed_data) + ", ?"
+        columns = ', '.join(mapping_template.values()) + ", web_st"
+        placeholders = ', '.join('?' for _ in mapping_template) + ", ?"
         insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
-        insert_values = list(transformed_data.values()) + [0]
+        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.append(0)
         cursor.execute(insert_query, insert_values)
 
     conn.commit()
@@ -852,7 +840,7 @@ def send_get_request():
         # Обновление или добавление каждого пользователя в базу данных data_gc.db
         for user_id, user_data in users_meta.items():
             user_data['messages'] = messages_json
-            update_or_insert_user(DATABASE_NAME, user_data, template)
+            update_or_insert_user(DATABASE_NAME, user_data, mapping_template)
 
         return jsonify({'status': 'User data saved successfully'})
     else: