Update app.py

app.py

@@ -764,21 +764,6 @@ 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')
-    type = request.form.get('type')
-    url = f'https://online.bizon365.ru/api/v1/webinars/reports/getlist?minDate={min_date}&type={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
 
 
 
@@ -801,51 +786,14 @@ DATABASE_NAME = 'data_gc.db'
 
 
 
-verifikation_start = "1"  # Глобальная переменная для управления верификацией
-curator_on_off = "1"  # Глобальная переменная для управления назначением куратора
-
-current_curator_index = 0
-
-
-verifikation_start = "1"  # Глобальная переменная для управления верификацией
-curator_on_off = "1"  # Глобальная переменная для управления назначением куратора
-current_curator_index = 0
-curators = ["Curator1", "Curator2", "Curator3"]  # Список кураторов
-
-
 
-mapping_template = {
-    "name": "name",
-    "phone": "phone",
-    "email": "email",
-    "b_city": "b_city",
-    "b_fin": "b_fin",
-    "b_ban": "b_ban",
-    "b_ign": "b_ign",
-    "b_baners": "b_baners",
-    "b_butt": "b_butt",
-    "b_mess": "b_mess"
-    # Добавьте все необходимые поля для маппинга
-}
 
-def verify_phone_number_biz(phone_number):
-    full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
-    payload = {"phoneNumber": phone_number}
-    headers = {'Content-Type': 'application/json'}
-    try:
-        response = requests.post(full_url_ver, headers=headers, json=payload)
-        response.raise_for_status()
-        response_body = response.json()
-        logging.debug(f"Phone verification response: {response_body}")
-        return response_body.get('existsWhatsapp', 'false')
-    except requests.RequestException as e:
-        logging.error(f"Error during phone verification: {str(e)}")
-        return "Error"
 
-def update_or_insert_user_biz(db_name, user_data, mapping_template):
+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}")
@@ -853,29 +801,41 @@ def update_or_insert_user_biz(db_name, user_data, mapping_template):
 
     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)
