Merge pull request #27 from GGrouppFoundation/feature/allow-date-suggestion-rows

Improve flow date flow step with suggestions rows

Author: pmosk

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.2</Version>
+    <Version>1.5.3</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Application' " />

src/DateTimesheet.Get/Step.GetDate/DateGetFlowStep.cs

@@ -8,7 +8,7 @@ internal static class DateGetFlowStep
     internal static ChatFlow<DateTimesheetFlowState> GetDate(
         this ChatFlow<DateTimesheetFlowState> chatFlow)
         =>
-        chatFlow.AwaitTimesheetDate("Дата", WithDate);
+        chatFlow.AwaitTimesheetDate("Дата", 3, WithDate);
 
     private static DateTimesheetFlowState WithDate(DateTimesheetFlowState state, DateOnly date)
         =>

src/Timesheet.Create/Step.GetDate/DateGetFlowStep.cs

@@ -7,7 +7,7 @@ internal static class DateGetFlowStep
 {
     internal static ChatFlow<TimesheetCreateFlowState> GetDate(this ChatFlow<TimesheetCreateFlowState> chatFlow)
         =>
-        chatFlow.AwaitTimesheetDate("Дата списания", WithDate);
+        chatFlow.AwaitTimesheetDate("Дата списания", 2, WithDate);
 
     private static TimesheetCreateFlowState WithDate(TimesheetCreateFlowState state, DateOnly date)
         =>

src/Utility.Date.Get/TimesheetDateGetFlowStep.cs

@@ -1,38 +1,45 @@
 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;
 
+using IDateSuggestionsRow = IReadOnlyCollection<KeyValuePair<string, DateOnly>>;
+
 public static class TimesheetDateGetFlowStep
 {
-    private const int DaySuggestionsCount = 7;
+    private const int DaysInRow = 3;
+
+    private const string DatePlaceholder = "дд.мм.гг";
 
     public static ChatFlow<TFlowState> AwaitTimesheetDate<TFlowState>(
-        this ChatFlow<TFlowState> chatFlow, string propertyDisplayName, Func<TFlowState, DateOnly, TFlowState> mapFlowState)
+        this ChatFlow<TFlowState> chatFlow, string propertyDisplayName, short days, Func<TFlowState, DateOnly, TFlowState> mapFlowState)
     {
         _ = chatFlow ?? throw new ArgumentNullException(nameof(chatFlow));
         _ = mapFlowState ?? throw new ArgumentNullException(nameof(mapFlowState));
 
         return chatFlow.AwaitDate(InnerCreateOptions, GetResultMessage, mapFlowState);
 
+        DateStepOption InnerCreateOptions(IChatFlowContext<TFlowState> context)
+            =>
+            CreateOptions(context, days);
+
         string GetResultMessage(IChatFlowContext<TFlowState> context, DateOnly date)
             =>
             propertyDisplayName + ": " + context.EncodeTextWithStyle(date.ToStringRussianCulture(), BotTextStyle.Bold);
     }
 
-    private static DateStepOption InnerCreateOptions<TFlowState>(IChatFlowContext<TFlowState> context)
+    private static DateStepOption CreateOptions<TFlowState>(IChatFlowContext<TFlowState> context, short days)
         =>
         new(
             text: GetDateText(context),
             confirmButtonText: "Выбрать",
             invalidDateText: "Не удалось распознать дату",
             DateOnly.FromDateTime(DateTime.Now),
-            placeholder: "дд.мм.гг",
-            suggestions: context.CreateSuggestions(DaySuggestionsCount));
+            placeholder: DatePlaceholder,
+            suggestions: context.CreateSuggestions(days));
 
     private static string GetDateText(ITurnContext context)
     {
@@ -41,33 +48,37 @@ private static string GetDateText(ITurnContext context)
             return "Выберите дату списания";
         }
 
-        var textBuilder = new StringBuilder("Введите дату списания в формате дд.мм.гг");
-
         if (context.IsTelegramChannel())
         {
-            var lastDay = DateOnly.FromDateTime(DateTime.Now);
-            var firstDay = lastDay.AddDays(1 - DaySuggestionsCount);
-
-            textBuilder.Append(' ').Append($"или выберите день недели с {ToString(firstDay)} по {ToString(lastDay)}");
+            return $"Выберите или введите дату списания в формате {DatePlaceholder}";
         }
 
-        return textBuilder.ToString();
-
-        static string ToString(DateOnly date) => date.ToStringRussianCulture("dd.MM");
+        return $"Введите дату списания в формате {DatePlaceholder}";
     }
 
-    private static IReadOnlyCollection<KeyValuePair<string, DateOnly>> CreateSuggestions(this ITurnContext context, int count)
+    private static IReadOnlyCollection<IDateSuggestionsRow> CreateSuggestions(this ITurnContext context, short rows)
     {
         if (context.IsNotTelegramChannel())
         {
-            return Array.Empty<KeyValuePair<string, DateOnly>>();
+            return Array.Empty<IDateSuggestionsRow>();
         }
 
-        var now = DateOnly.FromDateTime(DateTime.Now);
-        return Enumerable.Range(1 - count, count).Select(now.AddDays).Select(CreateSuggestion).ToArray();
+        var today = DateOnly.FromDateTime(DateTime.Now);
+        var days = DaysInRow * rows;
+
+        return Enumerable.Range(1 - days, days).GroupBy(GetRowNumber).Select(CreateRow).ToArray();
+
+        int GetRowNumber(int index)
+            =>
+            (index + days - 1) / DaysInRow;
+
+        IDateSuggestionsRow CreateRow<TCollection>(TCollection days)
+            where TCollection : IEnumerable<int>
+            =>
+            days.Select(today.AddDays).Select(CreateSuggestion).ToArray();
 
-        static KeyValuePair<string, DateOnly> CreateSuggestion(DateOnly date)
+        KeyValuePair<string, DateOnly> CreateSuggestion(DateOnly date)
             =>
-            new(date.ToStringRussianCulture("ddd"), date);
+            date == today ? new("Сегодня", date) : new(date.ToStringRussianCulture("dd.MM ddd"), date);
     }
 }

src/Utility.Date.Get/Utility.Date.Get.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Date" Version="2.4.1" />
+    <PackageReference Include="GGroupp.Infra.Bot.Builder.ChatFlow.Step.Date" Version="2.5.0" />
   </ItemGroup>
 
 </Project>