cleaning up activity handler and models

Virtual-Josh · Virtual-Josh · commit 9ed8110c6376 · 2019-12-03T21:51:37.000-08:00
diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py
@@ -285,15 +285,15 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
                 )
 
             if channel_data:
-                if channel_data.eventType == "channelCreated":
+                if channel_data.event_type == "channelCreated":
                     return await self.on_teams_channel_created_activity(
                         ChannelInfo(**channel_data.channel), channel_data.team, turn_context
                     )
-                if channel_data.eventType == "channelDeleted":
+                if channel_data.event_type == "channelDeleted":
                     return await self.on_teams_channel_deleted_activity(
                         channel_data.channel, channel_data.team, turn_context
                     )
-                if channel_data.eventType == "channelRenamed":
+                if channel_data.event_type == "channelRenamed":
                     return await self.on_teams_channel_renamed_activity(
                         channel_data.channel, channel_data.team, turn_context
                     )
diff --git a/libraries/botbuilder-schema/botbuilder/schema/_models_py3.py b/libraries/botbuilder-schema/botbuilder/schema/_models_py3.py
@@ -730,14 +730,14 @@ def __init__(
         *,
         id: str = None,
         name: str = None,
-        aadObjectId: str = None,
+        aad_object_id: str = None,
         role=None,
         **kwargs
     ) -> None:
         super(ChannelAccount, self).__init__(**kwargs)
         self.id = id
         self.name = name
-        self.aad_object_id = aadObjectId
+        self.aad_object_id = aad_object_id
         self.role = role
 
 

Original file line number	Diff line number	Diff line change
`@@ -285,15 +285,15 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):`
`285`	`285`	`)`
`286`	`286`
`287`	`287`	`if channel_data:`
`288`		`- if channel_data.eventType == "channelCreated":`
	`288`	`+ if channel_data.event_type == "channelCreated":`
`289`	`289`	`return await self.on_teams_channel_created_activity(`
`290`	`290`	`ChannelInfo(**channel_data.channel), channel_data.team, turn_context`
`291`	`291`	`)`
`292`		`- if channel_data.eventType == "channelDeleted":`
	`292`	`+ if channel_data.event_type == "channelDeleted":`
`293`	`293`	`return await self.on_teams_channel_deleted_activity(`
`294`	`294`	`channel_data.channel, channel_data.team, turn_context`
`295`	`295`	`)`
`296`		`- if channel_data.eventType == "channelRenamed":`
	`296`	`+ if channel_data.event_type == "channelRenamed":`
`297`	`297`	`return await self.on_teams_channel_renamed_activity(`
`298`	`298`	`channel_data.channel, channel_data.team, turn_context`
`299`	`299`	`)`