Update app.py

app.py

@@ -724,9 +724,6 @@ def data_gc_tab_out():
 
 DATABASE_NAME = 'data_gc.db'
 
-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}"
-
-
 def update_or_insert_user(db_name, user_data, mapping_template):
     conn = sqlite3.connect(db_name)
     cursor = conn.cursor()
@@ -826,19 +823,52 @@ def update_or_insert_user(db_name, user_data, mapping_template):
     conn.close()
     logging.debug(f"User with email {email} processed successfully")
 
-    # Отправляем данные в Google форму
-    url = generate_gog_url(transformed_data)
-    send_request(url, {})
-
-def send_request(url, data):
-    response = requests.post(url, data=data)
+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(f"Request sent successfully: {response.url}")
+        logging.info("Data successfully sent to Google Forms")
     else:
-        logging.error(f"Failed to send request: {response.status_code} - {response.text}")
+        logging.error(f"Failed to send data to Google Forms: {response.status_code}")
 
 @app.route('/send_request', methods=['POST'])
-def send_request_route():
+def send_request():
     token = request.form.get('token')
     min_date = request.form.get('minDate')
     type = request.form.get('type')
@@ -894,6 +924,7 @@ def send_get_request():
             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)
                 processed_emails.add(email)
 
         return jsonify({'status': 'User data saved successfully'})
@@ -943,50 +974,13 @@ def webhookbz():
             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)
                 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
 
-def generate_gog_url(user_data):
-    url = gog_url.format(
-        viewform='viewform',
-        name=quote(str(user_data.get('name', ''))),
-        email=quote(str(user_data.get('email', ''))),
-        phone=quote(str(user_data.get('phone', ''))),
-        vk_id=quote(str(user_data.get('vk_id', ''))),
-        chat_id=quote(str(user_data.get('chat_id', ''))),
-        ws_st=quote(str(user_data.get('ws_st', ''))),
-        ws_stop=quote(str(user_data.get('ws_stop', ''))),
-        web_st=quote(str(user_data.get('web_st', ''))),
-        fin_prog=quote(str(user_data.get('fin_prog', ''))),
-        b_city=quote(str(user_data.get('b_city', ''))),
-        b_fin=quote(str(user_data.get('b_fin', ''))),
-        b_ban=quote(str(user_data.get('b_ban', ''))),
-        b_ign=quote(str(user_data.get('b_ign', ''))),
-        b_baners=quote(str(user_data.get('b_baners', ''))),
-        b_butt=quote(str(user_data.get('b_butt', ''))),
-        b_mess=quote(str(user_data.get('b_mess', ''))),
-        shop_st=quote(str(user_data.get('shop_st', ''))),
-        curator=quote(str(user_data.get('curator', ''))),
-        pr1=quote(str(user_data.get('pr1', ''))),
-        pr2=quote(str(user_data.get('pr2', ''))),
-        pr3=quote(str(user_data.get('pr3', ''))),
-        pr4=quote(str(user_data.get('pr4', ''))),
-        pr5=quote(str(user_data.get('pr5', ''))),
-        gc_url=quote(str(user_data.get('gc_url', ''))),
-        key_pr=quote(str(user_data.get('key_pr', ''))),
-        n_con=quote(str(user_data.get('n_con', ''))),
-        canal=quote(str(user_data.get('canal', ''))),
-        data_t=quote(str(user_data.get('data_t', ''))),
-        utm_source=quote(str(user_data.get('utm_source', ''))),
-        utm_medium=quote(str(user_data.get('utm_medium', ''))),
-        utm_campaign=quote(str(user_data.get('utm_campaign', ''))),
-        utm_term=quote(str(user_data.get('utm_term', ''))),
-        utm_content=quote(str(user_data.get('utm_content', '')))
-    )
-    return url