eli-540 error handling

Author: Karthikeyannhs

src/eligibility_signposting_api/processors/hashing_service.py

@@ -35,8 +35,8 @@ def __init__(
 
     def hash_with_current_secret(self, nhs_number: str) -> str | None:
         secret_value = self.secret_repo.get_secret_current(self.hash_secret_name).get("AWSCURRENT")
-        return _hash(nhs_number, secret_value)
+        return _hash(nhs_number, secret_value) if secret_value else None
 
     def hash_with_previous_secret(self, nhs_number: str) -> str | None:
         secret_value = self.secret_repo.get_secret_previous(self.hash_secret_name).get("AWSPREVIOUS")
-        return _hash(nhs_number, secret_value)
+        return _hash(nhs_number, secret_value) if secret_value else None

src/eligibility_signposting_api/repos/person_repo.py

@@ -55,24 +55,24 @@ def get_person_record(self, nhs_hash: str | None) -> Any:
         return None
 
     def get_eligibility_data(self, nhs_number: NHSNumber) -> Person:
-        # AWSCURRENT secret
-        nhs_hash = self._hashing_service.hash_with_current_secret(nhs_number)
-        items = self.get_person_record(nhs_hash)
-
+        # Hash using AWSCURRENT secret and fetch items
+        items = None
+        nhs_hashed_with_current = self._hashing_service.hash_with_current_secret(nhs_number)
+        if nhs_hashed_with_current:
+            items = self.get_person_record(nhs_hashed_with_current)
         if not items:
-            logger.error("No person record found for hashed nhs_number using secret AWSCURRENT")
-
-            # AWSPREVIOUS secret
-            nhs_hash = self._hashing_service.hash_with_previous_secret(nhs_number)
+            logger.warning("No person record found for hashed nhs_number using secret AWSCURRENT")
 
-            if nhs_hash is not None:
-                items = self.get_person_record(nhs_hash)
+            # Hash using AWSPREVIOUS secret and fetch items
+            nhs_hashed_with_previous = self._hashing_service.hash_with_previous_secret(nhs_number)
+            if nhs_hashed_with_previous:
+                items = self.get_person_record(nhs_hashed_with_previous)
                 if not items:
-                    logger.error("No person record found for hashed nhs_number using secret AWSPREVIOUS")
+                    logger.warning("No person record found for hashed nhs_number using secret AWSPREVIOUS")
                     message = "Person not found after checking AWSCURRENT and AWSPREVIOUS."
                     raise NotFoundError(message)
             else:
-                # fallback not hashed NHS number
+                # fallback : Fetch using Raw NHS number
                 items = self.get_person_record(nhs_number)
                 if not items:
                     logger.error("No person record found for not hashed nhs_number")

src/eligibility_signposting_api/repos/secret_repo.py

@@ -25,6 +25,10 @@ def _get_secret_by_stage(self, secret_name: str, stage: str) -> dict[str, str]:
             )
             return {stage: response["SecretString"]}
 
+        except self.secret_manager.exceptions.ResourceNotFoundException:
+            logger.exception("Secret %s not found for stage %s", secret_name, stage)
+            return {}
+
         except ClientError:
             logger.exception("Failed to get secret %s at stage %s", secret_name, stage)
             return {}