Corrected TeamsChannelData deserialization in TelemetryLoggerMiddleware (microsoft#1957)

tracyboehrer · Tracy Boehrer · web-flow · commit 43dd98eb848a · 2022-07-29T11:24:39.000-05:00
* Corrected TeamsChannelData deserialization in TelemetryLoggerMiddleware

* Pinned emoji package for proper recognizers-text operation

* Corrected TelemetryLoggerMiddleware test for Teams

* Formatted TelemetryLoggerMiddleware

Co-authored-by: Tracy Boehrer &lt;trboehre@microsoft.com&gt;
diff --git a/libraries/botbuilder-core/botbuilder/core/telemetry_logger_middleware.py b/libraries/botbuilder-core/botbuilder/core/telemetry_logger_middleware.py
@@ -303,10 +303,12 @@ def __populate_additional_channel_properties(
         properties: dict,
     ):
         if activity.channel_id == Channels.ms_teams:
-            teams_channel_data: TeamsChannelData = activity.channel_data
+            teams_channel_data: TeamsChannelData = TeamsChannelData().deserialize(
+                activity.channel_data
+            )
 
             properties["TeamsTenantId"] = (
-                teams_channel_data.tenant
+                teams_channel_data.tenant.id
                 if teams_channel_data and teams_channel_data.tenant
                 else ""
             )
diff --git a/libraries/botbuilder-core/tests/test_telemetry_middleware.py b/libraries/botbuilder-core/tests/test_telemetry_middleware.py
@@ -251,7 +251,7 @@ async def test_log_teams(self):
         channel_data = TeamsChannelData(
             team=team_info,
             tenant=TenantInfo(id="tenantId"),
-        )
+        ).serialize()
 
         activity = MessageFactory.text("test")
         activity.channel_data = channel_data
@@ -272,7 +272,7 @@ async def test_log_teams(self):
                     "fromId": "userId",
                     "recipientId": "bot",
                     "recipientName": "Bot",
-                    "TeamsTenantId": TenantInfo(id="tenantId"),
+                    "TeamsTenantId": "tenantId",
                     "TeamsUserAadObjectId": "aaId",
                     "TeamsTeamInfo": TeamInfo.serialize(team_info),
                 },
diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py
@@ -6,6 +6,7 @@
 
 REQUIRES = [
     "regex<=2019.08.19",
+    "emoji==1.7.0",
     "recognizers-text-date-time>=1.0.2a1",
     "recognizers-text-number-with-unit>=1.0.2a1",
     "recognizers-text-number>=1.0.2a1",
