[Calendar] fix merge issue (#2370)

KayMKM · lauren-mills · commit 3ffe73896bab · 2019-09-14T08:57:30.000-07:00
* merge timezone issue fix from master

* fix error
diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/CalendarSkillDialogBase.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/CalendarSkillDialogBase.cs
@@ -629,7 +629,7 @@ protected List<EventModel> GetFilteredEvents(CalendarSkillState state, string us
             showingCardTitle = null;
 
             // filter meetings with start time
-            var timeResult = RecognizeDateTime(userInput, locale, false);
+            var timeResult = RecognizeDateTime(userInput, locale, state.GetUserTimeZone(), false);
             if (filteredMeetingList.Count <= 0 && timeResult != null)
             {
                 foreach (var result in timeResult)
@@ -767,33 +767,6 @@ protected async Task<string> GetUserPhotoUrlAsync(ITurnContext context, EventMod
             return string.Format(AdaptiveCardHelper.DefaultAvatarIconPathFormat, displayName);
         }
 
-        protected bool IsRelativeTime(string userInput, string resolverResult, string timex)
-        {
-            var userInputLower = userInput.ToLower();
-            if (userInputLower.Contains(CalendarCommonStrings.Ago) ||
-                userInputLower.Contains(CalendarCommonStrings.Before) ||
-                userInputLower.Contains(CalendarCommonStrings.Later) ||
-                userInputLower.Contains(CalendarCommonStrings.Next))
-            {
-                return true;
-            }
-
-            if (userInputLower.Contains(CalendarCommonStrings.TodayLower) ||
-                userInputLower.Contains(CalendarCommonStrings.Now) ||
-                userInputLower.Contains(CalendarCommonStrings.YesterdayLower) ||
-                userInputLower.Contains(CalendarCommonStrings.TomorrowLower))
-            {
-                return true;
-            }
-
-            if (timex == "PRESENT_REF")
-            {
-                return true;
-            }
-
-            return false;
-        }
-
         protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis luisResult, General generalLuisResult, bool isBeginDialog)
         {
             try
@@ -901,7 +874,7 @@ protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis lui
 
                             if (entity.Duration != null)
                             {
-                                var duration = GetDurationFromEntity(entity, dc.Context.Activity.Locale);
+                                var duration = GetDurationFromEntity(entity, dc.Context.Activity.Locale, state.GetUserTimeZone());
                                 if (duration != -1)
                                 {
                                     state.MeetingInfor.CreateHasDetail = true;
@@ -1047,12 +1020,12 @@ protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis lui
 
                             if (entity.MoveEarlierTimeSpan != null)
                             {
-                                state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveEarlierTimeSpan[0], dc.Context.Activity.Locale, false);
+                                state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveEarlierTimeSpan[0], dc.Context.Activity.Locale, false, state.GetUserTimeZone());
                             }
 
                             if (entity.MoveLaterTimeSpan != null)
                             {
-                                state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveLaterTimeSpan[0], dc.Context.Activity.Locale, true);
+                                state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveLaterTimeSpan[0], dc.Context.Activity.Locale, true, state.GetUserTimeZone());
                             }
 
                             if (entity.datetime != null)
@@ -1159,9 +1132,10 @@ protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis lui
             }
         }
 
