Use .NET8 features

pmosk · pmosk · commit 1eca5d0c413e · 2023-11-17T02:31:06.000+04:00
diff --git a/src/app/AzureFunc/AzureFunc.csproj b/src/app/AzureFunc/AzureFunc.csproj
@@ -39,8 +39,8 @@
     <PackageReference Include="GarageGroup.Infra.Dataverse.Api" Version="3.12.0" />
     <PackageReference Include="GarageGroup.Infra.Dataverse.DataverseUser.Api" Version="1.3.0" />
     <PackageReference Include="GarageGroup.Infra.Http.Polly" Version="1.1.1" />
-    <PackageReference Include="GarageGroup.Infra.Sql.Api" Version="2.0.0" />
-    <PackageReference Include="GarageGroup.Infra.Sql.Api.Provider.Microsoft" Version="2.0.0" />
+    <PackageReference Include="GarageGroup.Infra.Sql.Api" Version="2.1.0" />
+    <PackageReference Include="GarageGroup.Infra.Sql.Api.Provider.Microsoft" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.11.0" OutputItemType="Analyzer" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
     <PackageReference Include="PrimeFuncPack.DependencyRegistry" Version="1.2.1" />
diff --git a/src/endpoint/Incident.Create/Flow/Flow.csproj b/src/endpoint/Incident.Create/Flow/Flow.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="GarageGroup.Infra.Bot.Builder.ChatFlow.Extensions" Version="0.3.0" />
     <PackageReference Include="GarageGroup.Infra.Bot.Builder.ChatFlow.Step.Card" Version="0.2.0" />
     <PackageReference Include="GarageGroup.Infra.Bot.Builder.ChatFlow.Step.Lookup" Version="0.2.0" />
-    <PackageReference Include="GarageGroup.Infra.Bot.Builder.ChatFlow.Step.Value" Version="0.2.0" />
+    <PackageReference Include="GarageGroup.Infra.Bot.Builder.ChatFlow.Step.Value" Version="0.2.1" />
     <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.0.2" />
     <PackageReference Include="PrimeFuncPack.Primitives.Pipeline" Version="2.0.2" />
   </ItemGroup>
diff --git a/src/endpoint/Incident.Create/Flow/Step.CreateIncident/IncidentCreateHelper.cs b/src/endpoint/Incident.Create/Flow/Step.CreateIncident/IncidentCreateHelper.cs
@@ -43,10 +43,8 @@ internal static ValueTask<ChatFlowJump<IncidentCreateOut>> CreateIncidentOrBeakA
                 title: flowState.Title.OrEmpty(),
                 description: flowState.Description,
                 caseTypeCode: flowState.CaseTypeCode,
