Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions Api/.vscode/launch.json

This file was deleted.

32 changes: 32 additions & 0 deletions Api/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"sqltools.connections": [
{
"mysqlOptions": {
"authProtocol": "default",
"enableSsl": "Disabled"
},
"previewLimit": 50,
"server": "localhost",
"port": 3306,
"driver": "MariaDB",
"name": "minimal_api",
"database": "minimal_api",
"username": "root",
"askForPassword": true
},
{
"mysqlOptions": {
"authProtocol": "default",
"enableSsl": "Disabled"
},
"previewLimit": 50,
"server": "localhost",
"port": 3306,
"driver": "MySQL",
"name": "minimal_api",
"database": "minimal_api",
"username": "root",
"askForPassword": true
}
]
}
41 changes: 0 additions & 41 deletions Api/.vscode/tasks.json

This file was deleted.

8 changes: 5 additions & 3 deletions Api/Dominio/DTOs/AdministradorDTO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
using MinimalApi.Dominio.Enuns;

namespace MinimalApi.DTOs;

public class AdministradorDTO
{
public string Email { get;set; } = default!;
public string Senha { get;set; } = default!;
public Perfil? Perfil { get;set; } = default!;
public string Email { get; set; } = default!;
public string Senha { get; set; } = default!;
public Perfil? Perfil { get; set; } = default!;

}
4 changes: 2 additions & 2 deletions Api/Dominio/DTOs/LoginDTO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
namespace MinimalApi.DTOs;
public class LoginDTO
{
public string Email { get;set; } = default!;
public string Senha { get;set; } = default!;
public string Email { get; set; } = default!;
public string Senha { get; set; } = default!;
}
6 changes: 3 additions & 3 deletions Api/Dominio/DTOs/VeiculoDTO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace MinimalApi.DTOs;
public record VeiculoDTO
{
public string Nome { get;set; } = default!;
public string Marca { get;set; } = default!;
public int Ano { get;set; } = default!;
public string Nome { get; set; } = default!;
public string Marca { get; set; } = default!;
public int Ano { get; set; } = default!;
}
8 changes: 4 additions & 4 deletions Api/Dominio/Entidades/Administrador.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ public class Administrador
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get;set; } = default!;
public int Id { get; set; } = default!;

[Required]
[StringLength(255)]
public string Email { get;set; } = default!;
public string Email { get; set; } = default!;

[Required]
[StringLength(50)]
public string Senha { get;set; } = default!;
public string Senha { get; set; } = default!;

[Required]
[StringLength(10)]
public string Perfil { get;set; } = default!;
public string Perfil { get; set; } = default!;
}
8 changes: 4 additions & 4 deletions Api/Dominio/Entidades/Veiculo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ public class Veiculo
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get;set; } = default!;
public int Id { get; set; } = default!;

[Required]
[StringLength(150)]
public string Nome { get;set; } = default!;
public string Nome { get; set; } = default!;

[Required]
[StringLength(100)]
public string Marca { get;set; } = default!;
public string Marca { get; set; } = default!;

[Required]
public int Ano { get;set; } = default!;
public int Ano { get; set; } = default!;
}
1 change: 1 addition & 0 deletions Api/Dominio/Enuns/Perfil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ public enum Perfil
{
Adm,
Editor

}
2 changes: 1 addition & 1 deletion Api/Dominio/Interfaces/IAdministradorServico.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

using MinimalApi.Dominio.Entidades;
using MinimalApi.DTOs;

namespace MinimalApi.Dominio.Interfaces;

