refactor: refactor project with ruff
This commit is contained in:
@@ -16,10 +16,7 @@ async def get_user_id(connection: AsyncConnection, id: int) -> Optional[User]:
|
||||
"""
|
||||
Получает юзера по id.
|
||||
"""
|
||||
query = (
|
||||
select(account_table)
|
||||
.where(account_table.c.id == id)
|
||||
)
|
||||
query = select(account_table).where(account_table.c.id == id)
|
||||
|
||||
user_db_cursor = await connection.execute(query)
|
||||
user_db = user_db_cursor.one_or_none()
|
||||
@@ -28,8 +25,11 @@ async def get_user_id(connection: AsyncConnection, id: int) -> Optional[User]:
|
||||
return None
|
||||
|
||||
user_data = {
|
||||
column.name: (getattr(user_db, column.name).name if isinstance(
|
||||
getattr(user_db, column.name), Enum) else getattr(user_db, column.name))
|
||||
column.name: (
|
||||
getattr(user_db, column.name).name
|
||||
if isinstance(getattr(user_db, column.name), Enum)
|
||||
else getattr(user_db, column.name)
|
||||
)
|
||||
for column in account_table.columns
|
||||
}
|
||||
|
||||
@@ -40,10 +40,7 @@ async def get_user_login(connection: AsyncConnection, login: str) -> Optional[Us
|
||||
"""
|
||||
Получает юзера по login.
|
||||
"""
|
||||
query = (
|
||||
select(account_table)
|
||||
.where(account_table.c.login == login)
|
||||
)
|
||||
query = select(account_table).where(account_table.c.login == login)
|
||||
|
||||
user_db_cursor = await connection.execute(query)
|
||||
user_db = user_db_cursor.one_or_none()
|
||||
@@ -52,8 +49,11 @@ async def get_user_login(connection: AsyncConnection, login: str) -> Optional[Us
|
||||
return None
|
||||
|
||||
user_data = {
|
||||
column.name: (getattr(user_db, column.name).name if isinstance(
|
||||
getattr(user_db, column.name), Enum) else getattr(user_db, column.name))
|
||||
column.name: (
|
||||
getattr(user_db, column.name).name
|
||||
if isinstance(getattr(user_db, column.name), Enum)
|
||||
else getattr(user_db, column.name)
|
||||
)
|
||||
for column in account_table.columns
|
||||
}
|
||||
|
||||
@@ -64,11 +64,7 @@ async def update_user_id(connection: AsyncConnection, update_values, user) -> Op
|
||||
"""
|
||||
Вносит изменеия в нужное поле таблицы account_table.
|
||||
"""
|
||||
await connection.execute(
|
||||
account_table.update()
|
||||
.where(account_table.c.id == user.id)
|
||||
.values(**update_values)
|
||||
)
|
||||
await connection.execute(account_table.update().where(account_table.c.id == user.id).values(**update_values))
|
||||
|
||||
await connection.commit()
|
||||
|
||||
@@ -86,11 +82,9 @@ async def create_user(connection: AsyncConnection, user: User, creator_id: int)
|
||||
meta=user.meta,
|
||||
creator_id=creator_id,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
status=user.status.value
|
||||
status=user.status.value,
|
||||
)
|
||||
|
||||
|
||||
|
||||
await connection.execute(query)
|
||||
|
||||
await connection.commit()
|
||||
|
Reference in New Issue
Block a user