From 3152348011c4582f962e6b6b4adbbdc9b0ca3726 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Wed, 11 Dec 2019 16:31:54 -0800 Subject: [PATCH 1/2] updating teams seralization --- libraries/botbuilder-core/botbuilder/core/teams/teams_info.py | 4 ++-- .../botbuilder-schema/botbuilder/schema/teams/_models_py3.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py index b70fe256f..b5344ddc1 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py @@ -3,6 +3,7 @@ from typing import List from botbuilder.core.turn_context import TurnContext +from botbuilder.core.teams.teams_helper import deserializer_helper from botbuilder.schema.teams import ( ChannelInfo, TeamDetails, @@ -110,7 +111,6 @@ async def _get_members( ) for member in members: - new_account_json = member.serialize() - teams_members.append(TeamsChannelAccount(**new_account_json)) + teams_members.append(TeamsChannelAccount().deserialize(dict(member.serialize(), **member.additional_properties))) return teams_members diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py b/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py index 62d1e4a6f..407b6c4d7 100644 --- a/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py +++ b/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py @@ -1798,6 +1798,7 @@ class TeamsChannelAccount(ChannelAccount): "surname": {"key": "surname", "type": "str"}, "email": {"key": "email", "type": "str"}, "user_principal_name": {"key": "userPrincipalName", "type": "str"}, + "aad_object_id": {"key": "objectId", "type": "str"} } def __init__( @@ -1815,7 +1816,6 @@ def __init__( self.given_name = given_name self.surname = surname self.email = email - # changing to camel case due to how data comes in off the wire self.user_principal_name = user_principal_name From 91accffed66ecace8300d92d7919ee44ac898d78 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Wed, 11 Dec 2019 16:40:26 -0800 Subject: [PATCH 2/2] black updates --- .../botbuilder-core/botbuilder/core/teams/teams_info.py | 7 +++++-- .../botbuilder/schema/teams/_models_py3.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py index b5344ddc1..ca1e71a43 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py @@ -3,7 +3,6 @@ from typing import List from botbuilder.core.turn_context import TurnContext -from botbuilder.core.teams.teams_helper import deserializer_helper from botbuilder.schema.teams import ( ChannelInfo, TeamDetails, @@ -111,6 +110,10 @@ async def _get_members( ) for member in members: - teams_members.append(TeamsChannelAccount().deserialize(dict(member.serialize(), **member.additional_properties))) + teams_members.append( + TeamsChannelAccount().deserialize( + dict(member.serialize(), **member.additional_properties) + ) + ) return teams_members diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py b/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py index 407b6c4d7..529ab6851 100644 --- a/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py +++ b/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py @@ -1798,7 +1798,7 @@ class TeamsChannelAccount(ChannelAccount): "surname": {"key": "surname", "type": "str"}, "email": {"key": "email", "type": "str"}, "user_principal_name": {"key": "userPrincipalName", "type": "str"}, - "aad_object_id": {"key": "objectId", "type": "str"} + "aad_object_id": {"key": "objectId", "type": "str"}, } def __init__(