Update app.py

app.py

@@ -747,70 +747,94 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
 
     logging.debug(f"Processing user with email: {email}")
 
-    # Проверка существующих данных
-    cursor.execute("SELECT * FROM contacts WHERE email = ?", (email,))
+    cursor.execute("SELECT web_st, ws_st, b_mess FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
-    current_values = dict(zip([column[0] for column in cursor.description], user)) if user else {}
+    logging.debug(f"User found: {user}")
 
-    # Обработка данных
-    transformed_data = transform_data(user_data, mapping_template)
+    current_web_st = user[0] if user else None
+    current_ws_st = user[1] if user else None
+    current_messages = user[2] if user else ""
+    logging.debug(f"Current web_st: {current_web_st}, current_ws_st: {current_ws_st}, current_messages: {current_messages}")
+
+    transformed_data = {}
+    for json_key, db_column in mapping_template.items():
+        value = user_data.get(json_key, "")
+        if isinstance(value, list):
+            if all(isinstance(item, str) for item in value):
+                transformed_data[db_column] = "; ".join(value)
+            else:
+                logging.error(f"Expected list of strings for key {json_key}, but got: {value}")
+                transformed_data[db_column] = ""
+        else:
+            transformed_data[db_column] = str(value)
+    logging.debug(f"Transformed data: {transformed_data}")
+
+    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", "gc_url",
+        "key_pr", "n_con", "canal", "data_t", 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'
+    ]
+    for field in required_fields:
+        if field not in transformed_data:
+            transformed_data[field] = ""
+    logging.debug(f"Transformed data after adding required fields: {transformed_data}")
+
+    if 'phone' in user_data:
+        phone = user_data['phone']
+        if phone.startswith('+'):
+            phone = phone[1:]
+        transformed_data['phone'] = phone
+    logging.debug(f"Transformed data after phone processing: {transformed_data}")
+
+    # Столбцы, которые не нужно перезаписывать
+    no_overwrite_columns = ['ws_st', 'curator']  # Добавляйте сюда столбцы
+
+    # Проверяем наличие ws_st в базе данных и не перезаписываем его, если оно уже существует
+    if current_ws_st is not None and current_ws_st != "":
+        transformed_data['ws_st'] = current_ws_st
+    else:
+        transformed_data['ws_st'] = user_data.get('ws_st', "")
+
+    # Увеличиваем значение web_st на 1, если пользователь уже существует в базе данных
+    if current_web_st is not None and current_web_st != "":
+        transformed_data['web_st'] = int(current_web_st) + 1
+    else:
+        transformed_data['web_st'] = 1
+
+    new_messages = transformed_data.get('b_mess', "")
+    if current_messages:
+        transformed_data['b_mess'] = current_messages + "; " + new_messages
+    else:
+        transformed_data['b_mess'] = new_messages
+    logging.debug(f"Transformed data after message processing: {transformed_data}")
 
-    # Сравнение и подготовка данных
-    final_data = prepare_final_data(transformed_data, current_values)
-    
-    # Обновление или вставка данных в базу данных
     if user:
-        update_database(cursor, final_data, email)
+        update_query = "UPDATE contacts SET "
+        update_values = []
+        for column, value in transformed_data.items():
+            if column not in no_overwrite_columns:
+                update_query += f"{column} = ?, "
+                update_values.append(value)
+        update_query = update_query.rstrip(", ") + " WHERE email = ?"
+        update_values.append(email)
+        logging.debug(f"Update query: {update_query} with values: {update_values}")
+        cursor.execute(update_query, update_values)
     else:
-        insert_into_database(cursor, final_data)
+        columns = ', '.join(transformed_data.keys())
+        placeholders = ', '.join('?' for _ in transformed_data)
+        insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
+        insert_values = list(transformed_data.values())
+        logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
+        cursor.execute(insert_query, insert_values)
 
     conn.commit()
     conn.close()
-    
     logging.debug(f"User with email {email} processed successfully")
 
     # Отправка данных в Google Forms
-    send_to_google_forms(final_data, gog_url)
+    send_to_google_forms(transformed_data, gog_url)
 
-def transform_data(user_data, mapping_template):
-    # Трансформация данных
-    transformed_data = {}
-    for json_key, db_column in mapping_template.items():
-        value = user_data.get(json_key, "")
-        transformed_data[db_column] = str(value)
-    return transformed_data
-
-def prepare_final_data(transformed_data, current_values):
-    # Подготовка окончательных данных
-    for column in ['web_st', 'ws_st']:  # Пример столбцов для обработки
-        if column in transformed_data:
-            transformed_data[column] = handle_special_cases(column, transformed_data, current_values)
-    return transformed_data
-
-def handle_special_cases(column, transformed_data, current_values):
-    # Логика обработки особых случаев
-    if column == 'web_st':
-        return int(current_values.get(column, 0)) + 1
-    return transformed_data[column]
-
-def update_database(cursor, final_data, email):
-    # Обновление данных
-    update_query = "UPDATE contacts SET "
-    update_values = []
-    for column, value in final_data.items():
-        update_query += f"{column} = ?, "
-        update_values.append(value)
-    update_query = update_query.rstrip(", ") + " WHERE email = ?"
-    update_values.append(email)
-    cursor.execute(update_query, update_values)
-
-def insert_into_database(cursor, final_data):
-    # Вставка данных
-    columns = ', '.join(final_data.keys())
-    placeholders = ', '.join('?' for _ in final_data)
-    insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
-    insert_values = list(final_data.values())
-    cursor.execute(insert_query, insert_values)