added questionaire to the user details

streaksManagement.py

@@ -1,13 +1,13 @@
-
 from pymongo import MongoClient
-from datetime import datetime,timedelta
+from datetime import datetime, timedelta
+from typing import Dict, Union
 
-def get_current_date():
+def get_current_date() -> str:
     # Get the current date and return it in YYYY-MM-DD format
     return datetime.now().date().isoformat()
 
-def get_another_date(day:int):
-    # Get the current date and add one day to it
+def get_another_date(day: int) -> str:
+    # Get the current date and add specified days to it
     tomorrow = datetime.now() + timedelta(days=day)
     return tomorrow.date().isoformat()
 
@@ -19,52 +19,57 @@ def check_date_streak(start_date: str, end_date: str) -> bool:
     # Compare the dates to check if they are consecutive (1 day apart)
     return end_date - start_date == timedelta(days=1)
 
-def streaks_manager(db_uri: str,  document: dict) -> str:
+def streaks_manager(db_uri: str, document: Dict) -> Union[bool, str]:
     """
-    Inserts a new document into the specified MongoDB collection.
+    Manage user streaks in MongoDB.
 
-    Parameters:
-        db_uri (str): MongoDB connection URI.
-        db_name (str): Name of the database.
-        collection_name (str): Name of the collection.
-        document (dict): The document to insert.
+    Args:
+        db_uri: MongoDB connection string
+        document: Dictionary containing user data with 'user_id' key
 
     Returns:
-        str: The ID of the inserted document.
+        Union[bool, str]: True if successful, "User Already Exists" if streak is reset
     """
-    # Connect to MongoDB
     client = MongoClient(db_uri)
-    db = client["crayonics"]
-    collection = db["Streaks"]
-    
-    # Insert the document
-    foundUser = collection.find_one({"user_id":document.get('user_id')})
-    streak_dates=get_current_date()
+    try:
+        db = client["crayonics"]
+        collection = db["Streaks"]
+        
+        # Check for existing user
+        found_user = collection.find_one({"user_id": document.get('user_id')})
+        current_date = get_current_date()
+        document['streak_dates'] = [current_date]
 
-    document['streak_dates']= [streak_dates]
-    if foundUser==None:
-        result = collection.insert_one(document)
-        client.close()
-        return True
-    else:
-        print("user has a streak record")
-        is_a_streak=check_date_streak(start_date=foundUser['streak_dates'][-1],end_date=get_current_date())
-        if is_a_streak:
-            print("its a streak guys")
-            dates = []
-            for d in foundUser["streak_dates"]:
-                dates.append(d)
-            dates.append(get_current_date())
-            collection.update_one(filter={"user_id":document.get("user_id")},update={
-                "$set":{"streak_dates":dates}
-            }
-                                  )
-            client.close()
+        if found_user is None:
+            # New user case
+            collection.insert_one(document)
             return True
         else:
-            collection.find_one_and_replace(filter={"user_id":document.get('user_id')},replacement=document)
-        return "User Already Exists"
-    
-    # Close the connection
-    
+            print("user has a streak record")
+            is_a_streak = check_date_streak(
+                start_date=found_user['streak_dates'][-1],
+                end_date=current_date
+            )
+            if is_a_streak:
+                print("its a streak guys")
+                # Extend existing streak
+                dates = found_user["streak_dates"] + [current_date]
+                collection.update_one(
+                    {"user_id": document.get("user_id")},
+                    {"$set": {"streak_dates": dates}}
+                )
+                return True
+            else:
+                # Reset streak if not consecutive
+                collection.find_one_and_replace(
+                    {"user_id": document.get('user_id')},
+                    document
+                )
+                return "User Already Exists"
+                
+    except Exception as e:
+        print(f"Error: {str(e)}")
+        raise
+    finally:
+        client.close()
 

utils.py

@@ -231,23 +231,36 @@ def user_details_func(db_uri: str, document: dict) -> str:
     db = client["crayonics"]
     collection = db["users"]
     streaks_collection = db["Streaks"]
-    questionaire_collection = db["Streaks"]
+    questionaire_collection = db["Questionaire"]
     # Insert the document
     doc = collection.find_one({"_id":ObjectId(document.get("user_id"))})
-    
     if doc==None:
         return None
     else:  
         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
-        
+        try:
+            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_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 
+