Update backend/mongodb/operations/users.py

backend/mongodb/operations/users.py

@@ -7,69 +7,63 @@ from bson import ObjectId
 import re
 
 
-def get_collection_users(request: Request):
-  test = request.app.database["user_records"]
-  print(type(test))
-  return test
-
-
-def create_user(request: Request, user: User = Body(...)):
+def create_user(collection, user: User = Body(...)):
     user = jsonable_encoder(user)
-    new_user = get_collection_users(request).insert_one(user)
-    created_user = get_collection_users(request).find_one({"_id": new_user.inserted_id})
+    new_user = collection.insert_one(user)
+    created_user = collection.find_one({"_id": new_user.inserted_id})
     print("NEW ID IS:.........", new_user.inserted_id)
     return created_user
 
 
-def list_users(request: Request, limit: int):
+def list_users(collection, limit: int):
     try:
-        users = list(get_collection_users(request).find(limit = limit))
+        users = list(collection.find(limit = limit))
         return users
     except:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"No users found!")
 
 
-def find_user(request: Request, user_id: str):
-    if (user := get_collection_users(request).find_one({"user_id": user_id})):
+def find_user(collection, user_id: str):
+    if (user := collection.find_one({"user_id": user_id})):
         return user
     else:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"User with user_id {user_id} not found!")
 
 
-def find_user_name(request: Request, name: str):
+def find_user_name(collection, name: str):
     # search for name in lowercase
-    if (user := get_collection_users(request).find_one({"name": re.compile('^' + re.escape(name) + '$', re.IGNORECASE)})):
+    if (user := collection.find_one({"name": re.compile('^' + re.escape(name) + '$', re.IGNORECASE)})):
         return user
     else:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"User with name {name} not found!")
 
 
-def find_user_email(request: Request, email: str):
-    if (user := get_collection_users(request).find_one({"email": re.compile('^' + re.escape(email) + '$', re.IGNORECASE)})):
+def find_user_email(collection, email: str):
+    if (user := collection.find_one({"email": re.compile('^' + re.escape(email) + '$', re.IGNORECASE)})):
         return user
     else:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"User with Email Address {email} not found!")
 
 
 ''' Update user record based on user object/json'''
-def update_user(request: Request, user_id: str, user: UpdateUser):
+def update_user(collection, user_id: str, user: UpdateUser):
     try:
         user = {k: v for k, v in user.model_dump().items() if v is not None}
         if len(user) >= 1:
-            update_result = get_collection_users(request).update_one({"user_id": user_id}, {"$set": user})
+            update_result = collection.update_one({"user_id": user_id}, {"$set": user})
 
             if update_result.modified_count == 0:
                 raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"User with user_id: '{user_id}' not found and updated!")
 
-        if (existing_users := get_collection_users(request).find_one({"user_id": user_id})) is not None:
+        if (existing_users := collection.find_one({"user_id": user_id})) is not None:
             return existing_users
     except:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"User with user_id: '{user_id}' not found and updated!")
 
 
-def delete_user(request: Request, user_id: str):
+def delete_user(collection, user_id: str):
     try:
-        deleted_user = get_collection_users(request).delete_one({"user_id": user_id})
+        deleted_user = collection.delete_one({"user_id": user_id})
 
         if deleted_user.deleted_count == 1:
             return f"User with user_id {user_id} deleted sucessfully"