handle mongo errors

Author: ash-raph

dao/audit.py

@@ -1,6 +1,9 @@
 import logging
 from datetime import datetime
 
+from pymongo.collection import Collection
+from pymongo.errors import PyMongoError
+
 from sample_code.dao._base_mongo import BaseMongoDAO
 from sample_code.settings import (
     AUDIT_COLLECTION,
@@ -26,8 +29,11 @@ def __init__(
             mongoReplicaset=mongoReplicaset,
         )
 
-    def run_aggregation_query(collection, query, **kwargs):
-        return collection.aggregate(query, **kwargs)
+    def run_aggregation_query(collection: Collection, query: str, **kwargs):
+        try:
+            return collection.aggregate(query, **kwargs)
+        except PyMongoError as exc:
+            logger.error(str(exc))
 
     def get_subscribers(self, auditRangeStart: datetime, auditRangeEnd: datetime):
         logger.info(

dao/reporting.py

@@ -27,7 +27,6 @@ def run_query(self, query):
         except SQLAlchemyError as e:
             error = str(e.__dict__["orig"])
             logger.error(error)
-            return error
 
     def create_reporting_table(self) -> None:
         logger.info("Initiate reporting table")

dao/usage.py

@@ -3,6 +3,7 @@
 
 from pymongo import DESCENDING
 from pymongo.collection import Collection
+from pymongo.errors import PyMongoError
 
 from sample_code.dao._base_mongo import BaseMongoDAO
 from sample_code.settings import COLLECTION, DATABASE, PASSWORD, USERNAME
@@ -33,18 +34,21 @@ def run_query(
         limit_results: bool = False,
         limit_count: int = 10,
     ) -> list:
-        if project is not None:
-            db_query = collection.find(query, project)
-        else:
-            db_query = collection.find(query)
+        try:
+            if project is not None:
+                db_query = collection.find(query, project)
+            else:
+                db_query = collection.find(query)
 
-        if sort:
-            db_query.sort(sort_field, DESCENDING)
+            if sort:
+                db_query.sort(sort_field, DESCENDING)
 
-        if limit_results:
-            db_query.limit(limit_count)
+            if limit_results:
+                db_query.limit(limit_count)
 
-        return [doc for doc in db_query]
+            return [doc for doc in db_query]
+        except PyMongoError as exc:
+            logger.error(str(exc))
 
     def get_subscriber_usage(
         self, subscriberId: str, effectiveDate: datetime, expiryDate: datetime