Update app.py

app.py

@@ -787,53 +787,53 @@ def send_request():
 
 
 DATABASE_NAME = 'data_gc.db'
-
-
-
-
-
-
 def update_or_insert_user(db_name, user_data, mapping_template):
     conn = sqlite3.connect(db_name)
     cursor = conn.cursor()
 
+    # Получение email пользователя из данных
     email = user_data.get('email')
     if not email:
         logging.error(f"User data missing email: {user_data}")
         return
 
     logging.debug(f"Processing user with email: {email}")
-
-    cursor.execute("SELECT web_st, b_fin FROM contacts WHERE email = ?", (email,))
+    
+    # Проверка существования пользователя в базе данных по email
+    cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
     logging.debug(f"User found: {user}")
 
+    # Вынесение увеличения значения web_st в отдельный блок
     web_st_value = 1  # Инициализация значения web_st
-    b_fin_value = "0"  # Инициализация значения b_fin в виде строки
     if user:
-        current_web_st = int(user[0]) if user[0] is not None and user[0] != "" else 0
-        current_b_fin = int(user[1]) if user[1] is not None and user[1] != "" else 0
-        
-        web_st_value = current_web_st + 1
-        if user_data.get('finished') == "True":
-            b_fin_value = str(current_b_fin + 1)
-        else:
-            b_fin_value = str(current_b_fin)
-        logging.debug(f"Calculated web_st_value: {web_st_value}, b_fin_value: {b_fin_value}")
+        # Проверка текущего значения web_st и его инкрементация
+        current_web_st = user[0] if user[0] is not None and user[0] != "" else 0
+        web_st_value = int(current_web_st) + 1
+        logging.debug(f"Calculated web_st_value: {web_st_value}")
 
-        cursor.execute("UPDATE contacts SET web_st = ?, b_fin = ? WHERE email = ?", (web_st_value, b_fin_value, email))
+        # Обновление значения web_st
+        cursor.execute("UPDATE contacts SET web_st = ? WHERE email = ?", (web_st_value, email))
         conn.commit()
-        logging.debug(f"User {email} web_st updated to {web_st_value}, b_fin updated to {b_fin_value}")
+        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():
         value = user_data.get(json_key, "")
         
         if isinstance(value, list):
+            # Проверяем тип элементов списка
             if all(isinstance(item, str) for item in value):
-                transformed_data[db_column] = "; ".join(value)
+                transformed_data[db_column] = "; ".join(value)  # Сохраняем сообщения в строку
             else:
                 logging.error(f"Expected list of strings for key {json_key}, but got: {value}")
                 transformed_data[db_column] = ""
@@ -841,6 +841,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
             transformed_data[db_column] = str(value)
     logging.debug(f"Transformed data: {transformed_data}")
 
+    # Заполнение обязательных полей значениями по умолчанию
     required_fields = [
         "vk_id", "chat_id", "ws_st", "ws_stop", "web_st", "fin_prog",
         "b_city", "b_fin", "b_ban", "b_ign", "b_baners", "b_butt", "b_mess",
@@ -852,6 +853,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
             transformed_data[field] = ""
     logging.debug(f"Transformed data after adding required fields: {transformed_data}")
 
+    # Обработка номера телефона, если он есть
     if 'phone' in user_data:
         phone = user_data['phone']
         if phone.startswith('+'):
@@ -859,9 +861,10 @@ def update_or_insert_user(db_name, user_data, mapping_template):
         transformed_data['phone'] = phone
     logging.debug(f"Transformed data after phone processing: {transformed_data}")
 
-    transformed_data['web_st'] = str(web_st_value)
-    transformed_data['b_fin'] = b_fin_value
+    # Добавление значения web_st в данные для вставки
+    transformed_data['web_st'] = web_st_value
 
+    # Обновление данных пользователя в базе данных
     if user:
         update_query = "UPDATE contacts SET "
         update_values = []
@@ -880,13 +883,13 @@ def update_or_insert_user(db_name, user_data, mapping_template):
         logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
         cursor.execute(insert_query, insert_values)
 
+    # Подтверждение изменений и закрытие соединения
     conn.commit()
     conn.close()
     logging.debug(f"User with email {email} processed successfully")
 
 
 
-
 @app.route('/send_get_request', methods=['GET'])
 def send_get_request():
     token = request.args.get('token')
@@ -931,6 +934,7 @@ def send_get_request():
         return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
 
 
+
 @app.route('/webhookbz', methods=['POST'])
 def webhookbz():
     api_sys_control = request.args.get('api_sys')