-        protected List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture, bool convertToDate = true)
+        protected List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture, TimeZoneInfo userTimeZone, bool convertToDate = true)
         {
-            var results = DateTimeRecognizer.RecognizeDateTime(DateTimeHelper.ConvertNumberToDateTimeString(dateTimeString, convertToDate), culture, options: DateTimeOptions.CalendarMode);
+            var userNow = TimeConverter.ConvertUtcToUserTime(DateTime.UtcNow, userTimeZone);
+            var results = DateTimeRecognizer.RecognizeDateTime(DateTimeHelper.ConvertNumberToDateTimeString(dateTimeString, convertToDate), culture, DateTimeOptions.CalendarMode, userNow);
 
             if (results.Count > 0)
             {
@@ -1529,10 +1503,10 @@ private async Task<List<Card>> GetMeetingCardListAsync(CalendarSkillState state,
             return eventItemList;
         }
 
-        private int GetDurationFromEntity(CalendarLuis._Entities entity, string local)
+        private int GetDurationFromEntity(CalendarLuis._Entities entity, string local, TimeZoneInfo userTimeZone)
         {
             var culture = local ?? English;
-            var result = RecognizeDateTime(entity.Duration[0], culture);
+            var result = RecognizeDateTime(entity.Duration[0], culture, userTimeZone);
             if (result != null)
             {
                 if (result[0].Value != null)
@@ -1544,10 +1518,10 @@ private int GetDurationFromEntity(CalendarLuis._Entities entity, string local)
             return -1;
         }
 
-        private int GetMoveTimeSpanFromEntity(string timeSpan, string local, bool later)
+        private int GetMoveTimeSpanFromEntity(string timeSpan, string local, bool later, TimeZoneInfo userTimeZone)
         {
             var culture = local ?? English;
-            var result = RecognizeDateTime(timeSpan, culture);
+            var result = RecognizeDateTime(timeSpan, culture, userTimeZone);
             if (result != null)
             {
                 if (result[0].Value != null)
@@ -1585,7 +1559,7 @@ private List<DateTime> GetDateFromDateTimeString(string date, string local, Time
         {
             // if isTargetTimeRange is true, will only parse the time range
             var culture = local ?? English;
-            var results = RecognizeDateTime(date, culture, true);
+            var results = RecognizeDateTime(date, culture, userTimeZone, true);
             var dateTimeResults = new List<DateTime>();
             if (results != null)
             {
@@ -1603,8 +1577,7 @@ private List<DateTime> GetDateFromDateTimeString(string date, string local, Time
 
                         if (dateTime != null)
                         {
-                            var isRelativeTime = IsRelativeTime(date, result.Value, result.Timex);
-                            dateTimeResults.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, userTimeZone) : dateTime);
+                            dateTimeResults.Add(dateTime);
                         }
                     }
                     else
@@ -1630,7 +1603,7 @@ private List<DateTime> GetTimeFromDateTimeString(string time, string local, Time
         {
             // if isTargetTimeRange is true, will only parse the time range
             var culture = local ?? English;
-            var results = RecognizeDateTime(time, culture, false);
+            var results = RecognizeDateTime(time, culture, userTimeZone, false);
             var dateTimeResults = new List<DateTime>();
             if (results != null)
             {
@@ -1648,8 +1621,7 @@ private List<DateTime> GetTimeFromDateTimeString(string time, string local, Time
 
                         if (dateTime != null)
                         {
-                            var isRelativeTime = IsRelativeTime(time, result.Value, result.Timex);
-                            dateTimeResults.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, userTimeZone) : dateTime);
+                            dateTimeResults.Add(dateTime);
                         }
                     }
                     else
diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs
@@ -8,10 +8,12 @@
 using CalendarSkill.Models.DialogOptions;
 using CalendarSkill.Options;
 using CalendarSkill.Prompts;
+using CalendarSkill.Prompts.Options;
 using CalendarSkill.Responses.CreateEvent;
 using CalendarSkill.Responses.Shared;
 using CalendarSkill.Services;
 using CalendarSkill.Utilities;
+using Google.Apis.People.v1.Data;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Builder.Skills;
@@ -670,10 +672,11 @@ public CreateEventDialog(
                     return await sc.NextAsync(cancellationToken: cancellationToken);
                 }
 
-                return await sc.PromptAsync(Actions.DatePromptForCreate, new PromptOptions
+                return await sc.PromptAsync(Actions.DatePromptForCreate, new DatePromptOptions
                 {
                     Prompt = ResponseManager.GetResponse(CreateEventResponses.NoStartDate),
                     RetryPrompt = ResponseManager.GetResponse(CreateEventResponses.NoStartDateRetry),
+                    TimeZone = state.GetUserTimeZone()
                 }, cancellationToken);
             }
             catch (Exception ex)
@@ -718,25 +721,12 @@ public CreateEventDialog(
 
                                 if (dateTime != null)
                                 {
-                                    var isRelativeTime = IsRelativeTime(sc.Context.Activity.Text, dateTimeValue, dateTimeConvertType);
                                     if (CalendarCommonUtil.ContainsTime(dateTimeConvertType))
                                     {
-                                        state.MeetingInfor.StartTime.Add(TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, state.GetUserTimeZone()));
+                                        state.MeetingInfor.StartTime.Add(dateTime);
                                     }
 
-                                    // Workaround as DateTimePrompt only return as local time
-                                    if (isRelativeTime)
-                                    {
-                                        dateTime = new DateTime(
-                                            dateTime.Year,
-                                            dateTime.Month,
-                                            dateTime.Day,
-                                            DateTime.Now.Hour,
-                                            DateTime.Now.Minute,
-                                            DateTime.Now.Second);
-                                    }
-
-                                    state.MeetingInfor.StartDate.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, state.GetUserTimeZone()) : dateTime);
+                                    state.MeetingInfor.StartDate.Add(dateTime);
                                 }
                             }
                             catch (FormatException ex)
@@ -764,11 +754,12 @@ public CreateEventDialog(
                 var state = await Accessor.GetAsync(sc.Context, cancellationToken: cancellationToken);
                 if (!state.MeetingInfor.StartTime.Any())
                 {
-                    return await sc.PromptAsync(Actions.TimePromptForCreate, new NoSkipPromptOptions
+                    return await sc.PromptAsync(Actions.TimePromptForCreate, new TimePromptOptions
                     {
                         Prompt = ResponseManager.GetResponse(CreateEventResponses.NoStartTime),
                         RetryPrompt = ResponseManager.GetResponse(CreateEventResponses.NoStartTimeRetry),
                         NoSkipPrompt = ResponseManager.GetResponse(CreateEventResponses.NoStartTimeNoSkip),
+                        TimeZone = state.GetUserTimeZone()
                     }, cancellationToken);
                 }
                 else
@@ -803,8 +794,7 @@ public CreateEventDialog(
 
                                 if (dateTime != null)
                                 {
-                                    var isRelativeTime = IsRelativeTime(sc.Context.Activity.Text, dateTimeValue, dateTimeConvertType);
-                                    state.MeetingInfor.StartTime.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, state.GetUserTimeZone()) : dateTime);
+                                    state.MeetingInfor.StartTime.Add(dateTime);
                                 }
                             }
                             catch (FormatException ex)
diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs
@@ -5,6 +5,8 @@
 using System.Threading.Tasks;
 using CalendarSkill.Models;
 using CalendarSkill.Models.DialogOptions;
+using CalendarSkill.Options;
+using CalendarSkill.Prompts;
 using CalendarSkill.Prompts.Options;
 using CalendarSkill.Responses.Shared;
 using CalendarSkill.Responses.UpdateEvent;
@@ -218,10 +220,11 @@ public UpdateEventDialog(
                     return await sc.NextAsync();
                 }
 
-                return await sc.PromptAsync(Actions.TimePrompt, new PromptOptions
+                return await sc.PromptAsync(Actions.TimePrompt, new TimePromptOptions
                 {
                     Prompt = ResponseManager.GetResponse(UpdateEventResponses.NoNewTime),
-                    RetryPrompt = ResponseManager.GetResponse(UpdateEventResponses.NoNewTimeRetry)
+                    RetryPrompt = ResponseManager.GetResponse(UpdateEventResponses.NoNewTimeRetry),
+                    TimeZone = state.GetUserTimeZone()
                 }, cancellationToken);
             }
             catch (Exception ex)
@@ -304,13 +307,6 @@ public UpdateEventDialog(
                             continue;
                         }
 
-                        var isRelativeTime = IsRelativeTime(sc.Context.Activity.Text, resolution.Value, dateTimeConvertTypeString);
-                        if (isRelativeTime)
-                        {
-                            dateTimeValue = DateTime.SpecifyKind(dateTimeValue, DateTimeKind.Local);
-                        }
-
-                        dateTimeValue = isRelativeTime ? TimeZoneInfo.ConvertTime(dateTimeValue, TimeZoneInfo.Local, state.GetUserTimeZone()) : dateTimeValue;
                         var originalStartDateTime = TimeConverter.ConvertUtcToUserTime(state.ShowMeetingInfor.FocusedEvents[0].StartTime, state.GetUserTimeZone());
                         if (dateTimeConvertType.Types.Contains(Constants.TimexTypes.Date) && !dateTimeConvertType.Types.Contains(Constants.TimexTypes.DateTime))
                         {
diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/DatePrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/DatePrompt.cs
@@ -41,7 +41,7 @@ public DatePrompt(string dialogId, PromptValidator<IList<DateTimeResolution>> va
 
             if (!(options is DatePromptOptions))
             {
-                throw new Exception(nameof(options) + " should be GetEventOptions");
+                throw new Exception(nameof(options) + " should be DatePromptOptions");
             }
 
             if (isRetry && options.RetryPrompt != null)
diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/GetEventPrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/GetEventPrompt.cs
@@ -76,7 +76,7 @@ public GetEventPrompt(string dialogId, PromptValidator<IList<EventModel>> valida
             {
                 var message = turnContext.Activity.AsMessageActivity();
                 var culture = turnContext.Activity.Locale ?? DefaultLocale ?? English;
-                var date = GetTimeFromMessage(message.Text, culture);
+                var date = GetTimeFromMessage(message.Text, culture, userTimeZone);
                 if (date.Count > 0)
                 {
                     // input is a time
@@ -172,14 +172,14 @@ private async Task<IList<EventModel>> GetEventsWithTitle(string title)
             return events;
         }
 
-        private IList<DateTimeResolution> GetTimeFromMessage(string message, string culture)
+        private IList<DateTimeResolution> GetTimeFromMessage(string message, string culture, TimeZoneInfo userTimeZone)
         {
-            IList<DateTimeResolution> results = RecognizeDateTime(message, culture);
+            IList<DateTimeResolution> results = RecognizeDateTime(message, culture, userTimeZone);
 
             return results;
         }
 
-        private List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture)
+        private List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture, TimeZoneInfo userTimeZone)
         {
             var userNow = TimeConverter.ConvertUtcToUserTime(DateTime.UtcNow, userTimeZone);
             var results = DateTimeRecognizer.RecognizeDateTime(dateTimeString, culture, DateTimeOptions.CalendarMode, userNow);
diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/TimePrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/TimePrompt.cs
@@ -38,7 +38,7 @@ public TimePrompt(string dialogId, PromptValidator<IList<DateTimeResolution>> va
 
             if (!(options is TimePromptOptions))
             {
-                throw new Exception(nameof(options) + " should be GetEventOptions");
+                throw new Exception(nameof(options) + " should be TimePromptOptions");
             }
 
             if (isRetry && options.RetryPrompt != null)
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Prompt/DatePromptTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Prompt/DatePromptTests.cs
@@ -1,16 +1,19 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
+using CalendarSkill.Models;
 using CalendarSkill.Prompts;
 using CalendarSkill.Prompts.Options;
+using CalendarSkillTest.Flow.Fakes;
+using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Adapters;
+using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Schema;
 using Microsoft.Recognizers.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.Bot.Builder.Dialogs.Tests
+namespace CalendarSkillTest.Prompt
 {
     [TestClass]
     public class DatePromptTests
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Prompt/GetEventPromptTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Prompt/GetEventPromptTests.cs

Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ protected List<EventModel> GetFilteredEvents(CalendarSkillState state, string us`
`629`	`629`	`showingCardTitle = null;`
`630`	`630`
`631`	`631`	`// filter meetings with start time`
`632`		`- var timeResult = RecognizeDateTime(userInput, locale, false);`
	`632`	`+ var timeResult = RecognizeDateTime(userInput, locale, state.GetUserTimeZone(), false);`
`633`	`633`	`if (filteredMeetingList.Count <= 0 && timeResult != null)`
`634`	`634`	`{`
`635`	`635`	`foreach (var result in timeResult)`
`@@ -767,33 +767,6 @@ protected async Task<string> GetUserPhotoUrlAsync(ITurnContext context, EventMod`
`767`	`767`	`return string.Format(AdaptiveCardHelper.DefaultAvatarIconPathFormat, displayName);`
`768`	`768`	`}`
`769`	`769`
`770`		`- protected bool IsRelativeTime(string userInput, string resolverResult, string timex)`
`771`		`- {`
`772`		`- var userInputLower = userInput.ToLower();`
`773`		`- if (userInputLower.Contains(CalendarCommonStrings.Ago) \|\|`
`774`		`- userInputLower.Contains(CalendarCommonStrings.Before) \|\|`
`775`		`- userInputLower.Contains(CalendarCommonStrings.Later) \|\|`
`776`		`- userInputLower.Contains(CalendarCommonStrings.Next))`
`777`		`- {`
`778`		`- return true;`
`779`		`- }`
`780`		`-`
`781`		`- if (userInputLower.Contains(CalendarCommonStrings.TodayLower) \|\|`
`782`		`- userInputLower.Contains(CalendarCommonStrings.Now) \|\|`
`783`		`- userInputLower.Contains(CalendarCommonStrings.YesterdayLower) \|\|`
`784`		`- userInputLower.Contains(CalendarCommonStrings.TomorrowLower))`
`785`		`- {`
`786`		`- return true;`
`787`		`- }`
`788`		`-`
`789`		`- if (timex == "PRESENT_REF")`
`790`		`- {`
`791`		`- return true;`
`792`		`- }`
`793`		`-`
`794`		`- return false;`
`795`		`- }`
`796`		`-`
`797`	`770`	`protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis luisResult, General generalLuisResult, bool isBeginDialog)`
`798`	`771`	`{`
`799`	`772`	`try`
`@@ -901,7 +874,7 @@ protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis lui`
`901`	`874`
`902`	`875`	`if (entity.Duration != null)`
`903`	`876`	`{`
`904`		`- var duration = GetDurationFromEntity(entity, dc.Context.Activity.Locale);`
	`877`	`+ var duration = GetDurationFromEntity(entity, dc.Context.Activity.Locale, state.GetUserTimeZone());`
`905`	`878`	`if (duration != -1)`
`906`	`879`	`{`
`907`	`880`	`state.MeetingInfor.CreateHasDetail = true;`
`@@ -1047,12 +1020,12 @@ protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis lui`
`1047`	`1020`
`1048`	`1021`	`if (entity.MoveEarlierTimeSpan != null)`
`1049`	`1022`	`{`
`1050`		`- state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveEarlierTimeSpan[0], dc.Context.Activity.Locale, false);`
	`1023`	`+ state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveEarlierTimeSpan[0], dc.Context.Activity.Locale, false, state.GetUserTimeZone());`
`1051`	`1024`	`}`
`1052`	`1025`
`1053`	`1026`	`if (entity.MoveLaterTimeSpan != null)`
`1054`	`1027`	`{`
`1055`		`- state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveLaterTimeSpan[0], dc.Context.Activity.Locale, true);`
	`1028`	`+ state.UpdateMeetingInfor.MoveTimeSpan = GetMoveTimeSpanFromEntity(entity.MoveLaterTimeSpan[0], dc.Context.Activity.Locale, true, state.GetUserTimeZone());`
`1056`	`1029`	`}`
`1057`	`1030`
`1058`	`1031`	`if (entity.datetime != null)`
`@@ -1159,9 +1132,10 @@ protected async Task DigestCalendarLuisResult(DialogContext dc, CalendarLuis lui`
`1159`	`1132`	`}`
`1160`	`1133`	`}`
`1161`	`1134`
`1162`		`- protected List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture, bool convertToDate = true)`
	`1135`	`+ protected List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture, TimeZoneInfo userTimeZone, bool convertToDate = true)`
`1163`	`1136`	`{`
`1164`		`- var results = DateTimeRecognizer.RecognizeDateTime(DateTimeHelper.ConvertNumberToDateTimeString(dateTimeString, convertToDate), culture, options: DateTimeOptions.CalendarMode);`
	`1137`	`+ var userNow = TimeConverter.ConvertUtcToUserTime(DateTime.UtcNow, userTimeZone);`
	`1138`	`+ var results = DateTimeRecognizer.RecognizeDateTime(DateTimeHelper.ConvertNumberToDateTimeString(dateTimeString, convertToDate), culture, DateTimeOptions.CalendarMode, userNow);`
`1165`	`1139`
`1166`	`1140`	`if (results.Count > 0)`
`1167`	`1141`	`{`
`@@ -1529,10 +1503,10 @@ private async Task<List<Card>> GetMeetingCardListAsync(CalendarSkillState state,`
`1529`	`1503`	`return eventItemList;`
`1530`	`1504`	`}`
`1531`	`1505`
`1532`		`- private int GetDurationFromEntity(CalendarLuis._Entities entity, string local)`
	`1506`	`+ private int GetDurationFromEntity(CalendarLuis._Entities entity, string local, TimeZoneInfo userTimeZone)`
`1533`	`1507`	`{`
`1534`	`1508`	`var culture = local ?? English;`
`1535`		`- var result = RecognizeDateTime(entity.Duration[0], culture);`
	`1509`	`+ var result = RecognizeDateTime(entity.Duration[0], culture, userTimeZone);`
`1536`	`1510`	`if (result != null)`
`1537`	`1511`	`{`
`1538`	`1512`	`if (result[0].Value != null)`
`@@ -1544,10 +1518,10 @@ private int GetDurationFromEntity(CalendarLuis._Entities entity, string local)`
`1544`	`1518`	`return -1;`
`1545`	`1519`	`}`
`1546`	`1520`
`1547`		`- private int GetMoveTimeSpanFromEntity(string timeSpan, string local, bool later)`
	`1521`	`+ private int GetMoveTimeSpanFromEntity(string timeSpan, string local, bool later, TimeZoneInfo userTimeZone)`
`1548`	`1522`	`{`
`1549`	`1523`	`var culture = local ?? English;`
`1550`		`- var result = RecognizeDateTime(timeSpan, culture);`
	`1524`	`+ var result = RecognizeDateTime(timeSpan, culture, userTimeZone);`
`1551`	`1525`	`if (result != null)`
`1552`	`1526`	`{`
`1553`	`1527`	`if (result[0].Value != null)`
`@@ -1585,7 +1559,7 @@ private List<DateTime> GetDateFromDateTimeString(string date, string local, Time`
`1585`	`1559`	`{`
`1586`	`1560`	`// if isTargetTimeRange is true, will only parse the time range`
`1587`	`1561`	`var culture = local ?? English;`
`1588`		`- var results = RecognizeDateTime(date, culture, true);`
	`1562`	`+ var results = RecognizeDateTime(date, culture, userTimeZone, true);`
`1589`	`1563`	`var dateTimeResults = new List<DateTime>();`
`1590`	`1564`	`if (results != null)`
`1591`	`1565`	`{`
`@@ -1603,8 +1577,7 @@ private List<DateTime> GetDateFromDateTimeString(string date, string local, Time`
`1603`	`1577`
`1604`	`1578`	`if (dateTime != null)`
`1605`	`1579`	`{`
`1606`		`- var isRelativeTime = IsRelativeTime(date, result.Value, result.Timex);`
`1607`		`- dateTimeResults.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, userTimeZone) : dateTime);`
	`1580`	`+ dateTimeResults.Add(dateTime);`
`1608`	`1581`	`}`
`1609`	`1582`	`}`
`1610`	`1583`	`else`
`@@ -1630,7 +1603,7 @@ private List<DateTime> GetTimeFromDateTimeString(string time, string local, Time`
`1630`	`1603`	`{`
`1631`	`1604`	`// if isTargetTimeRange is true, will only parse the time range`
`1632`	`1605`	`var culture = local ?? English;`
`1633`		`- var results = RecognizeDateTime(time, culture, false);`
	`1606`	`+ var results = RecognizeDateTime(time, culture, userTimeZone, false);`
`1634`	`1607`	`var dateTimeResults = new List<DateTime>();`
`1635`	`1608`	`if (results != null)`
`1636`	`1609`	`{`
`@@ -1648,8 +1621,7 @@ private List<DateTime> GetTimeFromDateTimeString(string time, string local, Time`
`1648`	`1621`
`1649`	`1622`	`if (dateTime != null)`
`1650`	`1623`	`{`
`1651`		`- var isRelativeTime = IsRelativeTime(time, result.Value, result.Timex);`
`1652`		`- dateTimeResults.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, userTimeZone) : dateTime);`
	`1624`	`+ dateTimeResults.Add(dateTime);`
`1653`	`1625`	`}`
`1654`	`1626`	`}`
`1655`	`1627`	`else`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,12 @@`
`8`	`8`	`using CalendarSkill.Models.DialogOptions;`
`9`	`9`	`using CalendarSkill.Options;`
`10`	`10`	`using CalendarSkill.Prompts;`
	`11`	`+using CalendarSkill.Prompts.Options;`
`11`	`12`	`using CalendarSkill.Responses.CreateEvent;`
`12`	`13`	`using CalendarSkill.Responses.Shared;`
`13`	`14`	`using CalendarSkill.Services;`
`14`	`15`	`using CalendarSkill.Utilities;`
	`16`	`+using Google.Apis.People.v1.Data;`
`15`	`17`	`using Microsoft.Bot.Builder;`
`16`	`18`	`using Microsoft.Bot.Builder.Dialogs;`
`17`	`19`	`using Microsoft.Bot.Builder.Skills;`
`@@ -670,10 +672,11 @@ public CreateEventDialog(`
`670`	`672`	`return await sc.NextAsync(cancellationToken: cancellationToken);`
`671`	`673`	`}`
`672`	`674`
`673`		`- return await sc.PromptAsync(Actions.DatePromptForCreate, new PromptOptions`
	`675`	`+ return await sc.PromptAsync(Actions.DatePromptForCreate, new DatePromptOptions`
`674`	`676`	`{`
`675`	`677`	`Prompt = ResponseManager.GetResponse(CreateEventResponses.NoStartDate),`
`676`	`678`	`RetryPrompt = ResponseManager.GetResponse(CreateEventResponses.NoStartDateRetry),`
	`679`	`+ TimeZone = state.GetUserTimeZone()`
`677`	`680`	`}, cancellationToken);`
`678`	`681`	`}`
`679`	`682`	`catch (Exception ex)`
`@@ -718,25 +721,12 @@ public CreateEventDialog(`
`718`	`721`
`719`	`722`	`if (dateTime != null)`
`720`	`723`	`{`
`721`		`- var isRelativeTime = IsRelativeTime(sc.Context.Activity.Text, dateTimeValue, dateTimeConvertType);`
`722`	`724`	`if (CalendarCommonUtil.ContainsTime(dateTimeConvertType))`
`723`	`725`	`{`
`724`		`- state.MeetingInfor.StartTime.Add(TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, state.GetUserTimeZone()));`
	`726`	`+ state.MeetingInfor.StartTime.Add(dateTime);`
`725`	`727`	`}`
`726`	`728`
`727`		`- // Workaround as DateTimePrompt only return as local time`
`728`		`- if (isRelativeTime)`
`729`		`- {`
`730`		`- dateTime = new DateTime(`
`731`		`- dateTime.Year,`
`732`		`- dateTime.Month,`
`733`		`- dateTime.Day,`
`734`		`- DateTime.Now.Hour,`
`735`		`- DateTime.Now.Minute,`
`736`		`- DateTime.Now.Second);`
`737`		`- }`
`738`		`-`
`739`		`- state.MeetingInfor.StartDate.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, state.GetUserTimeZone()) : dateTime);`
	`729`	`+ state.MeetingInfor.StartDate.Add(dateTime);`
`740`	`730`	`}`
`741`	`731`	`}`
`742`	`732`	`catch (FormatException ex)`
`@@ -764,11 +754,12 @@ public CreateEventDialog(`
`764`	`754`	`var state = await Accessor.GetAsync(sc.Context, cancellationToken: cancellationToken);`
`765`	`755`	`if (!state.MeetingInfor.StartTime.Any())`
`766`	`756`	`{`
`767`		`- return await sc.PromptAsync(Actions.TimePromptForCreate, new NoSkipPromptOptions`
	`757`	`+ return await sc.PromptAsync(Actions.TimePromptForCreate, new TimePromptOptions`
`768`	`758`	`{`
`769`	`759`	`Prompt = ResponseManager.GetResponse(CreateEventResponses.NoStartTime),`
`770`	`760`	`RetryPrompt = ResponseManager.GetResponse(CreateEventResponses.NoStartTimeRetry),`
`771`	`761`	`NoSkipPrompt = ResponseManager.GetResponse(CreateEventResponses.NoStartTimeNoSkip),`
	`762`	`+ TimeZone = state.GetUserTimeZone()`
`772`	`763`	`}, cancellationToken);`
`773`	`764`	`}`
`774`	`765`	`else`
`@@ -803,8 +794,7 @@ public CreateEventDialog(`
`803`	`794`
`804`	`795`	`if (dateTime != null)`
`805`	`796`	`{`
`806`		`- var isRelativeTime = IsRelativeTime(sc.Context.Activity.Text, dateTimeValue, dateTimeConvertType);`
`807`		`- state.MeetingInfor.StartTime.Add(isRelativeTime ? TimeZoneInfo.ConvertTime(dateTime, TimeZoneInfo.Local, state.GetUserTimeZone()) : dateTime);`
	`797`	`+ state.MeetingInfor.StartTime.Add(dateTime);`
`808`	`798`	`}`
`809`	`799`	`}`
`810`	`800`	`catch (FormatException ex)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public DatePrompt(string dialogId, PromptValidator<IList<DateTimeResolution>> va`
`41`	`41`
`42`	`42`	`if (!(options is DatePromptOptions))`
`43`	`43`	`{`
`44`		`- throw new Exception(nameof(options) + " should be GetEventOptions");`
	`44`	`+ throw new Exception(nameof(options) + " should be DatePromptOptions");`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if (isRetry && options.RetryPrompt != null)`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public GetEventPrompt(string dialogId, PromptValidator<IList<EventModel>> valida`
`76`	`76`	`{`
`77`	`77`	`var message = turnContext.Activity.AsMessageActivity();`
`78`	`78`	`var culture = turnContext.Activity.Locale ?? DefaultLocale ?? English;`
`79`		`- var date = GetTimeFromMessage(message.Text, culture);`
	`79`	`+ var date = GetTimeFromMessage(message.Text, culture, userTimeZone);`
`80`	`80`	`if (date.Count > 0)`
`81`	`81`	`{`
`82`	`82`	`// input is a time`
`@@ -172,14 +172,14 @@ private async Task<IList<EventModel>> GetEventsWithTitle(string title)`
`172`	`172`	`return events;`
`173`	`173`	`}`
`174`	`174`
`175`		`- private IList<DateTimeResolution> GetTimeFromMessage(string message, string culture)`
	`175`	`+ private IList<DateTimeResolution> GetTimeFromMessage(string message, string culture, TimeZoneInfo userTimeZone)`
`176`	`176`	`{`
`177`		`- IList<DateTimeResolution> results = RecognizeDateTime(message, culture);`
	`177`	`+ IList<DateTimeResolution> results = RecognizeDateTime(message, culture, userTimeZone);`
`178`	`178`
`179`	`179`	`return results;`
`180`	`180`	`}`
`181`	`181`
`182`		`- private List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture)`
	`182`	`+ private List<DateTimeResolution> RecognizeDateTime(string dateTimeString, string culture, TimeZoneInfo userTimeZone)`
`183`	`183`	`{`
`184`	`184`	`var userNow = TimeConverter.ConvertUtcToUserTime(DateTime.UtcNow, userTimeZone);`
`185`	`185`	`var results = DateTimeRecognizer.RecognizeDateTime(dateTimeString, culture, DateTimeOptions.CalendarMode, userNow);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public TimePrompt(string dialogId, PromptValidator<IList<DateTimeResolution>> va`
`38`	`38`
`39`	`39`	`if (!(options is TimePromptOptions))`
`40`	`40`	`{`
`41`		`- throw new Exception(nameof(options) + " should be GetEventOptions");`
	`41`	`+ throw new Exception(nameof(options) + " should be TimePromptOptions");`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (isRetry && options.RetryPrompt != null)`