Cleaning up code

main.py

@@ -1,20 +1,10 @@
 import logging
-import os
-
-from dotenv import load_dotenv
 
 import utils
 from appconfig.config import Config
 from services.blaise_service import BlaiseService
 from services.validation_service import ValidationService
-from utilities.custom_exceptions import (
-    BlaiseError,
-    ConfigError,
-    GuidError,
-    IngestError,
-    RequestError,
-    UsersError,
-)
+from utilities.custom_exceptions import BlaiseError, ConfigError, IngestError
 from utilities.logging import setup_logger
 
 setup_logger()
@@ -66,26 +56,15 @@ def process_zip_file(data, _context):
 
         return f"Successfully ingested {file_name} from bucket", 200
 
-    except (RequestError, AttributeError, ValueError, ConfigError) as e:
+    except (AttributeError, ValueError, ConfigError) as e:
         error_message = f"Error occurred during Ingest: {e}"
         logging.error(error_message)
         return error_message, 400
     except BlaiseError as e:
         error_message = f"Error occurred during Ingest: {e}"
         logging.error(error_message)
         return error_message, 404
-    except (GuidError, UsersError, IngestError, Exception) as e:
+    except (IngestError, Exception) as e:
         error_message = f"Error occurred during Ingest: {e}"
         logging.error(error_message)
         return error_message, 500
-
-
-if os.path.isfile("./.env"):
-    logging.info("Loading environment variables from dotenv file")
-    load_dotenv()
-
-
-if __name__ == "__main__":
-    process_zip_file(
-        {"bucket": "ons-blaise-v2-dev-rr3-ingest", "name": "IPS2501A.zip"}, None
-    )

utilities/custom_exceptions.py

@@ -26,34 +26,6 @@ def __str__(self):
         return self._format_message()
 
 
-class GuidError(Exception):
-    def __init__(self, message=None):
-        self.message = message
-        super().__init__(self._format_message())
-
-    def _format_message(self):
-        if self.message:
-            return self.message
-        return ""
-
-    def __str__(self):
-        return self._format_message()
-
-
-class UsersError(Exception):
-    def __init__(self, message=None):
-        self.message = message
-        super().__init__(self._format_message())
-
-    def _format_message(self):
-        if self.message:
-            return self.message
-        return ""
-
-    def __str__(self):
-        return self._format_message()
-
-
 class IngestError(Exception):
     def __init__(self, message=None):
         self.message = message
@@ -66,45 +38,3 @@ def _format_message(self):
 
     def __str__(self):
         return self._format_message()
-
-
-class RequestError(Exception):
-    def __init__(self, message=None):
-        self.message = message
-        super().__init__(self._format_message())
-
-    def _format_message(self):
-        if self.message:
-            return self.message
-        return ""
-
-    def __str__(self):
-        return self._format_message()
-
-
-class UsersWithRoleNotFound(Exception):
-    def __init__(self, message=None):
-        self.message = message
-        super().__init__(self._format_message())
-
-    def _format_message(self):
-        if self.message:
-            return self.message
-        return ""
-
-    def __str__(self):
-        return self._format_message()
-
-
-class QuestionnaireNotFound(Exception):
-    def __init__(self, message=None):
-        self.message = message
-        super().__init__(self._format_message())
-
-    def _format_message(self):
-        if self.message:
-            return self.message
-        return ""
-
-    def __str__(self):
-        return self._format_message()