Merge pull request #47 from GarageGroup/feature/improve-owner-get

Feature/improve owner get

Author: pmosk

Internal.Support.Bot.sln

@@ -47,13 +47,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "src\service\CrmConta
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "src\service\CrmContact\Test\Test.csproj", "{897511EC-27DE-4A86-B0D3-5DA5DCD0C36C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CrmUser", "CrmUser", "{A1B43D14-F416-47D4-BCDB-2E047124F563}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CrmOwner", "CrmOwner", "{A1B43D14-F416-47D4-BCDB-2E047124F563}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contract", "src\service\CrmUser\Contract\Contract.csproj", "{9FCF0D94-88CA-405F-864A-710E7380B892}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contract", "src\service\CrmOwner\Contract\Contract.csproj", "{9FCF0D94-88CA-405F-864A-710E7380B892}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "src\service\CrmUser\Api\Api.csproj", "{45AA67DF-491D-493F-AB04-5D17D82A12BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "src\service\CrmOwner\Api\Api.csproj", "{45AA67DF-491D-493F-AB04-5D17D82A12BD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "src\service\CrmUser\Test\Test.csproj", "{CAC26758-7536-4892-A55C-C21B9BB0B193}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "src\service\CrmOwner\Test\Test.csproj", "{CAC26758-7536-4892-A55C-C21B9BB0B193}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/app/AzureFunc/Applicaton/BotFlow/Flow.IncidentCreate.cs

@@ -22,7 +22,7 @@ private static IBotBuilder UseIncidentCreateFlow(this IBotBuilder botBuilder)
         .With(
             UseDataverseApi().With(UseSqlApi()).UseCrmContactApi())
         .With(
-            UseDataverseApi().UseCrmUserApi())
+            UseDataverseApi().With(UseSqlApi()).UseCrmOwnerApi())
         .With(
             UseDataverseApi().UseCrmIncidentApi())
         .With(

src/app/AzureFunc/AzureFunc.csproj

@@ -22,7 +22,7 @@
     <ProjectReference Include="..\..\service\CrmContact\Api\Api.csproj" />
     <ProjectReference Include="..\..\service\CrmCustomer\Api\Api.csproj" />
     <ProjectReference Include="..\..\service\CrmIncident\Api\Api.csproj" />
-    <ProjectReference Include="..\..\service\CrmUser\Api\Api.csproj" />
+    <ProjectReference Include="..\..\service\CrmOwner\Api\Api.csproj" />
     <ProjectReference Include="..\..\service\Gpt\Api\Api.csproj" />
   </ItemGroup>
 

src/endpoint/Incident.Create/Flow/Flow.csproj

@@ -14,7 +14,7 @@
     <ProjectReference Include="..\..\..\service\CrmContact\Contract\Contract.csproj" />
     <ProjectReference Include="..\..\..\service\CrmCustomer\Contract\Contract.csproj" />
     <ProjectReference Include="..\..\..\service\CrmIncident\Contract\Contract.csproj" />
-    <ProjectReference Include="..\..\..\service\CrmUser\Contract\Contract.csproj" />
+    <ProjectReference Include="..\..\..\service\CrmOwner\Contract\Contract.csproj" />
     <ProjectReference Include="..\..\..\service\Gpt\Contract\Contract.csproj" />
   </ItemGroup>
 

src/endpoint/Incident.Create/Flow/Flow/Flow.Run.cs

@@ -11,7 +11,7 @@ internal static ValueTask<Unit> RunAsync(
         this IBotContext context,
         ICrmCustomerApi crmCustomerApi,
         ICrmContactApi crmContactApi,
-        ICrmUserApi crmUserApi,
+        ICrmOwnerApi crmOwnerApi,
         ICrmIncidentApi crmIncidentApi,
         ISupportGptApi supportGptApi,
         IncidentCreateFlowOption option,
@@ -34,7 +34,7 @@ internal static ValueTask<Unit> RunAsync(
 
         return context.CreateChatFlow("IncidentCreate")
         .RunFlow(
-            crmCustomerApi, crmContactApi, crmUserApi, crmIncidentApi, supportGptApi, option)
+            crmCustomerApi, crmContactApi, crmOwnerApi, crmIncidentApi, supportGptApi, option)
         .CompleteValueAsync(cancellationToken);
     }
 }

src/endpoint/Incident.Create/Flow/Flow/IncidentCreateChatFlow.cs

@@ -9,7 +9,7 @@ private static ChatFlow<Unit> RunFlow(
         this ChatFlow chatFlow,
         ICrmCustomerApi crmCustomerApi,
         ICrmContactApi crmContactApi,
-        ICrmUserApi crmUserApi,
+        ICrmOwnerApi crmOwnerApi,
         ICrmIncidentApi crmIncidentApi,
         ISupportGptApi supportGptApi,
         IncidentCreateFlowOption option)
