Shady nagy/net6 (#614)

* udated to .net6

* used the .net6 version RC2

* added editconfig.

* App core new Scoped Namespaces style.

* BlazorAdmin new Scoped Namespaces style.

* Blazor Shared new Scoped Namespaces style.

* Infra new Scoped Namespaces style.

* public api new Scoped Namespaces style.

* web new Scoped Namespaces style.

* FunctionalTests new Scoped Namespaces style.

* Integrational tests new Scoped Namespaces style.

* unit tests new Scoped Namespaces style.

* update github action.

* update github action.

* change the global.

src/Web/Services/BasketViewModelService.cs

@@ -1,97 +1,96 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using Microsoft.eShopWeb.ApplicationCore.Specifications;
 using Microsoft.eShopWeb.Web.Interfaces;
 using Microsoft.eShopWeb.Web.Pages.Basket;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Web.Services
+namespace Microsoft.eShopWeb.Web.Services;
+
+public class BasketViewModelService : IBasketViewModelService
 {
-    public class BasketViewModelService : IBasketViewModelService
+    private readonly IRepository<Basket> _basketRepository;
+    private readonly IUriComposer _uriComposer;
+    private readonly IBasketQueryService _basketQueryService;
+    private readonly IRepository<CatalogItem> _itemRepository;
+
+    public BasketViewModelService(IRepository<Basket> basketRepository,
+        IRepository<CatalogItem> itemRepository,
+        IUriComposer uriComposer,
+        IBasketQueryService basketQueryService)
     {
-        private readonly IRepository<Basket> _basketRepository;
-        private readonly IUriComposer _uriComposer;
-        private readonly IBasketQueryService _basketQueryService;
-        private readonly IRepository<CatalogItem> _itemRepository;
+        _basketRepository = basketRepository;
+        _uriComposer = uriComposer;
+        _basketQueryService = basketQueryService;
+        _itemRepository = itemRepository;
+    }
 
-        public BasketViewModelService(IRepository<Basket> basketRepository,
-            IRepository<CatalogItem> itemRepository,
-            IUriComposer uriComposer,
-            IBasketQueryService basketQueryService)
+    public async Task<BasketViewModel> GetOrCreateBasketForUser(string userName)
+    {
+        var basketSpec = new BasketWithItemsSpecification(userName);
+        var basket = (await _basketRepository.GetBySpecAsync(basketSpec));
+
+        if (basket == null)
         {
-            _basketRepository = basketRepository;
-            _uriComposer = uriComposer;
-            _basketQueryService = basketQueryService;
-            _itemRepository = itemRepository;
+            return await CreateBasketForUser(userName);
         }
+        var viewModel = await Map(basket);
+        return viewModel;
+    }
 
-        public async Task<BasketViewModel> GetOrCreateBasketForUser(string userName)
+    private async Task<BasketViewModel> CreateBasketForUser(string userId)
+    {
+        var basket = new Basket(userId);
+        await _basketRepository.AddAsync(basket);
+
+        return new BasketViewModel()
         {
-            var basketSpec = new BasketWithItemsSpecification(userName);
-            var basket = (await _basketRepository.GetBySpecAsync(basketSpec));
+            BuyerId = basket.BuyerId,
+            Id = basket.Id,
+        };
+    }
 
-            if (basket == null)
-            {
-                return await CreateBasketForUser(userName);
-            }
-            var viewModel = await Map(basket);
-            return viewModel;
-        }
+    private async Task<List<BasketItemViewModel>> GetBasketItems(IReadOnlyCollection<BasketItem> basketItems)
+    {
+        var catalogItemsSpecification = new CatalogItemsSpecification(basketItems.Select(b => b.CatalogItemId).ToArray());
+        var catalogItems = await _itemRepository.ListAsync(catalogItemsSpecification);
 
-        private async Task<BasketViewModel> CreateBasketForUser(string userId)
+        var items = basketItems.Select(basketItem =>
         {
-            var basket = new Basket(userId);
-            await _basketRepository.AddAsync(basket);
+            var catalogItem = catalogItems.First(c => c.Id == basketItem.CatalogItemId);
 
-            return new BasketViewModel()
+            var basketItemViewModel = new BasketItemViewModel
             {
-                BuyerId = basket.BuyerId,
-                Id = basket.Id,
+                Id = basketItem.Id,
+                UnitPrice = basketItem.UnitPrice,
+                Quantity = basketItem.Quantity,
+                CatalogItemId = basketItem.CatalogItemId,
+                PictureUrl = _uriComposer.ComposePicUri(catalogItem.PictureUri),
+                ProductName = catalogItem.Name
             };
-        }
+            return basketItemViewModel;
+        }).ToList();
 
-        private async Task<List<BasketItemViewModel>> GetBasketItems(IReadOnlyCollection<BasketItem> basketItems)
+        return items;
+    }
+
+    public async Task<BasketViewModel> Map(Basket basket)
+    {
+        return new BasketViewModel()
         {
-            var catalogItemsSpecification = new CatalogItemsSpecification(basketItems.Select(b => b.CatalogItemId).ToArray());
-            var catalogItems = await _itemRepository.ListAsync(catalogItemsSpecification);
+            BuyerId = basket.BuyerId,
+            Id = basket.Id,
+            Items = await GetBasketItems(basket.Items)
+        };
+    }
 
-            var items = basketItems.Select(basketItem =>
-            {
-                var catalogItem = catalogItems.First(c => c.Id == basketItem.CatalogItemId);
+    public async Task<int> CountTotalBasketItems(string username)
+    {
+        var counter = await _basketQueryService.CountTotalBasketItems(username);
 
-                var basketItemViewModel = new BasketItemViewModel
-                {
-                    Id = basketItem.Id,
-                    UnitPrice = basketItem.UnitPrice,
-                    Quantity = basketItem.Quantity,
-                    CatalogItemId = basketItem.CatalogItemId,
-                    PictureUrl = _uriComposer.ComposePicUri(catalogItem.PictureUri),
-                    ProductName = catalogItem.Name
-                };
-                return basketItemViewModel;
-            }).ToList();
-
-            return items;
-        }
-
-        public async Task<BasketViewModel> Map(Basket basket)
-        {
-            return new BasketViewModel()
-            {
-                BuyerId = basket.BuyerId,
-                Id = basket.Id,
-                Items = await GetBasketItems(basket.Items)
-            };
-        }
-
-        public async Task<int> CountTotalBasketItems(string username)
-        {
-            var counter = await _basketQueryService.CountTotalBasketItems(username);
-
-            return counter;
-        }
+        return counter;
     }
 }