Update app.py

app.py

@@ -1628,54 +1628,6 @@ def gc_forms():
 
 DATABASE_NAME3 = 'data_gc.db'
 
-def verify_phone_number(phone_number):
-    verifikation_start = "1"
-    print(f"verifikation_start: {verifikation_start}")
-
-    if verifikation_start == "1":
-        # Переменные окружения для сборки URL
-        wa_url = "https://api.green-api.com/waInstance"
-        wa_ak = "1101952913"
-        ws_url_ver = "/checkWhatsapp/"
-        wa_api_key = "fb4986a9d9cb40ef9be6c7b08cb9c98b7a3b1dc8c6834b0b92"
-
-        full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
-        print(f"Full URL: {full_url_ver}")
-
-        # Создаем payload для запроса
-        payload = json.dumps({
-            "phoneNumber": phone_number
-        })
-        headers = {
-            'Content-Type': 'application/json'
-        }
-
-        # Отправляем POST-запрос
-        response = requests.post(full_url_ver, headers=headers, data=payload)
-
-        # Печатаем статус ответа
-        print(f"Response Status Code: {response.status_code}")
-
-        # Проверяем статус код ответа
-        if response.status_code == 200:
-            # Печатаем текст ответа от сервера
-            response_body = response.json()
-            print(f"Response Body: {response_body}")
-
-            # Извлекаем значение из JSON
-            exists_whatsapp = response_body.get('existsWhatsapp', 'false')
-            print(f"existsWhatsapp: {exists_whatsapp}")
-
-            # Возвращаем значение
-            return exists_whatsapp
-        else:
-            print("Error: Unable to fetch data")
-            return "Error"
-    else:
-        print("Verification not started")
-        return "Verification not started"
-
-# Функция для добавления или обновления контакта в базе данных
 def add_or_update_contact(contact_data):
     conn = sqlite3.connect(DATABASE_NAME3)
     cursor = conn.cursor()
@@ -1685,10 +1637,15 @@ def add_or_update_contact(contact_data):
         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()
 
-    # List all fields for updating or inserting
     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',
@@ -1699,52 +1656,50 @@ def add_or_update_contact(contact_data):
 
     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]))
+        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))
+        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', '          _'),
+        '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': request.args.get('data_t', '_')
+        '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  # Сохраняем значение в поле ws_st
+        contact_data['ws_st'] = phone_verification_response
 
     try:
         add_or_update_contact(contact_data)