create patch user
This commit is contained in:
@@ -31,16 +31,11 @@ async def get_user_by_id(db: sessionDep, id: int, _: CurrentOrAdmin):
|
|||||||
async def patch_user(
|
async def patch_user(
|
||||||
db: sessionDep,
|
db: sessionDep,
|
||||||
id: int,
|
id: int,
|
||||||
user_update: UserUpdate = Body(),
|
_: CurrentOrAdmin,
|
||||||
_: CurrentOrAdmin = None,
|
user_update: UserUpdate = Body()
|
||||||
):
|
):
|
||||||
user = await UserService(db).get_user_by_filter_or_raise(id=id)
|
updated_user = await UserService(db).update_user(id=id, update_data=user_update)
|
||||||
update_data = user_update.model_dump(exclude_unset=True)
|
return updated_user
|
||||||
if not update_data:
|
|
||||||
raise HTTPException(status_code=400, detail="No fields provided for update")
|
|
||||||
updated_user = await db.user.update_one(id=id, data=update_data)
|
|
||||||
await db.commit()
|
|
||||||
return User.model_validate(updated_user)
|
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{id}")
|
@router.delete("/{id}")
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from sqlalchemy import delete, select
|
from sqlalchemy import delete, select, update
|
||||||
|
|
||||||
from src.models import UsersORM
|
from src.models import UsersORM
|
||||||
from src.repository.base import BaseRepo
|
from src.repository.base import BaseRepo
|
||||||
@@ -15,3 +15,9 @@ class UsersRepo(BaseRepo):
|
|||||||
|
|
||||||
async def delete_one(self, id: int) -> None:
|
async def delete_one(self, id: int) -> None:
|
||||||
await self.session.execute(delete(self.model).where(self.model.id == id))
|
await self.session.execute(delete(self.model).where(self.model.id == id))
|
||||||
|
|
||||||
|
async def update_one(self, id: int, data: dict) -> None:
|
||||||
|
stmt = update(self.model).where(self.model.id == id).values(data.model_dump(exclude_unset=True)).returning(self.model)
|
||||||
|
result = await self.session.execute(stmt)
|
||||||
|
model = result.scalar_one()
|
||||||
|
return model
|
||||||
|
|||||||
@@ -5,6 +5,13 @@ from pydantic import BaseModel, EmailStr, ConfigDict, BeforeValidator
|
|||||||
from src.schemas.validators import ensure_password
|
from src.schemas.validators import ensure_password
|
||||||
|
|
||||||
|
|
||||||
|
class UserUpdate(BaseModel):
|
||||||
|
email: EmailStr | None = None
|
||||||
|
username: str | None = None
|
||||||
|
is_active: bool | None = None
|
||||||
|
model_config = ConfigDict(from_attributes=True, extra="ignore")
|
||||||
|
|
||||||
|
|
||||||
class User(BaseModel):
|
class User(BaseModel):
|
||||||
id: int
|
id: int
|
||||||
email: EmailStr | None
|
email: EmailStr | None
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
|
|
||||||
from src.schemas.users import User
|
from src.schemas.users import User, UserUpdate
|
||||||
from src.services.base import BaseService
|
from src.services.base import BaseService
|
||||||
|
|
||||||
|
|
||||||
@@ -30,3 +30,10 @@ class UserService(BaseService):
|
|||||||
async def delete_user(self, id: int) -> None:
|
async def delete_user(self, id: int) -> None:
|
||||||
await self.session.user.delete_one(id=id)
|
await self.session.user.delete_one(id=id)
|
||||||
await self.session.commit()
|
await self.session.commit()
|
||||||
|
|
||||||
|
async def update_user(self, id: int, update_data: UserUpdate) -> User:
|
||||||
|
await self.get_user_by_filter_or_raise(id=id)
|
||||||
|
user = await self.session.user.update_one(id=id, data=update_data)
|
||||||
|
await self.session.commit()
|
||||||
|
return User.model_validate(user)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user