Update app.py

app.py

@@ -1840,7 +1840,7 @@ current_curator_index = 0
 
 
 
-def j_verify_phone_number(phone_number):
+def J_verify_phone_number(phone_number):
     full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
     payload = {"phoneNumber": phone_number}
     headers = {'Content-Type': 'application/json'}
@@ -1851,96 +1851,81 @@ def j_verify_phone_number(phone_number):
     else:
         return "Error"
 
-def j_parse_json_data(data):
-    return json.loads(data)
-
-def j_clean_phone_number(phone_number):
+def J_clean_phone_number(phone_number):
     return re.sub(r'\D', '', phone_number)
 
-def j_insert_data(data, verify_phone, add_curator):
+def J_insert_data(data, verify_phone, add_curator):
     global current_curator_index
-    for db_name in DATABASES5:
-        conn = sqlite3.connect(db_name)
-        cursor = conn.cursor()
-        
-        for row in data:
-            name = row.get('Имя', '')
-            phone = row.get('WhatsApp', '').lstrip('+')
-            email = row.get('Email', '')
-            data_t = row.get('Дата', '').strip('"')
+    conn = sqlite3.connect(DATABASES5)
+    cursor = conn.cursor()
 
-            phone = j_clean_phone_number(phone)
+    for row in data:
+        name = row.get('name', '')
+        phone = row.get('phone', '').lstrip('+')
+        email = row.get('email', '')
+        data_t = row.get('data_t', '').strip('"')
 
-            cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
-            user_exists = cursor.fetchone()
+        phone = J_clean_phone_number(phone)
 
-            if user_exists:
-                logging.warning(f"User with email {email} or phone {phone} already exists. Skipping insert.")
-                continue
+        cursor.execute("SELECT 1 FROM contacts WHERE email = ? OR phone = ?", (email, phone))
+        user_exists = cursor.fetchone()
 
-            if add_curator == "1":
-                curator = curators[current_curator_index]
-                current_curator_index = (current_curator_index + 1) % len(curators)
-            else:
-                curator = row.get('Куратор', '')
+        if user_exists:
+            print(f"User with email {email} or phone {phone} already exists. Skipping insert.")
+            continue
 
-            if verify_phone == "1":
-                ws_st = j_verify_phone_number(phone)
-            else:
-                ws_st = row.get('ws_st', '')
-
-            columns = ['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, row.get('ВКонтакте', ''), row.get('Телеграм', ''), ws_st, row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('Город', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('shop_st', ''), curator, row.get('pr1', ''), row.get('pr2', ''), row.get('pr3', ''), row.get('pr4', ''), row.get('pr5', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), data_t, row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', '')]
+        if add_curator == "1":
+            curator = curators[current_curator_index]
+            current_curator_index = (current_curator_index + 1) % len(curators)
+        else:
+            curator = row.get('curator', '')
 
-            placeholders = ', '.join(['?' for _ in columns])
-            columns_str = ', '.join(columns)
+        if verify_phone == "1":
+            ws_st = J_verify_phone_number(phone)
+        else:
+            ws_st = row.get('ws_st', '')
 
-            query = f'''
-                INSERT INTO contacts ({columns_str})
-                VALUES ({placeholders})
-            '''
+        columns = ['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, row.get('vk_id', ''), row.get('chat_id', ''), ws_st, row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('b_city', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('shop_st', ''), curator, row.get('pr1', ''), row.get('pr2', ''), row.get('pr3', ''), row.get('pr4', ''), row.get('pr5', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), data_t, row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', '')]
 
-            try:
-                cursor.execute(query, values)
-                user_data = dict(zip(columns, values))
-                send_to_google_forms(user_data, gog_url)
-            except Exception as e:
-                logging.error(f"Error inserting row: {row}")
-                logging.error(f"Error message: {str(e)}")
-                conn.rollback()
-                raise
+        placeholders = ', '.join(['?' for _ in columns])
+        columns_str = ', '.join(columns)
 
-        conn.commit()
-        conn.close()
+        query = f'''
+            INSERT INTO contacts ({columns_str})
+            VALUES ({placeholders})
+        '''
 
-@app.route('/j_upload_json', methods=['POST'])
-def j_upload_json():
-    if 'file' not in request.files:
-        return jsonify({"error": "No file part"}), 400
-    file = request.files['file']
-    if file.filename == '':
-        return jsonify({"error": "No selected file"}), 400
-    if file and file.filename.endswith('.json'):
         try:
-            data = file.read().decode("UTF8")
-            parsed_data = j_parse_json_data(data)
-            verify_phone = request.form.get('verify_phone', '0')
-            add_curator = request.form.get('add_curator', '0')
-            logging.debug(f"Verify Phone: {verify_phone}")
-            logging.debug(f"Add Curator: {add_curator}")
-            j_insert_data(parsed_data, verify_phone, add_curator)
-            return jsonify({"message": "Data uploaded and inserted successfully"})
-        except json.JSONDecodeError as e:
-            return jsonify({"error": "Invalid JSON format"}), 400
-    return jsonify({"error": "Invalid file format"}), 400
+            cursor.execute(query, values)
+            user_data = dict(zip(columns, values))
+            send_to_google_forms(user_data, gog_url)
+        except Exception as e:
+            print(f"Error inserting row: {row}")
+            print(f"Error message: {str(e)}")
+            conn.rollback()
+            raise
+
+    conn.commit()
+    conn.close()
 
-@app.route('/j_upl_json', methods=['GET'])
-def j_se_upl_json():
+@app.route('/upload_json', methods=['POST'])
+def J_upload_json():
+    data = request.get_json()
+    if not data:
+        return jsonify({"error": "Invalid JSON format"}), 400
+    verify_phone = request.form.get('verify_phone', '0')
+    add_curator = request.form.get('add_curator', '0')
+    print(f"JSON Data: {json.dumps(data, ensure_ascii=False, indent=4)}")
+    J_insert_data(data, verify_phone, add_curator)
+    return jsonify({"message": "Data uploaded and inserted successfully"})
+
+@app.route('/upl_json', methods=['GET'])
+def J_upl_json():
     api_sys_control = request.args.get('api_sys')
     if api_sys_control != api_key_sys:
         return "EUR 22", 200
-    return render_template('j_upl_json.html')
-
+    return render_template('upl_json.html')