Update app.py

app.py

@@ -9,6 +9,16 @@ token = os.getenv('token')  # Ваш токен
 api_key = os.getenv('api_key')  # Ваш 
 
 
+
+headers = {
+    'Authorization': f'Bearer {token}',
+    'Content-Type': 'application/json'
+}
+
+
+
+
+
 datas = '0'
 name = '0'
 email = '0'
@@ -33,10 +43,7 @@ def send_request():
     api_token = request.form.get('api_token')
     group_id = request.form.get('group_id')
     url = f"https://api.notisend.ru/v1/email/lists/{group_id}/parameters"
-    headers = {
-        'Content-Type': 'application/json',
-        'Authorization': f'Bearer {api_token}'
-    }
+
     response = requests.get(url, headers=headers)
     data = response.json()
     return jsonify(data)
@@ -139,6 +146,34 @@ def save_db():
 
 
 
+def send_request(list_id, email, phone, name, param_phone, param_name):
+    """Функция для отправки запроса на сервер."""
+    data = {
+        "email": email,
+        "unconfirmed": False,
+        "values": [
+            {
+                "parameter_id": param_phone,
+                "kind": "string",
+                "list_id": list_id,
+                "title": "phone",
+                "value": phone
+            },
+            {
+                "parameter_id": param_name,
+                "kind": "string",
+                "list_id": list_id,
+                "title": "name",
+                "value": name
+            }
+        ]
+    }
+    headers = {
+        'Authorization': f'Bearer {token}',
+        'Content-Type': 'application/json'
+    }
+    response = requests.post(f"{base_url}/email/lists/{list_id}/recipients", json=data, headers=headers)
+    return response.json()
 
 
 
@@ -161,102 +196,13 @@ def handle_incoming_request():
     current_hour = current_datetime.hour
 
     if current_day in [0, 4, 5, 6]:  # Понедельник, Пятница, Суббота, Воскресенье
-        # Отправка в лист 1, лист 2 подряд
-
-        # Лист 1
-        data_1 = {
-            "email": email,
-            "unconfirmed": False,
-            "values": [
-                {
-                    "parameter_id": 393120,
-                    "kind": "string",
-                    "list_id": list_id_1,
-                    "title": "phone",
-                    "value": phone
-                },
-                {
-                    "parameter_id": 393119,
-                    "kind": "string",
-                    "list_id": list_id_1,
-                    "title": "name",
-                    "value": name
-                }
-            ]
-        }
-        headers = {
-            'Authorization': f'Bearer {token}',
-            'Content-Type': 'application/json'
-        }
-
-        # Отправляем первый запрос и сохраняем ответ
-        response_1 = requests.post(f"{base_url}/email/lists/{list_id_1}/recipients", json=data_1, headers=headers)
-
-        # Лист 2
-        data_2 = {
-            "email": email,
-            "unconfirmed": False,
-            "values": [
-                {
-                    "parameter_id": 393196,
-                    "kind": "string",
-                    "list_id": list_id_2,
-                    "title": "phone",
-                    "value": phone
-                },
-                {
-                    "parameter_id": 393195,
-                    "kind": "string",
-                    "list_id": list_id_2,
-                    "title": "name",
-                    "value": name
-                }
-            ]
-        }
-
-        # Добавляем заголовок для второго запроса
-        headers_2 = {
-            'Authorization': f'Bearer {token}',
-            'Content-Type': 'application/json'
-        }
-
-        # Отправляем второй запрос и сохраняем ответ
-        response_2 = requests.post(f"{base_url}/email/lists/{list_id_2}/recipients", json=data_2, headers=headers_2)
-
-
-        # Лист 3
-        data_3 = {
-            "email": email,
-            "unconfirmed": False,
-            "values": [
-                {
-                    "parameter_id": 393198,
-                    "kind": "string",
-                    "list_id": list_id_3,
-                    "title": "phone",
-                    "value": phone
-                },
-                {
-                    "parameter_id": 393197,
-                    "kind": "string",
-                    "list_id": list_id_3,
-                    "title": "name",
-                    "value": name
-                }
-            ]
-        }
-
-        # Добавляем заголовок для второго запроса
-        headers_3 = {
-            'Authorization': f'Bearer {token}',
-            'Content-Type': 'application/json'
-        }
-
-        # Отправляем второй запрос и сохраняем ответ
-        response_3 = requests.post(f"{base_url}/email/lists/{list_id_3}/recipients", json=data_3, headers=headers_3)
+        # Отправляем запросы в листы подряд
+        response_1 = send_request(list_id_1, email, phone, name, 393120, 393119)
+        response_2 = send_request(list_id_2, email, phone, name, 393196, 393195)
+        response_3 = send_request(list_id_3, email, phone, name, 393198, 393197)
 
         # Возвращаем список ответов
-        return {'responses': [response_1.json(), response_2.json(), response_3.json()]}    
+        return {'responses': [response_1, response_2, response_3]}  
 
     elif current_day == 1:  # Вторник
         if current_hour < 19:
@@ -267,7 +213,7 @@ def handle_incoming_request():
 
 
 
-            # Лист 1
+            # Вторник - Утро - Лист 1
             data_1 = {
                 "email": email,
                 "unconfirmed": False,
@@ -296,7 +242,34 @@ def handle_incoming_request():
             # Отправляем первый запрос и сохраняем ответ
             response_1 = requests.post(f"{base_url}/email/lists/{list_id_1}/recipients", json=data_1, headers=headers)
 
+            # Вторник - Утро - Лист 2
+            data_1 = {
+                "email": email,
+                "unconfirmed": False,
+                "values": [
+                    {
+                        "parameter_id": 393120,
+                        "kind": "string",
+                        "list_id": list_id_2,
+                        "title": "phone",
+                        "value": phone
+                    },
+                    {
+                        "parameter_id": 393119,
+                        "kind": "string",
+                        "list_id": list_id_2,
+                        "title": "name",
+                        "value": name
+                    }
+                ]
+            }
+            headers = {
+                'Authorization': f'Bearer {token}',
+                'Content-Type': 'application/json'
+            }
 
+            # Отправляем первый запрос и сохраняем ответ
+            response_2 = requests.post(f"{base_url}/email/lists/{list_id_1}/recipients", json=data_1, headers=headers)