Skip to content

Commit 89fb5d6

Browse files
committed
1 parent 6127457 commit 89fb5d6

4 files changed

Lines changed: 11 additions & 8 deletions

File tree

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

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

67
public interface IOrderQueries
78
{
89
Task<Order> GetOrderAsync(int id);
910

10-
Task<IEnumerable<OrderSummary>> GetOrdersAsync();
11+
Task<IEnumerable<OrderSummary>> GetOrdersFromUserAsync(Guid userId);
1112

1213
Task<IEnumerable<CardType>> GetCardTypesAsync();
1314
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Collections.Generic;
88

99
public class OrderQueries
10-
:IOrderQueries
10+
: IOrderQueries
1111
{
1212
private string _connectionString = string.Empty;
1313

@@ -42,18 +42,20 @@ FROM ordering.Orders o
4242
}
4343
}
4444

45-
public async Task<IEnumerable<OrderSummary>> GetOrdersAsync()
45+
public async Task<IEnumerable<OrderSummary>> GetOrdersFromUserAsync(Guid userId)
4646
{
4747
using (var connection = new SqlConnection(_connectionString))
4848
{
4949
connection.Open();
5050

51-
return await connection.QueryAsync<OrderSummary>(@"SELECT o.[Id] as ordernumber,o.[OrderDate] as [date],os.[Name] as [status],SUM(oi.units*oi.unitprice) as total
51+
return await connection.QueryAsync<OrderSummary>(@"SELECT o.[Id] as ordernumber,o.[OrderDate] as [date],os.[Name] as [status], SUM(oi.units*oi.unitprice) as total
5252
FROM [ordering].[Orders] o
5353
LEFT JOIN[ordering].[orderitems] oi ON o.Id = oi.orderid
5454
LEFT JOIN[ordering].[orderstatus] os on o.OrderStatusId = os.Id
55+
LEFT JOIN[ordering].[buyers] ob on o.BuyerId = ob.Id
56+
WHERE ob.IdentityGuid = @userId
5557
GROUP BY o.[Id], o.[OrderDate], os.[Name]
56-
ORDER BY o.[Id]");
58+
ORDER BY o.[Id]", new { userId });
5759
}
5860
}
5961

src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public async Task<IActionResult> GetOrder(int orderId)
8787
[ProducesResponseType(typeof(IEnumerable<OrderSummary>), (int)HttpStatusCode.OK)]
8888
public async Task<IActionResult> GetOrders()
8989
{
90-
var orders = await _orderQueries.GetOrdersAsync();
91-
90+
var userid = _identityService.GetUserIdentity();
91+
var orders = await _orderQueries.GetOrdersFromUserAsync(Guid.Parse(userid));
9292
return Ok(orders);
9393
}
9494

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public async Task Get_orders_success()
9494
{
9595
//Arrange
9696
var fakeDynamicResult = Enumerable.Empty<OrderSummary>();
97-
_orderQueriesMock.Setup(x => x.GetOrdersAsync())
97+
_orderQueriesMock.Setup(x => x.GetOrdersFromUserAsync(Guid.NewGuid()))
9898
.Returns(Task.FromResult(fakeDynamicResult));
9999

100100
//Act

0 commit comments

Comments
 (0)