fix: model, name
This commit is contained in:
@@ -11,9 +11,10 @@ from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
|
||||
from api.db.connection.session import get_connection_dep
|
||||
|
||||
from api.db.logic.account import get_user_id, update_user_id, create_user,get_user_login,get_all_users_login_and_id
|
||||
from api.db.logic.account import get_user_id, update_user_id, create_user,get_user_login,get_user_accaunt_page
|
||||
|
||||
from api.schemas.account.account import User,Status
|
||||
from api.schemas.account.account import User
|
||||
from api.db.tables.account import AccountStatus
|
||||
from api.schemas.endpoints.account import UserUpdate,AllUserResponse
|
||||
|
||||
|
||||
@@ -41,7 +42,7 @@ async def get_all_account(
|
||||
current_user = request.state.current_user
|
||||
authorize_user = await db_user_role_validation(connection, current_user)
|
||||
|
||||
user_list = await get_all_users_login_and_id(connection,page,limit)
|
||||
user_list = await get_user_accaunt_page(connection,page,limit)
|
||||
|
||||
if user_list is None:
|
||||
raise HTTPException(
|
||||
@@ -146,7 +147,7 @@ async def delete_account(
|
||||
detail="Account not found")
|
||||
|
||||
|
||||
user_update = UserUpdate(status=Status.DELETED.value)
|
||||
user_update = UserUpdate(status=AccountStatus.DELETED.value)
|
||||
|
||||
update_values = update_user_data_changes(user_update,user)
|
||||
|
||||
|
@@ -2,9 +2,7 @@ from datetime import datetime, timedelta, timezone
|
||||
|
||||
from fastapi import (
|
||||
APIRouter,
|
||||
Body,
|
||||
Depends,
|
||||
Form,
|
||||
HTTPException,
|
||||
Request,
|
||||
Response,
|
||||
|
@@ -17,7 +17,8 @@ from api.db.connection.session import get_connection_dep
|
||||
from api.db.logic.keyring import get_key_id,create_key,update_key_id
|
||||
|
||||
|
||||
from api.schemas.account.account import Status
|
||||
|
||||
from api.db.tables.account import KeyStatus
|
||||
from api.schemas.endpoints.account_keyring import AccountKeyringUpdate
|
||||
|
||||
from api.schemas.account.account_keyring import AccountKeyring
|
||||
@@ -135,7 +136,7 @@ async def delete_keyring(
|
||||
detail="keyring not found")
|
||||
|
||||
|
||||
keyring_update = AccountKeyringUpdate(status=Status.DELETED.value)
|
||||
keyring_update = AccountKeyringUpdate(status=KeyStatus.DELETED.value)
|
||||
|
||||
update_values = update_key_data_changes(keyring_update,keyring)
|
||||
|
||||
|
Reference in New Issue
Block a user