diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..3f9164f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,155 @@ +root = true + +# Regras gerais para C# +[*.cs] +#charset = utf-8 +dotnet_diagnostic.SA0001.severity = none +dotnet_diagnostic.IDE0005.severity = none +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true + +# Forçar severidade padrão dos analisadores Roslyn +dotnet_analyzer_diagnostic.severity = warning + +# Estilo de código recomendados (exemplos) +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion + +# Ordenação de using +dotnet_sort_system_directives_first = true:warning + +# Exemplos de severidade para regras específicas (StyleCop) +dotnet_diagnostic.SA1200.severity = none +dotnet_diagnostic.SA1309.severity = none + +# Nomes e formatos (exemplo simples) +dotnet_naming_rule.private_fields_should_be_camel_case.severity = suggestion + +# Regras de nomenclatura +dotnet_naming_rule.private_fields_should_be_camel_case.severity = suggestion +dotnet_naming_rule.private_fields_should_be_camel_case.symbols = private_fields +dotnet_naming_rule.private_fields_should_be_camel_case.style = camel_case + +dotnet_naming_symbols.private_fields.applicable_kinds = field +dotnet_naming_symbols.private_fields.applicable_accessibilities = private + +dotnet_naming_style.camel_case.capitalization = camel_case + +# Regras de estilo de código +csharp_style_expression_bodied_methods = false:suggestion +csharp_style_expression_bodied_constructors = false:suggestion +csharp_style_expression_bodied_operators = false:suggestion +csharp_style_expression_bodied_properties = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_accessors = true:suggestion + +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion +csharp_style_var_elsewhere = true:suggestion + +csharp_style_prefer_method_group_conversion = true:suggestion +csharp_style_prefer_top_level_statements = true:suggestion +csharp_style_prefer_primary_constructors = false:suggestion + +# Regras de espaço e formatação +csharp_space_after_cast = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_parameter_list_parentheses = false + +# Default severity for analyzer diagnostics with category 'StyleCop.CSharp.DocumentationRules' +dotnet_analyzer_diagnostic.category-StyleCop.CSharp.DocumentationRules.severity = none + +# SYSLIB1045: Converter em 'GeneratedRegexAttribute'. +dotnet_diagnostic.SYSLIB1045.severity = none + +# SA1101: Prefix local calls with this +dotnet_diagnostic.SA1101.severity = none + +# IDE1006: Estilos de Nomenclatura +dotnet_diagnostic.IDE1006.severity = none + +# IDE0058: O valor da expressão nunca é usado +dotnet_diagnostic.IDE0058.severity = none + +# IDE0046: Converter em expressão condicional +dotnet_diagnostic.IDE0046.severity = suggestion + +# SA1201: Elements should appear in the correct order +dotnet_diagnostic.SA1201.severity = suggestion + +# IDE0041: Usar verificação 'is null' +dotnet_diagnostic.IDE0041.severity = suggestion + +# SA1503: Braces should not be omitted +dotnet_diagnostic.SA1503.severity = suggestion + +# IDE0011: Adicionar chaves +dotnet_diagnostic.IDE0011.severity = none + +# IDE0028: Simplificar a inicialização de coleção +dotnet_diagnostic.IDE0028.severity = suggestion + +# IDE0200: Remover expressão lambda desnecessária +dotnet_diagnostic.IDE0200.severity = suggestion + +# IDE0305: Simplificar a inicialização de coleção +dotnet_diagnostic.IDE0305.severity = suggestion + +# IDE0060: Remover o parâmetro não utilizado +dotnet_diagnostic.IDE0060.severity = suggestion + +# CA1720: O identificador contém o nome de tipo +dotnet_diagnostic.CA1720.severity = none + +# Desabilita SA1633 (cabeçalho de arquivo) globalmente para arquivos C# +dotnet_diagnostic.SA1633.severity = none + +# SA1413: Use trailing comma in multi-line initializers +dotnet_diagnostic.SA1413.severity = suggestion + +# IDE0100: Remover a igualdade redundante +dotnet_diagnostic.IDE0100.severity = none + +# CA1816: Os métodos Dispose devem chamar SuppressFinalize +dotnet_diagnostic.CA1816.severity = suggestion + +# IDE0052: Remover membros particulares não lidos +dotnet_diagnostic.IDE0052.severity = suggestion + +# CA1051: Não declarar campos de instância visíveis +dotnet_diagnostic.CA1051.severity = suggestion + +# SA1401: Fields should be private +dotnet_diagnostic.SA1401.severity = suggestion + +# SA1306: Field names should begin with lower-case letter +dotnet_diagnostic.SA1306.severity = suggestion + +# SA1100: Do not prefix calls with base unless local implementation exists +dotnet_diagnostic.SA1100.severity = suggestion + +# CA1707: Identificadores não devem conter sublinhados +dotnet_diagnostic.CA1707.severity = none + +# IDE0022: Usar o corpo do bloco para método +dotnet_diagnostic.IDE0022.severity = none + +# IDE0301: Simplificar a inicialização de coleção +dotnet_diagnostic.IDE0301.severity = suggestion + +# CA1305: Especificar IFormatProvider +dotnet_diagnostic.CA1305.severity = suggestion + +# IDE0059: Atribuição desnecessária de um valor +dotnet_diagnostic.IDE0059.severity = suggestion + +# CS8604: Possível argumento de referência nula. +dotnet_diagnostic.CS8604.severity = suggestion + +# CA1827: Não usar Count() ou LongCount() quando Any() puder ser usado +dotnet_diagnostic.CA1827.severity = suggestion diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..1e703ba --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,35 @@ + + + + net8.0 + + + enable + enable + + + 12.0 + + + true + + + true + true + latest + $(TreatWarningsAsErrors) + + + https://github.com/rinaldoserra-dev/plataforma-educacao-devops + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/PlataformaEducacao.sln b/PlataformaEducacao.sln index 8eb8d60..0cf2578 100644 --- a/PlataformaEducacao.sln +++ b/PlataformaEducacao.sln @@ -97,6 +97,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{81405219-1 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlataformaEducacao.Core.Tests", "src\tests\PlataformaEducacaoCore\PlataformaEducacao.Core.Tests.csproj", "{7CF9F8F1-2CFE-4543-9F1B-D1D819344A03}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlataformaEducacao.GestaoConteudo.Data.Tests", "src\tests\PlataformaEducacao.GestaoConteudo.Data.Tests\PlataformaEducacao.GestaoConteudo.Data.Tests.csproj", "{0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -443,6 +445,18 @@ Global {7CF9F8F1-2CFE-4543-9F1B-D1D819344A03}.Release|x64.Build.0 = Release|Any CPU {7CF9F8F1-2CFE-4543-9F1B-D1D819344A03}.Release|x86.ActiveCfg = Release|Any CPU {7CF9F8F1-2CFE-4543-9F1B-D1D819344A03}.Release|x86.Build.0 = Release|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Debug|x64.ActiveCfg = Debug|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Debug|x64.Build.0 = Debug|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Debug|x86.ActiveCfg = Debug|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Debug|x86.Build.0 = Debug|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Release|Any CPU.Build.0 = Release|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Release|x64.ActiveCfg = Release|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Release|x64.Build.0 = Release|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Release|x86.ActiveCfg = Release|Any CPU + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -494,6 +508,7 @@ Global {CB93565F-3313-4670-AB4C-8F71ADF66D63} = {56D316E0-2671-4404-9D44-01FCE4AD8192} {81405219-192E-4FA9-96E4-F550F8A8386F} = {56D316E0-2671-4404-9D44-01FCE4AD8192} {7CF9F8F1-2CFE-4543-9F1B-D1D819344A03} = {81405219-192E-4FA9-96E4-F550F8A8386F} + {0EDB1AC8-CC4B-487F-83AA-3072C0CF5689} = {53FF5E3B-DD37-43A1-9553-3B4135CA7E9E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5076C19C-1C60-4400-A9A6-CA081FE46BAE} diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/ApiConfig.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/ApiConfig.cs index f40429f..9196f1e 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/ApiConfig.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/ApiConfig.cs @@ -20,6 +20,7 @@ public static IHostBuilder ConfigureAppSettings(this IHostBuilder host) return host; } + public static IServiceCollection AddApiConfig(this IServiceCollection services, IConfiguration configuration) { services.AddControllers(); diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/MessageBusConfig.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/MessageBusConfig.cs index 4df6775..5d071dd 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/MessageBusConfig.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/MessageBusConfig.cs @@ -1,9 +1,14 @@ -namespace PlataformaEducacao.Bff.Api.Configurations +using PlataformaEducacao.Core.Utils; +using PlataformaEducacao.MessageBus; + +namespace PlataformaEducacao.Bff.Api.Configurations { public static class MessageBusConfig { public static IServiceCollection AddMessageBusConfiguration(this IServiceCollection services, IConfiguration configuration) { + services.AddMessageBus(configuration.GetMessageQueueConnection("MessageBus")); + return services; } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/SwaggerConfig.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/SwaggerConfig.cs index c4e266b..0d5b221 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/SwaggerConfig.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Configurations/SwaggerConfig.cs @@ -16,7 +16,6 @@ public static IServiceCollection AddSwaggerConfiguration(this IServiceCollection License = new OpenApiLicense { Name = "MIT", Url = new Uri("https://opensource.org/licenses/MIT") } }); - option.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme { In = ParameterLocation.Header, @@ -38,10 +37,9 @@ public static IServiceCollection AddSwaggerConfiguration(this IServiceCollection Id = "Bearer" } }, - new string[] {} + Array.Empty() } }); - }); return services; diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/BaseController.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/BaseController.cs index 45668e1..564ace9 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/BaseController.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/BaseController.cs @@ -24,7 +24,7 @@ protected ActionResult CustomResponse(ModelStateDictionary modelState) protected ActionResult CustomResponse(ResponseResult response) { - if (response == null || !response.Sucesso || response.Erros.Mensagens.Any()) + if (response == null || !response.Sucesso || response.Erros.Mensagens.Count != 0) { return BadRequest(response); } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoAlunosController.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoAlunosController.cs index e95a6a7..5a665a2 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoAlunosController.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoAlunosController.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Authorization; +using System.Text.Json; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using PlataformaEducacao.Bff.Api.Models.GestaoAlunos; using PlataformaEducacao.Bff.Api.Models.GestaoConteudo; using PlataformaEducacao.Bff.Api.Services; using PlataformaEducacao.WebApi.Core.Controllers; -using System.Text.Json; namespace PlataformaEducacao.Bff.Api.Controllers { @@ -30,9 +30,7 @@ public async Task Matricular(MatricularDTO matricular) } var cursoDetalhes = JsonSerializer.Deserialize( - curso!.Data.ToString()!, - new JsonSerializerOptions { PropertyNameCaseInsensitive = true } - ); + curso.Data.ToString(), JsonSerializerOptions); if (cursoDetalhes != null) { @@ -115,5 +113,10 @@ public async Task BaixarCertificado(Guid certificadoId) return File(bytes, contentType, fileName.Trim('"')); } + + private static readonly JsonSerializerOptions JsonSerializerOptions = new() + { + PropertyNameCaseInsensitive = true + }; } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoConteudoController.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoConteudoController.cs index d140766..ce9e938 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoConteudoController.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Controllers/GestaoConteudoController.cs @@ -24,6 +24,7 @@ public async Task AdicionarCurso([FromBody] AdicionarCursoRequest return CustomResponse(resposta); } + [HttpPut("{id:guid}")] [Authorize(Roles = "ADMIN")] public async Task Atualizar(Guid id, [FromBody] AtualizarCursoRequest cursoRequest) diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/AppServicesSettings.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/AppServicesSettings.cs index ab99f22..f33ceda 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/AppServicesSettings.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/AppServicesSettings.cs @@ -3,8 +3,11 @@ public class AppServicesSettings { public string IdentidadeUrl { get; set; } = string.Empty; + public string GestaoConteudoUrl { get; set; } = string.Empty; + public string GestaoAlunosUrl { get; set; } = string.Empty; + public string GestaoFinanceiraUrl { get; set; } = string.Empty; } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/HttpClientAuthorizationDelegatingHandler.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/HttpClientAuthorizationDelegatingHandler.cs index 5a5114a..89446a0 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/HttpClientAuthorizationDelegatingHandler.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Extensions/HttpClientAuthorizationDelegatingHandler.cs @@ -13,20 +13,19 @@ public HttpClientAuthorizationDelegatingHandler(IAspNetUser aspNetUser) protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { - var authorizationHeader = _aspNetUser.ObterHttpContext().Request.Headers["Authorization"]; + var authorizationHeader = _aspNetUser.ObterHttpContext().Request.Headers.Authorization; if (!string.IsNullOrEmpty(authorizationHeader)) { - request.Headers.Add("Authorization", new List() { authorizationHeader! }); + request.Headers.Add("Authorization", new List() { authorizationHeader }); } - //var token = _aspNetUser.ObterUserToken(); + // var token = _aspNetUser.ObterUserToken(); - //if (!string.IsNullOrEmpty(authorizationHeader)) - //{ + // if (!string.IsNullOrEmpty(authorizationHeader)) + // { // request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI1MTE0OGJlNy05ZDA5LTQwOWUtYTFiNi0xZDI1ODI4YzM2NjkiLCJlbWFpbCI6ImFkbWluQHRlc3RlLmNvbSIsImp0aSI6IjQ5OGUxMWVjLTM0ZjktNDlkOS1iYzY0LWU3NTk3OGIyMGQ3NCIsIm5iZiI6MTc3MDM5MjI4MywiaWF0IjoxNzcwMzkyMjgzLCJyb2xlIjoiQURNSU4iLCJleHAiOjE3NzAzOTk0ODMsImlzcyI6IlBsYXRhZm9ybWFFZHVjYWNhbyIsImF1ZCI6Imh0dHBzOi8vbG9jYWxob3N0In0.N8St5rJDb-iUgsJbc5WhESypBwXMhbAFZ6IUNbsCmRM"); - //} - + // } return await base.SendAsync(request, cancellationToken); } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoAlunos/RealizarAulaDTO.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoAlunos/RealizarAulaDTO.cs index 6bedd17..7b356db 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoAlunos/RealizarAulaDTO.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoAlunos/RealizarAulaDTO.cs @@ -13,4 +13,4 @@ public class RealizarAulaDTO [Required(ErrorMessage = "O id da aula é obrigatório.")] public Guid AulaId { get; set; } } -} \ No newline at end of file +} diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoConteudo/CursoDetalhesDTO.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoConteudo/CursoDetalhesDTO.cs index 3442129..3ebd98e 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoConteudo/CursoDetalhesDTO.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/GestaoConteudo/CursoDetalhesDTO.cs @@ -3,9 +3,13 @@ namespace PlataformaEducacao.Bff.Api.Models.GestaoConteudo public class CursoDetalhesDTO { public Guid Id { get; set; } + public string Nome { get; set; } = string.Empty; + public decimal Valor { get; set; } + public bool Disponivel { get; set; } + public IEnumerable Aulas { get; set; } = Enumerable.Empty(); } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Health/HealthStatusDTO.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Health/HealthStatusDTO.cs index a448b25..3a708e3 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Health/HealthStatusDTO.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Health/HealthStatusDTO.cs @@ -3,9 +3,13 @@ namespace PlataformaEducacao.Bff.Api.Models.Health public class HealthStatusDTO { public string Servico { get; set; } = string.Empty; + public string Url { get; set; } = string.Empty; + public bool Saudavel { get; set; } + public int Status { get; set; } + public string Mensagem { get; set; } = string.Empty; } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarAulaRequest.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarAulaRequest.cs index 53fbef6..8f0cfc5 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarAulaRequest.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarAulaRequest.cs @@ -6,12 +6,18 @@ public class AdicionarAulaRequest { [Required(ErrorMessage = "O campo {0} é obrigatório.")] public Guid CursoId { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] + public string Titulo { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] + public string Conteudo { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public int Ordem { get; set; } + public string? Material { get; set; } } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarCursoRequest.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarCursoRequest.cs index ea339c8..ed5b9e7 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarCursoRequest.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AdicionarCursoRequest.cs @@ -1,5 +1,5 @@ -using PlataformaEducacao.WebApi.Core.Extensions; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using PlataformaEducacao.WebApi.Core.Extensions; namespace PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo { diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AtualizarCursoRequest.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AtualizarCursoRequest.cs index c58923e..ba9bc53 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AtualizarCursoRequest.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/GestaoConteudo/AtualizarCursoRequest.cs @@ -6,14 +6,19 @@ public class AtualizarCursoRequest { [Required(ErrorMessage = "O campo {0} é obrigatório.")] public Guid Id { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public string Nome { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public string DescricaoConteudo { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public int CargaHoraria { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public decimal Valor { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public bool Disponivel { get; set; } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/Identidade/RefreshTokenRequest.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/Identidade/RefreshTokenRequest.cs index 130a419..0d56d2e 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/Identidade/RefreshTokenRequest.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Models/Request/Identidade/RefreshTokenRequest.cs @@ -6,6 +6,5 @@ public class RefreshTokenRequest { [Required(ErrorMessage = "O campo {0} é obrigatório")] public string RefreshToken { get; set; } = string.Empty; - } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Program.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Program.cs index f064f43..968b4c0 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Program.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Program.cs @@ -23,4 +23,6 @@ app.Run(); -public partial class Program { } +public partial class Program +{ +} diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/AlunosService.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/AlunosService.cs index 4edc77e..2a220bc 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/AlunosService.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/AlunosService.cs @@ -9,12 +9,19 @@ namespace PlataformaEducacao.Bff.Api.Services public interface IAlunosService { Task Matricular(MatricularDTO solicitarMatricula); + Task ObterMatriculasPendentesPagamento(); + Task ObterMatriculasAtivas(); + Task ValidarCertificado(string codigoVerificacao); + Task RealizarAula(RealizarAulaDTO realizarAula); + Task FinalizarCurso(FinalizarCursoDTO finalizarCurso); + Task ObterHistorico(Guid alunoId); + Task BaixarCertificado(Guid certificadoId); } @@ -23,21 +30,22 @@ public class AlunosService : Service, IAlunosService private readonly HttpClient _httpClient; private readonly ICursosService _cursosService; - public AlunosService(HttpClient httpClient, - ICursosService cursosService, - IOptions settings) + public AlunosService( + HttpClient httpClient, + ICursosService cursosService, + IOptions settings) { _httpClient = httpClient; _cursosService = cursosService; _httpClient.BaseAddress = new Uri(settings.Value.GestaoAlunosUrl); } - public async Task Matricular(MatricularDTO matricular) + public async Task Matricular(MatricularDTO solicitarMatricula) { - if (DadosCursoPreenchidos(matricular) is false) + if (DadosCursoPreenchidos(solicitarMatricula) is false) { - var cursoResponse = await _cursosService.ObterCursoComAulasPorCursoId(matricular.CursoId); - if (cursoResponse.Sucesso is false || cursoResponse.Erros.Mensagens.Any()) + var cursoResponse = await _cursosService.ObterCursoComAulasPorCursoId(solicitarMatricula.CursoId); + if (cursoResponse.Sucesso is false || cursoResponse.Erros.Mensagens.Count != 0) { return cursoResponse; } @@ -82,12 +90,12 @@ public async Task Matricular(MatricularDTO matricular) }; } - matricular.NomeCurso = curso.Nome; - matricular.Valor = curso.Valor; - matricular.TotalAulasCurso = curso.Aulas.Count(); + solicitarMatricula.NomeCurso = curso.Nome; + solicitarMatricula.Valor = curso.Valor; + solicitarMatricula.TotalAulasCurso = curso.Aulas.Count(); } - var conteudoMatricular = ObterConteudo(matricular); + var conteudoMatricular = ObterConteudo(solicitarMatricula); var response = await _httpClient.PostAsync("/api/alunos/matricular", conteudoMatricular); return await DeserializarObjetoResponse(response); diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/CursosService.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/CursosService.cs index 3560ac2..e733f5a 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/CursosService.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/CursosService.cs @@ -8,14 +8,18 @@ namespace PlataformaEducacao.Bff.Api.Services public interface ICursosService { Task AdicionarCurso(AdicionarCursoRequest cursoRequest); + Task AtualizarCurso(Guid cursoId, AtualizarCursoRequest cursoRequest); + Task AdicionarAula(AdicionarAulaRequest aulaRequest); + Task ObterCursosDisponiveisComAula(); - Task ObterCursoComAulasPorCursoId(Guid cursoId); - Task ObterTodos(); + Task ObterCursoComAulasPorCursoId(Guid cursoId); + Task ObterTodos(); } + public class CursosService : Service, ICursosService { private readonly HttpClient _httpClient; diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/HealthCheckService.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/HealthCheckService.cs index 129d9a9..190d387 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/HealthCheckService.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/HealthCheckService.cs @@ -15,8 +15,9 @@ public class HealthCheckService : Service, IHealthCheckService private readonly HttpClient _httpClient; private readonly AppServicesSettings _settings; - public HealthCheckService(HttpClient httpClient, - IOptions settings) + public HealthCheckService( + HttpClient httpClient, + IOptions settings) { _httpClient = httpClient; _settings = settings.Value; diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/IdentidadeService.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/IdentidadeService.cs index 492acf4..dc917e2 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/IdentidadeService.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/IdentidadeService.cs @@ -8,7 +8,9 @@ namespace PlataformaEducacao.Bff.Api.Services public interface IIdentidadeService { Task RegistrarAluno(RegistroAlunoRequest aluno); + Task Login(LoginRequest login); + Task RefreshToken(RefreshTokenRequest refreshToken); } @@ -38,7 +40,6 @@ public async Task RegistrarAluno(RegistroAlunoRequest aluno) var response = await _httpClient.PostAsync("/api/identidade/novo-aluno/", alunoContent); return await DeserializarObjetoResponse(response); - } public async Task RefreshToken(RefreshTokenRequest refreshToken) @@ -48,7 +49,6 @@ public async Task RefreshToken(RefreshTokenRequest refreshToken) var response = await _httpClient.PostAsync("/api/identidade/refresh-token/", refreshTokenContent); return await DeserializarObjetoResponse(response); - } } } diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/PagamentoService.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/PagamentoService.cs index a38af31..fd66597 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/PagamentoService.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/PagamentoService.cs @@ -8,7 +8,9 @@ namespace PlataformaEducacao.Bff.Api.Services public interface IPagamentoService { Task PagarMatricula(PagarMatriculaDTO pagamento); + Task ObterStatus(Guid matriculaId); + Task HealthCheck(); } @@ -16,8 +18,9 @@ public class PagamentoService : Service, IPagamentoService { private readonly HttpClient _httpClient; - public PagamentoService(HttpClient httpClient, - IOptions settings) + public PagamentoService( + HttpClient httpClient, + IOptions settings) { _httpClient = httpClient; _httpClient.BaseAddress = new Uri(settings.Value.GestaoFinanceiraUrl); diff --git a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/Service.cs b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/Service.cs index 35b0c22..3af6529 100644 --- a/src/api-gateways/PlataformaEducacao.Bff.Api/Services/Service.cs +++ b/src/api-gateways/PlataformaEducacao.Bff.Api/Services/Service.cs @@ -1,6 +1,6 @@ -using PlataformaEducacao.Core.Communication; -using System.Text; +using System.Text; using System.Text.Json; +using PlataformaEducacao.Core.Communication; namespace PlataformaEducacao.Bff.Api.Services { @@ -15,6 +15,7 @@ protected StringContent ObterConteudo(object dado) Encoding.UTF8, "application/json"); } + protected async Task DeserializarObjetoResponse(HttpResponseMessage responseMessage) { var stringContent = await responseMessage.Content.ReadAsStringAsync(); @@ -30,7 +31,9 @@ protected async Task DeserializarObjetoResponse(HttpResponseMess return result; } } - catch (JsonException) { } + catch (JsonException) + { + } } return new ResponseResult @@ -59,22 +62,20 @@ protected async Task DeserializarObjetoResponse(HttpResponseMess return default; } - //protected async Task DeserializarObjetoResponse(HttpResponseMessage responseMessage) - //{ + // protected async Task DeserializarObjetoResponse(HttpResponseMessage responseMessage) + // { // var options = new JsonSerializerOptions // { // PropertyNameCaseInsensitive = true // }; - // return JsonSerializer.Deserialize(await responseMessage.Content.ReadAsStringAsync(), options); - //} + // } - //protected bool TratarErrosResponse(HttpResponseMessage response) - //{ + // protected bool TratarErrosResponse(HttpResponseMessage response) + // { // if (response.StatusCode == HttpStatusCode.BadRequest) return false; - // response.EnsureSuccessStatusCode(); // return true; - //} + // } } } diff --git a/src/building-blocks/PlataformaEducacao.Core/Communication/ResponseErrorMessages.cs b/src/building-blocks/PlataformaEducacao.Core/Communication/ResponseErrorMessages.cs new file mode 100644 index 0000000..9a0bbde --- /dev/null +++ b/src/building-blocks/PlataformaEducacao.Core/Communication/ResponseErrorMessages.cs @@ -0,0 +1,12 @@ +namespace PlataformaEducacao.Core.Communication +{ + public class ResponseErrorMessages + { + public ResponseErrorMessages() + { + Mensagens = new List(); + } + + public List Mensagens { get; set; } + } +} diff --git a/src/building-blocks/PlataformaEducacao.Core/Communication/ResponseResult.cs b/src/building-blocks/PlataformaEducacao.Core/Communication/ResponseResult.cs index 13803a6..0cec937 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Communication/ResponseResult.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Communication/ResponseResult.cs @@ -3,18 +3,11 @@ public class ResponseResult { public int Status { get; set; } + public bool Sucesso { get; set; } - public object? Data { get; set; } - public ResponseErrorMessages Erros { get; set; } = new(); - } - public class ResponseErrorMessages - { - public ResponseErrorMessages() - { - Mensagens = new List(); - } + public object? Data { get; set; } - public List Mensagens { get; set; } + public ResponseErrorMessages Erros { get; set; } = new(); } } diff --git a/src/building-blocks/PlataformaEducacao.Core/Data/IRepository.cs b/src/building-blocks/PlataformaEducacao.Core/Data/IRepository.cs index 22257b3..5e39986 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Data/IRepository.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Data/IRepository.cs @@ -2,8 +2,8 @@ namespace PlataformaEducacao.Core.Data { - - public interface IRepository : IDisposable where T : IAggregateRoot + public interface IRepository : IDisposable + where T : IAggregateRoot { IUnitOfWork UnitOfWork { get; } } diff --git a/src/building-blocks/PlataformaEducacao.Core/DomainObjects/DomainException.cs b/src/building-blocks/PlataformaEducacao.Core/DomainObjects/DomainException.cs index c7a782f..2e2d514 100644 --- a/src/building-blocks/PlataformaEducacao.Core/DomainObjects/DomainException.cs +++ b/src/building-blocks/PlataformaEducacao.Core/DomainObjects/DomainException.cs @@ -6,11 +6,13 @@ public DomainException() { } - public DomainException(string message) : base(message) + public DomainException(string message) + : base(message) { } - public DomainException(string message, Exception innerException) : base(message, innerException) + public DomainException(string message, Exception innerException) + : base(message, innerException) { } } diff --git a/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Email.cs b/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Email.cs index 505728d..591b270 100644 --- a/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Email.cs +++ b/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Email.cs @@ -6,21 +6,28 @@ public class Email { public const int EnderecoMaxLength = 254; public const int EnderecoMinLength = 5; - public string Endereco { get; private set; } = null!; - - //Construtor do EntityFramework - protected Email() { } public Email(string endereco) { - if (!Validar(endereco)) throw new DomainException("E-mail inválido"); + if (!Validar(endereco)) + { + throw new DomainException("E-mail inválido"); + } + Endereco = endereco; } + // Construtor do EntityFramework + protected Email() + { + } + + public string Endereco { get; private set; } = null!; + public static bool Validar(string email) { var regexEmail = new Regex(@"^(?("")("".+?""@)|(([0-9a-zA-Z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-zA-Z])@))(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-zA-Z][-\w]*[0-9a-zA-Z]\.)+[a-zA-Z]{2,6}))$"); return regexEmail.IsMatch(email); } } -} \ No newline at end of file +} diff --git a/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Entity.cs b/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Entity.cs index 79cbb20..5279ec7 100644 --- a/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Entity.cs +++ b/src/building-blocks/PlataformaEducacao.Core/DomainObjects/Entity.cs @@ -4,27 +4,42 @@ namespace PlataformaEducacao.Core.DomainObjects { public abstract class Entity { - public Guid Id { get; set; } + private List _notificacoes; protected Entity() { Id = Guid.NewGuid(); - _notificacoes = new List(); + _notificacoes = []; } - private List _notificacoes; - public IReadOnlyCollection Notificacoes => _notificacoes.AsReadOnly(); - public void AdicionarEvento(Event evento) + public Guid Id { get; set; } + + public static bool operator ==( + Entity? a, Entity? b) { - _notificacoes = _notificacoes ?? new List(); + if (ReferenceEquals(a, null) && ReferenceEquals(b, null)) + return true; + + if (ReferenceEquals(a, null) || ReferenceEquals(b, null)) + return false; + + return a.Equals(b); + } + + public IReadOnlyCollection Notificacoes => _notificacoes.AsReadOnly(); + + public void AdicionarEvento(Evento evento) + { + _notificacoes ??= []; _notificacoes.Add(evento); } + public void DefinirId(Guid id) { Id = id; } - public void RemoverEvento(Event eventItem) + public void RemoverEvento(Evento eventItem) { _notificacoes?.Remove(eventItem); } @@ -38,21 +53,17 @@ public override bool Equals(object? obj) { var compareTo = obj as Entity; - if (ReferenceEquals(this, compareTo)) return true; - if (ReferenceEquals(null, compareTo)) return false; - - return Id.Equals(compareTo.Id); - } - - public static bool operator ==(Entity? a, Entity? b) - { - if (ReferenceEquals(a, null) && ReferenceEquals(b, null)) + if (ReferenceEquals(this, compareTo)) + { return true; + } - if (ReferenceEquals(a, null) || ReferenceEquals(b, null)) + if (compareTo is null) + { return false; + } - return a.Equals(b); + return Id.Equals(compareTo.Id); } public static bool operator !=(Entity? a, Entity? b) @@ -69,6 +80,7 @@ public override string ToString() { return $"{GetType().Name} [Id={Id}]"; } + public virtual bool EhValido() { throw new NotImplementedException(); diff --git a/src/building-blocks/PlataformaEducacao.Core/Mediator/IMediatorHandler.cs b/src/building-blocks/PlataformaEducacao.Core/Mediator/IMediatorHandler.cs index 682a457..fb5048b 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Mediator/IMediatorHandler.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Mediator/IMediatorHandler.cs @@ -5,7 +5,10 @@ namespace PlataformaEducacao.Core.Mediator { public interface IMediatorHandler { - Task PublishEvent(T evento) where T : Event; - Task SendCommand(T comando) where T : Command; + Task PublishEvent(T evento) + where T : Evento; + + Task SendCommand(T comando) + where T : Command; } } diff --git a/src/building-blocks/PlataformaEducacao.Core/Mediator/MediatorHandler.cs b/src/building-blocks/PlataformaEducacao.Core/Mediator/MediatorHandler.cs index 133db75..230abe5 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Mediator/MediatorHandler.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Mediator/MediatorHandler.cs @@ -13,12 +13,14 @@ public MediatorHandler(IMediator mediator) _mediator = mediator; } - public async Task SendCommand(T comando) where T : Command + public async Task SendCommand(T comando) + where T : Command { return await _mediator.Send(comando); } - public async Task PublishEvent(T evento) where T : Event + public async Task PublishEvent(T evento) + where T : Evento { await _mediator.Publish(evento); } diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/Command.cs b/src/building-blocks/PlataformaEducacao.Core/Messages/Command.cs index 89376d6..e5935c7 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/Command.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/Command.cs @@ -6,6 +6,7 @@ namespace PlataformaEducacao.Core.Messages public abstract class Command : Message, IRequest { public DateTime Timestamp { get; private set; } + public ValidationResult ValidationResult { get; set; } = new(); protected Command() diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/CommandHandler.cs b/src/building-blocks/PlataformaEducacao.Core/Messages/CommandHandler.cs index 57c1bbf..66f1ca1 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/CommandHandler.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/CommandHandler.cs @@ -5,13 +5,14 @@ namespace PlataformaEducacao.Core.Messages { public abstract class CommandHandler { - protected ValidationResult ValidationResult; - protected CommandHandler() { ValidationResult = new ValidationResult(); } + // Expor o ValidationResult para classes derivadas + protected ValidationResult ValidationResult { get; } + protected void AdicionarErro(string mensagem) { ValidationResult.Errors.Add(new ValidationFailure(string.Empty, mensagem)); diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/Event .cs b/src/building-blocks/PlataformaEducacao.Core/Messages/Event .cs index c6c61e5..b461861 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/Event .cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/Event .cs @@ -2,9 +2,9 @@ namespace PlataformaEducacao.Core.Messages { - public class Event : Message, INotification + public class Evento : Message, INotification { - protected Event() + protected Evento() { Timestamp = DateTime.Now; } diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IniciaPagamentoIntegrationEvent.cs b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IniciaPagamentoIntegrationEvent.cs index f1ba0df..2899e61 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IniciaPagamentoIntegrationEvent.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IniciaPagamentoIntegrationEvent.cs @@ -16,12 +16,19 @@ public IniciaPagamentoIntegrationEvent(Guid matriculaId, Guid alunoId, decimal v } public Guid MatriculaId { get; private set; } + public Guid AlunoId { get; private set; } + public decimal Valor { get; private set; } + public int TipoPagamento { get; set; } + public string NomeCartao { get; private set; } + public string NumeroCartao { get; private set; } + public string ExpiracaoCartao { get; private set; } + public string CvvCartao { get; private set; } } } diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IntegrationEvent.cs b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IntegrationEvent.cs index 167a9dd..90602c0 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IntegrationEvent.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/IntegrationEvent.cs @@ -1,6 +1,6 @@ namespace PlataformaEducacao.Core.Messages.Integration { - public abstract class IntegrationEvent : Event + public abstract class IntegrationEvent : Evento { } } diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/ResponseMessage.cs b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/ResponseMessage.cs index 49cd86c..50cf7e4 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/ResponseMessage.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/ResponseMessage.cs @@ -4,11 +4,11 @@ namespace PlataformaEducacao.Core.Messages.Integration { public class ResponseMessage : Message { - public ValidationResult ValidationResult { get; set; } - public ResponseMessage(ValidationResult validationResult) { ValidationResult = validationResult; } + + public ValidationResult ValidationResult { get; set; } } } diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/UsuarioRegistradoIntegrationEvent.cs b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/UsuarioRegistradoIntegrationEvent.cs index 4a7d318..0c0f62c 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/UsuarioRegistradoIntegrationEvent.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/Integration/UsuarioRegistradoIntegrationEvent.cs @@ -11,7 +11,9 @@ public UsuarioRegistradoIntegrationEvent(Guid usuarioId, string nome, string ema } public Guid UsuarioId { get; private set; } + public string Nome { get; private set; } = string.Empty; + public string Email { get; private set; } = string.Empty; } } diff --git a/src/building-blocks/PlataformaEducacao.Core/Messages/Message.cs b/src/building-blocks/PlataformaEducacao.Core/Messages/Message.cs index 328c47c..8180775 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Messages/Message.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Messages/Message.cs @@ -8,6 +8,7 @@ protected Message() } public string MessageType { get; protected set; } + public Guid AggregateId { get; protected set; } } } diff --git a/src/building-blocks/PlataformaEducacao.Core/PlataformaEducacao.Core.csproj b/src/building-blocks/PlataformaEducacao.Core/PlataformaEducacao.Core.csproj index 9242cd4..cf7bd32 100644 --- a/src/building-blocks/PlataformaEducacao.Core/PlataformaEducacao.Core.csproj +++ b/src/building-blocks/PlataformaEducacao.Core/PlataformaEducacao.Core.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/building-blocks/PlataformaEducacao.Core/Utils/StringUtils.cs b/src/building-blocks/PlataformaEducacao.Core/Utils/StringUtils.cs index b6af80e..3b0f48b 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Utils/StringUtils.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Utils/StringUtils.cs @@ -7,4 +7,4 @@ public static string ApenasNumeros(this string str, string input) return new string(input.Where(c => char.IsDigit(c)).ToArray()); } } -} \ No newline at end of file +} diff --git a/src/building-blocks/PlataformaEducacao.Core/Validacoes.cs b/src/building-blocks/PlataformaEducacao.Core/Validacoes.cs index 7f0e09d..cc3ee80 100644 --- a/src/building-blocks/PlataformaEducacao.Core/Validacoes.cs +++ b/src/building-blocks/PlataformaEducacao.Core/Validacoes.cs @@ -6,7 +6,7 @@ public class Validacoes { public static void ValidarSeVazio(string? valor, string mensagem) { - if (String.IsNullOrWhiteSpace(valor)) + if (string.IsNullOrWhiteSpace(valor)) { throw new DomainException(mensagem); } diff --git a/src/building-blocks/PlataformaEducacao.MessageBus/DependencyInjectionExtensions.cs b/src/building-blocks/PlataformaEducacao.MessageBus/DependencyInjectionExtensions.cs index 8cad006..5cc495d 100644 --- a/src/building-blocks/PlataformaEducacao.MessageBus/DependencyInjectionExtensions.cs +++ b/src/building-blocks/PlataformaEducacao.MessageBus/DependencyInjectionExtensions.cs @@ -6,7 +6,8 @@ public static class DependencyInjectionExtensions { public static IServiceCollection AddMessageBus(this IServiceCollection services, string connection) { - if (string.IsNullOrEmpty(connection)) throw new ArgumentNullException(); + if (string.IsNullOrEmpty(connection)) + throw new ArgumentNullException(nameof(connection), "A conexão não pode ser nula ou vazia."); services.AddSingleton(new MessageBus(connection)); diff --git a/src/building-blocks/PlataformaEducacao.MessageBus/IMessageBus.cs b/src/building-blocks/PlataformaEducacao.MessageBus/IMessageBus.cs index 5c13204..8015e55 100644 --- a/src/building-blocks/PlataformaEducacao.MessageBus/IMessageBus.cs +++ b/src/building-blocks/PlataformaEducacao.MessageBus/IMessageBus.cs @@ -6,15 +6,20 @@ namespace PlataformaEducacao.MessageBus public interface IMessageBus : IDisposable { bool IsConnected { get; } + IAdvancedBus AdvancedBus { get; } - void Publish(T message) where T : IntegrationEvent; + void Publish(T message) + where T : IntegrationEvent; - Task PublishAsync(T message) where T : IntegrationEvent; + Task PublishAsync(T message) + where T : IntegrationEvent; - void Subscribe(string subscriptionId, Action onMessage) where T : class; + void Subscribe(string subscriptionId, Action onMessage) + where T : class; - void SubscribeAsync(string subscriptionId, Func onMessage) where T : class; + void SubscribeAsync(string subscriptionId, Func onMessage) + where T : class; TResponse Request(TRequest request) where TRequest : IntegrationEvent @@ -31,6 +36,5 @@ IDisposable Respond(Func responder) IDisposable RespondAsync(Func> responder) where TRequest : IntegrationEvent where TResponse : ResponseMessage; - } } diff --git a/src/building-blocks/PlataformaEducacao.MessageBus/MessageBus.cs b/src/building-blocks/PlataformaEducacao.MessageBus/MessageBus.cs index e45717c..289db8a 100644 --- a/src/building-blocks/PlataformaEducacao.MessageBus/MessageBus.cs +++ b/src/building-blocks/PlataformaEducacao.MessageBus/MessageBus.cs @@ -7,11 +7,10 @@ namespace PlataformaEducacao.MessageBus { public class MessageBus : IMessageBus { + private readonly string _connectionString; private IBus _bus = null!; private IAdvancedBus _advancedBus = null!; - private readonly string _connectionString; - public MessageBus(string connectionString) { _connectionString = connectionString; @@ -19,33 +18,39 @@ public MessageBus(string connectionString) } public bool IsConnected => _bus?.IsConnected ?? false; + public IAdvancedBus AdvancedBus => _bus?.Advanced!; - public void Publish(T message) where T : IntegrationEvent + public void Publish(T message) + where T : IntegrationEvent { TryConnect(); _bus.Publish(message); } - public async Task PublishAsync(T message) where T : IntegrationEvent + public async Task PublishAsync(T message) + where T : IntegrationEvent { TryConnect(); await _bus.PublishAsync(message); } - public void Subscribe(string subscriptionId, Action onMessage) where T : class + public void Subscribe(string subscriptionId, Action onMessage) + where T : class { TryConnect(); _bus.Subscribe(subscriptionId, onMessage); } - public void SubscribeAsync(string subscriptionId, Func onMessage) where T : class + public void SubscribeAsync(string subscriptionId, Func onMessage) + where T : class { TryConnect(); _bus.SubscribeAsync(subscriptionId, onMessage); } - public TResponse Request(TRequest request) where TRequest : IntegrationEvent + public TResponse Request(TRequest request) + where TRequest : IntegrationEvent where TResponse : ResponseMessage { TryConnect(); @@ -53,26 +58,34 @@ public TResponse Request(TRequest request) where TRequest : } public async Task RequestAsync(TRequest request) - where TRequest : IntegrationEvent where TResponse : ResponseMessage + where TRequest : IntegrationEvent + where TResponse : ResponseMessage { TryConnect(); return await _bus.RequestAsync(request); } public IDisposable Respond(Func responder) - where TRequest : IntegrationEvent where TResponse : ResponseMessage + where TRequest : IntegrationEvent + where TResponse : ResponseMessage { TryConnect(); return _bus.Respond(responder); } public IDisposable RespondAsync(Func> responder) - where TRequest : IntegrationEvent where TResponse : ResponseMessage + where TRequest : IntegrationEvent + where TResponse : ResponseMessage { TryConnect(); return _bus.RespondAsync(responder); } + public void Dispose() + { + _bus.Dispose(); + } + private void TryConnect() { if (IsConnected) return; @@ -98,10 +111,5 @@ private void OnDisconnect(object? s, EventArgs e) policy.Execute(TryConnect); } - - public void Dispose() - { - _bus.Dispose(); - } } } diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Controllers/MainController.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Controllers/MainController.cs index d05aa04..ea148ba 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Controllers/MainController.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Controllers/MainController.cs @@ -1,8 +1,8 @@ -using FluentValidation.Results; +using System.Net; +using FluentValidation.Results; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding; using PlataformaEducacao.Core.Communication; -using System.Net; namespace PlataformaEducacao.WebApi.Core.Controllers { @@ -91,4 +91,4 @@ protected void LimparErrosProcessamento() Errors.Clear(); } } -} \ No newline at end of file +} diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/CorsConfig.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/CorsConfig.cs index 9d5a304..08ceb51 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/CorsConfig.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/CorsConfig.cs @@ -12,7 +12,7 @@ public static IServiceCollection AddCorsConfiguration( var allowedOrigins = configuration .GetSection("Cors:AllowedOrigins") .Get() - ?? Array.Empty(); + ?? []; services.AddCors(options => { diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/LoggingConfig.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/LoggingConfig.cs index 1c7373d..cf6215c 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/LoggingConfig.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/LoggingConfig.cs @@ -7,52 +7,51 @@ using Serilog; using Serilog.Events; -namespace PlataformaEducacao.WebApi.Core.Extensions; - - -public static class LoggingConfig +namespace PlataformaEducacao.WebApi.Core.Extensions { - public static IHostBuilder AddLoggingConfiguration( - this IHostBuilder hostBuilder, - IConfiguration configuration, - string serviceName) + public static class LoggingConfig { - hostBuilder.UseSerilog((context, _, loggerConfig) => + public static IHostBuilder AddLoggingConfiguration( + this IHostBuilder hostBuilder, + IConfiguration configuration, + string serviceName) { - loggerConfig - .ReadFrom.Configuration(configuration) - .Enrich.FromLogContext() - .Enrich.WithMachineName() - .Enrich.WithProcessId() - .Enrich.WithThreadId() - .Enrich.WithProperty("Service", serviceName) - .Enrich.WithProperty("Application", serviceName); - - var minimumLevel = context.Configuration["Serilog:MinimumLevel:Default"]; - if (!string.IsNullOrWhiteSpace(minimumLevel) - && Enum.TryParse(minimumLevel, true, out LogEventLevel level)) + hostBuilder.UseSerilog((context, _, loggerConfig) => { - loggerConfig.MinimumLevel.Is(level); - } - }); - - return hostBuilder; - } - - public static IServiceCollection AddCorrelationIdConfiguration( - this IServiceCollection services, - IConfiguration configuration) - { - services.AddDefaultCorrelationId(); - services.Configure(configuration.GetSection("CorrelationIdOptions")); - return services; - } + loggerConfig + .ReadFrom.Configuration(configuration) + .Enrich.FromLogContext() + .Enrich.WithMachineName() + .Enrich.WithProcessId() + .Enrich.WithThreadId() + .Enrich.WithProperty("Service", serviceName) + .Enrich.WithProperty("Application", serviceName); + + var minimumLevel = context.Configuration["Serilog:MinimumLevel:Default"]; + if (!string.IsNullOrWhiteSpace(minimumLevel) + && Enum.TryParse(minimumLevel, true, out LogEventLevel level)) + { + loggerConfig.MinimumLevel.Is(level); + } + }); + + return hostBuilder; + } + + public static IServiceCollection AddCorrelationIdConfiguration( + this IServiceCollection services, + IConfiguration configuration) + { + services.AddDefaultCorrelationId(); + services.Configure(configuration.GetSection("CorrelationIdOptions")); + return services; + } - public static IApplicationBuilder UseLoggingConfiguration(this IApplicationBuilder app) - { - app.UseCorrelationId(); - app.UseSerilogRequestLogging(); - return app; + public static IApplicationBuilder UseLoggingConfiguration(this IApplicationBuilder app) + { + app.UseCorrelationId(); + app.UseSerilogRequestLogging(); + return app; + } } - -} \ No newline at end of file +} diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/PollyExtensions.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/PollyExtensions.cs index bd518b6..3964c7c 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/PollyExtensions.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/PollyExtensions.cs @@ -10,12 +10,12 @@ public static AsyncRetryPolicy EsperarTentar() { var retry = HttpPolicyExtensions .HandleTransientHttpError() - .WaitAndRetryAsync(new[] - { + .WaitAndRetryAsync( + [ TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10), - }); + ]); return retry; } diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/ResponseResultExtensions.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/ResponseResultExtensions.cs index 02da714..1a4d07c 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/ResponseResultExtensions.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Extensions/ResponseResultExtensions.cs @@ -2,15 +2,13 @@ { public static class ResponseResultExtensions { - //public static async Task> ToResponseResult(this HttpResponseMessage response) - //{ + // public static async Task> ToResponseResult(this HttpResponseMessage response) + // { // var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true }; - // if (response.IsSuccessStatusCode) // { // return await response.Content.ReadFromJsonAsync>(options); // } - // if (response.StatusCode == HttpStatusCode.BadRequest) // { // var problem = await response.Content.ReadFromJsonAsync(options); @@ -20,8 +18,7 @@ public static class ResponseResultExtensions // Erros = new ResponseErrorMessages { Mensagens = problem!.Errors.SelectMany(x => x.Value).ToList() } // }; // } - // return new ResponseResult { Sucesso = false }; - //} + // } } } diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/AppSettings.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/AppSettings.cs index 86c9726..4ad431e 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/AppSettings.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/AppSettings.cs @@ -3,9 +3,13 @@ public class AppSettings { public string Secret { get; set; } = string.Empty; + public int ExpiracaoHoras { get; set; } + public int ExpiracaoRefreshToken { get; set; } + public string Emissor { get; set; } = string.Empty; + public string ValidoEm { get; set; } = string.Empty; } } diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/ClaimsAuthorizeAttribute.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/ClaimsAuthorizeAttribute.cs new file mode 100644 index 0000000..3b7ac3a --- /dev/null +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/ClaimsAuthorizeAttribute.cs @@ -0,0 +1,16 @@ +using System.Security.Claims; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; + +namespace PlataformaEducacao.WebApi.Core.Identidade +{ + public class ClaimsAuthorizeAttribute : TypeFilterAttribute + { + public ClaimsAuthorizeAttribute(string claimName, string claimValue) + : base(typeof(RequisitoClaimFilter)) + { + Arguments = [new Claim(claimName, claimValue)]; + } + } +} diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/CustomAuthorize.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/CustomAuthorize.cs index d95dd89..c06fbf5 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/CustomAuthorize.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/CustomAuthorize.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.Http; +using System.Security.Claims; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using System.Security.Claims; namespace PlataformaEducacao.WebApi.Core.Identidade { @@ -12,38 +12,5 @@ public static bool ValidarClaimsUsuario(HttpContext context, string claimName, s return context.User.Identity!.IsAuthenticated && context.User.Claims.Any(c => c.Type == claimName && c.Value.Contains(claimValue)); } - - } - - public class ClaimsAuthorizeAttribute : TypeFilterAttribute - { - public ClaimsAuthorizeAttribute(string claimName, string claimValue) : base(typeof(RequisitoClaimFilter)) - { - Arguments = new object[] { new Claim(claimName, claimValue) }; - } - } - - public class RequisitoClaimFilter : IAuthorizationFilter - { - private readonly Claim _claim; - - public RequisitoClaimFilter(Claim claim) - { - _claim = claim; - } - - public void OnAuthorization(AuthorizationFilterContext context) - { - if (!context.HttpContext.User.Identity!.IsAuthenticated) - { - context.Result = new StatusCodeResult(401); - return; - } - - if (!CustomAuthorization.ValidarClaimsUsuario(context.HttpContext, _claim.Type, _claim.Value)) - { - context.Result = new StatusCodeResult(403); - } - } } } diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/JwtConfig.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/JwtConfig.cs index b0df23e..5a7d732 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/JwtConfig.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/JwtConfig.cs @@ -1,16 +1,16 @@ -using Microsoft.AspNetCore.Authentication.JwtBearer; +using System.Text; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using System.Text; namespace PlataformaEducacao.WebApi.Core.Identidade { public static class JwtConfig { - public static IServiceCollection AddJwtConfiguration(this IServiceCollection services, - IConfiguration configuration) + public static IServiceCollection AddJwtConfiguration( + this IServiceCollection services, IConfiguration configuration) { var appSettingsSection = configuration.GetSection("AppSettings"); services.Configure(appSettingsSection); diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/RequisitoClaimFilter.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/RequisitoClaimFilter.cs new file mode 100644 index 0000000..f3a7ae7 --- /dev/null +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Identidade/RequisitoClaimFilter.cs @@ -0,0 +1,31 @@ +using System.Security.Claims; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; + +namespace PlataformaEducacao.WebApi.Core.Identidade +{ + public class RequisitoClaimFilter : IAuthorizationFilter + { + private readonly Claim _claim; + + public RequisitoClaimFilter(Claim claim) + { + _claim = claim; + } + + public void OnAuthorization(AuthorizationFilterContext context) + { + if (!context.HttpContext.User.Identity!.IsAuthenticated) + { + context.Result = new StatusCodeResult(401); + return; + } + + if (!CustomAuthorization.ValidarClaimsUsuario(context.HttpContext, _claim.Type, _claim.Value)) + { + context.Result = new StatusCodeResult(403); + } + } + } +} diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/AspNetUser.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/AspNetUser.cs index 9576522..7b7e833 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/AspNetUser.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/AspNetUser.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNetCore.Http; -using System.Security.Claims; +using System.Security.Claims; +using Microsoft.AspNetCore.Http; namespace PlataformaEducacao.WebApi.Core.Usuario { @@ -21,17 +21,17 @@ public Guid ObterUserId() public string ObterUserEmail() { - return EstaAutenticado() ? _accessor.HttpContext!.User.GetUserEmail() : ""; + return EstaAutenticado() ? _accessor.HttpContext!.User.GetUserEmail() : string.Empty; } public string ObterUserToken() { - return EstaAutenticado() ? _accessor.HttpContext!.User.GetUserToken() : ""; + return EstaAutenticado() ? _accessor.HttpContext!.User.GetUserToken() : string.Empty; } public string ObterUserRefreshToken() { - return EstaAutenticado() ? _accessor.HttpContext!.User.GetUserRefreshToken() : ""; + return EstaAutenticado() ? _accessor.HttpContext!.User.GetUserRefreshToken() : string.Empty; } public bool EstaAutenticado() diff --git a/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/IAspNetUser.cs b/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/IAspNetUser.cs index 8254461..3ec86c1 100644 --- a/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/IAspNetUser.cs +++ b/src/building-blocks/PlataformaEducacao.WebApi.Core/Usuario/IAspNetUser.cs @@ -1,18 +1,26 @@ -using Microsoft.AspNetCore.Http; -using System.Security.Claims; +using System.Security.Claims; +using Microsoft.AspNetCore.Http; namespace PlataformaEducacao.WebApi.Core.Usuario { public interface IAspNetUser { string Name { get; } + Guid ObterUserId(); + string ObterUserEmail(); + string ObterUserToken(); + string ObterUserRefreshToken(); + bool EstaAutenticado(); + bool PossuiRole(string role); + IEnumerable ObterClaims(); + HttpContext ObterHttpContext(); } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/ApiConfig.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/ApiConfig.cs index bc1af1f..6d54fd2 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/ApiConfig.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/ApiConfig.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.HttpOverrides; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.HttpOverrides; using PlataformaEducacao.WebApi.Core.Extensions; using PlataformaEducacao.WebApi.Core.Identidade; -using System.Text.Json.Serialization; namespace PlataformaEducacao.GestaoAluno.Api.Configurations { @@ -21,6 +21,7 @@ public static IHostBuilder ConfigureAppSettings(this IHostBuilder host) return host; } + public static IServiceCollection AddApiConfiguration(this IServiceCollection services, IConfiguration configuration) { services.AddControllers() diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbContextConfig.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbContextConfig.cs index 2ddc1cd..65ae60f 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbContextConfig.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbContextConfig.cs @@ -23,6 +23,7 @@ public static IServiceCollection AddDbContextConfig(this IServiceCollection serv opt.EnableSensitiveDataLogging(); }); } + return services; } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbMigrationHelper.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbMigrationHelper.cs index a452e6a..719d845 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbMigrationHelper.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DbMigrationHelper.cs @@ -18,6 +18,7 @@ public static async Task EnsureSeedData(WebApplication application) var service = application.Services.CreateScope().ServiceProvider; await EnsureSeedData(service); } + public static async Task EnsureSeedData(IServiceProvider serviceProvider) { using var scope = serviceProvider.GetRequiredService().CreateScope(); @@ -30,28 +31,29 @@ public static async Task EnsureSeedData(IServiceProvider serviceProvider) await alunoContext.Database.EnsureCreatedAsync(); await SeedTablesGestaoAluno(alunoContext); } - else if (env.EnvironmentName == "Development" || env.EnvironmentName == "Docker") + else if (env.EnvironmentName is "Development" or "Docker") { await alunoContext.Database.MigrateAsync(); await SeedTablesGestaoAluno(alunoContext); } } + private static async Task SeedTablesGestaoAluno(GestaoAlunoContext alunoContext) { if (!alunoContext.Matriculas.Any()) { - Guid alunoUm = Guid.Parse("37e95975-6489-4323-8d2c-72cc91a5e3aa"); + var alunoUm = Guid.Parse("37e95975-6489-4323-8d2c-72cc91a5e3aa"); var aluno = new Aluno(alunoUm, "Aluno ", "aluno@teste.com"); - Guid cursoId = Guid.Parse("683C31AE-7DB1-4A89-B011-13076E794824"); + var cursoId = Guid.Parse("683C31AE-7DB1-4A89-B011-13076E794824"); var cursoNome = ".NET"; var matricula = new Matricula(cursoId, cursoNome, 5, 500); - Guid cursoCoreId = Guid.Parse("2194EB04-6C17-4379-8F07-C847C899466F"); + var cursoCoreId = Guid.Parse("2194EB04-6C17-4379-8F07-C847C899466F"); var cursoCoreNome = ".NET Core"; var matriculaCore = new Matricula(cursoCoreId, cursoCoreNome, 1, 500); - Guid cursoDominiosRicosId = Guid.Parse("12E04CBC-6ACF-4582-9345-C74B12C8183C"); + var cursoDominiosRicosId = Guid.Parse("12E04CBC-6ACF-4582-9345-C74B12C8183C"); var cursoDominiosRicosNome = "Dominios Ricos"; var matriculaDominiosRicos = new Matricula(cursoDominiosRicosId, cursoDominiosRicosNome, 1, 500); @@ -60,10 +62,10 @@ private static async Task SeedTablesGestaoAluno(GestaoAlunoContext alunoContext) aluno.RealizarMatricula(matriculaDominiosRicos); matricula.Ativar(); + // matriculaCore.Ativar(); // deixada pendente de pagamento, para já aparecer na listagem de pendentes matriculaDominiosRicos.Ativar(); - var progresso = new ProgressoAula(Guid.Parse("C862D7FB-341D-476F-A978-98CBD44C2D08")); matricula.RegistrarAula(progresso); progresso = new ProgressoAula(Guid.Parse("0E7EF4C0-4EB3-4C05-B61F-968D114C21DC")); diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DependencyInjectionConfig.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DependencyInjectionConfig.cs index a9823c4..7b55a4b 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DependencyInjectionConfig.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/DependencyInjectionConfig.cs @@ -21,12 +21,10 @@ public static class DependencyInjectionConfig { public static IServiceCollection RegisterServices(this IServiceCollection services) { - // Mediator services.AddMediatR( typeof(AdicionarAlunoCommand).Assembly, - typeof(AdicionarAlunoCommandHandler).Assembly - ); + typeof(AdicionarAlunoCommandHandler).Assembly); // API services.AddSingleton(); @@ -47,10 +45,10 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic services.AddScoped(); services.AddScoped(); - services.AddScoped, MatriculaEventHandler>(); - services.AddScoped, MatriculaEventHandler>(); + services.AddScoped, MatriculaNotificationHandler>(); + services.AddScoped, MatriculaNotificationHandler>(); return services; } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/MessageBusConfig.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/MessageBusConfig.cs index 4f41b4b..cdb0273 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/MessageBusConfig.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/MessageBusConfig.cs @@ -6,7 +6,8 @@ namespace PlataformaEducacao.GestaoAluno.Api.Configurations { public static class MessageBusConfig { - public static IServiceCollection AddMessageBusConfiguration(this IServiceCollection services, + public static IServiceCollection AddMessageBusConfiguration( + this IServiceCollection services, IConfiguration configuration) { services.AddMessageBus(configuration.GetMessageQueueConnection("MessageBus")) diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/SwaggerConfig.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/SwaggerConfig.cs index 10df5a9..46e05d4 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/SwaggerConfig.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Configurations/SwaggerConfig.cs @@ -32,11 +32,11 @@ public static IServiceCollection AddSwaggerConfiguration(this IServiceCollection { Reference = new OpenApiReference { - Type=ReferenceType.SecurityScheme, - Id="Bearer" + Type = ReferenceType.SecurityScheme, + Id = "Bearer" } }, - new string[]{} + Array.Empty() } }); }); @@ -52,7 +52,6 @@ public static IApplicationBuilder UseSwaggerConfiguration(this IApplicationBuild o.SwaggerEndpoint("/swagger/v1/swagger.json", "v1"); }); - return app; } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Controllers/AlunosController.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Controllers/AlunosController.cs index 71e0f88..52367d0 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Controllers/AlunosController.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Controllers/AlunosController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using System.Net; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using PlataformaEducacao.Core.Mediator; using PlataformaEducacao.GestaoAluno.Application.Commands.FinalizarCurso; @@ -9,7 +10,6 @@ using PlataformaEducacao.GestaoAluno.Application.Queries.ViewModels; using PlataformaEducacao.WebApi.Core.Controllers; using PlataformaEducacao.WebApi.Core.Usuario; -using System.Net; namespace PlataformaEducacao.GestaoAluno.Api.Controllers { @@ -20,9 +20,10 @@ public class AlunosController : MainController private readonly IAspNetUser _user; private readonly IMediatorHandler _mediatorHandler; - public AlunosController(IAlunoQueries alunoQueries, - IAspNetUser user, - IMediatorHandler mediatorHandler) + public AlunosController( + IAlunoQueries alunoQueries, + IAspNetUser user, + IMediatorHandler mediatorHandler) { _alunoQueries = alunoQueries; _user = user; @@ -97,6 +98,7 @@ public async Task BaixarCertificado(Guid certificadoId, Cancellati AdicionarErroProcessamento("Certificado não encontrado."); return CustomResponse(); } + return File(certificado.PdfBytes, certificado.ContentType, certificado.NomeArquivo); } @@ -121,7 +123,8 @@ public async Task> ObterHistoricoAluno(Gui AdicionarErroProcessamento("Histórico de aluno não encontrado."); return CustomResponse(); } + return CustomResponse(HttpStatusCode.OK, historicoAluno); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Program.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Program.cs index f61a6d8..ab84c94 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Program.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Program.cs @@ -1,7 +1,7 @@ -using QuestPDF.Infrastructure; using PlataformaEducacao.GestaoAluno.Api.Configurations; using PlataformaEducacao.WebApi.Core.Extensions; using PlataformaEducacao.WebApi.Core.Identidade; +using QuestPDF.Infrastructure; var builder = WebApplication.CreateBuilder(args); @@ -30,4 +30,6 @@ app.Run(); -public partial class Program { } +public partial class Program +{ +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Requests/MatricularRequest.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Requests/MatricularRequest.cs index 882793a..1249088 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Requests/MatricularRequest.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Api/Requests/MatricularRequest.cs @@ -6,10 +6,13 @@ public class MatricularRequest { [Required(ErrorMessage = "O curso é obrigatório.")] public Guid CursoId { get; set; } + [Required(ErrorMessage = "O nome do curso é obrigatório.")] public string NomeCurso { get; set; } = string.Empty; + [Required(ErrorMessage = "A quantidade de aulas do curso é obrigatório.")] public int QuantidadeAulasCurso { get; set; } + [Required(ErrorMessage = "O valor do curso é obrigatório.")] public decimal ValorCurso { get; set; } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommand.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommand.cs index ee76dc3..dc1d505 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommand.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommand.cs @@ -13,7 +13,9 @@ public AdicionarAlunoCommand(Guid usuarioId, string nome, string email) } public Guid UsuarioId { get; private set; } + public string Nome { get; private set; } + public string Email { get; private set; } public override bool EhValido() @@ -22,22 +24,4 @@ public override bool EhValido() return ValidationResult.IsValid; } } - - public class AdicionarAlunoCommandValidation : AbstractValidator - { - public AdicionarAlunoCommandValidation() - { - RuleFor(a => a.UsuarioId) - .NotEmpty() - .WithMessage("O id do usuário é obrigatório."); - - RuleFor(a => a.Nome) - .NotEmpty() - .WithMessage("O nome do aluno é obrigatório."); - - RuleFor(a => a.Email) - .NotEmpty() - .WithMessage("O e-mail do aluno é obrigatório."); - } - } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommandHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommandHandler.cs index 5e5899a..2ce09c0 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommandHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommandHandler.cs @@ -16,11 +16,11 @@ public AdicionarAlunoCommandHandler(IAlunoRepository alunoRepository) _alunoRepository = alunoRepository; } - public async Task Handle(AdicionarAlunoCommand message, CancellationToken cancellationToken) + public async Task Handle(AdicionarAlunoCommand request, CancellationToken cancellationToken) { - if (!message.EhValido()) return message.ValidationResult; + if (!request.EhValido()) return request.ValidationResult; - var aluno = new Aluno(message.UsuarioId, message.Nome, message.Email); + var aluno = new Aluno(request.UsuarioId, request.Nome, request.Email); await _alunoRepository.Inserir(aluno, cancellationToken); diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommandValidation.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommandValidation.cs new file mode 100644 index 0000000..75357e1 --- /dev/null +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/AdicionarAluno/AdicionarAlunoCommandValidation.cs @@ -0,0 +1,23 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoAluno.Application.Commands.AdicionarAluno +{ + public class AdicionarAlunoCommandValidation : AbstractValidator + { + public AdicionarAlunoCommandValidation() + { + RuleFor(a => a.UsuarioId) + .NotEmpty() + .WithMessage("O id do usuário é obrigatório."); + + RuleFor(a => a.Nome) + .NotEmpty() + .WithMessage("O nome do aluno é obrigatório."); + + RuleFor(a => a.Email) + .NotEmpty() + .WithMessage("O e-mail do aluno é obrigatório."); + } + } +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommand.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommand.cs index 13dd5b7..dee731c 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommand.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommand.cs @@ -18,14 +18,4 @@ public override bool EhValido() return ValidationResult.IsValid; } } - - public class FinalizarCursoCommandValidation : AbstractValidator - { - public FinalizarCursoCommandValidation() - { - RuleFor(c => c.MatriculaId) - .NotEqual(Guid.Empty) - .WithMessage("Id da matrícula inválido."); - } - } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommandHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommandHandler.cs index 2790b61..e4fc3cc 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommandHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommandHandler.cs @@ -16,20 +16,20 @@ public FinalizarCursoCommandHandler(IAlunoRepository alunoRepository) _alunoRepository = alunoRepository; } - public async Task Handle(FinalizarCursoCommand message, CancellationToken cancellationToken) + public async Task Handle(FinalizarCursoCommand request, CancellationToken cancellationToken) { - if (message.EhValido() is false) return message.ValidationResult; + if (request.EhValido() is false) return request.ValidationResult; - var matricula = await _alunoRepository.ObterMatriculaComProgressoAulasPorId(message.MatriculaId, cancellationToken); + var matricula = await _alunoRepository.ObterMatriculaComProgressoAulasPorId(request.MatriculaId, cancellationToken); if (matricula is null) { - AdicionarErro($"Matrícula {message.MatriculaId} não encontrada."); + AdicionarErro($"Matrícula {request.MatriculaId} não encontrada."); return ValidationResult; } if (matricula.EstaAtiva() is false) { - AdicionarErro($"Matrícula {message.MatriculaId} pendente de pagamento."); + AdicionarErro($"Matrícula {request.MatriculaId} pendente de pagamento."); return ValidationResult; } @@ -50,4 +50,4 @@ public async Task Handle(FinalizarCursoCommand message, Cancel return await PersistirDados(_alunoRepository.UnitOfWork); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommandValidation.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommandValidation.cs new file mode 100644 index 0000000..d45e9af --- /dev/null +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/FinalizarCurso/FinalizarCursoCommandValidation.cs @@ -0,0 +1,15 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoAluno.Application.Commands.FinalizarCurso +{ + public class FinalizarCursoCommandValidation : AbstractValidator + { + public FinalizarCursoCommandValidation() + { + RuleFor(c => c.MatriculaId) + .NotEqual(Guid.Empty) + .WithMessage("Id da matrícula inválido."); + } + } +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommand.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommand.cs index 8a5d28d..e49a024 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommand.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommand.cs @@ -12,14 +12,4 @@ public GerarCertificadoCommand(Guid matriculaId) MatriculaId = matriculaId; } } - - public class GerarCertificadoCommandValidation : AbstractValidator - { - public GerarCertificadoCommandValidation() - { - RuleFor(c => c.MatriculaId) - .NotEqual(Guid.Empty) - .WithMessage("Id da matrícula inválido."); - } - } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommandHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommandHandler.cs index eacc042..5f31a81 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommandHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommandHandler.cs @@ -14,9 +14,10 @@ public GerarCertificadoCommandHandler(IAlunoRepository alunoRepository) { _alunoRepository = alunoRepository; } - public async Task Handle(GerarCertificadoCommand message, CancellationToken cancellationToken) + + public async Task Handle(GerarCertificadoCommand request, CancellationToken cancellationToken) { - var matricula = await _alunoRepository.ObterMatriculaComCertificadoPorId(message.MatriculaId, cancellationToken); + var matricula = await _alunoRepository.ObterMatriculaComCertificadoPorId(request.MatriculaId, cancellationToken); matricula?.GerarCertificado(); await _alunoRepository.GerarCertificado(matricula!.Certificado!, cancellationToken); diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommandValidation.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommandValidation.cs new file mode 100644 index 0000000..1cc01cc --- /dev/null +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/GerarCertificado/GerarCertificadoCommandValidation.cs @@ -0,0 +1,15 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoAluno.Application.Commands.GerarCertificado +{ + public class GerarCertificadoCommandValidation : AbstractValidator + { + public GerarCertificadoCommandValidation() + { + RuleFor(c => c.MatriculaId) + .NotEqual(Guid.Empty) + .WithMessage("Id da matrícula inválido."); + } + } +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommand.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommand.cs index 7a4fe9c..d4b119c 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommand.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommand.cs @@ -6,9 +6,13 @@ namespace PlataformaEducacao.GestaoAluno.Application.Commands.MatricularAlunoCur public class MatricularAlunoCursoCommand : Command { public Guid CursoId { get; private set; } + public Guid AlunoId { get; private set; } + public string NomeCurso { get; private set; } + public decimal Valor { get; private set; } + public int TotalAulasCurso { get; private set; } public MatricularAlunoCursoCommand(Guid cursoId, Guid alunoId, string nomeCurso, int totalAulasCurso, decimal valor) @@ -31,30 +35,4 @@ public void VincularAluno(Guid guid) AlunoId = guid; } } - - public class MatricularAlunoCursoCommandValidation : AbstractValidator - { - public MatricularAlunoCursoCommandValidation() - { - RuleFor(a => a.AlunoId) - .NotEmpty() - .WithMessage("O id do aluno é obrigatório."); - - RuleFor(a => a.CursoId) - .NotEmpty() - .WithMessage("O id do curso é obrigatório."); - - RuleFor(a => a.NomeCurso) - .NotEmpty() - .WithMessage("O nome do curso é obrigatório."); - - RuleFor(c => c.Valor) - .GreaterThan(0) - .WithMessage("O valor do curso deve ser maior que 0."); - - RuleFor(a => a.TotalAulasCurso) - .GreaterThan(0) - .WithMessage("O número de aulas do curso é obrigatório."); - } - } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandler.cs index 1cea388..e4b4d83 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandler.cs @@ -16,18 +16,18 @@ public MatricularAlunoCursoCommandHandler(IAlunoRepository alunoRepository) _alunoRepository = alunoRepository; } - public async Task Handle(MatricularAlunoCursoCommand message, CancellationToken cancellationToken) + public async Task Handle(MatricularAlunoCursoCommand request, CancellationToken cancellationToken) { - if (message.EhValido() is false) return message.ValidationResult; + if (request.EhValido() is false) return request.ValidationResult; - var aluno = await _alunoRepository.ObterComMatriculasPorId(message.AlunoId, cancellationToken); + var aluno = await _alunoRepository.ObterComMatriculasPorId(request.AlunoId, cancellationToken); if (aluno is null) { AdicionarErro("Aluno não encontrado!"); return ValidationResult; } - var matricula = new Matricula(message.CursoId, message.NomeCurso, message.TotalAulasCurso, message.Valor); + var matricula = new Matricula(request.CursoId, request.NomeCurso, request.TotalAulasCurso, request.Valor); if (aluno.MatriculaExistente(matricula)) { AdicionarErro("Aluno já matriculado no curso!"); @@ -41,4 +41,4 @@ public async Task Handle(MatricularAlunoCursoCommand message, return await PersistirDados(_alunoRepository.UnitOfWork); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandValidation.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandValidation.cs new file mode 100644 index 0000000..2cdccf3 --- /dev/null +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandValidation.cs @@ -0,0 +1,31 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoAluno.Application.Commands.MatricularAlunoCurso +{ + public class MatricularAlunoCursoCommandValidation : AbstractValidator + { + public MatricularAlunoCursoCommandValidation() + { + RuleFor(a => a.AlunoId) + .NotEmpty() + .WithMessage("O id do aluno é obrigatório."); + + RuleFor(a => a.CursoId) + .NotEmpty() + .WithMessage("O id do curso é obrigatório."); + + RuleFor(a => a.NomeCurso) + .NotEmpty() + .WithMessage("O nome do curso é obrigatório."); + + RuleFor(c => c.Valor) + .GreaterThan(0) + .WithMessage("O valor do curso deve ser maior que 0."); + + RuleFor(a => a.TotalAulasCurso) + .GreaterThan(0) + .WithMessage("O número de aulas do curso é obrigatório."); + } + } +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommand.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommand.cs index 28eafc0..9c5bb04 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommand.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommand.cs @@ -6,7 +6,9 @@ namespace PlataformaEducacao.GestaoAluno.Application.Commands.RealizarAula public class RealizarAulaCommand : Command { public Guid MatriculaId { get; private set; } + public Guid CursoId { get; private set; } + public Guid AulaId { get; private set; } public RealizarAulaCommand(Guid matriculaId, Guid cursoId, Guid aulaId) @@ -22,22 +24,4 @@ public override bool EhValido() return ValidationResult.IsValid; } } - - public class RealizarAulaCommandValidation : AbstractValidator - { - public RealizarAulaCommandValidation() - { - RuleFor(c => c.AulaId) - .NotEqual(Guid.Empty) - .WithMessage("Id da aula inválido."); - - RuleFor(c => c.MatriculaId) - .NotEqual(Guid.Empty) - .WithMessage("Id da matrícula inválido."); - - RuleFor(c => c.CursoId) - .NotEqual(Guid.Empty) - .WithMessage("Id do curso inválido."); - } - } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommandHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommandHandler.cs index 6cf0177..28a26ae 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommandHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommandHandler.cs @@ -16,11 +16,11 @@ public RealizarAulaCommandHandler(IAlunoRepository alunoRepository) _alunoRepository = alunoRepository; } - public async Task Handle(RealizarAulaCommand message, CancellationToken cancellationToken) + public async Task Handle(RealizarAulaCommand request, CancellationToken cancellationToken) { - if (message.EhValido() is false) return message.ValidationResult; + if (request.EhValido() is false) return request.ValidationResult; - var matricula = await _alunoRepository.ObterMatriculaComProgressoAulasPorId(message.MatriculaId, cancellationToken); + var matricula = await _alunoRepository.ObterMatriculaComProgressoAulasPorId(request.MatriculaId, cancellationToken); if (matricula is null) { AdicionarErro("Matrícula não encontrada."); @@ -33,13 +33,13 @@ public async Task Handle(RealizarAulaCommand message, Cancella return ValidationResult; } - if (matricula.CursoId != message.CursoId) + if (matricula.CursoId != request.CursoId) { AdicionarErro("Essa aula não faz parte do curso dessa matrícula."); return ValidationResult; } - var progressoAula = new ProgressoAula(message.AulaId); + var progressoAula = new ProgressoAula(request.AulaId); if (matricula.AulaRealizada(progressoAula)) { AdicionarErro("Aula já realizada."); @@ -54,4 +54,4 @@ public async Task Handle(RealizarAulaCommand message, Cancella return await PersistirDados(_alunoRepository.UnitOfWork); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommandValidation.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommandValidation.cs new file mode 100644 index 0000000..aa96380 --- /dev/null +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Commands/RealizarAula/RealizarAulaCommandValidation.cs @@ -0,0 +1,23 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoAluno.Application.Commands.RealizarAula +{ + public class RealizarAulaCommandValidation : AbstractValidator + { + public RealizarAulaCommandValidation() + { + RuleFor(c => c.AulaId) + .NotEqual(Guid.Empty) + .WithMessage("Id da aula inválido."); + + RuleFor(c => c.MatriculaId) + .NotEqual(Guid.Empty) + .WithMessage("Id da matrícula inválido."); + + RuleFor(c => c.CursoId) + .NotEqual(Guid.Empty) + .WithMessage("Id do curso inválido."); + } + } +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/ArquivoDTO.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/ArquivoDTO.cs index 8baa788..929b96b 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/ArquivoDTO.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/ArquivoDTO.cs @@ -3,7 +3,9 @@ public class ArquivoDTO { public byte[] PdfBytes { get; set; } = null!; + public string ContentType { get; set; } = null!; + public string NomeArquivo { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/CertificadoDTO.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/CertificadoDTO.cs index 6e91416..7539631 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/CertificadoDTO.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/CertificadoDTO.cs @@ -6,13 +6,20 @@ public class CertificadoDTO(Guid certificadoId, string nomeAluno, string nomeCur string codigoVerificacao) { public Guid CertificadoId { get; set; } = certificadoId; + public string NomeAluno { get; set; } = nomeAluno; + public string NomeCurso { get; set; } = nomeCurso; + public DateTime DataConclusao { get; set; } = dataConclusao; + public string CodigoVerificacao { get; set; } = codigoVerificacao; - public static CertificadoDTO FromMatricula(Matricula m) => new(m.Certificado!.Id, - m.Aluno.Nome, m.NomeCurso, m.HistoricoAprendizado.DataConclusao!.Value, - m.Certificado!.CodigoVerificacao); + public static CertificadoDTO FromMatricula(Matricula m) => new( + m.Certificado!.Id, + m.Aluno.Nome, + m.NomeCurso, + m.HistoricoAprendizado.DataConclusao!.Value, + m.Certificado!.CodigoVerificacao); } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaAtivaDTO.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaAtivaDTO.cs index 0833b69..847bcf5 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaAtivaDTO.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaAtivaDTO.cs @@ -7,22 +7,42 @@ public class MatriculaAtivaDTO(Guid matriculaId, Guid alunoId, string? nomeAluno DateTime? dataConclusao, double progressoGeralCurso, Guid? certificadoId, string? codigoVerificacao) { public Guid MatriculaId { get; set; } = matriculaId; + public Guid AlunoId { get; set; } = alunoId; + public string NomeAluno { get; set; } = nomeAluno ?? string.Empty; + public Guid CursoId { get; set; } = cursoId; + public string NomeCurso { get; set; } = nomeCurso; + public DateTime DataMatricula { get; set; } = dataMatricula; + public int SituacaoMatricula { get; set; } = situacaoMatricula; + public int SituacaoCurso { get; set; } = situacaoCurso; + public DateTime? DataConclusao { get; set; } = dataConclusao; + public double ProgressoGeralCurso { get; set; } = progressoGeralCurso; + public Guid? CertificadoId { get; set; } = certificadoId; + public string? CodigoVerificacao { get; set; } = codigoVerificacao; public static MatriculaAtivaDTO FromMatricula(Matricula m) - => new(m.Id, m.AlunoId, m.Aluno.Nome, m.CursoId, m.NomeCurso, (int)m.SituacaoMatricula, - m.DataMatricula, (int)m.HistoricoAprendizado.SituacaoCurso, - m.HistoricoAprendizado.DataConclusao, m.HistoricoAprendizado.ProgressoGeralCurso, - m.Certificado?.Id, m.Certificado?.CodigoVerificacao); + => new( + m.Id, + m.AlunoId, + m.Aluno.Nome, + m.CursoId, + m.NomeCurso, + (int)m.SituacaoMatricula, + m.DataMatricula, + (int)m.HistoricoAprendizado.SituacaoCurso, + m.HistoricoAprendizado.DataConclusao, + m.HistoricoAprendizado.ProgressoGeralCurso, + m.Certificado?.Id, + m.Certificado?.CodigoVerificacao); } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaPendentePagamentoDTO.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaPendentePagamentoDTO.cs index c843da1..522ce3f 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaPendentePagamentoDTO.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/DTO/MatriculaPendentePagamentoDTO.cs @@ -6,13 +6,18 @@ public class MatriculaPendentePagamentoDTO(Guid matriculaId, Guid alunoId, strin Guid cursoId, string nomeCurso, DateTime dataMatricula) { public Guid MatriculaId { get; set; } = matriculaId; + public Guid AlunoId { get; set; } = alunoId; + public string NomeAluno { get; set; } = nomeAluno ?? string.Empty; + public Guid CursoId { get; set; } = cursoId; + public string NomeCurso { get; set; } = nomeCurso; + public DateTime DataMatricula { get; set; } = dataMatricula; public static MatriculaPendentePagamentoDTO FromMatricula(Matricula m) => new(m.Id, m.AlunoId, m.Aluno.Nome, m.CursoId, m.NomeCurso, m.DataMatricula); } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Events/MatriculaEventHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Events/MatriculaNotificationHandler.cs similarity index 69% rename from src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Events/MatriculaEventHandler.cs rename to src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Events/MatriculaNotificationHandler.cs index c4f9974..af96e89 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Events/MatriculaEventHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Events/MatriculaNotificationHandler.cs @@ -5,23 +5,25 @@ namespace PlataformaEducacao.GestaoAluno.Application.Events { - public class MatriculaEventHandler : + public class MatriculaNotificationHandler : INotificationHandler, INotificationHandler { private readonly IMediatorHandler _mediatorHandler; - public MatriculaEventHandler(IMediatorHandler mediatorHandler) + public MatriculaNotificationHandler(IMediatorHandler mediatorHandler) { _mediatorHandler = mediatorHandler; } - public async Task Handle(CursoFinalizadoEvent message, CancellationToken cancellationToken) + + public async Task Handle(CursoFinalizadoEvent notification, CancellationToken cancellationToken) { - await _mediatorHandler.SendCommand(new GerarCertificadoCommand(message.MatriculaId)); + await _mediatorHandler.SendCommand(new GerarCertificadoCommand(notification.MatriculaId)); } + public Task Handle(MatriculaAtivadaEvent notification, CancellationToken cancellationToken) { - //envio de email de boas vindas + // envio de email de boas vindas return Task.CompletedTask; } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/AlunoQueries.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/AlunoQueries.cs index 7d02493..152853b 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/AlunoQueries.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/AlunoQueries.cs @@ -16,11 +16,11 @@ public AlunoQueries(IAlunoRepository alunoRepository, ICertificadoService certif _certificadoService = certificadoService; } - public async Task> ListarMatriculasPendentesPagamentoPorAlunoId - (Guid alunoId, CancellationToken cancellationToken) + public async Task> ListarMatriculasPendentesPagamentoPorAlunoId( + Guid alunoId, CancellationToken cancellationToken) { - var matriculas = await _alunoRepository.ListarMatriculasPendentesPagamentoPorAlunoId - (alunoId, cancellationToken); + var matriculas = await _alunoRepository.ListarMatriculasPendentesPagamentoPorAlunoId( + alunoId, cancellationToken); return matriculas.Select(m => MatriculaPendentePagamentoDTO.FromMatricula(m)); } @@ -68,7 +68,7 @@ public async Task> ObterMatriculasAtivasPorAlunoI if (certificado is null) return null; - var certificadoArquivo = await _certificadoService.GerarCertificado(certificado!); + var certificadoArquivo = await _certificadoService.GerarCertificado(certificado); return new ArquivoDTO { @@ -85,4 +85,4 @@ public async Task> ObterMatriculasAtivasPorAlunoI return alunoComMatriculas is null ? null : HistoricoAlunoViewModel.FromAlunoComMatriculas(alunoComMatriculas); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/IAlunoQueries.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/IAlunoQueries.cs index fd2df58..a82a804 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/IAlunoQueries.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/IAlunoQueries.cs @@ -6,12 +6,19 @@ namespace PlataformaEducacao.GestaoAluno.Application.Queries public interface IAlunoQueries { Task ObterMatricula(Guid matriculaId, CancellationToken cancellationToken); + Task> ListarMatriculasPendentesPagamentoPorAlunoId(Guid alunoId, CancellationToken cancellationToken); + Task> ObterMatriculasAtivasPorAlunoId(Guid alunoId, CancellationToken cancellationToken); + Task> ObterAlunosMatriculadosPorCursoId(Guid cursoId, CancellationToken cancellationToken); + Task> ObterAlunosPendentesPorCursoId(Guid cursoId, CancellationToken cancellationToken); + Task ValidarCertificado(string codigoVerificacao, CancellationToken cancellationToken); + Task BaixarCertificado(Guid certificadoId, CancellationToken cancellationToken); + Task ObterHistoricoAluno(Guid alunoId, CancellationToken cancellationToken); } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/CursoConcluidoViewModel.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/CursoConcluidoViewModel.cs index 3902273..1d74a99 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/CursoConcluidoViewModel.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/CursoConcluidoViewModel.cs @@ -5,10 +5,12 @@ namespace PlataformaEducacao.GestaoAluno.Application.Queries.ViewModels public class CursoConcluidoViewModel { public string NomeCurso { get; set; } = string.Empty; + public DateTime DataMatricula { get; set; } + public DateTime? DataConclusao { get; set; } - public CursoConcluidoViewModel(String nomeCurso, DateTime dataMatricula, DateTime? dataConclusao) + public CursoConcluidoViewModel(string nomeCurso, DateTime dataMatricula, DateTime? dataConclusao) { NomeCurso = nomeCurso; DataMatricula = dataMatricula; @@ -21,4 +23,4 @@ public static CursoConcluidoViewModel FromMatricula(Matricula matricula) matricula.DataMatricula, matricula.HistoricoAprendizado.DataConclusao); } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/HistoricoAlunoViewModel.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/HistoricoAlunoViewModel.cs index fe0123c..76ee810 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/HistoricoAlunoViewModel.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/HistoricoAlunoViewModel.cs @@ -8,7 +8,7 @@ public class HistoricoAlunoViewModel public IEnumerable CursosConcluidos { get; set; } = new List(); - public HistoricoAlunoViewModel(String nomeAluno, IEnumerable cursosConcluidos) + public HistoricoAlunoViewModel(string nomeAluno, IEnumerable cursosConcluidos) { NomeAluno = nomeAluno; CursosConcluidos = cursosConcluidos; @@ -21,4 +21,4 @@ public static HistoricoAlunoViewModel FromAlunoComMatriculas(Aluno alunoComMatri .Where(m => m.HistoricoAprendizado.SituacaoCurso == SituacaoCurso.Concluido) .Select(m => CursoConcluidoViewModel.FromMatricula(m))); } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/MatriculaViewModel.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/MatriculaViewModel.cs index 2b1f1ad..38099cb 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/MatriculaViewModel.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Queries/ViewModels/MatriculaViewModel.cs @@ -21,16 +21,27 @@ public MatriculaViewModel(Guid matriculaId, Guid alunoId, string? nomeAluno, Gui } public Guid MatriculaId { get; set; } + public Guid AlunoId { get; set; } + public string NomeAluno { get; set; } = null!; + public Guid CursoId { get; set; } + public string NomeCurso { get; set; } = null!; + public SituacaoMatricula SituacaoMatricula { get; set; } + public SituacaoCurso SituacaoCurso { get; set; } + public DateTime? DataConclusao { get; set; } + public double ProgressoGeralCurso { get; set; } + public DateTime DataMatricula { get; set; } + public Guid? CertificadoId { get; set; } + public string? CodigoVerificacao { get; set; } public static MatriculaViewModel FromMatricula(Matricula matricula) @@ -46,7 +57,6 @@ public static MatriculaViewModel FromMatricula(Matricula matricula) matricula.HistoricoAprendizado.DataConclusao, matricula.HistoricoAprendizado.ProgressoGeralCurso, matricula.Certificado?.Id, - matricula.Certificado?.CodigoVerificacao - ); + matricula.Certificado?.CodigoVerificacao); } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/PagamentoMatriculaIntegrationHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/PagamentoMatriculaIntegrationHandler.cs index ebe7634..5e2fe39 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/PagamentoMatriculaIntegrationHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/PagamentoMatriculaIntegrationHandler.cs @@ -26,25 +26,25 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) private void SetSubscribers() { - _bus.SubscribeAsync("MatriculaRecusada", - async request => await RecusarMatricula(request)); + _bus.SubscribeAsync( + "MatriculaRecusada", async request => await RecusarMatricula(request)); - _bus.SubscribeAsync("MatriculaConfirmada", - async request => await FinalizarMatricula(request)); + _bus.SubscribeAsync( + "MatriculaConfirmada", async request => await FinalizarMatricula(request)); } private async Task RecusarMatricula(MatriculaPagamentoRecusadoIntegrationEvent message) { using var scope = _serviceProvider.CreateScope(); - var _alunoRepository = scope.ServiceProvider.GetRequiredService(); + var alunoRepository = scope.ServiceProvider.GetRequiredService(); - var matricula = await _alunoRepository.ObterMatriculaComAlunoPorId(message.MatriculaId, default) + var matricula = await alunoRepository.ObterMatriculaComAlunoPorId(message.MatriculaId, default) ?? throw new DomainException($"Matrícula {message.MatriculaId} não encontrada."); matricula.Aluno.RecusarPagamentoMatricula(matricula); - if (await _alunoRepository.UnitOfWork.Commit() is false) + if (await alunoRepository.UnitOfWork.Commit() is false) throw new DomainException($"Problemas ao cancelar a matrícula {message.MatriculaId}"); } @@ -52,15 +52,15 @@ private async Task FinalizarMatricula(MatriculaPagamentoRealizadoIntegrationEven { using var scope = _serviceProvider.CreateScope(); - var _alunoRepository = scope.ServiceProvider.GetRequiredService(); + var alunoRepository = scope.ServiceProvider.GetRequiredService(); - var matricula = await _alunoRepository.ObterMatriculaComAlunoPorId(message.MatriculaId, default) + var matricula = await alunoRepository.ObterMatriculaComAlunoPorId(message.MatriculaId, default) ?? throw new DomainException($"Matrícula {message.MatriculaId} não encontrada."); matricula.Aluno.ConcluirPagamentoMatricula(matricula); - if (await _alunoRepository.UnitOfWork.Commit() is false) + if (await alunoRepository.UnitOfWork.Commit() is false) throw new DomainException($"Problemas ao ativar a matricula {message.MatriculaId}"); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/RegistroAlunoIntegrationHandler.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/RegistroAlunoIntegrationHandler.cs index a7c7702..eb70c24 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/RegistroAlunoIntegrationHandler.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Application/Services/RegistroAlunoIntegrationHandler.cs @@ -19,6 +19,12 @@ public RegistroAlunoIntegrationHandler(IMessageBus bus, IServiceProvider service _serviceProvider = serviceProvider; } + protected override Task ExecuteAsync(CancellationToken stoppingToken) + { + SetResponder(); + return Task.CompletedTask; + } + private void SetResponder() { _bus.RespondAsync(async request => @@ -27,12 +33,6 @@ private void SetResponder() _bus.AdvancedBus.Connected += OnConnect!; } - protected override Task ExecuteAsync(CancellationToken stoppingToken) - { - SetResponder(); - return Task.CompletedTask; - } - private void OnConnect(object s, EventArgs e) { SetResponder(); @@ -52,4 +52,4 @@ private async Task RegistrarCliente(UsuarioRegistradoIntegratio return new ResponseMessage(sucesso); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContext.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContext.cs index ff0cbc4..b787bd8 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContext.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContext.cs @@ -16,10 +16,21 @@ public GestaoAlunoContext(DbContextOptions options, IMediato _mediatorHandler = rebusHandler ?? throw new ArgumentNullException(nameof(rebusHandler)); } - public DbSet Alunos { get; set; } - public DbSet Matriculas { get; set; } - public DbSet Certificados { get; set; } - public DbSet ProgressoAulas { get; set; } + public DbSet Alunos { get; set; } = default!; + + public DbSet Matriculas { get; set; } = default!; + + public DbSet Certificados { get; set; } = default!; + + public DbSet ProgressoAulas { get; set; } = default!; + + public async Task Commit() + { + var sucesso = await base.SaveChangesAsync() > 0; + if (sucesso) await _mediatorHandler.PublicarEventos(this); + + return sucesso; + } protected override void OnModelCreating(ModelBuilder modelBuilder) { @@ -28,19 +39,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.ApplyConfigurationsFromAssembly(typeof(GestaoAlunoContext).Assembly); - modelBuilder.Ignore(); + modelBuilder.Ignore(); foreach (var relationship in modelBuilder.Model.GetEntityTypes() .SelectMany(e => e.GetForeignKeys())) relationship.DeleteBehavior = DeleteBehavior.ClientCascade; base.OnModelCreating(modelBuilder); } - public async Task Commit() - { - var sucesso = await base.SaveChangesAsync() > 0; - if (sucesso) await _mediatorHandler.PublicarEventos(this); - - return sucesso; - } } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContextFactory.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContextFactory.cs index 48fb841..9fdb8a4 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContextFactory.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/GestaoAlunoContextFactory.cs @@ -1,27 +1,30 @@ +using FluentValidation.Results; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; -using FluentValidation.Results; using PlataformaEducacao.Core.Mediator; using PlataformaEducacao.Core.Messages; -namespace PlataformaEducacao.GestaoAluno.Data; - -public sealed class GestaoAlunoContextFactory : IDesignTimeDbContextFactory +namespace PlataformaEducacao.GestaoAluno.Data { - public GestaoAlunoContext CreateDbContext(string[] args) + public sealed class GestaoAlunoContextFactory : IDesignTimeDbContextFactory { - var options = new DbContextOptionsBuilder() - .UseSqlServer("Server=localhost,1433;Database=GestaoAluno;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") - .Options; + public GestaoAlunoContext CreateDbContext(string[] args) + { + var options = new DbContextOptionsBuilder() + .UseSqlServer("Server=localhost,1433;Database=GestaoAluno;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") + .Options; - return new GestaoAlunoContext(options, new DesignTimeMediatorHandler()); - } + return new GestaoAlunoContext(options, new DesignTimeMediatorHandler()); + } - private sealed class DesignTimeMediatorHandler : IMediatorHandler - { - public Task PublishEvent(T evento) where T : Event => Task.CompletedTask; + private sealed class DesignTimeMediatorHandler : IMediatorHandler + { + public Task PublishEvent(T evento) + where T : Evento => Task.CompletedTask; - public Task SendCommand(T comando) where T : Command => - Task.FromResult(new ValidationResult()); + public Task SendCommand(T comando) + where T : Command => + Task.FromResult(new ValidationResult()); + } } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Mappings/AlunoMapping.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Mappings/AlunoMapping.cs index 422ff9b..a0542ed 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Mappings/AlunoMapping.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Mappings/AlunoMapping.cs @@ -16,7 +16,6 @@ public void Configure(EntityTypeBuilder builder) builder.Property(a => a.Nome) .IsRequired(); - builder.OwnsOne(c => c.Email, tf => { tf.Property(c => c.Endereco) @@ -24,7 +23,6 @@ public void Configure(EntityTypeBuilder builder) .HasColumnName("Email") .HasColumnType($"varchar({Email.EnderecoMaxLength})"); }); - } } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260209203739_Initial.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260209203739_Initial.cs index a3e678d..beb3d7f 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260209203739_Initial.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260209203739_Initial.cs @@ -1,10 +1,12 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System.Diagnostics.CodeAnalysis; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable namespace PlataformaEducacao.GestaoAluno.Data.Migrations { /// + [ExcludeFromCodeCoverage] public partial class Initial : Migration { /// diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260702222349_SqlServerBaseline.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260702222349_SqlServerBaseline.cs index 7cd7fec..9bb1061 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260702222349_SqlServerBaseline.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/20260702222349_SqlServerBaseline.cs @@ -1,16 +1,19 @@ +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace PlataformaEducacao.GestaoAluno.Data.Migrations; - -public partial class SqlServerBaseline : Migration +namespace PlataformaEducacao.GestaoAluno.Data.Migrations { - protected override void Up(MigrationBuilder migrationBuilder) + [ExcludeFromCodeCoverage] + public partial class SqlServerBaseline : Migration { - } + protected override void Up(MigrationBuilder migrationBuilder) + { + } - protected override void Down(MigrationBuilder migrationBuilder) - { + protected override void Down(MigrationBuilder migrationBuilder) + { + } } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/GestaoAlunoContextModelSnapshot.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/GestaoAlunoContextModelSnapshot.cs index de592e4..9189c5c 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/GestaoAlunoContextModelSnapshot.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Migrations/GestaoAlunoContextModelSnapshot.cs @@ -1,5 +1,6 @@ // using System; +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -10,6 +11,7 @@ namespace PlataformaEducacao.GestaoAluno.Data.Migrations { + [ExcludeFromCodeCoverage] [DbContext(typeof(GestaoAlunoContext))] partial class GestaoAlunoContextModelSnapshot : ModelSnapshot { diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Repository/AlunoRepository.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Repository/AlunoRepository.cs index f9abaf3..fe08da2 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Repository/AlunoRepository.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Repository/AlunoRepository.cs @@ -20,10 +20,12 @@ public async Task Inserir(Aluno aluno, CancellationToken cancellationToken) { await _context.Alunos.AddAsync(aluno, cancellationToken); } + public Task AtualizarMatricula(Matricula matricula, CancellationToken cancellationToken) { return Task.FromResult(_context.Matriculas.Update(matricula)); } + public async Task AtualizarProgressoAula(ProgressoAula progressoAula, CancellationToken cancellationToken) { await _context.ProgressoAulas.AddAsync(progressoAula, cancellationToken); @@ -33,6 +35,7 @@ public async Task GerarCertificado(Certificado certificado, CancellationToken ca { await _context.Certificados.AddAsync(certificado, cancellationToken); } + public async Task> ListarMatriculasPendentesPagamentoPorAlunoId(Guid alunoId, CancellationToken cancellationToken) { return await _context.Matriculas @@ -54,6 +57,7 @@ public async Task> ObterAlunosMatriculadosPorCursoId(Guid m.CursoId == cursoId) .ToListAsync(cancellationToken); } + public async Task> ObterAlunosPendentesPorCursoId(Guid cursoId, CancellationToken cancellationToken) { return await _context.Matriculas @@ -88,6 +92,7 @@ public async Task> ObterAlunosPendentesPorCursoId(Guid cu .Include(m => m.ProgressoAulas) .FirstOrDefaultAsync(m => m.Id == matriculaId, cancellationToken); } + public async Task ObterMatriculaComCertificadoPorId(Guid matriculaId, CancellationToken cancellationToken) { return await _context.Matriculas @@ -111,6 +116,7 @@ public async Task RealizarMatricula(Matricula matricula, CancellationToken cance { await _context.Matriculas.AddAsync(matricula, cancellationToken); } + public async Task ObterCertificadoPorCodigoVerificacao(string codigoVerificacao, CancellationToken cancellationToken) { return await _context.Matriculas @@ -120,6 +126,7 @@ public async Task RealizarMatricula(Matricula matricula, CancellationToken cance .AsNoTracking() .FirstOrDefaultAsync(m => m.Certificado!.CodigoVerificacao == codigoVerificacao, cancellationToken); } + public async Task ObterCertificadoPorCertificadoId(Guid certificadoId, CancellationToken cancellationToken) { return await _context.Certificados @@ -130,9 +137,9 @@ public async Task RealizarMatricula(Matricula matricula, CancellationToken cance .AsNoTracking() .FirstOrDefaultAsync(c => c.Id == certificadoId, cancellationToken); } + public void Dispose() { - } } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Services/CertificadoService.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Services/CertificadoService.cs index a982998..ff2fb2f 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Services/CertificadoService.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Data/Services/CertificadoService.cs @@ -40,7 +40,7 @@ public async Task GerarCertificado(Certificado certificado) .Text(text => { text.Span("A Escola PlataformaEducacao certifica para os devidos fins que ").FontSize(18); - text.Span($"{certificado.Matricula.Aluno?.Nome?.ToUpper()}").Bold().FontSize(18); + text.Span($"{certificado.Matricula.Aluno?.Nome?.ToUpper(System.Globalization.CultureInfo.CurrentCulture)}").Bold().FontSize(18); text.Span($" concluiu o curso {certificado.Matricula.NomeCurso}").FontSize(18); text.Span($" na data {certificado.Matricula.HistoricoAprendizado?.DataConclusao:dd/MM/yyyy}.").FontSize(18); }); diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Aluno.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Aluno.cs index dae17a6..c01a952 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Aluno.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Aluno.cs @@ -6,15 +6,12 @@ namespace PlataformaEducacao.GestaoAluno.Domain public class Aluno : Entity, IAggregateRoot { public string Nome { get; private set; } = null!; + public Email Email { get; private set; } = null!; private readonly List _matriculas; - public IReadOnlyCollection Matriculas => _matriculas; - protected Aluno() - { - _matriculas = []; - } + public IReadOnlyCollection Matriculas => _matriculas; public Aluno(Guid alunoId, string nome, string email) { @@ -26,10 +23,9 @@ public Aluno(Guid alunoId, string nome, string email) Validar(); } - protected void Validar() + protected Aluno() { - Validacoes.ValidarSeVazio(Id, "O id do aluno é obrigatório."); - Validacoes.ValidarSeVazio(Nome, "O nome do aluno é obrigatório."); + _matriculas = []; } public void RealizarMatricula(Matricula matricula) @@ -65,5 +61,11 @@ public void ConcluirPagamentoMatricula(Matricula matricula) matricula.Ativar(); } + + protected void Validar() + { + Validacoes.ValidarSeVazio(Id, "O id do aluno é obrigatório."); + Validacoes.ValidarSeVazio(Nome, "O nome do aluno é obrigatório."); + } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Certificado.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Certificado.cs index 56d8d86..5d52c9c 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Certificado.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Certificado.cs @@ -6,10 +6,10 @@ namespace PlataformaEducacao.GestaoAluno.Domain public class Certificado : Entity { public Guid MatriculaId { get; private set; } + public string CodigoVerificacao { get; private set; } = null!; - public Matricula Matricula { get; private set; } = null!; - protected Certificado() { } + public Matricula Matricula { get; private set; } = null!; public Certificado(Guid matriculaId) { @@ -18,9 +18,8 @@ public Certificado(Guid matriculaId) Validar(); } - private void GerarCodigoValidacao() + protected Certificado() { - CodigoVerificacao = Guid.NewGuid().ToString(); } protected void Validar() @@ -29,6 +28,11 @@ protected void Validar() Validacoes.ValidarSeVazio(CodigoVerificacao, "O código de verificação é obrigatório."); } + private void GerarCodigoValidacao() + { + CodigoVerificacao = Guid.NewGuid().ToString(); + } + public static class CertificadoFactory { public static Certificado CriarCompleto(Matricula matricula, string codigoVerificacao) @@ -45,4 +49,4 @@ public static Certificado CriarCompleto(Matricula matricula, string codigoVerifi } } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/CursoFinalizadoEvent.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/CursoFinalizadoEvent.cs index f4a13c7..d3f4894 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/CursoFinalizadoEvent.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/CursoFinalizadoEvent.cs @@ -2,7 +2,7 @@ namespace PlataformaEducacao.GestaoAluno.Domain.Events { - public class CursoFinalizadoEvent : Event + public class CursoFinalizadoEvent : Evento { public Guid MatriculaId { get; private set; } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/MatriculaAtivadaEvent.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/MatriculaAtivadaEvent.cs index 19edf33..b04b425 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/MatriculaAtivadaEvent.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Events/MatriculaAtivadaEvent.cs @@ -2,7 +2,7 @@ namespace PlataformaEducacao.GestaoAluno.Domain.Events { - public class MatriculaAtivadaEvent : Event + public class MatriculaAtivadaEvent : Evento { public Guid MatriculaId { get; private set; } @@ -10,7 +10,6 @@ public MatriculaAtivadaEvent(Guid matriculaId) { AggregateId = matriculaId; MatriculaId = matriculaId; - } } } diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/HistoricoAprendizado.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/HistoricoAprendizado.cs index f891428..9661107 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/HistoricoAprendizado.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/HistoricoAprendizado.cs @@ -5,11 +5,16 @@ namespace PlataformaEducacao.GestaoAluno.Domain public class HistoricoAprendizado { public int TotalAulasCurso { get; private set; } + public double ProgressoGeralCurso { get; private set; } + public SituacaoCurso SituacaoCurso { get; private set; } + public DateTime? DataConclusao { get; private set; } - protected HistoricoAprendizado() { } + protected HistoricoAprendizado() + { + } public static class HistoricoAprendizadoFactory { @@ -61,4 +66,4 @@ protected void Validar() Validacoes.ValidarSeMenorOuIgualQue(valor: TotalAulasCurso, minimo: 0, "O número de aulas do curso deve ser maior que zero."); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Matricula.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Matricula.cs index a986476..5789307 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Matricula.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Matricula.cs @@ -7,22 +7,26 @@ namespace PlataformaEducacao.GestaoAluno.Domain public class Matricula : Entity { public Guid CursoId { get; private set; } + public string NomeCurso { get; private set; } = null!; + public decimal Valor { get; private set; } + public Guid AlunoId { get; private set; } + public DateTime DataMatricula { get; private set; } + public SituacaoMatricula SituacaoMatricula { get; private set; } + public HistoricoAprendizado HistoricoAprendizado { get; private set; } = null!; + public Aluno Aluno { get; private set; } = null!; + public Certificado? Certificado { get; private set; } private readonly List _progressoAulas; - public IReadOnlyCollection ProgressoAulas => _progressoAulas; - protected Matricula() - { - _progressoAulas = []; - } + public IReadOnlyCollection ProgressoAulas => _progressoAulas; public Matricula(Guid cursoId, string nomeCurso, int totalAulasCurso, decimal valor) { @@ -38,6 +42,11 @@ public Matricula(Guid cursoId, string nomeCurso, int totalAulasCurso, decimal va Validar(); } + protected Matricula() + { + _progressoAulas = []; + } + public void AssociarAluno(Guid alunoId) { AlunoId = alunoId; @@ -96,23 +105,13 @@ public void RegistrarAula(ProgressoAula progressoAula) AtualizaProgressoCurso(); } - private void AtualizaProgressoCurso() - { - var totalAulasCurso = HistoricoAprendizado.TotalAulasCurso; - int aulasConcluidas = _progressoAulas.Count; - - double novoProgresso = (double)aulasConcluidas / totalAulasCurso * 100; - - HistoricoAprendizado = HistoricoAprendizado.HistoricoAprendizadoFactory.CriarEmAndamento(totalAulasCurso, novoProgresso); - } - public void FinalizarCurso() { if (EstaAtiva() is false) throw new DomainException("Antes de finalizar curso é obrigatório realizar pagamento da matrícula."); - int aulasConcluidas = _progressoAulas.Count; - int totalAulasCurso = HistoricoAprendizado.TotalAulasCurso; + var aulasConcluidas = _progressoAulas.Count; + var totalAulasCurso = HistoricoAprendizado.TotalAulasCurso; if (HistoricoAprendizado.ProgressoGeralCurso < 100 || aulasConcluidas != totalAulasCurso) throw new DomainException("Para finalizar curso é necessário assistir todas as aulas."); @@ -120,7 +119,7 @@ public void FinalizarCurso() if (HistoricoAprendizado.SituacaoCurso == SituacaoCurso.Concluido) throw new DomainException("Curso já finalizado, não pode ser finalizado novamente."); - double progresso = HistoricoAprendizado.ProgressoGeralCurso; + var progresso = HistoricoAprendizado.ProgressoGeralCurso; HistoricoAprendizado = HistoricoAprendizado.HistoricoAprendizadoFactory.CriarFinalizado(totalAulasCurso, progresso); @@ -142,6 +141,16 @@ protected void Validar() Validacoes.ValidarSeMenorOuIgualQue(Valor, 0, "O valor do curso deve ser maior que zero."); } + private void AtualizaProgressoCurso() + { + var totalAulasCurso = HistoricoAprendizado.TotalAulasCurso; + var aulasConcluidas = _progressoAulas.Count; + + var novoProgresso = (double)aulasConcluidas / totalAulasCurso * 100; + + HistoricoAprendizado = HistoricoAprendizado.HistoricoAprendizadoFactory.CriarEmAndamento(totalAulasCurso, novoProgresso); + } + public static class MatriculaFactory { public static Matricula CriarComPagamentoAprovado(Guid cursoId, string nomeCurso, int totalAulasCurso, decimal valor, Aluno aluno) @@ -204,4 +213,4 @@ public static Matricula CriarComPagamentoEmProcessamento(Guid cursoId, string no } } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/ProgressoAula.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/ProgressoAula.cs index e48548e..2afa6e7 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/ProgressoAula.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/ProgressoAula.cs @@ -6,11 +6,12 @@ namespace PlataformaEducacao.GestaoAluno.Domain public class ProgressoAula : Entity { public Guid MatriculaId { get; private set; } + public Guid AulaId { get; private set; } + public DateTime DataConclusao { get; private set; } - public Matricula Matricula { get; private set; } = null!; - protected ProgressoAula() { } + public Matricula Matricula { get; private set; } = null!; public ProgressoAula(Guid aulaId) { @@ -20,10 +21,14 @@ public ProgressoAula(Guid aulaId) Validacoes.ValidarSeVazio(AulaId, "A aula não pode ser vazia."); } + protected ProgressoAula() + { + } + public void AssociarMatricula(Guid matriculaId) { MatriculaId = matriculaId; Validacoes.ValidarSeVazio(MatriculaId, "A matrícula não pode ser vazia."); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Repositories/IAlunoRepository.cs b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Repositories/IAlunoRepository.cs index 9d8f8fa..371cf1a 100644 --- a/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Repositories/IAlunoRepository.cs +++ b/src/services/GestaoAluno/PlataformaEducacao.GestaoAluno.Domain/Repositories/IAlunoRepository.cs @@ -5,19 +5,33 @@ namespace PlataformaEducacao.GestaoAluno.Domain.Repositories public interface IAlunoRepository : IRepository { Task Inserir(Aluno aluno, CancellationToken cancellationToken); + Task AtualizarMatricula(Matricula matricula, CancellationToken cancellationToken); + Task AtualizarProgressoAula(ProgressoAula progressoAula, CancellationToken cancellationToken); + Task ObterComMatriculasPorId(Guid alunoId, CancellationToken cancellationToken); + Task RealizarMatricula(Matricula matricula, CancellationToken cancellationToken); + Task ObterMatriculaComAlunoPorId(Guid matriculaId, CancellationToken cancellationToken); + Task ObterMatriculaComProgressoAulasPorId(Guid matriculaId, CancellationToken cancellationToken); + Task ObterMatriculaComCertificadoPorId(Guid matriculaId, CancellationToken cancellationToken); + Task> ListarMatriculasPendentesPagamentoPorAlunoId(Guid alunoId, CancellationToken cancellationToken); + Task> ObterAlunosMatriculadosPorCursoId(Guid cursoId, CancellationToken cancellationToken); + Task> ObterAlunosPendentesPorCursoId(Guid cursoId, CancellationToken cancellationToken); + Task> ObterMatriculasAtivasPorAlunoId(Guid alunoId, CancellationToken cancellationToken); + Task GerarCertificado(Certificado certificado, CancellationToken cancellationToken); + Task ObterCertificadoPorCodigoVerificacao(string codigoVerificacao, CancellationToken cancellationToken); + Task ObterCertificadoPorCertificadoId(Guid certificadoId, CancellationToken cancellationToken); } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/ApiConfig.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/ApiConfig.cs index 6b3b05d..61d9fdc 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/ApiConfig.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/ApiConfig.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.HttpOverrides; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.HttpOverrides; using PlataformaEducacao.WebApi.Core.Extensions; using PlataformaEducacao.WebApi.Core.Identidade; -using System.Text.Json.Serialization; namespace PlataformaEducacao.GestaoConteudo.Api.Configurations { @@ -21,6 +21,7 @@ public static IHostBuilder ConfigureAppSettings(this IHostBuilder host) return host; } + public static IServiceCollection AddApiConfiguration(this IServiceCollection services, IConfiguration configuration) { services.AddControllers() diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbContextConfig.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbContextConfig.cs index 57d35aa..9d9c5cc 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbContextConfig.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbContextConfig.cs @@ -23,6 +23,7 @@ public static IServiceCollection AddDbContextConfig(this IServiceCollection serv opt.EnableSensitiveDataLogging(); }); } + return services; } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbMigrationHelper.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbMigrationHelper.cs index 8ca30b3..ab6b1a7 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbMigrationHelper.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DbMigrationHelper.cs @@ -19,6 +19,7 @@ public static async Task EnsureSeedData(WebApplication application) var service = application.Services.CreateScope().ServiceProvider; await EnsureSeedData(service); } + public static async Task EnsureSeedData(IServiceProvider serviceProvider) { using var scope = serviceProvider.GetRequiredService().CreateScope(); @@ -31,7 +32,7 @@ public static async Task EnsureSeedData(IServiceProvider serviceProvider) await conteudoContext.Database.EnsureCreatedAsync(); await SeedTablesGestaoConteudo(conteudoContext); } - else if (env.EnvironmentName == "Development" || env.EnvironmentName == "Docker") + else if (env.EnvironmentName is "Development" or "Docker") { await conteudoContext.Database.MigrateAsync(); await SeedTablesGestaoConteudo(conteudoContext); @@ -69,21 +70,23 @@ private static async Task SeedTablesGestaoConteudo(GestaoConteudoContext conteud curso = new Curso(".NET Core", new ConteudoProgramatico("Conteudo do Curso de .NET Core", 30), 500, true); curso.DefinirId(Guid.Parse("2194EB04-6C17-4379-8F07-C847C899466F")); - for (int i = 1; i <= 1; i++) + for (var i = 1; i <= 1; i++) { var aula = new Aula($"Aula {i}", $"Conteudo da Aula {i}", i, $"Segue link dos materiais da aula {i}"); curso.AdicionarAula(aula); } + await conteudoContext.Cursos.AddAsync(curso); curso = new Curso("Dominios Ricos", new ConteudoProgramatico("Conteudo do Curso de Dominios Ricos", 30), 500, true); curso.DefinirId(Guid.Parse("12E04CBC-6ACF-4582-9345-C74B12C8183C")); - for (int i = 1; i <= 1; i++) + for (var i = 1; i <= 1; i++) { var aula = new Aula($"Aula {i}", $"Conteudo da Aula {i}", i, $"Segue link dos materiais da aula {i}"); aula.DefinirId(Guid.Parse("AB514ABA-7F82-4B3C-AB3E-3B311A516DE9")); curso.AdicionarAula(aula); } + await conteudoContext.Cursos.AddAsync(curso); await conteudoContext.SaveChangesAsync(); diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DependencyInjectionConfig.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DependencyInjectionConfig.cs index 70d73f0..29da1d0 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DependencyInjectionConfig.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/DependencyInjectionConfig.cs @@ -13,12 +13,10 @@ public static class DependencyInjectionConfig { public static IServiceCollection RegisterServices(this IServiceCollection services) { - // Mediator services.AddMediatR( typeof(AdicionarAulaCommand).Assembly, - typeof(CursoCommandHandler).Assembly - ); + typeof(CursoCommandHandler).Assembly); // API services.AddSingleton(); diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/SwaggerConfig.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/SwaggerConfig.cs index 29c221c..93727c3 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/SwaggerConfig.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Configurations/SwaggerConfig.cs @@ -32,11 +32,11 @@ public static IServiceCollection AddSwaggerConfiguration(this IServiceCollection { Reference = new OpenApiReference { - Type=ReferenceType.SecurityScheme, - Id="Bearer" + Type = ReferenceType.SecurityScheme, + Id = "Bearer" } }, - new string[]{} + Array.Empty() } }); }); @@ -52,7 +52,6 @@ public static IApplicationBuilder UseSwaggerConfiguration(this IApplicationBuild o.SwaggerEndpoint("/swagger/v1/swagger.json", "v1"); }); - return app; } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Controllers/CursosController.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Controllers/CursosController.cs index b813e04..ecf0a4a 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Controllers/CursosController.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Controllers/CursosController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using System.Net; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using PlataformaEducacao.Core.Mediator; using PlataformaEducacao.GestaoConteudo.Api.Requests; @@ -6,7 +7,6 @@ using PlataformaEducacao.GestaoConteudo.Application.Queries; using PlataformaEducacao.GestaoConteudo.Application.Queries.ViewModels; using PlataformaEducacao.WebApi.Core.Controllers; -using System.Net; namespace PlataformaEducacao.GestaoConteudo.Api.Controllers { @@ -15,12 +15,15 @@ public class CursosController : MainController { private readonly ICursoQueries _cursoQueries; private readonly IMediatorHandler _mediatorHandler; - public CursosController(ICursoQueries cursoQueries, - IMediatorHandler mediatorHandler) + + public CursosController( + ICursoQueries cursoQueries, + IMediatorHandler mediatorHandler) { _cursoQueries = cursoQueries; _mediatorHandler = mediatorHandler; } + [AllowAnonymous] [HttpGet("listar-cursos-disponiveis")] public async Task>> ListarCursosDisponiveisParaMatricula(CancellationToken cancellationToken) @@ -53,8 +56,8 @@ public async Task AdicionarCurso([FromBody] AdicionarCursoRequest { return CustomResponse(ModelState); } - var command = new AdicionarCursoCommand(request.Nome, request.DescricaoConteudo, request.CargaHoraria, request.Valor, request.Disponivel); + var command = new AdicionarCursoCommand(request.Nome, request.DescricaoConteudo, request.CargaHoraria, request.Valor, request.Disponivel); return CustomResponse(await _mediatorHandler.SendCommand(command)); } @@ -68,6 +71,7 @@ public async Task Atualizar(Guid id, [FromBody] AtualizarCursoReq AdicionarErroProcessamento("O id informado não é o mesmo que foi passado no body"); return CustomResponse(); } + if (!ModelState.IsValid) { return CustomResponse(ModelState); @@ -86,6 +90,7 @@ public async Task AdicionarAula([FromBody] AdicionarAulaRequest r { return CustomResponse(ModelState); } + var command = new AdicionarAulaCommand(request.Titulo, request.Conteudo, request.Ordem, request.Material, request.CursoId); return CustomResponse(await _mediatorHandler.SendCommand(command)); diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Program.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Program.cs index 449cb8f..d46a5f1 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Program.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Program.cs @@ -25,4 +25,6 @@ app.Run(); -public partial class Program { } +public partial class Program +{ +} diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarAulaRequest.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarAulaRequest.cs index 0e1bcef..6af77ad 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarAulaRequest.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarAulaRequest.cs @@ -6,12 +6,16 @@ public class AdicionarAulaRequest { [Required(ErrorMessage = "O campo {0} é obrigatório.")] public Guid CursoId { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public string Titulo { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public string Conteudo { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public int Ordem { get; set; } + public string? Material { get; set; } } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarCursoRequest.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarCursoRequest.cs index 9409971..4de34e8 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarCursoRequest.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AdicionarCursoRequest.cs @@ -1,5 +1,5 @@ -using PlataformaEducacao.WebApi.Core.Extensions; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using PlataformaEducacao.WebApi.Core.Extensions; namespace PlataformaEducacao.GestaoConteudo.Api.Requests { diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AtualizarCursoRequest.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AtualizarCursoRequest.cs index 20b69f7..f1f6c98 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AtualizarCursoRequest.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Api/Requests/AtualizarCursoRequest.cs @@ -6,14 +6,19 @@ public class AtualizarCursoRequest { [Required(ErrorMessage = "O campo {0} é obrigatório.")] public Guid Id { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public string Nome { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public string DescricaoConteudo { get; set; } = null!; + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public int CargaHoraria { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public decimal Valor { get; set; } + [Required(ErrorMessage = "O campo {0} é obrigatório.")] public bool Disponivel { get; set; } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarAulaCommand.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarAulaCommand.cs index ee5e9ef..79e326d 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarAulaCommand.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarAulaCommand.cs @@ -13,10 +13,15 @@ public AdicionarAulaCommand(string titulo, string conteudo, int ordem, string? m Material = material; CursoId = cursoId; } + public Guid CursoId { get; private set; } + public string Titulo { get; private set; } + public string Conteudo { get; private set; } + public int Ordem { get; private set; } + public string? Material { get; set; } public override bool EhValido() @@ -25,31 +30,4 @@ public override bool EhValido() return ValidationResult.IsValid; } } - - public class AdicionarAulaCommandValidation : AbstractValidator - { - public AdicionarAulaCommandValidation() - { - RuleFor(c => c.Titulo) - .NotEmpty() - .WithMessage("Título da aula é obrigatório.") - .MaximumLength(255) - .WithMessage("Título da aula deve ter no máximo 255 caracteres."); - - RuleFor(c => c.Conteudo) - .NotEmpty() - .WithMessage("O conteudo é obrigatório.") - .MaximumLength(1000) - .WithMessage("O conteudo deve ter no máximo 1000 caracteres."); - - RuleFor(c => c.Ordem) - .GreaterThan(0) - .WithMessage("A ordem da aula deve ser maior que 0."); - - RuleFor(c => c.CursoId) - .NotEmpty() - .WithMessage("Curso é obrigatório."); - - } - } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarAulaCommandValidation.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarAulaCommandValidation.cs new file mode 100644 index 0000000..73281c7 --- /dev/null +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarAulaCommandValidation.cs @@ -0,0 +1,31 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoConteudo.Application.Commands +{ + public class AdicionarAulaCommandValidation : AbstractValidator + { + public AdicionarAulaCommandValidation() + { + RuleFor(c => c.Titulo) + .NotEmpty() + .WithMessage("Título da aula é obrigatório.") + .MaximumLength(255) + .WithMessage("Título da aula deve ter no máximo 255 caracteres."); + + RuleFor(c => c.Conteudo) + .NotEmpty() + .WithMessage("O conteudo é obrigatório.") + .MaximumLength(1000) + .WithMessage("O conteudo deve ter no máximo 1000 caracteres."); + + RuleFor(c => c.Ordem) + .GreaterThan(0) + .WithMessage("A ordem da aula deve ser maior que 0."); + + RuleFor(c => c.CursoId) + .NotEmpty() + .WithMessage("Curso é obrigatório."); + } + } +} diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarCursoCommand.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarCursoCommand.cs index 1b21921..28986fd 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarCursoCommand.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarCursoCommand.cs @@ -15,9 +15,13 @@ public AdicionarCursoCommand(string nome, string descricaoConteudo, int cargaHor } public string Nome { get; private set; } + public string DescricaoConteudo { get; private set; } + public int CargaHoraria { get; private set; } + public decimal Valor { get; private set; } + public bool Disponivel { get; private set; } public override bool EhValido() @@ -26,29 +30,4 @@ public override bool EhValido() return ValidationResult.IsValid; } } - public class AdicionarCursoCommandValidation : AbstractValidator - { - public AdicionarCursoCommandValidation() - { - RuleFor(c => c.Nome) - .NotEmpty() - .WithMessage("Nome do curso é obrigatório.") - .MaximumLength(255) - .WithMessage("Nome do curso deve ter no máximo 255 caracteres."); - - RuleFor(c => c.DescricaoConteudo) - .NotEmpty() - .WithMessage("A descrição do conteudo programático é obrigatória.") - .MaximumLength(1000) - .WithMessage("A descrição do conteudo programático deve ter no máximo 1000 caracteres."); - - RuleFor(c => c.CargaHoraria) - .GreaterThan(0) - .WithMessage(c => "A carga horária do curso deve ser maior que 0."); - - RuleFor(c => c.Valor) - .GreaterThan(0) - .WithMessage("O valor do curso deve ser maior que 0."); - } - } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarCursoCommandValidation.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarCursoCommandValidation.cs new file mode 100644 index 0000000..9a7cf1d --- /dev/null +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AdicionarCursoCommandValidation.cs @@ -0,0 +1,31 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoConteudo.Application.Commands +{ + public class AdicionarCursoCommandValidation : AbstractValidator + { + public AdicionarCursoCommandValidation() + { + RuleFor(c => c.Nome) + .NotEmpty() + .WithMessage("Nome do curso é obrigatório.") + .MaximumLength(255) + .WithMessage("Nome do curso deve ter no máximo 255 caracteres."); + + RuleFor(c => c.DescricaoConteudo) + .NotEmpty() + .WithMessage("A descrição do conteudo programático é obrigatória.") + .MaximumLength(1000) + .WithMessage("A descrição do conteudo programático deve ter no máximo 1000 caracteres."); + + RuleFor(c => c.CargaHoraria) + .GreaterThan(0) + .WithMessage(c => "A carga horária do curso deve ser maior que 0."); + + RuleFor(c => c.Valor) + .GreaterThan(0) + .WithMessage("O valor do curso deve ser maior que 0."); + } + } +} diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AtualizarCursoCommand.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AtualizarCursoCommand.cs index db429d3..652fede 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AtualizarCursoCommand.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AtualizarCursoCommand.cs @@ -14,11 +14,17 @@ public AtualizarCursoCommand(Guid cursoId, string nome, string descricaoConteudo Valor = valor; Disponivel = disponivel; } + public Guid CursoId { get; private set; } + public string Nome { get; private set; } + public string DescricaoConteudo { get; private set; } + public int CargaHoraria { get; private set; } + public decimal Valor { get; private set; } + public bool Disponivel { get; private set; } public override bool EhValido() @@ -27,34 +33,4 @@ public override bool EhValido() return ValidationResult.IsValid; } } - - public class AtualizarCursoCommandValidation : AbstractValidator - { - public AtualizarCursoCommandValidation() - { - RuleFor(c => c.CursoId) - .NotEmpty() - .WithMessage("Id do curso é obrigatório."); - - RuleFor(c => c.Nome) - .NotEmpty() - .WithMessage("Nome do curso é obrigatório.") - .MaximumLength(255) - .WithMessage("Nome do curso deve ter no máximo 255 caracteres."); - - RuleFor(c => c.DescricaoConteudo) - .NotEmpty() - .WithMessage("A descrição do conteudo programático é obrigatória.") - .MaximumLength(255) - .WithMessage("A descrição do conteudo programático deve ter no máximo 1000 caracteres."); - - RuleFor(c => c.CargaHoraria) - .GreaterThan(0) - .WithMessage("A carga horária do curso deve ser maior que 0."); - - RuleFor(c => c.Valor) - .GreaterThan(0) - .WithMessage("O valor do curso deve ser maior que 0."); - } - } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AtualizarCursoCommandValidation.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AtualizarCursoCommandValidation.cs new file mode 100644 index 0000000..a9a99fe --- /dev/null +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/AtualizarCursoCommandValidation.cs @@ -0,0 +1,35 @@ +using FluentValidation; +using PlataformaEducacao.Core.Messages; + +namespace PlataformaEducacao.GestaoConteudo.Application.Commands +{ + public class AtualizarCursoCommandValidation : AbstractValidator + { + public AtualizarCursoCommandValidation() + { + RuleFor(c => c.CursoId) + .NotEmpty() + .WithMessage("Id do curso é obrigatório."); + + RuleFor(c => c.Nome) + .NotEmpty() + .WithMessage("Nome do curso é obrigatório.") + .MaximumLength(255) + .WithMessage("Nome do curso deve ter no máximo 255 caracteres."); + + RuleFor(c => c.DescricaoConteudo) + .NotEmpty() + .WithMessage("A descrição do conteudo programático é obrigatória.") + .MaximumLength(255) + .WithMessage("A descrição do conteudo programático deve ter no máximo 1000 caracteres."); + + RuleFor(c => c.CargaHoraria) + .GreaterThan(0) + .WithMessage("A carga horária do curso deve ser maior que 0."); + + RuleFor(c => c.Valor) + .GreaterThan(0) + .WithMessage("O valor do curso deve ser maior que 0."); + } + } +} diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/CursoCommandHandler.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/CursoCommandHandler.cs index 03d9960..6ed9381 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/CursoCommandHandler.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Commands/CursoCommandHandler.cs @@ -6,10 +6,8 @@ namespace PlataformaEducacao.GestaoConteudo.Application.Commands { - public class CursoCommandHandler : CommandHandler, - IRequestHandler, - IRequestHandler, - IRequestHandler + public class CursoCommandHandler : CommandHandler, IRequestHandler, + IRequestHandler, IRequestHandler { private readonly ICursoRepository _cursoRepository; @@ -18,31 +16,32 @@ public CursoCommandHandler(ICursoRepository cursoRepository) _cursoRepository = cursoRepository; } - public async Task Handle(AdicionarCursoCommand message, CancellationToken cancellationToken) + public async Task Handle(AdicionarCursoCommand request, CancellationToken cancellationToken) { - if (!message.EhValido()) return message.ValidationResult; + if (!request.EhValido()) return request.ValidationResult; - var curso = await _cursoRepository.ObterPorNome(message.Nome, cancellationToken); + var curso = await _cursoRepository.ObterPorNome(request.Nome, cancellationToken); if (curso is not null) { AdicionarErro("Já possui curso com esse nome!"); return ValidationResult; } - var conteudoProgramatico = new ConteudoProgramatico(message.DescricaoConteudo, message.CargaHoraria); - curso = new Curso(message.Nome, conteudoProgramatico, message.Valor, message.Disponivel); + var conteudoProgramatico = new ConteudoProgramatico(request.DescricaoConteudo, request.CargaHoraria); + + curso = new Curso(request.Nome, conteudoProgramatico, request.Valor, request.Disponivel); await _cursoRepository.Inserir(curso, cancellationToken); return await PersistirDados(_cursoRepository.UnitOfWork); } - public async Task Handle(AtualizarCursoCommand message, CancellationToken cancellationToken) + public async Task Handle(AtualizarCursoCommand request, CancellationToken cancellationToken) { - if (!message.EhValido()) return message.ValidationResult; + if (!request.EhValido()) return request.ValidationResult; - var cursoAtualizar = await _cursoRepository.ObterPorId(message.CursoId, cancellationToken); + var cursoAtualizar = await _cursoRepository.ObterPorId(request.CursoId, cancellationToken); if (cursoAtualizar is null) { @@ -50,17 +49,17 @@ public async Task Handle(AtualizarCursoCommand message, Cancel return ValidationResult; } - var curso = await _cursoRepository.ObterPorNome(message.Nome, cancellationToken); + var curso = await _cursoRepository.ObterPorNome(request.Nome, cancellationToken); if (curso is not null && curso.Id != cursoAtualizar.Id) { AdicionarErro("O nome do curso já existe!"); return ValidationResult; } - cursoAtualizar.AtualizarNome(message.Nome); - cursoAtualizar.AtualizarValor(message.Valor); - cursoAtualizar.AtualizarConteudoProgramatico(new ConteudoProgramatico(message.DescricaoConteudo, message.CargaHoraria)); - if (message.Disponivel) + cursoAtualizar.AtualizarNome(request.Nome); + cursoAtualizar.AtualizarValor(request.Valor); + cursoAtualizar.AtualizarConteudoProgramatico(new ConteudoProgramatico(request.DescricaoConteudo, request.CargaHoraria)); + if (request.Disponivel) { cursoAtualizar.TornarDisponivel(); } @@ -74,18 +73,19 @@ public async Task Handle(AtualizarCursoCommand message, Cancel return await PersistirDados(_cursoRepository.UnitOfWork); } - public async Task Handle(AdicionarAulaCommand message, CancellationToken cancellationToken) + public async Task Handle(AdicionarAulaCommand request, CancellationToken cancellationToken) { - if (!message.EhValido()) return message.ValidationResult; + if (!request.EhValido()) return request.ValidationResult; - var curso = await _cursoRepository.ObterComAulasPorId(message.CursoId, cancellationToken); + var curso = await _cursoRepository.ObterComAulasPorId(request.CursoId, cancellationToken); if (curso is null) { AdicionarErro("Curso não encontrado!"); return ValidationResult; } - var aula = new Aula(message.Titulo, message.Conteudo, message.Ordem, message.Material); + + var aula = new Aula(request.Titulo, request.Conteudo, request.Ordem, request.Material); if (curso.AulaExistente(aula)) { AdicionarErro("O curso já possui uma aula com esse titulo!"); diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/CursoQueries.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/CursoQueries.cs index a009c81..a12a092 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/CursoQueries.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/CursoQueries.cs @@ -38,17 +38,19 @@ public async Task> ObterAulasPorCursoId(Guid cursoId, var curso = await _cursoRepository.ObterComAulasPorId(cursoId, cancellationToken); if (curso is null) { - return Enumerable.Empty(); + return []; } return curso.Aulas.Select(AulaViewModel.FromAula); } + public async Task ObterCursoComAulasPorCursoId(Guid cursoId, CancellationToken cancellationToken) { var curso = await _cursoRepository.ObterComAulasPorId(cursoId, cancellationToken); return curso is null ? null : CursoViewModel.FromCurso(curso); } + public async Task ObterAulaPorCursoIdEAulaId(Guid cursoId, Guid aulaId, CancellationToken cancellationToken) { var aula = await _cursoRepository.ObterAulaPorCursoIdEAulaId(cursoId, aulaId, cancellationToken); diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ICursoQueries.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ICursoQueries.cs index 2242663..61e46dc 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ICursoQueries.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ICursoQueries.cs @@ -11,7 +11,9 @@ public interface ICursoQueries Task> ObterDisponiveisComAula(CancellationToken cancellationToken); Task> ObterAulasPorCursoId(Guid cursoId, CancellationToken cancellationToken); + Task ObterCursoComAulasPorCursoId(Guid cursoId, CancellationToken cancellationToken); + Task ObterAulaPorCursoIdEAulaId(Guid cursoId, Guid aulaId, CancellationToken cancellationToken); } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/AulaViewModel.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/AulaViewModel.cs index 788e913..21a6c41 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/AulaViewModel.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/AulaViewModel.cs @@ -15,10 +15,15 @@ public AulaViewModel(Guid id, Guid cursoId, string titulo, string conteudo, int } public Guid Id { get; set; } + public Guid CursoId { get; private set; } + public string Titulo { get; private set; } + public string Conteudo { get; private set; } + public int Ordem { get; private set; } + public string? Material { get; set; } public static AulaViewModel FromAula(Aula aula) @@ -28,7 +33,6 @@ public static AulaViewModel FromAula(Aula aula) aula.Titulo, aula.Conteudo, aula.Ordem, - aula.Material - ); + aula.Material); } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/CursoViewModel.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/CursoViewModel.cs index 21d2140..a21cd00 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/CursoViewModel.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Application/Queries/ViewModels/CursoViewModel.cs @@ -16,11 +16,17 @@ public CursoViewModel(Guid id, string nome, string descricaoConteudo, int cargaH } public Guid Id { get; set; } + public string Nome { get; set; } + public string DescricaoConteudo { get; set; } + public int CargaHoraria { get; set; } + public decimal Valor { get; set; } + public bool Disponivel { get; set; } + public IEnumerable Aulas { get; set; } = new List(); public static CursoViewModel FromCurso(Curso curso) @@ -31,8 +37,6 @@ public static CursoViewModel FromCurso(Curso curso) curso.ConteudoProgramatico.CargaHoraria, curso.Valor, curso.Disponivel, - curso.Aulas == null ? Enumerable.Empty() : curso.Aulas.OrderBy(a => a.Ordem).Select(AulaViewModel.FromAula) - - ); + curso.Aulas == null ? Enumerable.Empty() : curso.Aulas.OrderBy(a => a.Ordem).Select(AulaViewModel.FromAula)); } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContext.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContext.cs index e6355e8..d02ee14 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContext.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContext.cs @@ -5,10 +5,23 @@ namespace PlataformaEducacao.GestaoConteudo.Data { - public class GestaoConteudoContext(DbContextOptions options) : DbContext(options), IUnitOfWork + public class GestaoConteudoContext : DbContext, IUnitOfWork { - public DbSet Cursos { get; set; } - public DbSet Aulas { get; set; } + public GestaoConteudoContext(DbContextOptions options) + : base(options) + { + } + + public DbSet Cursos { get; set; } = default!; + + public DbSet Aulas { get; set; } = default!; + + public async Task Commit() + { + var isSuccess = await base.SaveChangesAsync() > 0; + + return isSuccess; + } protected override void OnModelCreating(ModelBuilder modelBuilder) { @@ -17,19 +30,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.ApplyConfigurationsFromAssembly(typeof(GestaoConteudoContext).Assembly); - modelBuilder.Ignore(); - //modelBuilder.Ignore(); + modelBuilder.Ignore(); + // modelBuilder.Ignore(); foreach (var relationship in modelBuilder.Model.GetEntityTypes() .SelectMany(e => e.GetForeignKeys())) relationship.DeleteBehavior = DeleteBehavior.ClientCascade; base.OnModelCreating(modelBuilder); } - public async Task Commit() - { - var isSuccess = await base.SaveChangesAsync() > 0; - - return isSuccess; - } } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContextFactory.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContextFactory.cs index 0c27528..6bdb049 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContextFactory.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/GestaoConteudoContextFactory.cs @@ -1,16 +1,17 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; -namespace PlataformaEducacao.GestaoConteudo.Data; - -public sealed class GestaoConteudoContextFactory : IDesignTimeDbContextFactory +namespace PlataformaEducacao.GestaoConteudo.Data { - public GestaoConteudoContext CreateDbContext(string[] args) + public sealed class GestaoConteudoContextFactory : IDesignTimeDbContextFactory { - var options = new DbContextOptionsBuilder() - .UseSqlServer("Server=localhost,1433;Database=GestaoConteudo;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") - .Options; + public GestaoConteudoContext CreateDbContext(string[] args) + { + var options = new DbContextOptionsBuilder() + .UseSqlServer("Server=localhost,1433;Database=GestaoConteudo;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") + .Options; - return new GestaoConteudoContext(options); + return new GestaoConteudoContext(options); + } } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260206121014_Initial.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260206121014_Initial.cs index e354052..190c37c 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260206121014_Initial.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260206121014_Initial.cs @@ -1,10 +1,12 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System.Diagnostics.CodeAnalysis; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable namespace PlataformaEducacao.GestaoConteudo.Data.Migrations { /// + [ExcludeFromCodeCoverage] public partial class Initial : Migration { /// diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260702222241_SqlServerBaseline.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260702222241_SqlServerBaseline.cs index eb304a0..e0f145e 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260702222241_SqlServerBaseline.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/20260702222241_SqlServerBaseline.cs @@ -1,16 +1,19 @@ +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace PlataformaEducacao.GestaoConteudo.Data.Migrations; - -public partial class SqlServerBaseline : Migration +namespace PlataformaEducacao.GestaoConteudo.Data.Migrations { - protected override void Up(MigrationBuilder migrationBuilder) + [ExcludeFromCodeCoverage] + public partial class SqlServerBaseline : Migration { - } + protected override void Up(MigrationBuilder migrationBuilder) + { + } - protected override void Down(MigrationBuilder migrationBuilder) - { + protected override void Down(MigrationBuilder migrationBuilder) + { + } } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/GestaoConteudoContextModelSnapshot.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/GestaoConteudoContextModelSnapshot.cs index 23702ff..408b8be 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/GestaoConteudoContextModelSnapshot.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Migrations/GestaoConteudoContextModelSnapshot.cs @@ -1,5 +1,6 @@ // using System; +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -10,6 +11,7 @@ namespace PlataformaEducacao.GestaoConteudo.Data.Migrations { + [ExcludeFromCodeCoverage] [DbContext(typeof(GestaoConteudoContext))] partial class GestaoConteudoContextModelSnapshot : ModelSnapshot { diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Repository/CursoRepository.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Repository/CursoRepository.cs index 107c73e..086491f 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Repository/CursoRepository.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Data/Repository/CursoRepository.cs @@ -14,6 +14,7 @@ public CursoRepository(GestaoConteudoContext context) } public IUnitOfWork UnitOfWork => _context; + public async Task Inserir(Curso curso, CancellationToken cancellationToken) { await _context.Cursos.AddAsync(curso, cancellationToken); @@ -23,12 +24,14 @@ public Task Atualizar(Curso curso, CancellationToken cancellationToken) { return Task.FromResult(_context.Cursos.Update(curso)); } + public async Task ObterPorId(Guid cursoId, CancellationToken cancellationToken) { return await _context.Cursos .AsNoTracking() .FirstOrDefaultAsync(c => c.Id == cursoId, cancellationToken); } + public async Task ObterAulaPorCursoIdEAulaId(Guid cursoId, Guid aulaId, CancellationToken cancellationToken) { return await _context.Aulas @@ -42,6 +45,7 @@ public Task Atualizar(Curso curso, CancellationToken cancellationToken) .AsNoTracking() .FirstOrDefaultAsync(c => c.Nome == nome, cancellationToken); } + public async Task> ObterTodos(CancellationToken cancellationToken) { return await _context.Cursos @@ -56,10 +60,12 @@ public async Task> ObterTodos(CancellationToken cancellationT .AsNoTracking() .FirstOrDefaultAsync(c => c.Id == cursoId, cancellationToken); } + public async Task InserirAula(Aula aula, CancellationToken cancellationToken) { await _context.Aulas.AddAsync(aula, cancellationToken); } + public async Task> ObterDisponiveisComAula(CancellationToken cancellationToken) { return await _context.Cursos @@ -68,9 +74,9 @@ public async Task> ObterDisponiveisComAula(CancellationToken .Where(c => c.Disponivel) .ToListAsync(cancellationToken); } + public void Dispose() { - } } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Aula.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Aula.cs index 85085ec..763d687 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Aula.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Aula.cs @@ -6,13 +6,17 @@ namespace PlataformaEducacao.GestaoConteudo.Domain public class Aula : Entity { public string Titulo { get; private set; } = null!; + public string Conteudo { get; private set; } = null!; + public int Ordem { get; private set; } + public string? Material { get; private set; } + public Guid CursoId { get; private set; } + public Curso Curso { get; private set; } = null!; - protected Aula() { } public Aula(string titulo, string conteudo, int ordem, string? material) { Titulo = titulo; @@ -22,6 +26,11 @@ public Aula(string titulo, string conteudo, int ordem, string? material) Validar(); } + + protected Aula() + { + } + public void VincularCurso(Guid cursoId) { CursoId = cursoId; diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Curso.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Curso.cs index c4e032b..ff6e33d 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Curso.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/Curso.cs @@ -6,19 +6,18 @@ namespace PlataformaEducacao.GestaoConteudo.Domain { public class Curso : Entity, IAggregateRoot { + private readonly List _aulas; + public string Nome { get; private set; } = null!; + public ConteudoProgramatico ConteudoProgramatico { get; private set; } = null!; + public decimal Valor { get; private set; } + public bool Disponivel { get; private set; } - private readonly List _aulas; public IReadOnlyCollection Aulas => _aulas; - protected Curso() - { - _aulas = new List(); - } - public Curso(string nome, ConteudoProgramatico conteudoProgramatico, decimal valor, bool disponivel) { Nome = nome; @@ -30,6 +29,11 @@ public Curso(string nome, ConteudoProgramatico conteudoProgramatico, decimal val Validar(); } + protected Curso() + { + _aulas = new List(); + } + public void AtualizarNome(string nome) { Nome = nome; @@ -48,6 +52,7 @@ public void TornarDisponivel() { Disponivel = true; } + public void TornarIndisponivel() { Disponivel = false; diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ICursoRepository.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ICursoRepository.cs index 1ebee74..b6be571 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ICursoRepository.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ICursoRepository.cs @@ -4,15 +4,22 @@ namespace PlataformaEducacao.GestaoConteudo.Domain { public interface ICursoRepository : IRepository { - public Task Inserir(Curso curso, CancellationToken cancellationToken); - public Task Atualizar(Curso curso, CancellationToken cancellationToken); + Task Inserir(Curso curso, CancellationToken cancellationToken); + + Task Atualizar(Curso curso, CancellationToken cancellationToken); + Task ObterPorId(Guid cursoId, CancellationToken cancellationToken); + Task ObterPorNome(string nome, CancellationToken cancellationToken); + Task ObterComAulasPorId(Guid cursoId, CancellationToken cancellationToken); - public Task InserirAula(Aula aula, CancellationToken cancellationToken); + + Task InserirAula(Aula aula, CancellationToken cancellationToken); + Task> ObterTodos(CancellationToken cancellationToken); + Task> ObterDisponiveisComAula(CancellationToken cancellationToken); - Task ObterAulaPorCursoIdEAulaId(Guid cursoId, Guid aulaId, CancellationToken cancellationToken); + Task ObterAulaPorCursoIdEAulaId(Guid cursoId, Guid aulaId, CancellationToken cancellationToken); } } diff --git a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ValueObjects/ConteudoProgramatico.cs b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ValueObjects/ConteudoProgramatico.cs index 14648eb..f183062 100644 --- a/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ValueObjects/ConteudoProgramatico.cs +++ b/src/services/GestaoConteudo/PlataformaEducacao.GestaoConteudo.Domain/ValueObjects/ConteudoProgramatico.cs @@ -1,14 +1,12 @@ - - -using PlataformaEducacao.Core; +using PlataformaEducacao.Core; namespace PlataformaEducacao.GestaoConteudo.Domain.ValueObjects { public class ConteudoProgramatico { public string Descricao { get; private set; } = null!; - public int CargaHoraria { get; private set; } + public int CargaHoraria { get; private set; } public ConteudoProgramatico(string descricao, int cargaHoraria) { diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/ApiConfig.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/ApiConfig.cs index 4ebd190..723e830 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/ApiConfig.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/ApiConfig.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.HttpOverrides; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.HttpOverrides; using PlataformaEducacao.WebApi.Core.Extensions; using PlataformaEducacao.WebApi.Core.Identidade; -using System.Text.Json.Serialization; namespace PlataformaEducacao.GestaoFinanceira.Api.Configuration { @@ -21,6 +21,7 @@ public static IHostBuilder ConfigureAppSettings(this IHostBuilder host) return host; } + public static IServiceCollection AddApiConfiguration(this IServiceCollection services, IConfiguration configuration) { services.AddControllers() @@ -43,7 +44,6 @@ public static IServiceCollection AddApiConfiguration(this IServiceCollection ser return services; } - public static void UseApiConfiguration(this IApplicationBuilder app, IWebHostEnvironment env) { if (env.IsDevelopment()) diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbContextConfig.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbContextConfig.cs index f9169bb..0b0ae33 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbContextConfig.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbContextConfig.cs @@ -23,6 +23,7 @@ public static IServiceCollection AddDbContextConfig(this IServiceCollection serv opt.EnableSensitiveDataLogging(); }); } + return services; } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbMigrationHelper.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbMigrationHelper.cs index 06bb88f..4443d2b 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbMigrationHelper.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/DbMigrationHelper.cs @@ -18,6 +18,7 @@ public static async Task EnsureSeedData(WebApplication application) var service = application.Services.CreateScope().ServiceProvider; await EnsureSeedData(service); } + public static async Task EnsureSeedData(IServiceProvider serviceProvider) { using var scope = serviceProvider.GetRequiredService().CreateScope(); @@ -30,13 +31,12 @@ public static async Task EnsureSeedData(IServiceProvider serviceProvider) await financeiroContext.Database.EnsureCreatedAsync(); await SeedTablesGestaoFinanceira(financeiroContext); } - else if (env.EnvironmentName == "Development" || env.EnvironmentName == "Docker") + else if (env.EnvironmentName is "Development" or "Docker") { await financeiroContext.Database.MigrateAsync(); await SeedTablesGestaoFinanceira(financeiroContext); } } - } private static async Task SeedTablesGestaoFinanceira(PagamentosContext pagamentosContext) @@ -52,22 +52,20 @@ private static async Task SeedTablesGestaoFinanceira(PagamentosContext pagamento TipoPagamento = TipoPagamento.CartaoCredito, Valor = valor, DadosCartao = new DadosCartao("Fulano de Tal", "4916573380937962", "12/28", "123") - }; pagamento.AdicionarTransacao(new Transacao { - CodigoAutorizacao = "", + CodigoAutorizacao = string.Empty, BandeiraCartao = "MasterCard", DataTransacao = DateTime.UtcNow, ValorTotal = valor, - CustoTransacao = valor * (decimal)0.03, + CustoTransacao = valor * 0.03M, Status = StatusTransacao.Pago, TID = GetGenericCode(), NSU = GetGenericCode() }); - await pagamentosContext.Pagamentos.AddAsync(pagamento); await pagamentosContext.SaveChangesAsync(); diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/MessageBusConfig.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/MessageBusConfig.cs index b11ec82..4ab548a 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/MessageBusConfig.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/MessageBusConfig.cs @@ -5,7 +5,8 @@ namespace PlataformaEducacao.GestaoFinanceira.Api.Configuration { public static class MessageBusConfig { - public static IServiceCollection AddMessageBusConfiguration(this IServiceCollection services, + public static IServiceCollection AddMessageBusConfiguration( + this IServiceCollection services, IConfiguration configuration) { services.AddMessageBus(configuration.GetMessageQueueConnection("MessageBus")); diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/SwaggerConfig.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/SwaggerConfig.cs index 975897e..40778d9 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/SwaggerConfig.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Configuration/SwaggerConfig.cs @@ -31,14 +31,13 @@ public static IServiceCollection AddSwaggerConfiguration(this IServiceCollection { Reference = new OpenApiReference { - Type=ReferenceType.SecurityScheme, - Id="Bearer" + Type = ReferenceType.SecurityScheme, + Id = "Bearer" } }, - new string[]{} + Array.Empty() } }); - }); return services; } @@ -51,7 +50,6 @@ public static IApplicationBuilder UseSwaggerConfiguration(this IApplicationBuild o.SwaggerEndpoint("/swagger/v1/swagger.json", "v1"); }); - return app; } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Controllers/PagamentoController.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Controllers/PagamentoController.cs index 617488c..bdf0d47 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Controllers/PagamentoController.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Controllers/PagamentoController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using System.Net; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using PlataformaEducacao.GestaoFinanceira.Api.Models.Requests; using PlataformaEducacao.GestaoFinanceira.Api.Models.Response; @@ -6,7 +7,6 @@ using PlataformaEducacao.GestaoFinanceira.Business.Models; using PlataformaEducacao.WebApi.Core.Controllers; using PlataformaEducacao.WebApi.Core.Usuario; -using System.Net; namespace PlataformaEducacao.GestaoFinanceira.Api.Controllers { @@ -43,8 +43,8 @@ public async Task PagarMatricula([FromBody] PagarMatriculaRequest if (ObterStatus(dadosPagamento.MatriculaId, cancellationToken).Result is OkObjectResult statusResult) { - var status = statusResult.Value as PagamentoStatusResponse; - if (status != null && (status.Status == "Pago" || status.Status == "Autorizado")) + if (statusResult.Value is PagamentoStatusResponse status && ( + status.Status == "Pago" || status.Status == "Autorizado")) { AdicionarErroProcessamento("Matrícula já está paga."); return CustomResponse(); @@ -71,10 +71,8 @@ public async Task PagarMatricula([FromBody] PagarMatriculaRequest } return CustomResponse(HttpStatusCode.OK, "Pagamento autorizado com sucesso"); - } - [HttpGet("{matriculaId:guid}/status")] [Authorize] public async Task ObterStatus(Guid matriculaId, CancellationToken cancellationToken) @@ -82,21 +80,10 @@ public async Task ObterStatus(Guid matriculaId, CancellationToken var usuarioId = _user.ObterUserId(); var isAdm = _user.PossuiRole("ADMIN"); - var result = await _pagamentoService.ObterStatusPorMatricula(matriculaId, usuarioId, isAdm); - - if (result == null) - { - result = new PagamentoStatusResponse - { - MatriculaId = matriculaId, - Status = "Pagamento Pendente" - }; - } - + var result = await _pagamentoService.ObterStatusPorMatricula(matriculaId, usuarioId, isAdm) + ?? new PagamentoStatusResponse { MatriculaId = matriculaId, Status = "Pagamento Pendente" }; return CustomResponse(HttpStatusCode.OK, result); } - - } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260327145756_Initial.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260327145756_Initial.cs index 99da3bf..7af32ed 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260327145756_Initial.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260327145756_Initial.cs @@ -1,10 +1,12 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System.Diagnostics.CodeAnalysis; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable namespace PlataformaEducacao.GestaoFinanceira.Api.Data.Migrations { /// + [ExcludeFromCodeCoverage] public partial class Initial : Migration { /// diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260330040241_Inclusao_AlunoId.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260330040241_Inclusao_AlunoId.cs index 9a90e84..60ab967 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260330040241_Inclusao_AlunoId.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260330040241_Inclusao_AlunoId.cs @@ -1,10 +1,12 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System.Diagnostics.CodeAnalysis; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable namespace PlataformaEducacao.GestaoFinanceira.Api.Data.Migrations { /// + [ExcludeFromCodeCoverage] public partial class Inclusao_AlunoId : Migration { /// diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260702222351_SqlServerBaseline.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260702222351_SqlServerBaseline.cs index f2ed944..40d769d 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260702222351_SqlServerBaseline.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/20260702222351_SqlServerBaseline.cs @@ -1,16 +1,19 @@ +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace PlataformaEducacao.GestaoFinanceira.Api.Data.Migrations; - -public partial class SqlServerBaseline : Migration +namespace PlataformaEducacao.GestaoFinanceira.Api.Data.Migrations { - protected override void Up(MigrationBuilder migrationBuilder) + [ExcludeFromCodeCoverage] + public partial class SqlServerBaseline : Migration { - } + protected override void Up(MigrationBuilder migrationBuilder) + { + } - protected override void Down(MigrationBuilder migrationBuilder) - { + protected override void Down(MigrationBuilder migrationBuilder) + { + } } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/PagamentosContextModelSnapshot.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/PagamentosContextModelSnapshot.cs index 5fd317b..efd049c 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/PagamentosContextModelSnapshot.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Migrations/PagamentosContextModelSnapshot.cs @@ -1,5 +1,6 @@ // using System; +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -10,6 +11,7 @@ namespace PlataformaEducacao.GestaoFinanceira.Api.Data.Migrations { + [ExcludeFromCodeCoverage] [DbContext(typeof(PagamentosContext))] partial class PagamentosContextModelSnapshot : ModelSnapshot { diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContext.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContext.cs index 7bbaaa2..565e462 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContext.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContext.cs @@ -15,13 +15,19 @@ public PagamentosContext(DbContextOptions options) ChangeTracker.AutoDetectChangesEnabled = false; } - public DbSet Pagamentos { get; set; } - public DbSet Transacoes { get; set; } + public DbSet Pagamentos { get; set; } = default!; + + public DbSet Transacoes { get; set; } = default!; + + public async Task Commit() + { + return await SaveChangesAsync() > 0; + } protected override void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); foreach (var property in modelBuilder.Model.GetEntityTypes().SelectMany( e => e.GetProperties().Where(p => p.ClrType == typeof(string)))) @@ -32,10 +38,5 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.ApplyConfigurationsFromAssembly(typeof(PagamentosContext).Assembly); } - - public async Task Commit() - { - return await SaveChangesAsync() > 0; - } } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContextFactory.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContextFactory.cs index 2e2b023..898f241 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContextFactory.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/PagamentosContextFactory.cs @@ -1,16 +1,17 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; -namespace PlataformaEducacao.GestaoFinanceira.Api.Data; - -public sealed class PagamentosContextFactory : IDesignTimeDbContextFactory +namespace PlataformaEducacao.GestaoFinanceira.Api.Data { - public PagamentosContext CreateDbContext(string[] args) + public sealed class PagamentosContextFactory : IDesignTimeDbContextFactory { - var options = new DbContextOptionsBuilder() - .UseSqlServer("Server=localhost,1433;Database=GestaoFinanceira;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") - .Options; + public PagamentosContext CreateDbContext(string[] args) + { + var options = new DbContextOptionsBuilder() + .UseSqlServer("Server=localhost,1433;Database=GestaoFinanceira;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") + .Options; - return new PagamentosContext(options); + return new PagamentosContext(options); + } } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Repository/PagamentoRepository.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Repository/PagamentoRepository.cs index 509311a..eb8b841 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Repository/PagamentoRepository.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Data/Repository/PagamentoRepository.cs @@ -4,7 +4,6 @@ namespace PlataformaEducacao.GestaoFinanceira.Api.Data.Repository { - public class PagamentoRepository : IPagamentoRepository { private readonly PagamentosContext _context; @@ -51,4 +50,4 @@ public void Dispose() _context.Dispose(); } } -} \ No newline at end of file +} diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Requests/PagarMatriculaRequest.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Requests/PagarMatriculaRequest.cs index 0349bd4..b87f1d2 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Requests/PagarMatriculaRequest.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Requests/PagarMatriculaRequest.cs @@ -6,18 +6,24 @@ public class PagarMatriculaRequest { [Required] public Guid MatriculaId { get; set; } + public Guid AlunoId { get; set; } + [Range(0.01, 9999999)] public decimal Valor { get; set; } + [Required] [StringLength(150)] public string NomeCartao { get; set; } = string.Empty; + [Required] [StringLength(19)] public string NumeroCartao { get; set; } = string.Empty; + [Required] [StringLength(7)] public string ExpiracaoCartao { get; set; } = string.Empty; + [Required] [StringLength(4)] public string CvvCartao { get; set; } = string.Empty; diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Response/PagamentoStatusResponse.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Response/PagamentoStatusResponse.cs index 3c2b9e8..8cd206e 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Response/PagamentoStatusResponse.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Models/Response/PagamentoStatusResponse.cs @@ -3,7 +3,7 @@ public class PagamentoStatusResponse { public Guid MatriculaId { get; set; } - public string Status { get; set; } = string.Empty; + public string Status { get; set; } = string.Empty; } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Program.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Program.cs index 13ca247..423f1fd 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Program.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Program.cs @@ -30,4 +30,6 @@ app.Run(); -public partial class Program { } +public partial class Program +{ +} diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/IPagamentoService.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/IPagamentoService.cs index 5007081..bb9d5ce 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/IPagamentoService.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/IPagamentoService.cs @@ -7,8 +7,11 @@ namespace PlataformaEducacao.GestaoFinanceira.Api.Services public interface IPagamentoService { Task AutorizarPagamento(Pagamento pagamento, CancellationToken cancellationToken); + Task CapturarPagamento(Guid pedidoId); + Task CancelarPagamento(Guid pedidoId); + Task ObterStatusPorMatricula(Guid matriculaId, Guid usuarioId, bool isAdm); } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/PagamentoService.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/PagamentoService.cs index a71e879..0e215ca 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/PagamentoService.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Api/Services/PagamentoService.cs @@ -14,9 +14,10 @@ public class PagamentoService : IPagamentoService private readonly IPagamentoRepository _pagamentoRepository; private readonly IMessageBus _bus; - public PagamentoService(IPagamentoCartaoCreditoFacade pagamentoFacade, - IPagamentoRepository pagamentoRepository, - IMessageBus bus) + public PagamentoService( + IPagamentoCartaoCreditoFacade pagamentoFacade, + IPagamentoRepository pagamentoRepository, + IMessageBus bus) { _pagamentoFacade = pagamentoFacade; _pagamentoRepository = pagamentoRepository; @@ -30,9 +31,9 @@ public async Task AutorizarPagamento(Pagamento pagamento, Cance if (transacao.Status != StatusTransacao.Autorizado) { - - validationResult.Errors.Add(new ValidationFailure("Pagamento", - "Pagamento recusado, entre em contato com a sua operadora de cartão")); + validationResult.Errors.Add(new ValidationFailure( + "Pagamento", + "Pagamento recusado, entre em contato com a sua operadora de cartão")); await _bus.PublishAsync(new MatriculaPagamentoRecusadoIntegrationEvent(pagamento.MatriculaId)); @@ -44,7 +45,9 @@ public async Task AutorizarPagamento(Pagamento pagamento, Cance if (!await _pagamentoRepository.UnitOfWork.Commit()) { - validationResult.Errors.Add(new ValidationFailure("Pagamento", "Houve um erro ao realizar o pagamento.")); + validationResult.Errors.Add(new ValidationFailure( + "Pagamento", + "Houve um erro ao realizar o pagamento.")); // Cancelar pagamento no gateway await CancelarPagamento(pagamento.MatriculaId); @@ -58,7 +61,9 @@ public async Task AutorizarPagamento(Pagamento pagamento, Cance } catch (Exception) { - validationResult.Errors.Add(new ValidationFailure("Pagamento", "Pagamento autorizado, mas houve falha ao notificar os demais serviços.")); + validationResult.Errors.Add(new ValidationFailure( + "Pagamento", + "Pagamento autorizado, mas houve falha ao notificar os demais serviços.")); // Cancelar pagamento no gateway await CancelarPagamento(pagamento.MatriculaId); @@ -69,20 +74,21 @@ public async Task AutorizarPagamento(Pagamento pagamento, Cance return new ResponseMessage(validationResult); } - public async Task CapturarPagamento(Guid matriculaId) + public async Task CapturarPagamento(Guid pedidoId) { - var transacoes = await _pagamentoRepository.ObterTransacoesPorMatriculaId(matriculaId); + var transacoes = await _pagamentoRepository.ObterTransacoesPorMatriculaId(pedidoId); var transacaoAutorizada = transacoes?.FirstOrDefault(t => t.Status == StatusTransacao.Autorizado); var validationResult = new ValidationResult(); - if (transacaoAutorizada == null) throw new DomainException($"Transação não encontrada para a matricula {matriculaId}"); + if (transacaoAutorizada == null) throw new DomainException($"Transação não encontrada para a matricula {pedidoId}"); var transacao = await _pagamentoFacade.CapturarPagamento(transacaoAutorizada); if (transacao.Status != StatusTransacao.Pago) { - validationResult.Errors.Add(new ValidationFailure("Pagamento", - $"Não foi possível capturar o pagamento da matricula {matriculaId}")); + validationResult.Errors.Add(new ValidationFailure( + "Pagamento", + $"Não foi possível capturar o pagamento da matricula {pedidoId}")); return new ResponseMessage(validationResult); } @@ -92,8 +98,9 @@ public async Task CapturarPagamento(Guid matriculaId) if (!await _pagamentoRepository.UnitOfWork.Commit()) { - validationResult.Errors.Add(new ValidationFailure("Pagamento", - $"Não foi possível persistir a captura do pagamento da matricula {matriculaId}")); + validationResult.Errors.Add(new ValidationFailure( + "Pagamento", + $"Não foi possível persistir a captura do pagamento da matricula {pedidoId}")); return new ResponseMessage(validationResult); } @@ -101,20 +108,22 @@ public async Task CapturarPagamento(Guid matriculaId) return new ResponseMessage(validationResult); } - public async Task CancelarPagamento(Guid matriculaId) + public async Task CancelarPagamento(Guid pedidoId) { - var transacoes = await _pagamentoRepository.ObterTransacoesPorMatriculaId(matriculaId); + var transacoes = await _pagamentoRepository.ObterTransacoesPorMatriculaId(pedidoId); var transacaoAutorizada = transacoes?.FirstOrDefault(t => t.Status == StatusTransacao.Autorizado); var validationResult = new ValidationResult(); - if (transacaoAutorizada == null) throw new DomainException($"Transação não encontrada para a matricula {matriculaId}"); + if (transacaoAutorizada == null) + throw new DomainException($"Transação não encontrada para a matricula {pedidoId}"); var transacao = await _pagamentoFacade.CancelarAutorizacao(transacaoAutorizada); if (transacao.Status != StatusTransacao.Cancelado) { - validationResult.Errors.Add(new ValidationFailure("Pagamento", - $"Não foi possível cancelar o pagamento da matricula {matriculaId}")); + validationResult.Errors.Add(new ValidationFailure( + "Pagamento", + $"Não foi possível cancelar o pagamento da matricula {pedidoId}")); return new ResponseMessage(validationResult); } @@ -124,8 +133,9 @@ public async Task CancelarPagamento(Guid matriculaId) if (!await _pagamentoRepository.UnitOfWork.Commit()) { - validationResult.Errors.Add(new ValidationFailure("Pagamento", - $"Não foi possível persistir o cancelamento do pagamento da matricula {matriculaId}")); + validationResult.Errors.Add(new ValidationFailure( + "Pagamento", + $"Não foi possível persistir o cancelamento do pagamento da matricula {pedidoId}")); return new ResponseMessage(validationResult); } @@ -150,6 +160,5 @@ public async Task CancelarPagamento(Guid matriculaId) Status = ultimaTransacao?.Status.ToString() ?? "Sem transações" }; } - } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/IPagamentoCartaoCreditoFacade.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/IPagamentoCartaoCreditoFacade.cs index 69e3c32..56447ed 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/IPagamentoCartaoCreditoFacade.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/IPagamentoCartaoCreditoFacade.cs @@ -5,7 +5,9 @@ namespace PlataformaEducacao.GestaoFinanceira.Business.Facade public interface IPagamentoCartaoCreditoFacade { Task AutorizarPagamento(Pagamento pagamento); + Task CapturarPagamento(Transacao transacao); + Task CancelarAutorizacao(Transacao transacao); } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoCartaoCreditoFacade.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoCartaoCreditoFacade.cs index 71e4898..46cc3ba 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoCartaoCreditoFacade.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoCartaoCreditoFacade.cs @@ -15,11 +15,40 @@ public PagamentoCartaoCreditoFacade(IOptions pagamentoConfig) _pagamentoConfig = pagamentoConfig.Value; } + public static Transacao ParaTransacao(Transaction transaction) + { + return new Transacao + { + Id = Guid.NewGuid(), + Status = (StatusTransacao)transaction.Status, + ValorTotal = transaction.Amount, + BandeiraCartao = transaction.CardBrand, + CodigoAutorizacao = transaction.AuthorizationCode, + CustoTransacao = transaction.Cost, + DataTransacao = transaction.TransactionDate, + NSU = transaction.Nsu, + TID = transaction.Tid + }; + } + + public static Transaction ParaTransaction(Transacao transacao, EduPagService eduPagService) + { + return new Transaction(eduPagService) + { + Status = (TransactionStatus)transacao.Status, + Amount = transacao.ValorTotal, + CardBrand = transacao.BandeiraCartao, + AuthorizationCode = transacao.CodigoAutorizacao, + Cost = transacao.CustoTransacao, + Nsu = transacao.NSU, + Tid = transacao.TID + }; + } public async Task AutorizarPagamento(Pagamento pagamento) { - var eduPagSvc = new EduPagService(_pagamentoConfig.DefaultApiKey, - _pagamentoConfig.DefaultEncryptionKey); + var eduPagSvc = new EduPagService( + _pagamentoConfig.DefaultApiKey, _pagamentoConfig.DefaultEncryptionKey); var cardHashGen = new CardHash(eduPagSvc) { @@ -44,56 +73,24 @@ public async Task AutorizarPagamento(Pagamento pagamento) return ParaTransacao(await transacao.AuthorizeCardTransaction()); } - public async Task CapturarPagamento(Transacao transacao) { - var eduPagSvc = new EduPagService(_pagamentoConfig.DefaultApiKey, - _pagamentoConfig.DefaultEncryptionKey); + var eduPagSvc = new EduPagService( + _pagamentoConfig.DefaultApiKey, _pagamentoConfig.DefaultEncryptionKey); var transaction = ParaTransaction(transacao, eduPagSvc); return ParaTransacao(await transaction.CaptureCardTransaction()); } - public async Task CancelarAutorizacao(Transacao transacao) { - var eduPagSvc = new EduPagService(_pagamentoConfig.DefaultApiKey, - _pagamentoConfig.DefaultEncryptionKey); + var eduPagSvc = new EduPagService( + _pagamentoConfig.DefaultApiKey, _pagamentoConfig.DefaultEncryptionKey); var transaction = ParaTransaction(transacao, eduPagSvc); return ParaTransacao(await transaction.CancelAuthorization()); } - - public static Transacao ParaTransacao(Transaction transaction) - { - return new Transacao - { - Id = Guid.NewGuid(), - Status = (StatusTransacao)transaction.Status, - ValorTotal = transaction.Amount, - BandeiraCartao = transaction.CardBrand, - CodigoAutorizacao = transaction.AuthorizationCode, - CustoTransacao = transaction.Cost, - DataTransacao = transaction.TransactionDate, - NSU = transaction.Nsu, - TID = transaction.Tid - }; - } - - public static Transaction ParaTransaction(Transacao transacao, EduPagService eduPagService) - { - return new Transaction(eduPagService) - { - Status = (TransactionStatus)transacao.Status, - Amount = transacao.ValorTotal, - CardBrand = transacao.BandeiraCartao, - AuthorizationCode = transacao.CodigoAutorizacao, - Cost = transacao.CustoTransacao, - Nsu = transacao.NSU, - Tid = transacao.TID - }; - } } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoConfig.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoConfig.cs index ecdcf0b..57ad864 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoConfig.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Facade/PagamentoConfig.cs @@ -3,6 +3,7 @@ public class PagamentoConfig { public string DefaultApiKey { get; set; } = string.Empty; + public string DefaultEncryptionKey { get; set; } = string.Empty; } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/DadosCartao.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/DadosCartao.cs index a53e890..ecdadaa 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/DadosCartao.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/DadosCartao.cs @@ -15,8 +15,11 @@ public DadosCartao(string nomeCartao, string numeroCartao, string expiracaoCarta } public string NomeCartao { get; private set; } = null!; + public string NumeroCartao { get; private set; } = null!; + public string ExpiracaoCartao { get; private set; } = null!; + public string CvvCartao { get; private set; } = null!; protected void Validar() diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/IPagamentoRepository.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/IPagamentoRepository.cs index 63fddbc..ea64c43 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/IPagamentoRepository.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/IPagamentoRepository.cs @@ -5,9 +5,13 @@ namespace PlataformaEducacao.GestaoFinanceira.Business.Models public interface IPagamentoRepository : IRepository { void AdicionarPagamento(Pagamento pagamento); + void AdicionarTransacao(Transacao transacao); + Task ObterPagamentoPorMatriculaId(Guid matriculaId); + Task ObterPagamentoPorMatriculaId(Guid matriculaId, Guid usuarioId, bool isAdm); + Task> ObterTransacoesPorMatriculaId(Guid matriculaId); } } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Pagamento.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Pagamento.cs index bed69b7..3d675aa 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Pagamento.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Pagamento.cs @@ -1,6 +1,5 @@ using PlataformaEducacao.Core.DomainObjects; - namespace PlataformaEducacao.GestaoFinanceira.Business.Models { public class Pagamento : Entity, IAggregateRoot @@ -15,6 +14,7 @@ public Pagamento() public Guid MatriculaId { get; set; } public TipoPagamento TipoPagamento { get; set; } + public decimal Valor { get; set; } public DadosCartao DadosCartao { get; set; } = null!; diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Transacao.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Transacao.cs index 6a6fcb9..2b1ba61 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Transacao.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.Business/Models/Transacao.cs @@ -6,12 +6,19 @@ namespace PlataformaEducacao.GestaoFinanceira.Business.Models public class Transacao : Entity { public string CodigoAutorizacao { get; set; } = string.Empty; + public string BandeiraCartao { get; set; } = string.Empty; + public DateTime? DataTransacao { get; set; } + public decimal ValorTotal { get; set; } + public decimal CustoTransacao { get; set; } + public StatusTransacao Status { get; set; } + public string TID { get; set; } = string.Empty; // Id + public string NSU { get; set; } = string.Empty; // Meio (paypal) public Guid PagamentoId { get; set; } diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Card.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Card.cs index 4cdc04e..89276ea 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Card.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Card.cs @@ -5,24 +5,27 @@ namespace PlataformaEducacao.GestaoFinanceira.EduPag { public class CardHash { + private readonly EduPagService _eduPagService; + public CardHash(EduPagService eduPagService) { - EduPagService = eduPagService; + _eduPagService = eduPagService; } - private readonly EduPagService EduPagService; - public string CardHolderName { get; set; } = string.Empty; + public string CardNumber { get; set; } = string.Empty; + public string CardExpirationDate { get; set; } = string.Empty; + public string CardCvv { get; set; } = string.Empty; public string Generate() { using var aesAlg = Aes.Create(); - aesAlg.IV = Encoding.Default.GetBytes(EduPagService.EncryptionKey); - aesAlg.Key = Encoding.Default.GetBytes(EduPagService.ApiKey); + aesAlg.IV = Encoding.Default.GetBytes(_eduPagService.EncryptionKey); + aesAlg.Key = Encoding.Default.GetBytes(_eduPagService.ApiKey); var encryptor = aesAlg.CreateEncryptor(aesAlg.Key, aesAlg.IV); diff --git a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Transaction.cs b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Transaction.cs index 9bfec02..9786c37 100644 --- a/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Transaction.cs +++ b/src/services/GestaoFinanceira/PlataformaEducacao.GestaoFinanceira.EduPag/Transaction.cs @@ -2,20 +2,19 @@ { public class Transaction { + private readonly EduPagService _eduPagService = null!; public Transaction(EduPagService eduPagService) { - EduPagService = eduPagService; + _eduPagService = eduPagService; } - protected Transaction() { } - - private readonly EduPagService EduPagService = null!; - - protected string Endpoint { get; set; } = string.Empty; - public int SubscriptionId { get; set; } + protected Transaction() + { + } + public TransactionStatus Status { get; set; } public int AuthorizationAmount { get; set; } @@ -102,7 +101,7 @@ public Task AuthorizeCardTransaction() AuthorizationCode = GetGenericCode(), CardBrand = "MasterCard", TransactionDate = DateTime.Now, - Cost = Amount * (decimal)0.03, + Cost = Amount * 0.03M, Amount = Amount, Status = TransactionStatus.Authorized, Tid = GetGenericCode(), @@ -114,14 +113,14 @@ public Task AuthorizeCardTransaction() transaction = new Transaction { - AuthorizationCode = "", - CardBrand = "", + AuthorizationCode = string.Empty, + CardBrand = string.Empty, TransactionDate = DateTime.Now, Cost = 0, Amount = 0, Status = TransactionStatus.Refused, - Tid = "", - Nsu = "" + Tid = string.Empty, + Nsu = string.Empty }; return Task.FromResult(transaction); @@ -148,7 +147,7 @@ public Task CancelAuthorization() { var transaction = new Transaction { - AuthorizationCode = "", + AuthorizationCode = string.Empty, CardBrand = CardBrand, TransactionDate = DateTime.Now, Cost = 0, @@ -161,11 +160,12 @@ public Task CancelAuthorization() return Task.FromResult(transaction); } - private string GetGenericCode() + protected string Endpoint { get; set; } = string.Empty; + + private static string GetGenericCode() { return new string(Enumerable.Repeat("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", 10) .Select(s => s[new Random().Next(s.Length)]).ToArray()); } } - -} \ No newline at end of file +} diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/ApiConfig.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/ApiConfig.cs index 45aa383..ebed766 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/ApiConfig.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/ApiConfig.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.HttpOverrides; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.HttpOverrides; using PlataformaEducacao.WebApi.Core.Extensions; using PlataformaEducacao.WebApi.Core.Identidade; -using System.Text.Json.Serialization; namespace PlataformaEducacao.GestaoIdentidade.Api.Configurations { @@ -21,6 +21,7 @@ public static IHostBuilder ConfigureAppSettings(this IHostBuilder host) return host; } + public static IServiceCollection AddApiConfig(this IServiceCollection services, IConfiguration configuration) { services.AddControllers() @@ -39,6 +40,7 @@ public static IServiceCollection AddApiConfig(this IServiceCollection services, return services; } + public static IApplicationBuilder UseApiConfiguration(this IApplicationBuilder app, IWebHostEnvironment environment) { app.UseForwardedHeaders(); diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbContextConfig.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbContextConfig.cs index a84e7c3..c94ca6c 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbContextConfig.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbContextConfig.cs @@ -23,6 +23,7 @@ public static IServiceCollection AddDbContextConfig(this IServiceCollection serv opt.EnableSensitiveDataLogging(); }); } + return services; } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbMigrationHelper.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbMigrationHelper.cs index cc1fe30..0468b0c 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbMigrationHelper.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DbMigrationHelper.cs @@ -18,6 +18,7 @@ public static async Task EnsureSeedData(WebApplication application) var service = application.Services.CreateScope().ServiceProvider; await EnsureSeedData(service); } + public static async Task EnsureSeedData(IServiceProvider serviceProvider) { using var scope = serviceProvider.GetRequiredService().CreateScope(); @@ -30,7 +31,7 @@ public static async Task EnsureSeedData(IServiceProvider serviceProvider) await identityContext.Database.EnsureCreatedAsync(); await SeedUserAndRoles(identityContext); } - else if (env.EnvironmentName == "Development" || env.EnvironmentName == "Docker") + else if (env.EnvironmentName is "Development" or "Docker") { await identityContext.Database.MigrateAsync(); await SeedUserAndRoles(identityContext); diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DependencyInjectionConfig.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DependencyInjectionConfig.cs index 295a8c3..be1fe94 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DependencyInjectionConfig.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/DependencyInjectionConfig.cs @@ -8,9 +8,8 @@ public static class DependencyInjectionConfig { public static IServiceCollection RegisterServices(this IServiceCollection services) { - //services.AddSingleton(); - //services.AddScoped(); - + // services.AddSingleton(); + // services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/IdentityConfig.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/IdentityConfig.cs index 446e0f2..fb7ecf3 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/IdentityConfig.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/IdentityConfig.cs @@ -15,7 +15,6 @@ public static IServiceCollection AddIdentityConfig(this IServiceCollection servi .AddEntityFrameworkStores() .AddDefaultTokenProviders(); - services.AddJwtConfiguration(configuration); return services; diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/MessageBusConfig.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/MessageBusConfig.cs index bc4bfe3..61ef0b7 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/MessageBusConfig.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/MessageBusConfig.cs @@ -5,7 +5,8 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Configurations { public static class MessageBusConfig { - public static IServiceCollection AddMessageBusConfiguration(this IServiceCollection services, + public static IServiceCollection AddMessageBusConfiguration( + this IServiceCollection services, IConfiguration configuration) { services.AddMessageBus(configuration.GetMessageQueueConnection("MessageBus")); diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/SwaggerConfig.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/SwaggerConfig.cs index 8bb549e..b68ed7e 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/SwaggerConfig.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Configurations/SwaggerConfig.cs @@ -32,11 +32,11 @@ public static IServiceCollection AddSwaggerConfiguration(this IServiceCollection { Reference = new OpenApiReference { - Type=ReferenceType.SecurityScheme, - Id="Bearer" + Type = ReferenceType.SecurityScheme, + Id = "Bearer" } }, - new string[]{} + Array.Empty() } }); }); @@ -52,7 +52,6 @@ public static IApplicationBuilder UseSwaggerConfiguration(this IApplicationBuild o.SwaggerEndpoint("/swagger/v1/swagger.json", "v1"); }); - return app; } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Controllers/IdentidadeController.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Controllers/IdentidadeController.cs index 85d77a3..c8d8cab 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Controllers/IdentidadeController.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Controllers/IdentidadeController.cs @@ -1,4 +1,8 @@ -using Microsoft.AspNetCore.Identity; +using System.IdentityModel.Tokens.Jwt; +using System.Net; +using System.Security.Claims; +using System.Text; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; @@ -8,10 +12,6 @@ using PlataformaEducacao.MessageBus; using PlataformaEducacao.WebApi.Core.Controllers; using PlataformaEducacao.WebApi.Core.Identidade; -using System.IdentityModel.Tokens.Jwt; -using System.Net; -using System.Security.Claims; -using System.Text; namespace PlataformaEducacao.GestaoIdentidade.Api.Controllers { @@ -25,11 +25,12 @@ public class IdentidadeController : MainController private readonly IMessageBus _bus; - public IdentidadeController(SignInManager signInManager, - UserManager userManager, - IAutenticacaoService autenticacaoService, - IOptions appSettings, - IMessageBus bus) + public IdentidadeController( + SignInManager signInManager, + UserManager userManager, + IAutenticacaoService autenticacaoService, + IOptions appSettings, + IMessageBus bus) { _signInManager = signInManager; _userManager = userManager; @@ -66,6 +67,7 @@ public async Task NovoAluno(UsuarioRegistro usuarioRegistro) return CustomResponse(HttpStatusCode.Created, await GerarJwt(usuarioRegistro.Email)); } + foreach (var error in result.Errors) { AdicionarErroProcessamento(error.Description); @@ -79,8 +81,7 @@ public async Task Autenticar(UsuarioLogin usuarioLogin) { if (!ModelState.IsValid) return CustomResponse(ModelState); - var result = await _signInManager.PasswordSignInAsync(usuarioLogin.Email, usuarioLogin.Senha, - false, true); + var result = await _signInManager.PasswordSignInAsync(usuarioLogin.Email, usuarioLogin.Senha, false, true); if (result.Succeeded) { @@ -100,7 +101,6 @@ public async Task Autenticar(UsuarioLogin usuarioLogin) [HttpPost("refresh-token")] public async Task RefreshToken(UsuarioRefreshToken refreshToken) { - if (refreshToken == null) { AdicionarErroProcessamento("Refresh Token inválido"); @@ -123,17 +123,20 @@ public async Task RefreshToken(UsuarioRefreshToken refreshToken) return CustomResponse(HttpStatusCode.OK, await GerarJwt(token.UserName)); } + private static long ToUnixEpochDate(DateTime date) + => (long)Math.Round((date.ToUniversalTime() - new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero)).TotalSeconds); + private async Task GerarJwt(string email) { - var user = await _userManager.FindByEmailAsync(email); - if (user == null) throw new ArgumentException("Usuário não encontrado", nameof(email)); + var user = await _userManager.FindByEmailAsync(email) + ?? throw new ArgumentException("Usuário não encontrado", nameof(email)); var claims = await _userManager.GetClaimsAsync(user); var identityClaims = await ObterClaimsUsuario(claims, user); var encodedToken = CodificarToken(identityClaims); - var refreshToken = await _autenticacaoService.GerarRefreshToken(user.UserName!); + var refreshToken = await _autenticacaoService.GerarRefreshToken(user.UserName); return ObterRespostaToken(encodedToken, user, claims, refreshToken); } @@ -143,7 +146,7 @@ private async Task ObterClaimsUsuario(ICollection claims, var userRoles = await _userManager.GetRolesAsync(user); claims.Add(new Claim(JwtRegisteredClaimNames.Sub, user.Id)); - claims.Add(new Claim(JwtRegisteredClaimNames.Email, user.Email!)); + claims.Add(new Claim(JwtRegisteredClaimNames.Email, user.Email)); claims.Add(new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())); claims.Add(new Claim(JwtRegisteredClaimNames.Nbf, ToUnixEpochDate(DateTime.UtcNow).ToString())); claims.Add(new Claim(JwtRegisteredClaimNames.Iat, ToUnixEpochDate(DateTime.UtcNow).ToString(), ClaimValueTypes.Integer64)); @@ -190,9 +193,6 @@ private UsuarioRespostaLogin ObterRespostaToken(string encodedToken, IdentityUse }; } - private static long ToUnixEpochDate(DateTime date) - => (long)Math.Round((date.ToUniversalTime() - new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero)).TotalSeconds); - private async Task RegistrarAluno(UsuarioRegistro usuarioRegistro) { var usuario = await _userManager.FindByEmailAsync(usuarioRegistro.Email); @@ -209,6 +209,5 @@ private async Task RegistrarAluno(UsuarioRegistro usuarioRegist throw; } } - } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContext.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContext.cs index bbe085e..e8cd2e6 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContext.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContext.cs @@ -6,7 +6,7 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Data { public class GestaoIdentidadeContext(DbContextOptions options) : IdentityDbContext(options) { - public DbSet RefreshTokens { get; set; } + public DbSet RefreshTokens { get; set; } = default!; protected override void OnModelCreating(ModelBuilder builder) { diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContextFactory.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContextFactory.cs index fe75df6..6d88a4f 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContextFactory.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/GestaoIdentidadeContextFactory.cs @@ -1,16 +1,17 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; -namespace PlataformaEducacao.GestaoIdentidade.Api.Data; - -public sealed class GestaoIdentidadeContextFactory : IDesignTimeDbContextFactory +namespace PlataformaEducacao.GestaoIdentidade.Api.Data { - public GestaoIdentidadeContext CreateDbContext(string[] args) + public sealed class GestaoIdentidadeContextFactory : IDesignTimeDbContextFactory { - var options = new DbContextOptionsBuilder() - .UseSqlServer("Server=localhost,1433;Database=GestaoIdentidade;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") - .Options; + public GestaoIdentidadeContext CreateDbContext(string[] args) + { + var options = new DbContextOptionsBuilder() + .UseSqlServer("Server=localhost,1433;Database=GestaoIdentidade;User Id=sa;Password=Plataforma@2026;TrustServerCertificate=True") + .Options; - return new GestaoIdentidadeContext(options); + return new GestaoIdentidadeContext(options); + } } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/Repository/IAutenticacaoRepository.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/Repository/IAutenticacaoRepository.cs index deb67e4..e573a64 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/Repository/IAutenticacaoRepository.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Data/Repository/IAutenticacaoRepository.cs @@ -5,6 +5,7 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Data.Repository public interface IAutenticacaoRepository { Task AdicionarRefreshToken(RefreshToken refreshToken); + Task ObterRefreshToken(Guid refreshToken); } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Extensions/IdentityPortuguesMsgError.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Extensions/IdentityPortuguesMsgError.cs index e1f1349..c4a4462 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Extensions/IdentityPortuguesMsgError.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Extensions/IdentityPortuguesMsgError.cs @@ -5,70 +5,91 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Extensions public class IdentityPortuguesMsgError : IdentityErrorDescriber { public override IdentityError DefaultError() => - new IdentityError { Code = nameof(DefaultError), Description = "Ocorreu um erro desconhecido." }; + new() + { Code = nameof(DefaultError), Description = "Ocorreu um erro desconhecido." }; public override IdentityError ConcurrencyFailure() => - new IdentityError { Code = nameof(ConcurrencyFailure), Description = "Falha de concorrência otimista, o objeto foi modificado." }; + new() + { Code = nameof(ConcurrencyFailure), Description = "Falha de concorrência otimista, o objeto foi modificado." }; public override IdentityError PasswordMismatch() => - new IdentityError { Code = nameof(PasswordMismatch), Description = "Senha incorreta." }; + new() + { Code = nameof(PasswordMismatch), Description = "Senha incorreta." }; public override IdentityError InvalidToken() => - new IdentityError { Code = nameof(InvalidToken), Description = "Token inválido." }; + new() + { Code = nameof(InvalidToken), Description = "Token inválido." }; public override IdentityError LoginAlreadyAssociated() => - new IdentityError { Code = nameof(LoginAlreadyAssociated), Description = "Já existe um usuário com este login." }; + new() + { Code = nameof(LoginAlreadyAssociated), Description = "Já existe um usuário com este login." }; public override IdentityError InvalidUserName(string? userName) => - new IdentityError { Code = nameof(InvalidUserName), Description = $"O nome de usuário '{userName}' é inválido. Apenas letras e números são permitidos." }!; + new() + { Code = nameof(InvalidUserName), Description = $"O nome de usuário '{userName}' é inválido. Apenas letras e números são permitidos." }; public override IdentityError InvalidEmail(string? email) => - new IdentityError { Code = nameof(InvalidEmail), Description = $"O e-mail '{email}' é inválido." }!; + new() + { Code = nameof(InvalidEmail), Description = $"O e-mail '{email}' é inválido." }; public override IdentityError DuplicateUserName(string userName) => - new IdentityError { Code = nameof(DuplicateUserName), Description = $"O nome de usuário '{userName}' já está em uso." }; + new() + { Code = nameof(DuplicateUserName), Description = $"O nome de usuário '{userName}' já está em uso." }; public override IdentityError DuplicateEmail(string email) => - new IdentityError { Code = nameof(DuplicateEmail), Description = $"O e-mail '{email}' já está em uso." }; + new() + { Code = nameof(DuplicateEmail), Description = $"O e-mail '{email}' já está em uso." }; public override IdentityError InvalidRoleName(string? role) => - new IdentityError { Code = nameof(InvalidRoleName), Description = $"O nome da função '{role}' é inválido." }!; + new() + { Code = nameof(InvalidRoleName), Description = $"O nome da função '{role}' é inválido." }; public override IdentityError DuplicateRoleName(string role) => - new IdentityError { Code = nameof(DuplicateRoleName), Description = $"A função '{role}' já está em uso." }; + new() + { Code = nameof(DuplicateRoleName), Description = $"A função '{role}' já está em uso." }; public override IdentityError UserAlreadyHasPassword() => - new IdentityError { Code = nameof(UserAlreadyHasPassword), Description = "O usuário já possui uma senha definida." }; + new() + { Code = nameof(UserAlreadyHasPassword), Description = "O usuário já possui uma senha definida." }; public override IdentityError UserLockoutNotEnabled() => - new IdentityError { Code = nameof(UserLockoutNotEnabled), Description = "O bloqueio não está habilitado para este usuário." }; + new() + { Code = nameof(UserLockoutNotEnabled), Description = "O bloqueio não está habilitado para este usuário." }; public override IdentityError UserAlreadyInRole(string role) => - new IdentityError { Code = nameof(UserAlreadyInRole), Description = $"O usuário já está na função '{role}'." }; + new() + { Code = nameof(UserAlreadyInRole), Description = $"O usuário já está na função '{role}'." }; public override IdentityError UserNotInRole(string role) => - new IdentityError { Code = nameof(UserNotInRole), Description = $"O usuário não pertence à função '{role}'." }; + new() + { Code = nameof(UserNotInRole), Description = $"O usuário não pertence à função '{role}'." }; public override IdentityError PasswordTooShort(int length) => - new IdentityError { Code = nameof(PasswordTooShort), Description = $"A senha deve conter no mínimo {length} caracteres." }; + new() + { Code = nameof(PasswordTooShort), Description = $"A senha deve conter no mínimo {length} caracteres." }; public override IdentityError PasswordRequiresNonAlphanumeric() => - new IdentityError { Code = nameof(PasswordRequiresNonAlphanumeric), Description = "A senha deve conter ao menos um caractere não alfanumérico." }; + new() + { Code = nameof(PasswordRequiresNonAlphanumeric), Description = "A senha deve conter ao menos um caractere não alfanumérico." }; public override IdentityError PasswordRequiresDigit() => - new IdentityError { Code = nameof(PasswordRequiresDigit), Description = "A senha deve conter ao menos um número." }; + new() + { Code = nameof(PasswordRequiresDigit), Description = "A senha deve conter ao menos um número." }; public override IdentityError PasswordRequiresLower() => - new IdentityError { Code = nameof(PasswordRequiresLower), Description = "A senha deve conter ao menos uma letra minúscula." }; + new() + { Code = nameof(PasswordRequiresLower), Description = "A senha deve conter ao menos uma letra minúscula." }; public override IdentityError PasswordRequiresUpper() => - new IdentityError { Code = nameof(PasswordRequiresUpper), Description = "A senha deve conter ao menos uma letra maiúscula." }; + new() + { Code = nameof(PasswordRequiresUpper), Description = "A senha deve conter ao menos uma letra maiúscula." }; public override IdentityError PasswordRequiresUniqueChars(int uniqueChars) => - new IdentityError { Code = nameof(PasswordRequiresUniqueChars), Description = $"A senha deve conter ao menos {uniqueChars} caracteres únicos." }; + new() + { Code = nameof(PasswordRequiresUniqueChars), Description = $"A senha deve conter ao menos {uniqueChars} caracteres únicos." }; public override IdentityError RecoveryCodeRedemptionFailed() => - new IdentityError { Code = nameof(RecoveryCodeRedemptionFailed), Description = "Falha ao utilizar o código de recuperação." }; - + new() + { Code = nameof(RecoveryCodeRedemptionFailed), Description = "Falha ao utilizar o código de recuperação." }; } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260205180355_Initial.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260205180355_Initial.cs index 82568a8..d25f4e2 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260205180355_Initial.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260205180355_Initial.cs @@ -1,10 +1,12 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System.Diagnostics.CodeAnalysis; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable namespace PlataformaEducacao.GestaoIdentidade.Api.Migrations { /// + [ExcludeFromCodeCoverage] public partial class Initial : Migration { /// diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260424124923_AddRefreshTokenTable.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260424124923_AddRefreshTokenTable.cs index ed41c4e..861295b 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260424124923_AddRefreshTokenTable.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260424124923_AddRefreshTokenTable.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable @@ -6,6 +7,7 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Migrations { /// + [ExcludeFromCodeCoverage] public partial class AddRefreshTokenTable : Migration { /// diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260702222217_SqlServerBaseline.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260702222217_SqlServerBaseline.cs index ac840de..8a922fd 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260702222217_SqlServerBaseline.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/20260702222217_SqlServerBaseline.cs @@ -1,16 +1,19 @@ +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace PlataformaEducacao.GestaoIdentidade.Api.Migrations; - -public partial class SqlServerBaseline : Migration +namespace PlataformaEducacao.GestaoIdentidade.Api.Migrations { - protected override void Up(MigrationBuilder migrationBuilder) + [ExcludeFromCodeCoverage] + public partial class SqlServerBaseline : Migration { - } + protected override void Up(MigrationBuilder migrationBuilder) + { + } - protected override void Down(MigrationBuilder migrationBuilder) - { + protected override void Down(MigrationBuilder migrationBuilder) + { + } } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/GestaoIdentidadeContextModelSnapshot.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/GestaoIdentidadeContextModelSnapshot.cs index fdb36d6..dbab2bd 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/GestaoIdentidadeContextModelSnapshot.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Migrations/GestaoIdentidadeContextModelSnapshot.cs @@ -1,5 +1,6 @@ // using System; +using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -10,6 +11,7 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Migrations { + [ExcludeFromCodeCoverage] [DbContext(typeof(GestaoIdentidadeContext))] partial class GestaoIdentidadeContextModelSnapshot : ModelSnapshot { diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/RefreshToken.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/RefreshToken.cs index 8158adb..68f90ed 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/RefreshToken.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/RefreshToken.cs @@ -9,8 +9,11 @@ public RefreshToken() } public Guid Id { get; set; } + public string UserName { get; set; } = string.Empty; + public Guid Token { get; set; } + public DateTime ExpirationDate { get; set; } } } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UserViewModels.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UserViewModels.cs index 6886e05..520db8f 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UserViewModels.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UserViewModels.cs @@ -18,42 +18,4 @@ public class UsuarioRegistro [Compare("Senha", ErrorMessage = "As senhas não conferem.")] public string SenhaConfirmacao { get; set; } = string.Empty; } - - public class UsuarioLogin - { - [Required(ErrorMessage = "O campo {0} é obrigatório")] - [EmailAddress(ErrorMessage = "O campo {0} está em formato inválido")] - public string Email { get; set; } = string.Empty; - - [Required(ErrorMessage = "O campo {0} é obrigatório")] - [StringLength(100, ErrorMessage = "O campo {0} precisa ter entre {2} e {1} caracteres", MinimumLength = 6)] - public string Senha { get; set; } = string.Empty; - } - - public class UsuarioRespostaLogin - { - public string AccessToken { get; set; } = string.Empty; - public Guid RefreshToken { get; set; } - public double ExpiresIn { get; set; } - public UsuarioToken UsuarioToken { get; set; } = new(); - } - - public class UsuarioToken - { - public string Id { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; - public IEnumerable Claims { get; set; } = new List(); - } - - public class UsuarioClaim - { - public string Value { get; set; } = string.Empty; - public string Type { get; set; } = string.Empty; - } - - public class UsuarioRefreshToken - { - public string RefreshToken { get; set; } = string.Empty; - } - } diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioClaim.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioClaim.cs new file mode 100644 index 0000000..07d58ca --- /dev/null +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioClaim.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; + +namespace PlataformaEducacao.GestaoIdentidade.Api.Models +{ + public class UsuarioClaim + { + public string Value { get; set; } = string.Empty; + + public string Type { get; set; } = string.Empty; + } +} diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioLogin.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioLogin.cs new file mode 100644 index 0000000..c35a283 --- /dev/null +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioLogin.cs @@ -0,0 +1,15 @@ +using System.ComponentModel.DataAnnotations; + +namespace PlataformaEducacao.GestaoIdentidade.Api.Models +{ + public class UsuarioLogin + { + [Required(ErrorMessage = "O campo {0} é obrigatório")] + [EmailAddress(ErrorMessage = "O campo {0} está em formato inválido")] + public string Email { get; set; } = string.Empty; + + [Required(ErrorMessage = "O campo {0} é obrigatório")] + [StringLength(100, ErrorMessage = "O campo {0} precisa ter entre {2} e {1} caracteres", MinimumLength = 6)] + public string Senha { get; set; } = string.Empty; + } +} diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioRefreshToken.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioRefreshToken.cs new file mode 100644 index 0000000..e98daf5 --- /dev/null +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioRefreshToken.cs @@ -0,0 +1,9 @@ +using System.ComponentModel.DataAnnotations; + +namespace PlataformaEducacao.GestaoIdentidade.Api.Models +{ + public class UsuarioRefreshToken + { + public string RefreshToken { get; set; } = string.Empty; + } +} diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioRespostaLogin.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioRespostaLogin.cs new file mode 100644 index 0000000..8762beb --- /dev/null +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioRespostaLogin.cs @@ -0,0 +1,15 @@ +using System.ComponentModel.DataAnnotations; + +namespace PlataformaEducacao.GestaoIdentidade.Api.Models +{ + public class UsuarioRespostaLogin + { + public string AccessToken { get; set; } = string.Empty; + + public Guid RefreshToken { get; set; } + + public double ExpiresIn { get; set; } + + public UsuarioToken UsuarioToken { get; set; } = new(); + } +} diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioToken.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioToken.cs new file mode 100644 index 0000000..50b2c74 --- /dev/null +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Models/UsuarioToken.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace PlataformaEducacao.GestaoIdentidade.Api.Models +{ + public class UsuarioToken + { + public string Id { get; set; } = string.Empty; + + public string Email { get; set; } = string.Empty; + + public IEnumerable Claims { get; set; } = new List(); + } +} diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Program.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Program.cs index e435464..882a6f5 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Program.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Program.cs @@ -25,4 +25,6 @@ app.Run(); -public partial class Program { } +public partial class Program +{ +} diff --git a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Services/IAutenticacaoService.cs b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Services/IAutenticacaoService.cs index 4ad566f..6e90e2c 100644 --- a/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Services/IAutenticacaoService.cs +++ b/src/services/GestaoIdentidade/PlataformaEducacao.GestaoIdentidade.Api/Services/IAutenticacaoService.cs @@ -5,6 +5,7 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Services public interface IAutenticacaoService { Task GerarRefreshToken(string userName); + Task ObterRefreshToken(Guid refreshToken); } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/BffIntegrationTests.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/BffIntegrationTests.cs index e69b845..fca3dd0 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/BffIntegrationTests.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/BffIntegrationTests.cs @@ -1,19 +1,19 @@ +using System.Net; +using System.Net.Http.Json; using FluentAssertions; using PlataformaEducacao.Bff.Api.Models.GestaoAlunos; using PlataformaEducacao.Bff.Api.Models.GestaoFinanceira; using PlataformaEducacao.Bff.Api.Tests.Config; -using System.Net; -using System.Net.Http.Json; namespace PlataformaEducacao.Bff.Api.Tests { - [Collection(nameof(IntegrationApiTestsFixtureCollection))] - public class BffIntegrationTests : IClassFixture> + [Collection(nameof(IntegrationApiTestsCollectionFixture))] + public class BffIntegrationTests : IClassFixture> { - private readonly IntegrationTestsFixture _fixture; + private readonly IntegrationTestsFixture _fixture; private readonly HttpClient _client; - public BffIntegrationTests(IntegrationTestsFixture fixture) + public BffIntegrationTests(IntegrationTestsFixture fixture) { _fixture = fixture; _client = fixture.Client; diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeAlunosService.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeAlunosService.cs new file mode 100644 index 0000000..c1e8fdf --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeAlunosService.cs @@ -0,0 +1,78 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using PlataformaEducacao.Bff.Api.Models.GestaoAlunos; +using PlataformaEducacao.Bff.Api.Models.Request.Identidade; +using PlataformaEducacao.Bff.Api.Services; +using CoreResponseResult = PlataformaEducacao.Core.Communication.ResponseResult; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + internal sealed class FakeAlunosService : IAlunosService + { + public Task BaixarCertificado(Guid certificadoId) + { + var response = new HttpResponseMessage(System.Net.HttpStatusCode.OK) + { + Content = new ByteArrayContent([1, 2, 3]) + }; + response.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/pdf"); + response.Content.Headers.ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("attachment") + { + FileName = "certificado.pdf" + }; + + return Task.FromResult(response); + } + + public Task FinalizarCurso(FinalizarCursoDTO finalizarCurso) + => Ok(new { finalizarCurso.MatriculaId }); + + public Task Matricular(MatricularDTO solicitarMatricula) + { + if (string.IsNullOrWhiteSpace(solicitarMatricula.NomeCurso)) + { + solicitarMatricula.NomeCurso = "Curso de Microsservicos"; + solicitarMatricula.TotalAulasCurso = 2; + solicitarMatricula.Valor = 199.90m; + } + + return Ok(new + { + solicitarMatricula.CursoId, + solicitarMatricula.NomeCurso, + solicitarMatricula.TotalAulasCurso, + solicitarMatricula.Valor + }); + } + + public Task ObterHistorico(Guid alunoId) + => Ok(new { AlunoId = alunoId, CursosConcluidos = 1 }); + + public Task ObterMatriculasAtivas() + => Ok(new[] { new { MatriculaId = Guid.NewGuid(), Status = "Ativa" } }); + + public Task ObterMatriculasPendentesPagamento() + => Ok(new[] { new { MatriculaId = Guid.NewGuid(), Status = "PendentePagamento" } }); + + public Task RealizarAula(RealizarAulaDTO realizarAula) + => Ok(new { realizarAula.MatriculaId, realizarAula.AulaId }); + + public Task ValidarCertificado(string codigoVerificacao) + => Ok(new { Codigo = codigoVerificacao, Valido = true }); + + private static Task Ok(object data) + { + return Task.FromResult(new CoreResponseResult + { + Sucesso = true, + Status = StatusCodes.Status200OK, + Data = data + }); + } + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeCursosService.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeCursosService.cs new file mode 100644 index 0000000..463169a --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeCursosService.cs @@ -0,0 +1,64 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo; +using PlataformaEducacao.Bff.Api.Models.Request.Identidade; +using PlataformaEducacao.Bff.Api.Services; +using CoreResponseResult = PlataformaEducacao.Core.Communication.ResponseResult; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + internal sealed class FakeCursosService : ICursosService + { + public Task AdicionarAula(AdicionarAulaRequest aulaRequest) + => Ok(new { aulaRequest.CursoId, aulaRequest.Titulo }); + + public Task AdicionarCurso(AdicionarCursoRequest cursoRequest) + => Ok(new { cursoRequest.Nome }); + + public Task AtualizarCurso(Guid cursoId, AtualizarCursoRequest cursoRequest) + => Ok(new { cursoId, cursoRequest.Nome }); + + public Task ObterCursoComAulasPorCursoId(Guid cursoId) + => Ok(new + { + Id = cursoId, + Nome = "Curso de Microsservicos", + Valor = 199.90m, + Disponivel = true, + Aulas = new[] + { + new { Id = Guid.NewGuid() }, + new { Id = Guid.NewGuid() } + } + }); + + public Task ObterCursosDisponiveisComAula() + => Ok(new[] + { + new + { + Id = Guid.NewGuid(), + Nome = "Curso de Microsservicos", + Valor = 199.90m + } + }); + + public Task ObterTodos() + => ObterCursosDisponiveisComAula(); + + private static Task Ok(object data) + { + return Task.FromResult(new CoreResponseResult + { + Sucesso = true, + Status = StatusCodes.Status200OK, + Data = data + }); + } + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeHealthCheckService.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeHealthCheckService.cs new file mode 100644 index 0000000..e994680 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeHealthCheckService.cs @@ -0,0 +1,36 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using PlataformaEducacao.Bff.Api.Models.Request.Identidade; +using PlataformaEducacao.Bff.Api.Services; +using CoreResponseResult = PlataformaEducacao.Core.Communication.ResponseResult; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + internal sealed class FakeHealthCheckService : IHealthCheckService + { + public Task VerificarSaude() + { + return Task.FromResult(new CoreResponseResult + { + Sucesso = true, + Status = StatusCodes.Status200OK, + Data = new + { + Gateway = "PlataformaEducacao.Bff.Api", + Dependencias = new[] + { + new { Servico = "Identidade", Saudavel = true }, + new { Servico = "Gestao de Conteudo", Saudavel = true }, + new { Servico = "Gestao de Alunos", Saudavel = true }, + new { Servico = "Gestao Financeira", Saudavel = true } + } + } + }); + } + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeIdentidadeService.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeIdentidadeService.cs new file mode 100644 index 0000000..e260001 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakeIdentidadeService.cs @@ -0,0 +1,54 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo; +using PlataformaEducacao.Bff.Api.Models.Request.Identidade; +using PlataformaEducacao.Bff.Api.Services; +using CoreResponseResult = PlataformaEducacao.Core.Communication.ResponseResult; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + internal sealed class FakeIdentidadeService : IIdentidadeService + { + public Task Login(LoginRequest login) + { + return Task.FromResult(new CoreResponseResult + { + Sucesso = true, + Status = StatusCodes.Status200OK, + Data = new + { + accessToken = "fake-token", + expiresIn = 7200 + } + }); + } + + public Task RegistrarAluno(RegistroAlunoRequest aluno) + { + return Task.FromResult(new CoreResponseResult + { + Sucesso = true, + Status = StatusCodes.Status201Created, + Data = new { aluno.Email } + }); + } + + public Task RefreshToken(RefreshTokenRequest refreshToken) + { + return Task.FromResult(new CoreResponseResult + { + Sucesso = true, + Status = StatusCodes.Status200OK, + Data = new + { + RefreshToken = "fake-refresh-token" + } + }); + } + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakePagamentoService.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakePagamentoService.cs new file mode 100644 index 0000000..f5fbf39 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/FakePagamentoService.cs @@ -0,0 +1,36 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using PlataformaEducacao.Bff.Api.Models.GestaoFinanceira; +using PlataformaEducacao.Bff.Api.Models.Request.Identidade; +using PlataformaEducacao.Bff.Api.Services; +using CoreResponseResult = PlataformaEducacao.Core.Communication.ResponseResult; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + internal sealed class FakePagamentoService : IPagamentoService + { + public Task HealthCheck() + => Ok(new { }); + + public Task ObterStatus(Guid matriculaId) + => Ok(new { MatriculaId = matriculaId, Status = "Autorizado" }); + + public Task PagarMatricula(PagarMatriculaDTO pagamento) + => Ok(new { pagamento.MatriculaId, pagamento.Valor }); + + private static Task Ok(object data) + { + return Task.FromResult(new CoreResponseResult + { + Sucesso = true, + Status = StatusCodes.Status200OK, + Data = data + }); + } + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/IntegrationTestsFixture.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/IntegrationTestsFixture.cs index cb93191..1c27588 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/IntegrationTestsFixture.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/IntegrationTestsFixture.cs @@ -1,73 +1,12 @@ -using Microsoft.AspNetCore.Mvc.Testing; using System.Text.Json; using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using PlataformaEducacao.Bff.Api; namespace PlataformaEducacao.Bff.Api.Tests.Config { - [CollectionDefinition(nameof(IntegrationApiTestsFixtureCollection))] - public class IntegrationApiTestsFixtureCollection : ICollectionFixture> { } - - public class IntegrationTestsFixture : IDisposable where TProgram : class - { - public readonly PlataformaEducacaoBffAppFactory Factory; - public HttpClient Client { get; } - - public IntegrationTestsFixture() - { - var clientOptions = new WebApplicationFactoryClientOptions - { - BaseAddress = new Uri("http://localhost") - }; - - Factory = new PlataformaEducacaoBffAppFactory(); - Client = Factory.CreateClient(clientOptions); - } - - public async Task DeserializeResponse(HttpResponseMessage response) - { - var content = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(content, - new JsonSerializerOptions - { - PropertyNameCaseInsensitive = true, - Converters = { new JsonStringEnumConverter() } - }) ?? throw new InvalidOperationException("Deserialization returned null"); - } - - public IEnumerable GetErrors(string jsonResponse) - { - var response = JsonSerializer.Deserialize( - jsonResponse, - new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); - - return response?.Erros?.Mensagens ?? Enumerable.Empty(); - } - - public void Dispose() - { - Client.Dispose(); - Factory.Dispose(); - } - } - - public class ResponseApi - { - public bool Sucesso { get; set; } - public int Status { get; set; } - public T? Data { get; set; } - public ResponseErrorMessages Erros { get; set; } = new(); - } - - public class ResponseResult - { - public bool Sucesso { get; set; } - public int Status { get; set; } - public object? Data { get; set; } - public ResponseErrorMessages Erros { get; set; } = new(); - } - - public class ResponseErrorMessages + [CollectionDefinition(nameof(IntegrationApiTestsCollectionFixture))] + public class IntegrationApiTestsCollectionFixture : ICollectionFixture> { - public List Mensagens { get; set; } = new(); } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/IntegrationTestsFixtureTProgram.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/IntegrationTestsFixtureTProgram.cs new file mode 100644 index 0000000..311cca9 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/IntegrationTestsFixtureTProgram.cs @@ -0,0 +1,57 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using PlataformaEducacao.Bff.Api; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + public class IntegrationTestsFixture : IDisposable + where TProgram : class + { + public readonly PlataformaEducacaoBffAppFactory Factory; + + public HttpClient Client { get; } + + public IntegrationTestsFixture() + { + var clientOptions = new WebApplicationFactoryClientOptions + { + BaseAddress = new Uri("http://localhost") + }; + + Factory = new PlataformaEducacaoBffAppFactory(); + Client = Factory.CreateClient(clientOptions); + } + + public async Task DeserializeResponse(HttpResponseMessage response) + { + var content = await response.Content.ReadAsStringAsync(); + return JsonSerializer.Deserialize(content, PropertyNameCaseInsensitiveComConvertersOptions) ?? throw new InvalidOperationException("Deserialization returned null"); + } + + public IEnumerable GetErrors(string jsonResponse) + { + var response = JsonSerializer.Deserialize( + jsonResponse, PropertyNameCaseInsensitiveOptions); + + return response?.Erros?.Mensagens ?? Enumerable.Empty(); + } + + public void Dispose() + { + Client.Dispose(); + Factory.Dispose(); + } + + private static readonly JsonSerializerOptions PropertyNameCaseInsensitiveOptions = new() + { + PropertyNameCaseInsensitive = true, + }; + + private static readonly JsonSerializerOptions PropertyNameCaseInsensitiveComConvertersOptions = new() + { + PropertyNameCaseInsensitive = true, + Converters = { new JsonStringEnumConverter() } + }; + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/PlataformaEducacaoBffAppFactory.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/PlataformaEducacaoBffAppFactory.cs index 1cde3a4..6b0cef3 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/PlataformaEducacaoBffAppFactory.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/PlataformaEducacaoBffAppFactory.cs @@ -5,13 +5,15 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo; +using PlataformaEducacao.Bff.Api.Models.Request.Identidade; using PlataformaEducacao.Bff.Api.Services; using CoreResponseResult = PlataformaEducacao.Core.Communication.ResponseResult; -using PlataformaEducacao.Bff.Api.Models.Request.Identidade; namespace PlataformaEducacao.Bff.Api.Tests.Config { - public class PlataformaEducacaoBffAppFactory : WebApplicationFactory where TProgram : class + public class PlataformaEducacaoBffAppFactory : WebApplicationFactory + where TProgram : class { protected override void ConfigureWebHost(IWebHostBuilder builder) { @@ -64,203 +66,4 @@ protected override void ConfigureWebHost(IWebHostBuilder builder) }); } } - - internal class FakeIdentidadeService : IIdentidadeService - { - public Task Login(PlataformaEducacao.Bff.Api.Models.Request.Identidade.LoginRequest login) - { - return Task.FromResult(new CoreResponseResult - { - Sucesso = true, - Status = StatusCodes.Status200OK, - Data = new - { - accessToken = "fake-token", - expiresIn = 7200 - } - }); - } - - public Task RegistrarAluno(PlataformaEducacao.Bff.Api.Models.Request.Identidade.RegistroAlunoRequest aluno) - { - return Task.FromResult(new CoreResponseResult - { - Sucesso = true, - Status = StatusCodes.Status201Created, - Data = new { aluno.Email } - }); - } - - public Task RefreshToken(RefreshTokenRequest refreshToken) - { - return Task.FromResult(new CoreResponseResult - { - Sucesso = true, - Status = StatusCodes.Status200OK, - Data = new - { - RefreshToken = "fake-refresh-token" - } - }); - } - } - - internal class FakeCursosService : ICursosService - { - public Task AdicionarAula(PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo.AdicionarAulaRequest aulaRequest) - => Ok(new { aulaRequest.CursoId, aulaRequest.Titulo }); - - public Task AdicionarCurso(PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo.AdicionarCursoRequest cursoRequest) - => Ok(new { cursoRequest.Nome }); - - public Task AtualizarCurso(Guid cursoId, PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo.AtualizarCursoRequest cursoRequest) - => Ok(new { cursoId, cursoRequest.Nome }); - - public Task ObterCursoComAulasPorCursoId(Guid cursoId) - => Ok(new - { - Id = cursoId, - Nome = "Curso de Microsservicos", - Valor = 199.90m, - Disponivel = true, - Aulas = new[] - { - new { Id = Guid.NewGuid() }, - new { Id = Guid.NewGuid() } - } - }); - - public Task ObterCursosDisponiveisComAula() - => Ok(new[] - { - new - { - Id = Guid.NewGuid(), - Nome = "Curso de Microsservicos", - Valor = 199.90m - } - }); - - public Task ObterTodos() - => ObterCursosDisponiveisComAula(); - - private static Task Ok(object data) - { - return Task.FromResult(new CoreResponseResult - { - Sucesso = true, - Status = StatusCodes.Status200OK, - Data = data - }); - } - } - - internal class FakeAlunosService : IAlunosService - { - public Task BaixarCertificado(Guid certificadoId) - { - var response = new HttpResponseMessage(System.Net.HttpStatusCode.OK) - { - Content = new ByteArrayContent(new byte[] { 1, 2, 3 }) - }; - response.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/pdf"); - response.Content.Headers.ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("attachment") - { - FileName = "certificado.pdf" - }; - - return Task.FromResult(response); - } - - public Task FinalizarCurso(PlataformaEducacao.Bff.Api.Models.GestaoAlunos.FinalizarCursoDTO finalizarCurso) - => Ok(new { finalizarCurso.MatriculaId }); - - public Task Matricular(PlataformaEducacao.Bff.Api.Models.GestaoAlunos.MatricularDTO solicitarMatricula) - { - if (string.IsNullOrWhiteSpace(solicitarMatricula.NomeCurso)) - { - solicitarMatricula.NomeCurso = "Curso de Microsservicos"; - solicitarMatricula.TotalAulasCurso = 2; - solicitarMatricula.Valor = 199.90m; - } - - return Ok(new - { - solicitarMatricula.CursoId, - solicitarMatricula.NomeCurso, - solicitarMatricula.TotalAulasCurso, - solicitarMatricula.Valor - }); - } - - public Task ObterHistorico(Guid alunoId) - => Ok(new { AlunoId = alunoId, CursosConcluidos = 1 }); - - public Task ObterMatriculasAtivas() - => Ok(new[] { new { MatriculaId = Guid.NewGuid(), Status = "Ativa" } }); - - public Task ObterMatriculasPendentesPagamento() - => Ok(new[] { new { MatriculaId = Guid.NewGuid(), Status = "PendentePagamento" } }); - - public Task RealizarAula(PlataformaEducacao.Bff.Api.Models.GestaoAlunos.RealizarAulaDTO realizarAula) - => Ok(new { realizarAula.MatriculaId, realizarAula.AulaId }); - - public Task ValidarCertificado(string codigoVerificacao) - => Ok(new { Codigo = codigoVerificacao, Valido = true }); - - private static Task Ok(object data) - { - return Task.FromResult(new CoreResponseResult - { - Sucesso = true, - Status = StatusCodes.Status200OK, - Data = data - }); - } - } - - internal class FakePagamentoService : IPagamentoService - { - public Task HealthCheck() - => Ok(new { }); - - public Task ObterStatus(Guid matriculaId) - => Ok(new { MatriculaId = matriculaId, Status = "Autorizado" }); - - public Task PagarMatricula(PlataformaEducacao.Bff.Api.Models.GestaoFinanceira.PagarMatriculaDTO pagamento) - => Ok(new { pagamento.MatriculaId, pagamento.Valor }); - - private static Task Ok(object data) - { - return Task.FromResult(new CoreResponseResult - { - Sucesso = true, - Status = StatusCodes.Status200OK, - Data = data - }); - } - } - - internal class FakeHealthCheckService : IHealthCheckService - { - public Task VerificarSaude() - { - return Task.FromResult(new CoreResponseResult - { - Sucesso = true, - Status = StatusCodes.Status200OK, - Data = new - { - Gateway = "PlataformaEducacao.Bff.Api", - Dependencias = new[] - { - new { Servico = "Identidade", Saudavel = true }, - new { Servico = "Gestao de Conteudo", Saudavel = true }, - new { Servico = "Gestao de Alunos", Saudavel = true }, - new { Servico = "Gestao Financeira", Saudavel = true } - } - } - }); - } - } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseApi.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseApi.cs new file mode 100644 index 0000000..92ce1b3 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseApi.cs @@ -0,0 +1,18 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using PlataformaEducacao.Bff.Api; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + public class ResponseApi + { + public bool Sucesso { get; set; } + + public int Status { get; set; } + + public T? Data { get; set; } + + public ResponseErrorMessages Erros { get; set; } = new(); + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseErrorMessages.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseErrorMessages.cs new file mode 100644 index 0000000..7d9f588 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseErrorMessages.cs @@ -0,0 +1,12 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using PlataformaEducacao.Bff.Api; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + public class ResponseErrorMessages + { + public List Mensagens { get; set; } = new(); + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseResult.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseResult.cs new file mode 100644 index 0000000..6aa60e8 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/ResponseResult.cs @@ -0,0 +1,18 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using PlataformaEducacao.Bff.Api; + +namespace PlataformaEducacao.Bff.Api.Tests.Config +{ + public class ResponseResult + { + public bool Sucesso { get; set; } + + public int Status { get; set; } + + public object? Data { get; set; } + + public ResponseErrorMessages Erros { get; set; } = new(); + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/TestAuthHandler.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/TestAuthHandler.cs index 9c9bc1e..cca1f28 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/TestAuthHandler.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Config/TestAuthHandler.cs @@ -1,8 +1,8 @@ +using System.Security.Claims; +using System.Text.Encodings.Web; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using System.Security.Claims; -using System.Text.Encodings.Web; namespace PlataformaEducacao.Bff.Api.Tests.Config { @@ -12,7 +12,9 @@ public TestAuthHandler( IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) - : base(options, logger, encoder) { } + : base(options, logger, encoder) + { + } protected override Task HandleAuthenticateAsync() { @@ -28,9 +30,9 @@ protected override Task HandleAuthenticateAsync() var claims = new List { - new Claim(ClaimTypes.Name, $"Usuario {userRole}"), - new Claim(ClaimTypes.NameIdentifier, userId), - new Claim(ClaimTypes.Role, userRole) + new(ClaimTypes.Name, $"Usuario {userRole}"), + new(ClaimTypes.NameIdentifier, userId), + new(ClaimTypes.Role, userRole) }; var identity = new ClaimsIdentity(claims, "Test"); diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Controllers/BaseControllerTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Controllers/BaseControllerTest.cs index f8d16ef..6fab340 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Controllers/BaseControllerTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Controllers/BaseControllerTest.cs @@ -1,26 +1,12 @@ using FluentAssertions; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.ModelBinding; using PlataformaEducacao.Bff.Api.Controllers; using PlataformaEducacao.Core.Communication; namespace PlataformaEducacao.Bff.Api.Tests.Controllers { - // Pequena implementação concreta para expor os métodos protegidos do BaseController - public class TestBaseController : BaseController - { - public ActionResult InvokeCustomResponse(ModelStateDictionary modelState) - { - return CustomResponse(modelState); - } - - public ActionResult InvokeCustomResponse(ResponseResult response) - { - return CustomResponse(response); - } - } - public class BaseControllerTest { [Fact(DisplayName = "CustomResponse com ModelState com erros deve retornar BadRequest com ResponseResult")] @@ -54,7 +40,7 @@ public void CustomResponse_NullResponse_Returns_BadRequest() // Act ResponseResult? nullResponse = null; - var result = controller.InvokeCustomResponse(nullResponse!); + var result = controller.InvokeCustomResponse(nullResponse); // Assert result.Should().BeOfType(); diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Controllers/TestBaseController.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Controllers/TestBaseController.cs new file mode 100644 index 0000000..651e2c5 --- /dev/null +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Controllers/TestBaseController.cs @@ -0,0 +1,23 @@ +using FluentAssertions; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using PlataformaEducacao.Bff.Api.Controllers; +using PlataformaEducacao.Core.Communication; + +namespace PlataformaEducacao.Bff.Api.Tests.Controllers +{ + // Pequena implementação concreta para expor os métodos protegidos do BaseController + public class TestBaseController : BaseController + { + public ActionResult InvokeCustomResponse(ModelStateDictionary modelState) + { + return CustomResponse(modelState); + } + + public ActionResult InvokeCustomResponse(ResponseResult response) + { + return CustomResponse(response); + } + } +} diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Extensions/HttpClientAuthorizationDelegatingHandlerTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Extensions/HttpClientAuthorizationDelegatingHandlerTest.cs index d19197a..f93e3b2 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Extensions/HttpClientAuthorizationDelegatingHandlerTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Extensions/HttpClientAuthorizationDelegatingHandlerTest.cs @@ -14,7 +14,7 @@ public async Task SendAsync_ComAuthorization_DevePropagarHeader() { // Arrange var httpContext = new DefaultHttpContext(); - httpContext.Request.Headers["Authorization"] = "Bearer meu-token"; + httpContext.Request.Headers.Authorization = "Bearer meu-token"; var mockUser = new Mock(); mockUser.Setup(u => u.ObterHttpContext()).Returns(httpContext); @@ -68,7 +68,7 @@ public async Task SendAsync_SemAuthorization_NaoDeveAdicionarHeader() innerHandler.CapturedRequest!.Headers.Contains("Authorization").Should().BeFalse(); } - private class CaptureRequestHandler : HttpMessageHandler + private sealed class CaptureRequestHandler : HttpMessageHandler { public HttpRequestMessage? CapturedRequest { get; private set; } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoAlunosIntegrationTests.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoAlunosIntegrationTests.cs index 9653210..116e211 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoAlunosIntegrationTests.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoAlunosIntegrationTests.cs @@ -1,12 +1,12 @@ +using System.Net; +using System.Net.Http.Json; using FluentAssertions; using PlataformaEducacao.Bff.Api.Models.GestaoAlunos; using PlataformaEducacao.Bff.Api.Tests.Config; -using System.Net; -using System.Net.Http.Json; namespace PlataformaEducacao.Bff.Api.Tests { - [Collection(nameof(IntegrationApiTestsFixtureCollection))] + [Collection(nameof(IntegrationApiTestsCollectionFixture))] public class GestaoAlunosIntegrationTests : IClassFixture> { private readonly IntegrationTestsFixture _fixture; diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoConteudoIntegrationTests.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoConteudoIntegrationTests.cs index d5257a5..27ab39d 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoConteudoIntegrationTests.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/GestaoConteudoIntegrationTests.cs @@ -1,11 +1,11 @@ -using FluentAssertions; -using PlataformaEducacao.Bff.Api.Tests.Config; using System.Net; using System.Net.Http.Json; +using FluentAssertions; +using PlataformaEducacao.Bff.Api.Tests.Config; namespace PlataformaEducacao.Bff.Api.Tests { - [Collection(nameof(IntegrationApiTestsFixtureCollection))] + [Collection(nameof(IntegrationApiTestsCollectionFixture))] public class GestaoConteudoIntegrationTests : IClassFixture> { private readonly IntegrationTestsFixture _fixture; diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/PagamentosIntegrationTests.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/PagamentosIntegrationTests.cs index 16b7c8f..3cf1d3e 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/PagamentosIntegrationTests.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/PagamentosIntegrationTests.cs @@ -1,11 +1,11 @@ -using FluentAssertions; -using PlataformaEducacao.Bff.Api.Tests.Config; using System.Net; using System.Net.Http.Json; +using FluentAssertions; +using PlataformaEducacao.Bff.Api.Tests.Config; namespace PlataformaEducacao.Bff.Api.Tests { - [Collection(nameof(IntegrationApiTestsFixtureCollection))] + [Collection(nameof(IntegrationApiTestsCollectionFixture))] public class PagamentosIntegrationTests : IClassFixture> { private readonly IntegrationTestsFixture _fixture; @@ -56,10 +56,10 @@ public async Task PagarMatricula_SemDadosCartao_DeveRetornarBadRequest() { MatriculaId = Guid.NewGuid(), Valor = 0, - NomeCartao = "", - NumeroCartao = "", - ExpiracaoCartao = "", - CvvCartao = "" + NomeCartao = string.Empty, + NumeroCartao = string.Empty, + ExpiracaoCartao = string.Empty, + CvvCartao = string.Empty }); response.StatusCode.Should().Be(HttpStatusCode.BadRequest); diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/AlunosServiceTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/AlunosServiceTest.cs index e96fe9a..20a89bc 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/AlunosServiceTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/AlunosServiceTest.cs @@ -1,16 +1,16 @@ -using Microsoft.Extensions.Options; +using System.Net; +using System.Text.Json; +using Microsoft.Extensions.Options; using Moq; using PlataformaEducacao.Bff.Api.Extensions; using PlataformaEducacao.Bff.Api.Models.GestaoAlunos; using PlataformaEducacao.Bff.Api.Models.GestaoConteudo; using PlataformaEducacao.Bff.Api.Services; using PlataformaEducacao.Core.Communication; -using System.Net; -using System.Text.Json; namespace PlataformaEducacao.Bff.Api.Tests.Services { - public class AlunosServiceTest + public class AlunosServiceTest : IDisposable { private readonly MockHttpMessageHandler _handler; private readonly Mock _cursosServiceMock; @@ -226,5 +226,10 @@ public async Task BaixarCertificado_DeveRetornar() Assert.Equal(HttpStatusCode.OK, result.StatusCode); } + + public void Dispose() + { + _handler.Dispose(); + } } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/BffPagamentoServiceTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/BffPagamentoServiceTest.cs index fcc13bc..343fd1e 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/BffPagamentoServiceTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/BffPagamentoServiceTest.cs @@ -1,13 +1,13 @@ +using System.Net; using Microsoft.Extensions.Options; using PlataformaEducacao.Bff.Api.Extensions; using PlataformaEducacao.Bff.Api.Models.GestaoFinanceira; using PlataformaEducacao.Bff.Api.Services; using PlataformaEducacao.Core.Communication; -using System.Net; namespace PlataformaEducacao.Bff.Api.Tests.Services { - public class BffPagamentoServiceTest + public class BffPagamentoServiceTest : IDisposable { private readonly MockHttpMessageHandler _handler; private readonly PagamentoService _service; @@ -88,5 +88,10 @@ public async Task PagarMatricula_ComErro_DeveRetornarFalha() Assert.False(result.Sucesso); } + + public void Dispose() + { + _handler.Dispose(); + } } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/CursosServiceTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/CursosServiceTest.cs index db7f40a..67e6013 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/CursosServiceTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/CursosServiceTest.cs @@ -1,13 +1,13 @@ +using System.Net; using Microsoft.Extensions.Options; using PlataformaEducacao.Bff.Api.Extensions; using PlataformaEducacao.Bff.Api.Models.Request.GestaoConteudo; using PlataformaEducacao.Bff.Api.Services; using PlataformaEducacao.Core.Communication; -using System.Net; namespace PlataformaEducacao.Bff.Api.Tests.Services { - public class CursosServiceTest + public class CursosServiceTest : IDisposable { private readonly MockHttpMessageHandler _handler; private readonly CursosService _service; @@ -89,5 +89,10 @@ public async Task ObterTodos_DeveRetornar() Assert.True(result.Sucesso); } + + public void Dispose() + { + _handler.Dispose(); + } } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/HealthCheckServiceTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/HealthCheckServiceTest.cs index e771b74..9a97512 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/HealthCheckServiceTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/HealthCheckServiceTest.cs @@ -1,9 +1,9 @@ -using FluentAssertions; +using System.Net; +using FluentAssertions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using PlataformaEducacao.Bff.Api.Extensions; using PlataformaEducacao.Bff.Api.Services; -using System.Net; namespace PlataformaEducacao.Bff.Api.Tests.Services { @@ -103,7 +103,7 @@ public async Task VerificarSaude_DeveRetornarDadosDeTodasDependencias() resultado.Data.Should().NotBeNull(); } - private class ExceptionThrowingHandler : HttpMessageHandler + private sealed class ExceptionThrowingHandler : HttpMessageHandler { protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/IdentidadeServiceTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/IdentidadeServiceTest.cs index c77e462..9f30e74 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/IdentidadeServiceTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/IdentidadeServiceTest.cs @@ -1,13 +1,13 @@ -using Microsoft.Extensions.Options; +using System.Net; +using Microsoft.Extensions.Options; using PlataformaEducacao.Bff.Api.Extensions; using PlataformaEducacao.Bff.Api.Models.Request.Identidade; using PlataformaEducacao.Bff.Api.Services; using PlataformaEducacao.Core.Communication; -using System.Net; namespace PlataformaEducacao.Bff.Api.Tests.Services { - public class IdentidadeServiceTest + public class IdentidadeServiceTest : IDisposable { private readonly MockHttpMessageHandler _handler; private readonly IdentidadeService _service; @@ -60,5 +60,10 @@ public async Task Login_ComFalha_DeveRetornarErros() Assert.False(result.Sucesso); } + + public void Dispose() + { + _handler.Dispose(); + } } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/MockHttpMessageHandler.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/MockHttpMessageHandler.cs index ebb8161..c813250 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/MockHttpMessageHandler.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/MockHttpMessageHandler.cs @@ -10,24 +10,20 @@ public class MockHttpMessageHandler : HttpMessageHandler public void SetupResponse(string url, HttpStatusCode statusCode, object? content = null) { - var json = content != null - ? JsonSerializer.Serialize(content, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }) - : ""; + var json = content != null ? JsonSerializer.Serialize(content, PropertyNameCaseInsensitive) : string.Empty; _responses[url] = (statusCode, json); } public void SetupResponse(HttpStatusCode statusCode, object? content = null) { - var json = content != null - ? JsonSerializer.Serialize(content, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }) - : ""; + var json = content != null ? JsonSerializer.Serialize(content, PropertyNameCaseInsensitive) : string.Empty; _responses["*"] = (statusCode, json); } protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { - var url = request.RequestUri?.ToString() ?? ""; - var path = request.RequestUri?.PathAndQuery ?? ""; + var url = request.RequestUri?.ToString() ?? string.Empty; + var path = request.RequestUri?.PathAndQuery ?? string.Empty; foreach (var kvp in _responses) { @@ -45,5 +41,10 @@ protected override Task SendAsync(HttpRequestMessage reques Content = new StringContent("{}", Encoding.UTF8, "application/json") }); } + + private static readonly JsonSerializerOptions PropertyNameCaseInsensitive = new() + { + PropertyNameCaseInsensitive = true + }; } } diff --git a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/ServiceBaseTest.cs b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/ServiceBaseTest.cs index 0956d08..3488d1e 100644 --- a/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/ServiceBaseTest.cs +++ b/src/tests/PlataformaEducacao.Bff.Api.Tests/Services/ServiceBaseTest.cs @@ -1,8 +1,8 @@ -using PlataformaEducacao.Bff.Api.Services; -using PlataformaEducacao.Core.Communication; -using System.Net; +using System.Net; using System.Text; using System.Text.Json; +using PlataformaEducacao.Bff.Api.Services; +using PlataformaEducacao.Core.Communication; namespace PlataformaEducacao.Bff.Api.Tests.Services { @@ -74,7 +74,7 @@ public async Task DeserializarObjetoResponse_ComConteudoVazio_DeveRetornarFallba // Arrange var httpResponse = new HttpResponseMessage(HttpStatusCode.NoContent) { - Content = new StringContent("", Encoding.UTF8, "application/json"), + Content = new StringContent(string.Empty, Encoding.UTF8, "application/json"), ReasonPhrase = "No Content" }; @@ -92,7 +92,7 @@ public async Task DeserializarObjetoResponse_ComReasonPhrase_DeveUsarReasonPhras // Arrange var httpResponse = new HttpResponseMessage(HttpStatusCode.BadGateway) { - Content = new StringContent("", Encoding.UTF8, "application/json"), + Content = new StringContent(string.Empty, Encoding.UTF8, "application/json"), ReasonPhrase = "Bad Gateway" }; @@ -119,7 +119,7 @@ public void DeserializarData_ComJsonElement_DeveDeserializar() // Assert Assert.NotNull(result); - Assert.Equal("Curso", result!.Nome); + Assert.Equal("Curso", result.Nome); Assert.Equal(500, result.Valor); } @@ -136,7 +136,7 @@ public void DeserializarData_ComTipoDireto_DeveRetornarObjeto() // Assert Assert.NotNull(result); - Assert.Equal("Direto", result!.Nome); + Assert.Equal("Direto", result.Nome); } [Fact(DisplayName = "DeserializarData com null deve retornar default")] @@ -156,13 +156,16 @@ public void DeserializarData_ComNull_DeveRetornarDefault() public class TestDto { public string Nome { get; set; } = string.Empty; + public int Valor { get; set; } } - private class TestableService : Service + private sealed class TestableService : Service { public StringContent TestObterConteudo(object dado) => ObterConteudo(dado); + public Task TestDeserializarObjetoResponse(HttpResponseMessage msg) => DeserializarObjetoResponse(msg); + public T? TestDeserializarData(ResponseResult resp) => DeserializarData(resp); } } diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Config/GestaoAlunoApiFactory.cs b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Config/GestaoAlunoApiFactory.cs index 40c1138..d3c428c 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Config/GestaoAlunoApiFactory.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Config/GestaoAlunoApiFactory.cs @@ -12,7 +12,7 @@ namespace PlataformaEducacao.GestaoAluno.Api.Tests.Config { public class GestaoAlunoApiFactory : WebApplicationFactory, IDisposable { - private SqliteConnection _connection = null!; + private readonly SqliteConnection _connection = null!; public GestaoAlunoApiFactory() { @@ -20,6 +20,13 @@ public GestaoAlunoApiFactory() _connection.Open(); } + public new void Dispose() + { + base.Dispose(); + + _connection?.Close(); + } + protected override void ConfigureWebHost(IWebHostBuilder builder) { builder.ConfigureAppConfiguration((_, configBuilder) => @@ -68,11 +75,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder) foreach (var hs in hostedServices) services.Remove(hs); - using (var scope = services.BuildServiceProvider().CreateScope()) - { - var serviceProvider = scope.ServiceProvider; - DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); - } + using var scope = services.BuildServiceProvider().CreateScope(); + var serviceProvider = scope.ServiceProvider; + DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); }); } @@ -81,15 +86,5 @@ protected override IHost CreateHost(IHostBuilder builder) builder.UseEnvironment("Testing"); return base.CreateHost(builder); } - - public new void Dispose() - { - base.Dispose(); - - if (_connection != null) - { - _connection.Close(); - } - } } } diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Configurations/GestaoAlunoApiConfigurationsTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Configurations/GestaoAlunoApiConfigurationsTest.cs index d809b58..84faa7f 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Configurations/GestaoAlunoApiConfigurationsTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Configurations/GestaoAlunoApiConfigurationsTest.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc.Testing; +using System.Net; +using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.DependencyInjection; using PlataformaEducacao.Core.Mediator; using PlataformaEducacao.GestaoAluno.Api.Tests.Config; @@ -6,7 +7,6 @@ using PlataformaEducacao.GestaoAluno.Domain.Repositories; using PlataformaEducacao.GestaoAluno.Domain.Services; using PlataformaEducacao.WebApi.Core.Usuario; -using System.Net; namespace PlataformaEducacao.GestaoAluno.Api.Tests.Configurations { diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Controllers/AlunosControllerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Controllers/AlunosControllerTest.cs index 52a08a0..0e4040e 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Controllers/AlunosControllerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Controllers/AlunosControllerTest.cs @@ -1,3 +1,5 @@ +using System.Net; +using System.Security.Claims; using FluentValidation.Results; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -12,8 +14,6 @@ using PlataformaEducacao.GestaoAluno.Application.Queries; using PlataformaEducacao.GestaoAluno.Application.Queries.ViewModels; using PlataformaEducacao.WebApi.Core.Usuario; -using System.Net; -using System.Security.Claims; namespace PlataformaEducacao.GestaoAluno.Api.Tests.Controllers { @@ -28,8 +28,7 @@ public async Task ObterMatriculasAtivas_RetornaOkComDados() { ObterMatriculasAtivasPorAlunoIdResult = [ - new(matriculaId: Guid.NewGuid(), alunoId: Guid.NewGuid(), nomeAluno: "Aluno", cursoId: Guid.NewGuid(), nomeCurso: "Curso", situacaoMatricula: 0, - dataMatricula: DateTime.UtcNow, situacaoCurso: 0, dataConclusao: null, progressoGeralCurso: 0, certificadoId: null, codigoVerificacao: null) + new(matriculaId: Guid.NewGuid(), alunoId: Guid.NewGuid(), nomeAluno: "Aluno", cursoId: Guid.NewGuid(), nomeCurso: "Curso", situacaoMatricula: 0, dataMatricula: DateTime.UtcNow, situacaoCurso: 0, dataConclusao: null, progressoGeralCurso: 0, certificadoId: null, codigoVerificacao: null) ] }; @@ -74,8 +73,8 @@ public async Task ValidarCertificado_RetornaOkComDados() // Arrange var consultas = new FakeAlunoQueries { - ValidarCertificadoResult = new CertificadoDTO(certificadoId: Guid.NewGuid(), nomeAluno: "Aluno", nomeCurso: "Curso", dataConclusao: DateTime.UtcNow, - codigoVerificacao: "ABC123") + ValidarCertificadoResult = new CertificadoDTO( + certificadoId: Guid.NewGuid(), nomeAluno: "Aluno", nomeCurso: "Curso", dataConclusao: DateTime.UtcNow, codigoVerificacao: "ABC123") }; var controlador = CriarControlador(consultas); @@ -368,30 +367,39 @@ private static AlunosController CriarControlador(FakeAlunoQueries consultas) return new AlunosController(consultas, usuario, mediador); } - #region Fakes - - private class FakeAlunoQueries : IAlunoQueries + private sealed class FakeAlunoQueries : IAlunoQueries { public IEnumerable? ObterMatriculasAtivasPorAlunoIdResult { get; set; } + public IEnumerable? ListarMatriculasPendentesPagamentoPorAlunoIdResult { get; set; } + public CertificadoDTO? ValidarCertificadoResult { get; set; } + public ArquivoDTO? BaixarCertificadoResult { get; set; } + public HistoricoAlunoViewModel? ObterHistoricoAlunoResult { get; set; } public Task ObterMatricula(Guid matriculaId, CancellationToken cancellationToken) => Task.FromResult(null); + public Task> ListarMatriculasPendentesPagamentoPorAlunoId(Guid alunoId, CancellationToken cancellationToken) => Task.FromResult(ListarMatriculasPendentesPagamentoPorAlunoIdResult ?? []); + public Task> ObterMatriculasAtivasPorAlunoId(Guid alunoId, CancellationToken cancellationToken) => Task.FromResult(ObterMatriculasAtivasPorAlunoIdResult ?? []); + public Task> ObterAlunosMatriculadosPorCursoId(Guid cursoId, CancellationToken cancellationToken) => Task.FromResult(Enumerable.Empty()); + public Task> ObterAlunosPendentesPorCursoId(Guid cursoId, CancellationToken cancellationToken) => Task.FromResult(Enumerable.Empty()); + public Task ValidarCertificado(string codigoVerificacao, CancellationToken cancellationToken) => Task.FromResult(ValidarCertificadoResult); + public Task BaixarCertificado(Guid certificadoId, CancellationToken cancellationToken) => Task.FromResult(BaixarCertificadoResult); + public Task ObterHistoricoAluno(Guid alunoId, CancellationToken cancellationToken) => Task.FromResult(ObterHistoricoAlunoResult); } @@ -399,39 +407,48 @@ public Task> ObterAlunosPendentesPorCursoId(Guid private class FakeAspNetUser(Guid id) : IAspNetUser { private readonly Guid _id = id; + public string Name => string.Empty; + public Guid ObterUserId() => _id; + public string ObterUserEmail() => string.Empty; + public string ObterUserToken() => string.Empty; + public string ObterUserRefreshToken() => string.Empty; + public bool EstaAutenticado() => true; + public virtual bool PossuiRole(string role) => true; + public IEnumerable ObterClaims() => []; + public HttpContext ObterHttpContext() => new DefaultHttpContext(); } - private class UsuarioFakeSemPapelAdmin(Guid id) : FakeAspNetUser(id) + private sealed class UsuarioFakeSemPapelAdmin(Guid id) : FakeAspNetUser(id) { public override bool PossuiRole(string role) => role != "ADMIN"; } - private class UsuarioFakeComPapelAdmin(Guid id) : FakeAspNetUser(id) + private sealed class UsuarioFakeComPapelAdmin(Guid id) : FakeAspNetUser(id) { public override bool PossuiRole(string role) => role == "ADMIN"; } - private class FakeMediatorHandler : IMediatorHandler + private sealed class FakeMediatorHandler : IMediatorHandler { public ValidationResult SendCommandResult { get; set; } = new ValidationResult(); - public Task PublishEvent(T evento) where T : Event => Task.CompletedTask; + public Task PublishEvent(T evento) + where T : Evento => Task.CompletedTask; - public Task SendCommand(T comando) where T : Command + public Task SendCommand(T comando) + where T : Command { return Task.FromResult(SendCommandResult); } } - - #endregion } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Data/AlunoRepositoryIntegrationTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Data/AlunoRepositoryIntegrationTest.cs index c0ad991..6d668fb 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Data/AlunoRepositoryIntegrationTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Data/AlunoRepositoryIntegrationTest.cs @@ -297,7 +297,13 @@ public void Dispose_NaoDeveLancarExcecao() Assert.Null(exception); } - private Aluno CriarAlunoComMatricula() + public void Dispose() + { + _context.Dispose(); + _connection.Dispose(); + } + + private static Aluno CriarAlunoComMatricula() { var aluno = new Aluno(Guid.NewGuid(), "Aluno Teste", "aluno@teste.com"); var matricula = new Matricula(Guid.NewGuid(), "Curso Teste", 5, 100m); @@ -305,7 +311,7 @@ private Aluno CriarAlunoComMatricula() return aluno; } - private Aluno CriarAlunoComMatriculaAtiva() + private static Aluno CriarAlunoComMatriculaAtiva() { var aluno = CriarAlunoComMatricula(); aluno.ConcluirPagamentoMatricula(aluno.Matriculas.First()); @@ -317,11 +323,5 @@ private async Task SalvarAluno(Aluno aluno) _context.Alunos.Add(aluno); await _context.SaveChangesAsync(); } - - public void Dispose() - { - _context.Dispose(); - _connection.Dispose(); - } } } diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Requests/MatricularRequestTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Requests/MatricularRequestTest.cs index 08f323d..c6aa8b3 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Requests/MatricularRequestTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Api.Tests/Requests/MatricularRequestTest.cs @@ -1,5 +1,5 @@ -using PlataformaEducacao.GestaoAluno.Api.Requests; using System.ComponentModel.DataAnnotations; +using PlataformaEducacao.GestaoAluno.Api.Requests; namespace PlataformaEducacao.GestaoAluno.Api.Tests.Requests { @@ -53,4 +53,4 @@ public void MatricularRequest_NomeCursoVazio_RetornaErroDeValidacao() Assert.Contains("O nome do curso é obrigatório.", mensagens); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandHandlerTest.cs index d207fbf..ead00fa 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandHandlerTest.cs @@ -13,7 +13,7 @@ public class AdicionarAlunoCommandHandlerTest public async Task Handle_CommandInvalido_RetornaCommandValidationResultENaoChamaRepositorio() { // Arrange - var comandoInvalido = new AdicionarAlunoCommand(Guid.Empty, "", ""); + var comandoInvalido = new AdicionarAlunoCommand(Guid.Empty, string.Empty, string.Empty); var repositorioMock = new Mock(MockBehavior.Strict); var handler = new AdicionarAlunoCommandHandler(repositorioMock.Object); @@ -95,4 +95,4 @@ public async Task Handle_QuandoRepositorioInserirLancaExcecao_DevePropagarExceca repositorioMock.Verify(r => r.Inserir(It.IsAny(), It.IsAny()), Times.Once); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandTest.cs index 7dbf291..49a189b 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/AdicionarAluno/AdicionarAlunoCommandTest.cs @@ -38,7 +38,7 @@ public void AdicionarAlunoCommand_QuandoUsuarioIdVazio_DeveSerInvalido() public void AdicionarAlunoCommand_QuandoNomeVazio_DeveSerInvalido() { // Arrange - var command = new AdicionarAlunoCommand(Guid.NewGuid(), "", "fulano@teste.com"); + var command = new AdicionarAlunoCommand(Guid.NewGuid(), string.Empty, "fulano@teste.com"); // Act var result = command.EhValido(); @@ -53,7 +53,7 @@ public void AdicionarAlunoCommand_QuandoNomeVazio_DeveSerInvalido() public void AdicionarAlunoCommand_QuandoEmailVazio_DeveSerInvalido() { // Arrange - var command = new AdicionarAlunoCommand(Guid.NewGuid(), "Fulano de Tal", ""); + var command = new AdicionarAlunoCommand(Guid.NewGuid(), "Fulano de Tal", string.Empty); // Act var result = command.EhValido(); @@ -63,4 +63,4 @@ public void AdicionarAlunoCommand_QuandoEmailVazio_DeveSerInvalido() Assert.Contains(command.ValidationResult.Errors, e => e.ErrorMessage == "O e-mail do aluno é obrigatório."); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandHandlerTest.cs index ed62b46..2bfd1a4 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandHandlerTest.cs @@ -8,7 +8,7 @@ namespace PlataformaEducacao.GestaoAluno.Application.Tests.Commands.FinalizarCur { public class FinalizarCursoCommandHandlerTest { - readonly Aluno _aluno = new(Guid.NewGuid(), "Nome do Aluno", "email@teste.com"); + private readonly Aluno _aluno = new(Guid.NewGuid(), "Nome do Aluno", "email@teste.com"); [Fact(DisplayName = "FinalizarCursoCommand quando comando inválido retorna validação e não chama repositório")] [Trait("Categoria", "Gestão Aluno - Application - Commands - FinalizarCursoCommandHandler")] @@ -147,4 +147,4 @@ public async Task Handle_Valido_PersisteConformeCommit(bool resultadoCommit) uowMock.Verify(u => u.Commit(), Times.Once); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandTest.cs index ea46e98..607d15a 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/FinalizarCurso/FinalizarCursoCommandTest.cs @@ -33,4 +33,4 @@ public void FinalizarCursoCommand_QuandoMatriculaIdVazio_DeveSerInvalido() Assert.Contains(comando.ValidationResult.Errors, e => e.ErrorMessage == "Id da matrícula inválido."); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandHandlerTest.cs index 43dda3e..8a73950 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandHandlerTest.cs @@ -60,8 +60,8 @@ public async Task Handle_MatriculaComCertificado_ChamaRepositorioEPersiste() Assert.True(resultado.IsValid); repositorioMock.Verify(r => r.GerarCertificado(It.IsAny(), It.IsAny()), Times.Once); Assert.NotNull(certificadoGerado); - Assert.Equal(matricula.Id, certificadoGerado!.MatriculaId); + Assert.Equal(matricula.Id, certificadoGerado.MatriculaId); uowMock.Verify(u => u.Commit(), Times.Once); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandTest.cs index 91efabd..b7bbe47 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/GerarCertificado/GerarCertificadoCommandTest.cs @@ -35,4 +35,4 @@ public void GerarCertificadoCommand_QuandoMatriculaIdVazio_DeveSerInvalido() Assert.Contains(resultado.Errors, e => e.ErrorMessage == "Id da matrícula inválido."); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandlerTest.cs index 90ee55e..e39513a 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandHandlerTest.cs @@ -8,7 +8,7 @@ namespace PlataformaEducacao.GestaoAluno.Application.Tests.Commands.MatricularAl { public class MatricularAlunoCursoCommandHandlerTest { - readonly Aluno _aluno = new(alunoId: Guid.NewGuid(), "Fulano de Tal", "fulano@teste.com"); + private readonly Aluno _aluno = new(alunoId: Guid.NewGuid(), "Fulano de Tal", "fulano@teste.com"); [Fact(DisplayName = "MatricularAlunoCurso quando comando inválido retorna validação e não chama repositório")] [Trait("Categoria", "Gestão Aluno - Application - Commands - MatricularAlunoCursoHandler")] @@ -16,7 +16,7 @@ public async Task Handle_ComandoInvalido_RetornaValidacaoENaoChamaRepositorio() { // Arrange var comandoInvalido = new MatricularAlunoCursoCommand( - cursoId: Guid.Empty, alunoId: Guid.Empty, nomeCurso: "", totalAulasCurso: 0, valor: 0m); + cursoId: Guid.Empty, alunoId: Guid.Empty, nomeCurso: string.Empty, totalAulasCurso: 0, valor: 0m); var repositorioMock = new Mock(MockBehavior.Strict); var handler = new MatricularAlunoCursoCommandHandler(repositorioMock.Object); @@ -111,9 +111,9 @@ public async Task Handle_Valido_PersisteConformeCommit(bool commitResult) uowMock.Verify(u => u.Commit(), Times.Once); Assert.NotNull(matriculaObtida); - Assert.Equal(cursoId, matriculaObtida!.CursoId); + Assert.Equal(cursoId, matriculaObtida.CursoId); Assert.Equal("Curso X", matriculaObtida.NomeCurso); Assert.Equal(200m, matriculaObtida.Valor); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandTest.cs index 77b14c7..78cc183 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/MatricularAlunoCurso/MatricularAlunoCursoCommandTest.cs @@ -57,7 +57,7 @@ public void MatricularAlunoCursoCommand_QuandoNomeCursoVazio_DeveSerInvalido() { // Arrange var comando = new MatricularAlunoCursoCommand( - cursoId: Guid.NewGuid(), alunoId: Guid.NewGuid(), nomeCurso: "", totalAulasCurso: 10, valor: 100m); + cursoId: Guid.NewGuid(), alunoId: Guid.NewGuid(), nomeCurso: string.Empty, totalAulasCurso: 10, valor: 100m); // Act var resultado = comando.EhValido(); @@ -99,4 +99,4 @@ public void MatricularAlunoCursoCommand_QuandoTotalAulasCursoInvalido_DeveSerInv Assert.Contains(comando.ValidationResult.Errors, e => e.ErrorMessage == "O número de aulas do curso é obrigatório."); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandHandlerTest.cs index 1007879..a5ae716 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandHandlerTest.cs @@ -8,7 +8,7 @@ namespace PlataformaEducacao.GestaoAluno.Application.Tests.Commands.RealizarAula { public class RealizarAulaCommandHandlerTest { - readonly Aluno _aluno = new(alunoId: Guid.NewGuid(), "Fulano de Tal", "fulano@teste.com"); + private readonly Aluno _aluno = new(alunoId: Guid.NewGuid(), "Fulano de Tal", "fulano@teste.com"); [Fact(DisplayName = "RealizarAula quando comando inválido não chama repositório")] [Trait("Categoria", "Gestão Aluno - Application - Commands - RealizarAulaCommandHandler")] @@ -24,8 +24,7 @@ public async Task Handle_ComandoInvalido_NaoChamaRepositorio() // Assert Assert.Same(comandoInvalido.ValidationResult, resultado); - repositorioMock.Verify(r => r.ObterMatriculaComProgressoAulasPorId( - It.IsAny(), It.IsAny()), Times.Never); + repositorioMock.Verify(r => r.ObterMatriculaComProgressoAulasPorId(It.IsAny(), It.IsAny()), Times.Never); } [Fact(DisplayName = "RealizarAula quando aula pertence a curso diferente adiciona erro")] @@ -171,10 +170,8 @@ public async Task Handle_Valido_PersisteConformeCommit(bool resultadoCommit) if (!resultadoCommit) Assert.Contains(resultado.Errors, e => e.ErrorMessage == "Houve um erro ao persistir os dados"); - repositorioMock.Verify(r => r.AtualizarProgressoAula( - It.IsAny(), It.IsAny()), Times.Once); - repositorioMock.Verify(r => r.AtualizarMatricula( - It.IsAny(), It.IsAny()), Times.Once); + repositorioMock.Verify(r => r.AtualizarProgressoAula(It.IsAny(), It.IsAny()), Times.Once); + repositorioMock.Verify(r => r.AtualizarMatricula(It.IsAny(), It.IsAny()), Times.Once); repositorioMock.VerifyGet(r => r.UnitOfWork, Times.AtLeastOnce); uowMock.Verify(u => u.Commit(), Times.Once); @@ -184,4 +181,4 @@ public async Task Handle_Valido_PersisteConformeCommit(bool resultadoCommit) Assert.Equal(matricula.Id, matriculaCapturada.Id); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandTest.cs index caf7110..eb670b0 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Commands/RealizarAula/RealizarAulaCommandTest.cs @@ -63,4 +63,4 @@ public void RealizarAulaCommand_AulaIdVazio_DeveSerInvalido() Assert.Contains(comando.ValidationResult.Errors, e => e.ErrorMessage == "Id da aula inválido."); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/ArquivoDTOTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/ArquivoDTOTest.cs index 101f95f..75a7285 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/ArquivoDTOTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/ArquivoDTOTest.cs @@ -1,5 +1,5 @@ -using PlataformaEducacao.GestaoAluno.Application.DTO; using System.Text; +using PlataformaEducacao.GestaoAluno.Application.DTO; namespace PlataformaEducacao.GestaoAluno.Application.Tests.DTO { @@ -45,9 +45,9 @@ public void ArquivoDTO_Serializado_DevePreservarValores() // Assert Assert.NotNull(dtoDeserialized); - Assert.Equal(dto.NomeArquivo, dtoDeserialized!.NomeArquivo); + Assert.Equal(dto.NomeArquivo, dtoDeserialized.NomeArquivo); Assert.Equal(dto.ContentType, dtoDeserialized.ContentType); Assert.Equal(dto.PdfBytes, dtoDeserialized.PdfBytes); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/CertificadoDTOTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/CertificadoDTOTest.cs index f8f4b45..9e09d60 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/CertificadoDTOTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/CertificadoDTOTest.cs @@ -49,4 +49,4 @@ public void CertificadoDTO_FromMatricula_DeveMapearCorretamente() Assert.Equal(matricula.Certificado!.CodigoVerificacao, dto.CodigoVerificacao); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaAtivaDTOTests.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaAtivaDTOTests.cs index 2271406..4b57f23 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaAtivaDTOTests.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaAtivaDTOTests.cs @@ -21,7 +21,7 @@ public void MatriculaAtivaDTO_Construtor_DeveAtribuirPropriedades() DateTime? dataConclusao = DateTime.UtcNow.Date; var progresso = 75.5; Guid? certificadoId = Guid.NewGuid(); - string? codigo = "ABC-123"; + var codigo = "ABC-123"; // Act var dto = new MatriculaAtivaDTO(matriculaId, alunoId, nomeAluno, cursoId, nomeCurso, situacaoMatricula, dataMatricula, situacaoCurso, dataConclusao, progresso, certificadoId, codigo); @@ -84,4 +84,4 @@ public void MatriculaAtivaDTO_FromMatriculaComCertificado_DeveMapearCorretamente Assert.Equal(certificado.CodigoVerificacao, dto.CodigoVerificacao); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaPendentePagamentoDTOTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaPendentePagamentoDTOTest.cs index 2476158..5f85e00 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaPendentePagamentoDTOTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/DTO/MatriculaPendentePagamentoDTOTest.cs @@ -55,4 +55,4 @@ public void MatriculaPendentePagamentoDTO_FromMatricula_DeveMapearCorretamente() Assert.Equal(matricula.DataMatricula, dto.DataMatricula); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Events/MatriculaEventHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Events/MatriculaEventHandlerTest.cs index 39f73ba..e06e81b 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Events/MatriculaEventHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Events/MatriculaEventHandlerTest.cs @@ -13,13 +13,13 @@ public class MatriculaEventHandlerTest public async Task Handle_CursoFinalizadoEvent_EnviaGerarCertificadoCommand() { // Arrange - var matriculaId = System.Guid.NewGuid(); + var matriculaId = Guid.NewGuid(); var evento = new CursoFinalizadoEvent(matriculaId); var mediatorMock = new Mock(); mediatorMock.Setup(m => m.SendCommand(It.IsAny())).ReturnsAsync(new FluentValidation.Results.ValidationResult()); - var handler = new MatriculaEventHandler(mediatorMock.Object); + var handler = new MatriculaNotificationHandler(mediatorMock.Object); // Act await handler.Handle(evento, CancellationToken.None); @@ -33,9 +33,9 @@ public async Task Handle_CursoFinalizadoEvent_EnviaGerarCertificadoCommand() public async Task Handle_MatriculaAtivadaEvent_NaoChamaMediator() { // Arrange - var evento = new MatriculaAtivadaEvent(System.Guid.NewGuid()); + var evento = new MatriculaAtivadaEvent(Guid.NewGuid()); var mediatorMock = new Mock(MockBehavior.Strict); - var handler = new MatriculaEventHandler(mediatorMock.Object); + var handler = new MatriculaNotificationHandler(mediatorMock.Object); // Act await handler.Handle(evento, CancellationToken.None); @@ -46,4 +46,4 @@ public async Task Handle_MatriculaAtivadaEvent_NaoChamaMediator() mediatorMock.VerifyNoOtherCalls(); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/AlunoQueriesTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/AlunoQueriesTest.cs index b46c0ba..ea99570 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/AlunoQueriesTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/AlunoQueriesTest.cs @@ -16,11 +16,13 @@ public async Task ListarMatriculasPendentesPagamentoPorAlunoId_RetornaDTOs() var aluno = new Aluno(Guid.NewGuid(), "Aluno A", "a@teste.com"); var matricula = new Matricula(Guid.NewGuid(), "Curso P", totalAulasCurso: 1, valor: 100m); matricula.AssociarAluno(aluno.Id); - var alunoField = typeof(Matricula).GetField("k__BackingField", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); + var alunoField = typeof(Matricula).GetField( + "k__BackingField", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); alunoField?.SetValue(matricula, aluno); var repositorioMock = new Mock(); - repositorioMock.Setup(r => r.ListarMatriculasPendentesPagamentoPorAlunoId(aluno.Id, It.IsAny())).ReturnsAsync(new[] { matricula }); + repositorioMock.Setup(r => r.ListarMatriculasPendentesPagamentoPorAlunoId( + aluno.Id, It.IsAny())).ReturnsAsync([matricula]); var queries = new AlunoQueries(repositorioMock.Object, Mock.Of()); @@ -40,10 +42,12 @@ public async Task ObterAlunosMatriculadosPorCursoId_RetornaViewModels() { // Arrange var aluno = new Aluno(Guid.NewGuid(), "Aluno B", "b@teste.com"); - var matricula = Matricula.MatriculaFactory.CriarComPagamentoAprovado(Guid.NewGuid(), "Curso M", totalAulasCurso: 1, valor: 50m, aluno); + var matricula = Matricula.MatriculaFactory.CriarComPagamentoAprovado( + Guid.NewGuid(), "Curso M", totalAulasCurso: 1, valor: 50m, aluno); var repositorioMock = new Mock(); - repositorioMock.Setup(r => r.ObterAlunosMatriculadosPorCursoId(matricula.CursoId, It.IsAny())).ReturnsAsync(new[] { matricula }); + repositorioMock.Setup(r => r.ObterAlunosMatriculadosPorCursoId( + matricula.CursoId, It.IsAny())).ReturnsAsync([matricula]); var queries = new AlunoQueries(repositorioMock.Object, Mock.Of()); @@ -65,11 +69,13 @@ public async Task ObterAlunosPendentesPorCursoId_RetornaViewModels() var aluno = new Aluno(Guid.NewGuid(), "Aluno BP", "bp@teste.com"); var matricula = new Matricula(Guid.NewGuid(), "Curso MP", totalAulasCurso: 1, valor: 50m); matricula.AssociarAluno(aluno.Id); - var alunoField = typeof(Matricula).GetField("k__BackingField", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); + var alunoField = typeof(Matricula).GetField( + "k__BackingField", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); alunoField?.SetValue(matricula, aluno); var repositorioMock = new Mock(); - repositorioMock.Setup(r => r.ObterAlunosPendentesPorCursoId(matricula.CursoId, It.IsAny())).ReturnsAsync(new[] { matricula }); + repositorioMock.Setup(r => r.ObterAlunosPendentesPorCursoId( + matricula.CursoId, It.IsAny())).ReturnsAsync([matricula]); var queries = new AlunoQueries(repositorioMock.Object, Mock.Of()); @@ -89,10 +95,12 @@ public async Task ObterMatricula_RetornaViewModelOuNull() { // Arrange var aluno = new Aluno(Guid.NewGuid(), "Aluno C", "c@teste.com"); - var matricula = Matricula.MatriculaFactory.CriarComPagamentoAprovado(Guid.NewGuid(), "Curso X", totalAulasCurso: 1, valor: 50m, aluno); + var matricula = Matricula.MatriculaFactory.CriarComPagamentoAprovado( + Guid.NewGuid(), "Curso X", totalAulasCurso: 1, valor: 50m, aluno); var repositorioMock = new Mock(); - repositorioMock.Setup(r => r.ObterMatriculaComAlunoPorId(matricula.Id, It.IsAny())).ReturnsAsync(matricula); + repositorioMock.Setup(r => r.ObterMatriculaComAlunoPorId( + matricula.Id, It.IsAny())).ReturnsAsync(matricula); var queries = new AlunoQueries(repositorioMock.Object, Mock.Of()); @@ -100,12 +108,13 @@ public async Task ObterMatricula_RetornaViewModelOuNull() var encontrada = await queries.ObterMatricula(matricula.Id, CancellationToken.None); // Arrange & Act - segunda parte: matricula não encontrada - repositorioMock.Setup(r => r.ObterMatriculaComAlunoPorId(It.IsAny(), It.IsAny())).ReturnsAsync((Matricula?)null); + repositorioMock.Setup(r => r.ObterMatriculaComAlunoPorId( + It.IsAny(), It.IsAny())).ReturnsAsync((Matricula?)null); var naoEncontrada = await queries.ObterMatricula(Guid.NewGuid(), CancellationToken.None); // Assert Assert.NotNull(encontrada); - Assert.Equal(matricula.Id, encontrada!.MatriculaId); + Assert.Equal(matricula.Id, encontrada.MatriculaId); Assert.Null(naoEncontrada); } @@ -116,10 +125,12 @@ public async Task ObterMatriculasAtivasPorAlunoId_RetornaDTOs() { // Arrange var aluno = new Aluno(Guid.NewGuid(), "Aluno D", "d@teste.com"); - var matricula = Matricula.MatriculaFactory.CriarComPagamentoAprovado(Guid.NewGuid(), "Curso A", totalAulasCurso: 1, valor: 100m, aluno); + var matricula = Matricula.MatriculaFactory.CriarComPagamentoAprovado( + Guid.NewGuid(), "Curso A", totalAulasCurso: 1, valor: 100m, aluno); var repositorioMock = new Mock(); - repositorioMock.Setup(r => r.ObterMatriculasAtivasPorAlunoId(aluno.Id, It.IsAny())).ReturnsAsync(new[] { matricula }); + repositorioMock.Setup(r => r.ObterMatriculasAtivasPorAlunoId( + aluno.Id, It.IsAny())).ReturnsAsync([matricula]); var queries = new AlunoQueries(repositorioMock.Object, Mock.Of()); @@ -142,18 +153,22 @@ public async Task ValidarCertificado_Cases() var queries = new AlunoQueries(repositorioMock.Object, Mock.Of()); // Arrange & Act - certificado não encontrado - repositorioMock.Setup(r => r.ObterCertificadoPorCodigoVerificacao("x", It.IsAny())).ReturnsAsync((Matricula?)null); + repositorioMock.Setup(r => r.ObterCertificadoPorCodigoVerificacao( + "x", It.IsAny())).ReturnsAsync((Matricula?)null); var resultado1 = await queries.ValidarCertificado("x", CancellationToken.None); // Arrange & Act - matricula encontrada mas sem certificado var aluno = new Aluno(Guid.NewGuid(), "Aluno E", "e@teste.com"); - var matricula = Matricula.MatriculaFactory.CriarComCursoFinalizado(Guid.NewGuid(), "Curso F", totalAulasCurso: 1, valor: 100m, aluno); - repositorioMock.Setup(r => r.ObterCertificadoPorCodigoVerificacao("y", It.IsAny())).ReturnsAsync(matricula); + var matricula = Matricula.MatriculaFactory.CriarComCursoFinalizado( + Guid.NewGuid(), "Curso F", totalAulasCurso: 1, valor: 100m, aluno); + repositorioMock.Setup(r => r.ObterCertificadoPorCodigoVerificacao( + "y", It.IsAny())).ReturnsAsync(matricula); var resultado2 = await queries.ValidarCertificado("y", CancellationToken.None); // Arrange & Act - certificado encontrado matricula.GerarCertificado(); - repositorioMock.Setup(r => r.ObterCertificadoPorCodigoVerificacao("z", It.IsAny())).ReturnsAsync(matricula); + repositorioMock.Setup(r => r.ObterCertificadoPorCodigoVerificacao( + "z", It.IsAny())).ReturnsAsync(matricula); var resultado3 = await queries.ValidarCertificado("z", CancellationToken.None); // Assert @@ -173,7 +188,8 @@ public async Task BaixarCertificado_Cases() var repositorioMock = new Mock(); var servicoMock = new Mock(); - repositorioMock.Setup(r => r.ObterCertificadoPorCertificadoId(It.IsAny(), It.IsAny())).ReturnsAsync((Certificado?)null); + repositorioMock.Setup(r => r.ObterCertificadoPorCertificadoId( + It.IsAny(), It.IsAny())).ReturnsAsync((Certificado?)null); var queries = new AlunoQueries(repositorioMock.Object, servicoMock.Object); // Act - certificado não encontrado @@ -181,10 +197,12 @@ public async Task BaixarCertificado_Cases() // Arrange & Act - certificado encontrado var aluno = new Aluno(Guid.NewGuid(), "Aluno F", "f@teste.com"); - var matricula = Matricula.MatriculaFactory.CriarComCursoFinalizado(Guid.NewGuid(), "Curso Cert", totalAulasCurso: 1, valor: 100m, aluno); + var matricula = Matricula.MatriculaFactory.CriarComCursoFinalizado( + Guid.NewGuid(), "Curso Cert", totalAulasCurso: 1, valor: 100m, aluno); var certificado = Certificado.CertificadoFactory.CriarCompleto(matricula, "code-123"); - repositorioMock.Setup(r => r.ObterCertificadoPorCertificadoId(certificado.Id, It.IsAny())).ReturnsAsync(certificado); + repositorioMock.Setup(r => r.ObterCertificadoPorCertificadoId( + certificado.Id, It.IsAny())).ReturnsAsync(certificado); servicoMock.Setup(s => s.GerarCertificado(certificado)).ReturnsAsync([1, 2, 3]); var resultado2 = await queries.BaixarCertificado(certificado.Id, CancellationToken.None); @@ -193,8 +211,9 @@ public async Task BaixarCertificado_Cases() Assert.Null(resultado1); Assert.NotNull(resultado2); - Assert.Equal("application/pdf", resultado2!.ContentType); - var nomeEsperado = $"Certificado_{certificado.Matricula.Aluno.Nome}_{certificado.Matricula.NomeCurso}.pdf".Replace(" ", "_").Replace("/", "-"); + Assert.Equal("application/pdf", resultado2.ContentType); + var nomeEsperado = $"Certificado_{certificado.Matricula.Aluno.Nome}_{certificado.Matricula.NomeCurso}.pdf" + .Replace(" ", "_").Replace("/", "-"); Assert.Equal(nomeEsperado, resultado2.NomeArquivo); Assert.Equal(new byte[] { 1, 2, 3 }, resultado2.PdfBytes); } @@ -207,16 +226,19 @@ public async Task ObterHistoricoAluno_Cases() var repositorioMock = new Mock(); var queries = new AlunoQueries(repositorioMock.Object, Mock.Of()); - repositorioMock.Setup(r => r.ObterComMatriculasPorId(It.IsAny(), It.IsAny())).ReturnsAsync((Aluno?)null); + repositorioMock.Setup(r => r.ObterComMatriculasPorId( + It.IsAny(), It.IsAny())).ReturnsAsync((Aluno?)null); // Act - aluno não encontrado var resultado1 = await queries.ObterHistoricoAluno(Guid.NewGuid(), CancellationToken.None); // Arrange & Act - aluno encontrado var aluno = new Aluno(Guid.NewGuid(), "Aluno G", "g@teste.com"); - var matricula = Matricula.MatriculaFactory.CriarComCursoFinalizado(Guid.NewGuid(), "Curso H", totalAulasCurso: 1, valor: 100m, aluno); - var matriculasFieldAluno = typeof(Aluno).GetField("_matriculas", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); - var lista = (System.Collections.Generic.List?)matriculasFieldAluno?.GetValue(aluno); + var matricula = Matricula.MatriculaFactory.CriarComCursoFinalizado( + Guid.NewGuid(), "Curso H", totalAulasCurso: 1, valor: 100m, aluno); + var matriculasFieldAluno = typeof(Aluno).GetField( + "_matriculas", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); + var lista = (List?)matriculasFieldAluno?.GetValue(aluno); lista?.Add(matricula); repositorioMock.Setup(r => r.ObterComMatriculasPorId(aluno.Id, It.IsAny())).ReturnsAsync(aluno); @@ -227,7 +249,7 @@ public async Task ObterHistoricoAluno_Cases() Assert.Null(resultado1); Assert.NotNull(resultado2); - Assert.Equal(aluno.Nome, resultado2!.NomeAluno); + Assert.Equal(aluno.Nome, resultado2.NomeAluno); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/CursoConcluidoViewModelTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/CursoConcluidoViewModelTest.cs index e3e55e4..6603172 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/CursoConcluidoViewModelTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/CursoConcluidoViewModelTest.cs @@ -40,4 +40,4 @@ public void CursoConcluidoViewModel_FromMatricula_DeveMapearCorretamente() Assert.Equal(matricula.HistoricoAprendizado.DataConclusao, viewModel.DataConclusao); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/HistoricoAlunoViewModelTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/HistoricoAlunoViewModelTest.cs index 27f8e66..44a090f 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/HistoricoAlunoViewModelTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/HistoricoAlunoViewModelTest.cs @@ -36,7 +36,7 @@ public void HistoricoAlunoViewModel_FromAlunoComMatriculas_IncluiApenasConcluido alunoField?.SetValue(matriculaPendente, aluno); var matriculasFieldAluno = typeof(Aluno).GetField("_matriculas", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); - var lista = (System.Collections.Generic.List?)matriculasFieldAluno?.GetValue(aluno); + var lista = (List?)matriculasFieldAluno?.GetValue(aluno); if (lista is not null) { lista.Add(matriculaConcluida); @@ -52,4 +52,4 @@ public void HistoricoAlunoViewModel_FromAlunoComMatriculas_IncluiApenasConcluido Assert.Equal("Curso C", viewModel.CursosConcluidos.First().NomeCurso); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/MatriculaViewModelTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/MatriculaViewModelTest.cs index adc7063..e6d5f07 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/MatriculaViewModelTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Queries/ViewModels/MatriculaViewModelTest.cs @@ -67,4 +67,4 @@ public void MatriculaViewModel_FromMatricula_DeveMapearCorretamente() Assert.Equal(matricula.HistoricoAprendizado.ProgressoGeralCurso, vm.ProgressoGeralCurso); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/PagamentoMatriculaIntegrationHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/PagamentoMatriculaIntegrationHandlerTest.cs index 62cf465..a3eba81 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/PagamentoMatriculaIntegrationHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/PagamentoMatriculaIntegrationHandlerTest.cs @@ -11,11 +11,11 @@ namespace PlataformaEducacao.GestaoAluno.Application.Tests.Services { public class PagamentoMatriculaIntegrationHandlerTest { - Matricula? _matricula; - readonly Mock? _alunoRepositoryMock = new(); - readonly Mock? _uowMock = new(); - readonly Mock? _rootServiceProviderMock = new(); - readonly Mock _messageBusMock = new(); + private readonly Mock? _alunoRepositoryMock = new(); + private readonly Mock? _uowMock = new(); + private readonly Mock? _rootServiceProviderMock = new(); + private readonly Mock _messageBusMock = new(); + private Matricula? _matricula; [Fact(DisplayName = "Recusar matrícula ao receber evento deve recusar e commitar")] [Trait("Categoria", "Gestão Aluno - Application - Services - PagamentoMatriculaIntegrationHandler")] @@ -29,11 +29,11 @@ public async Task RecusarMatricula_EventoRecebido_DeveRecusarEComitar() Func? acaoRecusar = null; - _messageBusMock.Setup(b => b.SubscribeAsync( + _messageBusMock.Setup(b => b.SubscribeAsync( It.IsAny(), It.IsAny>())) .Callback>((_, f) => acaoRecusar = f); - _messageBusMock.Setup(b => b.SubscribeAsync( + _messageBusMock.Setup(b => b.SubscribeAsync( It.IsAny(), It.IsAny>())); var handler = new PagamentoMatriculaIntegrationHandler(_messageBusMock.Object, _rootServiceProviderMock!.Object); @@ -60,10 +60,10 @@ public async Task FinalizarMatricula_EventoRecebido_DeveAtivarEComitar() Func? acaoFinalizar = null; - _messageBusMock.Setup(b => b.SubscribeAsync( + _messageBusMock.Setup(b => b.SubscribeAsync( It.IsAny(), It.IsAny>())); - _messageBusMock.Setup(b => b.SubscribeAsync( + _messageBusMock.Setup(b => b.SubscribeAsync( It.IsAny(), It.IsAny>())) .Callback>((_, f) => acaoFinalizar = f); @@ -115,4 +115,4 @@ private void ConfigurarServiceProviderMock() _rootServiceProviderMock!.Setup(p => p.GetService(typeof(IServiceScopeFactory))).Returns(serviceScopeFactoryMock.Object); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/RegistroAlunoIntegrationHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/RegistroAlunoIntegrationHandlerTest.cs index b3a0542..060df56 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/RegistroAlunoIntegrationHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Application.Tests/Services/RegistroAlunoIntegrationHandlerTest.cs @@ -41,7 +41,7 @@ public async Task RegistrarAluno_QuandoEventoRecebido_DeveEnviarComandoERetornar busMock.SetupGet(b => b.AdvancedBus).Returns(advancedBusMock.Object); Func>? responderCapturado = null; - busMock.Setup(b => b.RespondAsync( + busMock.Setup(b => b.RespondAsync( It.IsAny>>())) .Callback>>(r => responderCapturado = r) .Returns(Mock.Of); @@ -54,13 +54,14 @@ public async Task RegistrarAluno_QuandoEventoRecebido_DeveEnviarComandoERetornar // Invocar o responder capturado e aguardar o resultado Assert.NotNull(responderCapturado); - var resposta = await responderCapturado!(evento); + var resposta = await responderCapturado(evento); // Assert - mediatorMock.Verify(m => m.SendCommand(It.Is( - c => c.UsuarioId == usuarioId && c.Nome == nome && c.Email == email)), Times.Once); + mediatorMock.Verify( + m => m.SendCommand(It.Is(c => c.UsuarioId == usuarioId && c.Nome == nome && c.Email == email)), + Times.Once); Assert.NotNull(resposta); Assert.True(resposta.ValidationResult.IsValid); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/AlunoTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/AlunoTest.cs index 6bfba91..660e3de 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/AlunoTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/AlunoTest.cs @@ -96,4 +96,4 @@ public void ConcluirPagamentoMatricula_DeveAtivarMatricula() Assert.Equal(SituacaoMatricula.Ativa, matricula.SituacaoMatricula); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/CertificadoTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/CertificadoTest.cs index 918ba40..083b87f 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/CertificadoTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/CertificadoTest.cs @@ -55,4 +55,4 @@ public void CriarCompleto_ComCodigoVazio_DeveLancarDomainException() Assert.Throws(() => Certificado.CertificadoFactory.CriarCompleto(matricula, string.Empty)); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Core/EntityTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Core/EntityTest.cs index f2213bb..88cb459 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Core/EntityTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Core/EntityTest.cs @@ -6,13 +6,20 @@ namespace PlataformaEducacao.GestaoAluno.Domain.Tests.Core { public class EntityTest { - private class EntidadeDeTeste : Entity { } + private sealed class EntidadeDeTeste : Entity + { + } - private class OutraEntidadeDeTeste : Entity { } + private sealed class OutraEntidadeDeTeste : Entity + { + } - private class EventoDeTeste : Event + private sealed class EventoDeTeste : Evento { - public EventoDeTeste() : base() { } + public EventoDeTeste() + : base() + { + } } [Fact(DisplayName = "Construtor deve gerar Id e inicializar notificações")] diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/AlunoRepositoryIntegrationTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/AlunoRepositoryIntegrationTest.cs index 4f0c5cf..20a50af 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/AlunoRepositoryIntegrationTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/AlunoRepositoryIntegrationTest.cs @@ -21,7 +21,7 @@ public AlunoRepositoryIntegrationTest() _connection.Open(); _mediatorMock = new Mock(); - _mediatorMock.Setup(m => m.PublishEvent(It.IsAny())).Returns(Task.CompletedTask); + _mediatorMock.Setup(m => m.PublishEvent(It.IsAny())).Returns(Task.CompletedTask); var options = new DbContextOptionsBuilder() .UseSqlite(_connection) @@ -48,7 +48,7 @@ public async Task Inserir_EObterComMatriculas_DevePersistir() // Assert Assert.NotNull(result); - Assert.Equal("João", result!.Nome); + Assert.Equal("João", result.Nome); Assert.Equal("joao@test.com", result.Email.Endereco); Assert.Empty(result.Matriculas); } @@ -72,7 +72,7 @@ public async Task RealizarMatricula_DevePersistir() // Assert var result = await _repository.ObterMatriculaComAlunoPorId(matricula.Id, CancellationToken.None); Assert.NotNull(result); - Assert.Equal("Curso C#", result!.NomeCurso); + Assert.Equal("Curso C#", result.NomeCurso); Assert.Equal(aluno.Id, result.AlunoId); } @@ -122,8 +122,7 @@ public async Task ObterAlunosMatriculadosPorCursoId_DeveRetornarAtivos() // Arrange var cursoId = Guid.NewGuid(); var aluno = Matricula.MatriculaFactory.CriarComPagamentoAprovado( - cursoId, "Curso K8s", 2, 500m, - new Aluno(Guid.NewGuid(), "Pedro", "pedro@test.com")); + cursoId, "Curso K8s", 2, 500m, new Aluno(Guid.NewGuid(), "Pedro", "pedro@test.com")); await _context.Alunos.AddAsync(aluno.Aluno); await _context.Matriculas.AddAsync(aluno); await _context.SaveChangesAsync(); @@ -171,7 +170,7 @@ public async Task ObterMatriculaComProgressoAulas_DeveRetornarComProgresso() // Assert Assert.NotNull(result); - Assert.NotNull(result!.ProgressoAulas); + Assert.NotNull(result.ProgressoAulas); } [Fact(DisplayName = "AtualizarMatricula deve persistir alteração")] @@ -196,7 +195,7 @@ public async Task AtualizarMatricula_DevePersistirAlteracao() // Assert Assert.NotNull(result); - Assert.Equal(SituacaoMatricula.Ativa, result!.SituacaoMatricula); + Assert.Equal(SituacaoMatricula.Ativa, result.SituacaoMatricula); } [Fact(DisplayName = "AtualizarProgressoAula deve persistir progresso")] @@ -242,7 +241,7 @@ public async Task GerarCertificado_DevePersistir() // Assert var result = await _context.Certificados.FirstOrDefaultAsync(c => c.Id == certificado.Id); Assert.NotNull(result); - Assert.Equal("CODIGO-123", result!.CodigoVerificacao); + Assert.Equal("CODIGO-123", result.CodigoVerificacao); } [Fact(DisplayName = "ObterMatriculaComCertificadoPorId deve retornar com certificado")] @@ -265,8 +264,8 @@ public async Task ObterMatriculaComCertificado_DeveRetornarComCertificado() // Assert Assert.NotNull(result); - Assert.NotNull(result!.Certificado); - Assert.Equal("CERT-456", result.Certificado!.CodigoVerificacao); + Assert.NotNull(result.Certificado); + Assert.Equal("CERT-456", result.Certificado.CodigoVerificacao); } [Fact(DisplayName = "ObterCertificadoPorCodigoVerificacao deve retornar matrícula")] @@ -289,7 +288,7 @@ public async Task ObterCertificadoPorCodigoVerificacao_DeveRetornar() // Assert Assert.NotNull(result); - Assert.NotNull(result!.Certificado); + Assert.NotNull(result.Certificado); } [Fact(DisplayName = "ObterCertificadoPorCertificadoId deve retornar certificado completo")] @@ -312,7 +311,7 @@ public async Task ObterCertificadoPorCertificadoId_DeveRetornar() // Assert Assert.NotNull(result); - Assert.NotNull(result!.Matricula); + Assert.NotNull(result.Matricula); Assert.NotNull(result.Matricula.Aluno); } @@ -337,7 +336,7 @@ public async Task Commit_ComAlteracao_DeveRetornarTrue() // Assert Assert.True(result); - _mediatorMock.Verify(m => m.PublishEvent(It.IsAny()), Times.Never); + _mediatorMock.Verify(m => m.PublishEvent(It.IsAny()), Times.Never); } [Fact(DisplayName = "UnitOfWork deve retornar o contexto")] @@ -355,6 +354,12 @@ public void Dispose_NaoDeveLancarExcecao() Assert.Null(exception); } + public void Dispose() + { + _context.Dispose(); + _connection.Dispose(); + } + private static Aluno CriarAlunoComMatriculaAtiva(string nome, string email) { var aluno = new Aluno(Guid.NewGuid(), nome, email); @@ -363,11 +368,5 @@ private static Aluno CriarAlunoComMatriculaAtiva(string nome, string email) aluno.ConcluirPagamentoMatricula(matricula); return aluno; } - - public void Dispose() - { - _context.Dispose(); - _connection.Dispose(); - } } } diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/MediatorExtensionTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/MediatorExtensionTest.cs index 7323285..b9257f0 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/MediatorExtensionTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Data/MediatorExtensionTest.cs @@ -19,7 +19,7 @@ public MediatorExtensionTest() _connection.Open(); _mediatorMock = new Mock(); - _mediatorMock.Setup(m => m.PublishEvent(It.IsAny())).Returns(Task.CompletedTask); + _mediatorMock.Setup(m => m.PublishEvent(It.IsAny())).Returns(Task.CompletedTask); var options = new DbContextOptionsBuilder() .UseSqlite(_connection) @@ -52,7 +52,7 @@ public async Task PublicarEventos_DevePublicarEventosDeEntidades() await _mediatorMock.Object.PublicarEventos(_context); // Assert - _mediatorMock.Verify(m => m.PublishEvent(It.IsAny()), Times.AtLeastOnce); + _mediatorMock.Verify(m => m.PublishEvent(It.IsAny()), Times.AtLeastOnce); } [Fact(DisplayName = "PublicarEventos sem eventos não deve chamar PublishEvent")] @@ -71,7 +71,7 @@ public async Task PublicarEventos_SemEventos_NaoDevePublicar() await _mediatorMock.Object.PublicarEventos(_context); // Assert - _mediatorMock.Verify(m => m.PublishEvent(It.IsAny()), Times.Never); + _mediatorMock.Verify(m => m.PublishEvent(It.IsAny()), Times.Never); } public void Dispose() diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/CursoFinalizadoEventTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/CursoFinalizadoEventTest.cs index fba476e..acd68d3 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/CursoFinalizadoEventTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/CursoFinalizadoEventTest.cs @@ -23,4 +23,4 @@ public void CursoFinalizadoEvent_Criar_DevePreencherPropriedades() Assert.True(evento.Timestamp > DateTime.Now.AddSeconds(-5)); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/MatriculaAtivadaEventTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/MatriculaAtivadaEventTest.cs index b843113..e85a2d2 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/MatriculaAtivadaEventTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/Events/MatriculaAtivadaEventTest.cs @@ -23,4 +23,4 @@ public void MatriculaAtivadaEvent_Criar_DevePreencherPropriedades() Assert.True(evento.Timestamp > DateTime.Now.AddSeconds(-5)); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/HistoricoAprendizadoTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/HistoricoAprendizadoTest.cs index cd92fae..4f6b231 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/HistoricoAprendizadoTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/HistoricoAprendizadoTest.cs @@ -56,4 +56,4 @@ public void Criar_TotalAulasCursoMenorOuIgualZero_DeveLancarDomainException() Assert.Throws(() => HistoricoAprendizado.HistoricoAprendizadoFactory.CriarFinalizado(totalAulasCurso: 0, progressoGeral: 100)); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/IntegrationEventsTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/IntegrationEventsTest.cs index 099aace..f987d1e 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/IntegrationEventsTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/IntegrationEventsTest.cs @@ -14,8 +14,14 @@ public void IniciaPagamentoIntegrationEvent_DevePreencherPropriedades() // Act var evento = new IniciaPagamentoIntegrationEvent( - matriculaId, alunoId, 500m, 1, - "Fulano", "4111111111111111", "12/2030", "123"); + matriculaId, + alunoId, + 500m, + 1, + "Fulano", + "4111111111111111", + "12/2030", + "123"); // Assert Assert.Equal(matriculaId, evento.MatriculaId); diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MainControllerTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MainControllerTest.cs index 8c94fca..81ad634 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MainControllerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MainControllerTest.cs @@ -1,8 +1,8 @@ -using FluentValidation.Results; +using System.Net; +using FluentValidation.Results; using Microsoft.AspNetCore.Mvc; using PlataformaEducacao.Core.Communication; using PlataformaEducacao.WebApi.Core.Controllers; -using System.Net; namespace PlataformaEducacao.GestaoAluno.Domain.Tests { @@ -195,7 +195,7 @@ public void OperacaoValida_SemErros_DeveRetornarTrue() Assert.True(controller.TestOperacaoValida()); } - private class TestableMainController : MainController + private sealed class TestableMainController : MainController { public ActionResult TestCustomResponse(HttpStatusCode statusCode = HttpStatusCode.OK, object? data = null) => CustomResponse(statusCode, data); diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MatriculaTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MatriculaTest.cs index 7ffbf2b..352c0f7 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MatriculaTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/MatriculaTest.cs @@ -239,7 +239,7 @@ public void GerarCertificado_QuandoNaoConcluido_DeveLancarDomainException() public void CriarMatricula_NomeVazio_DeveLancarDomainException() { // Act & Assert - Assert.Throws(() => new Matricula(Guid.NewGuid(), nomeCurso: "", totalAulasCurso: 1, valor: 50m)); + Assert.Throws(() => new Matricula(Guid.NewGuid(), nomeCurso: string.Empty, totalAulasCurso: 1, valor: 50m)); } [Fact(DisplayName = "Criar matricula com valor zero deve lançar DomainException")] @@ -327,4 +327,4 @@ public void AssociarAluno_DeveDefinirAlunoId() Assert.Equal(alunoId, matricula.AlunoId); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/ProgressoAulaTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/ProgressoAulaTest.cs index 12d8370..c960324 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/ProgressoAulaTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/ProgressoAulaTest.cs @@ -53,4 +53,4 @@ public void AssociarMatricula_ComIdVazio_DeveLancarDomainException() Assert.Throws(() => progresso.AssociarMatricula(Guid.Empty)); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoCursoTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoCursoTest.cs index 728f0e5..5a9174d 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoCursoTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoCursoTest.cs @@ -7,7 +7,7 @@ public class SituacaoCursoTest public void SituacaoCurso_ValoresEsperados() { // Arrange & Act - var names = Enum.GetNames(typeof(SituacaoCurso)); + var names = Enum.GetNames(); // Assert Assert.Contains("NaoIniciado", names); @@ -31,7 +31,7 @@ public void SituacaoCurso_ParseDeString_DeveFuncionar() { // Act var parsed = Enum.Parse("Concluido"); - var fromString = (SituacaoCurso)Enum.Parse(typeof(SituacaoCurso), "EmAndamento"); + var fromString = Enum.Parse("EmAndamento"); // Assert Assert.Equal(SituacaoCurso.Concluido, parsed); @@ -48,4 +48,4 @@ public void SituacaoCurso_ToString_DeveRetornarNome() Assert.Equal("Concluido", SituacaoCurso.Concluido.ToString()); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoMatriculaTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoMatriculaTest.cs index 9fd27d0..42de359 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoMatriculaTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/SituacaoMatriculaTest.cs @@ -7,7 +7,7 @@ public class SituacaoMatriculaTest public void SituacaoMatricula_ValoresEsperados() { // Arrange & Act - var names = Enum.GetNames(typeof(SituacaoMatricula)); + var names = Enum.GetNames(); // Assert Assert.Contains("PendentePagamento", names); @@ -31,7 +31,7 @@ public void SituacaoMatricula_ParseDeString_DeveFuncionar() { // Act var parsed = Enum.Parse("Ativa"); - var fromString = (SituacaoMatricula)Enum.Parse(typeof(SituacaoMatricula), "ProcessoPagamento"); + var fromString = Enum.Parse("ProcessoPagamento"); // Assert Assert.Equal(SituacaoMatricula.Ativa, parsed); @@ -48,4 +48,4 @@ public void SituacaoMatricula_ToString_DeveRetornarNome() Assert.Equal("Ativa", SituacaoMatricula.Ativa.ToString()); } } -} \ No newline at end of file +} diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/AspNetUserTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/AspNetUserTest.cs index 59b7475..6627138 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/AspNetUserTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/AspNetUserTest.cs @@ -1,7 +1,7 @@ -using FluentAssertions; +using System.Security.Claims; +using FluentAssertions; using Microsoft.AspNetCore.Http; using PlataformaEducacao.WebApi.Core.Usuario; -using System.Security.Claims; namespace PlataformaEducacao.GestaoAluno.Domain.Tests.WebApiCore { diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/ClaimsPrincipalExtensionsTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/ClaimsPrincipalExtensionsTest.cs index 7dbb1ca..0813b45 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/ClaimsPrincipalExtensionsTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/ClaimsPrincipalExtensionsTest.cs @@ -1,6 +1,6 @@ -using FluentAssertions; +using System.Security.Claims; +using FluentAssertions; using PlataformaEducacao.WebApi.Core.Usuario; -using System.Security.Claims; namespace PlataformaEducacao.GestaoAluno.Domain.Tests.WebApiCore { diff --git a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/CustomAuthorizationTest.cs b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/CustomAuthorizationTest.cs index dc9cf2f..e9b5432 100644 --- a/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/CustomAuthorizationTest.cs +++ b/src/tests/PlataformaEducacao.GestaoAluno.Domain.Tests/WebApiCore/CustomAuthorizationTest.cs @@ -1,18 +1,19 @@ -using FluentAssertions; +using System.Security.Claims; +using FluentAssertions; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Routing; using PlataformaEducacao.WebApi.Core.Identidade; -using System.Security.Claims; namespace PlataformaEducacao.GestaoAluno.Domain.Tests.WebApiCore { public class CustomAuthorizationTest { - #region ValidarClaimsUsuario - + /// + /// Região para testes da classe ValidarClaimsUsuario + /// [Fact(DisplayName = "ValidarClaimsUsuario autenticado com claim correta deve retornar true")] [Trait("Categoria", "WebApi.Core - Identidade - CustomAuthorization")] public void ValidarClaimsUsuario_AutenticadoComClaim_DeveRetornarTrue() @@ -69,10 +70,9 @@ public void ValidarClaimsUsuario_ClaimContemValor_DeveRetornarTrue() resultado.Should().BeTrue(); } - #endregion - - #region RequisitoClaimFilter - + /// + /// Região para testes da classe RequisitoClaimFilter + /// [Fact(DisplayName = "RequisitoClaimFilter não autenticado deve retornar 401")] [Trait("Categoria", "WebApi.Core - Identidade - RequisitoClaimFilter")] public void OnAuthorization_NaoAutenticado_DeveRetornar401() @@ -125,10 +125,9 @@ public void OnAuthorization_AutenticadoComClaim_NaoDeveDefinirResult() context.Result.Should().BeNull(); } - #endregion - - #region ClaimsAuthorizeAttribute - + /// + /// Região para testes da classe ClaimsAuthorizeAttribute + /// [Fact(DisplayName = "ClaimsAuthorizeAttribute deve criar instância com Arguments")] [Trait("Categoria", "WebApi.Core - Identidade - ClaimsAuthorizeAttribute")] public void ClaimsAuthorizeAttribute_DeveCriarComArguments() @@ -145,9 +144,7 @@ public void ClaimsAuthorizeAttribute_DeveCriarComArguments() claimArg.Value.Should().Be("Ler"); } - #endregion - - private static HttpContext CriarHttpContext(bool autenticado, string? claimType = null, string? claimValue = null) + private static DefaultHttpContext CriarHttpContext(bool autenticado, string? claimType = null, string? claimValue = null) { var claims = new List(); if (claimType != null && claimValue != null) diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/IntegrationTestsFixture.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/IntegrationTestsFixture.cs index abe967e..01371ef 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/IntegrationTestsFixture.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/IntegrationTestsFixture.cs @@ -1,80 +1,13 @@ -using Microsoft.AspNetCore.Mvc.Testing; +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.DependencyInjection; using PlataformaEducacao.GestaoConteudo.Data; -using System.Text.Json; -using System.Text.Json.Serialization; namespace PlataformaEducacao.GestaoConteudo.Api.Tests.Config { - [CollectionDefinition(nameof(IntegrationApiTestsFixtureCollection))] - public class IntegrationApiTestsFixtureCollection : ICollectionFixture> { } - public class IntegrationTestsFixture : IDisposable where TProgram : class - { - public readonly PlataformaEducacaoGestaoConteudoAppFactory Factory; - public HttpClient Client; - private readonly IServiceScope _serviceScope; - private readonly GestaoConteudoContext _gestaoConteudoContext; - - public IntegrationTestsFixture() - { - var clientOptions = new WebApplicationFactoryClientOptions - { - BaseAddress = new Uri("http://localhost") - }; - - Factory = new PlataformaEducacaoGestaoConteudoAppFactory(); - Client = Factory.CreateClient(clientOptions); - - _serviceScope = Factory.Services.CreateScope(); - _gestaoConteudoContext = _serviceScope.ServiceProvider.GetRequiredService(); - } - - - public GestaoConteudoContext GestaoConteudoContext => _gestaoConteudoContext; - - public async Task DeserializeResponse(HttpResponseMessage response) - { - var content = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(content!, - new JsonSerializerOptions() - { - PropertyNameCaseInsensitive = true, - Converters = { new JsonStringEnumConverter() } - }) ?? throw new InvalidOperationException("Deserialization returned null"); ; - } - - public IEnumerable GetErrors(string jsonResponse) - { - var response = JsonSerializer.Deserialize( - jsonResponse, - new JsonSerializerOptions { PropertyNameCaseInsensitive = true } - ); - - return response?.Erros?.Mensagens ?? Enumerable.Empty(); - } - public void Dispose() - { - Client.Dispose(); - Factory.Dispose(); - _serviceScope.Dispose(); - } - } - public class ResponseApi - { - public bool Sucesso { get; set; } - public T? Data { get; set; } - } - - public class ResponseResult - { - public bool Sucesso { get; set; } - public int Status { get; set; } - public object? Data { get; set; } - public ResponseErrorMessages? Erros { get; set; } - } - - public class ResponseErrorMessages + [CollectionDefinition(nameof(IntegrationApiTestsCollectionFixture))] + public class IntegrationApiTestsCollectionFixture : ICollectionFixture> { - public List Mensagens { get; set; } = new(); } } diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/IntegrationTestsFixtureTProgram.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/IntegrationTestsFixtureTProgram.cs new file mode 100644 index 0000000..cead829 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/IntegrationTestsFixtureTProgram.cs @@ -0,0 +1,65 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal; +using Microsoft.Extensions.DependencyInjection; +using PlataformaEducacao.GestaoConteudo.Data; + +namespace PlataformaEducacao.GestaoConteudo.Api.Tests.Config +{ + public class IntegrationTestsFixture : IDisposable + where TProgram : class + { + public readonly PlataformaEducacaoGestaoConteudoAppFactory Factory; + public HttpClient Client; + private readonly IServiceScope _serviceScope; + + public IntegrationTestsFixture() + { + var clientOptions = new WebApplicationFactoryClientOptions + { + BaseAddress = new Uri("http://localhost") + }; + + Factory = new PlataformaEducacaoGestaoConteudoAppFactory(); + Client = Factory.CreateClient(clientOptions); + + _serviceScope = Factory.Services.CreateScope(); + GestaoConteudoContext = _serviceScope.ServiceProvider.GetRequiredService(); + } + + public GestaoConteudoContext GestaoConteudoContext { get; } + + public async Task DeserializeResponse(HttpResponseMessage response) + { + var content = await response.Content.ReadAsStringAsync(); + return JsonSerializer.Deserialize(content, PropertyNameCaseSensitiveComConvertersOptions) ?? throw new InvalidOperationException("Deserialization returned null"); + } + + public IEnumerable GetErrors(string jsonResponse) + { + var response = JsonSerializer.Deserialize( + jsonResponse, PropertyNameCaseSensitiveOptions); + + return response?.Erros?.Mensagens ?? Enumerable.Empty(); + } + + public void Dispose() + { + Client.Dispose(); + Factory.Dispose(); + _serviceScope.Dispose(); + } + + private static readonly JsonSerializerOptions PropertyNameCaseSensitiveOptions = new() + { + PropertyNameCaseInsensitive = true, + }; + + private static readonly JsonSerializerOptions PropertyNameCaseSensitiveComConvertersOptions = new() + { + PropertyNameCaseInsensitive = true, + Converters = { new JsonStringEnumConverter() } + }; + } +} diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/PlataformaEducacaoGestaoConteudoAppFactory.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/PlataformaEducacaoGestaoConteudoAppFactory.cs index ab91504..cbb0ba1 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/PlataformaEducacaoGestaoConteudoAppFactory.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/PlataformaEducacaoGestaoConteudoAppFactory.cs @@ -11,15 +11,24 @@ namespace PlataformaEducacao.GestaoConteudo.Api.Tests.Config { - public class PlataformaEducacaoGestaoConteudoAppFactory : WebApplicationFactory, IDisposable where TProgram : class + public class PlataformaEducacaoGestaoConteudoAppFactory : WebApplicationFactory, IDisposable + where TProgram : class { - private SqliteConnection _connection = null!; + private readonly SqliteConnection _connection = null!; + public PlataformaEducacaoGestaoConteudoAppFactory() { _connection = new SqliteConnection("DataSource=:memory:"); _connection.Open(); } + public new void Dispose() + { + base.Dispose(); + + _connection?.Close(); + } + protected override void ConfigureWebHost(IWebHostBuilder builder) { builder.ConfigureAppConfiguration((_, configBuilder) => @@ -70,27 +79,16 @@ protected override void ConfigureWebHost(IWebHostBuilder builder) services.AddDbContext(options => options.UseSqlite(_connection)); - - using (var scope = services.BuildServiceProvider().CreateScope()) - { - var serviceProvider = scope.ServiceProvider; - DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); - } + using var scope = services.BuildServiceProvider().CreateScope(); + var serviceProvider = scope.ServiceProvider; + DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); }); } + protected override IHost CreateHost(IHostBuilder builder) { builder.UseEnvironment("Testing"); return base.CreateHost(builder); } - public new void Dispose() - { - base.Dispose(); - - if (_connection != null) - { - _connection.Close(); - } - } } } diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseApi.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseApi.cs new file mode 100644 index 0000000..92ef08c --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseApi.cs @@ -0,0 +1,15 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.DependencyInjection; +using PlataformaEducacao.GestaoConteudo.Data; + +namespace PlataformaEducacao.GestaoConteudo.Api.Tests.Config +{ + public class ResponseApi + { + public bool Sucesso { get; set; } + + public T? Data { get; set; } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseErrorMessages.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseErrorMessages.cs new file mode 100644 index 0000000..42d54b2 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseErrorMessages.cs @@ -0,0 +1,13 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.DependencyInjection; +using PlataformaEducacao.GestaoConteudo.Data; + +namespace PlataformaEducacao.GestaoConteudo.Api.Tests.Config +{ + public class ResponseErrorMessages + { + public List Mensagens { get; set; } = new(); + } +} diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseResult.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseResult.cs new file mode 100644 index 0000000..e0abccf --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/ResponseResult.cs @@ -0,0 +1,19 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.DependencyInjection; +using PlataformaEducacao.GestaoConteudo.Data; + +namespace PlataformaEducacao.GestaoConteudo.Api.Tests.Config +{ + public class ResponseResult + { + public bool Sucesso { get; set; } + + public int Status { get; set; } + + public object? Data { get; set; } + + public ResponseErrorMessages? Erros { get; set; } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/TestAuthHandler.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/TestAuthHandler.cs index 0a4e882..dc099a0 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/TestAuthHandler.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/Config/TestAuthHandler.cs @@ -1,8 +1,8 @@ -using Microsoft.AspNetCore.Authentication; +using System.Security.Claims; +using System.Text.Encodings.Web; +using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using System.Security.Claims; -using System.Text.Encodings.Web; namespace PlataformaEducacao.GestaoConteudo.Api.Tests.Config { @@ -12,7 +12,9 @@ public TestAuthHandler( IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) - : base(options, logger, encoder) { } + : base(options, logger, encoder) + { + } protected override Task HandleAuthenticateAsync() { @@ -25,9 +27,9 @@ protected override Task HandleAuthenticateAsync() var claims = new List { - new Claim(ClaimTypes.Name, $"Usuario {userRole}"), - new Claim(ClaimTypes.NameIdentifier, Guid.NewGuid().ToString()), - new Claim(ClaimTypes.Role, userRole) + new(ClaimTypes.Name, $"Usuario {userRole}"), + new(ClaimTypes.NameIdentifier, Guid.NewGuid().ToString()), + new(ClaimTypes.Role, userRole) }; var identity = new ClaimsIdentity(claims, "Test"); diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/CursosIntegrationTests.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/CursosIntegrationTests.cs index 9301973..01f944a 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/CursosIntegrationTests.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Api.Tests/CursosIntegrationTests.cs @@ -1,14 +1,14 @@ -using Microsoft.EntityFrameworkCore; +using System.Net; +using System.Net.Http.Json; +using Microsoft.EntityFrameworkCore; using PlataformaEducacao.GestaoConteudo.Api.Requests; using PlataformaEducacao.GestaoConteudo.Api.Tests.Config; using PlataformaEducacao.GestaoConteudo.Application.Queries.ViewModels; using PlataformaEducacao.GestaoConteudo.Data; -using System.Net; -using System.Net.Http.Json; namespace PlataformaEducacao.GestaoConteudo.Api.Tests { - [Collection(nameof(IntegrationApiTestsFixtureCollection))] + [Collection(nameof(IntegrationApiTestsCollectionFixture))] public class CursosIntegrationTests : IClassFixture> { private readonly IntegrationTestsFixture _fixture; @@ -110,8 +110,8 @@ public async Task AdicionarCurso_QuandoRequestInvalido_DeveRetornarComFalha() var result = _fixture.GetErrors(await response.Content.ReadAsStringAsync()); Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); - Assert.True(result.Contains("O campo Nome é obrigatório."), ""); - Assert.True(result.Contains("O campo Nome precisa ter entre 2 e 255 caracteres"), ""); + Assert.True(result.Contains("O campo Nome é obrigatório."), string.Empty); + Assert.True(result.Contains("O campo Nome precisa ter entre 2 e 255 caracteres"), string.Empty); } [Fact(DisplayName = nameof(AdicionarAula_DeveRetornarComSucesso))] @@ -169,7 +169,7 @@ public async Task AdicionarAula_QuandoRequestInvalido_DeveRetornarComFalha() var result = _fixture.GetErrors(await response.Content.ReadAsStringAsync()); Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); - Assert.True(result.Contains("O campo Conteudo é obrigatório."), ""); + Assert.True(result.Contains("O campo Conteudo é obrigatório."), string.Empty); } [Fact(DisplayName = nameof(ObterDetalhesCurso_DeveRetornarComSucesso))] @@ -201,7 +201,7 @@ public async Task ListarTodosCursos_DeveRetornarComSucesso() Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.True(retorno.Sucesso); - Assert.True(retorno.Data!.Count() > 0); + Assert.True(retorno.Data.Count() > 0); } [Fact(DisplayName = "Atualizar Curso")] @@ -312,7 +312,7 @@ public async Task AtualizarCurso_QuandoNomeExiste_DeveRetornarComFalha() var retorno = await _fixture.DeserializeResponse>(response); Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); - Assert.True(result.Contains("O nome do curso já existe!"), ""); + Assert.True(result.Contains("O nome do curso já existe!"), string.Empty); } } } diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarAulaCommandTest.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarAulaCommandTest.cs index a0549d6..e464acd 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarAulaCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarAulaCommandTest.cs @@ -23,7 +23,7 @@ public void AdiconarAulaCommand_EhValido_QuandoDadosCorretos() public void AdicionarAulaCommand_DeveSerInvalido_QuandoTituloVazio() { // Arrange - var command = new AdicionarAulaCommand("", "Conteudo da aula", 1, "Material", Guid.NewGuid()); + var command = new AdicionarAulaCommand(string.Empty, "Conteudo da aula", 1, "Material", Guid.NewGuid()); // Act var result = command.EhValido(); @@ -59,6 +59,7 @@ public void AdicionarAulaCommand_DeveSerInvalido_QuandoOrdemMenorIgualZero() Assert.False(result); Assert.Contains(command.ValidationResult.Errors, e => e.ErrorMessage == "A ordem da aula deve ser maior que 0."); } + [Fact(DisplayName = "Deve ser inválido quando o curso é inválido")] [Trait("Categoria", "Gestao Conteudo - AdicionarAulaCommand")] public void AdicionarAulaCommand_DeveSerInvalido_QuandoCursoInvalido() @@ -72,6 +73,5 @@ public void AdicionarAulaCommand_DeveSerInvalido_QuandoCursoInvalido() Assert.False(result); Assert.Contains(command.ValidationResult.Errors, e => e.ErrorMessage == "Curso é obrigatório."); } - } } diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarCursoCommandTest.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarCursoCommandTest.cs index 18c6806..639115e 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarCursoCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AdicionarCursoCommandTest.cs @@ -26,7 +26,7 @@ public void AdiconarCursoCommand_EhValido_QuandoDadosCorretos() public void AdicionarCursoCommand_DeveSerInvalido_QuandoNomeVazio() { // Arrange - var command = new AdicionarCursoCommand("", "Conteudo do curso", 5, 500, true); + var command = new AdicionarCursoCommand(string.Empty, "Conteudo do curso", 5, 500, true); // Act var result = command.EhValido(); @@ -55,7 +55,7 @@ public void AdicionarCursoCommand_DeveSerInvalido_QuandoTamanhoCampoNomeInvalido public void AdicionarCursoCommand_DeveSerInvalido_QuandoDescricaoConteudoVazio() { // Arrange - var command = new AdicionarCursoCommand("Curso C#", "", 5, 500, true); + var command = new AdicionarCursoCommand("Curso C#", string.Empty, 5, 500, true); // Act var result = command.EhValido(); diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AtualizarCursoCommandTest.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AtualizarCursoCommandTest.cs index 5e54952..ff9aff8 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AtualizarCursoCommandTest.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/AtualizarCursoCommandTest.cs @@ -37,7 +37,7 @@ public void AtualizarCursoCommand_DeveSerInvalido_QuandoIdVazio() public void AtualizarCursoCommand_DeveSerInvalido_QuandoNomeVazio() { // Arrange - var command = new AtualizarCursoCommand(Guid.NewGuid(), "", "Conteudo do curso", 5, 500, true); + var command = new AtualizarCursoCommand(Guid.NewGuid(), string.Empty, "Conteudo do curso", 5, 500, true); // Act var result = command.EhValido(); @@ -51,7 +51,7 @@ public void AtualizarCursoCommand_DeveSerInvalido_QuandoNomeVazio() public void AtualizarCursoCommand_DeveSerInvalido_QuandoDescricaoConteudoVazio() { // Arrange - var command = new AtualizarCursoCommand(Guid.NewGuid(), "Curso C#", "", 5, 500, true); + var command = new AtualizarCursoCommand(Guid.NewGuid(), "Curso C#", string.Empty, 5, 500, true); // Act var result = command.EhValido(); diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/CursoCommandHandlerTest.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/CursoCommandHandlerTest.cs index 920be3d..d0387fa 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/CursoCommandHandlerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Commands/CursoCommandHandlerTest.cs @@ -21,7 +21,7 @@ public CursoCommandHandlerTest() [Trait("Categoria", "Gestao Conteudo - CursoCommandHandler")] public async Task AdicionarCurso_DeveRetornarFalso_QuandoOComandoEInvalido() { - var command = new AdicionarCursoCommand("Curso XX", "", 0, 0, true); + var command = new AdicionarCursoCommand("Curso XX", string.Empty, 0, 0, true); var result = await _handler.Handle(command, CancellationToken.None); diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/CursoQueriesTests.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/CursoQueriesTests.cs index 99370be..c7fcc77 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/CursoQueriesTests.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/CursoQueriesTests.cs @@ -55,8 +55,8 @@ public async Task ObterTodos_DeveRetornarTodosCursos() // Arrange var cursos = new List { - new Curso("Curso C#", new ConteudoProgramatico("Descricao do conteudo", 200), 500, true), - new Curso("Curso Angular", new ConteudoProgramatico("Descricao do conteudo", 150), 450, true) + new("Curso C#", new ConteudoProgramatico("Descricao do conteudo", 200), 500, true), + new("Curso Angular", new ConteudoProgramatico("Descricao do conteudo", 150), 450, true) }; _cursoRepositoryMock.Setup(r => r.ObterTodos(default)).ReturnsAsync(cursos); @@ -75,8 +75,8 @@ public async Task ObterDisponiveisComAula_DeveRetornarTodosCursosDisponiveis() // Arrange var cursos = new List { - new Curso("Curso C#", new ConteudoProgramatico("Descricao do conteudo", 200), 500, true), - new Curso("Curso Angular", new ConteudoProgramatico("Descricao do conteudo", 150), 450, false) + new("Curso C#", new ConteudoProgramatico("Descricao do conteudo", 200), 500, true), + new("Curso Angular", new ConteudoProgramatico("Descricao do conteudo", 150), 450, false) }; _cursoRepositoryMock.Setup(r => r.ObterDisponiveisComAula(default)).ReturnsAsync(cursos.Where(c => c.Disponivel)); @@ -103,8 +103,9 @@ public async Task ObterAulasPorCursoId_DeveRetornarAulas() var resultado = await _queries.ObterAulasPorCursoId(curso.Id, default); // Assert - Assert.Equal(curso.Aulas.Count(), resultado.Count()); + Assert.Equal(curso.Aulas.Count, resultado.Count()); } + [Fact(DisplayName = "Deve retornar o curso com as aulas do curso")] [Trait("Categoria", "Gestao Conteudo - CursoQueries")] public async Task ObterCursoComAulasPorCursoId_DeveRetornarCursoComAulas() @@ -120,13 +121,15 @@ public async Task ObterCursoComAulasPorCursoId_DeveRetornarCursoComAulas() var resultado = await _queries.ObterCursoComAulasPorCursoId(curso.Id, default); // Assert - Assert.Equal(curso.Aulas.Count(), resultado!.Aulas.Count()); + Assert.Equal(curso.Aulas.Count, resultado!.Aulas.Count()); } + [Fact(DisplayName = "Deve retornar o curso com as aulas do curso")] [Trait("Categoria", "Gestao Conteudo - CursoQueries")] public async Task ObterCursoComAulasPorCursoId_DeveRetornarNullSeNaoEncontrarCurso() { var cursoInexistenteId = Guid.NewGuid(); + // Arrange var curso = new Curso("Curso C#", new ConteudoProgramatico("Descricao do conteudo", 200), 500, true); curso.AdicionarAula(new Aula("Aula 1", "Conteudo da Aula 1", 1, "Link do material 1")); @@ -140,6 +143,7 @@ public async Task ObterCursoComAulasPorCursoId_DeveRetornarNullSeNaoEncontrarCur // Assert Assert.Null(resultado); } + [Fact(DisplayName = "Deve retornar a aula do curso")] [Trait("Categoria", "Gestao Conteudo - CursoQueries")] public async Task ObterAulaPorCursoIdEAulaId_DeveRetornarAula() @@ -158,6 +162,5 @@ public async Task ObterAulaPorCursoIdEAulaId_DeveRetornarAula() Assert.Equal(resultado!.Id, aula.Id); Assert.Equal(resultado!.CursoId, aula.CursoId); } - } } diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/ViewModels/CursoViewModelTests.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/ViewModels/CursoViewModelTests.cs index 617bc4a..7fe56b8 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/ViewModels/CursoViewModelTests.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Application.Tests/Queries/ViewModels/CursoViewModelTests.cs @@ -33,6 +33,7 @@ public void FromCurso_MapeiaPropriedadesEOrdenaAulas() Assert.Equal(curso.Disponivel, vm.Disponivel); Assert.Equal(2, vm.Aulas.Count()); + // Aulas devem estar ordenadas por Ordem (1 then 2) Assert.Equal(1, vm.Aulas.ElementAt(0).Ordem); Assert.Equal(aula2.Titulo, vm.Aulas.ElementAt(0).Titulo); diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Data.Tests/PlataformaEducacao.GestaoConteudo.Data.Tests.csproj b/src/tests/PlataformaEducacao.GestaoConteudo.Data.Tests/PlataformaEducacao.GestaoConteudo.Data.Tests.csproj new file mode 100644 index 0000000..6250b91 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Data.Tests/PlataformaEducacao.GestaoConteudo.Data.Tests.csproj @@ -0,0 +1,28 @@ + + + + net8.0 + enable + enable + true + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Data.Tests/Repository/CursorRepositoryTests.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Data.Tests/Repository/CursorRepositoryTests.cs new file mode 100644 index 0000000..e19fb23 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Data.Tests/Repository/CursorRepositoryTests.cs @@ -0,0 +1,61 @@ +using System; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using PlataformaEducacao.GestaoConteudo.Data.Repository; +using PlataformaEducacao.GestaoConteudo.Domain; +using PlataformaEducacao.GestaoConteudo.Domain.ValueObjects; +using Xunit; + +namespace PlataformaEducacao.GestaoConteudo.Data.Tests.Repository +{ + public class CursoRepositoryTests + { + [Fact(DisplayName = "ObterAulaPorCursoIdEAulaId deve retornar a aula quando existir")] + public async Task ObterAulaPorCursoIdEAulaId_DeveRetornarAula_QuandoExistir() + { + var dbName = Guid.NewGuid().ToString(); + await using var context = CreateContext(dbName); + + var curso = new Curso("Curso Teste", new ConteudoProgramatico("Conteudo", 10), 100m, true); + var aula = new Aula("Aula 1", "Conteudo da aula", 1, "Material"); + curso.AdicionarAula(aula); + + await context.Cursos.AddAsync(curso); + await context.SaveChangesAsync(); + + var repository = new CursoRepository(context); + + var resultado = await repository.ObterAulaPorCursoIdEAulaId(curso.Id, aula.Id, default); + + Assert.NotNull(resultado); + Assert.Equal(aula.Id, resultado.Id); + Assert.Equal(curso.Id, resultado.CursoId); + } + + [Fact(DisplayName = "ObterAulaPorCursoIdEAulaId deve retornar null quando nao encontrar a aula")] + public async Task ObterAulaPorCursoIdEAulaId_DeveRetornarNull_QuandoNaoExistir() + { + var dbName = Guid.NewGuid().ToString(); + await using var context = CreateContext(dbName); + + var curso = new Curso("Curso Teste", new ConteudoProgramatico("Conteudo", 10), 100m, true); + await context.Cursos.AddAsync(curso); + await context.SaveChangesAsync(); + + var repository = new CursoRepository(context); + + var resultado = await repository.ObterAulaPorCursoIdEAulaId(curso.Id, Guid.NewGuid(), default); + + Assert.Null(resultado); + } + + private static GestaoConteudoContext CreateContext(string dbName) + { + var options = new DbContextOptionsBuilder() + .UseInMemoryDatabase(dbName) + .Options; + + return new GestaoConteudoContext(options); + } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/AulaTest.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/AulaTest.cs index c5e4487..da1774b 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/AulaTest.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/AulaTest.cs @@ -9,14 +9,15 @@ public class AulaTest public void Criar_Aula_DeveRetornarException_QuandoDescricaoEhVazia() { // Arrange - var tituloInvalido = ""; + var tituloInvalido = string.Empty; var conteudoValido = "Conteudo da aula"; var ordemValida = 1; var material = "Material da Aula"; - // Act + + // Act var ex = Assert.Throws(() => new Aula(tituloInvalido, conteudoValido, ordemValida, material)); - //Assert + // Assert Assert.Equal("O título da aula é orbigatório.", ex.Message); } @@ -26,14 +27,14 @@ public void Criar_Aula_ComConteudoInvalido_DeveLancarExcecao() { // Arrange var tituloValido = "Estrutura de Dados"; - var conteudoInvalido = ""; + var conteudoInvalido = string.Empty; var ordemValida = 1; var material = "Material da Aula"; - // Act + // Act var ex = Assert.Throws(() => new Aula(tituloValido, conteudoInvalido, ordemValida, material)); - //Assert + // Assert Assert.Equal("O conteudo da aula é obrigatório.", ex.Message); } @@ -46,10 +47,11 @@ public void Criar_Aula_Valida() var conteudoValido = "Conteudo da aula"; var ordemValida = 1; var materialValido = "Material da Aula"; - // Act + + // Act var aula = new Aula(tituloValido, conteudoValido, ordemValida, materialValido); - //Assert + // Assert Assert.Equal(aula.Titulo, tituloValido); Assert.Equal(aula.Conteudo, conteudoValido); Assert.Equal(aula.Ordem, ordemValida); @@ -65,10 +67,10 @@ public void Criar_AulaSemMaterial_Valida() var conteudoValido = "Conteudo da aula"; var ordemValida = 1; - // Act + // Act var aula = new Aula(tituloValido, conteudoValido, ordemValida, null); - //Assert + // Assert Assert.Equal(aula.Titulo, tituloValido); Assert.Equal(aula.Conteudo, conteudoValido); Assert.Null(aula.Material); diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/ConteudoProgramaticoTest.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/ConteudoProgramaticoTest.cs index 26263cf..955385b 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/ConteudoProgramaticoTest.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/ConteudoProgramaticoTest.cs @@ -10,7 +10,7 @@ public class ConteudoProgramaticoTest public void Criar_ConteudoProgramatico_DeveRetornarException_QuandoDescricaoEhVazia() { // Arrange Act Assert - Assert.Throws(() => new ConteudoProgramatico("", 150)); + Assert.Throws(() => new ConteudoProgramatico(string.Empty, 150)); } [Fact(DisplayName = "Criar Conteudo Programatico Com Duracao Invalida")] diff --git a/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/CursoTest.cs b/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/CursoTest.cs index 1674cdb..98f7863 100644 --- a/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/CursoTest.cs +++ b/src/tests/PlataformaEducacao.GestaoConteudo.Domain.Tests/CursoTest.cs @@ -12,7 +12,7 @@ public void Adicionar_NovoCurso_DeveRetornarCursoValido() // Arrange var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); - //Act + // Act var curso = new Curso("Introdução a C#", conteudoProgramatico, 500, true); // Assert @@ -30,9 +30,8 @@ public void Adicionar_NovoCurso_DeveRetornarException_Quando_NomeCurso_Vazio() // Arrange var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); - //Act Assert + // Act & Assert Assert.Throws(() => new Curso(" ", conteudoProgramatico, 500, true)); - } [Fact(DisplayName = "Adicionar Novo Curso Com Valor Vazio")] @@ -42,9 +41,8 @@ public void Adicionar_NovoCurso_DeveRetornarException_Quando_ValorCurso_Vazio() // Arrange var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); - //Act Assert + // Act & Assert Assert.Throws(() => new Curso("Curso C#", conteudoProgramatico, 0, true)); - } [Fact(DisplayName = "Atualizar Nome Curso")] @@ -55,7 +53,7 @@ public void AtualizarNomeCurso_DeveRetornarCursoValido() var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); var curso = new Curso("Introdução a C#", conteudoProgramatico, 500, true); - //Act + // Act curso.AtualizarNome("Introdução Linguagem C#"); // Assert @@ -70,9 +68,8 @@ public void AtualizarNomeCurso_DeveRetornarException_Quando_ValorInvalido() var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); var cursoInvalido = new Curso("Introdução a C#", conteudoProgramatico, 500, true); - //Act Assert + // Act & Assert Assert.Throws(() => cursoInvalido.AtualizarNome(" ")); - } [Fact(DisplayName = "Atualizar Preco Curso Com Valor Inválido")] @@ -83,9 +80,8 @@ public void AtualizarPrecoCurso_DeveRetornarException_Quando_ValorInvalido() var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); var cursoInvalido = new Curso("Introdução a C#", conteudoProgramatico, 500, true); - //Act Assert + // Act & Assert Assert.Throws(() => cursoInvalido.AtualizarValor(-500)); - } [Fact(DisplayName = "Tornar Indisponivel Curso")] @@ -96,13 +92,13 @@ public void TornarIndisponivelCurso() var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); var curso = new Curso("Introdução a C#", conteudoProgramatico, 500, true); - //Act + // Act curso.TornarIndisponivel(); // Assert Assert.False(curso.Disponivel); - } + [Fact(DisplayName = "Tornar Disponivel Curso")] [Trait("Categoria", "Gestao Conteudo - Curso")] public void TornarDisponivelCurso() @@ -111,12 +107,11 @@ public void TornarDisponivelCurso() var conteudoProgramatico = new ConteudoProgramatico("Módulo do curso C#", 150); var curso = new Curso("Introdução a C#", conteudoProgramatico, 500, false); - //Act + // Act curso.TornarDisponivel(); // Assert Assert.True(curso.Disponivel); - } [Fact(DisplayName = "Adicionar Aula Válida Ao Curso")] @@ -133,10 +128,10 @@ public void AdicionarAulaCurso_DeveRetornar_AulaValida() var materialValida = "Material da Aula"; var aula = new Aula(tituloValido, conteudoValido, ordemValida, materialValida); - // Act + // Act curso.AdicionarAula(aula); - //Assert + // Assert Assert.Single(curso.Aulas); } @@ -161,10 +156,10 @@ public void AdicionarAulaCurso_DeveRetornar_Valido_QuandoCursoPossuirAulaJaCadas var novoMaterialValido = "Material da Aula"; var novaAula = new Aula(novoTituloValido, novocConteudoValido, novaOrdemValida, novoMaterialValido); - // Act + // Act curso.AdicionarAula(novaAula); - //Assert + // Assert Assert.Equal(2, curso.Aulas.Count); } @@ -182,10 +177,10 @@ public void AdicionarAulaCurso_DeveRetornar_Exception_QuandoTituloAulaExistir() var materialValido = "Material da Aula"; var aula = new Aula(tituloValido, conteudoValido, ordemValida, materialValido); - // Act + // Act curso.AdicionarAula(aula); - //Assert + // Assert Assert.Throws(() => curso.AdicionarAula(aula)); Assert.Single(curso.Aulas); } diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Config/GestaoFinanceiraApiFactory.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Config/GestaoFinanceiraApiFactory.cs index 520fdb9..aadbf59 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Config/GestaoFinanceiraApiFactory.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Config/GestaoFinanceiraApiFactory.cs @@ -12,7 +12,7 @@ namespace PlataformaEducacao.GestaoFinanceira.Api.Tests.Config { public class GestaoFinanceiraApiFactory : WebApplicationFactory, IDisposable { - private SqliteConnection _connection = null!; + private readonly SqliteConnection _connection = null!; public GestaoFinanceiraApiFactory() { @@ -20,6 +20,13 @@ public GestaoFinanceiraApiFactory() _connection.Open(); } + public new void Dispose() + { + base.Dispose(); + + _connection?.Close(); + } + protected override void ConfigureWebHost(IWebHostBuilder builder) { builder.ConfigureAppConfiguration((_, configBuilder) => @@ -68,11 +75,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder) foreach (var hs in hostedServices) services.Remove(hs); - using (var scope = services.BuildServiceProvider().CreateScope()) - { - var serviceProvider = scope.ServiceProvider; - DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); - } + using var scope = services.BuildServiceProvider().CreateScope(); + var serviceProvider = scope.ServiceProvider; + DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); }); } @@ -81,15 +86,5 @@ protected override IHost CreateHost(IHostBuilder builder) builder.UseEnvironment("Testing"); return base.CreateHost(builder); } - - public new void Dispose() - { - base.Dispose(); - - if (_connection != null) - { - _connection.Close(); - } - } } } diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Configurations/GestaoFinanceiraApiConfigurationsTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Configurations/GestaoFinanceiraApiConfigurationsTest.cs index c51430f..d1763b8 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Configurations/GestaoFinanceiraApiConfigurationsTest.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Configurations/GestaoFinanceiraApiConfigurationsTest.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc.Testing; +using System.Net; +using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.DependencyInjection; using PlataformaEducacao.GestaoFinanceira.Api.Data; using PlataformaEducacao.GestaoFinanceira.Api.Services; @@ -6,7 +7,6 @@ using PlataformaEducacao.GestaoFinanceira.Business.Facade; using PlataformaEducacao.GestaoFinanceira.Business.Models; using PlataformaEducacao.WebApi.Core.Usuario; -using System.Net; namespace PlataformaEducacao.GestaoFinanceira.Api.Tests.Configurations { diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Data/PagamentoRepositoryIntegrationTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Data/PagamentoRepositoryIntegrationTest.cs index 98620b8..822cb80 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Data/PagamentoRepositoryIntegrationTest.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Api.Tests/Data/PagamentoRepositoryIntegrationTest.cs @@ -189,6 +189,12 @@ public void Dispose_NaoDeveLancarExcecao() Assert.Null(exception); } + public void Dispose() + { + _context.Dispose(); + _connection.Dispose(); + } + private static Pagamento CriarPagamento() { return new Pagamento @@ -201,11 +207,5 @@ private static Pagamento CriarPagamento() DadosCartao = new DadosCartao("Fulano", "4111111111111111", "12/2030", "123") }; } - - public void Dispose() - { - _context.Dispose(); - _connection.Dispose(); - } } } diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Controllers/PagamentoControllerTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Controllers/PagamentoControllerTest.cs index f12ff15..fc4f1e4 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Controllers/PagamentoControllerTest.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Controllers/PagamentoControllerTest.cs @@ -12,7 +12,7 @@ namespace PlataformaEducacao.GestaoFinanceira.Business.Tests.Controllers { - public class PagamentoControllerTest + public class PagamentoControllerTest : IDisposable { private readonly Mock _pagamentoServiceMock; private readonly Mock _serviceProviderMock; @@ -161,5 +161,10 @@ public async Task ObterStatus_SemPagamento_DeveRetornarPagamentoPendente(bool is var pagamentoStatus = Assert.IsType(responseResult.Data); Assert.Equal("Pagamento Pendente", pagamentoStatus.Status); } + + public void Dispose() + { + _controller.Dispose(); + } } } diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/CardHashTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/CardHashTest.cs new file mode 100644 index 0000000..7190bf1 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/CardHashTest.cs @@ -0,0 +1,29 @@ +using PlataformaEducacao.GestaoFinanceira.EduPag; + +namespace PlataformaEducacao.GestaoFinanceira.Business.Tests.EduPag +{ + public class CardHashTest + { + [Fact(DisplayName = "CardHash.Generate deve retornar string não vazia")] + [Trait("Categoria", "Gestão Financeira - EduPag - CardHash")] + public void Generate_DeveRetornarHashNaoVazio() + { + // Arrange + var svc = new EduPagService("0123456789abcdef0123456789abcdef", "abcdefghijklmnop"); + var cardHash = new CardHash(svc) + { + CardHolderName = "Fulano", + CardNumber = "4111111111111111", + CardExpirationDate = "12/2030", + CardCvv = "123" + }; + + // Act + var hash = cardHash.Generate(); + + // Assert + Assert.NotNull(hash); + Assert.NotEmpty(hash); + } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/EduPagTests.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/EduPagTests.cs index de2b55a..af2a509 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/EduPagTests.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/EduPagTests.cs @@ -16,204 +16,4 @@ public void EduPagService_DeveAtribuirChaves() Assert.Equal("minha-enc-key", service.EncryptionKey); } } - - public class TransactionTest - { - private static EduPagService CriarEduPagService() - { - return new EduPagService("0123456789abcdef0123456789abcdef", "abcdefghijklmnop"); - } - - [Fact(DisplayName = "AuthorizeCardTransaction deve retornar Authorized ou Refused")] - [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] - public async Task AuthorizeCardTransaction_DeveRetornarTransacao() - { - // Arrange - var svc = CriarEduPagService(); - var transaction = new Transaction(svc) - { - CardNumber = "4111111111111111", - CardHolderName = "Fulano", - CardExpirationDate = "12/2030", - CardCvv = "123", - PaymentMethod = PaymentMethod.CreditCard, - Amount = 100m - }; - - // Act - var result = await transaction.AuthorizeCardTransaction(); - - // Assert - Assert.NotNull(result); - Assert.True(result.Status == TransactionStatus.Authorized || result.Status == TransactionStatus.Refused); - } - - [Fact(DisplayName = "CaptureCardTransaction deve retornar status Paid")] - [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] - public async Task CaptureCardTransaction_DeveRetornarPaid() - { - // Arrange - var svc = CriarEduPagService(); - var transaction = new Transaction(svc) - { - Amount = 200m, - CardBrand = "MasterCard", - Tid = "TID123", - Nsu = "NSU456" - }; - - // Act - var result = await transaction.CaptureCardTransaction(); - - // Assert - Assert.Equal(TransactionStatus.Paid, result.Status); - Assert.Equal(200m, result.Amount); - Assert.Equal("MasterCard", result.CardBrand); - Assert.Equal("TID123", result.Tid); - Assert.Equal("NSU456", result.Nsu); - } - - [Fact(DisplayName = "CancelAuthorization deve retornar status Cancelled")] - [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] - public async Task CancelAuthorization_DeveRetornarCancelled() - { - // Arrange - var svc = CriarEduPagService(); - var transaction = new Transaction(svc) - { - Amount = 150m, - CardBrand = "Visa", - Tid = "TID789", - Nsu = "NSU012" - }; - - // Act - var result = await transaction.CancelAuthorization(); - - // Assert - Assert.Equal(TransactionStatus.Cancelled, result.Status); - Assert.Equal(150m, result.Amount); - Assert.Equal("Visa", result.CardBrand); - Assert.Equal(string.Empty, result.AuthorizationCode); - } - - [Fact(DisplayName = "Transaction deve atribuir propriedades")] - [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] - public void Transaction_DeveAtribuirPropriedades() - { - // Arrange & Act - var svc = CriarEduPagService(); - var t = new Transaction(svc) - { - SubscriptionId = 1, - Status = TransactionStatus.Authorized, - AuthorizationAmount = 100, - PaidAmount = 100, - RefundedAmount = 0, - CardHash = "hash", - CardNumber = "4111111111111111", - CardExpirationDate = "12/30", - StatusReason = "ok", - AcquirerResponseCode = "00", - AcquirerName = "Acquirer", - AuthorizationCode = "AUTH", - SoftDescriptor = "Desc", - RefuseReason = "", - Tid = "TID", - Nsu = "NSU", - Amount = 100m, - Installments = 1, - Cost = 3m, - CardHolderName = "Fulano", - CardCvv = "123", - CardLastDigits = "1111", - CardFirstDigits = "4111", - CardBrand = "Visa", - CardEmvResponse = "", - PostbackUrl = "http://callback", - PaymentMethod = PaymentMethod.CreditCard, - AntifraudScore = 95.5f, - BilletUrl = "", - BilletInstructions = "", - BilletExpirationDate = null, - BilletBarcode = "", - Referer = "http://site", - IP = "127.0.0.1", - ShouldCapture = true, - Async = false, - LocalTime = "12:00", - TransactionDate = DateTime.UtcNow - }; - - // Assert - Assert.Equal(1, t.SubscriptionId); - Assert.Equal(TransactionStatus.Authorized, t.Status); - Assert.Equal(100, t.AuthorizationAmount); - Assert.Equal(100, t.PaidAmount); - Assert.Equal("hash", t.CardHash); - Assert.Equal("4111111111111111", t.CardNumber); - Assert.Equal("AUTH", t.AuthorizationCode); - Assert.Equal("TID", t.Tid); - Assert.Equal("NSU", t.Nsu); - Assert.Equal(100m, t.Amount); - Assert.Equal(1, t.Installments); - Assert.Equal(3m, t.Cost); - Assert.Equal("Fulano", t.CardHolderName); - Assert.Equal("123", t.CardCvv); - Assert.Equal("Visa", t.CardBrand); - Assert.Equal(PaymentMethod.CreditCard, t.PaymentMethod); - Assert.True(t.ShouldCapture); - Assert.False(t.Async); - } - } - - public class CardHashTest - { - [Fact(DisplayName = "CardHash.Generate deve retornar string não vazia")] - [Trait("Categoria", "Gestão Financeira - EduPag - CardHash")] - public void Generate_DeveRetornarHashNaoVazio() - { - // Arrange - var svc = new EduPagService("0123456789abcdef0123456789abcdef", "abcdefghijklmnop"); - var cardHash = new CardHash(svc) - { - CardHolderName = "Fulano", - CardNumber = "4111111111111111", - CardExpirationDate = "12/2030", - CardCvv = "123" - }; - - // Act - var hash = cardHash.Generate(); - - // Assert - Assert.NotNull(hash); - Assert.NotEmpty(hash); - } - } - - public class PaymentMethodTest - { - [Fact(DisplayName = "PaymentMethod deve conter valores esperados")] - [Trait("Categoria", "Gestão Financeira - EduPag - PaymentMethod")] - public void PaymentMethod_ValoresEsperados() - { - Assert.Equal(1, (int)PaymentMethod.CreditCard); - Assert.Equal(2, (int)PaymentMethod.Billet); - } - } - - public class TransactionStatusTest - { - [Fact(DisplayName = "TransactionStatus deve conter valores esperados")] - [Trait("Categoria", "Gestão Financeira - EduPag - TransactionStatus")] - public void TransactionStatus_ValoresEsperados() - { - Assert.Equal(1, (int)TransactionStatus.Authorized); - Assert.Equal(2, (int)TransactionStatus.Paid); - Assert.Equal(3, (int)TransactionStatus.Refused); - Assert.Equal(4, (int)TransactionStatus.Chargedback); - Assert.Equal(5, (int)TransactionStatus.Cancelled); - } - } } diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/PaymentMethodTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/PaymentMethodTest.cs new file mode 100644 index 0000000..22905e0 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/PaymentMethodTest.cs @@ -0,0 +1,15 @@ +using PlataformaEducacao.GestaoFinanceira.EduPag; + +namespace PlataformaEducacao.GestaoFinanceira.Business.Tests.EduPag +{ + public class PaymentMethodTest + { + [Fact(DisplayName = "PaymentMethod deve conter valores esperados")] + [Trait("Categoria", "Gestão Financeira - EduPag - PaymentMethod")] + public void PaymentMethod_ValoresEsperados() + { + Assert.Equal(1, (int)PaymentMethod.CreditCard); + Assert.Equal(2, (int)PaymentMethod.Billet); + } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/TransactionStatusTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/TransactionStatusTest.cs new file mode 100644 index 0000000..a05a200 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/TransactionStatusTest.cs @@ -0,0 +1,18 @@ +using PlataformaEducacao.GestaoFinanceira.EduPag; + +namespace PlataformaEducacao.GestaoFinanceira.Business.Tests.EduPag +{ + public class TransactionStatusTest + { + [Fact(DisplayName = "TransactionStatus deve conter valores esperados")] + [Trait("Categoria", "Gestão Financeira - EduPag - TransactionStatus")] + public void TransactionStatus_ValoresEsperados() + { + Assert.Equal(1, (int)TransactionStatus.Authorized); + Assert.Equal(2, (int)TransactionStatus.Paid); + Assert.Equal(3, (int)TransactionStatus.Refused); + Assert.Equal(4, (int)TransactionStatus.Chargedback); + Assert.Equal(5, (int)TransactionStatus.Cancelled); + } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/TransactionTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/TransactionTest.cs new file mode 100644 index 0000000..01f4711 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/EduPag/TransactionTest.cs @@ -0,0 +1,154 @@ +using PlataformaEducacao.GestaoFinanceira.EduPag; + +namespace PlataformaEducacao.GestaoFinanceira.Business.Tests.EduPag +{ + public class TransactionTest + { + [Fact(DisplayName = "AuthorizeCardTransaction deve retornar Authorized ou Refused")] + [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] + public async Task AuthorizeCardTransaction_DeveRetornarTransacao() + { + // Arrange + var svc = CriarEduPagService(); + var transaction = new Transaction(svc) + { + CardNumber = "4111111111111111", + CardHolderName = "Fulano", + CardExpirationDate = "12/2030", + CardCvv = "123", + PaymentMethod = PaymentMethod.CreditCard, + Amount = 100m + }; + + // Act + var result = await transaction.AuthorizeCardTransaction(); + + // Assert + Assert.NotNull(result); + Assert.True(result.Status is TransactionStatus.Authorized or TransactionStatus.Refused); + } + + [Fact(DisplayName = "CaptureCardTransaction deve retornar status Paid")] + [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] + public async Task CaptureCardTransaction_DeveRetornarPaid() + { + // Arrange + var svc = CriarEduPagService(); + var transaction = new Transaction(svc) + { + Amount = 200m, + CardBrand = "MasterCard", + Tid = "TID123", + Nsu = "NSU456" + }; + + // Act + var result = await transaction.CaptureCardTransaction(); + + // Assert + Assert.Equal(TransactionStatus.Paid, result.Status); + Assert.Equal(200m, result.Amount); + Assert.Equal("MasterCard", result.CardBrand); + Assert.Equal("TID123", result.Tid); + Assert.Equal("NSU456", result.Nsu); + } + + [Fact(DisplayName = "CancelAuthorization deve retornar status Cancelled")] + [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] + public async Task CancelAuthorization_DeveRetornarCancelled() + { + // Arrange + var svc = CriarEduPagService(); + var transaction = new Transaction(svc) + { + Amount = 150m, + CardBrand = "Visa", + Tid = "TID789", + Nsu = "NSU012" + }; + + // Act + var result = await transaction.CancelAuthorization(); + + // Assert + Assert.Equal(TransactionStatus.Cancelled, result.Status); + Assert.Equal(150m, result.Amount); + Assert.Equal("Visa", result.CardBrand); + Assert.Equal(string.Empty, result.AuthorizationCode); + } + + [Fact(DisplayName = "Transaction deve atribuir propriedades")] + [Trait("Categoria", "Gestão Financeira - EduPag - Transaction")] + public void Transaction_DeveAtribuirPropriedades() + { + // Arrange & Act + var svc = CriarEduPagService(); + var t = new Transaction(svc) + { + SubscriptionId = 1, + Status = TransactionStatus.Authorized, + AuthorizationAmount = 100, + PaidAmount = 100, + RefundedAmount = 0, + CardHash = "hash", + CardNumber = "4111111111111111", + CardExpirationDate = "12/30", + StatusReason = "ok", + AcquirerResponseCode = "00", + AcquirerName = "Acquirer", + AuthorizationCode = "AUTH", + SoftDescriptor = "Desc", + RefuseReason = string.Empty, + Tid = "TID", + Nsu = "NSU", + Amount = 100m, + Installments = 1, + Cost = 3m, + CardHolderName = "Fulano", + CardCvv = "123", + CardLastDigits = "1111", + CardFirstDigits = "4111", + CardBrand = "Visa", + CardEmvResponse = string.Empty, + PostbackUrl = "http://callback", + PaymentMethod = PaymentMethod.CreditCard, + AntifraudScore = 95.5f, + BilletUrl = string.Empty, + BilletInstructions = string.Empty, + BilletExpirationDate = null, + BilletBarcode = string.Empty, + Referer = "http://site", + IP = "127.0.0.1", + ShouldCapture = true, + Async = false, + LocalTime = "12:00", + TransactionDate = DateTime.UtcNow + }; + + // Assert + Assert.Equal(1, t.SubscriptionId); + Assert.Equal(TransactionStatus.Authorized, t.Status); + Assert.Equal(100, t.AuthorizationAmount); + Assert.Equal(100, t.PaidAmount); + Assert.Equal("hash", t.CardHash); + Assert.Equal("4111111111111111", t.CardNumber); + Assert.Equal("AUTH", t.AuthorizationCode); + Assert.Equal("TID", t.Tid); + Assert.Equal("NSU", t.Nsu); + Assert.Equal(100m, t.Amount); + Assert.Equal(1, t.Installments); + Assert.Equal(3m, t.Cost); + Assert.Equal("Fulano", t.CardHolderName); + Assert.Equal("123", t.CardCvv); + Assert.Equal("Visa", t.CardBrand); + Assert.Equal(PaymentMethod.CreditCard, t.PaymentMethod); + Assert.True(t.ShouldCapture); + Assert.False(t.Async); + } + + private static EduPagService CriarEduPagService() + { + return new EduPagService("0123456789abcdef0123456789abcdef", "abcdefghijklmnop"); + } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Facade/PagamentoCartaoCreditoFacadeTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Facade/PagamentoCartaoCreditoFacadeTest.cs index 452c902..ece417e 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Facade/PagamentoCartaoCreditoFacadeTest.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Facade/PagamentoCartaoCreditoFacadeTest.cs @@ -76,14 +76,14 @@ public void ParaTransacao_StatusRefused_DeveConverterParaNegado() // Arrange var transaction = new Transaction(new EduPagService("key32caracteres_abcdefghijklm", "iv16caracteres__")) { - AuthorizationCode = "", - CardBrand = "", + AuthorizationCode = string.Empty, + CardBrand = string.Empty, TransactionDate = DateTime.UtcNow, Cost = 0, Amount = 0, Status = TransactionStatus.Refused, - Tid = "", - Nsu = "" + Tid = string.Empty, + Nsu = string.Empty }; // Act @@ -100,7 +100,7 @@ public void ParaTransacao_StatusCancelled_DeveConverterParaCancelado() // Arrange var transaction = new Transaction(new EduPagService("key32caracteres_abcdefghijklm", "iv16caracteres__")) { - AuthorizationCode = "", + AuthorizationCode = string.Empty, CardBrand = "Visa", TransactionDate = DateTime.UtcNow, Cost = 0, @@ -143,7 +143,7 @@ public async Task AutorizarPagamento_DeveRetornarTransacao() // Assert Assert.NotNull(result); - Assert.True(result.Status == StatusTransacao.Autorizado || result.Status == StatusTransacao.Negado); + Assert.True(result.Status is StatusTransacao.Autorizado or StatusTransacao.Negado); } [Fact(DisplayName = "CapturarPagamento deve retornar transacao com status Pago")] diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/DadosCartaoTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/DadosCartaoTest.cs index e891f45..89b6052 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/DadosCartaoTest.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/DadosCartaoTest.cs @@ -23,28 +23,28 @@ public void CriarDadosCartao_ComDadosValidos_DeveCriar() [Trait("Categoria", "Gestão Financeira - Business - DadosCartao")] public void CriarDadosCartao_SemNome_DeveLancarDomainException() { - Assert.Throws(() => new DadosCartao("", "4111111111111111", "12/2030", "123")); + Assert.Throws(() => new DadosCartao(string.Empty, "4111111111111111", "12/2030", "123")); } [Fact(DisplayName = "Criar DadosCartao sem número deve lançar DomainException")] [Trait("Categoria", "Gestão Financeira - Business - DadosCartao")] public void CriarDadosCartao_SemNumero_DeveLancarDomainException() { - Assert.Throws(() => new DadosCartao("Fulano", "", "12/2030", "123")); + Assert.Throws(() => new DadosCartao("Fulano", string.Empty, "12/2030", "123")); } [Fact(DisplayName = "Criar DadosCartao sem expiração deve lançar DomainException")] [Trait("Categoria", "Gestão Financeira - Business - DadosCartao")] public void CriarDadosCartao_SemExpiracao_DeveLancarDomainException() { - Assert.Throws(() => new DadosCartao("Fulano", "4111111111111111", "", "123")); + Assert.Throws(() => new DadosCartao("Fulano", "4111111111111111", string.Empty, "123")); } [Fact(DisplayName = "Criar DadosCartao sem CVV deve lançar DomainException")] [Trait("Categoria", "Gestão Financeira - Business - DadosCartao")] public void CriarDadosCartao_SemCvv_DeveLancarDomainException() { - Assert.Throws(() => new DadosCartao("Fulano", "4111111111111111", "12/2030", "")); + Assert.Throws(() => new DadosCartao("Fulano", "4111111111111111", "12/2030", string.Empty)); } } } diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/PagarMatriculaRequestTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/PagarMatriculaRequestTest.cs index 096b1d5..9676232 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/PagarMatriculaRequestTest.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Models/PagarMatriculaRequestTest.cs @@ -1,5 +1,5 @@ -using PlataformaEducacao.GestaoFinanceira.Api.Models.Requests; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using PlataformaEducacao.GestaoFinanceira.Api.Models.Requests; namespace PlataformaEducacao.GestaoFinanceira.Business.Tests.Models { diff --git a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Services/PagamentoServiceTest.cs b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Services/PagamentoServiceTest.cs index 9195a13..a120f81 100644 --- a/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Services/PagamentoServiceTest.cs +++ b/src/tests/PlataformaEducacao.GestaoFinanceira.Business.Tests/Services/PagamentoServiceTest.cs @@ -61,12 +61,12 @@ public async Task AutorizarPagamento_TransacaoRecusada_DeveRetornarErro() var transacao = new Transacao { Status = StatusTransacao.Negado, - CodigoAutorizacao = "", - BandeiraCartao = "", + CodigoAutorizacao = string.Empty, + BandeiraCartao = string.Empty, ValorTotal = 0, CustoTransacao = 0, - TID = "", - NSU = "", + TID = string.Empty, + NSU = string.Empty, DataTransacao = DateTime.UtcNow }; @@ -104,7 +104,7 @@ public async Task AutorizarPagamento_FalhaAoPersistir_DeveRetornarErro() // Setup para CancelarPagamento var transacoes = new List { transacao }; _repositoryMock.Setup(r => r.ObterTransacoesPorMatriculaId(pagamento.MatriculaId)).ReturnsAsync(transacoes); - var transacaoCancelada = new Transacao { Status = StatusTransacao.Cancelado, BandeiraCartao = "Visa", ValorTotal = 100m, TID = "TID", NSU = "NSU", CodigoAutorizacao = "" }; + var transacaoCancelada = new Transacao { Status = StatusTransacao.Cancelado, BandeiraCartao = "Visa", ValorTotal = 100m, TID = "TID", NSU = "NSU", CodigoAutorizacao = string.Empty }; _facadeMock.Setup(f => f.CancelarAutorizacao(It.IsAny())).ReturnsAsync(transacaoCancelada); _repositoryMock.Setup(r => r.UnitOfWork.Commit()).ReturnsAsync(false); @@ -147,7 +147,7 @@ public async Task ObterStatusPorMatricula_PagamentoExistente_DeveRetornarStatus( // Assert Assert.NotNull(resultado); - Assert.Equal(matriculaId, resultado!.MatriculaId); + Assert.Equal(matriculaId, resultado.MatriculaId); Assert.Equal("Pago", resultado.Status); } @@ -230,7 +230,7 @@ public async Task CancelarPagamento_TransacaoAutorizada_DeveCancelar() var transacaoCancelada = new Transacao { Status = StatusTransacao.Cancelado, - CodigoAutorizacao = "", + CodigoAutorizacao = string.Empty, BandeiraCartao = "Visa", ValorTotal = 100m, CustoTransacao = 0, @@ -279,12 +279,12 @@ public async Task AutorizarPagamento_ExcecaoNoPublish_DeveRetornarErro() }); _busMock.Setup(b => b.PublishAsync(It.IsAny())) - .ThrowsAsync(new Exception("Falha no bus")); + .ThrowsAsync(new InvalidOperationException("Falha no bus")); _repositoryMock.Setup(r => r.ObterTransacoesPorMatriculaId(pagamento.MatriculaId)) .ReturnsAsync(new List { transacao }); _facadeMock.Setup(f => f.CancelarAutorizacao(It.IsAny())) - .ReturnsAsync(new Transacao { Status = StatusTransacao.Cancelado, BandeiraCartao = "Visa", ValorTotal = 100m, TID = "TID", NSU = "NSU", CodigoAutorizacao = "" }); + .ReturnsAsync(new Transacao { Status = StatusTransacao.Cancelado, BandeiraCartao = "Visa", ValorTotal = 100m, TID = "TID", NSU = "NSU", CodigoAutorizacao = string.Empty }); // Act var resultado = await _service.AutorizarPagamento(pagamento, CancellationToken.None); @@ -314,12 +314,12 @@ public async Task CapturarPagamento_StatusNaoPago_DeveRetornarErro() var transacaoCapturada = new Transacao { Status = StatusTransacao.Negado, - CodigoAutorizacao = "", - BandeiraCartao = "", + CodigoAutorizacao = string.Empty, + BandeiraCartao = string.Empty, ValorTotal = 0m, CustoTransacao = 0, - TID = "", - NSU = "" + TID = string.Empty, + NSU = string.Empty }; _repositoryMock.Setup(r => r.ObterTransacoesPorMatriculaId(matriculaId)) @@ -396,7 +396,7 @@ public async Task CancelarPagamento_StatusNaoCancelado_DeveRetornarErro() _repositoryMock.Setup(r => r.ObterTransacoesPorMatriculaId(matriculaId)) .ReturnsAsync(new List { transacaoAutorizada }); _facadeMock.Setup(f => f.CancelarAutorizacao(transacaoAutorizada)) - .ReturnsAsync(new Transacao { Status = StatusTransacao.Negado, CodigoAutorizacao = "", BandeiraCartao = "", ValorTotal = 0, CustoTransacao = 0, TID = "", NSU = "" }); + .ReturnsAsync(new Transacao { Status = StatusTransacao.Negado, CodigoAutorizacao = string.Empty, BandeiraCartao = string.Empty, ValorTotal = 0, CustoTransacao = 0, TID = string.Empty, NSU = string.Empty }); // Act var resultado = await _service.CancelarPagamento(matriculaId); @@ -427,7 +427,7 @@ public async Task CancelarPagamento_FalhaAoPersistir_DeveRetornarErro() _repositoryMock.Setup(r => r.ObterTransacoesPorMatriculaId(matriculaId)) .ReturnsAsync(new List { transacaoAutorizada }); _facadeMock.Setup(f => f.CancelarAutorizacao(transacaoAutorizada)) - .ReturnsAsync(new Transacao { Status = StatusTransacao.Cancelado, CodigoAutorizacao = "", BandeiraCartao = "Visa", ValorTotal = 100m, CustoTransacao = 0, TID = "TID", NSU = "NSU" }); + .ReturnsAsync(new Transacao { Status = StatusTransacao.Cancelado, CodigoAutorizacao = string.Empty, BandeiraCartao = "Visa", ValorTotal = 100m, CustoTransacao = 0, TID = string.Empty, NSU = string.Empty }); _repositoryMock.Setup(r => r.UnitOfWork.Commit()).ReturnsAsync(false); // Act @@ -490,7 +490,7 @@ public async Task ObterStatusPorMatricula_SemTransacoes_DeveRetornarSemTransacoe // Assert Assert.NotNull(resultado); - Assert.Equal("Sem transações", resultado!.Status); + Assert.Equal("Sem transações", resultado.Status); } private static Pagamento CriarPagamento() diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Config/FakeMessageBus.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Config/FakeMessageBus.cs new file mode 100644 index 0000000..54e7ee2 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Config/FakeMessageBus.cs @@ -0,0 +1,74 @@ +using EasyNetQ; +using FluentValidation.Results; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Data.Sqlite; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Hosting; +using PlataformaEducacao.Core.Messages.Integration; +using PlataformaEducacao.GestaoIdentidade.Api.Data; +using PlataformaEducacao.MessageBus; +using static PlataformaEducacao.GestaoIdentidade.Api.Configurations.DbMigrationHelperExtension; + +namespace PlataformaEducacao.GestaoIdentidade.Api.Tests.Config +{ + internal sealed class FakeMessageBus : IMessageBus + { + public void Dispose() + { + } + + public bool IsConnected => true; + + public IAdvancedBus AdvancedBus => throw new NotImplementedException(); + + public void Publish(T message) + where T : IntegrationEvent + { + } + + public Task PublishAsync(T message) + where T : IntegrationEvent + => Task.CompletedTask; + + public TResponse Request(TRequest request) + where TRequest : IntegrationEvent + where TResponse : ResponseMessage + => (TResponse)new ResponseMessage(new ValidationResult()); + + public Task RequestAsync(TRequest request) + where TRequest : IntegrationEvent + where TResponse : ResponseMessage + => Task.FromResult((TResponse)new ResponseMessage(new ValidationResult())); + + public IDisposable Respond(Func responder) + where TRequest : IntegrationEvent + where TResponse : ResponseMessage + => new FakeDisposable(); + + public IDisposable RespondAsync(Func> responder) + where TRequest : IntegrationEvent + where TResponse : ResponseMessage + => new FakeDisposable(); + + public void Subscribe(string subscriptionId, Action onMessage) + where T : class + { + } + + public void SubscribeAsync(string subscriptionId, Func onMessage) + where T : class + { + } + + private sealed class FakeDisposable : IDisposable + { + public void Dispose() + { + } + } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Config/GestaoIdentidadeApiFactory.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Config/GestaoIdentidadeApiFactory.cs index be0ac65..13fc80e 100644 --- a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Config/GestaoIdentidadeApiFactory.cs +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Config/GestaoIdentidadeApiFactory.cs @@ -17,7 +17,7 @@ namespace PlataformaEducacao.GestaoIdentidade.Api.Tests.Config { public class GestaoIdentidadeApiFactory : WebApplicationFactory, IDisposable { - private SqliteConnection _connection = null!; + private readonly SqliteConnection _connection = null!; public GestaoIdentidadeApiFactory() { @@ -25,6 +25,13 @@ public GestaoIdentidadeApiFactory() _connection.Open(); } + public new void Dispose() + { + base.Dispose(); + + _connection?.Close(); + } + protected override void ConfigureWebHost(IWebHostBuilder builder) { builder.ConfigureAppConfiguration((_, configBuilder) => @@ -76,11 +83,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder) services.RemoveAll(); services.AddSingleton(new FakeMessageBus()); - using (var scope = services.BuildServiceProvider().CreateScope()) - { - var serviceProvider = scope.ServiceProvider; - DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); - } + using var scope = services.BuildServiceProvider().CreateScope(); + var serviceProvider = scope.ServiceProvider; + DbMigrationHelper.EnsureSeedData(serviceProvider).GetAwaiter().GetResult(); }); } @@ -89,58 +94,5 @@ protected override IHost CreateHost(IHostBuilder builder) builder.UseEnvironment("Testing"); return base.CreateHost(builder); } - - public new void Dispose() - { - base.Dispose(); - - if (_connection != null) - { - _connection.Close(); - } - } - } - - internal class FakeMessageBus : IMessageBus - { - public void Dispose() { } - - public bool IsConnected => true; - - public IAdvancedBus AdvancedBus => throw new NotImplementedException(); - - public void Publish(T message) where T : IntegrationEvent { } - - public Task PublishAsync(T message) where T : IntegrationEvent - => Task.CompletedTask; - - public TResponse Request(TRequest request) - where TRequest : IntegrationEvent - where TResponse : ResponseMessage - => (TResponse)new ResponseMessage(new ValidationResult()); - - public Task RequestAsync(TRequest request) - where TRequest : IntegrationEvent - where TResponse : ResponseMessage - => Task.FromResult((TResponse)new ResponseMessage(new ValidationResult())); - - public IDisposable Respond(Func responder) - where TRequest : IntegrationEvent - where TResponse : ResponseMessage - => new FakeDisposable(); - - public IDisposable RespondAsync(Func> responder) - where TRequest : IntegrationEvent - where TResponse : ResponseMessage - => new FakeDisposable(); - - public void Subscribe(string subscriptionId, Action onMessage) where T : class { } - - public void SubscribeAsync(string subscriptionId, Func onMessage) where T : class { } - - private class FakeDisposable : IDisposable - { - public void Dispose() { } - } } } diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Configurations/GestaoIdentidadeApiIntegrationTest.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Configurations/GestaoIdentidadeApiIntegrationTest.cs index 274b9c7..ea39a9e 100644 --- a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Configurations/GestaoIdentidadeApiIntegrationTest.cs +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Configurations/GestaoIdentidadeApiIntegrationTest.cs @@ -1,11 +1,11 @@ -using Microsoft.AspNetCore.Identity; +using System.Net; +using System.Net.Http.Json; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.DependencyInjection; using PlataformaEducacao.GestaoIdentidade.Api.Data; using PlataformaEducacao.GestaoIdentidade.Api.Tests.Config; using PlataformaEducacao.MessageBus; -using System.Net; -using System.Net.Http.Json; namespace PlataformaEducacao.GestaoIdentidade.Api.Tests.Configurations { @@ -98,8 +98,8 @@ public async Task Autenticar_DadosInvalidos_DeveRetornarBadRequest() { var response = await _client.PostAsJsonAsync("/api/identidade/autenticar", new { - Email = "", - Senha = "" + Email = string.Empty, + Senha = string.Empty }); Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); @@ -124,10 +124,10 @@ public async Task NovoAluno_DadosInvalidos_DeveRetornarBadRequest() { var response = await _client.PostAsJsonAsync("/api/identidade/novo-aluno", new { - Nome = "", + Nome = string.Empty, Email = "invalido", - Senha = "", - SenhaConfirmacao = "" + Senha = string.Empty, + SenhaConfirmacao = string.Empty }); Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Controllers/IdentidadeControllerTests.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Controllers/IdentidadeControllerTests.cs new file mode 100644 index 0000000..0ea6cc4 --- /dev/null +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Controllers/IdentidadeControllerTests.cs @@ -0,0 +1,106 @@ +using System; +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; +using PlataformaEducacao.Core.Communication; +using PlataformaEducacao.GestaoIdentidade.Api.Controllers; +using PlataformaEducacao.GestaoIdentidade.Api.Models; +using PlataformaEducacao.GestaoIdentidade.Api.Services; +using PlataformaEducacao.WebApi.Core.Identidade; +using Xunit; + +namespace PlataformaEducacao.GestaoIdentidade.Api.Tests.Controllers +{ + public class IdentidadeControllerTests + { + [Fact(DisplayName = "RefreshToken deve retornar BadRequest quando request for null")] + [Trait("Categoria", "Gestão Identidade - Controllers - IdentidadeController")] + public async Task RefreshToken_DeveRetornarBadRequest_QuandoRequestNulo() + { + // Arrange + var autenticacaoService = new FakeAutenticacaoService(); + var appSettings = Options.Create(new AppSettings()); + var controller = new IdentidadeController(null!, null!, autenticacaoService, appSettings, null!); + + // Act + var resultado = await controller.RefreshToken(null!); + + // Assert + var badRequest = Assert.IsType(resultado); + var resposta = Assert.IsType(badRequest.Value); + Assert.False(resposta.Sucesso); + Assert.Contains("Refresh Token inválido", resposta.Erros.Mensagens); + } + + [Fact(DisplayName = "RefreshToken deve retornar BadRequest quando RefreshToken string for vazia")] + [Trait("Categoria", "Gestão Identidade - Controllers - IdentidadeController")] + public async Task RefreshToken_DeveRetornarBadRequest_QuandoRefreshTokenVazio() + { + // Arrange + var autenticacaoService = new FakeAutenticacaoService(); + var appSettings = Options.Create(new AppSettings()); + var controller = new IdentidadeController(null!, null!, autenticacaoService, appSettings, null!); + + var request = new UsuarioRefreshToken { RefreshToken = string.Empty }; + + // Act + var resultado = await controller.RefreshToken(request); + + // Assert + var badRequest = Assert.IsType(resultado); + var resposta = Assert.IsType(badRequest.Value); + Assert.False(resposta.Sucesso); + Assert.Contains("Refresh Token inválido", resposta.Erros.Mensagens); + } + + [Fact(DisplayName = "RefreshToken deve retornar BadRequest quando RefreshToken expirado (service retorna nulo)")] + [Trait("Categoria", "Gestão Identidade - Controllers - IdentidadeController")] + public async Task RefreshToken_DeveRetornarBadRequest_QuandoRefreshTokenExpirado() + { + // Arrange + // Fake service configurado para retornar null em ObterRefreshToken + var autenticacaoService = new FakeAutenticacaoService(obterRefreshTokenResult: null); + var appSettings = Options.Create(new AppSettings()); + var controller = new IdentidadeController(null!, null!, autenticacaoService, appSettings, null!); + + var request = new UsuarioRefreshToken { RefreshToken = Guid.NewGuid().ToString() }; + + // Act + var resultado = await controller.RefreshToken(request); + + // Assert + var badRequest = Assert.IsType(resultado); + var resposta = Assert.IsType(badRequest.Value); + Assert.False(resposta.Sucesso); + Assert.Contains("Refresh Token expirado", resposta.Erros.Mensagens); + } + + // Fake implementation simples do IAutenticacaoService para testes unitários do controller. + private sealed class FakeAutenticacaoService : IAutenticacaoService + { + private readonly RefreshToken? _obterRefreshTokenResult; + + public FakeAutenticacaoService(RefreshToken? obterRefreshTokenResult = null) + { + _obterRefreshTokenResult = obterRefreshTokenResult; + } + + public Task GerarRefreshToken(string userName) + { + var token = new RefreshToken + { + UserName = userName, + Token = Guid.NewGuid(), + ExpirationDate = DateTime.UtcNow.AddHours(1) + }; + return Task.FromResult(token); + } + + public Task ObterRefreshToken(Guid refreshToken) + { + return Task.FromResult(_obterRefreshTokenResult); + } + } + } +} diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Data/Repository/AutenticacaoRepositoryTest.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Data/Repository/AutenticacaoRepositoryTest.cs index 0114e67..9ba7c50 100644 --- a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Data/Repository/AutenticacaoRepositoryTest.cs +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Data/Repository/AutenticacaoRepositoryTest.cs @@ -54,7 +54,7 @@ public async Task ObterRefreshToken_Deve_Retornar_Token_Quando_Valido() // Assert Assert.NotNull(obtido); - Assert.Equal(tokenValido.Token, obtido!.Token); + Assert.Equal(tokenValido.Token, obtido.Token); } [Fact(DisplayName = "ObterRefreshToken Deve Retornar Nulo Quando Expirado")] diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioLoginTest.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioLoginTest.cs index 7e689b1..318b905 100644 --- a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioLoginTest.cs +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioLoginTest.cs @@ -1,5 +1,5 @@ -using PlataformaEducacao.GestaoIdentidade.Api.Models; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using PlataformaEducacao.GestaoIdentidade.Api.Models; namespace PlataformaEducacao.GestaoIdentidade.Api.Tests.Models { @@ -33,7 +33,7 @@ public void UsuarioLogin_SemEmail_RetornaErro() // Arrange var login = new UsuarioLogin { - Email = "", + Email = string.Empty, Senha = "Teste@123" }; var contexto = new ValidationContext(login); @@ -74,7 +74,7 @@ public void UsuarioLogin_SemSenha_RetornaErro() var login = new UsuarioLogin { Email = "aluno@teste.com", - Senha = "" + Senha = string.Empty }; var contexto = new ValidationContext(login); var resultados = new List(); diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRegistroTest.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRegistroTest.cs index dbb9da8..8d9449e 100644 --- a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRegistroTest.cs +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRegistroTest.cs @@ -1,5 +1,5 @@ -using PlataformaEducacao.GestaoIdentidade.Api.Models; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using PlataformaEducacao.GestaoIdentidade.Api.Models; namespace PlataformaEducacao.GestaoIdentidade.Api.Tests.Models { @@ -35,7 +35,7 @@ public void UsuarioRegistro_SemNome_RetornaErro() // Arrange var registro = new UsuarioRegistro { - Nome = "", + Nome = string.Empty, Email = "aluno@teste.com", Senha = "Teste@123", SenhaConfirmacao = "Teste@123" diff --git a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRespostaLoginTest.cs b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRespostaLoginTest.cs index 8a278c4..b623e71 100644 --- a/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRespostaLoginTest.cs +++ b/src/tests/PlataformaEducacao.GestaoIdentidade.Api.Tests/Models/UsuarioRespostaLoginTest.cs @@ -19,7 +19,7 @@ public void UsuarioRespostaLogin_DeveAtribuirPropriedades() Email = "user@teste.com", Claims = new List { - new UsuarioClaim { Type = "role", Value = "ALUNO" } + new() { Type = "role", Value = "ALUNO" } } } }; diff --git a/src/tests/PlataformaEducacao.MessageBus.Tests/DependencyInjectionExtensionsTest.cs b/src/tests/PlataformaEducacao.MessageBus.Tests/DependencyInjectionExtensionsTest.cs index 9a2e692..003d9db 100644 --- a/src/tests/PlataformaEducacao.MessageBus.Tests/DependencyInjectionExtensionsTest.cs +++ b/src/tests/PlataformaEducacao.MessageBus.Tests/DependencyInjectionExtensionsTest.cs @@ -17,7 +17,7 @@ public void AddMessageBus_QuandoConexaoForNulaOuVazia_DeveLancarArgumentNullExce var services = new ServiceCollection(); // Act & Assert - Assert.Throws(() => services.AddMessageBus(connection!)); + Assert.Throws(() => services.AddMessageBus(connection)); } } } diff --git a/src/tests/PlataformaEducacao.MessageBus.Tests/EventoTeste.cs b/src/tests/PlataformaEducacao.MessageBus.Tests/EventoTeste.cs new file mode 100644 index 0000000..86e301d --- /dev/null +++ b/src/tests/PlataformaEducacao.MessageBus.Tests/EventoTeste.cs @@ -0,0 +1,16 @@ +using System; +using System.Runtime.CompilerServices; +using System.Threading.Tasks; +using EasyNetQ; +using FluentValidation.Results; +using Moq; +using PlataformaEducacao.Core.Messages.Integration; +using Xunit; + +namespace PlataformaEducacao.MessageBus.Tests +{ + // Tipo de suporte usado nos testes + public class EventoTeste : IntegrationEvent + { + } +} diff --git a/src/tests/PlataformaEducacao.MessageBus.Tests/MessageBusTests.cs b/src/tests/PlataformaEducacao.MessageBus.Tests/MessageBusTests.cs index e483d4a..d499fee 100644 --- a/src/tests/PlataformaEducacao.MessageBus.Tests/MessageBusTests.cs +++ b/src/tests/PlataformaEducacao.MessageBus.Tests/MessageBusTests.cs @@ -1,7 +1,11 @@ +using System; using System.Runtime.CompilerServices; +using System.Threading.Tasks; using EasyNetQ; +using FluentValidation.Results; using Moq; using PlataformaEducacao.Core.Messages.Integration; +using Xunit; namespace PlataformaEducacao.MessageBus.Tests { @@ -65,6 +69,229 @@ public void Dispose_DeveChamarDisposeDoBus() mockBus.Verify(b => b.Dispose(), Times.Once); } - private class EventoTeste : IntegrationEvent { } + [Fact(DisplayName = "Publish DeveDelegarParaBus")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void Publish_DeveDelegarParaBus() + { + // Arrange + var message = new EventoTeste(); + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.Publish(It.IsAny())); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + instancia.Publish(message); + + // Assert + mockBus.Verify(b => b.Publish(It.Is(m => m == message)), Times.Once); + } + + [Fact(DisplayName = "PublishAsync DeveDelegarParaBus")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public async Task PublishAsync_DeveDelegarParaBus() + { + // Arrange + var message = new EventoTeste(); + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.PublishAsync(It.IsAny())).Returns(Task.CompletedTask); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + await instancia.PublishAsync(message); + + // Assert + mockBus.Verify(b => b.PublishAsync(It.Is(m => m == message)), Times.Once); + } + + [Fact(DisplayName = "Subscribe DeveDelegarParaBus")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void Subscribe_DeveDelegarParaBus() + { + // Arrange + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.Subscribe(It.IsAny(), It.IsAny>())); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + instancia.Subscribe("sub", _ => { }); + + // Assert + mockBus.Verify(b => b.Subscribe(It.Is(s => s == "sub"), It.IsAny>()), Times.Once); + } + + [Fact(DisplayName = "SubscribeAsync DeveDelegarParaBus")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void SubscribeAsync_DeveDelegarParaBus() + { + // Arrange + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.SubscribeAsync(It.IsAny(), It.IsAny>())); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + instancia.SubscribeAsync("sub", _ => Task.CompletedTask); + + // Assert + mockBus.Verify(b => b.SubscribeAsync(It.Is(s => s == "sub"), It.IsAny>()), Times.Once); + } + + [Fact(DisplayName = "Request DeveDelegarParaBusERetornarResposta")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void Request_DeveDelegarParaBusERetornarResposta() + { + // Arrange + var request = new EventoTeste(); + var response = new RespostaTeste(new ValidationResult()); + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.Request(It.IsAny())).Returns(response); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + var resultado = instancia.Request(request); + + // Assert + Assert.Equal(response, resultado); + mockBus.Verify(b => b.Request(It.Is(r => r == request)), Times.Once); + } + + [Fact(DisplayName = "RequestAsync DeveDelegarParaBusERetornarResposta")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public async Task RequestAsync_DeveDelegarParaBusERetornarResposta() + { + // Arrange + var request = new EventoTeste(); + var response = new RespostaTeste(new ValidationResult()); + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.RequestAsync(It.IsAny())).ReturnsAsync(response); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + var resultado = await instancia.RequestAsync(request); + + // Assert + Assert.Equal(response, resultado); + mockBus.Verify(b => b.RequestAsync(It.Is(r => r == request)), Times.Once); + } + + [Fact(DisplayName = "Respond DeveDelegarParaBusERetornarDisposable")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void Respond_DeveDelegarParaBusERetornarDisposable() + { + // Arrange + var disposableMock = new Mock(); + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.Respond(It.IsAny>())) + .Returns(disposableMock.Object); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + var disposable = instancia.Respond(_ => new RespostaTeste(new ValidationResult())); + + // Assert + Assert.Equal(disposableMock.Object, disposable); + mockBus.Verify(b => b.Respond(It.IsAny>()), Times.Once); + } + + [Fact(DisplayName = "RespondAsync DeveDelegarParaBusERetornarDisposable")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void RespondAsync_DeveDelegarParaBusERetornarDisposable() + { + // Arrange + var disposableMock = new Mock(); + var mockBus = new Mock(); + mockBus.SetupGet(b => b.IsConnected).Returns(true); + mockBus.Setup(b => b.RespondAsync(It.IsAny>>())) + .Returns(disposableMock.Object); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Act + var disposable = instancia.RespondAsync(_ => Task.FromResult(new RespostaTeste(new ValidationResult()))); + + // Assert + Assert.Equal(disposableMock.Object, disposable); + mockBus.Verify(b => b.RespondAsync(It.IsAny>>()), Times.Once); + } + + // Novos testes para a lógica de TryConnect (trecho selecionado) + [Fact(DisplayName = "TryConnect NaoExecutaQuandoJaConectado")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void TryConnect_NaoExecutaQuandoJaConectado() + { + // Arrange + var mockBus = new Mock(); + + // Simula que já está conectado + mockBus.SetupGet(b => b.IsConnected).Returns(true); + + // Protege a propriedade Advanced para verificar se nunca é acessada + mockBus.SetupGet(b => b.Advanced).Returns((IAdvancedBus)null!); + + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + + // Define o campo _bus com o mock + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, mockBus.Object); + + // Garante que _advancedBus esteja nulo antes da chamada + typeof(MessageBus).GetField("_advancedBus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, null); + + // Act + var metodo = typeof(MessageBus).GetMethod("TryConnect", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!; + metodo.Invoke(instancia, Array.Empty()); + + // Assert + // Como já estava conectado, TryConnect não deve acessar Advanced nem alterar _advancedBus + mockBus.VerifyGet(b => b.Advanced, Times.Never); + var advancedAfter = typeof(MessageBus).GetField("_advancedBus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.GetValue(instancia); + Assert.Null(advancedAfter); + } + + // Teste complementar: quando não está conectado, TryConnect não lança exceção imediata ao ser invocado + // (não tenta validar conexão real com RabbitMQ neste teste unitário) + [Fact(DisplayName = "TryConnect_NaoLancaQuandoNaoConectado_EarlyReturnOuExecucaoSegura")] + [Trait("Categoria", "Building Blocks - MessageBus")] + public void TryConnect_NaoLancaQuandoNaoConectado_EarlyReturnOuExecucaoSegura() + { + // Arrange + var instancia = (MessageBus)RuntimeHelpers.GetUninitializedObject(typeof(MessageBus)); + + // Força _bus para null para simular estado desconectado + typeof(MessageBus).GetField("_bus", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!.SetValue(instancia, null); + + // Act & Assert + // Chamar TryConnect pode tentar criar um bus real (RabbitHutch.CreateBus). + // Como não queremos dependência externa nesse teste, garantimos apenas que a invocação + // não resulta em uma exceção não tratada do próprio código (por exemplo, problemas de null refs). + // Se RabbitHutch tentar conectar e lançar, isso ficará fora do escopo do teste unitário isolado. + var metodo = typeof(MessageBus).GetMethod("TryConnect", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)!; + var captured = Record.Exception(() => metodo.Invoke(instancia, Array.Empty())); + + // Se o método interno lançar um TargetInvocationException cujo InnerException é BrokerUnreachableException + // ou EasyNetQException, isso vem da tentativa de conexão real e não da lógica do método testada aqui. + // Aceitamos que não haja NullReferenceException ou similar. + Assert.True(captured is null or System.Reflection.TargetInvocationException or null); + } } } diff --git a/src/tests/PlataformaEducacao.MessageBus.Tests/RespostaTeste.cs b/src/tests/PlataformaEducacao.MessageBus.Tests/RespostaTeste.cs new file mode 100644 index 0000000..0148637 --- /dev/null +++ b/src/tests/PlataformaEducacao.MessageBus.Tests/RespostaTeste.cs @@ -0,0 +1,20 @@ +using System; +using System.Runtime.CompilerServices; +using System.Threading.Tasks; +using EasyNetQ; +using FluentValidation.Results; +using Moq; +using PlataformaEducacao.Core.Messages.Integration; +using Xunit; + +namespace PlataformaEducacao.MessageBus.Tests +{ + // Adapte o modificador de acesso conforme necessário (internal/public) + internal sealed class RespostaTeste : ResponseMessage + { + public RespostaTeste(ValidationResult validationResult) + : base(validationResult) + { + } + } +} diff --git a/src/tests/PlataformaEducacaoCore/ConfigurationExtensionsTests.cs b/src/tests/PlataformaEducacaoCore/ConfigurationExtensionsTests.cs index 40735bf..97a0f40 100644 --- a/src/tests/PlataformaEducacaoCore/ConfigurationExtensionsTests.cs +++ b/src/tests/PlataformaEducacaoCore/ConfigurationExtensionsTests.cs @@ -11,7 +11,7 @@ public void GetMessageQueueConnection_QuandoConfigurationEhNula_ReturnaStringVaz { IConfiguration? configuration = null; - var result = configuration!.GetMessageQueueConnection("AnyName"); + var result = configuration.GetMessageQueueConnection("AnyName"); Assert.Equal(string.Empty, result); }