Update app.py
Browse files
app.py
CHANGED
@@ -858,34 +858,47 @@ def update_or_insert_user(db_name, user_data, mapping_template):
|
|
858 |
transformed_data['b_baners'] = '1'
|
859 |
else:
|
860 |
transformed_data['b_baners'] = '0'
|
861 |
-
logging.debug(f"Transformed data after processing
|
862 |
|
863 |
-
#
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
864 |
new_messages = user_data.get('messages', [])
|
865 |
all_messages = old_messages + new_messages
|
866 |
transformed_data['b_mess'] = json.dumps(all_messages)
|
867 |
-
logging.debug(f"
|
|
|
|
|
|
|
868 |
|
869 |
-
# Обновление
|
870 |
if user:
|
871 |
-
|
872 |
-
|
873 |
-
|
874 |
-
|
875 |
-
|
|
|
|
|
|
|
|
|
876 |
else:
|
877 |
-
# Вставка нового пользователя
|
878 |
columns = ', '.join(transformed_data.keys())
|
879 |
-
placeholders = ', '.join(
|
|
|
880 |
insert_values = list(transformed_data.values())
|
881 |
-
|
882 |
-
|
883 |
-
logging.info(f"New user {email} has been added to the database.")
|
884 |
|
885 |
# Подтверждение изменений и закрытие соединения
|
886 |
conn.commit()
|
887 |
conn.close()
|
888 |
-
|
889 |
|
890 |
|
891 |
@app.route('/send_get_request', methods=['GET'])
|
@@ -943,7 +956,6 @@ def send_get_request():
|
|
943 |
|
944 |
|
945 |
|
946 |
-
|
947 |
@app.route('/biz_v', methods=['GET'])
|
948 |
def biz_v():
|
949 |
api_sys_control = request.args.get('api_sys')
|
|
|
858 |
transformed_data['b_baners'] = '1'
|
859 |
else:
|
860 |
transformed_data['b_baners'] = '0'
|
861 |
+
logging.debug(f"Transformed data after banners processing: {transformed_data}")
|
862 |
|
863 |
+
# Кнопки: Проверяется наличие ключа buttons в user_data и устанавливается b_butt в 1 или 0.
|
864 |
+
if 'buttons' in user_data and isinstance(user_data['buttons'], list) and user_data['buttons']:
|
865 |
+
transformed_data['b_butt'] = '1'
|
866 |
+
else:
|
867 |
+
transformed_data['b_butt'] = '0'
|
868 |
+
logging.debug(f"Transformed data after buttons processing: {transformed_data}")
|
869 |
+
|
870 |
+
# Обработка новых сообщений
|
871 |
new_messages = user_data.get('messages', [])
|
872 |
all_messages = old_messages + new_messages
|
873 |
transformed_data['b_mess'] = json.dumps(all_messages)
|
874 |
+
logging.debug(f"Transformed data after adding messages: {transformed_data}")
|
875 |
+
|
876 |
+
# Логирование сообщений перед сохранением
|
877 |
+
logging.debug(f"Messages for user {email} before saving: {all_messages}")
|
878 |
|
879 |
+
# Обновление данных пользователя в базе данных
|
880 |
if user:
|
881 |
+
update_query = "UPDATE contacts SET "
|
882 |
+
update_values = []
|
883 |
+
for column, value in transformed_data.items():
|
884 |
+
update_query += f"{column} = ?, "
|
885 |
+
update_values.append(value)
|
886 |
+
update_query = update_query.rstrip(", ") + " WHERE email = ?"
|
887 |
+
update_values.append(email)
|
888 |
+
logging.debug(f"Update query: {update_query} with values: {update_values}")
|
889 |
+
cursor.execute(update_query, update_values)
|
890 |
else:
|
|
|
891 |
columns = ', '.join(transformed_data.keys())
|
892 |
+
placeholders = ', '.join('?' for _ in transformed_data)
|
893 |
+
insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
|
894 |
insert_values = list(transformed_data.values())
|
895 |
+
logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
|
896 |
+
cursor.execute(insert_query, insert_values)
|
|
|
897 |
|
898 |
# Подтверждение изменений и закрытие соединения
|
899 |
conn.commit()
|
900 |
conn.close()
|
901 |
+
|
902 |
|
903 |
|
904 |
@app.route('/send_get_request', methods=['GET'])
|
|
|
956 |
|
957 |
|
958 |
|
|
|
959 |
@app.route('/biz_v', methods=['GET'])
|
960 |
def biz_v():
|
961 |
api_sys_control = request.args.get('api_sys')
|