From 0e9c7d0572ef939bf4eaa2e75e1cfd042e9bd531 Mon Sep 17 00:00:00 2001
From: Juan Carlos Jose Camacho <jc@dataherald.com>
Date: Mon, 9 Oct 2023 11:21:54 -0600
Subject: [PATCH] DH-4806 Raise 400 and 404 error for GET endpoints

---
 dataherald/api/fastapi.py | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/dataherald/api/fastapi.py b/dataherald/api/fastapi.py
index bf7c3aaf..6840fd22 100644
--- a/dataherald/api/fastapi.py
+++ b/dataherald/api/fastapi.py
@@ -4,7 +4,7 @@
 from typing import List
 
 from bson import json_util
-from bson.objectid import ObjectId
+from bson.objectid import InvalidId, ObjectId
 from fastapi import BackgroundTasks, HTTPException
 from overrides import override
 
@@ -272,7 +272,15 @@ def list_table_descriptions(
     @override
     def get_table_description(self, table_description_id: str) -> TableDescription:
         scanner_repository = TableDescriptionRepository(self.storage)
-        return scanner_repository.find_by_id(table_description_id)
+
+        try:
+            result = scanner_repository.find_by_id(table_description_id)
+        except InvalidId as e:
+            raise HTTPException(status_code=400, detail=str(e)) from e
+
+        if not result:
+            raise HTTPException(status_code=404, detail="Table description not found")
+        return result
 
     @override
     def get_responses(self, question_id: str | None = None) -> list[Response]:
@@ -285,7 +293,16 @@ def get_responses(self, question_id: str | None = None) -> list[Response]:
     @override
     def get_response(self, response_id: str) -> Response:
         response_repository = ResponseRepository(self.storage)
-        return response_repository.find_by_id(response_id)
+
+        try:
+            result = response_repository.find_by_id(response_id)
+        except InvalidId as e:
+            raise HTTPException(status_code=400, detail=str(e)) from e
+
+        if not result:
+            raise HTTPException(status_code=404, detail="Question not found")
+
+        return result
 
     @override
     def get_questions(self, db_connection_id: str | None = None) -> list[Question]:
@@ -293,12 +310,22 @@ def get_questions(self, db_connection_id: str | None = None) -> list[Question]:
         query = {}
         if db_connection_id:
             query = {"db_connection_id": ObjectId(db_connection_id)}
+
         return question_repository.find_by(query)
 
     @override
     def get_question(self, question_id: str) -> Question:
         question_repository = QuestionRepository(self.storage)
-        return question_repository.find_by_id(question_id)
+
+        try:
+            result = question_repository.find_by_id(question_id)
+        except InvalidId as e:
+            raise HTTPException(status_code=400, detail=str(e)) from e
+
+        if not result:
+            raise HTTPException(status_code=404, detail="Question not found")
+
+        return result
 
     @override
     def add_golden_records(