Fixed backend with login and user creation

Author: Uttam Singh

backend/app/database.py

@@ -4,11 +4,13 @@
 
 DATABASE_URL = os.getenv("DATABASE_URL", "sqlite:///./app.db")
 
-engine = create_engine(DATABASE_URL, connect_args={"check_same_thread": False} if DATABASE_URL.startswith("sqlite") else {})
+engine = create_engine(
+    DATABASE_URL,
+    connect_args={"check_same_thread": False} if DATABASE_URL.startswith("sqlite") else {}
+)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 Base = declarative_base()
 
-# Dependency for FastAPI routes
 def get_db():
     db = SessionLocal()
     try:

backend/app/routers/users.py

@@ -6,12 +6,7 @@
 
 router = APIRouter()
 
-# List all users
-@router.get("/")
-def list_users(db: Session = Depends(get_db)):
-    return db.query(User).all()
-
-# Create new user
+# ✅ Create a new user
 @router.post("/")
 def create_user(
     name: str = Form(...),
@@ -34,36 +29,31 @@ def create_user(
     )
     db.add(user)
     db.commit()
-    return {"ok": True}
-
-# Delete user
-@router.delete("/{user_id}")
-def delete_user(user_id: int, db: Session = Depends(get_db)):
-    user = db.get(User, user_id)
-    if not user:
-        raise HTTPException(status_code=404, detail="User not found")
-    db.delete(user)
-    db.commit()
-    return {"ok": True}
+    return {"ok": True, "message": "User created successfully"}
 
 # ✅ Login route
 @router.post("/login")
-def login(
+def login_user(
     email: str = Form(...),
     password: str = Form(...),
-    db: Session = Depends(get_db),
+    db: Session = Depends(get_db)
 ):
     user = db.query(User).filter(User.email == email).first()
     if not user or not bcrypt.verify(password, user.hashed_password):
         raise HTTPException(status_code=401, detail="Invalid email or password")
-    
-    return {
-        "status": "ok",
-        "user": {
-            "id": user.id,
-            "name": user.name,
-            "email": user.email,
-            "role": user.role,
-            "department": user.department,
-        }
-    }
+    return {"message": "Login successful", "user": {"id": user.id, "name": user.name, "role": user.role}}
+
+# ✅ Get all users
+@router.get("/")
+def list_users(db: Session = Depends(get_db)):
+    return db.query(User).all()
+
+# ✅ Delete user
+@router.delete("/{user_id}")
+def delete_user(user_id: int, db: Session = Depends(get_db)):
+    user = db.get(User, user_id)
+    if not user:
+        raise HTTPException(status_code=404, detail="User not found")
+    db.delete(user)
+    db.commit()
+    return {"ok": True, "message": "User deleted"}