Update app.py

app.py

@@ -48,7 +48,7 @@ code_executed = False
 status = "active"
 
 
-
+verifikation_start = "1"
 
 
 
@@ -1632,16 +1632,15 @@ mapping_template_cur = {
 }
 
 DATABASE_NAME3 = 'data_gc.db'
-verifikation_start = "1"  # Пример значения, которое должно быть установлено из конфигурации
-
-
 def verify_phone_number(phone_number):
-    print(f"Starting phone verification for 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 for verification: {full_url_ver}")
+        print(f"Full URL: {full_url_ver}")
 
         # Создаем payload для запроса
         payload = json.dumps({
@@ -1655,13 +1654,13 @@ def verify_phone_number(phone_number):
         response = requests.post(full_url_ver, headers=headers, data=payload)
 
         # Печатаем статус ответа
-        print(f"Response Status Code from verification server: {response.status_code}")
+        print(f"Response Status Code: {response.status_code}")
 
         # Проверяем статус код ответа
         if response.status_code == 200:
             # Печатаем текст ответа от сервера
             response_body = response.json()
-            print(f"Response Body from verification server: {response_body}")
+            print(f"Response Body: {response_body}")
 
             # Извлекаем значение из JSON
             exists_whatsapp = response_body.get('existsWhatsapp', 'false')
@@ -1670,35 +1669,44 @@ def verify_phone_number(phone_number):
             # Возвращаем значение
             return exists_whatsapp
         else:
-            print("Error: Unable to fetch data from verification server")
+            print("Error: Unable to fetch data")
             return "Error"
     else:
         print("Verification not started")
         return "false"  # Возвращаем значение, что WhatsApp не существует
-
-def add_user_to_db(db_name, user_data):
-    conn = sqlite3.connect(db_name)
+def add_or_update_contact(contact_data):
+    conn = sqlite3.connect(DATABASE_NAME3)
     cursor = conn.cursor()
 
-    # Преобразование данных пользователя на основе шаблона сопоставления
-    transformed_data = {db_column: user_data.get(json_key, "") for json_key, db_column in mapping_template_cur.items()}
+    email = contact_data.get('email')
+    if not email:
+        logging.error(f"Missing email in contact data: {contact_data}")
+        return
 
-    # Добавление недостающих полей с пустыми строками
-    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"
+    # Добавление текущей даты и времени
+    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'
     ]
-    for field in required_fields:
-        if field not in transformed_data:
-            transformed_data[field] = ""
+    
+    placeholders = ", ".join([f"{field} = ?" for field in fields])
 
-    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())
+    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))
 
-    cursor.execute(insert_query, insert_values)
     conn.commit()
     conn.close()