chtzsch/Pibd-21_Ievlewa_MD._PrecastConcretePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21_IevlewaMD_Lab1_hard #8

Closed
chtzsch wants to merge 4 commits from Lab1_Hard into lab1
pull from: Lab1_Hard
merge into: chtzsch:lab1
Conversation 0 Commits 4 Files Changed 23 +13 -11
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0e8c49cbe4 - Show all commits

20
PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ShopLogic.cs
View File

@ -88,8 +88,8 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics
}
return true;
}
public bool ReplenishShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count)
//логика пополнения магазина
public bool RefillShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count)
{
if (shopModel == null)
{
@ -103,25 +103,27 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics
{
throw new ArgumentException("В магазине должен быть хотя бы один товар", nameof(count));
}
_logger.LogInformation("ReplenishShop(GetElement). ShopName: {ShopName}. Id: {Id}", shopModel.ShopName, shopModel.Id);
_logger.LogInformation("RefillShop(GetElement). ShopName: {ShopName}. Id: {Id}", shopModel.ShopName, shopModel.Id);
var shop = _shopStorage.GetElement(shopModel);
if (shop == null)
{
_logger.LogWarning("ReplenishShop(GetElement). Element not found");
_logger.LogWarning("RefillShop(GetElement). Element not found");
return false;
}
if (shop.ShopReinforceds.ContainsKey(reinforced.Id))
if (shop.ShopReinforceds.ContainsKey(reinforced.Id))//если есть товар то плюс
{
var shopR = shop.ShopReinforceds[reinforced.Id];
shopR.Item2 += count;
shop.ShopReinforceds[reinforced.Id] = shopR;
_logger.LogInformation("ReplenishShop. Added {count} '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName,
_logger.LogInformation("RefillShop. Added {count} '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName,
shop.ShopName);
}
else
else//если нет то просто добавляем
{
shop.ShopReinforceds.Add(reinforced.Id, (reinforced, count));
_logger.LogInformation("ReplenishShop. Added {count} new '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName,
_logger.LogInformation("RefillShop. Added {count} new '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName,
shop.ShopName);
}
if (_shopStorage.Update(new ShopBindingModel()
@ -133,7 +135,7 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics
ShopReinforceds = shop.ShopReinforceds,
}) == null)
{
_logger.LogWarning("ReplenishShop. Update operation failed");
_logger.LogWarning("RefillShop. Update operation failed");
return false;
}
return true;

2
PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IShopLogic.cs
View File

@ -22,6 +22,6 @@ namespace PrecastConcretePlantContracts.BusinessLogicsContracts
bool Delete(ShopBindingModel model);
bool ReplenishShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count);
bool RefillShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count);
}
}

2
PrecastConcretePlant/PrecastConcretePlantView/FormShopRefill.cs
View File

@ -95,7 +95,7 @@ namespace PrecastConcretePlantView
{
throw new Exception("Изделие не найдено.");
}
var operationResult = _logicShop.ReplenishShop(new ShopSearchModel
var operationResult = _logicShop.RefillShop(new ShopSearchModel
{
Id = Convert.ToInt32(comboBoxShop.SelectedValue)
},