From 234b5bbde5ba19e2135516b3b5d803e74b85636b Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 13:02:27 +0000 Subject: [PATCH] Format code with black This commit fixes the style issues introduced in f72703b according to the output from black. Details: https://deepsource.io/gh/kgex/bigbbe/transform/9b116603-e3ce-4a6b-a08e-18c08b55a3eb/ --- app/crud.py | 25 ++++++++++++++++--------- app/main.py | 25 +++++++++++++++---------- app/models.py | 15 ++++++++++++--- app/schemas.py | 18 +++++++++++------- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/app/crud.py b/app/crud.py index a68923d..bbff5bf 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) @@ -287,11 +286,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 510de19..d027ee1 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 + ) diff --git a/app/models.py b/app/models.py index 4a34ab5..8c48ae4 100644 --- a/app/models.py +++ b/app/models.py @@ -1,6 +1,15 @@ from enum import unique from pydoc import describe -from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, DateTime, Enum, Date +from sqlalchemy import ( + Boolean, + Column, + ForeignKey, + Integer, + String, + DateTime, + Enum, + Date, +) from sqlalchemy.orm import relationship from .enums import TaskEnum, GrievanceEnum, PriorityEnum, StatusEnum from .database import Base @@ -17,12 +26,12 @@ class User(Base): rfid_key = Column(String, unique=True) otp = Column(Integer, unique=True) role = Column(String, default="student") - register_num = Column(String, unique = True) + register_num = Column(String, unique=True) discord_username = Column(String, unique=True) phone_no = Column(String, unique=True) college = Column(String) dept = Column(String) - join_year= Column(Integer) + join_year = Column(Integer) grad_year = Column(Integer) otp_last_gen = Column(DateTime) items = relationship("Item", back_populates="owner") diff --git a/app/schemas.py b/app/schemas.py index 4685288..ac706cb 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -56,12 +56,13 @@ class UserBase(BaseModel): class UserCreate(UserBase): password: str - phone_no:str - register_num:str - college:str - join_year:int - grad_year:int - dept:str + phone_no: str + register_num: str + college: str + join_year: int + grad_year: int + dept: str + class UserDelete(BaseModel): id: int @@ -95,6 +96,7 @@ class Report(BaseModel): class Config: orm_mode = True + class ReportDiscord(BaseModel): task_type: TaskEnum title: str @@ -108,6 +110,7 @@ class ReportDiscord(BaseModel): class Config: orm_mode = True + class ResetPasswordBase(BaseModel): email: str password: str @@ -217,7 +220,8 @@ class AttendanceResponse(BaseModel): class Config: orm_mode = True + class ForgotPass(BaseModel): email: str otp: int - password: str \ No newline at end of file + password: str