Update app.py

app.py

@@ -763,6 +763,22 @@ def data_gc_tab_out():
 
 
 
+
+
+@app.route('/send_request', methods=['POST'])
+def send_request():
+    token = request.form.get('token')
+    min_date = request.form.get('minDate')
+    url = f'https://online.bizon365.ru/api/v1/webinars/reports/getlist?minDate={min_date}'
+    
+    response = requests.get(url, headers={'X-Token': token})
+    
+    if response.status_code == 200:
+        data = response.json()
+        webinar_ids = [item['webinarId'] for item in data['list']]
+        return jsonify(webinar_ids)
+    else:
+        return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
 
 
 
@@ -775,64 +791,137 @@ 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}")
+    
+    # Проверка существования пользователя в базе данных по email
     cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
+    logging.debug(f"User found: {user}")
 
-    web_st_value = 1
+    # Вынесение увеличения значения web_st в отдельный блок
+    web_st_value = 1  # Инициализация значения web_st
     if user:
+        # Проверка текущего значения 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}")
+
+        # Обновление значения web_st
         cursor.execute("UPDATE contacts SET web_st = ? WHERE email = ?", (web_st_value, email))
+        conn.commit()
+        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)  # Сохраняем сообщения в строку
+            else:
+                logging.error(f"Expected list of strings for key {json_key}, but got: {value}")
+                transformed_data[db_column] = ""
+        else:
+            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",
+        "shop_st", "curator", "pr1", "pr2", "pr3", "pr4", "pr5", "ad_url",
+        "key_pr", "n_con", "canal", "data_t"
+    ]
+    for field in required_fields:
+        if field not in transformed_data:
+            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('+'):
+            phone = phone[1:]
+        transformed_data['phone'] = phone
+    logging.debug(f"Transformed data after phone processing: {transformed_data}")
+
+    # Добавление значения web_st в данные для вставки
+    transformed_data['web_st'] = web_st_value
+
+    # Обновление данных пользователя в базе данных
+    if user:
+        update_query = "UPDATE contacts SET "
+        update_values = []
+        for column, value in transformed_data.items():
+            update_query += f"{column} = ?, "
+            update_values.append(value)
+        update_query = update_query.rstrip(", ") + " WHERE email = ?"
+        update_values.append(email)
+        logging.debug(f"Update query: {update_query} with values: {update_values}")
+        cursor.execute(update_query, update_values)
     else:
-        transformed_data = {db_column: str(user_data.get(json_key, "")) for json_key, db_column in mapping_template.items()}
-        transformed_data['web_st'] = web_st_value
         columns = ', '.join(transformed_data.keys())
         placeholders = ', '.join('?' for _ in transformed_data)
         insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
-        cursor.execute(insert_query, list(transformed_data.values()))
+        insert_values = list(transformed_data.values())
+        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_request', methods=['POST'])
-def send_request():
-    token = request.form.get('token')
-    min_date = request.form.get('minDate')
-    limit = request.form.get('limit', '20')
-    webinar_type = request.form.get('type', 'LiveWebinars')
-    url = f'https://online.bizon365.ru/api/v1/webinars/reports/getlist?minDate={min_date}&limit={limit}&type={webinar_type}'
-    
-    response = requests.get(url, headers={'X-Token': token})
-    
-    if response.status_code == 200:
-        data = response.json()
-        webinar_ids = [item['webinarId'] for item in data['list']]
-        return jsonify(webinar_ids)
-    else:
-        return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
+
 
 @app.route('/send_get_request', methods=['GET'])
 def send_get_request():
     token = request.args.get('token')
-    webinar_id = request.args.get('webinarId')
-    url = f'https://online.bizon365.ru/api/v1/webinars/reports/get?webinarId={webinar_id}'
+    webinarId = request.args.get('webinarId')
+    url = f'https://online.bizon365.ru/api/v1/webinars/reports/get?webinarId={webinarId}'
 
     response = requests.get(url, headers={'X-Token': token})
 
     if response.status_code == 200:
         data = response.json()
-        report_json = json.loads(data.get('report', {}).get('report', '{}'))
-        messages_json = json.loads(data.get('report', {}).get('messages', '{}'))
+
+        report = data.get('report', {})
+        messages = data.get('messages', {})
+
+        report_json_str = report.get('report', '{}')
+        try:
+            report_json = json.loads(report_json_str)
+        except json.JSONDecodeError:
+            report_json = {}
+
+        messages_json_str = report.get('messages', '{}')
+        try:
+            messages_json = json.loads(messages_json_str)
+        except json.JSONDecodeError:
+            messages_json = {}
+
         users_meta = report_json.get('usersMeta', {})
 
+        # Обновление или добавление каждого пользователя в базу данных
         processed_emails = set()
         for user_id, user_data in users_meta.items():
+            # Получаем только сообщения для текущего пользователя
             user_messages = messages_json.get(user_id, [])
             user_data['messages'] = user_messages
             email = user_data.get('email')