Skip to content

Commit ed79708

Browse files
Revert "Fix API signatures for collections"
1 parent ebc4de2 commit ed79708

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries
22
{
3-
using System.Collections.Generic;
43
using System.Threading.Tasks;
54

65
public interface IOrderQueries
76
{
87
Task<dynamic> GetOrderAsync(int id);
98

10-
Task<IEnumerable<dynamic>> GetOrdersAsync();
9+
Task<dynamic> GetOrdersAsync();
1110

12-
Task<IEnumerable<dynamic>> GetCardTypesAsync();
11+
Task<dynamic> GetCardTypesAsync();
1312
}
1413
}

src/Services/Ordering/Ordering.API/Application/Queries/OrderQueries.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,27 @@ FROM ordering.Orders o
4444
}
4545
}
4646

47-
public Task<IEnumerable<dynamic>> GetOrdersAsync()
47+
public async Task<dynamic> GetOrdersAsync()
4848
{
4949
using (var connection = new SqlConnection(_connectionString))
5050
{
5151
connection.Open();
5252

53-
return connection.QueryAsync<dynamic>(@"SELECT o.[Id] as ordernumber,o.[OrderDate] as [date],os.[Name] as [status],SUM(oi.units*oi.unitprice) as total
53+
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
5454
FROM [ordering].[Orders] o
5555
LEFT JOIN[ordering].[orderitems] oi ON o.Id = oi.orderid
5656
LEFT JOIN[ordering].[orderstatus] os on o.OrderStatusId = os.Id
5757
GROUP BY o.[Id], o.[OrderDate], os.[Name]");
5858
}
5959
}
6060

61-
public Task<IEnumerable<dynamic>> GetCardTypesAsync()
61+
public async Task<dynamic> GetCardTypesAsync()
6262
{
6363
using (var connection = new SqlConnection(_connectionString))
6464
{
6565
connection.Open();
6666

67-
return connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
67+
return await connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
6868
}
6969
}
7070

test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Services;
77
using Moq;
88
using System;
9-
using System.Linq;
109
using System.Threading.Tasks;
1110
using Xunit;
1211

@@ -60,7 +59,7 @@ public async Task Create_order_bad_request()
6059
public async Task Get_orders_success()
6160
{
6261
//Arrange
63-
var fakeDynamicResult = Enumerable.Empty<object>();
62+
var fakeDynamicResult = new Object();
6463
_orderQueriesMock.Setup(x => x.GetOrdersAsync())
6564
.Returns(Task.FromResult(fakeDynamicResult));
6665

@@ -93,7 +92,7 @@ public async Task Get_order_success()
9392
public async Task Get_cardTypes_success()
9493
{
9594
//Arrange
96-
var fakeDynamicResult = Enumerable.Empty<object>();
95+
var fakeDynamicResult = new Object();
9796
_orderQueriesMock.Setup(x => x.GetCardTypesAsync())
9897
.Returns(Task.FromResult(fakeDynamicResult));
9998

0 commit comments

Comments
 (0)