Update app.py
Browse files
app.py
CHANGED
@@ -747,12 +747,13 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
|
|
747 |
|
748 |
logging.debug(f"Processing user with email: {email}")
|
749 |
|
750 |
-
cursor.execute("SELECT web_st, b_mess FROM contacts WHERE email = ?", (email,))
|
751 |
user = cursor.fetchone()
|
752 |
logging.debug(f"User found: {user}")
|
753 |
|
754 |
current_web_st = user[0] if user else None
|
755 |
-
|
|
|
756 |
|
757 |
transformed_data = {}
|
758 |
for json_key, db_column in mapping_template.items():
|
@@ -786,11 +787,17 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
|
|
786 |
logging.debug(f"Transformed data after phone processing: {transformed_data}")
|
787 |
|
788 |
# Проверяем наличие ws_st в базе данных и не перезаписываем его, если оно уже существует
|
789 |
-
if
|
790 |
-
transformed_data['ws_st'] =
|
791 |
else:
|
792 |
transformed_data['ws_st'] = user_data.get('ws_st', "")
|
793 |
|
|
|
|
|
|
|
|
|
|
|
|
|
794 |
new_messages = transformed_data.get('b_mess', "")
|
795 |
if current_messages:
|
796 |
transformed_data['b_mess'] = current_messages + "; " + new_messages
|
|
|
747 |
|
748 |
logging.debug(f"Processing user with email: {email}")
|
749 |
|
750 |
+
cursor.execute("SELECT web_st, ws_st, b_mess FROM contacts WHERE email = ?", (email,))
|
751 |
user = cursor.fetchone()
|
752 |
logging.debug(f"User found: {user}")
|
753 |
|
754 |
current_web_st = user[0] if user else None
|
755 |
+
current_ws_st = user[1] if user else None
|
756 |
+
current_messages = user[2] if user else ""
|
757 |
|
758 |
transformed_data = {}
|
759 |
for json_key, db_column in mapping_template.items():
|
|
|
787 |
logging.debug(f"Transformed data after phone processing: {transformed_data}")
|
788 |
|
789 |
# Проверяем наличие ws_st в базе данных и не перезаписываем его, если оно уже существует
|
790 |
+
if current_ws_st is not None and current_ws_st != "":
|
791 |
+
transformed_data['ws_st'] = current_ws_st
|
792 |
else:
|
793 |
transformed_data['ws_st'] = user_data.get('ws_st', "")
|
794 |
|
795 |
+
# Увеличиваем значение web_st на 1, если пользователь уже существует в базе данных
|
796 |
+
if current_web_st is not None:
|
797 |
+
transformed_data['web_st'] = int(current_web_st) + 1
|
798 |
+
else:
|
799 |
+
transformed_data['web_st'] = 1
|
800 |
+
|
801 |
new_messages = transformed_data.get('b_mess', "")
|
802 |
if current_messages:
|
803 |
transformed_data['b_mess'] = current_messages + "; " + new_messages
|