From a15d9f300170a18af2e5fccc1337ec6a8b2beb66 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Fri, 15 May 2020 00:15:07 -0700 Subject: [PATCH 1/5] adding TeamInfo to members removed for C# parity' --- .../botbuilder/core/teams/teams_activity_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 72cd23022..41b84ff0f 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -408,10 +408,10 @@ async def on_teams_members_removed_dispatch( # pylint: disable=unused-argument TeamsChannelAccount().deserialize(new_account_json) ) - return await self.on_teams_members_removed(teams_members_removed, turn_context) + return await self.on_teams_members_removed(teams_members_removed, team_info, turn_context) async def on_teams_members_removed( - self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext + self, teams_members_removed: [TeamsChannelAccount], teams_info: TeamInfo, turn_context: TurnContext ): members_removed = [ ChannelAccount().deserialize(member.serialize()) From 492ab5eef5e1161faa02ac3b9870dbc0cf388207 Mon Sep 17 00:00:00 2001 From: Josh <50158775+Virtual-Josh@users.noreply.github.com> Date: Fri, 15 May 2020 09:48:11 -0700 Subject: [PATCH 2/5] singular team --- .../botbuilder/core/teams/teams_activity_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 41b84ff0f..4778ce444 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -411,7 +411,7 @@ async def on_teams_members_removed_dispatch( # pylint: disable=unused-argument return await self.on_teams_members_removed(teams_members_removed, team_info, turn_context) async def on_teams_members_removed( - self, teams_members_removed: [TeamsChannelAccount], teams_info: TeamInfo, turn_context: TurnContext + self, teams_members_removed: [TeamsChannelAccount], team_info: TeamInfo, turn_context: TurnContext ): members_removed = [ ChannelAccount().deserialize(member.serialize()) From c4cac78c9eb443896fb126e90b78eafed7be08a1 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Fri, 15 May 2020 00:15:07 -0700 Subject: [PATCH 3/5] adding TeamInfo to members removed for C# parity' --- .../botbuilder/core/teams/teams_activity_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index b5dc77e99..59a3a624d 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -412,10 +412,10 @@ async def on_teams_members_removed_dispatch( # pylint: disable=unused-argument TeamsChannelAccount().deserialize(new_account_json) ) - return await self.on_teams_members_removed(teams_members_removed, turn_context) + return await self.on_teams_members_removed(teams_members_removed, team_info, turn_context) async def on_teams_members_removed( - self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext + self, teams_members_removed: [TeamsChannelAccount], teams_info: TeamInfo, turn_context: TurnContext ): members_removed = [ ChannelAccount().deserialize(member.serialize()) From 73aac32208835f00f2044c6c364036c790a9d687 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Tue, 19 May 2020 10:14:00 -0700 Subject: [PATCH 4/5] updating unit test --- .../tests/teams/test_teams_activity_handler.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py index 2bbeb6ee4..ad9568da7 100644 --- a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py +++ b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py @@ -50,11 +50,11 @@ async def on_teams_members_added( # pylint: disable=unused-argument ) async def on_teams_members_removed( - self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext + self, teams_members_removed: [TeamsChannelAccount], team_info: TeamInfo, turn_context: TurnContext ): self.record.append("on_teams_members_removed") return await super().on_teams_members_removed( - teams_members_removed, turn_context + teams_members_removed, team_info, turn_context ) async def on_message_activity(self, turn_context: TurnContext): @@ -421,7 +421,10 @@ async def test_on_teams_members_removed_activity(self): # arrange activity = Activity( type=ActivityTypes.conversation_update, - channel_data={"eventType": "teamMemberRemoved"}, + channel_data={ + "eventType": "teamMemberRemoved", + "team": {"id": "team_id_1", "name": "new_team_name"} + }, members_removed=[ ChannelAccount( id="123", From a8347a3ae741b157dace0a94129658f0c2af4a68 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Wed, 27 May 2020 15:51:05 -0700 Subject: [PATCH 5/5] Formatting --- .../botbuilder/core/teams/teams_activity_handler.py | 9 +++++++-- .../tests/teams/test_teams_activity_handler.py | 11 +++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 0f7956058..7b1a88814 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -412,10 +412,15 @@ async def on_teams_members_removed_dispatch( # pylint: disable=unused-argument TeamsChannelAccount().deserialize(new_account_json) ) - return await self.on_teams_members_removed(teams_members_removed, team_info, turn_context) + return await self.on_teams_members_removed( + teams_members_removed, team_info, turn_context + ) async def on_teams_members_removed( # pylint: disable=unused-argument - self, teams_members_removed: [TeamsChannelAccount], team_info: TeamInfo, turn_context: TurnContext + self, + teams_members_removed: [TeamsChannelAccount], + team_info: TeamInfo, + turn_context: TurnContext, ): members_removed = [ ChannelAccount().deserialize(member.serialize()) diff --git a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py index ad9568da7..7c70ef36c 100644 --- a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py +++ b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py @@ -50,7 +50,10 @@ async def on_teams_members_added( # pylint: disable=unused-argument ) async def on_teams_members_removed( - self, teams_members_removed: [TeamsChannelAccount], team_info: TeamInfo, turn_context: TurnContext + self, + teams_members_removed: [TeamsChannelAccount], + team_info: TeamInfo, + turn_context: TurnContext, ): self.record.append("on_teams_members_removed") return await super().on_teams_members_removed( @@ -422,9 +425,9 @@ async def test_on_teams_members_removed_activity(self): activity = Activity( type=ActivityTypes.conversation_update, channel_data={ - "eventType": "teamMemberRemoved", - "team": {"id": "team_id_1", "name": "new_team_name"} - }, + "eventType": "teamMemberRemoved", + "team": {"id": "team_id_1", "name": "new_team_name"}, + }, members_removed=[ ChannelAccount( id="123",