Update app.py

app.py

@@ -795,7 +795,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
     logging.debug(f"Processing user with email: {email}")
     
     # Проверка существования пользователя в базе данных по email
-    cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
+    cursor.execute("SELECT web_st, b_mess FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
     logging.debug(f"User found: {user}")
 
@@ -810,16 +810,10 @@ def update_or_insert_user(db_name, user_data, mapping_template):
         # Обновление значения web_st
         cursor.execute("UPDATE contacts SET web_st = ? WHERE email = ?", (web_st_value, email))
         conn.commit()
-        conn.close()
         logging.debug(f"User {email} web_st updated to {web_st_value}")
     else:
-        conn.close()
         logging.debug(f"User {email} not found, proceeding with insert")
 
-    # Открываем соединение снова для остальных операций
-    conn = sqlite3.connect(db_name)
-    cursor = conn.cursor()
-
     # Преобразование данных пользователя на основе шаблона сопоставления
     transformed_data = {}
     for json_key, db_column in mapping_template.items():
@@ -870,6 +864,12 @@ def update_or_insert_user(db_name, user_data, mapping_template):
 
     # Обновление данных пользователя в базе данных
     if user:
+        # Объединение новых и старых сообщений
+        new_messages = user_data.get('messages', [])
+        old_messages = json.loads(user[1]) if user[1] else []
+        all_messages = old_messages + new_messages
+        transformed_data['b_mess'] = json.dumps(all_messages)
+
         update_query = "UPDATE contacts SET "
         update_values = []
         for column, value in transformed_data.items():
@@ -880,6 +880,9 @@ def update_or_insert_user(db_name, user_data, mapping_template):
         logging.debug(f"Update query: {update_query} with values: {update_values}")
         cursor.execute(update_query, update_values)
     else:
+        # Преобразование сообщений в JSON
+        transformed_data['b_mess'] = json.dumps(user_data.get('messages', []))
+
         columns = ', '.join(transformed_data.keys())
         placeholders = ', '.join('?' for _ in transformed_data)
         insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
@@ -891,10 +894,6 @@ def update_or_insert_user(db_name, user_data, mapping_template):
     conn.commit()
     conn.close()
 
-
-
-
-
 @app.route('/send_get_request', methods=['GET'])
 def send_get_request():
     token = request.args.get('token')