Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1093: Update stock quantity bug #1094

Merged
merged 3 commits into from
Mar 17, 2024
Merged

#1093: Update stock quantity bug #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72c7882
#1093: Update stock quantity bug
s04v Mar 12, 2024
8c5cdd6
Update src/Modules/SimplCommerce.Module.Inventory/Services/StockServi…
hishamco Mar 12, 2024
64c00e2
#1093: Unit test for stock update
s04v Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Modules/SimplCommerce.Module.Inventory/Services/StockService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,15 @@ public async Task UpdateStock(StockUpdateRequest stockUpdateRequest)
var product = await _productRepository.Query().FirstOrDefaultAsync(x => x.Id == stockUpdateRequest.ProductId);
var stock = await _stockRepository.Query().FirstOrDefaultAsync(x => x.ProductId == stockUpdateRequest.ProductId && x.WarehouseId == stockUpdateRequest.WarehouseId);

var adjustedQuantity = stockUpdateRequest.AdjustedQuantity;
if (adjustedQuantity < 0 && Math.Abs(adjustedQuantity) > stock.Quantity)
{
adjustedQuantity = -stock.Quantity;
}

var prevStockQuantity = product.StockQuantity;
stock.Quantity = stock.Quantity + stockUpdateRequest.AdjustedQuantity;
product.StockQuantity = product.StockQuantity + stockUpdateRequest.AdjustedQuantity;
stock.Quantity = stock.Quantity + adjustedQuantity;
product.StockQuantity = product.StockQuantity + adjustedQuantity;
var stockHistory = new StockHistory
{
ProductId = stockUpdateRequest.ProductId,
Expand Down
2 changes: 2 additions & 0 deletions test/SimplCommerce.Module.Inventory.Tests/SimplCommerce.Module.Inventory.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="MockQueryable.Moq" Version="7.0.1" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PrivateAssets>all</PrivateAssets>
Expand Down
164 changes: 106 additions & 58 deletions test/SimplCommerce.Module.Inventory.Tests/StockServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,114 @@
//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;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using MediatR;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.EntityFrameworkCore;
using MockQueryable.Moq;
using Moq;
using SimplCommerce.Infrastructure.Data;
using SimplCommerce.Module.Catalog.Models;
using SimplCommerce.Module.Inventory.Event;
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};
namespace SimplCommerce.Module.Inventory.Tests
{
public class StockServiceTests
{
private Mock<IRepository<Stock>> _stockRepoMock;
private Mock<IRepository<Product>> _productRepoMock;
private Mock<IMediator> _mediatorMock;
private readonly Mock<IRepository<StockHistory>> _stockHistoryRepoMock;
private readonly Warehouse _testWarehouse = new Warehouse(100) {VendorId = 123};

// public StockServiceTests()
// {
// _stockHistoryRepoMock = new Mock<IRepository<StockHistory>>();
// }
public StockServiceTests()
{
_stockHistoryRepoMock = new Mock<IRepository<StockHistory>>();
_mediatorMock = new Mock<IMediator>();
}

// [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);
/* [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, _mediatorMock.Object);
await service.AddAllProduct(_testWarehouse);

// _stockRepoMock.Verify(m =>
// m.AddRange(It.Is<IEnumerable<Stock>>(arg => arg.Count() == productsCount - stocksCount)));
// }
_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 };
// }
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];
var stocksMock = stocks.BuildMock();
_stockRepoMock.Setup(x => x.Query()).Returns(stocksMock);
_stockRepoMock.Setup(x => x.AddRange(It.IsAny<IEnumerable<Stock>>()));

// 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 = 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()));
// }
// }
//}
var productsMock = products.BuildMock();
_productRepoMock.Setup(x => x.Query()).Returns(productsMock);

_mediatorMock
.Setup(m => m.Send(It.IsAny<ProductBackInStock>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Task.CompletedTask);
}

[Theory]
[InlineData(1, 1, -5)]
[InlineData(1, 1, -10)]
[InlineData(1, 1, 7)]
[InlineData(1, 1, 0)]
[InlineData(1, 1, -2)]
public async Task UpdateStockTest(int productsCount, int stocksCount, int adjustedQuantity)
{
InitializeMocks(productsCount, stocksCount);

var service = new StockService(_stockRepoMock.Object, _productRepoMock.Object,
_stockHistoryRepoMock.Object, _mediatorMock.Object);

var product = _productRepoMock.Object.Query().FirstOrDefault();
var stock = _stockRepoMock.Object
.Query()
.FirstOrDefault(o => o.ProductId == product.Id && o.WarehouseId == _testWarehouse.Id);
var prevStockQuantity = stock.Quantity;

var request = new StockUpdateRequest
{
AdjustedQuantity = adjustedQuantity,
ProductId = product.Id,
WarehouseId = _testWarehouse.Id,
};

await service.UpdateStock(request);

var newStockQuantity = stock.Quantity;
Assert.Equal(Math.Max(0, prevStockQuantity + adjustedQuantity), newStockQuantity);
}
}
}