Update app.py

app.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 
 import os
 from flask import Flask, request, Response, render_template_string, jsonify, redirect, url_for
@@ -98,10 +97,9 @@ def load_visitor_data():
 
         return visitor_data_cache
 
-def save_visitor_data(data):
+def save_visitor_data():
     with _data_lock:
         try:
-            visitor_data_cache.update(data)
             with open(DATA_FILE, 'w', encoding='utf-8') as f:
                 json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
             logging.info(f"Visitor data successfully saved to {DATA_FILE}.")
@@ -1452,7 +1450,7 @@ def verify_data():
                     user_id_to_save = new_user_id
                 
                 all_data[user_id_to_save] = user_entry
-                save_visitor_data(all_data)
+                save_visitor_data()
                 return jsonify({"status": "ok", "verified": True, "user_id": user_id_to_save})
             else:
                  return jsonify({"status": "error", "verified": True, "message": "User ID not found"}), 400
@@ -1481,25 +1479,23 @@ def submit_referral():
         user['has_been_welcomed'] = True
 
         if referral_code:
-            referrer = next((u for u_id, u in all_data.items() if u_id != "organization_details" and u.get('referral_code') == referral_code), None)
+            referrer_id = next((u_id for u_id, u in all_data.items() if u_id != "organization_details" and u.get('referral_code') == referral_code), None)
             
-            if not referrer:
+            if not referrer_id:
                 return jsonify({"status": "error", "message": "Промокод не найден."}), 404
             
-            if referrer['id'] == user_id:
+            if referrer_id == user_id:
                 return jsonify({"status": "error", "message": "Нельзя использовать свой промокод."}), 400
 
-            user['referred_by'] = referrer['id']
+            user['referred_by'] = referrer_id
+            referrer = all_data[referrer_id]
             if 'referrals' not in referrer: referrer['referrals'] = []
             referrer['referrals'].append(user_id)
             
-            all_data[user_id] = user
-            all_data[referrer['id']] = referrer
-            save_visitor_data(all_data)
+            save_visitor_data()
             return jsonify({"status": "ok", "message": "Промокод успешно применен!"}), 200
         else:
-            all_data[user_id] = user
-            save_visitor_data(all_data)
+            save_visitor_data()
             return jsonify({"status": "ok", "message": "Добро пожаловать!"}), 200
 
     except Exception as e:
@@ -1511,14 +1507,12 @@ def admin_panel():
     all_data = load_visitor_data()
     users_list = []
     
-    # Create a map of user_id to user_name for quick lookup
     user_name_map = {uid: f"{ud.get('first_name', '')} {ud.get('last_name', '')}".strip() or f"ID: {uid}" for uid, ud in all_data.items() if uid != "organization_details"}
 
     for user_id, user_data in all_data.items():
         if user_id == "organization_details": continue
         user_data['id'] = user_id
         
-        # Add referral info
         user_data['referrals_count'] = len(user_data.get('referrals', []))
         referrer_id = user_data.get('referred_by')
         user_data['referrer_info'] = user_name_map.get(referrer_id, None)
@@ -1560,7 +1554,7 @@ def add_client():
             'referral_code': f'PROMO{new_id}', 'referred_by': None, 'referrals': [], 'has_been_welcomed': True
         }
         all_data[new_id] = new_client
-        save_visitor_data(all_data)
+        save_visitor_data()
         return jsonify({"status": "ok", "message": "Client added successfully"}), 201
     except Exception as e:
         logging.exception("Error in /admin/add_client endpoint")
@@ -1598,8 +1592,7 @@ def add_transaction():
         if add_debt_amount > 0: user['debt_history'].append({"type": "accrual", "amount": round(add_debt_amount, 2), "description": "Добавление долга", "date": now_iso, "date_str": now_str})
         if repay_debt_amount > 0: user['debt_history'].append({"type": "payment", "amount": round(repay_debt_amount, 2), "description": "Погашение долга", "date": now_iso, "date_str": now_str})
         
