Update app.py

app.py

@@ -665,59 +665,60 @@ def data_gc_tab_out():
 
 
 
-forms = "formResponse"
-
-
+DATABASE_NAME = 'data_gc.db'
 
-gog_url = "https://docs.google.com/forms/d/e/1FAIpQLSc-JbmXvgpgGq6KrkXsYSsfMACVMyIDnNqrHy6jImGeSRcpiQ/formResponse?usp=pp_url&entry.1556100878={name}&entry.1477412341={email}&entry.1634985541={phone}&entry.1736544219={vk_id}&entry.62153872={chat_id}&entry.1913752768={ws_st}&entry.1768186232={ws_stop}&entry.1198983592={web_st}&entry.994770784={fin_prog}&entry.910932310={b_city}&entry.1923801792={b_fin}&entry.2005444720={b_ban}&entry.741087361={b_ign}&entry.1316159837={b_baners}&entry.355123557={b_butt}&entry.395996312={b_mess}&entry.646571729={shop_st}&entry.578527800={curator}&entry.1936838964={pr1}&entry.1375537366={pr2}&entry.1249356084={pr3}&entry.752547226={pr4}&entry.704766458={pr5}&entry.1837661={gc_url}&entry.398837750={key_pr}&entry.225564240={n_con}&entry.1642320872={canal}&entry.1581826411={data_t}&entry.311131724={utm_source}&entry.1904279859={utm_medium}&entry.740234546={utm_campaign}&entry.880981295={utm_term}&entry.431306383={utm_content}"
 
 
 
-DATABASE_NAME = 'data_gc.db'
-def send_to_google_forms(user_data, gog_url):
-    # Формирование URL с параметрами
-    url = gog_url.format(**user_data)
-    
-    # Отправка POST-запроса
-    response = requests.post(url)
-    
-    if response.status_code == 200:
-        logging.debug(f"Data sent to Google Forms successfully for user: {user_data.get('email')}")
-    else:
-        logging.error(f"Failed to send data to Google Forms for user: {user_data.get('email')}. Response: {response.text}")
 
-        
 
-def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
-    # Подключение к базе данных
+def update_or_insert_user(db_name, user_data, mapping_template):
     conn = sqlite3.connect(db_name)
     cursor = conn.cursor()
 
-    # Получение email пользователя
+    # Получение 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, ws_st, b_mess 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}")
 
-    current_web_st = user[0] if user else None
-    current_ws_st = user[1] if user else None
-    current_messages = user[2] if user else ""
-    logging.debug(f"Current web_st: {current_web_st}, current_ws_st: {current_ws_st}, current_messages: {current_messages}")
+    # Вынесение увеличения значения 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] = ""
@@ -725,19 +726,19 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
             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", "gc_url",
-        "key_pr", "n_con", "canal", "data_on", "data_t", 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc'
+        "shop_st", "curator", "pr1", "pr2", "pr3", "pr4", "pr5", "ad_url",
+        "key_pr", "n_con", "canal", "data_t", 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'
     ]
     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('+'):
@@ -745,35 +746,16 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
         transformed_data['phone'] = phone
     logging.debug(f"Transformed data after phone processing: {transformed_data}")
 
-    # Столбцы, которые не нужно перезаписывать
-    no_overwrite_columns = ['ws_st', 'curator', 'data_t']  # Добавляйте сюда столбцы
-
-    # Проверка и подготовка значений столбцов
-    if current_ws_st is not None and current_ws_st != "":
-        transformed_data['ws_st'] = current_ws_st
-    else:
-        transformed_data['ws_st'] = user_data.get('ws_st', "")
+    # Добавление значения web_st в данные для вставки
+    transformed_data['web_st'] = web_st_value
 
-    if current_web_st is not None and current_web_st != "":
-        transformed_data['web_st'] = int(current_web_st) + 1
-    else:
-        transformed_data['web_st'] = 1
-
-    new_messages = transformed_data.get('b_mess', "")
-    if current_messages:
-        transformed_data['b_mess'] = current_messages + "; " + new_messages
-    else:
-        transformed_data['b_mess'] = new_messages
-    logging.debug(f"Transformed data after message processing: {transformed_data}")
-
-    # Запись данных в базу данных
+    # Обновление данных пользователя в базе данных
     if user:
         update_query = "UPDATE contacts SET "
         update_values = []
         for column, value in transformed_data.items():
