added a fix to leaderboard

app.py

@@ -23,7 +23,8 @@ from pydantic import BaseModel
 from datetime import datetime
 from bson import ObjectId
 import os 
-
+from concurrent.futures import ThreadPoolExecutor
+executor = ThreadPoolExecutor(max_workers=5)
 
 
 load_dotenv()
@@ -439,6 +440,7 @@ def create_leaderboard_ranking( document: LeaderBoardRanking) -> bool:
     collection = db['LeaderBoard']
     # Insert the document
     result= collection.find_one_and_replace(filter={"userId":document.userId},replacement=document.model_dump())
+    print(result)
     if result==None:
         result = collection.insert_one(document.model_dump())
         print("correctly inserted new document for",document.firstName)
@@ -484,6 +486,52 @@ def get_user_id_from_docKey(dockId):
 client = MongoClient(MONGO_URI)
 db = client.crayonics
 collection = db['Points']
+import logging
+from datetime import datetime
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+def handle_change2(new_point):
+    logger.info(f"Extra info: {new_point}")
+    print("No leaderboard so creating one now")
+
+    users = get_all_users()
+    
+    for user in users:
+        user_id = str(user['_id'])
+        print("Inserting user", f"User ID: {user_id}")
+
+        # Handle points retrieval safely
+        try:
+            points = get_all_simple_points_func(userId=user_id)
+            print("Points:", points)
+        except Exception as e:
+            logger.error(f"Error processing points for user {user_id}: {e}")
+            points = None  # Default value to prevent errors
+
+        # Handle dream job retrieval safely
+        tempDreamJob = None
+        try:
+            tempDreamJob = get_dream_job(userId=user_id)
+        except Exception as e:
+            logger.error(f"Error retrieving dream job for user {user_id}: {e}")
+
+        # Assign default value if tempDreamJob is invalid
+        dreamJob = tempDreamJob if isinstance(tempDreamJob, str) else "IncompleteProfile"
+
+        # Try inserting into leaderboard
+        try:
+            create_leaderboard_ranking(LeaderBoardRanking(
+                userId=user_id,
+                firstName=user.get('first_name', 'Unknown'),  # Safer dict access
+                lastName=user.get('last_name', 'Unknown'),
+                totalpoints=points.totalpoints if points else 0,  # Prevent NoneType error
+                lastUpdated=datetime.now(),
+                careerPath=dreamJob,
+            ))
+        except Exception as e:
+            logger.error(f"Error adding user {user_id} to leaderboard: {e}")
+
 
 # A function to handle changes
 def handle_change(change=None,new_point=None):
@@ -494,23 +542,15 @@ def handle_change(change=None,new_point=None):
     if new_point!=None:
         collections = db.list_collection_names()
         logger.info(f"Extra info: {new_point}")
-        if "LeaderBoard" not in collections:
-            print("No leaderboard so creating one now")
-            users = get_all_users()
-            for user in users:
-                print("inserting user",f"user id {user['_id']}")
-                points = get_all_simple_points_func(userId=str(user['_id']))
-                tempDreamJob =  get_dream_job(userId=str(user['_id'])) 
-                dreamJob = tempDreamJob if type(tempDreamJob)==str else "IncompleteProfile"
-                create_leaderboard_ranking(LeaderBoardRanking(userId=str(user['_id']),firstName=user['first_name'],lastName=user['last_name'],totalpoints=points.totalpoints,lastUpdated=datetime.now(),careerPath=dreamJob,))
-        else:
-            
-            user_id =new_point.get('userId')
-            leveleduser = get_all_users(userId=user_id)
-            points = get_all_simple_points_func(userId=user_id)
-            tempDreamJob =  get_dream_job(userId=user_id) 
+        print("No leaderboard so creating one now")
+        users = get_all_users()
+        for user in users:
+            print("inserting user",f"user id {user['_id']}")
+            points = get_all_simple_points_func(userId=str(user['_id']))
+            tempDreamJob =  get_dream_job(userId=str(user['_id'])) 
             dreamJob = tempDreamJob if type(tempDreamJob)==str else "IncompleteProfile"
