From 227221ff67dd6c5b9ab2c4e77d851cd24172d39a Mon Sep 17 00:00:00 2001
From: Wu Clan <jianhengwu0407@gmail.com>
Date: Tue, 2 Jan 2024 22:05:20 +0800
Subject: [PATCH] Clean up outdated pydantic dict methods (#262)

---
 backend/app/crud/crud_user.py          |  4 ++--
 backend/app/services/casbin_service.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/app/crud/crud_user.py b/backend/app/crud/crud_user.py
index 4051be4d..776d5a72 100644
--- a/backend/app/crud/crud_user.py
+++ b/backend/app/crud/crud_user.py
@@ -36,7 +36,7 @@ class CRUDUser(CRUDBase[User, RegisterUser, UpdateUser]):
     async def create(self, db: AsyncSession, obj: RegisterUser) -> None:
         salt = text_captcha(5)
         obj.password = await jwt.get_hash_password(obj.password + salt)
-        dict_obj = obj.dict()
+        dict_obj = obj.model_dump()
         dict_obj.update({'salt': salt})
         new_user = self.model(**dict_obj)
         db.add(new_user)
@@ -54,7 +54,7 @@ class CRUDUser(CRUDBase[User, RegisterUser, UpdateUser]):
         db.add(new_user)
 
     async def update_userinfo(self, db: AsyncSession, input_user: User, obj: UpdateUser) -> int:
-        user = await db.execute(update(self.model).where(self.model.id == input_user.id).values(**obj.dict()))
+        user = await db.execute(update(self.model).where(self.model.id == input_user.id).values(**obj.model_dump()))
         return user.rowcount
 
     @staticmethod
diff --git a/backend/app/services/casbin_service.py b/backend/app/services/casbin_service.py
index e899748a..6b884dd7 100644
--- a/backend/app/services/casbin_service.py
+++ b/backend/app/services/casbin_service.py
@@ -45,7 +45,7 @@ class CasbinService:
     @staticmethod
     async def create_policies(*, ps: list[CreatePolicy]):
         enforcer = await RBAC.enforcer()
-        data = await enforcer.add_policies([list(p.dict().values()) for p in ps])
+        data = await enforcer.add_policies([list(p.model_dump().values()) for p in ps])
         if not data:
             raise errors.ForbiddenError(msg='权限已存在')
         return data
@@ -63,7 +63,7 @@ class CasbinService:
     async def update_policies(*, old: list[UpdatePolicy], new: list[UpdatePolicy]):
         enforcer = await RBAC.enforcer()
         data = await enforcer.update_policies(
-            [list(o.dict().values()) for o in old], [list(n.dict().values()) for n in new]
+            [list(o.model_dump().values()) for o in old], [list(n.model_dump().values()) for n in new]
         )
         return data
 
@@ -79,7 +79,7 @@ class CasbinService:
     @staticmethod
     async def delete_policies(*, ps: list[DeletePolicy]):
         enforcer = await RBAC.enforcer()
-        data = await enforcer.remove_policies([list(p.dict().values()) for p in ps])
+        data = await enforcer.remove_policies([list(p.model_dump().values()) for p in ps])
         if not data:
             raise errors.NotFoundError(msg='权限不存在')
         return data
@@ -107,7 +107,7 @@ class CasbinService:
     @staticmethod
     async def create_groups(*, gs: list[CreateUserRole]):
         enforcer = await RBAC.enforcer()
-        data = await enforcer.add_grouping_policies([list(g.dict().values()) for g in gs])
+        data = await enforcer.add_grouping_policies([list(g.model_dump().values()) for g in gs])
         if not data:
             raise errors.ForbiddenError(msg='权限已存在')
         return data
@@ -124,7 +124,7 @@ class CasbinService:
     @staticmethod
     async def delete_groups(*, gs: list[DeleteUserRole]):
         enforcer = await RBAC.enforcer()
-        data = await enforcer.remove_grouping_policies([list(g.dict().values()) for g in gs])
+        data = await enforcer.remove_grouping_policies([list(g.model_dump().values()) for g in gs])
         if not data:
             raise errors.NotFoundError(msg='权限不存在')
         return data