-            if column not in no_overwrite_columns:  # Исключаем столбцы, которые не нужно перезаписывать
-                update_query += f"{column} = ?, "
-                update_values.append(value)
+            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}")
@@ -786,29 +768,18 @@ def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
         logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
         cursor.execute(insert_query, insert_values)
 
+    # Подтверждение изменений и закрытие соединения
     conn.commit()
-
-    # Извлечение обновленных данных из базы данных
-    cursor.execute("SELECT * FROM contacts WHERE email = ?", (email,))
-    updated_user = cursor.fetchone()
-    updated_data = dict(zip([column[0] for column in cursor.description], updated_user))
-
     conn.close()
     logging.debug(f"User with email {email} processed successfully")
 
-    # Отправка данных в Google Forms
-    send_to_google_forms(updated_data, gog_url)
-
-
-
-
 
 @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}&limit=100'
+    url = f'https://online.bizon365.ru/api/v1/webinars/reports/getlist?minDate={min_date}&type={type}'
     
     response = requests.get(url, headers={'X-Token': token})
     
@@ -833,12 +804,14 @@ def send_get_request():
         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
 
@@ -862,7 +835,7 @@ def send_get_request():
             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, gog_url)
+                update_or_insert_user(DATABASE_NAME, user_data, mapping_template)
                 processed_emails.add(email)
 
         return jsonify({'status': 'User data saved successfully'})
@@ -872,8 +845,6 @@ def send_get_request():
 
 
 
-api_bz = "SkrIONpr3ByeSIuEaBhr1bB8u4aBhSJfH8uEpB2rk7rI_ETrn"
-        
 
 @app.route('/webhookbz', methods=['POST'])
 def webhookbz():
@@ -886,10 +857,9 @@ def webhookbz():
 
     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_bz})
 
+    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()
@@ -917,13 +887,23 @@ def webhookbz():
             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, gog_url)
+                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
 
+
+
+
+
+
+
+
+
+
+
     
 
 
@@ -1485,6 +1465,24 @@ mapp_templates = {
 
 DATABASE_NAME3 = 'data_gc.db'
 
+
+def verify_phone_number(phone_number):
+    if verifikation_start == "1":
+        full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
+        
+        payload = json.dumps({"phoneNumber": phone_number})
+        headers = {'Content-Type': 'application/json'}
+
+        response = requests.post(full_url_ver, headers=headers, data=payload)
+        
+        if response.status_code == 200:
+            response_body = response.json()
+            return response_body.get('existsWhatsapp', 'false')
+        else:
+            return "Error"
+    else:
+        return "false"
+
 def add_or_update_contact(contact_data):
     conn = sqlite3.connect(DATABASE_NAME3)
     cursor = conn.cursor()
@@ -1499,35 +1497,27 @@ def add_or_update_contact(contact_data):
     msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
     contact_data['data_t'] = msk_now.strftime('%Y-%m-%d %H:%M:%S')
 
-    # Список всех возможных полей
+    cursor.execute("SELECT id FROM contacts WHERE email = ?", (email,))
+    contact = cursor.fetchone()
+
     fields = [
         'name', 'phone', 'email', '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', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content' 'gcpc'
+        'pr1', 'pr2', 'pr3', 'pr4', 'pr5', 'ad_url', 'key_pr', 'n_con', 'canal', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'
     ]
 
-    # Устанавливаем значения по умолчанию для отсутствующих полей
-    for field in fields:
-        if field not in contact_data:
-            contact_data[field] = ''
-
     placeholders = ", ".join([f"{field} = ?" for field in fields])
 
-    cursor.execute("SELECT id FROM contacts WHERE email = ?", (email,))
-    contact = cursor.fetchone()
-
     if contact:
         update_query = f"UPDATE contacts SET {placeholders} WHERE id = ?"
-        cursor.execute(update_query, (*[contact_data[field] for field in fields], contact[0]))
+        cursor.execute(update_query, (*[contact_data.get(field, '') for field in fields], contact[0]))
     else:
         insert_query = f"INSERT INTO contacts ({', '.join(fields)}) VALUES ({', '.join(['?' for _ in fields])})"
-        cursor.execute(insert_query, tuple(contact_data[field] for field in fields))
+        cursor.execute(insert_query, tuple(contact_data.get(field, '') for field in fields))
 
     conn.commit()
     conn.close()
 
-
-
 @app.route('/add_data_ver_cur', methods=['GET'])
 def add_data_ver_cur():
     global current_curator_index
@@ -1540,18 +1530,11 @@ def add_data_ver_cur():
 
     user_data = {mapping_template_cur[key]: request.args.get(key, "") for key in mapping_template_cur}
 
-    logging.debug(f"Received data: {user_data}")
-
     if curator_on_off == "1":
         user_data['curator'] = curators[current_curator_index]
 
     if veref_on_off == "1":
-        phone_number = user_data.get('phone', '')
-        if not phone_number:
-            logging.error("Phone number is empty")
-            return jsonify({'status': 'error', 'message': 'Phone number is empty'}), 400
-        
-        phone_verification_response = verify_phone_number(phone_number)
+        phone_verification_response = verify_phone_number(user_data.get('phone', ''))
         if phone_verification_response is not None:
             user_data['ws_st'] = phone_verification_response
 
@@ -1559,10 +1542,6 @@ def add_data_ver_cur():
         add_or_update_contact(user_data)
         if curator_on_off == "1":
             current_curator_index = (current_curator_index + 1) % len(curators)
-        
-        # Отправка данных в Google Forms
-        send_to_google_forms(user_data, gog_url)
-
         return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}'})
     except Exception as e:
         logging.error(f"Error adding user: {e}")
