diff --git a/src/application/abstractions/repositories/i_user_repository.py b/src/application/abstractions/repositories/i_user_repository.py index 3763ea3..6c4b782 100644 --- a/src/application/abstractions/repositories/i_user_repository.py +++ b/src/application/abstractions/repositories/i_user_repository.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from datetime import datetime from src.application.domain.entities import UserEntity -from src.application.domain.entities.organization import PartySearchEntity +from src.application.domain.entities.party_search import PartySearchEntity class IUserRepository(ABC): diff --git a/src/application/commands/party_search_command.py b/src/application/commands/party_search_command.py index 6a0b5cd..0f489fa 100644 --- a/src/application/commands/party_search_command.py +++ b/src/application/commands/party_search_command.py @@ -4,7 +4,8 @@ from typing import Any from src.application.abstractions import IUnitOfWork from src.application.contracts import ILogger -from src.application.domain.entities.organization import LegalEntityEntity, PartySearchEntity +from src.application.domain.entities.organization import LegalEntityEntity +from src.application.domain.entities.party_search import PartySearchEntity from src.application.domain.enums.account_type import AccountType from src.infrastructure.database.decorators import transactional diff --git a/src/application/commands/user_commands.py b/src/application/commands/user_commands.py index 1ccbfea..032f616 100644 --- a/src/application/commands/user_commands.py +++ b/src/application/commands/user_commands.py @@ -4,7 +4,6 @@ from typing import Any from src.application.abstractions import IUnitOfWork from src.application.contracts import ILogger -from src.application.domain.entities.organization import PartySearchEntity from src.application.domain.entities.user import UserEntity from src.application.domain.enums.account_type import AccountType from src.infrastructure.database.decorators import transactional diff --git a/src/application/domain/entities/organization.py b/src/application/domain/entities/organization.py index d7d0ae4..6cbdba2 100644 --- a/src/application/domain/entities/organization.py +++ b/src/application/domain/entities/organization.py @@ -56,20 +56,6 @@ class OrganizationDocumentSlot: file_size_bytes: int | None = None -@dataclass -class PartySearchEntity: - id: str - account_type: str - user_id: str - email: str | None - name: str | None - inn: str | None - phone: str | None - status: str | None = None - kyc_verified: bool | None = None - created_at: datetime | None = None - - @dataclass class PurchaseRequestEntity: id: str diff --git a/src/application/domain/entities/party_search.py b/src/application/domain/entities/party_search.py new file mode 100644 index 0000000..63acd1b --- /dev/null +++ b/src/application/domain/entities/party_search.py @@ -0,0 +1,19 @@ +from __future__ import annotations + +from dataclasses import dataclass +from datetime import datetime +from decimal import Decimal +from typing import Any + +@dataclass +class PartySearchEntity: + id: str + account_type: str + user_id: str + email: str | None + name: str | None + inn: str | None + phone: str | None + status: str | None = None + kyc_verified: bool | None = None + created_at: datetime | None = None \ No newline at end of file diff --git a/src/infrastructure/database/repositories/user_repository.py b/src/infrastructure/database/repositories/user_repository.py index 69d3a16..74209f8 100644 --- a/src/infrastructure/database/repositories/user_repository.py +++ b/src/infrastructure/database/repositories/user_repository.py @@ -10,7 +10,7 @@ from sqlalchemy.exc import IntegrityError, SQLAlchemyError from src.application.abstractions.repositories import IUserRepository from src.application.contracts import ILogger from src.application.domain.entities import UserEntity -from src.application.domain.entities.organization import PartySearchEntity +from src.application.domain.entities.party_search import PartySearchEntity from src.application.domain.enums.account_type import AccountType from src.application.domain.exceptions import InternalServerException, ApplicationException from src.infrastructure.database.models import UserModel diff --git a/src/presentation/routing/search.py b/src/presentation/routing/search.py index fb64b6d..47f6ebd 100644 --- a/src/presentation/routing/search.py +++ b/src/presentation/routing/search.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter, Depends, Query, status +from fastapi import APIRouter, Depends, Query from src.application.commands import ( SearchPartiesCommand, @@ -12,7 +12,6 @@ from src.presentation.schemas.mappers import ( party_search_to_response, ) from src.presentation.schemas.entity import ( - PartySearchResponse, PartySearchListResponse, ) diff --git a/src/presentation/schemas/mappers.py b/src/presentation/schemas/mappers.py index 5972f24..8ffcb9f 100644 --- a/src/presentation/schemas/mappers.py +++ b/src/presentation/schemas/mappers.py @@ -5,9 +5,11 @@ from src.application.domain.entities.organization import ( LegalEntityEntity, OrganizationDocumentSlot, OrganizationWalletEntity, - PartySearchEntity, PurchaseRequestEntity, ) +from src.application.domain.entities.party_search import ( + PartySearchEntity, +) from src.application.domain.entities.user import ( UserEntity, )