ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix API signatures for collections"

Browse Source
This commit is contained in:
Cesar De la Torre 2017-04-29 15:30:17 -07:00 committed by GitHub
parent 27cca44d17
commit ee787dcaad
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Services/Ordering/Ordering.API/Application/Queries/IOrderQueries.cs
View File

@ -1,14 +1,13 @@
namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries
{ {
using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
public interface IOrderQueries public interface IOrderQueries
{ {
Task<dynamic> GetOrderAsync(int id); Task<dynamic> GetOrderAsync(int id);
Task<IEnumerable<dynamic>> GetOrdersAsync(); Task<dynamic> GetOrdersAsync();
Task<IEnumerable<dynamic>> GetCardTypesAsync(); Task<dynamic> GetCardTypesAsync();
} }
} }

8
src/Services/Ordering/Ordering.API/Application/Queries/OrderQueries.cs
View File

@ -44,13 +44,13 @@
} }
} }
public Task<IEnumerable<dynamic>> GetOrdersAsync() public async Task<dynamic> GetOrdersAsync()
{ {
using (var connection = new SqlConnection(_connectionString)) using (var connection = new SqlConnection(_connectionString))
{ {
connection.Open(); connection.Open();
return connection.QueryAsync<dynamic>(@"SELECT o.[Id] as ordernumber,o.[OrderDate] as [date],os.[Name] as [status],SUM(oi.units*oi.unitprice) as total return await connection.QueryAsync<dynamic>(@"SELECT o.[Id] as ordernumber,o.[OrderDate] as [date],os.[Name] as [status],SUM(oi.units*oi.unitprice) as total
FROM [ordering].[Orders] o FROM [ordering].[Orders] o
LEFT JOIN[ordering].[orderitems] oi ON o.Id = oi.orderid LEFT JOIN[ordering].[orderitems] oi ON o.Id = oi.orderid
LEFT JOIN[ordering].[orderstatus] os on o.OrderStatusId = os.Id LEFT JOIN[ordering].[orderstatus] os on o.OrderStatusId = os.Id
@ -58,13 +58,13 @@
} }
} }
public Task<IEnumerable<dynamic>> GetCardTypesAsync() public async Task<dynamic> GetCardTypesAsync()
{ {
using (var connection = new SqlConnection(_connectionString)) using (var connection = new SqlConnection(_connectionString))
{ {
connection.Open(); connection.Open();
return connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes"); return await connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
} }
} }

5
test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs
View File

@ -6,7 +6,6 @@ using Microsoft.eShopOnContainers.Services.Ordering.API.Controllers;
using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Services; using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Services;
using Moq; using Moq;
using System; using System;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Xunit; using Xunit;
@ -60,7 +59,7 @@ namespace UnitTest.Ordering.Application
public async Task Get_orders_success() public async Task Get_orders_success()
{ {
//Arrange //Arrange
var fakeDynamicResult = Enumerable.Empty<object>(); var fakeDynamicResult = new Object();
_orderQueriesMock.Setup(x => x.GetOrdersAsync()) _orderQueriesMock.Setup(x => x.GetOrdersAsync())
.Returns(Task.FromResult(fakeDynamicResult)); .Returns(Task.FromResult(fakeDynamicResult));
@ -93,7 +92,7 @@ namespace UnitTest.Ordering.Application
public async Task Get_cardTypes_success() public async Task Get_cardTypes_success()
{ {
//Arrange //Arrange
var fakeDynamicResult = Enumerable.Empty<object>(); var fakeDynamicResult = new Object();
_orderQueriesMock.Setup(x => x.GetCardTypesAsync()) _orderQueriesMock.Setup(x => x.GetCardTypesAsync())
.Returns(Task.FromResult(fakeDynamicResult)); .Returns(Task.FromResult(fakeDynamicResult));