From 9855833a819ccf2b41e7e42d4c58a958a40eda77 Mon Sep 17 00:00:00 2001
From: lambeb <141648830+lambeb@users.noreply.github.com>
Date: Wed, 29 Jan 2025 17:31:38 +0000
Subject: [PATCH] removing this code caused test to fail. have left out
 regex.py as that was not being used

---
 main.py                        | 27 +++++++++++--
 utilities/custom_exceptions.py | 70 ++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index abe4051..5108229 100644
--- a/main.py
+++ b/main.py
@@ -1,10 +1,20 @@
 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, IngestError
+from utilities.custom_exceptions import (
+    BlaiseError,
+    ConfigError,
+    GuidError,
+    IngestError,
+    RequestError,
+    UsersError,
+)
 from utilities.logging import setup_logger
 
 setup_logger()
@@ -56,7 +66,7 @@ def process_zip_file(data, _context):
 
         return f"Successfully ingested {file_name} from bucket", 200
 
-    except (AttributeError, ValueError, ConfigError) as e:
+    except (RequestError, AttributeError, ValueError, ConfigError) as e:
         error_message = f"Error occurred during Ingest: {e}"
         logging.error(error_message)
         return error_message, 400
@@ -64,7 +74,18 @@ def process_zip_file(data, _context):
         error_message = f"Error occurred during Ingest: {e}"
         logging.error(error_message)
         return error_message, 404
-    except (IngestError, Exception) as e:
+    except (GuidError, UsersError, 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
+    )
diff --git a/utilities/custom_exceptions.py b/utilities/custom_exceptions.py
index 10e1203..eba11fe 100644
--- a/utilities/custom_exceptions.py
+++ b/utilities/custom_exceptions.py
@@ -26,6 +26,34 @@ 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
@@ -38,3 +66,45 @@ 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()