Develop

OneBus.API/Controllers/EmployeeController.cs

@@ -10,7 +10,6 @@
 
 namespace OneBus.API.Controllers
 {
-    [NonController]
     [Route("api/v1/employees")]
     [ApiController]
     [Produces("application/json")]
@@ -102,9 +101,9 @@ public async Task<IActionResult> DeleteAsync([FromRoute] long id, CancellationTo
         /// <response code="200">Funcionários paginados e filtrados com sucesso</response>
         [HttpGet]
         [ProducesResponseType(typeof(SuccessResult<Pagination<ReadEmployeeDTO>>), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter, CancellationToken cancellationToken = default)
+        public async Task<IActionResult> GetPaginedAsync([FromQuery] EmployeeFilter filter, CancellationToken cancellationToken = default)
         {
-            return (await _employeeService.GetPaginedAsync(filter, cancellationToken)).ToActionResult();
+            return (await _employeeService.GetPaginedAsync(filter, cancellationToken: cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -123,7 +122,52 @@ public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter,
         [ProducesResponseType(typeof(NotFoundResult<ReadEmployeeDTO>), StatusCodes.Status404NotFound)]
         public async Task<IActionResult> GetByIdAsync([FromRoute] long id, CancellationToken cancellationToken = default)
         {
-            return (await _employeeService.GetByIdAsync(id, cancellationToken)).ToActionResult();
+            return (await _employeeService.GetByIdAsync(id, cancellationToken: cancellationToken)).ToActionResult();
+        }
+
+        /// <summary>
+        /// Listar status
+        /// </summary>
+        /// <remarks>
+        /// GET de status
+        /// </remarks>
+        /// <returns>Status disponíveis</returns>
+        /// <response code="200">Status retornados com sucesso</response>
+        [HttpGet("status")]
+        [ProducesResponseType(typeof(SuccessResult<IEnumerable<ReadStatusDTO>>), StatusCodes.Status200OK)]
+        public IActionResult GetStatus()
+        {
+            return _employeeService.GetStatus().ToActionResult();
+        }
+
+        /// <summary>
+        /// Listar cargos
+        /// </summary>
+        /// <remarks>
+        /// GET de cargos
+        /// </remarks>
+        /// <returns>Cargos disponíveis</returns>
+        /// <response code="200">Cargos retornados com sucesso</response>
+        [HttpGet("roles")]
+        [ProducesResponseType(typeof(SuccessResult<IEnumerable<ReadRoleDTO>>), StatusCodes.Status200OK)]
+        public IActionResult GetRoles()
+        {
+            return _employeeService.GetRoles().ToActionResult();
+        }
+
+        /// <summary>
+        /// Listar tipos sanguíneos 
+        /// </summary>
+        /// <remarks>
+        /// GET de tipos sanguíneos
+        /// </remarks>
+        /// <returns>Tipos sanguíneos disponíveis</returns>
+        /// <response code="200">Tipos sanguíneos retornados com sucesso</response>
+        [HttpGet("bloodTypes")]
+        [ProducesResponseType(typeof(SuccessResult<IEnumerable<ReadBloodTypeDTO>>), StatusCodes.Status200OK)]
+        public IActionResult GetBloodTypes()
+        {
+            return _employeeService.GetBloodTypes().ToActionResult();
         }
     }
 }

OneBus.API/Controllers/EmployeeWorkdayController.cs

@@ -10,7 +10,6 @@
 
 namespace OneBus.API.Controllers
 {
-    [NonController]
     [Route("api/v1/employeesWorkdays")]
     [ApiController]
     [Produces("application/json")]
@@ -102,9 +101,11 @@ public async Task<IActionResult> DeleteAsync([FromRoute] long id, CancellationTo
         /// <response code="200">Horários dos Funcionários paginados e filtrados com sucesso</response>
         [HttpGet]
         [ProducesResponseType(typeof(SuccessResult<Pagination<ReadEmployeeWorkdayDTO>>), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter, CancellationToken cancellationToken = default)
+        public async Task<IActionResult> GetPaginedAsync([FromQuery] EmployeeWorkDayFilter filter, CancellationToken cancellationToken = default)
         {
-            return (await _employeeWorkdayService.GetPaginedAsync(filter, cancellationToken)).ToActionResult();
+            return (await _employeeWorkdayService.GetPaginedAsync(filter,
+                DbQueryOptions.Create(["Employee"]),
+                cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -123,7 +124,24 @@ public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter,
         [ProducesResponseType(typeof(NotFoundResult<ReadEmployeeWorkdayDTO>), StatusCodes.Status404NotFound)]
         public async Task<IActionResult> GetByIdAsync([FromRoute] long id, CancellationToken cancellationToken = default)
         {
-            return (await _employeeWorkdayService.GetByIdAsync(id, cancellationToken)).ToActionResult();
+            return (await _employeeWorkdayService.GetByIdAsync(id,
+                DbQueryOptions.Create(["Employee"]),
+                cancellationToken)).ToActionResult();
+        }
+
+        /// <summary>
+        /// Listar tipos de dias
+        /// </summary>
+        /// <remarks>
+        /// GET de tipos de dias
+        /// </remarks>
+        /// <returns>Tipos de Dias disponíveis</returns>
+        /// <response code="200">Status retornados com sucesso</response>
+        [HttpGet("daysTypes")]
+        [ProducesResponseType(typeof(SuccessResult<IEnumerable<ReadDayTypeDTO>>), StatusCodes.Status200OK)]
+        public IActionResult GetDaysTypes()
+        {
+            return _employeeWorkdayService.GetDaysTypes().ToActionResult();
         }
     }
 }

OneBus.API/Controllers/LineController.cs

@@ -104,7 +104,7 @@ public async Task<IActionResult> DeleteAsync([FromRoute] long id, CancellationTo
         [ProducesResponseType(typeof(SuccessResult<Pagination<ReadLineDTO>>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter, CancellationToken cancellationToken = default)
         {
-            return (await _lineService.GetPaginedAsync(filter, cancellationToken)).ToActionResult();
+            return (await _lineService.GetPaginedAsync(filter, cancellationToken: cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter,
         [ProducesResponseType(typeof(NotFoundResult<ReadLineDTO>), StatusCodes.Status404NotFound)]
         public async Task<IActionResult> GetByIdAsync([FromRoute] long id, CancellationToken cancellationToken = default)
         {
-            return (await _lineService.GetByIdAsync(id, cancellationToken)).ToActionResult();
+            return (await _lineService.GetByIdAsync(id, cancellationToken: cancellationToken)).ToActionResult();
         }
     }
 }

OneBus.API/Controllers/LineTimeController.cs

@@ -104,7 +104,7 @@ public async Task<IActionResult> DeleteAsync([FromRoute] long id, CancellationTo
         [ProducesResponseType(typeof(SuccessResult<Pagination<ReadLineTimeDTO>>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter, CancellationToken cancellationToken = default)
         {
-            return (await _lineTimeService.GetPaginedAsync(filter, cancellationToken)).ToActionResult();
+            return (await _lineTimeService.GetPaginedAsync(filter, cancellationToken: cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter,
         [ProducesResponseType(typeof(NotFoundResult<ReadLineTimeDTO>), StatusCodes.Status404NotFound)]
         public async Task<IActionResult> GetByIdAsync([FromRoute] long id, CancellationToken cancellationToken = default)
         {
-            return (await _lineTimeService.GetByIdAsync(id, cancellationToken)).ToActionResult();
+            return (await _lineTimeService.GetByIdAsync(id, cancellationToken: cancellationToken)).ToActionResult();
         }
     }
 }

OneBus.API/Controllers/MaintenanceController.cs

@@ -104,7 +104,7 @@ public async Task<IActionResult> DeleteAsync([FromRoute] long id, CancellationTo
         [ProducesResponseType(typeof(SuccessResult<Pagination<ReadMaintenanceDTO>>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter, CancellationToken cancellationToken = default)
         {
-            return (await _maintenanceService.GetPaginedAsync(filter, cancellationToken)).ToActionResult();
+            return (await _maintenanceService.GetPaginedAsync(filter, cancellationToken: cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter,
         [ProducesResponseType(typeof(NotFoundResult<ReadMaintenanceDTO>), StatusCodes.Status404NotFound)]
         public async Task<IActionResult> GetByIdAsync([FromRoute] long id, CancellationToken cancellationToken = default)
         {
-            return (await _maintenanceService.GetByIdAsync(id, cancellationToken)).ToActionResult();
+            return (await _maintenanceService.GetByIdAsync(id, cancellationToken: cancellationToken)).ToActionResult();
         }
     }
 }

OneBus.API/Controllers/UserController.cs

@@ -27,7 +27,7 @@ public UserController(IUserService userService)
         /// Efetuar login
         /// </summary>
         /// <remarks>
-        /// Example:
+        /// Exemplo:
         /// 
         ///     POST /logins
         ///     {

OneBus.API/Controllers/VehicleController.cs

@@ -41,7 +41,7 @@ public VehicleController(IVehicleService vehicleService)
         [ProducesResponseType(typeof(InvalidResult<ReadVehicleDTO>), StatusCodes.Status422UnprocessableEntity)]
         public async Task<IActionResult> CreateAsync([FromBody] CreateVehicleDTO createDTO, CancellationToken cancellationToken = default)
         {
-            return (await _vehicleService.CreateAsync(createDTO, cancellationToken)).ToActionResult();
+            return (await _vehicleService.CreateAsync(createDTO, cancellationToken: cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -104,7 +104,7 @@ public async Task<IActionResult> DeleteAsync([FromRoute] long id, CancellationTo
         [ProducesResponseType(typeof(SuccessResult<Pagination<ReadVehicleDTO>>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter, CancellationToken cancellationToken = default)
         {
-            return (await _vehicleService.GetPaginedAsync(filter, cancellationToken)).ToActionResult();
+            return (await _vehicleService.GetPaginedAsync(filter, cancellationToken: cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter,
         [ProducesResponseType(typeof(NotFoundResult<ReadVehicleDTO>), StatusCodes.Status404NotFound)]
         public async Task<IActionResult> GetByIdAsync([FromRoute] long id, CancellationToken cancellationToken = default)
         {
-            return (await _vehicleService.GetByIdAsync(id, cancellationToken)).ToActionResult();
+            return (await _vehicleService.GetByIdAsync(id, cancellationToken: cancellationToken)).ToActionResult();
         }
     }
 }

OneBus.API/Controllers/VehicleOperationController.cs

@@ -104,7 +104,7 @@ public async Task<IActionResult> DeleteAsync([FromRoute] long id, CancellationTo
         [ProducesResponseType(typeof(SuccessResult<Pagination<ReadVehicleOperationDTO>>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter, CancellationToken cancellationToken = default)
         {
-            return (await _vehicleOperationService.GetPaginedAsync(filter, cancellationToken)).ToActionResult();
+            return (await _vehicleOperationService.GetPaginedAsync(filter, cancellationToken: cancellationToken)).ToActionResult();
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ public async Task<IActionResult> GetPaginedAsync([FromQuery] BaseFilter filter,
         [ProducesResponseType(typeof(NotFoundResult<ReadVehicleOperationDTO>), StatusCodes.Status404NotFound)]
         public async Task<IActionResult> GetByIdAsync([FromRoute] long id, CancellationToken cancellationToken = default)
         {
-            return (await _vehicleOperationService.GetByIdAsync(id, cancellationToken)).ToActionResult();
+            return (await _vehicleOperationService.GetByIdAsync(id, cancellationToken: cancellationToken)).ToActionResult();
         }
     }
 }

OneBus.API/Converters/TrimmingJsonConverter.cs

@@ -0,0 +1,18 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OneBus.API.Converters
+{
+    public class TrimmingJsonConverter : JsonConverter<string>
+    {
+        public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return reader.GetString()?.Trim()!;
+        }
+
+        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value);
+        }
+    }
+}

OneBus.API/OneBus.API.csproj

@@ -11,17 +11,17 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.8" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.9" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.3" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="9.0.3" />
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.3" />
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.3" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="9.0.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.4" />
 	</ItemGroup>
 
 	<ItemGroup>

OneBus.API/Program.cs

@@ -1,22 +1,24 @@
-using System.Text;
-using OneBus.Infra.Ioc;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.IdentityModel.Tokens;
+using Microsoft.OpenApi.Models;
+using OneBus.API.Converters;
 using OneBus.API.Handlers;
 using OneBus.Domain.Settings;
-using Microsoft.OpenApi.Models;
 using OneBus.Infra.Data.DbContexts;
-using Microsoft.EntityFrameworkCore;
+using OneBus.Infra.Ioc;
+using System.Text;
 using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Http.Json;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container:
 
 builder.Services
     .AddControllers()
-    .AddJsonOptions(c => c.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()));
+    .AddJsonOptions(c => c.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()))
+    .AddJsonOptions(c => c.JsonSerializerOptions.Converters.Add(new TrimmingJsonConverter()));
 
 // Configuring json visualization for Enums 
 builder.Services.Configure<JsonOptions>(options =>

OneBus.Application/DTOs/Employee/CreateEmployeeDTO.cs

@@ -2,5 +2,40 @@
 {
     public class CreateEmployeeDTO : BaseCreateDTO
     {
+        public CreateEmployeeDTO()
+        {
+            Name = string.Empty;
+            Rg = string.Empty;
+            Cpf = string.Empty;
+            Code = string.Empty;
+            Email = string.Empty;
+            Phone = string.Empty;
+        }
+
+        public string Name { get; set; }
+
+        public string Rg { get; set; }
+
+        public string Cpf { get; set; }
+
+        public byte? BloodType { get; set; }
+
+        public string Code { get; set; }
+
+        public byte Role { get; set; }
+
+        public string Email { get; set; }
+
+        public string Phone { get; set; }
+
+        public DateOnly HiringDate { get; set; }
+
+        public string? CnhNumber { get; set; }
+
+        public DateOnly? CnhExpiration { get; set; }
+
+        public byte Status { get; set; }
+
+        public byte[]? Image { get; set; }
     }
 }

OneBus.Application/DTOs/Employee/ReadBloodTypeDTO.cs

@@ -0,0 +1,14 @@
+namespace OneBus.Application.DTOs.Employee
+{
+    public class ReadBloodTypeDTO
+    {
+        public ReadBloodTypeDTO()
+        {
+            Name = string.Empty;
+        }
+
+        public byte Value { get; set; }
+
+        public string Name { get; set; }
+    }
+}