更新CRUDBase为sqlalchemy-crud-plus (#33)

Author: wu-clan

backend/app/admin/crud/crud_user.py

@@ -5,47 +5,42 @@
 from sqlalchemy import select, update, desc, and_
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.sql import Select
+from sqlalchemy_crud_plus import CRUDPlus
 
 from backend.app.admin.model import User
 from backend.common import jwt
-from backend.common.msd.crud import CRUDBase
 from backend.app.admin.schema.user import CreateUser, UpdateUser, Avatar
 
 
-class CRUDUser(CRUDBase[User, CreateUser, UpdateUser]):
+class CRUDUser(CRUDPlus[User]):
     async def get_user_by_id(self, db: AsyncSession, user_id: int) -> User | None:
-        user = await super().get(db, pk=user_id)
-        return user
+        return await self.select_model_by_id(db, user_id)
 
     async def get_user_by_username(self, db: AsyncSession, username: str) -> User | None:
-        user = await db.execute(select(self.model).where(self.model.username == username))
-        return user.scalars().first()
+        return await self.select_model_by_column(db, 'username', username)
 
     async def update_user_login_time(self, db: AsyncSession, username: str, login_time: datetime) -> int:
         user = await db.execute(
             update(self.model).where(self.model.username == username).values(last_login_time=login_time)
         )
         return user.rowcount
 
-    @staticmethod
-    async def create_user(db: AsyncSession, create: CreateUser) -> None:
+    async def create_user(self, db: AsyncSession, create: CreateUser) -> None:
         create.password = await jwt.get_hash_password(create.password)
-        new_user = User(**create.model_dump())
+        new_user = self.model(**create.model_dump())
         db.add(new_user)
 
     async def update_userinfo(self, db: AsyncSession, current_user: User, obj: UpdateUser) -> int:
-        return await super().update(db, current_user.id, obj)
+        return await self.update_model(db, current_user.id, obj)
 
     async def update_avatar(self, db: AsyncSession, current_user: User, avatar: Avatar) -> int:
-        user = await db.execute(update(self.model).where(self.model.id == current_user.id).values(avatar=avatar.url))
-        return user.rowcount
+        return await self.update_model(db, current_user.id, {'avatar': avatar.url})
 
     async def delete_user(self, db: AsyncSession, user_id: int) -> int:
-        return await super().delete(db, user_id)
+        return await self.delete_model(db, user_id)
 
     async def check_email(self, db: AsyncSession, email: str) -> User:
-        mail = await db.execute(select(self.model).where(self.model.email == email))
-        return mail.scalars().first()
+        return await self.select_model_by_column(db, 'email', email)
 
     async def reset_password(self, db: AsyncSession, username: str, password: str) -> int:
         user = await db.execute(
@@ -78,17 +73,11 @@ async def get_user_status(self, db: AsyncSession, user_id: int) -> bool:
 
     async def super_set(self, db: AsyncSession, user_id: int) -> int:
         super_status = await self.get_user_super(db, user_id)
-        user = await db.execute(
-            update(self.model).where(self.model.id == user_id).values(is_superuser=False if super_status else True)
-        )
-        return user.rowcount
+        return await self.update_model(db, user_id, {'is_superuser': False if super_status else True})
 
     async def status_set(self, db: AsyncSession, user_id: int) -> int:
         status = await self.get_user_status(db, user_id)
-        user = await db.execute(
-            update(self.model).where(self.model.id == user_id).values(status=False if status else True)
-        )
-        return user.rowcount
+        return await self.update_model(db, user_id, {'status': False if status else True})
 
 
 UserDao: CRUDUser = CRUDUser(User)

backend/app/admin/model/__init__.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-from backend.common.msd.model import MappedBase  # noqa: I
+from backend.common.model import MappedBase  # noqa: I
 from backend.app.admin.model.user import User

backend/app/admin/model/user.py

@@ -5,7 +5,7 @@
 from sqlalchemy import String
 from sqlalchemy.orm import Mapped, mapped_column
 
-from backend.common.msd.model import DataClassBase, id_key
+from backend.common.model import DataClassBase, id_key
 from backend.database.db_mysql import uuid4_str
 from backend.utils.timezone import timezone
 

backend/app/admin/schema/token.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-from backend.common.msd.schema import SchemaBase
+from backend.common.schema import SchemaBase
 from backend.app.admin.schema.user import GetUserInfo
 
 

backend/app/admin/schema/user.py

@@ -5,7 +5,7 @@
 from email_validator import validate_email, EmailNotValidError
 from pydantic import Field, EmailStr, field_validator, ConfigDict, UUID4, HttpUrl
 
-from backend.common.msd.schema import SchemaBase
+from backend.common.schema import SchemaBase
 
 
 class Auth(SchemaBase):

backend/common/exception/exception_handler.py

@@ -14,7 +14,7 @@
 from backend.common.log import log
 from backend.common.response.response_schema import response_base
 from backend.core.conf import settings
-from backend.common.msd.schema import (
+from backend.common.schema import (
     CUSTOM_VALIDATION_ERROR_MESSAGES,
     CUSTOM_USAGE_ERROR_MESSAGES,
 )