Update app.py

app.py

@@ -48,7 +48,7 @@ code_executed = False
 status = "active"
 
 
-verifikation_start = "0"
+
 
 
 
@@ -1617,14 +1617,29 @@ def gc_forms():
 
 
 
-DATABASE_NAME3 = 'data_gc.db'
-def verify_phone_number(phone_number):
 
-    print(f"verifikation_start: {verifikation_start}")
 
-    if verifikation_start == "1":
+curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
+
+# Переменная для отслеживания текущего куратора
+current_curator_index = 0
+
+# Шаблон сопоставления для кураторов
+mapping_template_cur = {
+    'name': 'name',
+    'phone': 'phone',
+    'email': 'email',
+    'curator': 'curator'
+}
 
 
+verifikation_start = "1"  # Пример значения, которое должно быть установлено из конфигурации
+
+
+def verify_phone_number(phone_number):
+    print(f"verifikation_start: {verifikation_start}")
+
+    if verifikation_start == "1":
         full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
         print(f"Full URL: {full_url_ver}")
 
@@ -1660,177 +1675,6 @@ def verify_phone_number(phone_number):
     else:
         print("Verification not started")
         return "false"  # Возвращаем значение, что WhatsApp не существует
-def add_or_update_contact(contact_data):
-    conn = sqlite3.connect(DATABASE_NAME3)
-    cursor = conn.cursor()
-
-    email = contact_data.get('email')
-    if not email:
-        logging.error(f"Missing email in contact data: {contact_data}")
-        return
-
-    # Добавление текущей даты и времени
-    utc_now = datetime.utcnow()
-    msk_tz = pytz.timezone('Europe/Moscow')
-    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', 'ad_url', 'key_pr', 'n_con', 'canal', 'data_t'
-    ]
-    
-    placeholders = ", ".join([f"{field} = ?" for field in fields])
-
-    if contact:
-        update_query = f"UPDATE contacts SET {placeholders} WHERE id = ?"
-        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.get(field, '') for field in fields))
-
-    conn.commit()
-    conn.close()
-
-@app.route('/add_data_ver', methods=['GET'])
-def add_data_ver():
-    contact_data = {
-        'name': request.args.get('name', ''),
-        'phone': request.args.get('phone', ''),
-        'email': request.args.get('email', ''),
-        'vk_id': request.args.get('vk_id', ''),
-        'chat_id': request.args.get('chat_id', ''),
-        'ws_st': request.args.get('ws_st', ''),
-        'ws_stop': request.args.get('ws_stop', ''),
-        'web_st': request.args.get('web_st', ''),
-        'fin_prog': request.args.get('fin_prog', '5'),
-        'b_city': request.args.get('b_city', ''),
-        'b_fin': request.args.get('b_fin', ''),
-        'b_ban': request.args.get('b_ban', ''),
-        'b_ign': request.args.get('b_ign', ''),
-        'b_baners': request.args.get('b_baners', ''),
-        'b_butt': request.args.get('b_butt', ''),
-        'b_mess': request.args.get('b_mess', ''),
-        'shop_st': request.args.get('shop_st', ''),
-        'curator': request.args.get('curator', ''),
-        'pr1': request.args.get('pr1', ''),
-        'pr2': request.args.get('pr2', ''),
-        'pr3': request.args.get('pr3', ''),
-        'pr4': request.args.get('pr4', ''),
-        'pr5': request.args.get('pr5', ''),
-        'ad_url': request.args.get('ad_url', ''),
-        'key_pr': request.args.get('key_pr', ''),
-        'n_con': request.args.get('n_con', ''),
-        'canal': request.args.get('canal', ''),
-        'data_t': ''  # Будет заполнено в функции add_or_update_contact
-    }
-
-    phone_verification_response = verify_phone_number(contact_data['phone'])
-    if phone_verification_response is not None:
-        contact_data['ws_st'] = phone_verification_response
-
-    try:
-        add_or_update_contact(contact_data)
-        return jsonify({'status': 'success'})
-    except Exception as e:
-        logging.error(f"Error adding/updating contact: {e}")
-        return jsonify({'status': 'error', 'message': str(e)}), 500
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Пример шаблона сопоставления для настройки переменных записываемых в базу данных. - Не проверин
-mapping_template3 = {
-    'name': 'name',
-    'phone': 'phone',
-    'email': 'email'
-}
-
-def add_user_bot(db_name, user_data, mapping_template3):
-    conn = sqlite3.connect(db_name)
-    cursor = conn.cursor()
-
-    # Проверка наличия пользователя по email
-    email = user_data.get('email')
-    cursor.execute("SELECT 1 FROM contacts WHERE email = ?", (email,))
-    if cursor.fetchone() is not None:
-        logging.warning(f"User with email {email} already exists. Skipping insert.")
-        conn.close()
-        return
-
-    # Преобразование данных пользователя на основе шаблона сопоставления
-    transformed_data = {db_column: user_data.get(json_key, "") for json_key, db_column in mapping_template3.items()}
-
-    # Добавление недостающих полей с пустыми строками
-    required_fields = [
-        "ad_url", "b_ban", "b_baners", "b_butt", "b_city", "b_fin", "b_ign", "b_mess",
-        "canal", "chat_id", "curator", "data_t", "fin_prog", "key_pr", "n_con",
-        "pr1", "pr2", "pr3", "pr4", "pr5", "shop_st", "vk_id", "web_st", "ws_st", "ws_stop"
-    ]
-    for field in required_fields:
-        if field not in transformed_data:
-            transformed_data[field] = ""
-
-    columns = ', '.join(transformed_data.keys())
-    placeholders = ', '.join('?' for _ in transformed_data)
-    insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
-    insert_values = list(transformed_data.values())
-
-    cursor.execute(insert_query, insert_values)
-    conn.commit()
-    conn.close()
-
-@app.route('/add_user_bot', methods=['GET'])
-def add_user_bot_route():
-    db_name = request.args.get('db_name', 'data_gc.db')  # Имя базы данных из параметра запроса
-    user_data = {key: request.args.get(key, "") for key in mapping_template3.keys()}
-
-    logging.debug(f"User data: {user_data}")
-
-    try:
-        add_user_bot(db_name, user_data, mapping_template3)
-        return jsonify({'status': 'success', 'message': f'User added to {db_name}'})
-    except Exception as e:
-        logging.error(f"Error adding user: {e}")
-        return jsonify({'status': 'error', 'message': str(e)}), 500
-
-
-
-# Конец примера шаблона сопоставления для настройки переменных записываемых в базу данных.
-
-
-# Список кураторов
-curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
-
-# Переменная для отслеживания текущего куратора
-current_curator_index = 0
-
-# Шаблон сопоставления для кураторов
-mapping_template_cur = {
-    'name': 'name',
-    'phone': 'phone',
-    'email': 'email',
-    'curator': 'curator'
-}
 
 def add_user_to_db(db_name, user_data):
     conn = sqlite3.connect(db_name)
