diff --git a/src/presentation/routing/account.py b/src/presentation/routing/account.py index ec7ddf1..e65d967 100644 --- a/src/presentation/routing/account.py +++ b/src/presentation/routing/account.py @@ -55,4 +55,22 @@ async def me( ) -> MeUserPublicResponse: user = await command(user_id=auth.user_id) logger.info(f'Get user: {user.id}') - return MeUserPublicResponse.from_user(user) + return MeUserPublicResponse( + id=user.id, + email=user.email, + first_name=user.first_name, + middle_name=user.middle_name, + last_name=user.last_name, + birth_date=user.birth_date, + encrypted_mnemonic=user.encrypted_mnemonic, + phone=user.phone, + passport_data=user.passport_data, + inn=user.inn, + erc20=user.erc20, + avatar_link=user.avatar_link, + kyc_verified=user.kyc_verified, + is_deleted=user.is_deleted, + created_at=user.created_at, + updated_at=user.updated_at, + kyc_verified_at=user.kyc_verified_at + ) diff --git a/src/presentation/routing/account_settings.py b/src/presentation/routing/account_settings.py index 0fd16dc..88427b0 100644 --- a/src/presentation/routing/account_settings.py +++ b/src/presentation/routing/account_settings.py @@ -174,7 +174,25 @@ async def set_avatar( command: SetAvatarCommand = Depends(get_set_avatar_command), ) -> SetAvatarPublicResponse: user, webp_size = await command(user_id=auth.user_id, image_bytes=body.decoded_bytes) - pub = MeUserPublicResponse.from_user(user) + pub = MeUserPublicResponse( + id=user.id, + email=user.email, + first_name=user.first_name, + middle_name=user.middle_name, + last_name=user.last_name, + birth_date=user.birth_date, + encrypted_mnemonic=user.encrypted_mnemonic, + phone=user.phone, + passport_data=user.passport_data, + inn=user.inn, + erc20=user.erc20, + avatar_link=user.avatar_link, + kyc_verified=user.kyc_verified, + is_deleted=user.is_deleted, + created_at=user.created_at, + updated_at=user.updated_at, + kyc_verified_at=user.kyc_verified_at + ) return SetAvatarPublicResponse(**pub.model_dump(), webp_size_bytes=webp_size) @@ -196,7 +214,25 @@ async def delete_avatar( command: DeleteAvatarCommand = Depends(get_delete_avatar_command), ) -> MeUserPublicResponse: user = await command(user_id=auth.user_id) - return MeUserPublicResponse.from_user(user) + return MeUserPublicResponse( + id=user.id, + email=user.email, + first_name=user.first_name, + middle_name=user.middle_name, + last_name=user.last_name, + birth_date=user.birth_date, + encrypted_mnemonic=user.encrypted_mnemonic, + phone=user.phone, + passport_data=user.passport_data, + inn=user.inn, + erc20=user.erc20, + avatar_link=user.avatar_link, + kyc_verified=user.kyc_verified, + is_deleted=user.is_deleted, + created_at=user.created_at, + updated_at=user.updated_at, + kyc_verified_at=user.kyc_verified_at + ) @account_settings_router.post(