diff --git a/app/crud.py b/app/crud.py index 4137586..bc02137 100644 --- a/app/crud.py +++ b/app/crud.py @@ -5,6 +5,7 @@ from .auth import get_password_hash from sqlalchemy import func + def get_user(db: Session, user_id: int): return db.query(models.User).filter(models.User.id == user_id).first() @@ -20,12 +21,10 @@ def get_users(db: Session, skip: int = 0, limit: int = 100): def create_user(db: Session, user: schemas.UserCreate): hashed_password = get_password_hash(user.password) user_dict = user.dict() - user_dict['hashed_password'] = hashed_password - del user_dict['password'] + user_dict["hashed_password"] = hashed_password + del user_dict["password"] print(user_dict) - db_user = models.User( - **user_dict - ) + db_user = models.User(**user_dict) db.add(db_user) db.commit() db.refresh(db_user) @@ -291,11 +290,19 @@ def get_user_reports_by_discord_id(db: Session, discord_username: str): .all()[0]["Report"] ) -def add_reports_by_discord_id(db:Session, report: schemas.ReportDiscord, discord_username: str): - user_id = db.query(models.User).filter(models.User.discord_username == discord_username).first().id + +def add_reports_by_discord_id( + db: Session, report: schemas.ReportDiscord, discord_username: str +): + user_id = ( + db.query(models.User) + .filter(models.User.discord_username == discord_username) + .first() + .id + ) db_report = models.Report(**report.dict()) - db_report.owner_id=user_id + db_report.owner_id = user_id db.add(db_report) db.commit() db.refresh() - return {"message": "report succesfully added"} \ No newline at end of file + return {"message": "report succesfully added"} diff --git a/app/main.py b/app/main.py index f6248c0..4ceb24e 100644 --- a/app/main.py +++ b/app/main.py @@ -126,12 +126,12 @@ async def login_for_access_token( "user_id": user.id, "full_name": user.full_name, "role": user.role, - "phone_no":user.phone_no, - "register_num":user.register_num, - "college":user.college, - "join_year":user.join_year, - "grad_year":user.grad_year, - "dept":user.dept + "phone_no": user.phone_no, + "register_num": user.register_num, + "college": user.college, + "join_year": user.join_year, + "grad_year": user.grad_year, + "dept": user.dept, }, expires_delta=access_token_expires, ) @@ -273,12 +273,12 @@ def forgot_password(user_email: str, db: Session = Depends(get_db)): @app.post("/enterotp") -def enter_otp(user:schemas.ForgotPass, db: Session = Depends(get_db)): +def enter_otp(user: schemas.ForgotPass, db: Session = Depends(get_db)): db_user = crud.get_user_by_email(db, email=user.email) if db_user.otp == user.otp: db_user.otp = 0 db_user.hashed_password = auth.get_password_hash(user.password) - crud.save_user_details(db,db_user) + crud.save_user_details(db, db_user) return {"status": "success", "message": "Password changed successfully"} else: return {"status": "failure", "message": "OTP not verified"} @@ -351,6 +351,11 @@ def update_discord_id( def get_user_report_by_discord_id(discord_username: str, db: Session = Depends(get_db)): return crud.get_user_reports_by_discord_id(db=db, discord_username=discord_username) + @app.post("/discord") -def add_report_by_discord_username(discord_username: str, report:schemas.ReportDiscord, db: Session = Depends(get_db)): - return crud.add_reports_by_discord_id(db=db, discord_username=discord_username, report=report) \ No newline at end of file +def add_report_by_discord_username( + discord_username: str, report: schemas.ReportDiscord, db: Session = Depends(get_db) +): + return crud.add_reports_by_discord_id( + db=db, discord_username=discord_username, report=report + )