@@ -31,7 +31,7 @@ private static ChatFlow<Unit> RunFlow(
         .AwaitCaseType()
         .AwaitPriority()
         .AwaitOwner(
-            crmUserApi)
+            crmOwnerApi)
         .ConfirmIncident()
         .CreateIncident(
             crmIncidentApi)

src/endpoint/Incident.Create/Flow/IncidentCreateDependency.cs

@@ -9,7 +9,7 @@ namespace GarageGroup.Internal.Support;
 public static class IncidentCreateDependency
 {
     public static IBotBuilder MapIncidentCreateFlow(
-        this Dependency<IncidentCreateFlowOption, ICrmCustomerApi, ICrmContactApi, ICrmUserApi, ICrmIncidentApi, ISupportGptApi> dependency,
+        this Dependency<IncidentCreateFlowOption, ICrmCustomerApi, ICrmContactApi, ICrmOwnerApi, ICrmIncidentApi, ISupportGptApi> dependency,
         IBotBuilder botBuilder)
     {
         ArgumentNullException.ThrowIfNull(dependency);
@@ -23,7 +23,7 @@ ValueTask<Unit> InnerInvokeAsync(IBotContext context, CancellationToken cancella
                 option: dependency.ResolveFirst(context.ServiceProvider),
                 crmCustomerApi: dependency.ResolveSecond(context.ServiceProvider),
                 crmContactApi: dependency.ResolveThird(context.ServiceProvider),
-                crmUserApi: dependency.ResolveFourth(context.ServiceProvider),
+                crmOwnerApi: dependency.ResolveFourth(context.ServiceProvider),
                 crmIncidentApi: dependency.ResolveFifth(context.ServiceProvider),
                 supportGptApi: dependency.ResolveSixth(context.ServiceProvider),
                 cancellationToken: cancellationToken);

src/endpoint/Incident.Create/Flow/Step.AwaitContact/ContactFindHelper.cs

@@ -85,8 +85,8 @@ private static LookupValue MapContactItem(ContactItemOut item)
 
     private static LookupValueSetOption MapSearchFailure(Failure<ContactSetGetFailureCode> failure, ILogger logger)
     {
-        logger.LogError("Search contacts failure: {failureCode} {failureMessage}", failure.FailureCode, failure.FailureMessage);
-        return new(items: new[] { SkipValue }, choiceText: ChooseOrSkip);
+        logger.LogError("Get last contacts failure: {failureCode} {failureMessage}", failure.FailureCode, failure.FailureMessage);
+        return new(items: SkipValue.AsFlatArray(), choiceText: ChooseOrSkip);
     }
 
     private static BotFlowFailure MapToFlowFailure(Failure<ContactSetGetFailureCode> failure)

src/endpoint/Incident.Create/Flow/Step.AwaitOwner/OwnerAwaitFlowStep.cs

@@ -5,13 +5,11 @@ namespace GarageGroup.Internal.Support;
 internal static class OwnerAwaitFlowStep
 {
     internal static ChatFlow<IncidentCreateFlowState> AwaitOwner(
-        this ChatFlow<IncidentCreateFlowState> chatFlow, ICrmUserApi crmUserApi)
+        this ChatFlow<IncidentCreateFlowState> chatFlow, ICrmOwnerApi crmOwnerApi)
         =>
-        chatFlow.SendText(
-            _ => "Нужно выбрать ответственного")
-        .AwaitLookupValue(
-            OwnerAwaitHelper.GetDefaultOwnerAsync,
-            crmUserApi.SearchUsersOrFailureAsync,
+        chatFlow.SetTypingStatus().AwaitLookupValue(
+            crmOwnerApi.GetDefaultOwnersAsync,
+            crmOwnerApi.SearchUsersOrFailureAsync,
             OwnerAwaitHelper.CreateResultMessage,
             MapFlowState);
 

src/endpoint/Incident.Create/Flow/Step.AwaitOwner/OwnerAwaitHelper.cs

@@ -2,34 +2,45 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GarageGroup.Infra.Bot.Builder;
+using Microsoft.Extensions.Logging;
 
 namespace GarageGroup.Internal.Support;
 
 internal static class OwnerAwaitHelper
 {
-    private const string DefaultChooseOwnerMessage = "Выберите себя или введите часть имени для поиска";
-
     private const string ChooseOwnerMessage = "Выберите ответственного или введите часть имени для поиска";
 
     private const string UnsuccessfulSearchResultText = "Не удалось найти ни одного пользователя. Попробуйте уточнить запрос";
 
     private const int MaxUserSetCount = 6;
 
-    internal static ValueTask<LookupValueSetOption> GetDefaultOwnerAsync(
-        IChatFlowContext<IncidentCreateFlowState> context, CancellationToken cancellationToken)
+    internal static ValueTask<LookupValueSetOption> GetDefaultOwnersAsync(
+        this ICrmOwnerApi crmOwnerApi,
+        IChatFlowContext<IncidentCreateFlowState> context,
+        CancellationToken cancellationToken)
         =>
         AsyncPipeline.Pipe(
             context.FlowState, cancellationToken)
         .Pipe(
-            static flowState => new LookupValueSetOption(
-                items: new LookupValue(
-                    id: flowState.BotUserId.GetValueOrDefault(),
-                    name: flowState.BotUserName?.OrNullIfWhiteSpace() ?? "Я (по умолчанию)")
-                    .AsFlatArray(),
-                choiceText: DefaultChooseOwnerMessage));
+            static state => new LastOwnerSetGetIn(
+                customerId: state.CustomerId,
+                userId: state.BotUserId.GetValueOrDefault(),
+                top: MaxUserSetCount - 1))
+        .PipeValue(
+            crmOwnerApi.GetLastAsync)
+        .OnFailure(
+            failure => context.Logger.LogError(
+                "Get last owners failure: {failureCode} {failureMessage}", failure.FailureCode, failure.FailureMessage))
+        .Fold(
+            static success => success.Owners.Map(MapOwnerItem),
+            static _ => default)
+        .Pipe(
+            owners => new LookupValueSetOption(
+                items: owners.InsertBotUser(context.FlowState),
+                choiceText: ChooseOwnerMessage));
 
     internal static ValueTask<Result<LookupValueSetOption, BotFlowFailure>> SearchUsersOrFailureAsync(
-        this ICrmUserApi crmUserApi,
+        this ICrmOwnerApi crmOwnerApi,
         IChatFlowContext<IncidentCreateFlowState> context,
         string seachText,
         CancellationToken cancellationToken)
@@ -38,34 +49,50 @@ internal static ValueTask<Result<LookupValueSetOption, BotFlowFailure>> SearchUs
             context.FlowState, cancellationToken)
         .HandleCancellation()
         .Pipe(
-            flowState => new UserSetSearchIn(seachText)
+            flowState => new OwnerSetSearchIn(seachText)
             {
                 Top = MaxUserSetCount
             })
         .PipeValue(
-            crmUserApi.SearchAsync)
+            crmOwnerApi.SearchAsync)
         .MapFailure(
             MapToFlowFailure)
         .MapSuccess(
             static @out => new LookupValueSetOption(
-                items: @out.Users.Map(MapUserItem),
-                choiceText: @out.Users.IsNotEmpty ? ChooseOwnerMessage : UnsuccessfulSearchResultText));
+                items: @out.Owners.Map(MapOwnerItem),
+                choiceText: @out.Owners.IsNotEmpty ? ChooseOwnerMessage : UnsuccessfulSearchResultText));
 
     internal static string CreateResultMessage(IChatFlowContext<IncidentCreateFlowState> context, LookupValue userValue)
         =>
         $"Ответственный: {context.EncodeHtmlTextWithStyle(userValue.Name, BotTextStyle.Bold)}";
 