@@ -1858,8 +1702,8 @@ def add_user_to_db(db_name, user_data):
     conn.commit()
     conn.close()
 
-@app.route('/add_user_cur', methods=['GET'])
-def add_user_cur_route():
+@app.route('/add_data_ver_cur', methods=['GET'])
+def add_data_ver_cur():
     global current_curator_index
 
     # Получаем данные пользователя из параметров запроса
@@ -1868,14 +1712,19 @@ def add_user_cur_route():
     # Назначаем текущего куратора
     user_data['curator'] = curators[current_curator_index]
 
-    # Добавляем пользователя в базу данных
-    add_user_to_db('data_gc.db', user_data)
-
-    # Переходим к следующему куратору
-    current_curator_index = (current_curator_index + 1) % len(curators)
-
-    return jsonify({'status': 'success', 'message': f'User added with curator {user_data["curator"]}'})
+    # Верификация номера телефона
+    phone_verification_response = verify_phone_number(user_data['phone'])
+    if phone_verification_response is not None:
+        user_data['ws_st'] = phone_verification_response
 
+    try:
+        # Добавляем пользователя в базу данных
+        add_user_to_db(DATABASE_NAME3, user_data)
+        current_curator_index = (current_curator_index + 1) % len(curators)
+        return jsonify({'status': 'success', 'message': f'User added with curator {user_data["curator"]}'})
+    except Exception as e:
+        logging.error(f"Error adding user: {e}")
+        return jsonify({'status': 'error', 'message': str(e)}), 500