fix: merge conflict 2

This commit is contained in:
2026-06-10 18:42:06 +03:00
parent 4fc74f404f
commit 18c9c1e01a

View File

@@ -10,17 +10,21 @@ from src.application.commands import (
GetAdminMeCommand, GetAdminMeCommand,
CreateOrganizationCommand, CreateOrganizationCommand,
CreateOrganizationWalletsCommand, CreateOrganizationWalletsCommand,
GetOrganizationMnemonicCommand,
GetOrganizationSecretKeysCommand,
GetOrganizationCommand, GetOrganizationCommand,
ListOrganizationWalletsCommand,
GetPurchaseRequestCommand, GetPurchaseRequestCommand,
ListOrganizationsCommand, ListOrganizationsCommand,
GetOrganizationDocumentCommand, GetOrganizationDocumentCommand,
ListOrganizationDocumentsCommand, ListOrganizationDocumentsCommand,
ListPurchaseRequestsCommand, ListPurchaseRequestsCommand,
SearchPartiesCommand,
SetPurchaseRequestQuoteCommand, SetPurchaseRequestQuoteCommand,
UpdateOrganizationCommand, UpdateOrganizationCommand,
UpdatePurchaseRequestCommand,
UpdatePurchaseRequestStatusCommand, UpdatePurchaseRequestStatusCommand,
UploadOrganizationDocumentCommand, PutOrganizationDocumentCommand,
SetPasswordCommand,
) )
from src.application.contracts import IHashService, IJwtService, ILogger from src.application.contracts import IHashService, IJwtService, ILogger
from src.infrastructure.config import settings from src.infrastructure.config import settings
@@ -92,11 +96,32 @@ def get_create_organization_wallets_command(
return CreateOrganizationWalletsCommand(uow, logger) return CreateOrganizationWalletsCommand(uow, logger)
def get_upload_organization_document_command( def get_list_organization_wallets_command(
uow: IUnitOfWork = Depends(get_unit_of_work), uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger), logger: ILogger = Depends(get_logger),
) -> UploadOrganizationDocumentCommand: ) -> ListOrganizationWalletsCommand:
return UploadOrganizationDocumentCommand(uow, get_s3_documents_service(), logger) return ListOrganizationWalletsCommand(uow, logger)
def get_get_organization_mnemonic_command(
uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger),
) -> GetOrganizationMnemonicCommand:
return GetOrganizationMnemonicCommand(uow, logger)
def get_get_organization_secret_keys_command(
uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger),
) -> GetOrganizationSecretKeysCommand:
return GetOrganizationSecretKeysCommand(uow, logger)
def get_put_organization_document_command(
uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger),
) -> PutOrganizationDocumentCommand:
return PutOrganizationDocumentCommand(uow, get_s3_documents_service(), logger)
def get_list_organizations_command( def get_list_organizations_command(
@@ -106,6 +131,13 @@ def get_list_organizations_command(
return ListOrganizationsCommand(uow, logger) return ListOrganizationsCommand(uow, logger)
def get_search_parties_command(
uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger),
) -> SearchPartiesCommand:
return SearchPartiesCommand(uow, logger)
def get_get_organization_command( def get_get_organization_command(
uow: IUnitOfWork = Depends(get_unit_of_work), uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger), logger: ILogger = Depends(get_logger),
@@ -155,15 +187,15 @@ def get_update_purchase_request_status_command(
return UpdatePurchaseRequestStatusCommand(uow, logger) return UpdatePurchaseRequestStatusCommand(uow, logger)
def get_update_purchase_request_command(
uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger),
) -> UpdatePurchaseRequestCommand:
return UpdatePurchaseRequestCommand(uow, logger)
def get_set_purchase_request_quote_command( def get_set_purchase_request_quote_command(
uow: IUnitOfWork = Depends(get_unit_of_work), uow: IUnitOfWork = Depends(get_unit_of_work),
logger: ILogger = Depends(get_logger), logger: ILogger = Depends(get_logger),
) -> SetPurchaseRequestQuoteCommand: ) -> SetPurchaseRequestQuoteCommand:
return SetPurchaseRequestQuoteCommand(uow, logger) return SetPurchaseRequestQuoteCommand(uow, logger)
def get_set_password_command(
uow: IUnitOfWork = Depends(get_unit_of_work),
hash_service: IHashService = Depends(get_hash_service),
logger: ILogger = Depends(get_logger),
) -> SetPasswordCommand:
return SetPasswordCommand(uow, hash_service, logger)