[Calendar] refine find contact flow (#939)

* refine find contact logic

* fix some bug

* fix skill exception and remove old code

* add comments and refine some logic

* revert some code

Author: ChengxianMo

solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkillState.cs

@@ -38,6 +38,7 @@ public CalendarSkillState()
             NewStartDateTime = null;
             EventSource = EventSource.Other;
             AttendeesNameList = new List<string>();
+            CurrentAttendeeName = string.Empty;
             ConfirmAttendeesNameIndex = 0;
             DialogName = string.Empty;
             ShowAttendeesIndex = 0;
@@ -131,6 +132,8 @@ public CalendarSkillState()
 
         public List<string> AttendeesNameList { get; set; }
 
+        public string CurrentAttendeeName { get; set; }
+
         public int ConfirmAttendeesNameIndex { get; set; }
 
         public string DialogName { get; set; }
@@ -214,6 +217,7 @@ public void Clear()
             NewStartDateTime = null;
             EventSource = EventSource.Other;
             AttendeesNameList = new List<string>();
+            CurrentAttendeeName = string.Empty;
             ConfirmAttendeesNameIndex = 0;
             DialogName = string.Empty;
             ShowAttendeesIndex = 0;
@@ -305,6 +309,7 @@ public void ClearParticipants()
         {
             Attendees = new List<EventModel.Attendee>();
             AttendeesNameList = new List<string>();
+            CurrentAttendeeName = string.Empty;
             ConfirmAttendeesNameIndex = 0;
             CreateHasDetail = true;
             RecreateState = RecreateEventState.Participants;

solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/CreateEvent/CreateEventDialog.cs

@@ -54,12 +54,6 @@ public CreateEventDialog(
                 CreateEvent,
             };
 
-            var updateAddress = new WaterfallStep[]
-            {
-                UpdateAddress,
-                AfterUpdateAddress,
-            };
-
             var updateStartDate = new WaterfallStep[]
             {
                 UpdateStartDateForCreate,
@@ -86,7 +80,6 @@ public CreateEventDialog(
 
             // Define the conversation flow using a waterfall model.
             AddDialog(new WaterfallDialog(Actions.CreateEvent, createEvent) { TelemetryClient = telemetryClient });
-            AddDialog(new WaterfallDialog(Actions.UpdateAddress, updateAddress) { TelemetryClient = telemetryClient });
             AddDialog(new WaterfallDialog(Actions.UpdateStartDateForCreate, updateStartDate) { TelemetryClient = telemetryClient });
             AddDialog(new WaterfallDialog(Actions.UpdateStartTimeForCreate, updateStartTime) { TelemetryClient = telemetryClient });
             AddDialog(new WaterfallDialog(Actions.UpdateDurationForCreate, updateDuration) { TelemetryClient = telemetryClient });
@@ -199,7 +192,7 @@ public CreateEventDialog(
 
                 if (state.Attendees.Count == 0 && (!state.CreateHasDetail || state.RecreateState == RecreateEventState.Participants || state.AttendeesNameList.Count > 0))
                 {
-                    return await sc.BeginDialogAsync(Actions.UpdateAddress, cancellationToken: cancellationToken);
+                    return await sc.BeginDialogAsync(nameof(FindContactDialog), options: sc.Options, cancellationToken: cancellationToken);
                 }
                 else
                 {
@@ -494,72 +487,6 @@ public CreateEventDialog(
             }
         }
 
-        // update address waterfall steps
-        public async Task<DialogTurnResult> UpdateAddress(WaterfallStepContext sc, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            try
-            {
-                var state = await Accessor.GetAsync(sc.Context, cancellationToken: cancellationToken);
-                if (state.AttendeesNameList.Any())
-                {
-                    return await sc.NextAsync(cancellationToken: cancellationToken);
-                }
-
-                return await sc.PromptAsync(Actions.Prompt, new PromptOptions { Prompt = ResponseManager.GetResponse(CreateEventResponses.NoAttendees) }, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                await HandleDialogExceptions(sc, ex);
-                return new DialogTurnResult(DialogTurnStatus.Cancelled, CommonUtil.DialogTurnResultCancelAllDialogs);
-            }
-        }
-
-        public async Task<DialogTurnResult> AfterUpdateAddress(WaterfallStepContext sc, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            try
-            {
-                var state = await Accessor.GetAsync(sc.Context, cancellationToken: cancellationToken);
-                if (state.AttendeesNameList.Any())
-                {
-                    state.FirstEnterFindContact = true;
-                    return await sc.BeginDialogAsync(nameof(FindContactDialog), options: sc.Options, cancellationToken: cancellationToken);
-                }
-
-                if (sc.Result != null)
-                {
-                    sc.Context.Activity.Properties.TryGetValue("OriginText", out var content);
-                    var userInput = content != null ? content.ToString() : sc.Context.Activity.Text;
-                    if (state.EventSource != EventSource.Other)
-                    {
-                        if (userInput != null)
-                        {
-                            var nameList = userInput.Split(CreateEventWhiteList.GetContactNameSeparator(), StringSplitOptions.None)
-                                .Select(x => x.Trim())
-                                .Where(x => !string.IsNullOrWhiteSpace(x))
-                                .ToList();
-                            state.AttendeesNameList = nameList;
-                        }
-
-                        state.FirstEnterFindContact = true;
-                        return await sc.BeginDialogAsync(nameof(FindContactDialog), options: sc.Options, cancellationToken: cancellationToken);
-                    }
-                    else
-                    {
-                        return await sc.BeginDialogAsync(Actions.UpdateAddress, new UpdateAddressDialogOptions(UpdateAddressDialogOptions.UpdateReason.NotAnAddress), cancellationToken);
-                    }
-                }
-                else
-                {
-                    return await sc.NextAsync(cancellationToken: cancellationToken);
-                }
-            }
-            catch (Exception ex)
-            {
-                await HandleDialogExceptions(sc, ex);
-                return new DialogTurnResult(DialogTurnStatus.Cancelled, CommonUtil.DialogTurnResultCancelAllDialogs);
-            }
-        }
-
         // update start date waterfall steps
         public async Task<DialogTurnResult> UpdateStartDateForCreate(WaterfallStepContext sc, CancellationToken cancellationToken = default(CancellationToken))
         {