-    private static LookupValue MapUserItem(UserItemOut item)
+    private static LookupValue MapOwnerItem(OwnerItemOut item)
         =>
         new(item.Id, item.FullName);
 
-    private static BotFlowFailure MapToFlowFailure(Failure<UserSetSearchFailureCode> failure)
+    private static FlatArray<LookupValue> InsertBotUser(this FlatArray<LookupValue> values, IncidentCreateFlowState flowState)
+    {
+        var builder = FlatArray<LookupValue>.Builder.OfLength(values.Length + 1);
+
+        builder[0] = new(
+            id: flowState.BotUserId.GetValueOrDefault(),
+            name: flowState.BotUserName?.OrNullIfWhiteSpace() ?? "Я (по умолчанию)");
+
+        for (var i = 0; i < values.Length; i++)
+        {
+            builder[i + 1] = values[i];
+        }
+
+        return builder.MoveToFlatArray();
+    }
+
+    private static BotFlowFailure MapToFlowFailure(Failure<OwnerSetGetFailureCode> failure)
         =>
         (failure.FailureCode switch
         {
-            UserSetSearchFailureCode.NotAllowed
+            OwnerSetGetFailureCode.NotAllowed
                 => "При поиске пользователей произошла ошибка. У вашей учетной записи не достаточно разрешений. Обратитесь к администратору приложения",
-            UserSetSearchFailureCode.TooManyRequests
+            OwnerSetGetFailureCode.TooManyRequests
                 => "Слишком много обращений к сервису. Попробуйте повторить попытку через несколько секунд",
             _
                 => "При поиске пользователей произошла непредвиденная ошибка. Обратитесь к администратору или повторите попытку позднее"