fixed questionaire retrieval

streaksManagement.py

@@ -45,7 +45,6 @@ def streaks_manager(db_uri: str, document: Dict) -> Union[bool, str]:
             collection.insert_one(document)
             return True
         else:
-            print("user has a streak record")
             is_a_streak = check_date_streak(
                 start_date=found_user['streak_dates'][-1],
                 end_date=current_date

tokenManagement.py

@@ -123,28 +123,22 @@ def verify_access_token(db_uri: str, user_id: str, access_token: str) -> bool:
     collection = db["AccessToken"]
     docs = collection.find({"user_id":user_id})
     for doc in docs:
-        print("doc=", doc,"user access token =" , access_token)
 
         if doc==None:
             return False
         else:
             if str(doc['_id']) == access_token:
-                print("accesstoke is correct")
                 if isexpired(doc['expire_at'])!=False:
-                    print("isexpired!=False")
                     streaks_doc={}
                     streaks_doc['user_id'] = str(user_id)
                     streaks_manager(db_uri=db_uri,document=streaks_doc)
                     pass
                 else:
                     streaks_doc={}
-                    print("isexpired!=True")
                     streaks_doc['user_id'] = str(user_id)
                     streaks_manager(db_uri=db_uri,document=streaks_doc)
                     return True
             else:
-                print("doc=", str(doc['_id']),"user access token =" , access_token)
-                print("accesstoken is wrong")
                 streaks_doc={}
                 streaks_doc['user_id'] = str(user_id)
                 streaks_manager(db_uri=db_uri,document=streaks_doc)

utils.py

@@ -225,47 +225,71 @@ def login_user(db_uri: str, db_name: str, collection_name: str, document: dict)
     
     
 
+from pymongo import MongoClient
+from bson.objectid import ObjectId
+from typing import Dict, Optional
 
-
-def user_details_func(db_uri: str, document: dict) -> str:
-    streaks_doc={}
+def user_details_func(db_uri: str, document: Dict) -> Optional[Dict]:
+    """
+    Retrieve and process user details from MongoDB collections.
+    
+    Args:
+        db_uri (str): MongoDB connection URI
+        document (dict): Document containing user_id
+        
+    Returns:
+        dict: Processed user details or None if user not found
+    """
+    streaks_doc = {}
 
     # Connect to MongoDB
     client = MongoClient(db_uri)
     db = client["crayonics"]
-    collection = db["users"]
+    
+    # Define collections
+    users_collection = db["users"]
     streaks_collection = db["Streaks"]
     questionaire_collection = db["Questionaire"]
-    # Insert the document
-    doc = collection.find_one({"_id":ObjectId(document.get("user_id"))})
-    if doc==None:
+
+    # Find user document
+    user_id = document.get("user_id")
+    user_doc = users_collection.find_one({"_id": ObjectId(user_id)})
+    
+    if not user_doc:
         return None
-    else:  
+
+    # Prepare base user document
+    user_doc['user_id'] = str(user_doc['_id'])
+    user_doc.pop('_id')
+    user_doc.pop('password', None)  # Use default None in case password doesn't exist
+
+    # Get streaks data
+    streaks_collection_doc = streaks_collection.find_one({"user_id": user_id})
+    streaks_doc['user_id'] = user_id
+    
+    # Call streaks_manager (assuming this function exists elsewhere)
+    streaks_manager(db_uri=db_uri, document=streaks_doc)
+    
+    if streaks_collection_doc:
+        streaks_collection_doc.pop("_id", None)
+        streaks_collection_doc.pop("user_id", None)
+        user_doc['streak_dates'] = streaks_collection_doc.get('streak_dates', [])
+
+    # Try to get questionnaire data
+    
+    questionaire_doc = questionaire_collection.find_one({"userId": user_id})
+    if questionaire_doc:
+        print(f"in questionaire retrieval:")
         try:
-            streaks_collection_doc = streaks_collection.find_one(filter={"user_id":document.get("user_id")})
-            questionaire_collection_doc= questionaire_collection.find_one(filter={"user_id":document.get("user_id")})
-            streaks_doc['user_id'] = document.get("user_id")
-            streaks_manager(db_uri=db_uri,document=streaks_doc)
-            streaks_collection_doc.pop("_id")
-            doc['user_id'] = str(doc['_id'])
-            doc.pop('_id')
-            questionaire_collection_doc.pop('_id')
-            questionaire_collection_doc.pop('user_id')
-            doc.pop('password')
-            streaks_collection_doc.pop('user_id')
-            doc['streak_dates'] =streaks_collection_doc['streak_dates']
-            doc['career_questions'] = questionaire_collection_doc
-            return doc
-        except:
-            streaks_collection_doc = streaks_collection.find_one(filter={"user_id":document.get("user_id")})
-            streaks_doc['user_id'] = document.get("user_id")
-            streaks_manager(db_uri=db_uri,document=streaks_doc)
-            streaks_collection_doc.pop("_id")
-            doc['user_id'] = str(doc['_id'])
-            doc.pop('_id')
-            doc.pop('password')
-            streaks_collection_doc.pop('user_id')
-            doc['streak_dates'] =streaks_collection_doc['streak_dates']
-            return doc 
-            
+            questionaire_doc.pop("_id", None)
+            questionaire_doc.pop("user_id", None)
+            user_doc['career_questions'] = questionaire_doc
+        except Exception as e:
+            # If questionnaire fails, continue with what we have
+            print(f"Error in questionaire retrieval: {str(e)}")
+            print(questionaire_doc)
+            pass
+    client.close()
+    return user_doc
+