Merge pull request #178 from BillWagner/use-IEnumerable-dynamic

Fix API signatures for collections

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

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

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

@@ -44,13 +44,13 @@
             }
         }
 
-        public async Task<dynamic> GetOrdersAsync()
+        public Task<IEnumerable<dynamic>> GetOrdersAsync()
         {
             using (var connection = new SqlConnection(_connectionString))
             {
                 connection.Open();
 
-                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
+                return 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
                      LEFT JOIN[ordering].[orderitems] oi ON  o.Id = oi.orderid 
                      LEFT JOIN[ordering].[orderstatus] os on o.OrderStatusId = os.Id
@@ -58,13 +58,13 @@
             }
         }
 
-        public async Task<dynamic> GetCardTypesAsync()
+        public Task<IEnumerable<dynamic>> GetCardTypesAsync()
         {
             using (var connection = new SqlConnection(_connectionString))
             {
                 connection.Open();
 
-                return await connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
+                return connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
             }
         }
 

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

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