Merge pull request dotnet-architecture#322 from KonradMasalski/master

Minor code cleanup
fdsmax · Oct 29, 2019 · 9a21db6 · 9a21db6
2 parents 8ccc87d + d422c42
commit 9a21db6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/ApplicationCore/Entities/OrderAggregate/Order.cs b/src/ApplicationCore/Entities/OrderAggregate/Order.cs
@@ -33,11 +33,11 @@ public Order(string buyerId, Address shipToAddress, List<OrderItem> items)
         // but only through the method Order.AddOrderItem() which includes behavior.
         private readonly List<OrderItem> _orderItems = new List<OrderItem>();
 
-        public IReadOnlyCollection<OrderItem> OrderItems => _orderItems.AsReadOnly();
         // Using List<>.AsReadOnly() 
         // This will create a read only wrapper around the private list so is protected against "external updates".
         // It's much cheaper than .ToList() because it will not have to copy all items in a new collection. (Just one heap alloc for the wrapper instance)
         //https://msdn.microsoft.com/en-us/library/e78dcd75(v=vs.110).aspx 
+        public IReadOnlyCollection<OrderItem> OrderItems => _orderItems.AsReadOnly();
 
         public decimal Total()
         {

diff --git a/src/ApplicationCore/Interfaces/IBasketService.cs b/src/ApplicationCore/Interfaces/IBasketService.cs
@@ -7,7 +7,7 @@ public interface IBasketService
     {
         Task<int> GetBasketItemCountAsync(string userName);
         Task TransferBasketAsync(string anonymousId, string userName);
-        Task AddItemToBasket(int basketId, int catalogItemId, decimal price, int quantity);
+        Task AddItemToBasket(int basketId, int catalogItemId, decimal price, int quantity = 1);
         Task SetQuantities(int basketId, Dictionary<string, int> quantities);
         Task DeleteBasketAsync(int basketId);
     }

diff --git a/src/ApplicationCore/Services/BasketService.cs b/src/ApplicationCore/Services/BasketService.cs
@@ -20,7 +20,7 @@ public BasketService(IAsyncRepository<Basket> basketRepository,
             _logger = logger;
         }
 
-        public async Task AddItemToBasket(int basketId, int catalogItemId, decimal price, int quantity)
+        public async Task AddItemToBasket(int basketId, int catalogItemId, decimal price, int quantity = 1)
         {
             var basket = await _basketRepository.GetByIdAsync(basketId);
 

diff --git a/src/Web/Pages/Basket/Index.cshtml.cs b/src/Web/Pages/Basket/Index.cshtml.cs
@@ -15,19 +15,15 @@ namespace Microsoft.eShopWeb.Web.Pages.Basket
     public class IndexModel : PageModel
     {
         private readonly IBasketService _basketService;
-        private const string _basketSessionKey = "basketId";
-        private readonly IUriComposer _uriComposer;
         private readonly SignInManager<ApplicationUser> _signInManager;
         private string _username = null;
         private readonly IBasketViewModelService _basketViewModelService;
 
         public IndexModel(IBasketService basketService,
             IBasketViewModelService basketViewModelService,
-            IUriComposer uriComposer,
             SignInManager<ApplicationUser> signInManager)
         {
             _basketService = basketService;
-            _uriComposer = uriComposer;
             _signInManager = signInManager;
             _basketViewModelService = basketViewModelService;
         }
@@ -47,7 +43,7 @@ public async Task<IActionResult> OnPost(CatalogItemViewModel productDetails)
             }
             await SetBasketModelAsync();
 
-            await _basketService.AddItemToBasket(BasketModel.Id, productDetails.Id, productDetails.Price, 1);
+            await _basketService.AddItemToBasket(BasketModel.Id, productDetails.Id, productDetails.Price);
 
             await SetBasketModelAsync();