From baf8c574a0bc209c1d5f55e602dad7ffe1176c1b Mon Sep 17 00:00:00 2001 From: MikeP Date: Wed, 23 Nov 2022 19:42:02 +0300 Subject: [PATCH 1/2] delete user endpoint --- design_bot/routes/registration.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/design_bot/routes/registration.py b/design_bot/routes/registration.py index eaaccc1..e43b1b8 100644 --- a/design_bot/routes/registration.py +++ b/design_bot/routes/registration.py @@ -62,3 +62,13 @@ async def get_users(_: auth.User = Depends(auth.get_current_user)) -> list[UserG if not users: raise HTTPException(status_code=404) return parse_obj_as(list[UserGet], db.session.query(User).all()) + + +@registration.delete('/{social_web_id}', response_model=None) +async def delete_user(social_web_id: str, _: auth.User = Depends(auth.get_current_user)) -> None: + user: User = db.session.query(User).filter(User.social_web_id == social_web_id).one_or_none() + if not user: + raise HTTPException(status_code=404, detail="User not found") + db.session.delete(user) + db.session.flush() + return None From 21e77483dfaaeb6630045f09579ca76792711d02 Mon Sep 17 00:00:00 2001 From: MikeP Date: Wed, 23 Nov 2022 19:58:10 +0300 Subject: [PATCH 2/2] fix patch --- design_bot/routes/registration.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/design_bot/routes/registration.py b/design_bot/routes/registration.py index e43b1b8..37dfdc3 100644 --- a/design_bot/routes/registration.py +++ b/design_bot/routes/registration.py @@ -41,7 +41,7 @@ async def sign_up(new_user: UserPost, _: auth.User = Depends(auth.get_current_us @registration.patch("/{social_web_id}", response_model=UserGet) async def patch_user(social_web_id: str, schema: UserPatch, _: auth.User = Depends(auth.get_current_user)) -> UserGet: user_query = db.session.query(User.social_web_id == social_web_id) - if not user_query.one_or_none(): + if not user_query.all(): raise HTTPException(status_code=404, detail="User not found") user_query.update(**schema.dict(exclude_unset=True)) db.session.flush() @@ -62,13 +62,3 @@ async def get_users(_: auth.User = Depends(auth.get_current_user)) -> list[UserG if not users: raise HTTPException(status_code=404) return parse_obj_as(list[UserGet], db.session.query(User).all()) - - -@registration.delete('/{social_web_id}', response_model=None) -async def delete_user(social_web_id: str, _: auth.User = Depends(auth.get_current_user)) -> None: - user: User = db.session.query(User).filter(User.social_web_id == social_web_id).one_or_none() - if not user: - raise HTTPException(status_code=404, detail="User not found") - db.session.delete(user) - db.session.flush() - return None