Update app.py

app.py

@@ -282,20 +282,6 @@ def initialize_requests():
 
 
 
-def send_test_data():
-    GOOGLE_FORM_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}"
-    )
-    
-    response = requests.post(GOOGLE_FORM_URL)
-    
-    if response.status_code == 200:
-        print("Data sent successfully.")
-    else:
-        print(f"Failed to send data: {response.status_code}, {response.text}")
-
-send_test_data()
-
 
 
 
@@ -735,105 +721,12 @@ def data_gc_tab_out():
 DATABASE_NAME = 'data_gc.db'
 
 
+DATABASE_NAME = 'data_gc.db'
+DATABASES = ['data_gc.db', 'data1.db', 'data2.db', 'data3.db', 'data4.db', 'data5.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}"
 
 
-# URL Google Формы как переменная
-GOOGLE_FORM_URL = (
-    "https://docs.google.com/formResponse/d/e/1FAIpQLSc-JbmXvgpgGq6KrkXsYSsfMACVMyIDnNqrHy6jImGeSRcpiQ/formResponse"
-    "?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}"
-)
-
-# Определяем шаблон для маппинга
-mapping_template_log = {
-    'name': 'name',
-    'email': 'email',
-    'phone': 'phone',
-    'vk_id': 'vk_id',
-    'chat_id': 'chat_id',
-    'ws_st': 'ws_st',
-    'ws_stop': 'ws_stop',
-    'web_st': 'web_st',
-    'fin_prog': 'fin_prog',
-    'b_city': 'b_city',
-    'b_fin': 'b_fin',
-    'b_ban': 'b_ban',
-    'b_ign': 'b_ign',
-    'b_baners': 'b_baners',
-    'b_butt': 'b_butt',
-    'b_mess': 'b_mess',
-    'shop_st': 'shop_st',
-    'curator': 'curator',
-    'pr1': 'pr1',
-    'pr2': 'pr2',
-    'pr3': 'pr3',
-    'pr4': 'pr4',
-    'pr5': 'pr5',
-    'gc_url': 'gc_url',
-    'key_pr': 'key_pr',
-    'n_con': 'n_con',
-    'canal': 'canal',
-    'data_t': 'data_t',
-    'utm_source': 'utm_source',
-    'utm_medium': 'utm_medium',
-    'utm_campaign': 'utm_campaign',
-    'utm_term': 'utm_term',
-    'utm_content': 'utm_content'
-}
-
-
-
-def send_data_to_google_form(data):
-    # Используем переменную GOOGLE_FORM_URL для формирования ссылки
-    google_form_url = GOOGLE_FORM_URL.format(
-        name=data.get('name', ''),
-        email=data.get('email', ''),
-        phone=data.get('phone', ''),
-        vk_id=data.get('vk_id', ''),
-        chat_id=data.get('chat_id', ''),
-        ws_st=data.get('ws_st', ''),
-        ws_stop=data.get('ws_stop', ''),
-        web_st=data.get('web_st', ''),
-        fin_prog=data.get('fin_prog', ''),
-        b_city=data.get('b_city', ''),
-        b_fin=data.get('b_fin', ''),
-        b_ban=data.get('b_ban', ''),
-        b_ign=data.get('b_ign', ''),
-        b_baners=data.get('b_baners', ''),
-        b_butt=data.get('b_butt', ''),
-        b_mess=data.get('b_mess', ''),
-        shop_st=data.get('shop_st', ''),
-        curator=data.get('curator', ''),
-        pr1=data.get('pr1', ''),
-        pr2=data.get('pr2', ''),
-        pr3=data.get('pr3', ''),
-        pr4=data.get('pr4', ''),
-        pr5=data.get('pr5', ''),
-        gc_url=data.get('gc_url', ''),
-        key_pr=data.get('key_pr', ''),
-        n_con=data.get('n_con', ''),
-        canal=data.get('canal', ''),
-        data_t=data.get('data_t', ''),
-        utm_source=data.get('utm_source', ''),
-        utm_medium=data.get('utm_medium', ''),
-        utm_campaign=data.get('utm_campaign', ''),
-        utm_term=data.get('utm_term', ''),
-        utm_content=data.get('utm_content', '')
-    )
-    
-    response = requests.post(google_form_url)
-    if response.status_code != 200:
-        logging.error(f"Failed to send data to Google Form: {response.status_code}, {response.text}")
-    else:
-        logging.info(f"Data sent to Google Form successfully: {response.status_code}")
-
-def update_or_insert_user(db_name, user_data, mapping_template_log):
+def update_or_insert_user(db_name, user_data, mapping_template):
     conn = sqlite3.connect(db_name)
     cursor = conn.cursor()
 
@@ -843,7 +736,7 @@ def update_or_insert_user(db_name, user_data, mapping_template_log):
         return
 
     logging.debug(f"Processing user with email: {email}")
-    
+
     cursor.execute("SELECT web_st, b_mess FROM contacts WHERE email = ?", (email,))
     user = cursor.fetchone()
     logging.debug(f"User found: {user}")
@@ -870,7 +763,7 @@ def update_or_insert_user(db_name, user_data, mapping_template_log):
     cursor = conn.cursor()
 
     transformed_data = {}
-    for json_key, db_column in mapping_template_log.items():
+    for json_key, db_column in mapping_template.items():
         value = user_data.get(json_key, "")
         
         if isinstance(value, list):
@@ -883,58 +776,68 @@ def update_or_insert_user(db_name, user_data, mapping_template_log):
             transformed_data[db_column] = str(value)
     logging.debug(f"Transformed data: {transformed_data}")
 
-    insert_query = f"""
-    INSERT INTO contacts (name, phone, email, vk_id, chat_id, ws_st, ws_stop, web_st, fin_prog, b_city, b_fin, b_ban, b_ign, b_baners, b_butt, b_mess, shop_st, curator, pr1, pr2, pr3, pr4, pr5, gc_url, key_pr, n_con, canal, data_t, utm_source, utm_medium, utm_campaign, utm_term, utm_content)
-    VALUES (:name, :phone, :email, :vk_id, :chat_id, :ws_st, :ws_stop, :web_st, :fin_prog, :b_city, :b_fin, :b_ban, :b_ign, :b_baners, :b_butt, :b_mess, :shop_st, :curator, :pr1, :pr2, :pr3, :pr4, :pr5, :gc_url, :key_pr, :n_con, :canal, :data_t, :utm_source, :utm_medium, :utm_campaign, :utm_term, :utm_content)
-    """
-    
-    insert_values = {
-        'name': transformed_data.get('name', ''),
-        'phone': transformed_data.get('phone', ''),
-        'email': transformed_data.get('email', ''),
-        'vk_id': transformed_data.get('vk_id', ''),
-        'chat_id': transformed_data.get('chat_id', ''),
-        'ws_st': transformed_data.get('ws_st', ''),
-        'ws_stop': transformed_data.get('ws_stop', ''),
-        'web_st': transformed_data.get('web_st', ''),
-        'fin_prog': transformed_data.get('fin_prog', ''),
-        'b_city': transformed_data.get('b_city', ''),
-        'b_fin': transformed_data.get('b_fin', ''),
-        'b_ban': transformed_data.get('b_ban', ''),
-        'b_ign': transformed_data.get('b_ign', ''),
-        'b_baners': transformed_data.get('b_baners', ''),
-        'b_butt': transformed_data.get('b_butt', ''),
-        'b_mess': transformed_data.get('b_mess', ''),
-        'shop_st': transformed_data.get('shop_st', ''),
-        'curator': transformed_data.get('curator', ''),
-        'pr1': transformed_data.get('pr1', ''),
-        'pr2': transformed_data.get('pr2', ''),
-        'pr3': transformed_data.get('pr3', ''),
-        'pr4': transformed_data.get('pr4', ''),
-        'pr5': transformed_data.get('pr5', ''),
-        'gc_url': transformed_data.get('gc_url', ''),
-        'key_pr': transformed_data.get('key_pr', ''),
-        'n_con': transformed_data.get('n_con', ''),
-        'canal': transformed_data.get('canal', ''),
-        'data_t': transformed_data.get('data_t', ''),
-        'utm_source': transformed_data.get('utm_source', ''),
-        'utm_medium': transformed_data.get('utm_medium', ''),
-        'utm_campaign': transformed_data.get('utm_campaign', ''),
-        'utm_term': transformed_data.get('utm_term', ''),
-        'utm_content': transformed_data.get('utm_content', '')
-    }
-    logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
-    cursor.execute(insert_query, insert_values)
+    required_fields = [
+        "vk_id", "chat_id", "ws_st", "ws_stop", "web_st", "fin_prog",
+        "b_city", "b_fin", "b_ban", "b_ign", "b_baners", "b_butt", "b_mess",
+        "shop_st", "curator", "pr1", "pr2", "pr3", "pr4", "pr5", "gc_url",
+        "key_pr", "n_con", "canal", "data_t", 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'
+    ]
+    for field in required_fields:
+        if field not in transformed_data:
+            transformed_data[field] = ""
+    logging.debug(f"Transformed data after adding required fields: {transformed_data}")
+
+    if 'phone' in user_data:
+        phone = user_data['phone']
+        if phone.startswith('+'):
+            phone = phone[1:]
+        transformed_data['phone'] = phone
+    logging.debug(f"Transformed data after phone processing: {transformed_data}")
+
+    transformed_data['web_st'] = web_st_value
+
+    new_messages = transformed_data.get('b_mess', "")
+    if current_messages:
+        transformed_data['b_mess'] = current_messages + "; " + new_messages
+    else:
+        transformed_data['b_mess'] = new_messages
+    logging.debug(f"Transformed data after message processing: {transformed_data}")
+
+    if user:
+        update_query = "UPDATE contacts SET "
+        update_values = []
+        for column, value in transformed_data.items():
+            update_query += f"{column} = ?, "
+            update_values.append(value)
+        update_query = update_query.rstrip(", ") + " WHERE email = ?"
+        update_values.append(email)
+        logging.debug(f"Update query: {update_query} with values: {update_values}")
+        cursor.execute(update_query, update_values)
+    else:
+        columns = ', '.join(transformed_data.keys())
+        placeholders = ', '.join('?' for _ in transformed_data)
+        insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
+        insert_values = list(transformed_data.values())
+        logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
+        cursor.execute(insert_query, insert_values)
 
     conn.commit()
     conn.close()
     logging.debug(f"User with email {email} processed successfully")
 
-    # Отправляем данные в Google Форму после обновления/вставки
-    send_data_to_google_form(transformed_data)
+    # Отправляем данные в Google форму
+    url = generate_gog_url(transformed_data)
+    send_request(url, {})
+
+def send_request(url, data):
+    response = requests.post(url, data=data)
+    if response.status_code == 200:
+        logging.info(f"Request sent successfully: {response.url}")
+    else:
+        logging.error(f"Failed to send request: {response.status_code} - {response.text}")
 
 @app.route('/send_request', methods=['POST'])
-def send_request():
+def send_request_route():
     token = request.form.get('token')
     min_date = request.form.get('minDate')
     type = request.form.get('type')
@@ -1045,8 +948,43 @@ def webhookbz():
     else:
         return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
 
-
-
+def generate_gog_url(user_data):
+    data_dict = {
+        'name': quote(user_data.get('name', '')),
+        'email': quote(user_data.get('email', '')),
+        'phone': quote(user_data.get('phone', '')),
+        'vk_id': quote(user_data.get('vk_id', '')),
+        'chat_id': quote(user_data.get('chat_id', '')),
+        'ws_st': quote(user_data.get('ws_st', '')),
+        'ws_stop': quote(user_data.get('ws_stop', '')),
+        'web_st': quote(user_data.get('web_st', '')),
+        'fin_prog': quote(user_data.get('fin_prog', '')),
+        'b_city': quote(user_data.get('b_city', '')),
+        'b_fin': quote(user_data.get('b_fin', '')),
+        'b_ban': quote(user_data.get('b_ban', '')),
+        'b_ign': quote(user_data.get('b_ign', '')),
+        'b_baners': quote(user_data.get('b_baners', '')),
+        'b_butt': quote(user_data.get('b_butt', '')),
+        'b_mess': quote(user_data.get('b_mess', '')),
+        'shop_st': quote(user_data.get('shop_st', '')),
+        'curator': quote(user_data.get('curator', '')),
+        'pr1': quote(user_data.get('pr1', '')),
+        'pr2': quote(user_data.get('pr2', '')),
+        'pr3': quote(user_data.get('pr3', '')),
+        'pr4': quote(user_data.get('pr4', '')),
+        'pr5': quote(user_data.get('pr5', '')),
+        'gc_url': quote(user_data.get('gc_url', '')),
+        'key_pr': quote(user_data.get('key_pr', '')),
+        'n_con': quote(user_data.get('n_con', '')),
+        'canal': quote(user_data.get('canal', '')),
+        'data_t': quote(user_data.get('data_t', '')),
+        'utm_source': quote(user_data.get('utm_source', '')),
+        'utm_medium': quote(user_data.get('utm_medium', '')),
+        'utm_campaign': quote(user_data.get('utm_campaign', '')),
+        'utm_term': quote(user_data.get('utm_term', '')),
+        'utm_content': quote(user_data.get('utm_content', ''))
+    }
+    return gog_url.format(**data_dict)