Update app.py
Browse files
app.py
CHANGED
|
@@ -806,30 +806,26 @@ def update_or_insert_user(db_name, user_data, mapping_template):
|
|
| 806 |
logging.debug(f"Processing user with email: {email}")
|
| 807 |
|
| 808 |
# Проверка существования пользователя в базе данных по email
|
| 809 |
-
cursor.execute("SELECT
|
| 810 |
user = cursor.fetchone()
|
| 811 |
logging.debug(f"User found: {user}")
|
| 812 |
|
| 813 |
-
# Вынесение увеличения
|
| 814 |
-
|
| 815 |
-
b_fin_value = 0 # Инициализация значения b_fin
|
| 816 |
if user:
|
| 817 |
-
# Проверка
|
| 818 |
-
|
| 819 |
-
current_b_fin = user[1] if user[1] is not None and user[1] != "" else 0
|
| 820 |
-
|
| 821 |
-
ws_st_value = int(current_ws_st) + 1
|
| 822 |
if user_data.get('finished') == "True":
|
| 823 |
b_fin_value = int(current_b_fin) + 1
|
| 824 |
else:
|
| 825 |
b_fin_value = current_b_fin
|
| 826 |
-
logging.debug(f"Calculated
|
| 827 |
|
| 828 |
-
# Обновление
|
| 829 |
-
cursor.execute("UPDATE contacts SET
|
| 830 |
conn.commit()
|
| 831 |
conn.close()
|
| 832 |
-
logging.debug(f"User {email}
|
| 833 |
else:
|
| 834 |
conn.close()
|
| 835 |
logging.debug(f"User {email} not found, proceeding with insert")
|
|
@@ -874,8 +870,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
|
|
| 874 |
transformed_data['phone'] = phone
|
| 875 |
logging.debug(f"Transformed data after phone processing: {transformed_data}")
|
| 876 |
|
| 877 |
-
# Добавление
|
| 878 |
-
transformed_data['ws_st'] = ws_st_value
|
| 879 |
transformed_data['b_fin'] = b_fin_value
|
| 880 |
|
| 881 |
# Обновление данных пользователя в базе данных
|
|
@@ -1013,7 +1008,6 @@ def webhookbz():
|
|
| 1013 |
|
| 1014 |
|
| 1015 |
|
| 1016 |
-
|
| 1017 |
@app.route('/biz_v', methods=['GET'])
|
| 1018 |
def biz_v():
|
| 1019 |
api_sys_control = request.args.get('api_sys')
|
|
|
|
| 806 |
logging.debug(f"Processing user with email: {email}")
|
| 807 |
|
| 808 |
# Проверка существования пользователя в базе данных по email
|
| 809 |
+
cursor.execute("SELECT b_fin FROM contacts WHERE email = ?", (email,))
|
| 810 |
user = cursor.fetchone()
|
| 811 |
logging.debug(f"User found: {user}")
|
| 812 |
|
| 813 |
+
# Вынесение увеличения значения b_fin в отдельный блок
|
| 814 |
+
b_fin_value = 1 # Инициализация значения b_fin
|
|
|
|
| 815 |
if user:
|
| 816 |
+
# Проверка текущего значения b_fin и его инкрементация
|
| 817 |
+
current_b_fin = user[0] if user[0] is not None and user[0] != "" else 0
|
|
|
|
|
|
|
|
|
|
| 818 |
if user_data.get('finished') == "True":
|
| 819 |
b_fin_value = int(current_b_fin) + 1
|
| 820 |
else:
|
| 821 |
b_fin_value = current_b_fin
|
| 822 |
+
logging.debug(f"Calculated b_fin_value: {b_fin_value}")
|
| 823 |
|
| 824 |
+
# Обновление значения b_fin
|
| 825 |
+
cursor.execute("UPDATE contacts SET b_fin = ? WHERE email = ?", (b_fin_value, email))
|
| 826 |
conn.commit()
|
| 827 |
conn.close()
|
| 828 |
+
logging.debug(f"User {email} b_fin updated to {b_fin_value}")
|
| 829 |
else:
|
| 830 |
conn.close()
|
| 831 |
logging.debug(f"User {email} not found, proceeding with insert")
|
|
|
|
| 870 |
transformed_data['phone'] = phone
|
| 871 |
logging.debug(f"Transformed data after phone processing: {transformed_data}")
|
| 872 |
|
| 873 |
+
# Добавление значения b_fin в данные для вставки
|
|
|
|
| 874 |
transformed_data['b_fin'] = b_fin_value
|
| 875 |
|
| 876 |
# Обновление данных пользователя в базе данных
|
|
|
|
| 1008 |
|
| 1009 |
|
| 1010 |
|
|
|
|
| 1011 |
@app.route('/biz_v', methods=['GET'])
|
| 1012 |
def biz_v():
|
| 1013 |
api_sys_control = request.args.get('api_sys')
|