Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ htmlcov
site
.snippets*/
.idea/
.hypothesis/
.vscode/
.python-version
9 changes: 8 additions & 1 deletion pybotx/client/users_api/user_from_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@
from typing import Literal
from uuid import UUID

from pydantic import Field, field_validator

from pybotx.models.api_base import VerifiedPayloadBaseModel
from pybotx.models.enums import APIUserKinds, convert_user_kind_to_domain
from pybotx.models.users import UserFromSearch
from pydantic import Field, field_validator


class BotXAPISearchUserResult(VerifiedPayloadBaseModel):
user_huid: UUID
ad_login: str | None = None
ad_domain: str | None = None
avatar: str | None = None
avatar_preview: str | None = None
name: str
company: str | None = None
company_position: str | None = None
Expand Down Expand Up @@ -50,6 +53,8 @@ def to_domain(self) -> UserFromSearch:
huid=self.result.user_huid,
ad_login=self.result.ad_login,
ad_domain=self.result.ad_domain,
avatar=self.result.avatar,
avatar_preview=self.result.avatar_preview,
username=self.result.name,
company=self.result.company,
company_position=self.result.company_position,
Expand Down Expand Up @@ -82,6 +87,8 @@ def to_domain(self) -> list[UserFromSearch]:
huid=user.user_huid,
ad_login=user.ad_login,
ad_domain=user.ad_domain,
avatar=user.avatar,
avatar_preview=user.avatar_preview,
username=user.name,
company=user.company,
company_position=user.company_position,
Expand Down
4 changes: 4 additions & 0 deletions pybotx/models/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class UserFromSearch:
huid: User huid.
ad_login: User AD login.
ad_domain: User AD domain.
avatar: User avatar (link).
avatar_preview: User avatar preview (link).
username: User name.
company: User company.
company_position: User company position.
Expand Down Expand Up @@ -44,6 +46,8 @@ class UserFromSearch:
emails: list[str]
other_id: str | None
user_kind: UserKinds
avatar: str | None = None
avatar_preview: str | None = None
active: bool | None = None
description: str | None = None
ip_phone: str | None = None
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pybotx"
version = "0.76.4"
version = "0.76.5"
description = "A python library for interacting with eXpress BotX API"
authors = [
"Sidnev Nikolay <nsidnev@ccsteam.ru>",
Expand Down
22 changes: 22 additions & 0 deletions tests/fixtures/users_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ def user_from_search_with_data_json() -> dict[str, Any]:
"user_huid": "6fafda2c-6505-57a5-a088-25ea5d1d0364",
"ad_login": "ad_user_login",
"ad_domain": "cts.com",
"avatar": (
"https://test-cts.ru/uploads/profile_avatar/fa13e946-121b-52ce-aa92-677b51d19d83/"
"3ebb64d5e2f54e1ab9a3f2ff8096f55a.jpg"
"?v=1780399650402&sid=a619fcfa-a19b-5256-a592-9b0e75ca0896"
),
"avatar_preview": (
"https://test-cts.ru/uploads/profile_avatar/fa13e946-121b-52ce-aa92-677b51d19d83/"
"0a1294c14df84a1ea13c62483ec6cd0f.jpg?"
"v=1780399650402&sid=a619fcfa-a19b-5256-a592-9b0e75ca0896"
),
"name": "Bob",
"company": "Bobs Co",
"company_position": "Director",
Expand Down Expand Up @@ -40,6 +50,16 @@ def user_from_search_with_data() -> UserFromSearch:
huid=UUID("6fafda2c-6505-57a5-a088-25ea5d1d0364"),
ad_login="ad_user_login",
ad_domain="cts.com",
avatar=(
"https://test-cts.ru/uploads/profile_avatar/fa13e946-121b-52ce-aa92-677b51d19d83/"
"3ebb64d5e2f54e1ab9a3f2ff8096f55a.jpg"
"?v=1780399650402&sid=a619fcfa-a19b-5256-a592-9b0e75ca0896"
),
avatar_preview=(
"https://test-cts.ru/uploads/profile_avatar/fa13e946-121b-52ce-aa92-677b51d19d83/"
"0a1294c14df84a1ea13c62483ec6cd0f.jpg?"
"v=1780399650402&sid=a619fcfa-a19b-5256-a592-9b0e75ca0896"
),
username="Bob",
company="Bobs Co",
company_position="Director",
Expand Down Expand Up @@ -95,6 +115,8 @@ def user_from_search_without_data() -> UserFromSearch:
huid=UUID("6fafda2c-6505-57a5-a088-25ea5d1d0364"),
ad_login="ad_user_login",
ad_domain="cts.com",
avatar=None,
avatar_preview=None,
username="Bob",
company="Bobs Co",
company_position="Director",
Expand Down
Loading