Update app.py

app.py

@@ -1650,13 +1650,12 @@ def verify_phone_number(phone_number):
 
         if response.status_code == 200:
             result = response.json()
-            return result
+            return result.get('existsWhatsapp', False)
         else:
-            return {"existsWhatsapp": False}
+            return False
     else:
-        return {"existsWhatsapp": False}
+        return False
 
-# Flask route для добавления или обновления контакта с проверкой номера
 @app.route('/add_data_ver', methods=['GET'])
 def add_data_ver():
     try:
@@ -1668,35 +1667,22 @@ def add_data_ver():
         name = request.args.get('name')
         phone = request.args.get('phone')
         email = request.args.get('email')
-        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')
+        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', '')
         canal = request.args.get('canal', '')
 
         if not name or not phone or not email:
             return "Parameters 'name', 'phone', and 'email' are required.", 400
 
-        # Очистка номера телефона от знака "+"
+        # Clean up phone number by removing any leading plus sign
         if phone.startswith('+'):
             phone = phone[1:]
 
-        # Верификация номера телефона
-        verification_result = verify_phone_number(phone)
-        ws_status = verification_result.get('existsWhatsapp', False)
-
-        # Определение переменных, если они не передаются
-        vk_id = request.args.get('vk_id', None)
-        chat_id = request.args.get('chat_id', None)
-        ws_stop = request.args.get('ws_stop', None)
-        web_statys = request.args.get('web_statys', None)
-        fin_progress = request.args.get('fin_progress', None)
-        shop_statys_full = request.args.get('shop_statys_full', None)
-        ad_url = request.args.get('ad_url', None)
-        curator = request.args.get('curator', None)
-        key_pr = request.args.get('key_pr', None)
-        n_con = request.args.get('n_con', None)
+        # Выполнение верификации номера телефона и добавление в ws_st
+        ws_statys = verify_phone_number(phone)
 
         # Получение текущего времени в московском часовом поясе
         utc_now = datetime.utcnow()
@@ -1709,71 +1695,40 @@ def add_data_ver():
         cursor.execute('SELECT * FROM contacts WHERE phone = ? OR email = ?', (phone, email))
         existing_contact = cursor.fetchone()
 
+        # Преобразование данных пользователя для вставки
+        user_data = {
+            "name": name,
+            "phone": phone,
+            "email": email,
+            "ws_st": ws_statys,
+            "pr1": pr1,
+            "pr2": pr2,
+            "pr3": pr3,
+            "pr4": pr4,
+            "pr5": pr5,
+            "canal": canal,
+            "data_t": data_t
+        }
+
+        # Обработка полей, которые могут быть NULL
+        for field in ["vk_id", "chat_id", "ws_stop", "web_st", "fin_prog", "shop_st", "ad_url", "curator", "key_pr", "n_con"]:
+            user_data[field] = ""
+
         if existing_contact:
-            update_query = '''
-                UPDATE contacts SET
-                    name = ?, email = ?, vk_id = ?, chat_id = ?, ws_st = ?, ws_stop = ?, 
-                    web_st = ?, fin_prog = ?, shop_st = ?, ad_url = ?, curator = ?, key_pr = ?, n_con = ?, 
-                    canal = ?, data_t = ?
-            '''
-            params = [name, email, vk_id, chat_id, ws_status, ws_stop, web_statys, fin_progress,
-                      shop_statys_full, ad_url, curator, key_pr, n_con, canal, data_t]
-
-            if pr1 is not None:
-                update_query += ", pr1 = ?"
-                params.append(pr1)
-            if pr2 is not None:
-                update_query += ", pr2 = ?"
-                params.append(pr2)
-            if pr3 is not None:
-                update_query += ", pr3 = ?"
-                params.append(pr3)
-            if pr4 is not None:
-                update_query += ", pr4 = ?"
-                params.append(pr4)
-            if pr5 is not None:
-                update_query += ", pr5 = ?"
-                params.append(pr5)
-
-            update_query += " WHERE phone = ? OR email = ?"
-            params.extend([phone, email])
-
-            cursor.execute(update_query, params)
+            update_query = "UPDATE contacts SET "
+            update_values = []
+            for column, value in user_data.items():
+                update_query += f"{column} = ?, "
+                update_values.append(value)
+            update_query = update_query.rstrip(", ") + " WHERE phone = ? OR email = ?"
+            update_values.extend([phone, email])
+            cursor.execute(update_query, update_values)
         else:
-            insert_columns = '''
-                name, phone, email, vk_id, chat_id, ws_st, ws_stop, web_st, fin_prog, 
-                shop_st, ad_url, curator, key_pr, n_con, canal, data_t
-            '''
-            placeholders = '?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?'
-            params = [name, phone, email, vk_id, chat_id, ws_status, ws_stop, web_statys, fin_progress,
-                      shop_statys_full, ad_url, curator, key_pr, n_con, canal, data_t]
-
-            if pr1 is not None:
-                insert_columns += ", pr1"
-                placeholders += ", ?"
-                params.append(pr1)
-            if pr2 is not None:
-                insert_columns += ", pr2"
-                placeholders += ", ?"
-                params.append(pr2)
-            if pr3 is not None:
-                insert_columns += ", pr3"
-                placeholders += ", ?"
-                params.append(pr3)
-            if pr4 is not None:
-                insert_columns += ", pr4"
-                placeholders += ", ?"
-                params.append(pr4)
-            if pr5 is not None:
-                insert_columns += ", pr5"
-                placeholders += ", ?"
-                params.append(pr5)
-
-            insert_query = f'''
-                INSERT INTO contacts ({insert_columns}) VALUES ({placeholders})
-            '''
-
-            cursor.execute(insert_query, params)
+            columns = ', '.join(user_data.keys())
+            placeholders = ', '.join('?' for _ in user_data)
+            insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
+            insert_values = list(user_data.values())
+            cursor.execute(insert_query, insert_values)
 
         conn.commit()
         conn.close()
@@ -1798,8 +1753,6 @@ def add_data_ver():
 
 
 
-
-
 initialize_requests()