Not to show disabled users

Author: pmosk

src/service/CrmContact/Api/Api.csproj

@@ -17,6 +17,7 @@
   <ItemGroup>
     <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.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="PrimeFuncPack.Core.Optional" Version="2.1.0" />

src/service/CrmContact/Api/Api/Api.Search.cs

@@ -17,7 +17,7 @@ public ValueTask<Result<ContactSetSearchOut, Failure<ContactSetGetFailureCode>>>
             static @in => new DataverseSearchIn($"*{@in.SearchText}*")
             {
                 Entities = ContactSetSearchEntities,
-                Filter = $"parentcustomerid eq '{@in.CustomerId:D}'",
+                Filter = new DataverseComparisonFilter("parentcustomerid", DataverseComparisonOperator.Equal, @in.CustomerId),
                 Top = @in.Top 
             })
         .PipeValue(

src/service/CrmOwner/Api/Api/Api.GetLast.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using GarageGroup.Infra;
@@ -21,9 +20,9 @@ public ValueTask<Result<LastOwnerSetGetOut, Failure<OwnerSetGetFailureCode>>> Ge
                 Filter = new DbCombinedFilter(DbLogicalOperator.And)
                 {
                     Filters = new(
-                        DbIncidentOwner.OwnerNotNullFilter,
                         DbIncidentOwner.BuildCurrentUserIdFilter(@in.UserId),
-                        DbIncidentOwner.BuildCustomerIdFilter(@in.CustomerId))
+                        DbIncidentOwner.BuildCustomerIdFilter(@in.CustomerId),
+                        DbIncidentOwner.EnabledUserFilter)
                 },
                 Orders = DbIncidentOwner.DefaultOrders
             })

src/service/CrmOwner/Api/Internal.DbIncidentOwner/DbIncidentOwner.cs

@@ -3,12 +3,15 @@
 namespace GarageGroup.Internal.Support;
 
 [DbEntity("incident", AliasName)]
+[DbJoin(DbJoinType.Inner, "systemuser", UserAlias, $"{UserAlias}.systemuserid = {OwnerIdFieldName}")]
 internal sealed partial record class DbIncidentOwner : IDbEntity<DbIncidentOwner>
 {
     private const string All = "QueryAll";
 
     private const string AliasName = "i";
 
+    private const string UserAlias = "u";
+
     private const string OwnerIdFieldName = $"{AliasName}.ownerid";
 
     private const string MaxCreatedOnParameter = "MaxCreatedOn";

src/service/CrmOwner/Api/Internal.DbIncidentOwner/Owner.Field.cs

@@ -13,6 +13,6 @@ public static FlatArray<string> AllSelectedFields
     [DbSelect(All, AliasName, OwnerIdFieldName, GroupBy = true)]
     public Guid OwnerId { get; init; }
 
-    [DbSelect(All, AliasName, $"{AliasName}.owneridname", GroupBy = true)]
+    [DbSelect(All, UserAlias, $"{UserAlias}.fullname", GroupBy = true)]
     public string? OwnerName { get; init; }
 }

src/service/CrmOwner/Api/Internal.DbIncidentOwner/Owner.Filter.cs

@@ -5,9 +5,9 @@ namespace GarageGroup.Internal.Support;
 
 partial record class DbIncidentOwner
 {
-    internal static readonly DbRawFilter OwnerNotNullFilter
+    internal static readonly DbRawFilter EnabledUserFilter
         =
-        new($"{OwnerIdFieldName} IS NOT NULL");
+        new($"{UserAlias}.isdisabled = 0");
 
     internal static DbParameterFilter BuildCurrentUserIdFilter(Guid currentUserId)
         =>

src/service/CrmOwner/Test/Test.Api/Test.GetLast.cs

@@ -42,20 +42,24 @@ public static async Task GetLastAsync_InputIsNotNull_ExpectSqlApiCalledOnce()
         var expectedQuery = new DbSelectQuery("incident", "i")
         {
             Top = 11,
-            SelectedFields = new("i.ownerid AS OwnerId", "i.owneridname AS OwnerName", "MAX(i.createdon) AS MaxCreatedOn"),
+            SelectedFields = new("i.ownerid AS OwnerId", "u.fullname AS OwnerName", "MAX(i.createdon) AS MaxCreatedOn"),
             Filter = new DbCombinedFilter(DbLogicalOperator.And)
             {
                 Filters = new IDbFilter[]
                 {
-                    new DbRawFilter(
-                        "i.ownerid IS NOT NULL"),
                     new DbParameterFilter(
                         "i.ownerid", DbFilterOperator.Inequal, Guid.Parse("71cbe0d9-a715-4bf3-bb0c-bb02e343d569"), "currentUserId"),
                     new DbParameterFilter(
-                        "i.customerid", DbFilterOperator.Equal, Guid.Parse("4a8f89de-3a0f-4952-9a92-7421b2a72405"), "customerId")
+                        "i.customerid", DbFilterOperator.Equal, Guid.Parse("4a8f89de-3a0f-4952-9a92-7421b2a72405"), "customerId"),
+                    new DbRawFilter(
+                        "u.isdisabled = 0")
                 }
             },
-            GroupByFields = new("i.ownerid", "i.owneridname"),
+            JoinedTables = new DbJoinedTable[]
+            {
+                new(DbJoinType.Inner, "systemuser", "u", new DbRawFilter("u.systemuserid = i.ownerid"))
+            },
+            GroupByFields = new("i.ownerid", "u.fullname"),
             Orders = new DbOrder[]
             {
                 new("MaxCreatedOn", DbOrderType.Descending)