add filter flag (#39)

ApplETS · Apr 5, 2024 · b53bcc1 · b53bcc1
1 parent 36fb571
commit b53bcc1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/core/Controllers/OrganizersController.cs b/core/Controllers/OrganizersController.cs
@@ -1,5 +1,6 @@
 using api.core.data.entities;
 using api.core.Data;
+using api.core.Data.Enums;
 using api.core.Data.Exceptions;
 using api.core.Data.requests;
 using api.core.Data.Requests;
@@ -61,10 +62,10 @@ await emailService.SendEmailAsync(
     }
 
     [HttpGet]
-    public IActionResult GetUsers(string? search, [FromQuery] PaginationRequest pagination)
+    public IActionResult GetUsers(string? search, OrganizerAccountActiveFilter filter, [FromQuery] PaginationRequest pagination)
     {
         var validFilter = new PaginationRequest(pagination.PageNumber, pagination.PageSize);
-        var users = userService.GetUsers(search, out int totalRecords);
+        var users = userService.GetUsers(search, filter, out int totalRecords);
 
         var paginatedRes = users
             .Skip((pagination.PageNumber - 1) * pagination.PageSize)

diff --git a/core/Data/Enums/OrganizerAccountActiveFilter.cs b/core/Data/Enums/OrganizerAccountActiveFilter.cs
@@ -0,0 +1,13 @@
+namespace api.core.Data.Enums;
+
+/// <summary>
+/// Filter the organizer accounts by their active status
+/// </summary>
+[Flags]
+public enum OrganizerAccountActiveFilter
+{
+    None = 0,
+    Active = 1,
+    Inactive = 2,
+    All = Active | Inactive
+}
diff --git a/core/Services/Abstractions/IUserService.cs b/core/Services/Abstractions/IUserService.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.Tracing;
 
+using api.core.Data.Enums;
 using api.core.Data.requests;
 using api.core.Data.Responses;
 
@@ -13,7 +14,7 @@ public interface IUserService
 
     public string GetUserAvatarUrl(Guid id);
 
-    public IEnumerable<UserResponseDTO> GetUsers(string? search, out int count);
+    public IEnumerable<UserResponseDTO> GetUsers(string? search, OrganizerAccountActiveFilter activeFilter, out int count);
 
     public bool UpdateUser(Guid id, UserUpdateDTO dto);
 

diff --git a/core/Services/UserService.cs b/core/Services/UserService.cs
@@ -1,5 +1,6 @@
 using api.core.data.entities;
 using api.core.Data.Exceptions;
+using api.core.Data.Enums;
 using api.core.Data.requests;
 using api.core.Data.Responses;
 using api.core.repositories;
@@ -81,12 +82,15 @@ public string GetUserAvatarUrl(Guid id)
         return avatarUri.ToString();
     }
 
-    public IEnumerable<UserResponseDTO> GetUsers(string? search, out int count)
+    public IEnumerable<UserResponseDTO> GetUsers(string? search, OrganizerAccountActiveFilter activeFilter, out int count)
     {
         var organizers = organizerRepository.GetAll()
-            .Where(x => search.IsNullOrEmpty() ||
-                x.Organization.ToLower().Contains(search.ToLower() ?? "") ||
-                x.Email.ToLower().Contains(search.ToLower() ?? "")
+            .Where(x => (search.IsNullOrEmpty() ||
+                x.Organization.ToLower().Contains(search!.ToLower() ?? "") ||
+                x.Email.ToLower().Contains(search!.ToLower() ?? "")) &&
+                ((activeFilter.HasFlag(OrganizerAccountActiveFilter.Active) && x.IsActive) ||
+                 (activeFilter.HasFlag(OrganizerAccountActiveFilter.Inactive) && !x.IsActive) ||
+                 activeFilter.HasFlag(OrganizerAccountActiveFilter.All))
             );
         count = organizers.Count();