add employee filtering by position & enum support for swagger

Author: Mirazyzz

CheckDrive.Api/CheckDrive.Api/CheckDrive.Api.csproj

@@ -24,6 +24,7 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.9.0" />
     <PackageReference Include="Syncfusion.XlsIO.Net.Core" Version="27.1.50" />
   </ItemGroup>
 

CheckDrive.Api/CheckDrive.Api/Controllers/AccountsController.cs

@@ -1,6 +1,7 @@
 using CheckDrive.Application.Constants;
 using CheckDrive.Application.DTOs.Account;
 using CheckDrive.Application.Interfaces;
+using CheckDrive.Domain.Enums;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -18,9 +19,9 @@ public AccountsController(IAccountService service)
     }
 
     [HttpGet]
-    public async Task<ActionResult<List<AccountDto>>> GetAsync()
+    public async Task<ActionResult<List<AccountDto>>> GetAsync(EmployeePosition? position)
     {
-        var accounts = await _service.GetAsync();
+        var accounts = await _service.GetAsync(position);
 
         return Ok(accounts);
     }

CheckDrive.Api/CheckDrive.Api/Extensions/DependencyInjection.cs

@@ -9,7 +9,6 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using System.Text;
-using CheckDrive.Api.Filters;
 
 namespace CheckDrive.Api.Extensions;
 
@@ -56,15 +55,19 @@ private static void AddSwagger(IServiceCollection services)
             .AddSwaggerGen(setup =>
             {
                 setup.SwaggerDoc("v1", new OpenApiInfo { Title = "Check-Drive API", Version = "v1" });
-
-                setup.SchemaFilter<EnumSchemaFilter>();
-            });
+            })
+            .AddSwaggerGenNewtonsoftSupport();
     }
 
     private static void AddAuthentication(IServiceCollection services, IConfiguration configuration)
     {
         var jwtOptions = configuration.GetSection(nameof(JwtOptions)).Get<JwtOptions>();
 
+        if (jwtOptions is null)
+        {
+            throw new InvalidOperationException("Could not load JWT configurations.");
+        }
+
         services
             .AddAuthentication(options =>
         {
@@ -84,7 +87,7 @@ private static void AddAuthentication(IServiceCollection services, IConfiguratio
                     ValidateLifetime = true,
                     ValidateIssuerSigningKey = true,
                     IssuerSigningKey = new SymmetricSecurityKey(
-                        Encoding.UTF8.GetBytes(jwtOptions!.SecretKey))
+                        Encoding.UTF8.GetBytes(jwtOptions.SecretKey))
                 };
 
                 options.Events = new JwtBearerEvents

CheckDrive.Api/CheckDrive.Api/Filters/EnumSchemaFilter.cs

@@ -1,10 +1,11 @@
 using CheckDrive.Application.DTOs.Account;
+using CheckDrive.Domain.Enums;
 
 namespace CheckDrive.Application.Interfaces;
 
 public interface IAccountService
 {
-    Task<List<AccountDto>> GetAsync();
+    Task<List<AccountDto>> GetAsync(EmployeePosition? position);
     Task<AccountDto> GetByIdAsync(string id);
     Task<AccountDto> CreateAsync(CreateAccountDto account);
     Task<AccountDto> UpdateAsync(UpdateAccountDto account);

CheckDrive.Api/CheckDrive.Application/Interfaces/IAccountService.cs

@@ -24,13 +24,18 @@ public AccountService(ICheckDriveDbContext context, IMapper mapper, UserManager<
         _userManager = userManager ?? throw new ArgumentNullException(nameof(userManager));
     }
 
-    public async Task<List<AccountDto>> GetAsync()
+    public async Task<List<AccountDto>> GetAsync(EmployeePosition? position)
     {
-        var accounts = await _context.Employees
+        var query = _context.Employees
             .AsNoTracking()
-            .Include(x => x.Account)
-            .ToListAsync();
+            .AsQueryable();
+
+        if (position.HasValue)
+        {
+            query = query.Where(x => x.Position == position.Value);
+        }
 
+        var accounts = await query.ToListAsync();
         var dtos = _mapper.Map<List<AccountDto>>(accounts);
 
         return dtos;
@@ -100,7 +105,7 @@ public async Task DeleteAsync(string id)
         await _context.SaveChangesAsync();
     }
 
-    private async Task AssignToRoleAsync(IdentityUser user,EmployeePosition position)
+    private async Task AssignToRoleAsync(IdentityUser user, EmployeePosition position)
     {
         var role = position switch
         {