-                priorityCode: flowState.PriorityCode)
-            {
-                CallerUserId = flowState.BotUserId
-            })
+                priorityCode: flowState.PriorityCode,
+                callerUserId: flowState.BotUserId.GetValueOrDefault()))
         .PipeValue(
             crmIncidentApi.CreateAsync)
         .MapFailure(
diff --git a/src/service/CrmContact/Api/Api.csproj b/src/service/CrmContact/Api/Api.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Search" Version="3.8.2" />
     <PackageReference Include="GarageGroup.Infra.Dataverse.Api.Filter" Version="0.1.1" />
     <PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="2.0.0" />
-    <PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.0.0" />
+    <PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.1.0" />
     <PackageReference Include="PrimeFuncPack.Core.Optional" Version="2.1.0" />
     <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.0.2" />
   </ItemGroup>
diff --git a/src/service/CrmContact/Api/Api/CrmCustomerApi.cs b/src/service/CrmContact/Api/Api/CrmCustomerApi.cs
@@ -3,21 +3,11 @@
 
 namespace GarageGroup.Internal.Support;
 
-internal sealed partial class CrmContactApi : ICrmContactApi
+internal sealed partial class CrmContactApi(IDataverseSearchSupplier dataverseApi, ISqlQueryEntitySetSupplier sqlApi) : ICrmContactApi
 {
     private static readonly FlatArray<string> ContactSetSearchEntities;
 
     static CrmContactApi()
         =>
         ContactSetSearchEntities = new("contact");
-
-    private readonly IDataverseSearchSupplier dataverseApi;
-
-    private readonly ISqlQueryEntitySetSupplier sqlApi;
-
-    internal CrmContactApi(IDataverseSearchSupplier dataverseApi, ISqlQueryEntitySetSupplier sqlApi)
-    {
-        this.dataverseApi = dataverseApi;
-        this.sqlApi = sqlApi;
-    }
 }
diff --git a/src/service/CrmCustomer/Api/Api.csproj b/src/service/CrmCustomer/Api/Api.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="EarlyFuncPack.Core.AsyncPipeline" Version="0.3.0" />
     <PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Search" Version="3.8.2" />
     <PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="2.0.0" />
-    <PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.0.0" />
+    <PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.1.0" />
     <PackageReference Include="PrimeFuncPack.Core.Optional" Version="2.1.0" />
     <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.0.2" />
   </ItemGroup>
diff --git a/src/service/CrmCustomer/Api/Api/CrmCustomerApi.cs b/src/service/CrmCustomer/Api/Api/CrmCustomerApi.cs
@@ -3,21 +3,11 @@
 
 namespace GarageGroup.Internal.Support;
 
-internal sealed partial class CrmCustomerApi : ICrmCustomerApi
+internal sealed partial class CrmCustomerApi(IDataverseSearchSupplier dataverseApi, ISqlQueryEntitySetSupplier sqlApi) : ICrmCustomerApi
 {
     private static readonly FlatArray<string> CustomerSetSearchEntities;
 
     static CrmCustomerApi()
         =>
         CustomerSetSearchEntities = new("account");
-
-    private readonly IDataverseSearchSupplier dataverseApi;
-
-    private readonly ISqlQueryEntitySetSupplier sqlApi;
-
-    internal CrmCustomerApi(IDataverseSearchSupplier dataverseApi, ISqlQueryEntitySetSupplier sqlApi)
-    {
-        this.dataverseApi = dataverseApi;
-        this.sqlApi = sqlApi;
-    }
 }
diff --git a/src/service/CrmIncident/Api/Api/Api.Create.cs b/src/service/CrmIncident/Api/Api/Api.Create.cs
@@ -5,7 +5,7 @@
 
 namespace GarageGroup.Internal.Support;
 
-partial class CrmIncidentApi<TDataverseApi>
+partial class CrmIncidentApi
 {
     public ValueTask<Result<IncidentCreateOut, Failure<IncidentCreateFailureCode>>> CreateAsync(
         IncidentCreateIn input, CancellationToken cancellationToken)
@@ -38,7 +38,7 @@ public ValueTask<Result<IncidentCreateOut, Failure<IncidentCreateFailureCode>>>
         .Pipe(
             IncidentJsonCreateIn.BuildDataverseCreateInput)
         .PipeValue(
-            GetDataverseApi(input.CallerUserId).CreateEntityAsync<IncidentJsonCreateIn, IncidentJsonCreateOut>)
+            dataverseApi.Impersonate(input.CallerUserId).CreateEntityAsync<IncidentJsonCreateIn, IncidentJsonCreateOut>)
         .MapFailure(
             static failure => failure.MapFailureCode(ToIncidentCreateFailureCode))
         .MapSuccess(
diff --git a/src/service/CrmIncident/Api/Api/CrmIncidentApi.cs b/src/service/CrmIncident/Api/Api/CrmIncidentApi.cs
@@ -1,22 +1,9 @@
-﻿using System;
-using GarageGroup.Infra;
+﻿using GarageGroup.Infra;
 
 namespace GarageGroup.Internal.Support;
 
-internal sealed partial class CrmIncidentApi<TDataverseApi> : ICrmIncidentApi
-    where TDataverseApi : IDataverseEntityCreateSupplier, IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>
-{
-    private readonly TDataverseApi dataverseApi;
-
-    internal CrmIncidentApi(TDataverseApi dataverseApi)
-        =>
-        this.dataverseApi = dataverseApi;
+using TDataverseApi = IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>;
 
-    private IDataverseEntityCreateSupplier GetDataverseApi(Guid? callerUserId)
-        =>
-        callerUserId switch
-        {
-            null => dataverseApi,
-            _ => dataverseApi.Impersonate(callerUserId.Value)
-        };
+internal sealed partial class CrmIncidentApi(TDataverseApi dataverseApi) : ICrmIncidentApi
+{
 }
diff --git a/src/service/CrmIncident/Api/CrmIncidentApiDependency.cs b/src/service/CrmIncident/Api/CrmIncidentApiDependency.cs
@@ -10,12 +10,12 @@ namespace GarageGroup.Internal.Support;
 public static class CrmIncidentApiDependency
 {
     public static Dependency<ICrmIncidentApi> UseCrmIncidentApi<TDataverseApi>(this Dependency<TDataverseApi> dependency)
-        where TDataverseApi : IDataverseEntityCreateSupplier, IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>
+        where TDataverseApi : IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>
     {
         ArgumentNullException.ThrowIfNull(dependency);
         return dependency.Map<ICrmIncidentApi>(CreateApi);
 
-        static CrmIncidentApi<TDataverseApi> CreateApi(TDataverseApi dataverseApi)
+        static CrmIncidentApi CreateApi(TDataverseApi dataverseApi)
         {
             ArgumentNullException.ThrowIfNull(dataverseApi);
             return new(dataverseApi);
diff --git a/src/service/CrmIncident/Contract/IncidentCreateIn.cs b/src/service/CrmIncident/Contract/IncidentCreateIn.cs
@@ -12,7 +12,8 @@ public IncidentCreateIn(
         string title,
         [AllowNull] string description,
         IncidentCaseTypeCode caseTypeCode,
-        IncidentPriorityCode priorityCode)
+        IncidentPriorityCode priorityCode,
+        Guid callerUserId)
     {
         OwnerId = ownerId;
         CustomerId = customerId;
@@ -21,6 +22,7 @@ public IncidentCreateIn(
         Description = description.OrEmpty();
         CaseTypeCode = caseTypeCode;
         PriorityCode = priorityCode;
+        CallerUserId = callerUserId;
     }
 
     public Guid OwnerId { get; }
@@ -37,5 +39,5 @@ public IncidentCreateIn(
 
     public IncidentPriorityCode PriorityCode { get; }
 
-    public Guid? CallerUserId { get; init; }
+    public Guid CallerUserId { get; }
 }
diff --git a/src/service/CrmIncident/Test/Source.Api/Source.In.Valid.cs b/src/service/CrmIncident/Test/Source.Api/Source.In.Valid.cs
@@ -18,10 +18,8 @@ public static IEnumerable<object[]> InputValidTestData
                     title: "Some title",
                     description: "Some description",
                     caseTypeCode: IncidentCaseTypeCode.Question,
-                    priorityCode: IncidentPriorityCode.Low)
-                {
-                    CallerUserId = Guid.Parse("8d690bea-2c1d-4ded-b5c2-0d070e8559f1")
-                },
+                    priorityCode: IncidentPriorityCode.Low,
+                    callerUserId: Guid.Parse("8d690bea-2c1d-4ded-b5c2-0d070e8559f1")),
                 new DataverseEntityCreateIn<IncidentJsonCreateIn>(
                     entityPluralName: "incidents",
                     selectFields: new("title"),
@@ -45,10 +43,8 @@ public static IEnumerable<object[]> InputValidTestData
                     title: string.Empty,
                     description: "Some Description",
                     caseTypeCode: IncidentCaseTypeCode.Request,
-                    priorityCode: IncidentPriorityCode.Hight)
-                {
-                    CallerUserId = Guid.Parse("144326e7-5aa8-4792-b8aa-d125b6f7f6b5")
-                },
+                    priorityCode: IncidentPriorityCode.Hight,
+                    callerUserId: Guid.Parse("144326e7-5aa8-4792-b8aa-d125b6f7f6b5")),
                 new DataverseEntityCreateIn<IncidentJsonCreateIn>(
                     entityPluralName: "incidents",
                     selectFields: new("title"),
@@ -72,10 +68,8 @@ public static IEnumerable<object[]> InputValidTestData
                     title: "Some Title",
                     description: string.Empty,
                     caseTypeCode: IncidentCaseTypeCode.Problem,
-                    priorityCode: IncidentPriorityCode.Normal)
-                {
-                    CallerUserId = null
-                },
+                    priorityCode: IncidentPriorityCode.Normal,
+                    callerUserId: Guid.Parse("a6093320-cdf2-43d7-bf42-21825c303721")),
                 new DataverseEntityCreateIn<IncidentJsonCreateIn>(
                     entityPluralName: "incidents",
                     selectFields: new("title"),
diff --git a/src/service/CrmIncident/Test/Test.Api/CrmIncidentApiTest.cs b/src/service/CrmIncident/Test/Test.Api/CrmIncidentApiTest.cs
@@ -1,11 +1,8 @@
 ﻿using System;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using GarageGroup.Infra;
 using Moq;
 
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-
 namespace GarageGroup.Internal.Support.Service.CrmIncident.Test;
 
 public static partial class CrmIncidentApiTest
@@ -19,7 +16,8 @@ private static readonly IncidentCreateIn SomeIncidentCreateInput
             title: "title",
             description: "decription",
             caseTypeCode: IncidentCaseTypeCode.Question,
-            priorityCode: IncidentPriorityCode.Normal);
+            priorityCode: IncidentPriorityCode.Normal,
+            callerUserId: Guid.Parse("d40c9c6c-ba5f-4264-aaad-542f11caf4f6"));
 
     private static readonly IncidentJsonCreateOut SomeIncidentJsonOutput
         =
@@ -29,22 +27,26 @@ private static readonly IncidentJsonCreateOut SomeIncidentJsonOutput
             Title = "Some Incident title"
         };
 