+                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] = ""
@@ -883,6 +843,7 @@ def update_or_insert_user_biz(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",
@@ -894,6 +855,7 @@ def update_or_insert_user_biz(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('+'):
@@ -901,25 +863,10 @@ def update_or_insert_user_biz(db_name, user_data, mapping_template):
         transformed_data['phone'] = phone
     logging.debug(f"Transformed data after phone processing: {transformed_data}")
 
+    # Добавление значения web_st в данные для вставки
     transformed_data['web_st'] = web_st_value
 
-    # Верификация номера телефона
-    if 'phone' in user_data and verifikation_start == "1":
-        phone_verification_result = verify_phone_number_biz(transformed_data['phone'])
-        logging.debug(f"Phone verification result for {email}: {phone_verification_result}")
-        if phone_verification_result == "true":
-            transformed_data['ws_st'] = "True"
-        else:
-            transformed_data['ws_st'] = "False"
-    logging.debug(f"Transformed data after phone verification: {transformed_data}")
-
-    # Назначение куратора
-    if curator_on_off == "1":
-        global current_curator_index
-        transformed_data['curator'] = curators[current_curator_index]
-        current_curator_index = (current_curator_index + 1) % len(curators)
-        logging.debug(f"Curator assigned for {email}: {transformed_data['curator']}")
-
+    # Обновление данных пользователя в базе данных
     if user:
         update_query = "UPDATE contacts SET "
         update_values = []
@@ -938,27 +885,50 @@ def update_or_insert_user_biz(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_request', methods=['POST'])
+def send_request():
+    token = request.form.get('token')
+    min_date = request.form.get('minDate')
+    type = request.form.get('type')
+    url = f'https://online.bizon365.ru/api/v1/webinars/reports/getlist?minDate={min_date}&type={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_biz():
+def send_get_request():
     token = request.args.get('token')
     webinarId = request.args.get('webinarId')
     url = f'https://online.bizon365.ru/api/v1/webinars/reports/get?webinarId={webinarId}'
 
     try:
         response = requests.get(url, headers={'X-Token': token})
-        response.raise_for_status()
+        response.raise_for_status()  # Проверка на ошибки HTTP
         data = response.json()
 
+        # Убедитесь, что report существует в данных
         if data is None or 'report' not in data:
             return jsonify({'error': 'No report data found'}), 500
 
         report = data.get('report', {})
         messages = data.get('messages', {})
 
+        # Проверка на None перед использованием
         if report is None:
             return jsonify({'error': 'No report data found in the response'}), 500
 
@@ -982,7 +952,7 @@ def send_get_request_biz():
             user_data['messages'] = user_messages
             email = user_data.get('email')
             if email and email not in processed_emails:
-                update_or_insert_user_biz(DATABASE_NAME, user_data, mapping_template)
+                update_or_insert_user(DATABASE_NAME, user_data, mapping_template)
                 processed_emails.add(email)
 
         return jsonify({'status': 'User data saved successfully'})
@@ -993,6 +963,61 @@ def send_get_request_biz():
 
 
 
+@app.route('/webhookbz', methods=['POST'])
+def webhookbz():
+    api_sys_control = request.args.get('api_sys')
+    if api_sys_control != api_key_sys:
+        return "EUR 22", 200
+
+    data = request.json
+    webinar_id = data.get('webinarId')
+
+    if not webinar_id:
+        return jsonify({'error': 'webinarId is required'}), 400
+
+    url = f'https://online.bizon365.ru/api/v1/webinars/reports/get?webinarId={webinar_id}'
+    response = requests.get(url, headers={'X-Token': api_key_sys})
+
+    if response.status_code == 200:
+        data = response.json()
+
+        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')
+            if email and email not in processed_emails:
+                update_or_insert_user(DATABASE_NAME, user_data, mapping_template)
+                processed_emails.add(email)
+
+        return jsonify({'status': 'User data saved successfully'})
+    else:
+        return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
+
+
+
+
+
+
+
+
 
 
 
@@ -1843,7 +1868,6 @@ function mySuccessFunction(form) {
     if (form instanceof jQuery) {
         form = form.get(0);
     }
-
  
     var obj = {};
     var inputs = form.elements;
@@ -1854,16 +1878,13 @@ function mySuccessFunction(form) {
             obj[input.name] = input.value;
         }
     });
-
   
     var email = obj["Email"] || "";
     var phone = obj["Phone"] || "";
     var name = obj["Name"] || "";
-
     console.log("name:", name);
     console.log("email:", email);
     console.log("phone:", phone);
-
   
     var urlParams = new URLSearchParams(window.location.search);
     var utm_source = urlParams.get('utm_source') || "0";
@@ -1872,9 +1893,6 @@ function mySuccessFunction(form) {
     var utm_content = urlParams.get('utm_content') || "0";
     var utm_term = urlParams.get('utm_term') || "0";
     var gcpc = urlParams.get('gcpc') || "0";
-
-
-
     var redirectUrl;
     if (form.id === formId1) {
         redirectUrl = new URL(redirectUrl1);
@@ -1886,8 +1904,6 @@ function mySuccessFunction(form) {
         console.error('Неизвестный ID формы:', form.id);
         return;
     }
-
-
     var queryString = '?ups=' + encodeURIComponent(ups);
     queryString += '&name=' + encodeURIComponent(name);
     queryString += '&email=' + encodeURIComponent(email);
@@ -1898,20 +1914,14 @@ function mySuccessFunction(form) {
     queryString += '&utm_content=' + encodeURIComponent(utm_content);
     queryString += '&utm_term=' + encodeURIComponent(utm_term);
     queryString += '&gcpc=' + encodeURIComponent(gcpc);
-
-
     console.log('Сформированный URL:', redirectUrl.toString() + queryString);
-
-
     window.open(redirectUrl.toString() + queryString, '_blank');
 }
-
 if (document.readyState !== 'loading') {
     us_sendFormAfterSuccess();
 } else {
     document.addEventListener('DOMContentLoaded', us_sendFormAfterSuccess);
 }
-
 function us_sendFormAfterSuccess() {
     var forms = document.querySelectorAll('.js-form-proccess');
     Array.prototype.forEach.call(forms, function(form) {