Update backend/mongodb/operations/calls.py

backend/mongodb/operations/calls.py

@@ -4,37 +4,27 @@ import sys
 # sys.path.append('/Users/benolojo/DCU/CA4/ca400_FinalYearProject/2024-ca400-olojob2-majdap2/src/backend/src/')
 from ..models.calls import UpdateCall, UserCall, UserCaptions
 
-def get_collection_calls(request: Request):
-  try:
-    # return request.app.database["call_records"]
-      return request.app.database["call_test"]
-  except:
-      raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Unable to find call records Database.")
 
 # Used within calls to create call record in main.py
 def create_calls(collection, user: UserCall = Body(...)):
     calls = jsonable_encoder(user)
-    # new_calls = get_collection_calls(request).insert_one(calls)
     new_calls = collection.insert_one(calls)
-    # created_calls = get_collection_calls(request).find_one({"_id": new_calls.inserted_id})
     created_calls = collection.find_one({"_id": new_calls.inserted_id})
 
     return created_calls
 
 
-def list_calls(request: Request, limit: int):
+def list_calls(collection, limit: int):
     try:
-        calls = list(get_collection_calls(request).find(limit = limit))
-        # dateTest = calls[2]['date']
+        calls = collection.find(limit = limit))
         return calls
     except:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"No existing call records yet.")
 
 
 '''Finding calls based on call id'''
-def find_calls(request: Request, call_id: str):
-    # if user_calls := get_collection_calls(request).find_one({"call_id": call_id}) is not None:
-    user_calls = get_collection_calls(request).find_one({"call_id": call_id})
+def find_calls(collection, call_id: str):
+    user_calls = collection.find_one({"call_id": call_id})
     if user_calls is not None:
         return user_calls
     else:
@@ -42,8 +32,8 @@ def find_calls(request: Request, call_id: str):
     
 
 '''Finding calls based on user id'''
-def find_user_calls(request: Request, user_id: str):
-    user_calls = list(get_collection_calls(request).find({"$or": [{"caller_id": user_id}, {"callee_id": user_id}]})) # match on caller or callee ID
+def find_user_calls(collection, user_id: str):
+    user_calls = list(collection.find({"$or": [{"caller_id": user_id}, {"callee_id": user_id}]})) # match on caller or callee ID
     if len(user_calls):
         return user_calls
     else:
@@ -51,10 +41,10 @@ def find_user_calls(request: Request, user_id: str):
 
 
 '''Finding calls based on key terms list'''
-def list_transcripts_by_key_terms(request: Request, key_terms_list: list[str] = Body(...)):
+def list_transcripts_by_key_terms(collection, key_terms_list: list[str] = Body(...)):
     key_terms_list = jsonable_encoder(key_terms_list)
 
-    call_records = list(get_collection_calls(request).find({"key_terms": {"$in": key_terms_list}}, {'_id': 0})) # exclude returning ObjectID in find()
+    call_records = list(collection.find({"key_terms": {"$in": key_terms_list}}, {'_id': 0})) # exclude returning ObjectID in find()
     
     # Check if any call records were returned
     if len(call_records):
@@ -64,13 +54,14 @@ def list_transcripts_by_key_terms(request: Request, key_terms_list: list[str] =
     
 
 '''Finding calls based on date ranges'''
-def list_transcripts_by_dates(request: Request, start_date: str, end_date: str):
-    print(start_date, end_date)
+def list_transcripts_by_dates(collection, start_date: str, end_date: str):
+    # print(start_date, end_date)
+    
     # Convert strings to date string in YYYY-MM-ddT00:00:00 format
     start_date = f'{start_date}T00:00:00'
     end_date = f'{end_date}T00:00:00'
 
-    call_records = list(get_collection_calls(request).find({"date":{"$gte": start_date, "$lte": end_date}}))
+    call_records = list(collection.find({"date":{"$gte": start_date, "$lte": end_date}}))
 
     if len(call_records):
         return call_records
@@ -79,9 +70,9 @@ def list_transcripts_by_dates(request: Request, start_date: str, end_date: str):
     
 
 '''Finding calls based on call lengths'''
-def list_transcripts_by_duration(request: Request, min_len: int, max_len: int):
+def list_transcripts_by_duration(collection, min_len: int, max_len: int):
 
-    call_records = list(get_collection_calls(request).find({"duration":{"$gte": min_len, "$lte": max_len}}))
+    call_records = list(collection.find({"duration":{"$gte": min_len, "$lte": max_len}}))
 
     if len(call_records):
         return call_records
@@ -103,6 +94,7 @@ def update_calls(collection, call_id: str, calls: UpdateCall = Body(...)):
 
     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Call not found!")
 
+
 def update_captions(collection, call_id: str, calls: UserCaptions = Body(...)):
     # calls = {k: v for k, v in calls.model_dump().items() if v is not None}
     calls = {k: v for k, v in calls.items() if v is not None}
@@ -119,8 +111,8 @@ def update_captions(collection, call_id: str, calls: UserCaptions = Body(...)):
     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Captions not found!")
 
 
-def delete_calls(request: Request, call_id: str):
-    deleted_calls = get_collection_calls(request).delete_one({"call_id": call_id})
+def delete_calls(collection, call_id: str):
+    deleted_calls = collection.delete_one({"call_id": call_id})
 
     if deleted_calls.deleted_count == 1:
         return f"Call deleted sucessfully!"