-    private static Mock<IStubDataverseApi> CreateMockDataverseApi(
+    private static Mock<IDataverseEntityCreateSupplier> BuildMockDataverseCreateSupplier(
         Result<DataverseEntityCreateOut<IncidentJsonCreateOut>, Failure<DataverseFailureCode>> result)
     {
-        var mock = new Mock<IStubDataverseApi>();
+        var mock = new Mock<IDataverseEntityCreateSupplier>();
 
         _ = mock.Setup(
             static api => api.CreateEntityAsync<IncidentJsonCreateIn, IncidentJsonCreateOut>(
                 It.IsAny<DataverseEntityCreateIn<IncidentJsonCreateIn>>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(result);
 
-        _ = mock.Setup(static api => api.Impersonate(It.IsAny<Guid>())).Returns(mock.Object);
-
         return mock;
     }
 
-    internal interface IStubDataverseApi : IDataverseEntityCreateSupplier, IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>
+    private static Mock<IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>> BuildMockDataverseApi(
+        IDataverseEntityCreateSupplier dataverseCreateSupplier)
     {
+        var mock = new Mock<IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>>();
+
+        _ = mock.Setup(static api => api.Impersonate(It.IsAny<Guid>())).Returns(dataverseCreateSupplier);
+
+        return mock;
     }
 }
diff --git a/src/service/CrmIncident/Test/Test.Api/Test.Create.cs b/src/service/CrmIncident/Test/Test.Api/Test.Create.cs
diff --git a/src/service/CrmOwner/Api/Api.csproj b/src/service/CrmOwner/Api/Api.csproj
diff --git a/src/service/CrmOwner/Api/Api/CrmOwnerApi.cs b/src/service/CrmOwner/Api/Api/CrmOwnerApi.cs
diff --git a/src/service/Gpt/Api/Api/SupportGptApi.cs b/src/service/Gpt/Api/Api/SupportGptApi.cs
diff --git a/src/service/Gpt/Test/Stub/MockHttpMessageHandler.cs b/src/service/Gpt/Test/Stub/MockHttpMessageHandler.cs

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ namespace GarageGroup.Internal.Support;`
`10`	`10`	`public static class CrmIncidentApiDependency`
`11`	`11`	`{`
`12`	`12`	`public static Dependency<ICrmIncidentApi> UseCrmIncidentApi<TDataverseApi>(this Dependency<TDataverseApi> dependency)`
`13`		`- where TDataverseApi : IDataverseEntityCreateSupplier, IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>`
	`13`	`+ where TDataverseApi : IDataverseImpersonateSupplier<IDataverseEntityCreateSupplier>`
`14`	`14`	`{`
`15`	`15`	`ArgumentNullException.ThrowIfNull(dependency);`
`16`	`16`	`return dependency.Map<ICrmIncidentApi>(CreateApi);`
`17`	`17`
`18`		`- static CrmIncidentApi<TDataverseApi> CreateApi(TDataverseApi dataverseApi)`
	`18`	`+ static CrmIncidentApi CreateApi(TDataverseApi dataverseApi)`
`19`	`19`	`{`
`20`	`20`	`ArgumentNullException.ThrowIfNull(dataverseApi);`
`21`	`21`	`return new(dataverseApi);`