From cbd5682ea07e6e8899791b48bae250ea8f104483 Mon Sep 17 00:00:00 2001 From: unai Date: Wed, 7 Dec 2016 18:59:41 +0100 Subject: [PATCH] minor refactoring on reviews --- .../Ordering.API/Controllers/OrdersController.cs | 2 -- src/Services/Ordering/Ordering.API/Startup.cs | 5 ----- .../Commands/NewOrderREquestHandler.cs | 11 +++++++---- .../Ordering.Application/Commands/NewOrderRequest.cs | 4 ---- .../Ordering.Application/Queries/OrderQueries.cs | 1 - .../Services/Ordering/OrderingScenarios.cs | 2 -- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs b/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs index 02d209ad0..3cd3f5353 100644 --- a/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs +++ b/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs @@ -64,7 +64,6 @@ { var order = await _orderQueries.GetOrder(orderId); - return Ok(order); } @@ -74,7 +73,6 @@ { var orders = await _orderQueries.GetOrders(); - return Ok(orders); } diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 58c3d8442..2470fa00d 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -43,9 +43,7 @@ services.AddMvc(options=> { - options.Filters.Add(typeof(HttpGlobalExceptionFilter)); - }).AddControllersAsServices(); services.AddEntityFrameworkSqlServer() @@ -72,8 +70,6 @@ services.AddOptions(); - - //configure autofac var container = new ContainerBuilder(); @@ -82,7 +78,6 @@ container.RegisterModule(new MediatorModule()); container.RegisterModule(new ApplicationModule()); - return new AutofacServiceProvider(container.Build()); } diff --git a/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs b/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs index 2f321a685..dea451bff 100644 --- a/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs +++ b/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs @@ -30,7 +30,7 @@ } public async Task Handle(NewOrderRequest message) { - //find buyer/payment or add a new one + //find buyer/payment or add a new one buyer/payment var buyer = await _buyerRepository.FindAsync(message.Buyer); @@ -41,9 +41,11 @@ var payment = GetExistingPaymentOrAddANewOne(buyer, message); - await _buyerRepository.UnitOfWork.SaveChangesAsync(); + await _buyerRepository.UnitOfWork + .SaveChangesAsync(); + + //create order for buyer and payment method - //create order var order = CreateOrder(buyer.Id, payment.Id, 0); order.SetAddress( new Address() { @@ -55,7 +57,8 @@ _orderRepository.Add(order); - var result = await _orderRepository.UnitOfWork.SaveChangesAsync(); + var result = await _orderRepository.UnitOfWork + .SaveChangesAsync(); return result > 0; } diff --git a/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs b/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs index 108a4d98e..ee79d0319 100644 --- a/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs +++ b/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs @@ -27,9 +27,5 @@ public int CardTypeId { get; set; } public string Buyer { get; set; } - - public NewOrderRequest() - { - } } } diff --git a/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs b/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs index 97283546e..7697f7262 100644 --- a/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs +++ b/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs @@ -50,6 +50,5 @@ return await connection.QueryAsync("SELECT * FROM ordering.cardtypes"); } } - } } diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs index cbbd6ea9d..a139ab09a 100644 --- a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs +++ b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs @@ -1,8 +1,6 @@ namespace FunctionalTests.Services.Ordering { - using Microsoft.AspNetCore.TestHost; using Microsoft.eShopOnContainers.Services.Ordering.API.Models; - using Microsoft.eShopOnContainers.Services.Ordering.Domain; using Newtonsoft.Json; using System; using System.Net.Http;