Update app.py

app.py

@@ -748,7 +748,6 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
 
     logging.debug(f"Processing user with email: {email}")
 
-    # Получаем текущее значение из базы данных, если оно существует
     cursor.execute("SELECT web_st, ws_st, b_mess FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
     logging.debug(f"User found: {user}")
@@ -756,15 +755,7 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
     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 ""
-
-    # Преобразование статуса WhatsApp
-    new_ws_st = user_data.get('ws_st', "").strip().upper()
-    if new_ws_st == 'TRUE':
-        new_ws_st = '1'
-    elif new_ws_st == 'FALSE':
-        new_ws_st = '0'
-    else:
-        new_ws_st = ""  # Если статус не True и не False, оставляем пустым
+    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():
@@ -779,7 +770,17 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
             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('+'):
@@ -787,16 +788,18 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
         transformed_data['phone'] = phone
     logging.debug(f"Transformed data after phone processing: {transformed_data}")
 
+    # Проверяем наличие 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
 
-    # Записываем преобразованное значение ws_st
-    transformed_data['ws_st'] = new_ws_st
-
-    # Обработка сообщений
     new_messages = transformed_data.get('b_mess', "")
     if current_messages:
         transformed_data['b_mess'] = current_messages + "; " + new_messages