Update app.py
Browse files
app.py
CHANGED
@@ -751,22 +751,8 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
|
|
751 |
user = cursor.fetchone()
|
752 |
logging.debug(f"User found: {user}")
|
753 |
|
754 |
-
|
755 |
-
current_messages = ""
|
756 |
-
if user:
|
757 |
-
current_web_st = user[0] if user[0] is not None and user[0] != "" else 0
|
758 |
-
web_st_value = int(current_web_st) + 1
|
759 |
-
current_messages = user[1] if user[1] is not None else ""
|
760 |
-
cursor.execute("UPDATE contacts SET web_st = ? WHERE email = ?", (web_st_value, email))
|
761 |
-
conn.commit()
|
762 |
-
conn.close()
|
763 |
-
logging.debug(f"User {email} web_st updated to {web_st_value}")
|
764 |
-
else:
|
765 |
-
conn.close()
|
766 |
-
logging.debug(f"User {email} not found, proceeding with insert")
|
767 |
-
|
768 |
-
conn = sqlite3.connect(db_name)
|
769 |
-
cursor = conn.cursor()
|
770 |
|
771 |
transformed_data = {}
|
772 |
for json_key, db_column in mapping_template.items():
|
@@ -799,11 +785,11 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
|
|
799 |
transformed_data['phone'] = phone
|
800 |
logging.debug(f"Transformed data after phone processing: {transformed_data}")
|
801 |
|
802 |
-
#
|
803 |
-
if
|
804 |
-
transformed_data['ws_st'] =
|
805 |
else:
|
806 |
-
transformed_data['ws_st'] = ""
|
807 |
|
808 |
new_messages = transformed_data.get('b_mess', "")
|
809 |
if current_messages:
|
|
|
751 |
user = cursor.fetchone()
|
752 |
logging.debug(f"User found: {user}")
|
753 |
|
754 |
+
current_web_st = user[0] if user else None
|
755 |
+
current_messages = user[1] if user else ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
756 |
|
757 |
transformed_data = {}
|
758 |
for json_key, db_column in mapping_template.items():
|
|
|
785 |
transformed_data['phone'] = phone
|
786 |
logging.debug(f"Transformed data after phone processing: {transformed_data}")
|
787 |
|
788 |
+
# Проверяем наличие ws_st в базе данных и не перезаписываем его, если оно уже существует
|
789 |
+
if current_web_st is not None and current_web_st != "":
|
790 |
+
transformed_data['ws_st'] = current_web_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:
|