Merge pull request #24 from GGrouppFoundation/feature/improve-date-step

pmosk · web-flow · commit 0aabf421c815 · 2022-06-06T01:31:21.000+03:00
Feature/improve date step
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -8,7 +8,7 @@
     <InvariantGlobalization>false</InvariantGlobalization>
     <RootNamespace>GGroupp.Internal.Timesheet</RootNamespace>
     <AssemblyName>GGroupp.Internal.Timesheet.Bot.Application</AssemblyName>
-    <Version>1.5.1-preview.1</Version>
+    <Version>1.5.1-preview.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Application' " />
diff --git a/src/DateTimesheet.Get/DateTimesheet.Get.csproj b/src/DateTimesheet.Get/DateTimesheet.Get.csproj
@@ -12,11 +12,13 @@
 
   <ItemGroup>
     <PackageReference Include="EarlyFuncPack.Core.AsyncPipeline" Version="0.1.0" />
-    <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Date" Version="2.3.0" />
-    <PackageReference Include="GGroupp.Infra.Bot.Builder.TurnContext.Extensions" Version="1.1.1" />
     <PackageReference Include="GGroupp.Internal.Timesheet.TimesheetSet.Get.InOut" Version="1.0.1" />
     <PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.0.1" />
     <PackageReference Include="PrimeFuncPack.Primitives.Pipeline" Version="2.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Utility.Date.Get\Utility.Date.Get.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/DateTimesheet.Get/Step.Date.Get/DateGetFlowStep.cs b/src/DateTimesheet.Get/Step.Date.Get/DateGetFlowStep.cs
@@ -8,15 +8,12 @@ internal static class DateGetFlowStep
     internal static ChatFlow<DateTimesheetFlowState> GetDate(
         this ChatFlow<DateTimesheetFlowState> chatFlow)
         =>
-        chatFlow.AwaitDate(
-            static _ => new(
-                text: "Введите дату списания",
-                confirmButtonText: "Выбрать",
-                invalidDateText: "Не удалось распознать дату",
-                DateOnly.FromDateTime(DateTime.Now)),
-            static (context, date) => $"Дата: {context.EncodeTextWithStyle(date.ToStringRussianCulture(), BotTextStyle.Bold)}",
-            static (state, date) => state with
-            {
-                Date = date
-            });
+        chatFlow.AwaitTimesheetDate("Дата", WithDate);
+
+    private static DateTimesheetFlowState WithDate(DateTimesheetFlowState state, DateOnly date)
+        =>
+        state with
+        {
+            Date = date
+        };
 }
