Merge pull request #16 from IEEECS-VIT/aryan

login responses

Author: jainaryan04

routes/answer.py

@@ -1,50 +1,58 @@
 from fastapi import FastAPI, HTTPException, Depends
-from typing import List, Dict
-from pydantic import BaseModel
+from typing import List
+from pydantic import BaseModel, Field
 from middleware.verifyToken import get_access_token
 from firebase_admin import auth
 from config import initialize
+from botocore.exceptions import ClientError
 
 ans_app = FastAPI()
 
 resources = initialize()
 user_table = resources['user_table']
 firebase_app = resources['firebase_app']  
 
-class QuestionAnswer(BaseModel):
-    question: str
-    answer: str
-
 class AnswerStruct(BaseModel):
-    domain: str
-    questions: List[str]
-    answers: List[str]
-    
-# Route for posting answers
+    domain: str = Field(..., title="Domain for the answers")
+    questions: List[str] = Field(..., title="List of questions")
+    answers: List[str] = Field(..., title="List of answers")
+
 @ans_app.post("/post-answer")
 async def post_answers(answerReq: AnswerStruct, idToken: str = Depends(get_access_token)):
     try:
         # Validate token and fetch user records
-        decoded_token = auth.verify_id_token(idToken, app=firebase_app)
+        decoded_token = auth.verify_id_token(idToken, app=resources["firebase_app"])
         email = decoded_token.get("email")
+        print(answerReq)
+
+        if not email:
+            raise HTTPException(status_code=401, detail="Invalid or missing email in token.")
 
         response = user_table.get_item(Key={"uid": email})
         user = response.get("Item")
 
         if not user:
-            raise HTTPException(status_code=404, detail="User not found")
+            raise HTTPException(status_code=404, detail="User not found.")
 
-        # Extract existing Q&A data
-        existing_qna = user.get("qna", {})
+        # Validate input lengths
+        if len(answerReq.questions) != len(answerReq.answers):
+            raise HTTPException(
+                status_code=400,
+                detail="Questions and answers lists must have the same length."
+            )
 
+        # Check for existing domain
+        existing_qna = user.get("qna", {})
         if answerReq.domain in existing_qna:
             raise HTTPException(
                 status_code=400,
                 detail=f"Answers for domain '{answerReq.domain}' have already been submitted."
             )
 
         # Convert Pydantic model to dictionary (array of question/answer pairs)
-        answers_dict = [{"question": q, "answer": a} for q, a in zip(answerReq.questions, answerReq.answers)]
+        answers_dict = [
+            {"question": q, "answer": a} for q, a in zip(answerReq.questions, answerReq.answers)
+        ]
 
         # Add answers for the new domain
         existing_qna[answerReq.domain] = {"answers": answers_dict}
@@ -58,7 +66,9 @@ async def post_answers(answerReq: AnswerStruct, idToken: str = Depends(get_acces
             ReturnValues="UPDATED_NEW",
         )
 
-        return {"message": f"Answers for domain '{answerReq.domain}' submitted successfully.", "qna": existing_qna}
+        return {"message": f"Answers for domain '{answerReq.domain}' submitted successfully."}
 
+    except ClientError as e:
+        raise HTTPException(status_code=500, detail=f"DynamoDB error: {str(e)}")
     except Exception as e:
-        raise HTTPException(status_code=400, detail=f"Error posting answers: {str(e)}")
+        raise HTTPException(status_code=400, detail=f"Error posting answers: {str(e)}")

routes/user.py

@@ -1,4 +1,5 @@
 from fastapi import FastAPI, HTTPException, Depends
+from fastapi.responses import JSONResponse
 from firebase_admin import auth
 from pydantic import BaseModel
 from middleware.verifyToken import get_access_token
@@ -24,13 +25,9 @@ async def login(authorization: str = Depends(get_access_token), resources: dict
         response = user_table.get_item(Key={'uid': email})
         user = response.get('Item')
         if user is not None:
-            username = user.get("username")
-            if username not in [None, ""]:
-                return {"status": "success", "message": "Username exists", "email": email, "username": username}
-            else:
-                return {"status": "success", "message": "Username does not exist", "email": email}
+            return JSONResponse(status_code=200, content={"detail": "Logged In Successfully"})
         else:
-            raise HTTPException(status_code=401, detail="User not registered on VTOP")
+            return JSONResponse(status_code=402, content={"detail":"User not registered on VTOP"})
 
     except auth.InvalidIdTokenError:
         raise HTTPException(status_code=401, detail="Invalid ID token")