From 0daa2750bd33060e6c9961e195f5287d8848fe17 Mon Sep 17 00:00:00 2001 From: Oleksandr Shadurskyi Date: Thu, 30 Mar 2023 14:38:53 +0200 Subject: [PATCH 1/9] fixed connection strings --- src/PublicApi/appsettings.Docker.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PublicApi/appsettings.Docker.json b/src/PublicApi/appsettings.Docker.json index 0aa16e3..0bf721d 100644 --- a/src/PublicApi/appsettings.Docker.json +++ b/src/PublicApi/appsettings.Docker.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { - "CatalogConnection": "Server=sqlserver,1433;Integrated Security=true;Initial Catalog=Microsoft.eShopOnWeb.CatalogDb;User Id=sa;Password=@someThingComplicated1234;Trusted_Connection=false;", - "IdentityConnection": "Server=sqlserver,1433;Integrated Security=true;Initial Catalog=Microsoft.eShopOnWeb.Identity;User Id=sa;Password=@someThingComplicated1234;Trusted_Connection=false;" + "CatalogConnection": "Server=sqlserver,1433;Integrated Security=true;Initial Catalog=Microsoft.eShopOnWeb.CatalogDb;User Id=sa;Password=@someThingComplicated1234;Trusted_Connection=false;TrustServerCertificate=true;", + "IdentityConnection": "Server=sqlserver,1433;Integrated Security=true;Initial Catalog=Microsoft.eShopOnWeb.Identity;User Id=sa;Password=@someThingComplicated1234;Trusted_Connection=false;TrustServerCertificate=true;" }, "baseUrls": { "apiBase": "http://localhost:5200/api/", From e7d71ea57289a1c3e7b322a53d5a2d2dc36d01f9 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 23 May 2023 14:55:24 -0400 Subject: [PATCH 2/9] Separate OrderViewModel from OrderDetailsViewModel (#904) * Separate OrderViewModel from OrderDetailsViewModel * Update packages --- Directory.Packages.props | 37 +++++++++---------- .../CustomerOrdersSpecification.cs | 13 +++++++ src/Web/Features/MyOrders/GetMyOrders.cs | 3 +- .../Features/MyOrders/GetMyOrdersHandler.cs | 10 +---- .../Features/OrderDetails/GetOrderDetails.cs | 2 +- .../OrderDetails/GetOrderDetailsHandler.cs | 6 +-- src/Web/ViewModels/OrderDetailViewModel.cs | 6 +++ src/Web/ViewModels/OrderViewModel.cs | 1 - src/Web/Views/Order/Detail.cshtml | 2 +- tests/UnitTests/UnitTests.csproj | 1 - 10 files changed, 44 insertions(+), 37 deletions(-) create mode 100644 src/ApplicationCore/Specifications/CustomerOrdersSpecification.cs create mode 100644 src/Web/ViewModels/OrderDetailViewModel.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index aae2105..e96dccb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,7 +1,6 @@ true - true net7.0 @@ -15,25 +14,25 @@ - + - - - - - - - - - + + + + + + + + + - + - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -42,13 +41,13 @@ - + - - + + all @@ -61,6 +60,6 @@ - + \ No newline at end of file diff --git a/src/ApplicationCore/Specifications/CustomerOrdersSpecification.cs b/src/ApplicationCore/Specifications/CustomerOrdersSpecification.cs new file mode 100644 index 0000000..e3faa6a --- /dev/null +++ b/src/ApplicationCore/Specifications/CustomerOrdersSpecification.cs @@ -0,0 +1,13 @@ +using Ardalis.Specification; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; + +namespace Microsoft.eShopWeb.ApplicationCore.Specifications; + +public class CustomerOrdersSpecification : Specification +{ + public CustomerOrdersSpecification(string buyerId) + { + Query.Where(o => o.BuyerId == buyerId) + .Include(o => o.OrderItems); + } +} diff --git a/src/Web/Features/MyOrders/GetMyOrders.cs b/src/Web/Features/MyOrders/GetMyOrders.cs index aedfde1..5baf32c 100644 --- a/src/Web/Features/MyOrders/GetMyOrders.cs +++ b/src/Web/Features/MyOrders/GetMyOrders.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using MediatR; +using MediatR; using Microsoft.eShopWeb.Web.ViewModels; namespace Microsoft.eShopWeb.Web.Features.MyOrders; diff --git a/src/Web/Features/MyOrders/GetMyOrdersHandler.cs b/src/Web/Features/MyOrders/GetMyOrdersHandler.cs index 125f0a9..df6db4b 100644 --- a/src/Web/Features/MyOrders/GetMyOrdersHandler.cs +++ b/src/Web/Features/MyOrders/GetMyOrdersHandler.cs @@ -18,20 +18,12 @@ public class GetMyOrdersHandler : IRequestHandler> Handle(GetMyOrders request, CancellationToken cancellationToken) { - var specification = new CustomerOrdersWithItemsSpecification(request.UserName); + var specification = new CustomerOrdersSpecification(request.UserName); var orders = await _orderRepository.ListAsync(specification, cancellationToken); return orders.Select(o => new OrderViewModel { OrderDate = o.OrderDate, - OrderItems = o.OrderItems.Select(oi => new OrderItemViewModel() - { - PictureUrl = oi.ItemOrdered.PictureUri, - ProductId = oi.ItemOrdered.CatalogItemId, - ProductName = oi.ItemOrdered.ProductName, - UnitPrice = oi.UnitPrice, - Units = oi.Units - }).ToList(), OrderNumber = o.Id, ShippingAddress = o.ShipToAddress, Total = o.Total() diff --git a/src/Web/Features/OrderDetails/GetOrderDetails.cs b/src/Web/Features/OrderDetails/GetOrderDetails.cs index 2cc0721..deb1fb5 100644 --- a/src/Web/Features/OrderDetails/GetOrderDetails.cs +++ b/src/Web/Features/OrderDetails/GetOrderDetails.cs @@ -3,7 +3,7 @@ using Microsoft.eShopWeb.Web.ViewModels; namespace Microsoft.eShopWeb.Web.Features.OrderDetails; -public class GetOrderDetails : IRequest +public class GetOrderDetails : IRequest { public string UserName { get; set; } public int OrderId { get; set; } diff --git a/src/Web/Features/OrderDetails/GetOrderDetailsHandler.cs b/src/Web/Features/OrderDetails/GetOrderDetailsHandler.cs index be7b8dc..4c11199 100644 --- a/src/Web/Features/OrderDetails/GetOrderDetailsHandler.cs +++ b/src/Web/Features/OrderDetails/GetOrderDetailsHandler.cs @@ -6,7 +6,7 @@ using Microsoft.eShopWeb.Web.ViewModels; namespace Microsoft.eShopWeb.Web.Features.OrderDetails; -public class GetOrderDetailsHandler : IRequestHandler +public class GetOrderDetailsHandler : IRequestHandler { private readonly IReadRepository _orderRepository; @@ -15,7 +15,7 @@ public class GetOrderDetailsHandler : IRequestHandler Handle(GetOrderDetails request, + public async Task Handle(GetOrderDetails request, CancellationToken cancellationToken) { var spec = new OrderWithItemsByIdSpec(request.OrderId); @@ -26,7 +26,7 @@ public class GetOrderDetailsHandler : IRequestHandler new OrderItemViewModel diff --git a/src/Web/ViewModels/OrderDetailViewModel.cs b/src/Web/ViewModels/OrderDetailViewModel.cs new file mode 100644 index 0000000..18a3aa0 --- /dev/null +++ b/src/Web/ViewModels/OrderDetailViewModel.cs @@ -0,0 +1,6 @@ +namespace Microsoft.eShopWeb.Web.ViewModels; + +public class OrderDetailViewModel : OrderViewModel +{ + public List OrderItems { get; set; } = new(); +} diff --git a/src/Web/ViewModels/OrderViewModel.cs b/src/Web/ViewModels/OrderViewModel.cs index 582a504..d34866a 100644 --- a/src/Web/ViewModels/OrderViewModel.cs +++ b/src/Web/ViewModels/OrderViewModel.cs @@ -11,5 +11,4 @@ public class OrderViewModel public decimal Total { get; set; } public string Status => DEFAULT_STATUS; public Address? ShippingAddress { get; set; } - public List OrderItems { get; set; } = new(); } diff --git a/src/Web/Views/Order/Detail.cshtml b/src/Web/Views/Order/Detail.cshtml index 097d17e..c5eb47b 100644 --- a/src/Web/Views/Order/Detail.cshtml +++ b/src/Web/Views/Order/Detail.cshtml @@ -1,4 +1,4 @@ -@model OrderViewModel +@model OrderDetailViewModel @{ ViewData["Title"] = "My Order History"; } diff --git a/tests/UnitTests/UnitTests.csproj b/tests/UnitTests/UnitTests.csproj index f8bbe01..4b069f2 100644 --- a/tests/UnitTests/UnitTests.csproj +++ b/tests/UnitTests/UnitTests.csproj @@ -9,7 +9,6 @@ - From a4906806a9bec982dbda5752ddb1daa4e33b350d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 11:27:19 -0400 Subject: [PATCH 3/9] Bump Microsoft.AspNetCore.Components.WebAssembly from 7.0.5 to 7.0.8 (#910) Bumps [Microsoft.AspNetCore.Components.WebAssembly](https://github.com/dotnet/aspnetcore) from 7.0.5 to 7.0.8. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.5...v7.0.8) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Components.WebAssembly dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e96dccb..1a10c87 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -17,7 +17,7 @@ - + From 0a6e44a89ad749a0b59e027600ab5c9c24799596 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 11:39:46 -0400 Subject: [PATCH 4/9] Bump Microsoft.AspNetCore.Mvc.Testing from 7.0.5 to 7.0.8 (#913) Bumps [Microsoft.AspNetCore.Mvc.Testing](https://github.com/dotnet/aspnetcore) from 7.0.5 to 7.0.8. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.5...v7.0.8) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1a10c87..43c17b9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -46,7 +46,7 @@ - + From 3f9f26b85e2ee71edd6a5fb2c256417b193daa5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 14:28:17 -0400 Subject: [PATCH 5/9] Bump Microsoft.EntityFrameworkCore.Tools from 7.0.5 to 7.0.8 (#912) Bumps [Microsoft.EntityFrameworkCore.Tools](https://github.com/dotnet/efcore) from 7.0.5 to 7.0.8. - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v7.0.5...v7.0.8) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.Tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 43c17b9..e83c6f1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -32,7 +32,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 46eb2ce53526a93b7a4ca9fc40b4ef652a5cf9a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:23:27 -0400 Subject: [PATCH 6/9] Bump Microsoft.NET.Test.Sdk from 17.6.0 to 17.6.3 (#915) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.0 to 17.6.3. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.6.0...v17.6.3) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e83c6f1..cffd58b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -47,7 +47,7 @@ - + all From 780fb6e606cfd1f87d9606eb55da08d75733a98a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:55:02 -0400 Subject: [PATCH 7/9] Bump Microsoft.AspNetCore.Authentication.JwtBearer from 7.0.5 to 7.0.8 (#916) Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 7.0.5 to 7.0.8. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.5...v7.0.8) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cffd58b..f3cf657 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -22,7 +22,7 @@ - + From cf6a1aac87cd279629779d46e30e058f6fbb01bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:01:59 -0400 Subject: [PATCH 8/9] Bump Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore (#917) Bumps [Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore](https://github.com/dotnet/aspnetcore) from 7.0.5 to 7.0.8. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.5...v7.0.8) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f3cf657..6336a5b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -23,7 +23,7 @@ - + From f97e1751cde4700c25ddf7d13b331c0ab79f246c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:02:27 -0400 Subject: [PATCH 9/9] Bump Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore (#917) Bumps [Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore](https://github.com/dotnet/aspnetcore) from 7.0.5 to 7.0.8. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.5...v7.0.8) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>