Update app.py

app.py

@@ -714,7 +714,7 @@ def data_gc_tab_out():
 
 
 
-
+gog_url = "https://docs.google.com/formResponse/d/e/1FAIpQLSc-JbmXvgpgGq6KrkXsYSsfMACVMyIDnNqrHy6jImGeSRcpiQ/{viewform}?usp=pp_url&entry.1556100878={name}&entry.1477412341={email}&entry.1634985541={phone}&entry.1736544219={vk_id}&entry.62153872={chat_id}&entry.1913752768={ws_st}&entry.1768186232={ws_stop}&entry.1198983592={web_st}&entry.994770784={fin_prog}&entry.910932310={b_city}&entry.1923801792={b_fin}&entry.2005444720={b_ban}&entry.741087361={b_ign}&entry.1316159837={b_baners}&entry.355123557={b_butt}&entry.395996312={b_mess}&entry.646571729={shop_st}&entry.578527800={curator}&entry.1936838964={pr1}&entry.1375537366={pr2}&entry.1249356084={pr3}&entry.752547226={pr4}&entry.704766458={pr5}&entry.1837661={gc_url}&entry.398837750={key_pr}&entry.225564240={n_con}&entry.1642320872={canal}&entry.1581826411={data_t}&entry.311131724={utm_source}&entry.1904279859={utm_medium}&entry.740234546={utm_campaign}&entry.880981295={utm_term}&entry.431306383={utm_content}"
 
 
 
@@ -724,7 +724,20 @@ def data_gc_tab_out():
 
 DATABASE_NAME = 'data_gc.db'
 
-def update_or_insert_user(db_name, user_data, mapping_template):
+def send_to_google_forms(user_data, gog_url):
+    # Формирование URL с параметрами
+    url = gog_url.format(**user_data)
+    
+    # Отправка POST-запроса
+    response = requests.post(url)
+    
+    if response.status_code == 200:
+        logging.debug(f"Data sent to Google Forms successfully for user: {user_data.get('email')}")
+    else:
+        logging.error(f"Failed to send data to Google Forms for user: {user_data.get('email')}. Response: {response.text}")
+
+        
+def update_or_insert_user(db_name, user_data, mapping_template, gog_url):
     conn = sqlite3.connect(db_name)
     cursor = conn.cursor()
 
@@ -744,11 +757,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
     if user:
         current_web_st = user[0] if user[0] is not None and user[0] != "" else 0
         web_st_value = int(current_web_st) + 1
-        logging.debug(f"Calculated web_st_value: {web_st_value}")
-
         current_messages = user[1] if user[1] is not None else ""
-        logging.debug(f"Current messages: {current_messages}")
-
         cursor.execute("UPDATE contacts SET web_st = ? WHERE email = ?", (web_st_value, email))
         conn.commit()
         conn.close()
@@ -763,7 +772,6 @@ def update_or_insert_user(db_name, user_data, mapping_template):
     transformed_data = {}
     for json_key, db_column in mapping_template.items():
         value = user_data.get(json_key, "")
-        
         if isinstance(value, list):
             if all(isinstance(item, str) for item in value):
                 transformed_data[db_column] = "; ".join(value)
@@ -823,49 +831,9 @@ def update_or_insert_user(db_name, user_data, mapping_template):
     conn.close()
     logging.debug(f"User with email {email} processed successfully")
 
-def send_to_google_forms(data):
-    form_url = (
-        "https://docs.google.com/forms/d/e/1FAIpQLSc-JbmXvgpgGq6KrkXsYSsfMACVMyIDnNqrHy6jImGeSRcpiQ/viewform?"
-        "usp=pp_url"
-        f"&name={data.get('name', '')}"
-        f"&email={data.get('email', '')}"
-        f"&phone={data.get('phone', '')}"
-        f"&vk_id={data.get('vk_id', '')}"
-        f"&chat_id={data.get('chat_id', '')}"
-        f"&ws_st={data.get('ws_st', '')}"
-        f"&ws_stop={data.get('ws_stop', '')}"
-        f"&web_st={data.get('web_st', '')}"
-        f"&fin_prog={data.get('fin_prog', '')}"
-        f"&b_city={data.get('b_city', '')}"
-        f"&b_fin={data.get('b_fin', '')}"
-        f"&b_ban={data.get('b_ban', '')}"
-        f"&b_ign={data.get('b_ign', '')}"
-        f"&b_baners={data.get('b_baners', '')}"
-        f"&b_butt={data.get('b_butt', '')}"
-        f"&b_mess={data.get('b_mess', '')}"
-        f"&shop_st={data.get('shop_st', '')}"
-        f"&curator={data.get('curator', '')}"
-        f"&pr1={data.get('pr1', '')}"
-        f"&pr2={data.get('pr2', '')}"
-        f"&pr3={data.get('pr3', '')}"
-        f"&pr4={data.get('pr4', '')}"
-        f"&pr5={data.get('pr5', '')}"
-        f"&gc_url={data.get('gc_url', '')}"
-        f"&key_pr={data.get('key_pr', '')}"
-        f"&n_con={data.get('n_con', '')}"
-        f"&canal={data.get('canal', '')}"
-        f"&data_t={data.get('data_t', '')}"
-        f"&utm_source={data.get('utm_source', '')}"
-        f"&utm_medium={data.get('utm_medium', '')}"
-        f"&utm_campaign={data.get('utm_campaign', '')}"
-        f"&utm_term={data.get('utm_term', '')}"
-        f"&utm_content={data.get('utm_content', '')}"
-    )
-    response = requests.post(form_url)
-    if response.status_code == 200:
-        logging.info("Data successfully sent to Google Forms")
-    else:
-        logging.error(f"Failed to send data to Google Forms: {response.status_code}")
+    # Отправка данных в Google Forms
+    send_to_google_forms(transformed_data, gog_url)
+
 
 @app.route('/send_request', methods=['POST'])
 def send_request():
@@ -883,6 +851,9 @@ def send_request():
     else:
         return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
 
+
+
+
 @app.route('/send_get_request', methods=['GET'])
 def send_get_request():
     token = request.args.get('token')
@@ -891,7 +862,7 @@ def send_get_request():
 
     try:
         response = requests.get(url, headers={'X-Token': token})
-        response.raise_for_status()
+        response.raise_for_status()  # Проверка на ошибки HTTP
         data = response.json()
 
         if data is None or 'report' not in data:
@@ -923,8 +894,7 @@ def send_get_request():
             user_data['messages'] = user_messages
             email = user_data.get('email')
             if email and email not in processed_emails:
-                update_or_insert_user(DATABASE_NAME, user_data, mapping_template)
-                send_to_google_forms(user_data)
+                update_or_insert_user(DATABASE_NAME, user_data, mapping_template, gog_url)
                 processed_emails.add(email)
 
         return jsonify({'status': 'User data saved successfully'})
@@ -973,18 +943,14 @@ def webhookbz():
             user_data['messages'] = user_messages
             email = user_data.get('email')
             if email and email not in processed_emails:
-                update_or_insert_user(DATABASE_NAME, user_data, mapping_template)
-                send_to_google_forms(user_data)
+                update_or_insert_user(DATABASE_NAME, user_data, mapping_template, gog_url)
                 processed_emails.add(email)
 
         return jsonify({'status': 'User data saved successfully'})
     else:
         return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
 
-
-
-
-
+