eli-540 refactored get person

Author: Karthikeyannhs

src/eligibility_signposting_api/repos/person_repo.py

@@ -55,28 +55,29 @@ 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("The AWSPREVIOUS secret was tried, but no person record was found")
 
-            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.error("The AWSPREVIOUS secret was also tried, but no person record was found")
                     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")
+                    logger.error("The not hashed nhs number was also tried, but no person record was found")
                     message = "Person not found after checking AWSCURRENT, AWSPREVIOUS, and not hashed NHS numbers."
                     raise NotFoundError(message)
 
+        logger.info("Person record found")
         return Person(data=items)