Stock servivce changes (simplcommerce#695)

starovernet · thiennn · commit 396e2805d423 · 2019-01-31T10:26:15.000+07:00
* rewrite AddAllProduct to use single query with group join

* add StockService tests

* remove unnesessary 'at' symbols
diff --git a/SimplCommerce.sln b/SimplCommerce.sln
@@ -119,6 +119,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimplCommerce.Module.Commen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimplCommerce.Module.PaymentBraintree", "src\Modules\SimplCommerce.Module.PaymentBraintree\SimplCommerce.Module.PaymentBraintree.csproj", "{3BF9411D-4794-404D-9ADE-8DABD50853D1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimplCommerce.Module.Inventory.Tests", "test\SimplCommerce.Module.Inventory.Tests\SimplCommerce.Module.Inventory.Tests.csproj", "{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -633,6 +635,18 @@ Global
 		{3BF9411D-4794-404D-9ADE-8DABD50853D1}.Release|x64.Build.0 = Release|Any CPU
 		{3BF9411D-4794-404D-9ADE-8DABD50853D1}.Release|x86.ActiveCfg = Release|Any CPU
 		{3BF9411D-4794-404D-9ADE-8DABD50853D1}.Release|x86.Build.0 = Release|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Debug|x64.Build.0 = Debug|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Debug|x86.Build.0 = Debug|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Release|x64.Build.0 = Release|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Release|x86.ActiveCfg = Release|Any CPU
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -682,6 +696,7 @@ Global
 		{67B14D0D-0BA7-4E6C-8F8E-151C92732D6D} = {7EFA2FA7-32DD-4047-B021-50E77A83D714}
 		{4C78BFFD-3AD6-4C39-A44D-F7FC55A2B3A6} = {7EFA2FA7-32DD-4047-B021-50E77A83D714}
 		{3BF9411D-4794-404D-9ADE-8DABD50853D1} = {7EFA2FA7-32DD-4047-B021-50E77A83D714}
+		{19AF369C-71BB-44B3-9D02-8EF3A3E912E5} = {D9FD9ABA-AE5E-4427-AA6B-6285BE2E212D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B9D0D8F0-1AB9-44DD-839F-ED8CEE7DDB10}
diff --git a/src/Modules/SimplCommerce.Module.Comments/Areas/Comments/Views/Shared/Components/Comment/Default.cshtml b/src/Modules/SimplCommerce.Module.Comments/Areas/Comments/Views/Shared/Components/Comment/Default.cshtml
@@ -26,7 +26,7 @@
     <div id="comments" class="comment-item-list">
         @if (Model.CommentsCount > 0)
         {
-            @foreach (var comment in Model.Items.Data)
+            foreach (var comment in Model.Items.Data)
             {
                 <div>
                     <div>
diff --git a/src/Modules/SimplCommerce.Module.Core/Data/RepositoryWithTypedId.cs b/src/Modules/SimplCommerce.Module.Core/Data/RepositoryWithTypedId.cs
@@ -1,4 +1,5 @@
-﻿using System.Linq;
+﻿using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -24,6 +25,11 @@ public void Add(T entity)
             DbSet.Add(entity);
         }
 
+        public void AddRange(IEnumerable<T> entity)
+        {
+            DbSet.AddRange(entity);
+        }
+
         public IDbContextTransaction BeginTransaction()
         {
             return Context.Database.BeginTransaction();
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Services/StockService.cs b/src/Modules/SimplCommerce.Module.Inventory/Services/StockService.cs
@@ -23,24 +23,18 @@ public StockService(IRepository<Stock> stockRepository, IRepository<Product> pro
 
         public async Task AddAllProduct(Warehouse warehouse)
         {
-            // TODO Need refactor for better performance
-            var productIds = await _productRepository.Query().Where(x => !x.HasOptions && x.VendorId == warehouse.VendorId).Select(x => x.Id).ToListAsync();
-            var inStockProductIds = await _stockRepository.Query().Where(x => x.WarehouseId== warehouse.Id).Select(x => x.ProductId).ToListAsync();
-            foreach(var productId in productIds)
-            {
-                if (!inStockProductIds.Contains(productId))
+            var stocks = await _productRepository.Query().Where(x => !x.HasOptions && x.VendorId == warehouse.VendorId)
+                .GroupJoin(_stockRepository.Query().Where(x => x.WarehouseId == warehouse.Id),
+                    product => product.Id, stock => stock.ProductId,
+                    (product, stockCollection) => new {IsNew = !stockCollection.Any(), ProductId = product.Id})
+                .Where(x => x.IsNew)
+                .Select(x => new Stock
                 {
-                    var stock = new Stock
-                    {
-                        ProductId = productId,
-                        WarehouseId = warehouse.Id,
-                        Quantity = 0
-                    };
-
-                    _stockRepository.Add(stock);
-                }
-            }
-
+                    ProductId = x.ProductId,
+                    WarehouseId = warehouse.Id,
+                    Quantity = 0
+                }).ToArrayAsync();
+            _stockRepository.AddRange(stocks);
             await _stockRepository.SaveChangesAsync();
         }
 
diff --git a/src/Modules/SimplCommerce.Module.Reviews/Areas/Reviews/Views/Review/List.cshtml b/src/Modules/SimplCommerce.Module.Reviews/Areas/Reviews/Views/Review/List.cshtml
@@ -93,7 +93,7 @@
         <div id="reviews" class="review-item-list">
             @if (Model.ReviewsCount > 0)
             {
-                @foreach (var review in Model.Items.Data)
+                foreach (var review in Model.Items.Data)
                 {
                     <div>
                         <ul class="list-inline product-ratings">
diff --git a/src/Modules/SimplCommerce.Module.Reviews/Areas/Reviews/Views/Shared/Components/Review/Default.cshtml b/src/Modules/SimplCommerce.Module.Reviews/Areas/Reviews/Views/Shared/Components/Review/Default.cshtml
@@ -68,7 +68,7 @@
     <div id="reviews" class="review-item-list">
         @if (Model.ReviewsCount > 0)
         {
-            @foreach (var review in Model.Items.Data)
+            foreach (var review in Model.Items.Data)
             {
                 <div>
                     <ul class="list-inline product-ratings">
diff --git a/src/Modules/SimplCommerce.Module.WishList/Areas/WishList/Views/WishList/PrivateList.cshtml b/src/Modules/SimplCommerce.Module.WishList/Areas/WishList/Views/WishList/PrivateList.cshtml
@@ -18,7 +18,7 @@
         <hr />
         @if (Model.Items.TotalItems > 0)
         {
-            @foreach (var item in Model.Items.Data)
+            foreach (var item in Model.Items.Data)
             {
                 <div class="row item">
                     <div class="col-md-3">
diff --git a/src/Modules/SimplCommerce.Module.WishList/Areas/WishList/Views/WishList/PublicList.cshtml b/src/Modules/SimplCommerce.Module.WishList/Areas/WishList/Views/WishList/PublicList.cshtml
@@ -15,7 +15,7 @@
         <hr />
         @if (Model.Items.TotalItems > 0)
         {
-            @foreach (var item in Model.Items.Data)
+            foreach (var item in Model.Items.Data)
             {
                 <div class="row item">
                     <div class="col-md-4">
diff --git a/src/SimplCommerce.Infrastructure/Data/IRepositoryWithTypedId.cs b/src/SimplCommerce.Infrastructure/Data/IRepositoryWithTypedId.cs
@@ -1,4 +1,5 @@
-﻿using System.Linq;
+﻿using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Storage;
 using SimplCommerce.Infrastructure.Models;
@@ -11,6 +12,8 @@ public interface IRepositoryWithTypedId<T, TId> where T : IEntityWithTypedId<TId
 
         void Add(T entity);
 
+        void AddRange(IEnumerable<T> entity);
+
         IDbContextTransaction BeginTransaction();
 
         void SaveChanges();
diff --git a/src/SimplCommerce.WebHost/Themes/CozaStore/Views/Shared/_LoginPartial.cshtml b/src/SimplCommerce.WebHost/Themes/CozaStore/Views/Shared/_LoginPartial.cshtml
@@ -7,7 +7,7 @@
 @if (SignInManager.IsSignedIn(User))
 {
     <a class="flex-c-m trans-04 p-lr-25" asp-area="Core" asp-controller="Manage" asp-action="Index" title="@Localizer["Manage"]">@Localizer["Hello {0}!", (await WorkContext.GetCurrentUser()).FullName]</a>
-    @if (User.IsInRole("admin") || User.IsInRole("vendor"))
+    if (User.IsInRole("admin") || User.IsInRole("vendor"))
     {
        <a class="flex-c-m trans-04 p-lr-25" asp-area="Core" asp-controller="HomeAdmin" asp-action="Index">@Localizer["Dashboard"]</a>
     }
diff --git a/src/SimplCommerce.WebHost/Views/Shared/_LoginPartial.cshtml b/src/SimplCommerce.WebHost/Views/Shared/_LoginPartial.cshtml
@@ -9,7 +9,7 @@
     <li class="nav-item">
         <a class="nav-link" asp-area="Core" asp-controller="Manage" asp-action="Index" title="@Localizer["Manage"]">@Localizer["Hello {0}!", (await WorkContext.GetCurrentUser()).FullName]</a>
     </li>
-    @if (User.IsInRole("admin") || User.IsInRole("vendor"))
+    if (User.IsInRole("admin") || User.IsInRole("vendor"))
     {
         <li class="nav-item"><a class="nav-link" asp-area="Core" asp-controller="HomeAdmin" asp-action="Index">@Localizer["Dashboard"]</a></li>
     }
diff --git a/test/SimplCommerce.Module.Inventory.Tests/SimplCommerce.Module.Inventory.Tests.csproj b/test/SimplCommerce.Module.Inventory.Tests/SimplCommerce.Module.Inventory.Tests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Modules\SimplCommerce.Module.Inventory\SimplCommerce.Module.Inventory.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/SimplCommerce.Module.Inventory.Tests/StockServiceTests.cs b/test/SimplCommerce.Module.Inventory.Tests/StockServiceTests.cs
@@ -0,0 +1,66 @@
+﻿using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Moq;
+using SimplCommerce.Infrastructure.Data;
+using SimplCommerce.Module.Catalog.Models;
+using SimplCommerce.Module.Inventory.Models;
+using SimplCommerce.Module.Inventory.Services;
+using Xunit;
+
+namespace SimplCommerce.Module.Inventory.Tests
+{
+    public class StockServiceTests
+    {
+        private  Mock<IRepository<Stock>> _stockRepoMock;
+        private  Mock<IRepository<Product>> _productRepoMock;
+        private readonly Mock<IRepository<StockHistory>> _stockHistoryRepoMock;
+        private readonly Warehouse _testWarehouse = new Warehouse(100) {VendorId = 123};
+
+        public StockServiceTests()
+        {
+            _stockHistoryRepoMock = new Mock<IRepository<StockHistory>>();
+        }
+
+        [Theory]
+        [InlineData(100,50)]
+        [InlineData(1000,560)]
+        [InlineData(13, 5)]
+        [InlineData(143, 0)]
+        public async Task AddAllProductsTest(int productsCount, int  stocksCount)
+        {
+            InitializeMocks(productsCount, stocksCount);
+            var service = new StockService(_stockRepoMock.Object, _productRepoMock.Object,
+                _stockHistoryRepoMock.Object);
+            await service.AddAllProduct(_testWarehouse);
+
+            _stockRepoMock.Verify(m =>
+                m.AddRange(It.Is<IEnumerable<Stock>>(arg => arg.Count() == productsCount - stocksCount)));
+        }
+
+        private void InitializeMocks(int productsCount, int stocksCount)
+        {
+            _stockRepoMock = new Mock<IRepository<Stock>>();
+            var stocks = new Stock[stocksCount];
+            for (int i = 1; i <= stocks.Length; i++)
+            {
+                stocks[i - 1] = new Stock
+                    { ProductId = i, Quantity = 5, WarehouseId = _testWarehouse.Id };
+            }
+
+            _stockRepoMock.Setup(x => x.Query()).Returns(() => new TestAsyncEnumerable<Stock>(stocks.AsQueryable()));
+            _stockRepoMock.Setup(x => x.AddRange(It.IsAny<IEnumerable<Stock>>()));
+            _productRepoMock = new Mock<IRepository<Product>>();
+            var products = new Product[productsCount];
+
+            for (int i = 1; i <= products.Length; i++)
+            {
+                products[i - 1] = new Product { HasOptions = false, VendorId = _testWarehouse.VendorId };
+                typeof(Product).GetProperty("Id").SetValue(products[i - 1], i);
+            }
+
+            _productRepoMock.Setup(x => x.Query()).Returns(new TestAsyncEnumerable<Product>(products.AsQueryable()));
+        }
+    }
+}
diff --git a/test/SimplCommerce.Module.Inventory.Tests/TestAsyncEnumerable.cs b/test/SimplCommerce.Module.Inventory.Tests/TestAsyncEnumerable.cs
@@ -0,0 +1,24 @@
+﻿using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace SimplCommerce.Module.Inventory.Tests
+{
+    internal class TestAsyncEnumerable<T> : EnumerableQuery<T>, IAsyncEnumerable<T>, IQueryable<T>
+    {
+        public TestAsyncEnumerable(IEnumerable<T> enumerable)
+            : base(enumerable)
+        { }
+
+        public TestAsyncEnumerable(Expression expression)
+            : base(expression)
+        { }
+
+        public IAsyncEnumerator<T> GetEnumerator()
+        {
+            return new TestAsyncEnumerator<T>(this.AsEnumerable().GetEnumerator());
+        }
+
+        IQueryProvider IQueryable.Provider => new TestAsyncQueryProvider<T>(this);
+    }
+}
diff --git a/test/SimplCommerce.Module.Inventory.Tests/TestAsyncEnumerator.cs b/test/SimplCommerce.Module.Inventory.Tests/TestAsyncEnumerator.cs
@@ -0,0 +1,28 @@
+﻿using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SimplCommerce.Module.Inventory.Tests
+{
+    internal class TestAsyncEnumerator<T> : IAsyncEnumerator<T>
+    {
+        private readonly IEnumerator<T> _inner;
+
+        public TestAsyncEnumerator(IEnumerator<T> inner)
+        {
+            _inner = inner;
+        }
+
+        public void Dispose()
+        {
+            _inner.Dispose();
+        }
+
+        public T Current => _inner.Current;
+
+        public Task<bool> MoveNext(CancellationToken cancellationToken)
+        {
+            return Task.FromResult(_inner.MoveNext());
+        }
+    }
+}
diff --git a/test/SimplCommerce.Module.Inventory.Tests/TestAsyncQueryProvider.cs b/test/SimplCommerce.Module.Inventory.Tests/TestAsyncQueryProvider.cs
@@ -0,0 +1,49 @@
+﻿using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Query.Internal;
+
+namespace SimplCommerce.Module.Inventory.Tests
+{
+    internal class TestAsyncQueryProvider<TEntity> : IAsyncQueryProvider
+    {
+        private readonly IQueryProvider _inner;
+
+        internal TestAsyncQueryProvider(IQueryProvider inner)
+        {
+            _inner = inner;
+        }
+
+        public IQueryable CreateQuery(Expression expression)
+        {
+            return new TestAsyncEnumerable<TEntity>(expression);
+        }
+
+        public IQueryable<TElement> CreateQuery<TElement>(Expression expression)
+        {
+            return new TestAsyncEnumerable<TElement>(expression);
+        }
+
+        public object Execute(Expression expression)
+        {
+            return _inner.Execute(expression);
+        }
+
+        public TResult Execute<TResult>(Expression expression)
+        {
+            return _inner.Execute<TResult>(expression);
+        }
+
+        public IAsyncEnumerable<TResult> ExecuteAsync<TResult>(Expression expression)
+        {
+            return new TestAsyncEnumerable<TResult>(expression);
+        }
+
+        public Task<TResult> ExecuteAsync<TResult>(Expression expression, CancellationToken cancellationToken)
+        {
+            return Task.FromResult(Execute<TResult>(expression));
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`<div id="comments" class="comment-item-list">`
`27`	`27`	`@if (Model.CommentsCount > 0)`
`28`	`28`	`{`
`29`		`- @foreach (var comment in Model.Items.Data)`
	`29`	`+ foreach (var comment in Model.Items.Data)`
`30`	`30`	`{`
`31`	`31`	`<div>`
`32`	`32`	`<div>`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@`
`93`	`93`	`<div id="reviews" class="review-item-list">`
`94`	`94`	`@if (Model.ReviewsCount > 0)`
`95`	`95`	`{`
`96`		`- @foreach (var review in Model.Items.Data)`
	`96`	`+ foreach (var review in Model.Items.Data)`
`97`	`97`	`{`
`98`	`98`	`<div>`
`99`	`99`	`<ul class="list-inline product-ratings">`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@`
`68`	`68`	`<div id="reviews" class="review-item-list">`
`69`	`69`	`@if (Model.ReviewsCount > 0)`
`70`	`70`	`{`
`71`		`- @foreach (var review in Model.Items.Data)`
	`71`	`+ foreach (var review in Model.Items.Data)`
`72`	`72`	`{`
`73`	`73`	`<div>`
`74`	`74`	`<ul class="list-inline product-ratings">`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`<hr />`
`19`	`19`	`@if (Model.Items.TotalItems > 0)`
`20`	`20`	`{`
`21`		`- @foreach (var item in Model.Items.Data)`
	`21`	`+ foreach (var item in Model.Items.Data)`
`22`	`22`	`{`
`23`	`23`	`<div class="row item">`
`24`	`24`	`<div class="col-md-3">`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`<hr />`
`16`	`16`	`@if (Model.Items.TotalItems > 0)`
`17`	`17`	`{`
`18`		`- @foreach (var item in Model.Items.Data)`
	`18`	`+ foreach (var item in Model.Items.Data)`
`19`	`19`	`{`
`20`	`20`	`<div class="row item">`
`21`	`21`	`<div class="col-md-4">`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`@if (SignInManager.IsSignedIn(User))`
`8`	`8`	`{`
`9`	`9`	`<a class="flex-c-m trans-04 p-lr-25" asp-area="Core" asp-controller="Manage" asp-action="Index" title="@Localizer["Manage"]">@Localizer["Hello {0}!", (await WorkContext.GetCurrentUser()).FullName]</a>`
`10`		`- @if (User.IsInRole("admin") \|\| User.IsInRole("vendor"))`
	`10`	`+ if (User.IsInRole("admin") \|\| User.IsInRole("vendor"))`
`11`	`11`	`{`
`12`	`12`	`<a class="flex-c-m trans-04 p-lr-25" asp-area="Core" asp-controller="HomeAdmin" asp-action="Index">@Localizer["Dashboard"]</a>`
`13`	`13`	`}`