Update app.py

app.py

@@ -771,109 +771,103 @@ def send_request():
 
 DATABASE_NAME = 'data_gc.db'
 
-def update_or_insert_user(db_name, user_data, mapping_template):
-    conn = sqlite3.connect(db_name)
-    cursor = conn.cursor()
+def create_connection(db_file):
+    conn = sqlite3.connect(db_file)
+    return conn
+
+def select_user_by_email(conn, email):
+    cur = conn.cursor()
+    cur.execute("SELECT web_st FROM contacts WHERE email=?", (email,))
+    return cur.fetchone()
+
+def update_user(conn, data):
+    query = """
+    UPDATE contacts SET name = ?, phone = ?, email = ?, b_city = ?, b_fin = ?, b_ban = ?, b_ign = ?, b_baners = ?, b_butt = ?, b_mess = ?, 
+    vk_id = ?, chat_id = ?, ws_st = ?, ws_stop = ?, web_st = ?, fin_prog = ?, shop_st = ?, curator = ?, pr1 = ?, pr2 = ?, pr3 = ?, pr4 = ?, pr5 = ?, 
+    ad_url = ?, key_pr = ?, n_con = ?, canal = ?, data_t = ?, web_st = ? WHERE email = ?
+    """
+    cur = conn.cursor()
+    cur.execute(query, data)
+    conn.commit()
 
-    email = user_data.get('email')
+def insert_user(conn, data):
+    query = """
+    INSERT INTO contacts (name, phone, email, b_city, b_fin, b_ban, b_ign, b_baners, b_butt, b_mess, vk_id, chat_id, ws_st, ws_stop, web_st, 
+    fin_prog, shop_st, curator, pr1, pr2, pr3, pr4, pr5, ad_url, key_pr, n_con, canal, data_t, web_st) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    """
+    cur = conn.cursor()
+    cur.execute(query, data)
+    conn.commit()
+
+def process_user_data(conn, user_data):
+    email = user_data['email']
     logging.debug(f"Processing user with email: {email}")
     
-    cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
-    user = cursor.fetchone()
+    user = select_user_by_email(conn, email)
     logging.debug(f"User found: {user}")
-
-    transformed_data = {}
-    for json_key, db_column in mapping_template.items():
-        value = user_data.get(json_key, "")
-        if isinstance(value, list):
-            transformed_data[db_column] = "-1" if value else "0"
-        else:
-            transformed_data[db_column] = str(value)
+    
+    transformed_data = {
+        'name': user_data.get('name', ''),
+        'phone': user_data.get('phone', ''),
+        'email': email,
+        'b_city': user_data.get('b_city', ''),
+        'b_fin': user_data.get('b_fin', ''),
+        'b_ban': user_data.get('b_ban', ''),
+        'b_ign': user_data.get('b_ign', ''),
+        'b_baners': user_data.get('b_baners', '0'),
+        'b_butt': user_data.get('b_butt', '-1'),
+        'b_mess': user_data.get('b_mess', ''),
+        'vk_id': '',
+        'chat_id': '',
+        'ws_st': '',
+        'ws_stop': '',
+        'web_st': '',
+        'fin_prog': '',
+        'shop_st': '',
+        'curator': '',
+        'pr1': '',
+        'pr2': '',
+        'pr3': '',
+        'pr4': '',
+        'pr5': '',
+        'ad_url': '',
+        'key_pr': '',
+        'n_con': '',
+        'canal': '',
+        'data_t': ''
+    }
     logging.debug(f"Transformed data: {transformed_data}")
-
-    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", "ad_url",
-        "key_pr", "n_con", "canal", "data_t"
-    ]
-
-    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
+    
+    transformed_data['phone'] = re.sub(r'\D', '', transformed_data['phone'])
     logging.debug(f"Transformed data after phone processing: {transformed_data}")
-
-    web_st_value = 0
-    if user:
-        web_st_value = int(user[0]) if user[0] else 0
-        web_st_value += 1
+    
+    web_st_value = 0 if user is None else 1
     logging.debug(f"Calculated web_st_value: {web_st_value}")
-
-    update_query = "UPDATE contacts SET "
-    update_values = []
-    for column, value in transformed_data.items():
-        update_query += f"{column} = ?, "
-        update_values.append(value)
-    update_query += "web_st = ? WHERE email = ?"
-    update_values.extend([web_st_value, email])
-    logging.debug(f"Update query: {update_query} with values: {update_values}")
-    cursor.execute(update_query, update_values)
-
-    if cursor.rowcount == 0:
-        columns = ', '.join(transformed_data.keys()) + ", web_st"
-        placeholders = ', '.join('?' for _ in transformed_data) + ", ?"
-        insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
-        insert_values = list(transformed_data.values()) + [web_st_value]
-        logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
-        cursor.execute(insert_query, insert_values)
-
-    conn.commit()
-    conn.close()
+    
+    transformed_data['web_st'] = web_st_value
+    
+    if user:
+        update_data = list(transformed_data.values()) + [email]
+        logging.debug(f"Update query: {query} with values: {update_data}")
+        update_user(conn, update_data)
+    else:
+        insert_data = list(transformed_data.values())
+        logging.debug(f"Insert query: {query} with values: {insert_data}")
+        insert_user(conn, insert_data)
+    
     logging.debug(f"User with email {email} processed successfully")
 
-@app.route('/send_get_request', methods=['GET'])
-def send_get_request():
-    token = request.args.get('token')
-    webinarId = request.args.get('webinarId')
-    url = f'https://online.bizon365.ru/api/v1/webinars/reports/get?webinarId={webinarId}'
-
-    response = requests.get(url, headers={'X-Token': token})
-
-    if response.status_code == 200:
-        data = response.json()
-
-        report = data.get('report', {})
-        messages = data.get('messages', {})
-
-        report_json_str = report.get('report', '{}')
-        try:
-            report_json = json.loads(report_json_str)
-        except json.JSONDecodeError:
-            report_json = {}
-
-        messages_json_str = report.get('messages', '{}')
-        try:
-            messages_json = json.loads(messages_json_str)
-        except json.JSONDecodeError:
-            messages_json = {}
-
-        users_meta = report_json.get('usersMeta', {})
-
-        # Обновление или добавление каждого пользователя в базу данных data_gc.db
-        for user_id, user_data in users_meta.items():
-            user_data['messages'] = messages_json
-            update_or_insert_user(DATABASE_NAME, user_data, template)
-
-        return jsonify({'status': 'User data saved successfully'})
-    else:
-        return jsonify({'error': 'Failed to fetch data from the API'}), response.status_code
+@app.route('/process_users', methods=['POST'])
+def process_users():
+    data = request.json
+    db_file = 'database.db'
+    conn = create_connection(db_file)
+    
+    for user_data in data:
+        process_user_data(conn, user_data)
+    
+    conn.close()
+    return jsonify({"status": "success", "message": "Users processed successfully"})