Fix firebase issues and vercel deployment

Author: KrishnashishMunshi

database.py

@@ -1,91 +1,84 @@
 import firebase_admin
-from firebase_admin import credentials , db
-
+from firebase_admin import credentials, db
+import os
+import json
 from datetime import datetime
 
-current_datetime = datetime.now()
-formatted_datetime = current_datetime.strftime("%Y-%m-%d %H:%M:%S")
-
-cred = credentials.Certificate("serviceAccountKey.json")
+# Read Firebase credentials from an environment variable
+firebase_credentials = os.getenv("FIREBASE_CREDENTIALS")
 
-firebase_admin.initialize_app(cred, {
-    'databaseURL': "https://speed-typing-test-shashi-singh-default-rtdb.firebaseio.com/"  # For Realtime Database 
-})
+if firebase_credentials:
+    firebase_credentials = json.loads(firebase_credentials)
+    cred = credentials.Certificate(firebase_credentials)
+    firebase_admin.initialize_app(cred, {
+        'databaseURL': "https://speed-typing-test-shashi-singh-default-rtdb.firebaseio.com/"
+    })
+else:
+    raise ValueError("Firebase credentials not found. Set the FIREBASE_CREDENTIALS environment variable.")
 
+# Get reference to the Firebase Realtime Database
 ref = db.reference("test")
-data = ref.get()
 
-def checkUniqueUser(username): 
-    for key,value in data.items():
-        for names,entry in value.items():
-            if entry==username:
-                # print("found")
-                return True
+def checkUniqueUser(username):
+    """Check if a user exists in the database."""
+    data = ref.get()  # Fetch fresh data every time
+    if data:
+        for key, value in data.items():
+            if isinstance(value, dict):  # Ensure it's a dictionary before iterating
+                for names, entry in value.items():
+                    if entry == username:
+                        return True
     return False
 
-def initialiseNewUser(username,password):
-    newValue = {
-        "name":username,
-        "password":password
+def initialiseNewUser(username, password):
+    """Add a new user to the database."""
+    new_value = {
+        "name": username,
+        "password": password
     }
-    ref.child(username).update(newValue)
+    ref.child(username).set(new_value)  # Use `set()` instead of `update()` to avoid partial overwrites
 
 def uploadCurrentData(username, wpm, accuracy):
-    date = formatted_datetime
-    newValue = {
-        date: {
-            "wpm": wpm,
-            "accuracy": accuracy,
-        },
+    """Upload user WPM and accuracy data with a timestamp."""
+    current_datetime = datetime.now()
+    formatted_datetime = current_datetime.strftime("%Y-%m-%d %H:%M:%S")
+
+    new_value = {
+        "wpm": wpm,
+        "accuracy": accuracy,
     }
+    
     try:
-        if username != "Login":
-            ref.child(username).child("history").push(newValue)
-    except firebase_admin.exceptions.UnavailableError as e:
+        if username and username != "Login":
+            ref.child(username).child("history").child(formatted_datetime).set(new_value)
+    except firebase_admin.exceptions.FirebaseError as e:
         print(f"Failed to upload data: {e}")
     except Exception as e:
         print(f"Unexpected error: {e}")
 
-
 def getHistory(username):
-    newData = ref.child(username).child("history").get()
-    output_list = []
-    final_list = []
-    temporary = []
+    """Retrieve the user's typing history."""
+    new_data = ref.child(username).child("history").get()
+    if not new_data:
+        return []
 
-    for a,b in newData.items():
-        for date,pairValue in b.items():
-            timestamp = date
+    output_list = []
+    
+    for timestamp, values in new_data.items():
+        try:
             datetime_obj = datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S")
-
             real_date = datetime_obj.date()
             real_time = datetime_obj.time()
 
-            # print("Date: ",date)
-
-            final_list.append(real_date)
-            final_list.append(real_time)
-
-            # print("finallist",final_list)
-
-            for key,value in pairValue.items():
-                # print(key,value)
-                temporary.append(key)
-                temporary.append(value)
-
-            # print("pairValue",pairValue)
-            # print("temporary",  temporary)
-            final_list.append(temporary)
-
-            temporary = []
-
-        output_list.append(final_list)
-        final_list = []
-
-    # count = len(output_list)
-    # print(count)
-    # for i in output_list:
-    #     print(i)
+            entry = {
+                "date": real_date,
+                "time": real_time,
+                "wpm": values.get("wpm", 0),
+                "accuracy": values.get("accuracy", 0),
+            }
+            output_list.append(entry)
+        except ValueError:
+            print(f"Skipping invalid timestamp: {timestamp}")
 
     return output_list
 

requirements.txt

@@ -1,2 +1,3 @@
 Flask==2.3.2
-firebase-admin==6.2.0
+firebase-admin==6.2.0
+gunicorn  # Add this for better production performance

vercel.json

@@ -1,16 +1,15 @@
 {
-    "version": 2,
-    "builds": [
+  "version": 2,
+  "builds": [
       {
-        "src": "app.py",
-        "use": "@vercel/python"
+          "src": "wsgi.py",
+          "use": "@vercel/python"
       }
-    ],
-    "routes": [
+  ],
+  "routes": [
       {
-        "src": "/(.*)",
-        "dest": "app.py"
+          "src": "/(.*)",
+          "dest": "wsgi.py"
       }
-    ]
-  }
-  
+  ]
+}

wsgi.py

@@ -0,0 +1,4 @@
+from app import app
+
+if __name__ == "__main__":
+    app.run()