Added search by client ID in projects

sancsoft · May 15, 2024 · e33db8a · e33db8a
1 parent 03d5180
commit e33db8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/dotnet/HQ.Abstractions/Projects/GetProjectsV1.cs b/src/dotnet/HQ.Abstractions/Projects/GetProjectsV1.cs
@@ -15,7 +15,7 @@ public class Request : PagedRequestV1
     {
         public string? Search { get; set; }
         public Guid? Id { get; set; }
-
+        public Guid? clientId { get; set; }
         public SortColumn SortBy { get; set; } = SortColumn.Name;
         public SortDirection SortDirection { get; set; } = SortDirection.Asc;
     }

diff --git a/src/dotnet/HQ.Server/Services/ProjectServiceV1.cs b/src/dotnet/HQ.Server/Services/ProjectServiceV1.cs
@@ -83,12 +83,15 @@ public ProjectServiceV1(HQDbContext context)
             .OrderByDescending(t => t.CreatedAt)
             .AsQueryable();
 
-        var total = await records.CountAsync(ct);
+        if (request.clientId.HasValue)
+        {
+            records = records.Where(t => t.ClientId == request.clientId);
+        }
 
         if (!string.IsNullOrEmpty(request.Search))
         {
             records = records.Where(t =>
-                t.Name.ToLower().Contains(request.Search.ToLower()) || 
+                t.Name.ToLower().Contains(request.Search.ToLower()) ||
                 t.Client.Name.ToLower().Contains(request.Search.ToLower()) ||
                 (t.ChargeCode != null ? t.ChargeCode.Code.ToLower().Contains(request.Search.ToLower()) : false)
             );
@@ -140,6 +143,8 @@ public ProjectServiceV1(HQDbContext context)
         {
             mapped = mapped.Take(request.Take.Value);
         }
+
+        var total = await records.CountAsync(ct);
 
         var response = new GetProjectsV1.Response()
         {