Merge branch 'master' into VORKOUT-14

api/api/endpoints/account.py

@@ -4,29 +4,24 @@ from fastapi import (
     HTTPException,
     status,
 )
-
-
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from api.db.connection.session import get_connection_dep
-
 from api.db.logic.account import (
-    get_user_by_id,
-    update_user_by_id,
     create_user,
-    get_user_by_login,
     get_user_accaunt_page,
+    get_user_by_id,
+    get_user_by_login,
+    update_user_by_id,
 )
-
-from api.schemas.account.account import User
+from api.db.logic.keyring import create_password_key, update_password_key
 from api.db.tables.account import AccountStatus
+from api.schemas.account.account import User
 from api.schemas.base import bearer_schema
-from api.schemas.endpoints.account import UserUpdate, AllUserResponse
+from api.schemas.endpoints.account import AllUser, AllUserResponse, UserCreate, UserUpdate
 from api.services.auth import get_current_user
-
-from api.services.user_role_validation import db_user_role_validation
 from api.services.update_data_validation import update_user_data_changes
-
+from api.services.user_role_validation import db_user_role_validation
 
 api_router = APIRouter(
     prefix="/account",
@@ -51,9 +46,11 @@ async def get_all_account(
     return user_list
 
 
-@api_router.get("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
+@api_router.get("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=UserUpdate)
 async def get_account(
-    user_id: int, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
+    user_id: int,
+    connection: AsyncConnection = Depends(get_connection_dep),
+    current_user=Depends(get_current_user),
 ):
     authorize_user = await db_user_role_validation(connection, current_user)
 
@@ -65,26 +62,27 @@ async def get_account(
     return user
 
 
-@api_router.post("", dependencies=[Depends(bearer_schema)], response_model=User)
+@api_router.post("", dependencies=[Depends(bearer_schema)], response_model=AllUser)
 async def create_account(
-    user: UserUpdate, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
+    user: UserCreate,
+    connection: AsyncConnection = Depends(get_connection_dep),
+    current_user=Depends(get_current_user),
 ):
     authorize_user = await db_user_role_validation(connection, current_user)
 
     user_validation = await get_user_by_login(connection, user.login)
 
     if user_validation is None:
-        await create_user(connection, user, authorize_user.id)
-        user_new = await get_user_by_login(connection, user.login)
-        return user_new
-
+        new_user = await create_user(connection, user, authorize_user.id)
+        await create_password_key(connection, user.password, new_user.id)
+        return new_user
     else:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST, detail="An account with this information already exists."
         )
 
 
-@api_router.put("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
+@api_router.put("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=UserUpdate)
 async def update_account(
     user_id: int,
     user_update: UserUpdate,
@@ -97,12 +95,15 @@ async def update_account(
     if user is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
 
+    if user_update.password is not None:
+        await update_password_key(connection, user.id, user_update.password)
+
     update_values = update_user_data_changes(user_update, user)
 
     if update_values is None:
         return user
 
-    user_update_data = User.model_validate({**user.model_dump(), **update_values})
+    user_update_data = UserUpdate.model_validate({**user.model_dump(), **update_values})
 
     await update_user_by_id(connection, update_values, user)
 
@@ -113,7 +114,9 @@ async def update_account(
 
 @api_router.delete("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
 async def delete_account(
-    user_id: int, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
+    user_id: int,
+    connection: AsyncConnection = Depends(get_connection_dep),
+    current_user=Depends(get_current_user),
 ):
     authorize_user = await db_user_role_validation(connection, current_user)