From 29d25111df626fc313d731162e06e7aa7374fe8d Mon Sep 17 00:00:00 2001 From: koval Date: Mon, 20 Nov 2023 09:40:30 +0300 Subject: [PATCH 1/2] Fix UsersManagement.delete_user(). --- huntflow_api_client/entities/users_management.py | 9 +++++++-- tests/test_entities/test_users_management.py | 12 +++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/huntflow_api_client/entities/users_management.py b/huntflow_api_client/entities/users_management.py index 6729e52..5e50d7e 100644 --- a/huntflow_api_client/entities/users_management.py +++ b/huntflow_api_client/entities/users_management.py @@ -98,7 +98,11 @@ async def create_user( ) return CreatedUserControlTaskResponse.model_validate(response.json()) - async def delete_user(self, account_id: int, foreign_user_id: str) -> None: + async def delete_user( + self, + account_id: int, + foreign_user_id: str, + ) -> CreatedUserControlTaskResponse: """ API method reference https://api.huntflow.ai/v2/docs#delete-/accounts/-account_id-/users/foreign/-foreign_user_id- @@ -106,10 +110,11 @@ async def delete_user(self, account_id: int, foreign_user_id: str) -> None: :param account_id: Organization ID :param foreign_user_id: Foreign ID of User """ - await self._api.request( + response = await self._api.request( "DELETE", f"/accounts/{account_id}/users/foreign/{foreign_user_id}", ) + return CreatedUserControlTaskResponse.model_validate(response.json()) async def get_user_internal_id_by_foreign( self, diff --git a/tests/test_entities/test_users_management.py b/tests/test_entities/test_users_management.py index 9689d98..0a12a37 100644 --- a/tests/test_entities/test_users_management.py +++ b/tests/test_entities/test_users_management.py @@ -58,7 +58,7 @@ "completed": "2020-01-01T00:00:00+03:00", } GET_USER_ID_BY_FOREIGN_RESPONSE: Dict[str, Any] = {"id": 12345} -CREATE_USER_RESPONSE: Dict[str, Any] = { +CREATE_USER_TASK_RESPONSE: Dict[str, Any] = { "task_id": TASK_ID, "action": "CREATE", "created": "2020-01-01T00:00:00+03:00", @@ -142,12 +142,14 @@ async def test_delete_user( ) -> None: httpx_mock.add_response( url=f"{BASE_URL}/accounts/{ACCOUNT_ID}/users/foreign/{FOREIGN_USER_ID}", - status_code=204, + status_code=202, + json=CREATE_USER_TASK_RESPONSE, ) api_client = HuntflowAPI(BASE_URL, token_proxy=token_proxy) users_management = UsersManagement(api_client) - await users_management.delete_user(ACCOUNT_ID, FOREIGN_USER_ID) + response = await users_management.delete_user(ACCOUNT_ID, FOREIGN_USER_ID) + assert response == CreatedUserControlTaskResponse(**CREATE_USER_TASK_RESPONSE) async def test_create_user( @@ -156,7 +158,7 @@ async def test_create_user( ) -> None: httpx_mock.add_response( url=f"{BASE_URL}/accounts/{ACCOUNT_ID}/users/foreign", - json=CREATE_USER_RESPONSE, + json=CREATE_USER_TASK_RESPONSE, ) api_client = HuntflowAPI(BASE_URL, token_proxy=token_proxy) users_management = UsersManagement(api_client) @@ -167,7 +169,7 @@ async def test_create_user( type=MemberType.owner, ) response = await users_management.create_user(account_id=ACCOUNT_ID, data=data) - assert response == CreatedUserControlTaskResponse(**CREATE_USER_RESPONSE) + assert response == CreatedUserControlTaskResponse(**CREATE_USER_TASK_RESPONSE) async def test_update_user( From 27fcce3804c219ad4b1dbcda65ecaa1795d5a897 Mon Sep 17 00:00:00 2001 From: koval Date: Mon, 20 Nov 2023 09:41:37 +0300 Subject: [PATCH 2/2] Up version. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3854228..05bbab6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "huntflow-api-client" -version = "0.1.2" +version = "0.1.3" description = "Huntflow API Client for Python" authors = [ {name = "Developers huntflow", email = "developer@huntflow.ru"},