the/CourseWork_CompShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assembly components

Browse Source
This commit is contained in:
the 2023-05-17 13:52:06 +04:00
parent cfb0caf0f7
commit 91d0fccdb3
8 changed files with 141 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ComputerShopProvider/ComputerShopBusinessLogic/BusinessLogics/AssemblyLogic.cs
View File

@ -3,6 +3,7 @@ using ComputerShopContracts.BusinessLogicContracts;
using ComputerShopContracts.SearchModels;
using ComputerShopContracts.StorageContracts;
using ComputerShopContracts.ViewModels;
using ComputerShopDataModels.Models;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
@ -16,11 +17,13 @@ namespace ComputerShopBusinessLogic.BusinessLogics
{
private readonly ILogger _logger;
private readonly IAssemblyStorage _assemblyStorage;
private readonly IComponentStorage _componentStorage;
public AssemblyLogic(ILogger<AssemblyLogic> logger, IAssemblyStorage assemblyStorage)
public AssemblyLogic(ILogger<AssemblyLogic> logger, IAssemblyStorage assemblyStorage, IComponentStorage componentStorage)
{
_logger = logger;
_assemblyStorage = assemblyStorage;
_componentStorage = componentStorage;
}
public bool Create(AssemblyBindingModel model)
@ -87,6 +90,38 @@ namespace ComputerShopBusinessLogic.BusinessLogics
return true;
}
public bool AddComponentToAssembly(AssemblySearchModel model, ComponentSearchModel componentmodel, int amount)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
_logger.LogInformation("AddComponentToAssembly. AssemblyName:{AssemblyName}.Id:{ Id}", model.AssemblyName, model.Id);
var element = _assemblyStorage.GetElement(model);
var component = _componentStorage.GetElement(componentmodel);
if (element == null || component == null)
{
return false;
}
_logger.LogInformation("AddComponentToAssembly find. Id:{Id}", element.Id);
element.AssemblyComponents[component.Id] = (component, amount);
_assemblyStorage.Update(new()
{
Id = element.Id,
AssemblyName = element.AssemblyName,
Price = element.Price + component.Cost * amount,
ClientId = element.ClientId,
AssemblyComponents = element.AssemblyComponents,
});
return true;
}
private void CheckModel(AssemblyBindingModel model, bool withParams = true)
{
if (model == null)
@ -101,10 +136,10 @@ namespace ComputerShopBusinessLogic.BusinessLogics
{
throw new ArgumentNullException("Нет названия сборки", nameof(model.AssemblyName));
}
//if (model.Price <= 0)
//{
// throw new ArgumentNullException("Стоимость сборки должна быть больше 0", nameof(model.Price));
//}
if (model.Price <= 0)
{
throw new ArgumentNullException("Стоимость сборки должна быть больше 0", nameof(model.Price));
}
_logger.LogInformation("Assembly. ComputerName:{AssemblyName}.Price:{ Price}. Id: { Id}", model.AssemblyName, model.Price, model.Id);
var element = _assemblyStorage.GetElement(new AssemblySearchModel
{

3
ComputerShopProvider/ComputerShopBusinessLogic/BusinessLogics/ComponentLogic.cs
View File

@ -24,8 +24,7 @@ namespace ComputerShopBusinessLogic.BusinessLogics
public List<ComponentViewModel>? ReadList(ComponentSearchModel? model)
{
_logger.LogInformation("ReadList. ComponentName:{ComponentName}. Id:{ Id}", model?.ComponentName, model?.Id);
var list = model == null ? _componentStorage.GetFullList() :
_componentStorage.GetFilteredList(model);
var list = model == null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model);
if (list == null)
{
_logger.LogWarning("ReadList return null list");

35
ComputerShopProvider/ComputerShopClientApp/Controllers/HomeController.cs
View File

@ -1,5 +1,6 @@
using ComputerShopClientApp.Models;
using ComputerShopContracts.BindingModels;
using ComputerShopContracts.SearchModels;
using ComputerShopContracts.ViewModels;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics;
@ -30,7 +31,7 @@ namespace ComputerShopClientApp.Controllers
{
return Redirect("~/Home/Enter");
}
return View(APIClient.GetRequest<List<ComponentViewModel>>($"api/component/getcomponentlist"));
return View(APIClient.GetRequest<List<ComponentViewModel>>($"api/component/getcomponentlist?clientId={APIClient.Client.Id}"));
}
public IActionResult Assembly()
{
@ -129,7 +130,7 @@ namespace ComputerShopClientApp.Controllers
[HttpGet]
public IActionResult CreatePurchase()
{
ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>("api/main/getcomponentlist");
ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>($"api/main/getcomponentlist?clientId={APIClient.Client.Id}");
return View();
}
@ -182,7 +183,7 @@ namespace ComputerShopClientApp.Controllers
[HttpGet]
public IActionResult DeleteComponent()
{
ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>("api/main/getcomponentlist");
ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>($"api/main/getcomponentlist?clientId={APIClient.Client.Id}");
return View();
}
[HttpDelete]
@ -202,7 +203,7 @@ namespace ComputerShopClientApp.Controllers
[HttpGet]
public IActionResult CreateAssembly()
{
ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>("api/component/getcomponentlist");
ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>($"api/component/getcomponentlist?clientId={APIClient.Client.Id}");
ViewBag.CurrentComponents = new List<ComponentViewModel>();
return View();
}
@ -249,6 +250,32 @@ namespace ComputerShopClientApp.Controllers
Response.Redirect("Assembly");
}
public IActionResult AddComponentToAssembly()
{
if (APIClient.Client == null)
{
return Redirect("~/Home/Enter");
}
ViewBag.Assemblies = APIClient.GetRequest<List<AssemblyViewModel>>($"api/assembly/getassemblylist?clientId={APIClient.Client.Id}");
ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>($"api/component/getcomponentlist?clientId={APIClient.Client.Id}");
return View();
}
[HttpPost]
public void AddComponentToAssembly(int assembly, int component, int amount)
{
if (APIClient.Client == null)
{
throw new Exception("Необходима авторизация");
}
APIClient.PostRequest("api/assembly/AddComponentToAssembly", Tuple.Create(
new AssemblySearchModel() { Id = assembly },
new ComponentSearchModel() { Id = component },
amount
));
Response.Redirect("Assembly");
}
[HttpPost]

31
ComputerShopProvider/ComputerShopClientApp/Views/Home/AddComponentToAssembly.cshtml Normal file
View File

@ -0,0 +1,31 @@
@using ComputerShopContracts.ViewModels;
@using ComputerShopDataModels.Models;
@{
ViewData["Title"] = "AddComponentToAssembly";
}
@model Dictionary<int, IComponentModel>
<form method="post">
<div class="u-form-group u-form-name u-label-top">
<label class="u-label u-text-custom-color-1 u-label-1">Сборка: </label>
<div class="u-input u-input-rectangle">
<select id="assembly" name="assembly" class="form-control" asp-items="@(new SelectList(@ViewBag.Assemblies, "Id", "AssemblyName"))"></select>
</div>
</div>
<div class="u-form-group u-form-name u-label-top">
<label class="u-label u-text-custom-color-1 u-label-1">Компонент: </label>
<div class="u-input u-input-rectangle">
<select id="component" name="component" class="form-control" asp-items="@(new SelectList(@ViewBag.Components, "Id", "ComponentName"))"></select>
</div>
</div>
<div class="row">
<div class="col-4">Количество:</div>
<div class="col-8"><input type="text" name="amount" id="amount" /></div>
</div>
<div class="u-align-right u-form-group u-form-submit u-label-top">
<div class="col-8"></div>
<div class="col-4"><input type="submit" value="Добавить компонент" class="u-active-custom-color-6 u-border-none u-btn u-btn-submit u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1" /></div>
</div>
</form>

2
ComputerShopProvider/ComputerShopContracts/BusinessLogicContracts/IAssemblyLogic.cs
View File

@ -1,6 +1,7 @@
using ComputerShopContracts.BindingModels;
using ComputerShopContracts.SearchModels;
using ComputerShopContracts.ViewModels;
using ComputerShopDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
@ -16,5 +17,6 @@ namespace ComputerShopContracts.BusinessLogicContracts
bool Create(AssemblyBindingModel model);
bool Update(AssemblyBindingModel model);
bool Delete(AssemblyBindingModel model);
bool AddComponentToAssembly(AssemblySearchModel model, ComponentSearchModel componentmodel, int amount);
}
}

20
ComputerShopProvider/ComputerShopDatabaseImplement/Implements/ComponentStorage.cs
View File

@ -23,15 +23,25 @@ namespace ComputerShopDatabaseImplement.Implements
public List<ComponentViewModel> GetFilteredList(ComponentSearchModel
model)
{
if (string.IsNullOrEmpty(model.ComponentName))
if (string.IsNullOrEmpty(model.ComponentName) && model.ClientId == null)
{
return new();
}
using var context = new ComputerShopDatabase();
return context.Components
.Where(x => x.ComponentName.Contains(model.ComponentName))
.Select(x => x.GetViewModel)
.ToList();
if (!string.IsNullOrEmpty(model.ComponentName))
{
return context.Components
.Where(x => x.ComponentName.Contains(model.ComponentName))
.Select(x => x.GetViewModel)
.ToList();
}
else
{
return context.Components
.Where(x => x.ClientId == model.ClientId)
.Select(x => x.GetViewModel)
.ToList();
}
}
public ComponentViewModel? GetElement(ComponentSearchModel model)
{

15
ComputerShopProvider/ComputerShopRestApi/Controllers/AssemblyController.cs
View File

@ -2,6 +2,7 @@
using ComputerShopContracts.BusinessLogicContracts;
using ComputerShopContracts.SearchModels;
using ComputerShopContracts.ViewModels;
using ComputerShopDataModels.Models;
using Microsoft.AspNetCore.Mvc;
namespace ComputerShopRestApi.Controllers
@ -74,5 +75,19 @@ namespace ComputerShopRestApi.Controllers
throw;
}
}
[HttpPost]
public void AddComponentToAssembly(Tuple<AssemblySearchModel, ComponentSearchModel, int> model)
{
try
{
_assembly.AddComponentToAssembly(model.Item1, model.Item2, model.Item3);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка добавления компонента в сборку.");
throw;
}
}
}
}

8
ComputerShopProvider/ComputerShopRestApi/Controllers/ComponentController.cs
View File

@ -3,6 +3,7 @@ using ComputerShopContracts.BindingModels;
using ComputerShopContracts.BusinessLogicContracts;
using ComputerShopContracts.SearchModels;
using ComputerShopContracts.ViewModels;
using System.Reflection;
namespace ComputerShopRestApi.Controllers
{
@ -18,11 +19,14 @@ namespace ComputerShopRestApi.Controllers
_component = component;
}
[HttpGet]
public List<ComponentViewModel>? GetComponentList()
public List<ComponentViewModel>? GetComponentList(int clientId)
{
try
{
return _component.ReadList(null);
return _component.ReadList(new ComponentSearchModel
{
ClientId = clientId,
});
}
catch (Exception ex)
{