[Calendar] return both tel number and meeting link when join meeting (#2338)

* add join meeting link

* add test

* add onlinemeetingurl check

* rename EventJoinLink to OpenDefaultApp

Author: KayMKM

skills/src/csharp/calendarskill/calendarskill/Dialogs/JoinEventDialog.cs

@@ -16,6 +16,7 @@
 using Microsoft.Bot.Builder.Solutions.Util;
 using Microsoft.Bot.Connector.Authentication;
 using Microsoft.Bot.Schema;
+using Newtonsoft.Json;
 
 namespace CalendarSkill.Dialogs
 {
@@ -94,6 +95,26 @@ private string GetDialInNumberFromMeeting(EventModel eventModel)
             return number.InnerText.Replace(telToken, string.Empty);
         }
 
+        private string GetTeamsMeetingLinkFromMeeting(EventModel eventModel)
+        {
+            if (string.IsNullOrEmpty(eventModel.Content))
+            {
+                return null;
+            }
+
+            var body = eventModel.Content;
+            var doc = new HtmlDocument();
+            doc.LoadHtml(body);
+
+            var meetingLink = doc.DocumentNode.SelectSingleNode("//a[contains(string(), 'Join')][contains(string(), 'Microsoft')][contains(string(), 'Teams')][contains(string(), 'Meeting')]");
+            if (meetingLink != null)
+            {
+                return meetingLink.GetAttributeValue("href", null);
+            }
+
+            return null;
+        }
+
         private bool IsValidJoinTime(TimeZoneInfo userTimeZone, EventModel e)
         {
             var startTime = TimeZoneInfo.ConvertTime(e.StartTime, TimeZoneInfo.Utc, userTimeZone);
@@ -165,7 +186,7 @@ private async Task<DialogTurnResult> CheckValid(WaterfallStepContext sc, Cancell
                 var validEvents = new List<EventModel>();
                 foreach (var item in state.ShowMeetingInfor.ShowingMeetings)
                 {
-                    if (IsValidJoinTime(state.GetUserTimeZone(), item) && GetDialInNumberFromMeeting(item) != null)
+                    if (IsValidJoinTime(state.GetUserTimeZone(), item) && (GetDialInNumberFromMeeting(item) != null || item.OnlineMeetingUrl != null || GetTeamsMeetingLinkFromMeeting(item) != null))
                     {
                         validEvents.Add(item);
                     }
@@ -196,11 +217,16 @@ private async Task<DialogTurnResult> ConfirmNumber(WaterfallStepContext sc, Canc
 
                 var selectedEvent = state.ShowMeetingInfor.FocusedEvents.First();
                 var phoneNumber = GetDialInNumberFromMeeting(selectedEvent);
+                var meetingLink = selectedEvent.OnlineMeetingUrl ?? GetTeamsMeetingLinkFromMeeting(selectedEvent);
                 var responseParams = new StringDictionary()
                 {
                     { "PhoneNumber", phoneNumber },
+                    { "MeetingLink", meetingLink }
                 };
-                return await sc.PromptAsync(Actions.TakeFurtherAction, new PromptOptions() { Prompt = ResponseManager.GetResponse(JoinEventResponses.ConfirmPhoneNumber, responseParams) });
+
+                var responseName = phoneNumber == null ? JoinEventResponses.ConfirmMeetingLink : JoinEventResponses.ConfirmPhoneNumber;
+
+                return await sc.PromptAsync(Actions.TakeFurtherAction, new PromptOptions() { Prompt = ResponseManager.GetResponse(responseName, responseParams) });
             }
             catch (Exception ex)
             {
@@ -222,8 +248,13 @@ private async Task<DialogTurnResult> AfterConfirmNumber(WaterfallStepContext sc,
                         await sc.Context.SendActivityAsync(ResponseManager.GetResponse(JoinEventResponses.JoinMeeting));
                         var replyEvent = sc.Context.Activity.CreateReply();
                         replyEvent.Type = ActivityTypes.Event;
-                        replyEvent.Name = "JoinEvent.DialInNumber";
-                        replyEvent.Value = GetDialInNumberFromMeeting(selectedEvent);
+                        replyEvent.Name = "OpenDefaultApp";
+                        var eventJoinLink = new OpenDefaultApp
+                        {
+                            MeetingUri = selectedEvent.OnlineMeetingUrl ?? GetTeamsMeetingLinkFromMeeting(selectedEvent),
+                            TelephoneUri = GetDialInNumberFromMeeting(selectedEvent)
+                        };
+                        replyEvent.Value = JsonConvert.SerializeObject(eventJoinLink);
                         await sc.Context.SendActivityAsync(replyEvent, cancellationToken);
                     }
                     else

skills/src/csharp/calendarskill/calendarskill/Models/OpenDefaultApp.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace CalendarSkill.Models
+{
+    public class OpenDefaultApp
+    {
+        public string MeetingUri { get; set; }
+
+        public string TelephoneUri { get; set; }
+    }
+}

skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.cs

@@ -16,6 +16,7 @@ public class JoinEventResponses : IResponseIdCollection
         public const string SelectMeeting = "SelectMeeting";
         public const string NotJoinMeeting = "NotJoinMeeting";
         public const string ConfirmPhoneNumber = "ConfirmPhoneNumber";
+        public const string ConfirmMeetingLink = "ConfirmMeetingLink";
         public const string JoinMeeting = "JoinMeeting";
         public const string NoMeetingToConnect = "NoMeetingToConnect";
     }

skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json

@@ -35,6 +35,15 @@
     ],
     "inputHint": "acceptingInput"
   },
+  "ConfirmMeetingLink": {
+    "replies": [
+      {
+        "text": "Here is the link I am about to join: {MeetingLink}. Please be aware that charges may apply. Do you want to proceed?",
+        "speak": "Here is the link I am about to join: {MeetingLink}. Please be aware that charges may apply. Do you want to proceed?"
+      }
+    ],
+    "inputHint": "acceptingInput"
+  },
   "JoinMeeting": {
     "replies": [
       {

skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json

@@ -33,7 +33,7 @@ public void SetupLuisService()
         }
 
         [TestMethod]
-        public async Task Test_CalendarJoinWithStartTimeEntity()
+        public async Task Test_CalendarJoinNumberWithStartTimeEntity()
         {
             var now = DateTime.Now;
             var startTime = new DateTime(now.Year, now.Month, now.Day, 18, 0, 0);
@@ -58,11 +58,42 @@ await this.GetTestFlow()
                 .StartTestAsync();
         }
 
+        [TestMethod]
+        public async Task Test_CalendarJoinLinkWithStartTimeEntity()
+        {
+            var now = DateTime.Now;
+            var startTime = new DateTime(now.Year, now.Month, now.Day, 18, 0, 0);
+            startTime = startTime.AddDays(1);
+            startTime = TimeZoneInfo.ConvertTimeToUtc(startTime);
+            this.ServiceManager = MockServiceManager.SetMeetingsToSpecial(new List<EventModel>()
+            {
+                MockCalendarService.CreateEventModel(
+                    startDateTime: startTime,
+                    endDateTime: startTime.AddHours(1),
+                    content: "<a href=\"meetinglink\">Join Microsoft Teams Meeting</a>")
+            });
+            await this.GetTestFlow()
+                .Send(ConnectToMeetingUtterances.JoinMeetingWithStartTime)
+                .AssertReply(this.ShowAuth())
+                .Send(this.GetAuthResponse())
+                .AssertReplyOneOf(this.ConfirmMeetingLinkPrompt())
+                .Send(Strings.Strings.ConfirmYes)
+                .AssertReplyOneOf(this.JoinMeetingResponse())
+                .AssertReply(this.JoinMeetingEvent())
+                .AssertReply(this.ActionEndMessage())
+                .StartTestAsync();
+        }
+
         private string[] ConfirmPhoneNumberPrompt()
         {
             return this.ParseReplies(JoinEventResponses.ConfirmPhoneNumber, new StringDictionary() { { "PhoneNumber", "12345678" } });
         }
 
+        private string[] ConfirmMeetingLinkPrompt()
+        {
+            return this.ParseReplies(JoinEventResponses.ConfirmMeetingLink, new StringDictionary() { { "MeetingLink", "meetinglink" } });
+        }
+
         private string[] JoinMeetingResponse()
         {
             return this.ParseReplies(JoinEventResponses.JoinMeeting, new StringDictionary());