Skip to content

Fix/lg/user from search #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Melifarmo merged 1 commit into from
Jan 29, 2025
Merged

Fix/lg/user from search #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pybotx/client/users_api/user_from_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class BotXAPIUserFromCSVResult(VerifiedPayloadBaseModel):
description: Optional[str] = Field(alias="Description")
phone: Optional[str] = Field(alias="Phone")
other_phone: Optional[str] = Field(alias="Other phone")
ip_phone: Optional[int] = Field(alias="IP phone")
other_ip_phone: Optional[int] = Field(alias="Other IP phone")
ip_phone: Optional[str] = Field(alias="IP phone")
other_ip_phone: Optional[str] = Field(alias="Other IP phone")
personnel_number: Optional[str] = Field(alias="Personnel number")

@validator(
Expand Down
4 changes: 2 additions & 2 deletions pybotx/client/users_api/user_from_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ class BotXAPISearchUserResult(VerifiedPayloadBaseModel):
user_kind: APIUserKinds
active: Optional[bool] = None
description: Optional[str] = None
ip_phone: Optional[int] = None
ip_phone: Optional[str] = None
manager: Optional[str] = None
office: Optional[str] = None
other_ip_phone: Optional[int] = None
other_ip_phone: Optional[str] = None
other_phone: Optional[str] = None
public_name: Optional[str] = None
cts_id: Optional[UUID] = None
Expand Down
8 changes: 4 additions & 4 deletions pybotx/models/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ class UserFromSearch:
user_kind: UserKinds
active: Optional[bool] = None
description: Optional[str] = None
ip_phone: Optional[int] = None
ip_phone: Optional[str] = None
manager: Optional[str] = None
office: Optional[str] = None
other_ip_phone: Optional[int] = None
other_ip_phone: Optional[str] = None
other_phone: Optional[str] = None
public_name: Optional[str] = None
cts_id: Optional[UUID] = None
Expand Down Expand Up @@ -106,6 +106,6 @@ class UserFromCSV:
description: Optional[str] = None
phone: Optional[str] = None
other_phone: Optional[str] = None
ip_phone: Optional[int] = None
other_ip_phone: Optional[int] = None
ip_phone: Optional[str] = None
other_ip_phone: Optional[str] = None
personnel_number: Optional[str] = None
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pybotx"
version = "0.73.2"
version = "0.73.3"
description = "A python library for interacting with eXpress BotX API"
authors = [
"Sidnev Nikolay <nsidnev@ccsteam.ru>",
Expand Down
10 changes: 5 additions & 5 deletions tests/client/users_api/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ def user_from_search_with_data_json() -> Dict[str, Any]:
"created_at": "2023-03-26T14:36:08.740618Z",
"cts_id": "e0140f4c-4af2-5a2e-9ad1-5f37fceafbaf",
"description": "Director in Owners dep",
"ip_phone": 1271020,
"ip_phone": "1271020",
"manager": "Alice",
"office": "SUN",
"other_ip_phone": 32593,
"other_phone": 1254218,
"other_ip_phone": "32593",
"other_phone": "1254218",
"public_name": "Bobby",
"rts_id": "f46440a4-d930-58d4-b3f5-8110ab846ee3",
"updated_at": "2023-03-26T14:36:08.740618Z",
Expand All @@ -51,10 +51,10 @@ def user_from_search_with_data() -> UserFromSearch:
created_at=convert_to_datetime("2023-03-26T14:36:08.740618Z"),
cts_id=UUID("e0140f4c-4af2-5a2e-9ad1-5f37fceafbaf"),
description="Director in Owners dep",
ip_phone=1271020,
ip_phone="1271020",
manager="Alice",
office="SUN",
other_ip_phone=32593,
other_ip_phone="32593",
other_phone="1254218",
public_name="Bobby",
rts_id=UUID("f46440a4-d930-58d4-b3f5-8110ab846ee3"),
Expand Down
6 changes: 3 additions & 3 deletions tests/client/users_api/test_users_as_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ async def test__users_as_csv__succeed(
status_code=HTTPStatus.OK,
content=(
b"HUID,AD Login,Domain,AD E-mail,Name,Sync source,Active,Kind,Company,Department,Position,Manager,Manager HUID,Personnel number,Description,IP phone,Other IP phone,Phone,Other phone,Avatar,Office,Avatar preview\n"
b"dbc8934f-d0d7-4a9e-89df-d45c137a851c,test_user_17,cts.example.com,,test_user_17,ad,false,cts_user,Company,Department,Position,Manager John,13a6909c-bce1-4dbf-8359-efb7ef8e5b34,Some number,Description,123,321,Phone,Other_phone,Avatar,Office,Avatar_preview\n"
b"dbc8934f-d0d7-4a9e-89df-d45c137a851c,test_user_17,cts.example.com,,test_user_17,ad,false,cts_user,Company,Department,Position,Manager John,13a6909c-bce1-4dbf-8359-efb7ef8e5b34,Some number,Description,IP phone,Other IP phone,Phone,Other_phone,Avatar,Office,Avatar_preview\n"
b"13a6909c-bce1-4dbf-8359-efb7ef8e5b34,test_user_18,cts.example.com,,test_user_18,unsupported,true,cts_user,,,,,,,,,,,,,,"
),
),
Expand Down Expand Up @@ -107,8 +107,8 @@ async def test__users_as_csv__succeed(
manager="Manager John",
manager_huid=UUID("13a6909c-bce1-4dbf-8359-efb7ef8e5b34"),
description="Description",
ip_phone=123,
other_ip_phone=321,
ip_phone="IP phone",
other_ip_phone="Other IP phone",
phone="Phone",
other_phone="Other_phone",
avatar="Avatar",
Expand Down
Loading