-            create_leaderboard_ranking(LeaderBoardRanking(userId=user_id,firstName=leveleduser['first_name'],lastName=leveleduser['last_name'],totalpoints=points.totalpoints,lastUpdated=datetime.now(),careerPath=dreamJob,))
+            create_leaderboard_ranking(LeaderBoardRanking(userId=str(user['_id']),firstName=user['first_name'],lastName=user['last_name'],totalpoints=points.totalpoints,lastUpdated=datetime.now(),careerPath=dreamJob,))
+      
                 
         
     elif new_point==None and change!=None:
@@ -553,7 +593,7 @@ def handle_change(change=None,new_point=None):
                 create_leaderboard_ranking(LeaderBoardRanking(userId=user_id,firstName=leveleduser['first_name'],lastName=leveleduser['last_name'],totalpoints=points.totalpoints,lastUpdated=datetime.now(),careerPath=dreamJob,))
                 
             
-        print(f"Change detected: {dumps(change)}")
+        logger.info(f"Change detected: {dumps(change)}")
 
 # Function to run the change stream in a separate thread (non-blocking)
 def watch_change_stream():

gamification/objects.py

@@ -268,9 +268,9 @@ class IndividualUserLevel(BaseModel):
     
 class SimpleIndividualUserLevel(BaseModel):
     totalpoints:float
-    levelName:str
-    maxPoints:float
-    minPoints:float
+    levelName:Optional[str]=None
+    maxPoints:Optional[float]=None
+    minPoints:Optional[float]=None
 
     class Config:
         json_encoders = {

gamification/pointLogic.py

@@ -29,7 +29,6 @@ def get_dream_job(userId):
 
 
 def create_points_func(document:UserPoints)->bool:
-    from app import handle_change
     db_uri = MONGO_URI
     db_name = "crayonics"
     collection_name="Points"
@@ -42,7 +41,7 @@ def create_points_func(document:UserPoints)->bool:
         doc = document.model_dump()
         doc['earnedAt']=datetime.now()
         result = collection.insert_one(doc)
-        handle_change(new_point={"userId":document.userId})
+        
         return True
     else:
         client.close()
@@ -98,16 +97,23 @@ def get_all_simple_points_func(userId) -> SimpleIndividualUserLevel:
     point_cursor = collection.find({"userId": userId})  # This returns a cursor to the documents
     
     # Convert the cursor to a list so we can reuse it
-    points_list = list(point_cursor)
+    try:
+        points_list = list(point_cursor)
     
     # Calculate the total points
-    totalPoints = sum([point['numOfPoints'] for point in points_list])
-    particularLevelInfo = get_particular_level(dreamJob=dreamJob,totalPoints=totalPoints)
-    # Create the individual points list
+        totalPoints = sum([point['numOfPoints'] for point in points_list])
+        particularLevelInfo = get_particular_level(dreamJob=dreamJob,totalPoints=totalPoints)
+        # Create the individual points list
 
     # Create the IndividualUserLevel object with totalPoints and individualPoints
-    points = SimpleIndividualUserLevel(totalpoints=totalPoints,levelName=particularLevelInfo[0].levelName,minPoints=particularLevelInfo[0].minPoints,maxPoints=particularLevelInfo[0].maxPoints)
-    
+        points = SimpleIndividualUserLevel(totalpoints=totalPoints)
+    except:
+        totalPoints = 0
+        # Create the individual points list
+
+    # Create the IndividualUserLevel object with totalPoints and individualPoints
+        points = SimpleIndividualUserLevel(totalpoints=totalPoints)
+        
     return points
 
 

gamification/routes.py

@@ -124,14 +124,18 @@ def delete_level(levelId):
     except Exception as e:
         raise HTTPException(status_code=500,detail=f"{e}")
     
-    
+from fastapi import BackgroundTasks  
 @gamification.get("/get-top-30",tags=["user","admin"])
-def get_leaderboard()->List[Ranker]:
+def get_leaderboard(background_tasks: BackgroundTasks)->List[Ranker]:
+    from app import handle_change2
     try:
         list_of_rankers = []
         result = get_top_30()
+        background_tasks.add_task(handle_change2, 2)
+        # executor.submit(handle_change2,2)
+
         list_of_rankers = [Ranker(**ranker) for ranker in result]
-        
+        # handle_change(new_point="userId")
         return list_of_rankers
     except Exception as e:
         raise HTTPException(status_code=500,detail=f"{e}")