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
4 changes: 2 additions & 2 deletions pybotx/client/users_api/user_from_csv.py
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[str] = Field(alias="IP phone")
other_ip_phone: Optional[str] = Field(alias="Other IP phone")
ip_phone: Optional[int] = Field(alias="IP phone")
other_ip_phone: Optional[int] = Field(alias="Other IP phone")
personnel_number: Optional[str] = Field(alias="Personnel number")

@validator(
Expand Down
2 changes: 1 addition & 1 deletion pybotx/client/users_api/user_from_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class BotXAPISearchUserResult(VerifiedPayloadBaseModel):
manager: Optional[str] = None
office: Optional[str] = None
other_ip_phone: Optional[int] = None
other_phone: Optional[int] = None
other_phone: Optional[str] = None
public_name: Optional[str] = None
cts_id: Optional[UUID] = None
rts_id: Optional[UUID] = None
Expand Down
6 changes: 3 additions & 3 deletions pybotx/models/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class UserFromSearch:
manager: Optional[str] = None
office: Optional[str] = None
other_ip_phone: Optional[int] = None
other_phone: Optional[int] = None
other_phone: Optional[str] = None
public_name: Optional[str] = None
cts_id: Optional[UUID] = None
rts_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[str] = None
other_ip_phone: Optional[str] = None
ip_phone: Optional[int] = None
other_ip_phone: Optional[int] = None
personnel_number: Optional[str] = None
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.73.1"
version = "0.73.2"
description = "A python library for interacting with eXpress BotX API"
authors = [
"Sidnev Nikolay <nsidnev@ccsteam.ru>",
Expand Down
2 changes: 1 addition & 1 deletion tests/client/users_api/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def user_from_search_with_data() -> UserFromSearch:
manager="Alice",
office="SUN",
other_ip_phone=32593,
other_phone=1254218,
other_phone="1254218",
public_name="Bobby",
rts_id=UUID("f46440a4-d930-58d4-b3f5-8110ab846ee3"),
updated_at=convert_to_datetime("2023-03-26T14:36:08.740618Z"),
Expand Down
6 changes: 3 additions & 3 deletions tests/client/users_api/test_users_as_csv.py
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,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"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="Ip_phone",
other_ip_phone="Other_ip_phone",
ip_phone=123,
other_ip_phone=321,
phone="Phone",
other_phone="Other_phone",
avatar="Avatar",
Expand Down
Loading