Merge pull request #24 from amfoss/develop

fix: display total_points in user profile and expose all auth endpoints

Author: ganidande905

app/main.py

@@ -1,6 +1,6 @@
 from fastapi import FastAPI
 from app.db.db import Base, engine
-from app.routes import auth, progress, tracks, leaderboard, mentors , submissions
+from app.routes import auth, progress, tracks, leaderboard, mentors , submissions 
 from fastapi.middleware.cors import CORSMiddleware
 
 app = FastAPI(title="amMentor API")

app/routes/auth.py

@@ -1,12 +1,13 @@
+from app.utils.helpers import calculate_total_points
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 from datetime import datetime, timedelta
 import random, string
-
 from app.db import models, crud
 from app.db.db import get_db
-from app.schemas.user import UserCreate, UserOut
+from app.schemas.user import UserCreate, UserOut, UserOutWithPoints
 from app.utils.mail import send_email
+from sqlalchemy import func
 
 router = APIRouter()
 
@@ -56,9 +57,24 @@ def verify_otp(email: str, otp: str = Query(...), db: Session = Depends(get_db))
 
     return user
 
-@router.get("/user/{email}", response_model=UserOut)
+
+@router.get("/user/{email}", response_model=UserOutWithPoints)
 def get_user_by_email(email: str, db: Session = Depends(get_db)):
-    user = crud.get_user_by_email(db, email)
+    user = db.query(models.User).filter(models.User.email == email).first()
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
-    return user
+    submissions = db.query(models.Submission).filter_by(mentee_id=user.id).all()
+    task_ids = [s.task_id for s in submissions]
+    if task_ids:
+        tasks = db.query(models.Task).filter(models.Task.id.in_(task_ids)).all()
+        task_lookup = {task.id: task.points for task in tasks}
+    else:
+        task_lookup = {}
+    total_points = calculate_total_points(submissions, task_lookup)
+    return {
+        "id": user.id,
+        "email": user.email,
+        "name": user.name,
+        "role": user.role,
+        "total_points": total_points
+    }

app/schemas/user.py

@@ -10,6 +10,10 @@ class UserCreate(UserBase):
 class UserOut(UserBase):
     id: int
     role: str
+    name: str
+    email: str
 
     class Config:
-        orm_mode = True
+        orm_mode = True
+class UserOutWithPoints(UserOut):
+    total_points: int