public interface IAdministradorServico
{

Administrador? Login(LoginDTO loginDTO);
Administrador Incluir(Administrador administrador);
Administrador? BuscaPorId(int id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace MinimalApi.Dominio.Interfaces;

public interface IVeiculoServico
{

List<Veiculo> Todos(int? pagina = 1, string? nome = null, string? marca = null);
Veiculo? BuscaPorId(int id);
void Incluir(Veiculo veiculo);
Expand Down
6 changes: 3 additions & 3 deletions Api/Dominio/ModelViews/AdministradorLogado.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace MinimalApi.Dominio.ModelViews;

public record AdministradorLogado
{
public string Email { get;set; } = default!;
public string Perfil { get;set; } = default!;
public string Token { get;set; } = default!;
public string Email { get; set; } = default!;
public string Perfil { get; set; } = default!;
public string Token { get; set; } = default!;
}
6 changes: 3 additions & 3 deletions Api/Dominio/ModelViews/AdministradorModelView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace MinimalApi.Dominio.ModelViews;

public record AdministradorModelView
{
public int Id { get;set; } = default!;
public string Email { get;set; } = default!;
public string Perfil { get;set; } = default!;
public int Id { get; set; } = default!;
public string Email { get; set; } = default!;
public string Perfil { get; set; } = default!;
}
2 changes: 1 addition & 1 deletion Api/Dominio/ModelViews/ErrosDeValidacao.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ namespace MinimalApi.Dominio.ModelViews;

public struct ErrosDeValidacao
{
public List<string> Mensagens { get;set; }
public List<string> Mensagens { get; set; }
}
2 changes: 1 addition & 1 deletion Api/Dominio/ModelViews/Home.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ namespace MinimalApi.Dominio.ModelViews;

public struct Home
{
public string Mensagem { get => "Bem vindo a API de veículos - Minimal API"; }
public string Mensagem { get => "Bem vindo a API de veículos - Minmal API"; }
public string Doc { get => "/swagger"; }
}
14 changes: 9 additions & 5 deletions Api/Dominio/Servicos/AdministradorServico.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.EntityFrameworkCore;
using MinimalApi.Dominio.Entidades;
using MinimalApi.DTOs;
using MinimalApi.Infraestrutura.Db;
using MinimalApi.Dominio.Interfaces;
using System.ComponentModel.DataAnnotations;

namespace MinimalApi.Dominio.Servicos;

Expand All @@ -13,7 +16,7 @@ public AdministradorServico(DbContexto contexto)
_contexto = contexto;
}

public Administrador? BuscaPorId(int id)
public Administrador? BuscaPorId(int id)
{
return _contexto.Administradores.Where(v => v.Id == id).FirstOrDefault();
}
Expand All @@ -30,17 +33,18 @@ public Administrador Incluir(Administrador administrador)
{
var adm = _contexto.Administradores.Where(a => a.Email == loginDTO.Email && a.Senha == loginDTO.Senha).FirstOrDefault();
return adm;

}

public List<Administrador> Todos(int? pagina)
{
var query = _contexto.Administradores.AsQueryable();

int itensPorPagina = 10;

if(pagina != null)
if (pagina != null)
query = query.Skip(((int)pagina - 1) * itensPorPagina).Take(itensPorPagina);

return query.ToList();
}
}
}
14 changes: 8 additions & 6 deletions Api/Dominio/Servicos/VeiculoServico.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.EntityFrameworkCore;
using MinimalApi.Dominio.Entidades;
using MinimalApi.DTOs;
using MinimalApi.Infraestrutura.Db;
using MinimalApi.Dominio.Interfaces;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;

namespace MinimalApi.Dominio.Servicos;

Expand Down Expand Up @@ -40,16 +42,16 @@ public void Incluir(Veiculo veiculo)
public List<Veiculo> Todos(int? pagina = 1, string? nome = null, string? marca = null)
{
var query = _contexto.Veiculos.AsQueryable();
if(!string.IsNullOrEmpty(nome))
if (!string.IsNullOrEmpty(nome))
{
query = query.Where(v => EF.Functions.Like(v.Nome.ToLower(), $"%{nome}%"));
query = query.Where(v => EF.Functions.Like(v.Nome.ToLower(), $"%%{nome.ToLower()}"));
}

int itensPorPagina = 10;

if(pagina != null)
if (pagina != null)
query = query.Skip(((int)pagina - 1) * itensPorPagina).Take(itensPorPagina);

return query.ToList();
}
}
}
File renamed without changes.
9 changes: 5 additions & 4 deletions Api/Infraestrutura/Db/DbContexto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@ public DbContexto(IConfiguration configuracaoAppSettings)
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Administrador>().HasData(
new Administrador {
new Administrador
{
Id = 1,
Email = "administrador@teste.com",
Senha = "123456",
Perfil = "Adm"
}
}
);
}

protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
if(!optionsBuilder.IsConfigured)
if (!optionsBuilder.IsConfigured)
{
var stringConexao = _configuracaoAppSettings.GetConnectionString("MySql")?.ToString();
if(!string.IsNullOrEmpty(stringConexao))
if (!string.IsNullOrEmpty(stringConexao))
{
optionsBuilder.UseMySql(
stringConexao,
Expand Down
Loading