-        all_data[user_id] = user
-        save_visitor_data(all_data)
+        save_visitor_data()
         return jsonify({"status": "ok", "message": "Transaction successful", "new_balance": user['bonuses'], "new_debt": user['debts']}), 200
     except Exception as e:
         logging.exception("Error in /admin/add_transaction endpoint")
@@ -1630,8 +1623,7 @@ def add_invoice():
         if 'invoices' not in user: user['invoices'] = []
         user['invoices'].append(new_invoice)
         
-        all_data[user_id] = user
-        save_visitor_data(all_data)
+        save_visitor_data()
         return jsonify({"status": "ok", "message": "Invoice added successfully", "invoice_id": invoice_id}), 200
     except Exception as e:
         logging.exception("Error in /admin/add_invoice endpoint")
@@ -1654,8 +1646,7 @@ def delete_invoice():
         user['invoices'] = [inv for inv in user['invoices'] if inv.get('invoice_id') != invoice_id]
         if len(user['invoices']) == original_count: return jsonify({"status": "error", "message": "Invoice not found for this user"}), 404
         
-        all_data[user_id] = user
-        save_visitor_data(all_data)
+        save_visitor_data()
         return jsonify({"status": "ok", "message": "Invoice deleted successfully"}), 200
     except Exception as e:
         logging.exception("Error in /admin/delete_invoice endpoint")
@@ -1665,15 +1656,21 @@ def delete_invoice():
 def delete_client():
     try:
         user_id = str(request.get_json().get('user_id'))
-        if not user_id: return jsonify({"status": "error", "message": "User ID is required"}), 400
+        if not user_id:
+            return jsonify({"status": "error", "message": "User ID is required"}), 400
+
+        all_data = load_visitor_data()
+
+        if user_id not in all_data:
+            return jsonify({"status": "error", "message": "User not found"}), 404
+        
+        if all_data[user_id].get('telegram_id') is not None:
+            return jsonify({"status": "error", "message": "Cannot delete a Telegram-linked user"}), 403
+
+        del all_data[user_id]
+        
+        save_visitor_data()
 
-        with _data_lock:
-            all_data = load_visitor_data()
-            if user_id not in all_data: return jsonify({"status": "error", "message": "User not found"}), 404
-            if all_data[user_id].get('telegram_id') is not None: return jsonify({"status": "error", "message": "Cannot delete a Telegram-linked user"}), 403
-            
-            del all_data[user_id]
-            save_visitor_data(all_data)
         return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
     except Exception as e:
         logging.exception("Error in /admin/delete_client endpoint")
@@ -1699,7 +1696,7 @@ def save_organization_details():
         }
         all_data = load_visitor_data()
         all_data['organization_details'] = new_org_details
-        save_visitor_data(all_data)
+        save_visitor_data()
         return jsonify({"status": "ok", "message": "Organization details saved successfully"}), 200
     except Exception as e:
         logging.exception("Error saving organization details")
@@ -1708,16 +1705,27 @@ def save_organization_details():
 if __name__ == '__main__':
     print("--- BONUS SYSTEM SERVER ---")
     print(f"Server starting on http://{HOST}:{PORT}")
+
+    print("Loading local data file...")
+    load_visitor_data()
+
+    if (not visitor_data_cache or len(visitor_data_cache) <= 1) and HF_TOKEN_READ:
+        print("Local data not found or empty. Attempting to restore from Hugging Face backup...")
+        download_data_from_hf()
+    elif not visitor_data_cache or len(visitor_data_cache) <= 1:
+        print("Starting with a fresh, empty database.")
+    else:
+        print("Successfully loaded data from local file.")
+
     if not HF_TOKEN_READ or not HF_TOKEN_WRITE:
          print("WARNING: Hugging Face token(s) not set. Backup/restore functionality will be limited.")
-    else:
-         print("Attempting initial data download from Hugging Face...")
-         download_data_from_hf()
-    load_visitor_data()
+    
     print("WARNING: The /admin route is NOT protected. Implement proper authentication for production.")
+    
     if HF_TOKEN_WRITE:
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
         print("Periodic backup thread started (every hour).")
+
     print("--- Server Ready ---")
-    app.run(host=HOST, port=PORT, debug=False)
+    app.run(host=HOST, port=PORT, debug=False)