goldfest228/PIBD-21_Lobashov_I_D_TravelCompany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-21 Лобашов И. Д. 5лаб усложнённая #13

Closed
goldfest228 wants to merge 2 commits from Lab5_Hard into Lab5
pull from: Lab5_Hard
merge into: goldfest228:Lab5
Conversation 0 Commits 2 Files Changed 151 +8 -4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 62162888ec - Show all commits

11
TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs
View File

@ -107,6 +107,13 @@ namespace TravelCompanyBusinessLogic.BusinessLogics
{
throw new ArgumentException("Магазина не существует");
}
var totalSupplyCount = shop.ShopTravels.Values.Sum(supply => supply.Item2) + model.Count;
if (totalSupplyCount > shop.TravelMaxCount)
{
throw new ArgumentException("Количество поставляемых товаров превышает максимальное количество товаров, которое может содержать магазин");
}
if (shop.ShopTravels.ContainsKey(model.TravelId))
{
var oldValue = shop.ShopTravels[model.TravelId];
@ -123,10 +130,6 @@ namespace TravelCompanyBusinessLogic.BusinessLogics
{
throw new ArgumentException($"Поставка: Товар с id:{model.TravelId} не найденн");
}
if (shop.ShopTravels.Sum(kv => kv.Value.Item2) + model.Count > shop.TravelMaxCount)
{
throw new ArgumentException("Превышена максимальная вместимость магазина");
}
shop.ShopTravels.Add(model.TravelId, (Travel, model.Count));
}

1
TravelCompany/TravelCompanyRestApi/Controllers/ShopController.cs
View File

@ -3,6 +3,7 @@ using TravelCompanyContracts.BindingModels;
using TravelCompanyContracts.BusinessLogicsContracts;
using TravelCompanyContracts.SearchModels;
using TravelCompanyContracts.ViewModels;
using System.Net.Http;
namespace TravelCompanyRestApi.Controllers
{