bocchanskyy/PIbd-23-Volkov-N.A.-ComputersShop
bocchanskyy/PIbd-23-Volkov-N.A.-ComputersShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-23 Волков Никита Андреевич Лабораторная работа №2 Усложненная #7

Closed
bocchanskyy wants to merge 6 commits from Lab2Hard into Lab1Hard
pull from: Lab2Hard
merge into: bocchanskyy:Lab1Hard
Conversation 0 Commits 6 Files Changed 30 +8 -12
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e72da0eece - Show all commits

4
ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs
View File

@ -33,7 +33,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics
if (quantity <= 0)
{
return false;
throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(quantity));
throw new ArgumentException("Количество добавляемого компьютера должно быть больше 0", nameof(quantity));
}
_logger.LogInformation("AddComputerInShop. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
@ -81,7 +81,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics
}
if (quantity <= 0)
{
throw new ArgumentException("Количество документов должно быть больше 0", nameof(quantity));
throw new ArgumentException("Количество компьютеров должно быть больше 0", nameof(quantity));
}
_logger.LogInformation("AddComputers. ShopName:{ShopName}. Id:{Id}", computer.ComputerName, computer.Id);
var allFreeQuantity = _shopStorage.GetFullList().Select(x => x.Capacity - x.Computers.Select(x => x.Value.Item2).Sum()).Sum();

16
ComputersShop/ComputersShopFileImplement/Implements/ShopStorage.cs
View File

@ -74,17 +74,13 @@ namespace ComputersShopFileImplement.Implements
public bool SellComputers(IComputerModel model, int quantity)
{
int hasCount = 0;
int hasCount = source.Shops
.SelectMany(x => x.Computers)
.Where(pair => pair.Key == model.Id)
.Sum(pair => pair.Value.Item2);
source.Shops.ForEach(x =>
{
if (x.Computers.TryGetValue(model.Id, out var pair))
{
hasCount += pair.Item2;
}
});
if (hasCount < quantity) return false;
if (hasCount < quantity)
return false;
source.Shops.ForEach(x =>
{