Provide 404 for non-existent record

nationalarchives · Feb 19, 2024 · 032cc1f · 032cc1f
1 parent 8877ca0
commit 032cc1f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/app/records/routes.py b/app/records/routes.py
@@ -5,6 +5,7 @@
     RosettaRecordsSearch,
     RosettaRecordsSearchStats,
 )
+from fastapi import HTTPException
 
 from .schemas import Record, RecordArchive, RecordCreator, RecordSearchResults
 
@@ -80,5 +81,8 @@ async def item(
     id: str,
 ):  # ) -> Record | RecordCreator | RecordArchive:
     rosetta_api = RosettaRecordDetails()
-    result = rosetta_api.get_result(id)
+    try:
+        result = rosetta_api.get_result(id)
+    except Exception:
+        raise HTTPException(status_code=404, detail="Record not found")
     return result
diff --git a/app/sources/rosetta/api.py b/app/sources/rosetta/api.py
@@ -150,7 +150,10 @@ def get_result(self, id: str) -> dict:
         return self.parse_results(raw_results, url)
 
     def parse_results(self, raw_results, source_url):
-        parsed_data = RosettaResponseParser(raw_results)
+        try:
+            parsed_data = RosettaResponseParser(raw_results)
+        except Exception:
+            raise Exception("Respone is not recognised")
         if (
             parsed_data.type() == "record"
             or parsed_data.type() == "aggregation"

diff --git a/app/sources/rosetta/lib/response_parser.py b/app/sources/rosetta/lib/response_parser.py
@@ -28,7 +28,11 @@
 
 class RosettaResponseParser:
     def __new__(cls, rosetta_data: dict, source_item: int = 0):
-        rosetta_data_source = rosetta_data["metadata"][source_item]["_source"]
+        rosetta_data_source = objects.get(
+            rosetta_data, f"metadata.{source_item}._source"
+        )
+        if not rosetta_data_source:
+            raise Exception("Invalid response structure")
         return RosettaSourceParser(rosetta_data_source)