Update app.py

app.py

@@ -771,54 +771,54 @@ 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()
-
-    email = user_data.get('email')
-
-    cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
-    user = cursor.fetchone()
-
-    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"
+def update_or_insert_user(email, user_data):
+    for db in DATABASES:
+        conn = sqlite3.connect(db)
+        cursor = conn.cursor()
+        cursor.execute('SELECT * FROM contacts WHERE email = ?', (email,))
+        existing_user = cursor.fetchone()
+
+        if existing_user:
+            # Обновление данных пользователя
+            update_data = {}
+            for key, value in user_data.items():
+                if key in mapping_template:
+                    update_data[mapping_template[key]] = value
+            update_data['b_baners'] = -1 if user_data.get('banners', []) else 0
+            update_data['b_butt'] = -1 if user_data.get('buttons', []) else 0
+            update_query = 'UPDATE contacts SET ' + ', '.join([f'{k} = ?' for k in update_data.keys()]) + ' WHERE email = ?'
+            cursor.execute(update_query, list(update_data.values()) + [email])
         else:
-            transformed_data[db_column] = str(value)
-
-    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] = ""
-
-    if user:
-        web_st_value = int(user[0]) + 1
-
-        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])
-        cursor.execute(update_query, update_values)
-    else:
-        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()) + [0]
-        cursor.execute(insert_query, insert_values)
+            # Добавление нового пользователя
+            insert_data = {
+                "name": user_data.get('username', ''),
+                "phone": user_data.get('phone', ''),
+                "email": user_data.get('email', ''),
+                "b_city": user_data.get('city', ''),
+                "b_fin": user_data.get('finished', ''),
+                "b_ban": user_data.get('ban', ''),
+                "b_ign": user_data.get('ignore', ''),
+                "b_baners": -1 if user_data.get('banners', []) else 0,
+                "b_butt": -1 if user_data.get('buttons', []) else 0,
+                "b_mess": user_data.get('messages', ''),
+                "shop_st": '',
+                "curator": '',
+                "pr1": '',
+                "pr2": '',
+                "pr3": '',
+                "pr4": '',
+                "pr5": '',
+                "ad_url": '',
+                "key_pr": '',
+                "n_con": '',
+                "canal": '',
+                "data_t": ''
+            }
+            insert_query = 'INSERT INTO contacts (' + ', '.join(insert_data.keys()) + ') VALUES (' + ', '.join(['?'] * len(insert_data)) + ')'
+            cursor.execute(insert_query, list(insert_data.values()))
 
-    conn.commit()
-    conn.close()
+        conn.commit()
+        conn.close()
 
 @app.route('/send_get_request', methods=['GET'])
 def send_get_request():
@@ -848,10 +848,10 @@ def send_get_request():
 
         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, mapping_template)
+            update_or_insert_user(user_data.get('email'), user_data)
 
         return jsonify({'status': 'User data saved successfully'})
     else: