Skip to content
Merged
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
- EasyNetQ
- Application Query Stack e Specification Pattern
- NetDevPack
- Facade

# Ferramentas
- Visual Studio 2022 - Version 17.11.4 ++
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
namespace JSE.Core.Messages.Integration
{
public class PedidoAutorizadoIntegrationEvent : IntegrationEvent
{
public Guid ClienteId { get; private set; }
public Guid PedidoId { get; private set; }
public IDictionary<Guid, int> Itens { get; private set; }

public PedidoAutorizadoIntegrationEvent(Guid clienteId, Guid pedidoId, IDictionary<Guid, int> itens)
{
ClienteId = clienteId;
PedidoId = pedidoId;
Itens = itens;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@
"DefaultApiKey": "ak_ewr4dsWehiwAT",
"DefaultEncryptionKey": "ek_SweRsdFas4uT5"
}

}
2 changes: 1 addition & 1 deletion src/services/JSE.Pedido.API/Application/DTO/PedidoDTO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class PedidoDTO
{
public Guid Id { get; set; }
public int Codigo { get; set; }

public Guid ClienteId { get; set; }
public int Status { get; set; }
public DateTime Data { get; set; }
public decimal ValorTotal { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ public interface IPedidoQueries
{
Task<PedidoDTO> ObterUltimoPedido(Guid clienteId);
Task<IEnumerable<PedidoDTO>> ObterListaPorClienteId(Guid clienteId);
Task<PedidoDTO> ObterPedidosAutorizados();
}

}
31 changes: 31 additions & 0 deletions src/services/JSE.Pedido.API/Application/Queries/PedidoQueries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,37 @@ public async Task<IEnumerable<PedidoDTO>> ObterListaPorClienteId(Guid clienteId)
return pedidos.Select(PedidoDTO.ParaPedidoDTO);
}

public async Task<PedidoDTO> ObterPedidosAutorizados()
{
// Correção para pegar todos os itens do pedido e ordernar pelo pedido mais antigo
const string sql = @"SELECT
P.ID as 'PedidoId', P.ID, P.CLIENTEID,
PI.ID as 'PedidoItemId', PI.ID, PI.PRODUTOID, PI.QUANTIDADE
FROM PEDIDOS P
INNER JOIN PEDIDOITEMS PI ON P.ID = PI.PEDIDOID
WHERE P.PEDIDOSTATUS = 1
ORDER BY P.DATACADASTRO";

// Utilizacao do lookup para manter o estado a cada ciclo de registro retornado
var lookup = new Dictionary<Guid, PedidoDTO>();

await _pedidoRepository.ObterConexao().QueryAsync<PedidoDTO, PedidoItemDTO, PedidoDTO>(sql,
(p, pi) =>
{
if (!lookup.TryGetValue(p.Id, out var pedidoDTO))
lookup.Add(p.Id, pedidoDTO = p);

pedidoDTO.PedidoItems ??= new List<PedidoItemDTO>();
pedidoDTO.PedidoItems.Add(pi);

return pedidoDTO;

}, splitOn: "PedidoId,PedidoItemId");

// Obtendo dados o lookup
return lookup.Values.OrderBy(p => p.Data).FirstOrDefault();
}

private PedidoDTO MapearPedido(dynamic result)
{
var pedido = new PedidoDTO
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using JSE.Core.Utils;
using JSE.MessageBus;
using JSE.Pedidos.API.Services;

namespace JSE.Pedidos.API.Configuration
{
Expand All @@ -8,7 +9,8 @@ public static class MessageBusConfig
public static void AddMessageBusConfiguration(this IServiceCollection services,
IConfiguration configuration)
{
services.AddMessageBus(configuration.GetMessageQueueConnection("MessageBus"));
services.AddMessageBus(configuration.GetMessageQueueConnection("MessageBus"))
.AddHostedService<PedidoOrquestradorIntegrationHandler>();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace JSE.Pedido_API.Controllers
namespace JSE.Pedidos.API.Controllers
{
[Authorize]
public class PedidoController : MainController
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@

using JSE.Core.Messages.Integration;
using JSE.MessageBus;
using JSE.Pedidos.API.Application.Queries;

namespace JSE.Pedidos.API.Services
{
public class PedidoOrquestradorIntegrationHandler : IHostedService, IDisposable
{

private readonly IServiceProvider _serviceProvider;
private readonly ILogger<PedidoOrquestradorIntegrationHandler> _logger;
private Timer _timer;

public PedidoOrquestradorIntegrationHandler(ILogger<PedidoOrquestradorIntegrationHandler> logger, IServiceProvider serviceProvider)
{
_logger = logger;
_serviceProvider = serviceProvider;
}

public Task StartAsync(CancellationToken cancellationToken)
{
_logger.LogInformation("Serviço de pedidos iniciado.");

_timer = new Timer(ProcessarPedidos, null, TimeSpan.Zero,
TimeSpan.FromSeconds(15));

return Task.CompletedTask;
}

private async void ProcessarPedidos(object state)
{
using (var scope = _serviceProvider.CreateScope())
{
var pedidoQueries = scope.ServiceProvider.GetRequiredService<IPedidoQueries>();
var pedido = await pedidoQueries.ObterPedidosAutorizados();

if (pedido == null) return;

var bus = scope.ServiceProvider.GetRequiredService<IMessageBus>();

var pedidoAutorizado = new PedidoAutorizadoIntegrationEvent(pedido.ClienteId, pedido.Id,
pedido.PedidoItems.ToDictionary(p => p.ProdutoId, p => p.Quantidade));

await bus.PublishAsync(pedidoAutorizado);

_logger.LogInformation($"Pedido ID: {pedido.Id} foi encaminhado para baixa no estoque.");
}
}

public Task StopAsync(CancellationToken cancellationToken)
{
_logger.LogInformation("Serviço de pedidos finalizado.");

_timer?.Change(Timeout.Infinite, 0);

return Task.CompletedTask;
}

public void Dispose()
{
_timer?.Dispose();
}
}
}
110 changes: 110 additions & 0 deletions src/web/JSE.WebApp.MVC/Views/Pedido/ConfirmacaoPedido.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
@using JSE.WebApp.MVC.Extensions
@model JSE.WebApp.MVC.Models.PedidoViewModel

@{
ViewData["Title"] = "Pedido confirmado!";
}

<section class="padding-y">
<div class="container">

<vc:Summary></vc:Summary>

@{
if (Model.PedidoItems.Any())
{
<div class="card">
<div class="tracking-wrap">
<div class="step active">
<span class="icon">
<i class="fa fa-location-arrow"></i>
</span>
<span class="text"> Endereço</span>
</div>
<div class="step active">
<span class="icon">
<i class="fa fa-credit-card"></i>
</span>
<span class="text"> Pagamento </span>
</div>
<div class="step active">
<span class="icon">
<i class="fa fa-check-square"></i>
</span>
<span class="text"> Confirmação</span>
</div>
</div>
<article class="card-body">
<header class="mb-4">
<h4 class="card-title">Pedido concluído com sucesso!</h4>
</header>
<div class="row">
@{
foreach (var item in Model.PedidoItems)
{
<div class="col-md-6">
<figure class="itemside mb-3">
<div class="aside">
<img src="~/images/produtos/@item.Imagem" alt="@item.Nome" class="border img-xs">
</div>
<figcaption class="info">
<p>
<b>@item.Nome</b>
</p>
<span>@this.UnidadesPorProdutoValorTotal(item.Quantidade, item.Valor) </span>
</figcaption>
</figure>
</div>
}
}

</div>
</article>

<header class="card-header">
<h3 class="d-inline-block mr-3">Pedido número: #@Model.Codigo</h3>
</header>
<article class="card-body border-top">

<div class="card-body">
<div class="row">
<div class="col-md-8">
<h6 class="text-muted">Entregar em</h6>
<p>
@Model.Endereco.ToString()
</p>
</div>
<div class="col-md-4">
<h6 class="text-muted">Pagamento</h6>
<span class="text-success">
<i class="fas fa-credit-card"></i>
Transação em cartão de crédito
</span>
<p>
<span class="b">Total: @this.FormatoMoeda(Model.ValorTotal)</span>
</p>
</div>
</div>

</div>
</article>

<div class="card-body border-top">
<div class="text-left">
<a asp-controller="Pedido" asp-action="MeusPedidos" class="btn btn-primary float-md-right"> Meus Pedidos <i class="fa fa-chevron-right"></i> </a>
</div>
</div>

</div>
}
}
</div>
</section>

@section Scripts {

@{
await Html.RenderPartialAsync("_ValidationScriptsPartial");
}

}
68 changes: 68 additions & 0 deletions src/web/JSE.WebApp.MVC/Views/Pedido/MeusPedidos.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
@using JSE.WebApp.MVC.Extensions
@model IEnumerable<JSE.WebApp.MVC.Models.PedidoViewModel>

@{
ViewData["Title"] = "Meus Pedidos";
}

<section class="padding-y">
<div class="container">

@{
foreach (var pedido in Model.OrderBy(p=>p.Data))
{
<div class="col-md-12" style="padding-bottom: 35px">
<article class="card">
<header class="card-header">
<b class="d-inline-block mr-3">Pedido ID: #@pedido.Codigo @Html.Raw(this.ExibeStatus(pedido.Status))</b>
<span>@pedido.Data.ToLongDateString()</span>
</header>
<div class="card-body">
<div class="row">
<div class="col-md-4">
<h6 class="text-muted">Pagamento</h6>
<span class="text-success">
<i class="fas fa-credit-card"></i>
Transação em cartão de crédito
</span>

<p>
<span class="b">Total: @this.FormatoMoeda(pedido.ValorTotal)</span>
</p>

</div>
<div class="col-md-8">
<h6 class="text-muted">Endereço de entrega</h6>
<p>
@pedido.Endereco.ToString()
</p>
</div>
</div>
<hr>
<ul class="row">
@{
foreach (var item in pedido.PedidoItems)
{
<li class="col-md-4">
<figure class="itemside mb-3">
<div class="aside">
<img src="~/images/produtos/@item.Imagem" alt="@item.Nome" class="border img-xs">
</div>
<figcaption class="info">
<p>
<b>@item.Nome</b>
</p>
<span>@this.UnidadesPorProdutoValorTotal(item.Quantidade, item.Valor) </span>
</figcaption>
</figure>
</li>
}
}
</ul>
</div>
</article>
</div>
}
}
</div>
</section>
Loading