diff --git a/src/application/commands/user_login_complete.py b/src/application/commands/user_login_complete.py index 5dcea64..d06db6d 100644 --- a/src/application/commands/user_login_complete.py +++ b/src/application/commands/user_login_complete.py @@ -104,9 +104,7 @@ class UserLoginCompleteCommand: birth_date=user.birth_date, crypto_wallet=user.crypto_wallet, phone=user.phone, - bik=user.bik, - account_number=user.account_number, - card_number=user.card_number, + passport_data=user.passport_data, inn=user.inn, kyc_verified=user.kyc_verified, kyc_verified_at=user.kyc_verified_at, diff --git a/src/application/domain/dto/user.py b/src/application/domain/dto/user.py index d70e910..f096739 100644 --- a/src/application/domain/dto/user.py +++ b/src/application/domain/dto/user.py @@ -20,9 +20,7 @@ class UserLoginDto: birth_date: date | None = None crypto_wallet: str | None = None phone: str | None = None - bik: str | None = None - account_number: str | None = None - card_number: str | None = None + passport_data: str | None = None inn: str | None = None kyc_verified: bool | None = None access_token: str | None = None diff --git a/src/application/domain/entities/user.py b/src/application/domain/entities/user.py index f0a7961..5857676 100644 --- a/src/application/domain/entities/user.py +++ b/src/application/domain/entities/user.py @@ -17,9 +17,7 @@ class UserEntity: crypto_wallet: str | None = None phone: str | None = None - bik: str | None = None - account_number: str | None = None - card_number: str | None = None + passport_data: str | None = None inn: str | None = None kyc_verified: bool | None = None diff --git a/src/infrastructure/database/models/user.py b/src/infrastructure/database/models/user.py index e1fa316..68ade9e 100644 --- a/src/infrastructure/database/models/user.py +++ b/src/infrastructure/database/models/user.py @@ -19,9 +19,7 @@ class UserModel(Base, UlidPrimaryKeyMixin, AuditTimestampsMixin, SoftDeleteMixin crypto_wallet: Mapped[str | None] = mapped_column(String(255), nullable=True) phone: Mapped[str | None] = mapped_column(String(16), nullable=True) - bik: Mapped[str | None] = mapped_column(String(9), nullable=True) - account_number: Mapped[str | None] = mapped_column(String(20), nullable=True) - card_number: Mapped[str | None] = mapped_column(String(19), nullable=True) + passport_data: Mapped[str | None] = mapped_column(String(255), nullable=True) inn: Mapped[str | None] = mapped_column(String(12), nullable=True) kyc_verified: Mapped[bool] = mapped_column(Boolean, nullable=False, server_default='false', default=False) diff --git a/src/infrastructure/database/repositories/user_repository.py b/src/infrastructure/database/repositories/user_repository.py index e340e5f..0d18acb 100644 --- a/src/infrastructure/database/repositories/user_repository.py +++ b/src/infrastructure/database/repositories/user_repository.py @@ -69,9 +69,7 @@ class UserRepository(IUserRepository): birth_date=user.birth_date, crypto_wallet=user.crypto_wallet, phone=user.phone, - bik=user.bik, - account_number=user.account_number, - card_number=user.card_number, + passport_data=user.passport_data, inn=user.inn, kyc_verified_at=user.kyc_verified_at, kyc_verified=user.kyc_verified, diff --git a/src/presentation/routing/auth.py b/src/presentation/routing/auth.py index d997631..192e364 100644 --- a/src/presentation/routing/auth.py +++ b/src/presentation/routing/auth.py @@ -158,9 +158,7 @@ async def login( 'birth_date': dto.birth_date.isoformat() if dto.birth_date else None, 'crypto_wallet': dto.crypto_wallet, 'phone': dto.phone, - 'bik': dto.bik, - 'account_number': dto.account_number, - 'card_number': dto.card_number, + 'passport_data': dto.passport_data, 'inn': dto.inn, 'kyc_verified': dto.kyc_verified, 'kyc_verified_at': dto.kyc_verified_at,