refactor: refactor project with ruff
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import select, update
|
||||
from sqlalchemy import select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
from enum import Enum
|
||||
|
||||
@@ -11,16 +11,14 @@ from api.schemas.account.account_keyring import AccountKeyring
|
||||
|
||||
from api.utils.key_id_gen import KeyIdGenerator
|
||||
|
||||
from datetime import datetime, timezone
|
||||
from datetime import datetime, timezone
|
||||
|
||||
|
||||
async def get_user(connection: AsyncConnection, login: str) -> Optional[User]:
|
||||
|
||||
query = (
|
||||
select(account_table, account_keyring_table)
|
||||
.join(account_keyring_table, account_table.c.id == account_keyring_table.c.owner_id)
|
||||
.where(account_table.c.login == login,
|
||||
account_keyring_table.c.key_type == KeyType.PASSWORD)
|
||||
.where(account_table.c.login == login, account_keyring_table.c.key_type == KeyType.PASSWORD)
|
||||
)
|
||||
|
||||
user_db_cursor = await connection.execute(query)
|
||||
@@ -29,16 +27,21 @@ async def get_user(connection: AsyncConnection, login: str) -> Optional[User]:
|
||||
if not user_db:
|
||||
return None, 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
|
||||
}
|
||||
|
||||
password_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_keyring_table.columns
|
||||
}
|
||||
|
||||
@@ -47,8 +50,7 @@ async def get_user(connection: AsyncConnection, login: str) -> Optional[User]:
|
||||
return user, password
|
||||
|
||||
|
||||
async def upgrade_old_refresh_token(connection: AsyncConnection, user,refresh_token) -> Optional[User]:
|
||||
|
||||
async def upgrade_old_refresh_token(connection: AsyncConnection, user, refresh_token) -> Optional[User]:
|
||||
new_status = KeyStatus.EXPIRED
|
||||
|
||||
update_query = (
|
||||
@@ -57,7 +59,7 @@ async def upgrade_old_refresh_token(connection: AsyncConnection, user,refresh_to
|
||||
account_table.c.id == user.id,
|
||||
account_keyring_table.c.status == KeyStatus.ACTIVE,
|
||||
account_keyring_table.c.key_type == KeyType.REFRESH_TOKEN,
|
||||
account_keyring_table.c.key_value == refresh_token
|
||||
account_keyring_table.c.key_value == refresh_token,
|
||||
)
|
||||
.values(status=new_status)
|
||||
)
|
||||
@@ -67,8 +69,9 @@ async def upgrade_old_refresh_token(connection: AsyncConnection, user,refresh_to
|
||||
await connection.commit()
|
||||
|
||||
|
||||
async def add_new_refresh_token(connection: AsyncConnection, new_refresh_token, new_refresh_token_expires_time, user) -> Optional[User]:
|
||||
|
||||
async def add_new_refresh_token(
|
||||
connection: AsyncConnection, new_refresh_token, new_refresh_token_expires_time, user
|
||||
) -> Optional[User]:
|
||||
new_refresh_token = account_keyring_table.insert().values(
|
||||
owner_id=user.id,
|
||||
key_type=KeyType.REFRESH_TOKEN,
|
||||
|
||||
Reference in New Issue
Block a user