fix: merge conflict

src/application/abstractions/repositories/i_user_repository.py

@@ -2,6 +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
 
 
 class IUserRepository(ABC):
@@ -26,6 +27,14 @@ class IUserRepository(ABC):
     async def exists_by_email(self, email: str) -> bool:
         raise NotImplementedError
     
+    @abstractmethod
+    async def search_individuals(self, *, query: str, limit: int, offset: int) -> list[PartySearchEntity]:
+        raise NotImplementedError
+    
+    @abstractmethod
+    async def count_individuals(self, *, query: str) -> int:
+        raise NotImplementedError
+    
     @abstractmethod
     async def get_password_hash(self, user_id: str) -> str:
         raise NotImplementedError

src/application/commands/__init__.py

@@ -1,23 +1,27 @@
-from src.application.commands.admin_login import AdminLoginCommand
-from src.application.commands.admin_logout import AdminLogoutCommand
 from src.application.commands.admin_jwt_refresh import AdminJwtRefreshCommand
 from src.application.commands.get_admin_me import GetAdminMeCommand
 from src.application.commands.create_organization import CreateOrganizationCommand
 from src.application.commands.create_organization_wallets import CreateOrganizationWalletsCommand
-from src.application.commands.upload_organization_document import UploadOrganizationDocumentCommand
+from src.application.commands.put_organization_document import PutOrganizationDocumentCommand
-from src.application.commands.set_password import SetPasswordCommand
 from src.application.commands.organization_commands import (
     ListOrganizationsCommand,
     GetOrganizationCommand,
+    SearchPartiesCommand,
     UpdateOrganizationCommand,
 )
 from src.application.commands.organization_document_commands import (
     ListOrganizationDocumentsCommand,
     GetOrganizationDocumentCommand,
 )
+from src.application.commands.organization_wallet_commands import (
+    GetOrganizationMnemonicCommand,
+    GetOrganizationSecretKeysCommand,
+    ListOrganizationWalletsCommand,
+)
 from src.application.commands.purchase_request_commands import (
     ListPurchaseRequestsCommand,
     GetPurchaseRequestCommand,
+    UpdatePurchaseRequestCommand,
     UpdatePurchaseRequestStatusCommand,
     SetPurchaseRequestQuoteCommand,
 )
@@ -29,15 +33,19 @@ __all__ = [
     'GetAdminMeCommand',
     'CreateOrganizationCommand',
     'CreateOrganizationWalletsCommand',
-    'UploadOrganizationDocumentCommand',
+    'PutOrganizationDocumentCommand',
     'ListOrganizationsCommand',
     'GetOrganizationCommand',
+    'SearchPartiesCommand',
     'UpdateOrganizationCommand',
     'ListPurchaseRequestsCommand',
     'GetPurchaseRequestCommand',
+    'UpdatePurchaseRequestCommand',
     'UpdatePurchaseRequestStatusCommand',
     'SetPurchaseRequestQuoteCommand',
     'ListOrganizationDocumentsCommand',
     'GetOrganizationDocumentCommand',
-    'SetPasswordCommand',
+    'ListOrganizationWalletsCommand',
-]
+    'GetOrganizationMnemonicCommand',
+    'GetOrganizationSecretKeysCommand',
+]