Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, request, render_template, jsonify
+from flask import Flask, request, render_template_string
 import requests
 import os
 import pytz
@@ -18,33 +18,8 @@ list_id_1 = 560768
 list_id_2 = 560832
 list_id_3 = 560833
 
-# Инициализация Flask приложения
 app = Flask(__name__, template_folder="./")
 
-# Функция для отправки запроса на сервер
-def send_request(list_id, email, phone, name, param_name, param_phone, pr5, pr4, pr3, pr2, pr1, pr5_id, pr4_id, pr3_id, pr2_id, pr1_id):
-    data = {
-        "email": email,
-        "unconfirmed": False,
-        "values": [
-            {"parameter_id": pr5_id, "kind": "string", "list_id": list_id, "title": "pr5", "value": pr5},
-            {"parameter_id": pr4_id, "kind": "string", "list_id": list_id, "title": "pr4", "value": pr4},
-            {"parameter_id": pr3_id, "kind": "string", "list_id": list_id, "title": "pr3", "value": pr3},
-            {"parameter_id": pr2_id, "kind": "string", "list_id": list_id, "title": "pr2", "value": pr2},
-            {"parameter_id": pr1_id, "kind": "string", "list_id": list_id, "title": "pr1", "value": pr1},
-            {"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()
-
-# Функция для сохранения данных в SQLite3
 def init_db():
     conn = sqlite3.connect('data.db')
     cursor = conn.cursor()
@@ -66,10 +41,6 @@ def init_db():
 
 init_db()
 
-
-
-
-
 def save_to_database(name, email, phone, pr5, pr4, pr3, pr2, pr1):
     try:
         conn = sqlite3.connect('data.db')
@@ -83,16 +54,71 @@ def save_to_database(name, email, phone, pr5, pr4, pr3, pr2, pr1):
     except Exception as e:
         print(f"Error saving to database: {e}")
 
+def send_request(list_id, email, phone, name, param_name, param_phone, pr5, pr4, pr3, pr2, pr1, pr5_id, pr4_id, pr3_id, pr2_id, pr1_id):
+    """Функция для отправки запроса на сервер."""
+    data = {
+        "email": email,
+        "unconfirmed": False,
+        "values": [
+            {
+                "parameter_id": pr5_id,
+                "kind": "string",
+                "list_id": list_id,
+                "title": "pr5",
+                "value": pr5
+            },
+            {
+                "parameter_id": pr4_id,
+                "kind": "string",
+                "list_id": list_id,
+                "title": "pr4",
+                "value": pr4
+            },
+            {
+                "parameter_id": pr3_id,
+                "kind": "string",
+                "list_id": list_id,
+                "title": "pr3",
+                "value": pr3
+            },
+            {
+                "parameter_id": pr2_id,
+                "kind": "string",
+                "list_id": list_id,
+                "title": "pr2",
+                "value": pr2
+            },
+            {
+                "parameter_id": pr1_id,
+                "kind": "string",
+                "list_id": list_id,
+                "title": "pr1",
+                "value": pr1
+            },
+            {
+                "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()
 
-
-
-
-
-
-
-
-# Определение маршрута для обработки входящих POST-запросов
 @app.route('/incoming', methods=['POST'])
 def handle_incoming_request():
     datas = request.json
@@ -106,6 +132,9 @@ def handle_incoming_request():
     pr2 = datas.get('pr2')
     pr1 = datas.get('pr1')
 
+    # Сохраняем данные в базу данных SQLite3
+    save_to_database(name, email, phone, pr5, pr4, pr3, pr2, pr1)
+
     # Устанавливаем временную зону Москвы
     moscow_timezone = pytz.timezone('Europe/Moscow')
 
@@ -121,37 +150,22 @@ def handle_incoming_request():
         response_1 = send_request(560768, email, phone, name, 393120, 393119, pr5, pr4, pr3, pr2, pr1, 393248, 393247, 393246, 393245, 393244)
         response_2 = send_request(560832, email, phone, name, 393196, 393195, pr5, pr4, pr3, pr2, pr1, 393267, 393266, 393265, 393264, 393263)
         response_3 = send_request(560833, email, phone, name, 393198, 393197, pr5, pr4, pr3, pr2, pr1, 393272, 393271, 393270, 393269, 393268)
-        
-        # Сохраняем данные в базу данных SQLite3
-        save_to_database(name, email, phone, pr5, pr4, pr3, pr2, pr1)
-        
         # Возвращаем список ответов
-        return {'responses': [response_2, response_3]}
-        
+        return {'responses': [response_1,response_2,response_3]} 
     elif current_day == 1:  # Вторник
         if current_hour < 19:
             # Утром во вторник
-            # Комментарий: Отправка в лист 1, лист 2, лист 3
             response_1 = send_request(560768, email, phone, name, 393120, 393119, pr5, pr4, pr3, pr2, pr1, 393248, 393247, 393246, 393245, 393244)
             response_2 = send_request(560832, email, phone, name, 393196, 393195, pr5, pr4, pr3, pr2, pr1, 393267, 393266, 393265, 393264, 393263)
             response_3 = send_request(560833, email, phone, name, 393198, 393197, pr5, pr4, pr3, pr2, pr1, 393272, 393271, 393270, 393269, 393268)
-            
-            # Сохраняем данные в базу данных SQLite3
-            save_to_database(name, email, phone, pr5, pr4, pr3, pr2, pr1)
-            
             # Возвращаем список ответов
-            return {'responses': [response_1, response_2, response_3]}
+            return {'responses': [response_1,response_2,response_3]}
         else:
             # Вечером во вторник
-            # Комментарий: Отправка только лист 2, лист 3
             response_2 = send_request(560832, email, phone, name, 393196, 393195, pr5, pr4, pr3, pr2, pr1, 393267, 393266, 393265, 393264, 393263)
             response_3 = send_request(560833, email, phone, name, 393198, 393197, pr5, pr4, pr3, pr2, pr1, 393272, 393271, 393270, 393269, 393268)
-            
-            # Сохраняем данные в базу данных SQLite3
-            save_to_database(name, email, phone, pr5, pr4, pr3, pr2, pr1)
-            
             # Возвращаем список ответов
-            return {'responses': [response_2, response_3]}
+            return {'responses': [response_2,response_3]}
 
 
         
@@ -792,7 +806,6 @@ def show_contacts():
 
 
 
-
         
 
 if __name__ == '__main__':