diff --git a/src/DateTimesheet.Get/Step.TimesheetSet.Get/TimesheetSetGetActivity.cs b/src/DateTimesheet.Get/Step.TimesheetSet.Get/TimesheetSetGetActivity.cs
@@ -22,7 +22,7 @@ internal static IActivity CreateActivity(IChatFlowContext<DateTimesheetFlowState
     {
         if (context.FlowState.Timesheets?.Count is not > 0)
         {
-            return MessageFactory.Text("Нет списаний времени на указанную дату");
+            return MessageFactory.Text($"Нет списаний времени на {context.FlowState.Date.ToStringRussianCulture()}");
         }
 
         if (context.IsCardSupported())
diff --git a/src/DateTimesheet.Get/UITextHelper/UITextHelper.cs b/src/DateTimesheet.Get/UITextHelper/UITextHelper.cs
@@ -1,8 +1,7 @@
-﻿using System;
-using System.Globalization;
+﻿using System.Globalization;
 
 namespace GGroupp.Internal.Timesheet;
-
+
 internal static class UITextHelper
 {
     private const char HourSymbol = 'ч';
@@ -13,10 +12,6 @@ static UITextHelper()
         =>
         RussianCultureInfo = CultureInfo.GetCultureInfo("ru-RU");
 
-    internal static string ToStringRussianCulture(this DateOnly date)
-        =>
-        date.ToString("d MMMM yyyy", RussianCultureInfo);
-
     internal static string ToDurationStringRussianCulture(this decimal value, bool fixWidth = false)
         =>
         fixWidth
diff --git a/src/Timesheet.Create/Flow/Flow.CreateTimesheet.cs b/src/Timesheet.Create/Flow/Flow.CreateTimesheet.cs
@@ -17,7 +17,7 @@ internal static ChatFlow<Unit> CreateTimesheet(
         ITimesheetCreateFunc timesheetCreateFunc)
         =>
         chatFlow.Start(
-            static () => new TimesheetCreateFlowStateJson())
+            static () => new TimesheetCreateFlowState())
         .FindProject(
             botUserProvider,
             favoriteProjectSetGetFunc,
diff --git a/src/Timesheet.Create/FlowState/TimesheetCreateFlowState.cs b/src/Timesheet.Create/FlowState/TimesheetCreateFlowState.cs
@@ -4,7 +4,7 @@
 
 namespace GGroupp.Internal.Timesheet;
 
-internal sealed record class TimesheetCreateFlowStateJson
+internal sealed record class TimesheetCreateFlowState
 {
     [JsonProperty("projectId")]
     public Guid ProjectId { get; init; }
diff --git a/src/Timesheet.Create/Step.Date.Get/DateGetFlowStep.cs b/src/Timesheet.Create/Step.Date.Get/DateGetFlowStep.cs
@@ -5,18 +5,15 @@ namespace GGroupp.Internal.Timesheet;
 
 internal static class DateGetFlowStep
 {
-    internal static ChatFlow<TimesheetCreateFlowStateJson> GetDate(
-        this ChatFlow<TimesheetCreateFlowStateJson> chatFlow)
+    internal static ChatFlow<TimesheetCreateFlowState> GetDate(
+        this ChatFlow<TimesheetCreateFlowState> chatFlow)
         =>
-        chatFlow.AwaitDate(
-            static _ => new(
-                text: "Введите дату списания",
-                confirmButtonText: "Выбрать",
-                invalidDateText: "Не удалось распознать дату",
-                DateOnly.FromDateTime(DateTime.Now)),
-            static (context, date) => $"Дата списания: {context.EncodeTextWithStyle(date.ToStringRussianCulture(), BotTextStyle.Bold)}",
-            static (state, date) => state with
-            {
-                Date = date
-            });
+        chatFlow.AwaitTimesheetDate("Дата списания", WithDate);
+
+    private static TimesheetCreateFlowState WithDate(TimesheetCreateFlowState state, DateOnly date)
+        =>
+        state with
+        {
+            Date = date
+        };
 }
diff --git a/src/Timesheet.Create/Step.Description.Get/DescriptionGetFlowStep.cs b/src/Timesheet.Create/Step.Description.Get/DescriptionGetFlowStep.cs
@@ -1,4 +1,4 @@
-﻿using System;
+﻿using System;
 using GGroupp.Infra.Bot.Builder;
 
 namespace GGroupp.Internal.Timesheet;
@@ -7,15 +7,15 @@ internal static class DescriptionGetFlowStep
 {
     private const string SkipText = "Пропустить";
 
-    internal static ChatFlow<TimesheetCreateFlowStateJson> GetDescription(
-        this ChatFlow<TimesheetCreateFlowStateJson> chatFlow)
+    internal static ChatFlow<TimesheetCreateFlowState> GetDescription(
+        this ChatFlow<TimesheetCreateFlowState> chatFlow)
         =>
         chatFlow.AwaitText(
             GetStepOption,
             static (context, suggestion) => $"Описание: {context.EncodeTextWithStyle(suggestion, BotTextStyle.Bold)}",
             BindWithDescription);
 
-    private static ValueStepOption GetStepOption(IChatFlowContext<TimesheetCreateFlowStateJson> _)
+    private static ValueStepOption GetStepOption(IChatFlowContext<TimesheetCreateFlowState> _)
         =>
         new(
             messageText: "Введите описание. Этот шаг можно пропустить",
@@ -27,7 +27,7 @@ private static ValueStepOption GetStepOption(IChatFlowContext<TimesheetCreateFlo
                 }
             });
 
-    private static TimesheetCreateFlowStateJson BindWithDescription(TimesheetCreateFlowStateJson state, string description)
+    private static TimesheetCreateFlowState BindWithDescription(TimesheetCreateFlowState state, string description)
     {
         if (string.Equals(description, SkipText, StringComparison.InvariantCultureIgnoreCase))
         {
diff --git a/src/Timesheet.Create/Step.HourValue.Get/HourValueGetFlowStep.cs b/src/Timesheet.Create/Step.HourValue.Get/HourValueGetFlowStep.cs
@@ -9,8 +9,8 @@ internal static class HourValueGetFlowStep
 {
     private const int MaxValue = 24;
 
-    internal static ChatFlow<TimesheetCreateFlowStateJson> GetHourValue(
-        this ChatFlow<TimesheetCreateFlowStateJson> chatFlow)
+    internal static ChatFlow<TimesheetCreateFlowState> GetHourValue(
+        this ChatFlow<TimesheetCreateFlowState> chatFlow)
         =>
         chatFlow.AwaitValue(
             GetStepOption,
@@ -21,7 +21,7 @@ internal static ChatFlow<TimesheetCreateFlowStateJson> GetHourValue(
                 ValueHours = value
             });
 
-    private static ValueStepOption GetStepOption(IChatFlowContext<TimesheetCreateFlowStateJson> context)
+    private static ValueStepOption GetStepOption(IChatFlowContext<TimesheetCreateFlowState> context)
         =>
         new(
             messageText: "Введите время работы в часах",
diff --git a/src/Timesheet.Create/Step.Project.Find/ProjectFindExtensions.cs b/src/Timesheet.Create/Step.Project.Find/ProjectFindExtensions.cs
@@ -19,7 +19,7 @@ internal static class ProjectFindExtensions
     private const int MaxProjectsCount = 6;
 
     internal static ValueTask<LookupValueSetOption> ShowFavorieProjects(
-        this IChatFlowContext<TimesheetCreateFlowStateJson> context,
+        this IChatFlowContext<TimesheetCreateFlowState> context,
         IBotUserProvider botUserProvider,
         IFavoriteProjectSetGetFunc favoriteProjectSetGetFunc,
         CancellationToken token)
diff --git a/src/Timesheet.Create/Step.Project.Find/ProjectFindFlowStep.cs b/src/Timesheet.Create/Step.Project.Find/ProjectFindFlowStep.cs
@@ -8,8 +8,8 @@ namespace GGroupp.Internal.Timesheet;
 
 internal static class ProjectFindFlowStep
 {
-    internal static ChatFlow<TimesheetCreateFlowStateJson> FindProject(
-        this ChatFlow<TimesheetCreateFlowStateJson> chatFlow,
+    internal static ChatFlow<TimesheetCreateFlowState> FindProject(
+        this ChatFlow<TimesheetCreateFlowState> chatFlow,
         IBotUserProvider botUserProvider,
         IFavoriteProjectSetGetFunc favoriteProjectSetGetFunc,
         IProjectSetSearchFunc projectSetSearchFunc)
@@ -25,7 +25,7 @@ internal static ChatFlow<TimesheetCreateFlowStateJson> FindProject(
                 ProjectName = projectValue.Name
             });
 
-    private static string CreateResultMessage(IChatFlowContext<TimesheetCreateFlowStateJson> context, LookupValue projectValue)
+    private static string CreateResultMessage(IChatFlowContext<TimesheetCreateFlowState> context, LookupValue projectValue)
         =>
         $"{projectValue.GetProjectType().ToStringRussianCulture()}: {context.EncodeTextWithStyle(projectValue.Name, BotTextStyle.Bold)}";
 
diff --git a/src/Timesheet.Create/Step.Timesheet.Confirm/TimesheetConfirmFlowStep.cs b/src/Timesheet.Create/Step.Timesheet.Confirm/TimesheetConfirmFlowStep.cs
@@ -1,17 +1,17 @@
-﻿using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using GGroupp.Infra.Bot.Builder;
 
 namespace GGroupp.Internal.Timesheet;
 
 internal static class TimesheetConfirmFlowStep
 {
-    internal static ChatFlow<TimesheetCreateFlowStateJson> ConfirmCreation(
-        this ChatFlow<TimesheetCreateFlowStateJson> chatFlow)
+    internal static ChatFlow<TimesheetCreateFlowState> ConfirmCreation(
+        this ChatFlow<TimesheetCreateFlowState> chatFlow)
         =>
         chatFlow.AwaitConfirmation(
             CreateConfirmationOption);
 
-    private static ConfirmationCardOption CreateConfirmationOption(IChatFlowContext<TimesheetCreateFlowStateJson> context)
+    private static ConfirmationCardOption CreateConfirmationOption(IChatFlowContext<TimesheetCreateFlowState> context)
         =>
         new(
             questionText: "Списать время?",
diff --git a/src/Timesheet.Create/Step.Timesheet.Create/TimesheetCreateFlowStep.cs b/src/Timesheet.Create/Step.Timesheet.Create/TimesheetCreateFlowStep.cs
@@ -11,7 +11,7 @@ namespace GGroupp.Internal.Timesheet;
 internal static class TimesheetCreateFlowStep
 {
     internal static ChatFlow<Unit> CreateTimesheet(
-        this ChatFlow<TimesheetCreateFlowStateJson> chatFlow,
+        this ChatFlow<TimesheetCreateFlowState> chatFlow,
         ITimesheetCreateFunc timesheetCreateFunc)
         =>
         chatFlow.ForwardValue(
@@ -20,7 +20,7 @@ internal static ChatFlow<Unit> CreateTimesheet(
             static _ => "Списание времени создано успешно");
 
     private static ValueTask<ChatFlowJump<Unit>> CreateTimesheetAsync(
-        this IChatFlowContext<TimesheetCreateFlowStateJson> context,
+        this IChatFlowContext<TimesheetCreateFlowState> context,
         ITimesheetCreateFunc timesheetCreateFunc,
         CancellationToken cancellationToken)
         =>
diff --git a/src/Timesheet.Create/Timesheet.Create.csproj b/src/Timesheet.Create/Timesheet.Create.csproj
@@ -13,7 +13,6 @@
   <ItemGroup>
     <PackageReference Include="EarlyFuncPack.Core.AsyncPipeline" Version="0.1.0" />
     <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Card" Version="1.1.0" />
-    <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Date" Version="2.3.0" />
     <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Lookup" Version="2.2.0" />
     <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Value" Version="2.2.0" />
     <PackageReference Include="GGroupp.Internal.Timesheet.FavoriteProjectSet.Get.InOut" Version="1.8.1" />
@@ -22,4 +21,8 @@
     <PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Utility.Date.Get\Utility.Date.Get.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Timesheet.Create/UITextHelper/UITextHelper.cs b/src/Timesheet.Create/UITextHelper/UITextHelper.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Globalization;
+﻿using System.Globalization;
 
 namespace GGroupp.Internal.Timesheet;
 
@@ -11,10 +10,6 @@ static UITextHelper()
         =>
         RussianCultureInfo = CultureInfo.GetCultureInfo("ru-RU");
 
-    internal static string ToStringRussianCulture(this DateOnly date)
-        =>
-        date.ToString("d MMMM yyyy", RussianCultureInfo);
-
     internal static string ToStringRussianCulture(this decimal value)
         =>
         value.ToString("G", RussianCultureInfo);
diff --git a/src/Utility.Date.Get/TimesheetDateGetFlowStep.cs b/src/Utility.Date.Get/TimesheetDateGetFlowStep.cs
@@ -0,0 +1,66 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GGroupp.Infra.Bot.Builder;
+using Microsoft.Bot.Builder;
+
+namespace GGroupp.Internal.Timesheet;
+
+public static class TimesheetDateGetFlowStep
+{
+    public static ChatFlow<TFlowState> AwaitTimesheetDate<TFlowState>(
+        this ChatFlow<TFlowState> chatFlow, string propertyDisplayName, Func<TFlowState, DateOnly, TFlowState> mapFlowState)
+    {
+        _ = chatFlow ?? throw new ArgumentNullException(nameof(chatFlow));
+        _ = mapFlowState ?? throw new ArgumentNullException(nameof(mapFlowState));
+
+        return chatFlow.AwaitDate(InnerCreateOptions, GetResultMessage, mapFlowState);
+
+        string GetResultMessage(IChatFlowContext<TFlowState> context, DateOnly date)
+            =>
+            propertyDisplayName + ": " + context.EncodeTextWithStyle(date.ToStringRussianCulture(), BotTextStyle.Bold);
+    }
+
+    private static DateStepOption InnerCreateOptions<TFlowState>(IChatFlowContext<TFlowState> context)
+        =>
+        new(
+            text: GetDateText(context),
+            confirmButtonText: "Выбрать",
+            invalidDateText: "Не удалось распознать дату",
+            DateOnly.FromDateTime(DateTime.Now),
+            placeholder: "дд.мм.гг",
+            suggestions: context.CreateSuggestions(7));
+
+    private static string GetDateText(ITurnContext context)
+    {
+        if (context.IsMsteamsChannel())
+        {
+            return "Выберите дату списания";
+        }
+
+        var textBuilder = new StringBuilder("Введите дату списания в формате дд.мм.гг");
+
+        if (context.IsTelegramChannel())
+        {
+            textBuilder.Append(' ').Append("или выберите день недели");
+        }
+
+        return textBuilder.ToString();
+    }
+
+    private static IReadOnlyCollection<KeyValuePair<string, DateOnly>> CreateSuggestions(this ITurnContext context, int count)
+    {
+        if (context.IsNotTelegramChannel())
+        {
+            return Array.Empty<KeyValuePair<string, DateOnly>>();
+        }
+
+        var now = DateOnly.FromDateTime(DateTime.Now);
+        return Enumerable.Range(1 - count, count).Select(now.AddDays).Select(CreateSuggestion).ToArray();
+
+        static KeyValuePair<string, DateOnly> CreateSuggestion(DateOnly date)
+            =>
+            new(date.GetRussianCultureDayOfWeekName(), date);
+    }
+}
diff --git a/src/Utility.Date.Get/TimesheetDateGetUIHelper.cs b/src/Utility.Date.Get/TimesheetDateGetUIHelper.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.Globalization;
+
+namespace GGroupp.Internal.Timesheet;
+
+public static class TimesheetDateGetUIHelper
+{
+    private static readonly CultureInfo RussianCultureInfo;
+
+    static TimesheetDateGetUIHelper()
+        =>
+        RussianCultureInfo = CultureInfo.GetCultureInfo("ru-RU");
+
+    public static string ToStringRussianCulture(this DateOnly date)
+        =>
+        date.ToString("d MMMM yyyy", RussianCultureInfo);
+
+    public static string GetRussianCultureDayOfWeekName(this DateOnly date)
+        =>
+        date.ToString("ddd", RussianCultureInfo);
+}
diff --git a/src/Utility.Date.Get/Utility.Date.Get.csproj b/src/Utility.Date.Get/Utility.Date.Get.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <InvariantGlobalization>false</InvariantGlobalization>
+    <RootNamespace>GGroupp.Internal.Timesheet</RootNamespace>
+    <AssemblyName>GGroupp.Internal.Timesheet.Utility.Date.Get</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Date" Version="2.3.1" />
+    <PackageReference Include="GGroupp.Infra.Bot.Builder.TurnContext.Extensions" Version="1.1.1" />
+  </ItemGroup>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal static IActivity CreateActivity(IChatFlowContext<DateTimesheetFlowState`
`22`	`22`	`{`
`23`	`23`	`if (context.FlowState.Timesheets?.Count is not > 0)`
`24`	`24`	`{`
`25`		`- return MessageFactory.Text("Нет списаний времени на указанную дату");`
	`25`	`+ return MessageFactory.Text($"Нет списаний времени на {context.FlowState.Date.ToStringRussianCulture()}");`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if (context.IsCardSupported())`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace GGroupp.Internal.Timesheet;`
`6`	`6`
`7`		`-internal sealed record class TimesheetCreateFlowStateJson`
	`7`	`+internal sealed record class TimesheetCreateFlowState`
`8`	`8`	`{`
`9`	`9`	`[JsonProperty("projectId")]`
`10`	`10`	`public Guid ProjectId { get; init; }`