@@ -1581,25 +1560,6 @@ def add_data_ver_cur():
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Глобальная переменная для управления верификацией
-
 DATABASE2 = 'data_gc.db'
 
 def verify_phone_number(phone_number):
@@ -1612,7 +1572,7 @@ def verify_phone_number(phone_number):
         return response_body.get('existsWhatsapp', 'false')
     else:
         return "Error"
-        
+
 def parse_csv_data(data):
     parsed_data = []
     for item in data:
@@ -1622,10 +1582,6 @@ def parse_csv_data(data):
             parsed_data.append(dict(zip(headers, row)))
     return parsed_data
 
-def clean_phone_number(phone_number):
-    # Удаляем все символы, кроме цифр
-    return re.sub(r'\D', '', phone_number)
-
 def insert_data(data, verify_phone, add_curator):
     global current_curator_index
     conn = sqlite3.connect(DATABASE2)
@@ -1635,10 +1591,7 @@ def insert_data(data, verify_phone, add_curator):
         name = row.get('Name', '')
         phone = row.get('Phone', '').lstrip('+')
         email = row.get('Email', '')
-        data_t = row.get('Date', '').lstrip('"')
-
-        # Очистка номера телефона
-        phone = clean_phone_number(phone)
+        data_t = row.get('Date', '').strip('"')
 
         cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
         user_exists = cursor.fetchone()
@@ -1671,9 +1624,6 @@ def insert_data(data, verify_phone, add_curator):
 
         try:
             cursor.execute(query, values)
-            # Отправка данных в Google Forms
-            user_data = dict(zip(columns, values))
-            send_to_google_forms(user_data, gog_url)
         except Exception as e:
             print(f"Error inserting row: {row}")
             print(f"Error message: {str(e)}")
@@ -1703,6 +1653,11 @@ def upload_csv():
         return jsonify({"message": "Data uploaded and inserted successfully"})
     return jsonify({"error": "Invalid file format"}), 400
 
+
+
+
+
+
 @app.route('/upl_csv', methods=['GET'])
 def se_upl_csv():
     api_sys_control = request.args.get('api_sys')
@@ -1717,6 +1672,15 @@ def se_upl_csv():
 
 
 
+
+
+
+
+
+
+
+
+
 DATABASE = 'data_gc.db'
 
 # Функция для очистки номера телефона