diff --git a/api/core/security.py b/api/core/security.py index 318ea9b..7273fdf 100644 --- a/api/core/security.py +++ b/api/core/security.py @@ -33,9 +33,8 @@ def create_access_token(data: dict, expires_delta: Optional[timedelta] = None) - else: expire = datetime.utcnow() + timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES) to_encode.update({"exp": expire}) - encoded_jwt = jwt.encode( + return jwt.encode( to_encode, settings.SECRET_KEY, algorithm=ALGORITHM) - return encoded_jwt def verify_password(plain_password: str, hashed_password: str) -> bool: diff --git a/api/crud.py b/api/crud.py index d4413d8..75a72a8 100644 --- a/api/crud.py +++ b/api/crud.py @@ -148,10 +148,8 @@ def get_tweets_for_user(db: Session, user_id: int, skip: int = 0, limit: int = 1 raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail="User does not exist") - # user exists - proceed to return tweets - tweets = db.query(models.Tweet).filter(models.Tweet.user_id == user_id).order_by( + return db.query(models.Tweet).filter(models.Tweet.user_id == user_id).order_by( models.Tweet.created_at.desc()).limit(limit).all() - return tweets def get_tweets_liked_by_user(db: Session, user_id: int, skip: int = 0, limit: int = 100): @@ -390,10 +388,8 @@ def get_all_followers(db: Session, user_id: int): raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Bad userId. User does not exist.") - # User is valid - proceed to get all followers - db_followers = db.query(models.Follows).filter( + return db.query(models.Follows).filter( models.Follows.follows_user_id == user_id).all() - return db_followers ############### # Tweet Likes # diff --git a/api/routers/users.py b/api/routers/users.py index f33e8ac..47ca28c 100644 --- a/api/routers/users.py +++ b/api/routers/users.py @@ -115,9 +115,7 @@ def update_user(request_body: schemas.UserUpdateRequestBody, raise HTTPException( status_code=status.HTTP_406_NOT_ACCEPTABLE, detail="Username already exists") - # Update user attributes - user = crud.update_user(db, current_user.id, request_body) - return user + return crud.update_user(db, current_user.id, request_body) @router.delete('/', response_model=schemas.EmptyResponse)