Fix bugs

Author: billyhoce

services/question-service/app/crud.py

@@ -21,7 +21,26 @@ def list_difficulties_and_topics() -> Dict[str, List[str]]:
             topics = [row[0] for row in cur.fetchall()]
 
             return {"difficulties": difficulties, "topics": topics}
-        
+
+def add_difficulty(difficulty: str):
+    with get_conn() as conn:
+        with conn.cursor() as cur:
+            cur.execute("INSERT INTO difficulties (name) VALUES (%s) ON CONFLICT DO NOTHING", (difficulty,))
+
+def delete_difficulty(difficulty: str):
+    with get_conn() as conn:
+        with conn.cursor() as cur:
+            cur.execute("DELETE FROM difficulties WHERE level = %s", (difficulty,))
+
+def add_topic(topic: str):
+    with get_conn() as conn:
+        with conn.cursor() as cur:
+            cur.execute("INSERT INTO topics (name) VALUES (%s) ON CONFLICT DO NOTHING", (topic,))
+
+def delete_topic(topic: str):
+    with get_conn() as conn:
+        with conn.cursor() as cur:
+            cur.execute("DELETE FROM topics WHERE name = %s", (topic,))
 
 def create_question(
     name: str,

services/question-service/app/main.py

@@ -4,6 +4,10 @@
 from app.models.exceptions import QuestionNotFoundException
 from app.utils import batch_convert_base64_to_bytes, batch_convert_bytes_to_base64
 from app.crud import (
+    add_difficulty,
+    delete_difficulty,
+    add_topic,
+    delete_topic,
     create_question,
     get_question,
     get_random_question_by_difficulty_and_topic,
@@ -18,7 +22,7 @@
 app = FastAPI()
 
 @app.post("/questions")
-def create_question(q: QuestionBase64Images):
+def create_question_endpoint(q: QuestionBase64Images):
     # Convert images and call CRUD with primitive types
     images_bytes = batch_convert_base64_to_bytes(q.images)
 
@@ -38,16 +42,17 @@ def create_question(q: QuestionBase64Images):
 
 
 @app.get("/questions/{qid}", response_model=QuestionBase64Images) 
-def read_question(qid: str):
+def get_question_endpoint(qid: str):
     try:
         question_dict = get_question(qid)
     except QuestionNotFoundException as e:
         raise HTTPException(status_code=404, detail=f"Question {e.question_id} not found")
-    return batch_convert_bytes_to_base64(question_dict)
+    question_dict['images'] = batch_convert_bytes_to_base64(question_dict['images'])
+    return question_dict
 
 
 @app.get("/questions/random")
-def get_random_question(
+def get_random_question_endpoint(
     difficulty: str = Query(..., description="The difficulty level to filter by"),
     topic: str = Query(..., description="The topic to filter by")
 ):
@@ -56,11 +61,12 @@ def get_random_question(
         question_dict = get_random_question_by_difficulty_and_topic(difficulty, topic)
     except QuestionNotFoundException as e:
         raise HTTPException(status_code=404, detail=str(e))
-    return batch_convert_bytes_to_base64(question_dict)
+    question_dict['images'] = batch_convert_bytes_to_base64(question_dict['images'])
+    return question_dict
 
 
 @app.put("/questions/{qid}")
-def update_question(qid: str, q: QuestionBase64Images):
+def update_question_endpoint(qid: str, q: QuestionBase64Images):
     images_bytes = batch_convert_base64_to_bytes(q.images)
 
     try:
@@ -81,7 +87,7 @@ def update_question(qid: str, q: QuestionBase64Images):
 
 
 @app.delete("/questions/{qid}")
-def delete_question(qid: str):
+def delete_question_endpoint(qid: str):
     try:
         delete_question(qid)
     except QuestionNotFoundException as e:
@@ -91,6 +97,34 @@ def delete_question(qid: str):
     }
 
 
-@app.get("/metadata")
-def get_metadata():
+@app.get("/difficulties-topics")
+def get_difficulties_topics():
     return list_difficulties_and_topics()
+
+@app.post("/difficulties")
+def add_difficulty_endpoint(difficulty: str = Query(..., description="The difficulty level to add")):
+    add_difficulty(difficulty)
+    return {
+        "message": f"Difficulty '{difficulty}' added successfully"
+    }
+
+@app.delete("/difficulties")
+def delete_difficulty_endpoint(difficulty: str = Query(..., description="The difficulty level to delete")):
+    delete_difficulty(difficulty)
+    return {
+        "message": f"Difficulty '{difficulty}' deleted successfully"
+    }
+
+@app.post("/topics")
+def add_topic_endpoint(topic: str = Query(..., description="The topic to add")):
+    add_topic(topic)
+    return {
+        "message": f"Topic '{topic}' added successfully"
+    }
+
+@app.delete("/topics")
+def delete_topic_endpoint(topic: str = Query(..., description="The topic to delete")):
+    delete_topic(topic)
+    return {
+        "message": f"Topic '{topic}' deleted successfully"
+    }