doone

Aparyan.ISE_22.MotorPlant/Aparyan.ISE_22.MotorPlant.sln

@@ -13,13 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MotorPlantBusinessLogic", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MotorPlantView", "..\MotorPlantView\MotorPlantView.csproj", "{76FE3E67-6BFC-4C12-AD2F-2267F8986605}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MotorPlantFileImplement", "..\MotorPlantFileImplement\MotorPlantFileImplement.csproj", "{44BB8347-D6F7-4AD3-BC7D-E565CA02E0F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotorPlantFileImplement", "MotorPlantFileImplement\MotorPlantFileImplement.csproj", "{3216A68E-02C0-4B3E-A608-6CD4D4B12CB4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MotorPlantDatabaseImplement", "MotorPlantDatabaseImplement\MotorPlantDatabaseImplement.csproj", "{4E5A0E78-08F9-4807-866C-4C7D50693C96}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotorPlantRestApi", "MotorPlantRestApi\MotorPlantRestApi.csproj", "{29E5B36D-7602-4EE5-96BB-A43FF9A49780}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotorPlantClientApi", "MotorPlantClientApi\MotorPlantClientApi.csproj", "{6F7A6389-1E4D-4F35-AE10-143EAA601F62}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotorPlantDatabaseImplementt", "MotorPlantDatabaseImplementt\MotorPlantDatabaseImplementt.csproj", "{F1E90353-277F-4F6C-B0D4-0E816F5D91A6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,22 +43,14 @@ Global
 		{76FE3E67-6BFC-4C12-AD2F-2267F8986605}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{76FE3E67-6BFC-4C12-AD2F-2267F8986605}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76FE3E67-6BFC-4C12-AD2F-2267F8986605}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44BB8347-D6F7-4AD3-BC7D-E565CA02E0F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44BB8347-D6F7-4AD3-BC7D-E565CA02E0F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44BB8347-D6F7-4AD3-BC7D-E565CA02E0F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44BB8347-D6F7-4AD3-BC7D-E565CA02E0F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E5A0E78-08F9-4807-866C-4C7D50693C96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E5A0E78-08F9-4807-866C-4C7D50693C96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E5A0E78-08F9-4807-866C-4C7D50693C96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E5A0E78-08F9-4807-866C-4C7D50693C96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29E5B36D-7602-4EE5-96BB-A43FF9A49780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29E5B36D-7602-4EE5-96BB-A43FF9A49780}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29E5B36D-7602-4EE5-96BB-A43FF9A49780}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29E5B36D-7602-4EE5-96BB-A43FF9A49780}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F7A6389-1E4D-4F35-AE10-143EAA601F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F7A6389-1E4D-4F35-AE10-143EAA601F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F7A6389-1E4D-4F35-AE10-143EAA601F62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F7A6389-1E4D-4F35-AE10-143EAA601F62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3216A68E-02C0-4B3E-A608-6CD4D4B12CB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3216A68E-02C0-4B3E-A608-6CD4D4B12CB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3216A68E-02C0-4B3E-A608-6CD4D4B12CB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3216A68E-02C0-4B3E-A608-6CD4D4B12CB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1E90353-277F-4F6C-B0D4-0E816F5D91A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1E90353-277F-4F6C-B0D4-0E816F5D91A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1E90353-277F-4F6C-B0D4-0E816F5D91A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1E90353-277F-4F6C-B0D4-0E816F5D91A6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Aparyan.ISE_22.MotorPlant/ClientRestApi/ClientRestApi.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <InvariantGlobalization>true</InvariantGlobalization>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-  </ItemGroup>
-
-</Project>

Aparyan.ISE_22.MotorPlant/ClientRestApi/ClientRestApi.http

@@ -1,6 +0,0 @@
-@ClientRestApi_HostAddress = http://localhost:5227
-
-GET {{ClientRestApi_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###

Aparyan.ISE_22.MotorPlant/ClientRestApi/Controllers/WeatherForecastController.cs

@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace ClientRestApi.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
-    {
-        private static readonly string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
-
-        private readonly ILogger<WeatherForecastController> _logger;
-
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            _logger = logger;
-        }
-
-        [HttpGet(Name = "GetWeatherForecast")]
-        public IEnumerable<WeatherForecast> Get()
-        {
-            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-                TemperatureC = Random.Shared.Next(-20, 55),
-                Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-            })
-            .ToArray();
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/ClientRestApi/Program.cs

@@ -1,25 +0,0 @@
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

Aparyan.ISE_22.MotorPlant/ClientRestApi/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:25213",
-      "sslPort": 44395
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5227",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7097;http://localhost:5227",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

Aparyan.ISE_22.MotorPlant/ClientRestApi/WeatherForecast.cs

@@ -1,13 +0,0 @@
-namespace ClientRestApi
-{
-    public class WeatherForecast
-    {
-        public DateOnly Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-        public string? Summary { get; set; }
-    }
-}

Aparyan.ISE_22.MotorPlant/ClientRestApi/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

Aparyan.ISE_22.MotorPlant/ClientRestApi/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/ApiClient.cs

@@ -1,47 +0,0 @@
-using System.Net.Http.Headers;
-using System.Text;
-using Newtonsoft.Json;
-using MotorPlantContracts.ViewModels;
-
-
-namespace MotorPlantClientApp
-{
-	public static class APIClient
-	{
-		private static readonly HttpClient _client = new();
-		public static ClientViewModel? Client { get; set; } = null;
-		public static void Connect(IConfiguration configuration)
-		{
-			_client.BaseAddress = new Uri(configuration["IPAddress"]);
-			_client.DefaultRequestHeaders.Accept.Clear();
-			_client.DefaultRequestHeaders.Accept.Add(new
-		   MediaTypeWithQualityHeaderValue("application/json"));
-		}
-		public static T? GetRequest<T>(string requestUrl)
-		{
-			var response = _client.GetAsync(requestUrl);
-			var result = response.Result.Content.ReadAsStringAsync().Result;
-			if (response.Result.IsSuccessStatusCode)
-			{
-				return JsonConvert.DeserializeObject<T>(result);
-			}
-			else
-			{
-				throw new Exception(result);
-			}
-		}
-		public static void PostRequest<T>(string requestUrl, T model)
-		{
-			var json = JsonConvert.SerializeObject(model);
-			var data = new StringContent(json, Encoding.UTF8,
-		   "application/json");
-			var response = _client.PostAsync(requestUrl, data);
-			var result = response.Result.Content.ReadAsStringAsync().Result;
-			if (!response.Result.IsSuccessStatusCode)
-			{
-				throw new Exception(result);
-			}
-		}
-	}
-
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Controllers/HomeController.cs

@@ -1,151 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using MotorPlantClientApp.Models;
-using System.Diagnostics;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantContracts.VeiwModels;
-
-namespace MotorPlantClientApp.Controllers
-{
-    public class HomeController : Controller
-    {
-        private readonly ILogger<HomeController> _logger;
-        public HomeController(ILogger<HomeController> logger)
-        {
-            _logger = logger;
-        }
-        public IActionResult Index()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return
-            View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
-        }
-        [HttpGet]
-        public IActionResult Privacy()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View(APIClient.Client);
-        }
-        [HttpPost]
-        public void Privacy(string login, string password, string fio)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("<22><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>? <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
-            }
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-            {
-                throw new Exception("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>");
-            }
-            APIClient.PostRequest("api/client/updatedata", new
-            ClientBindingModel
-            {
-                Id = APIClient.Client.Id,
-                ClientFIO = fio,
-                Email = login,
-                Password = password
-            });
-            APIClient.Client.ClientFIO = fio;
-            APIClient.Client.Email = login;
-            APIClient.Client.Password = password;
-            Response.Redirect("Index");
-        }
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None,
-        NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel
-            {
-                RequestId =
-            Activity.Current?.Id ?? HttpContext.TraceIdentifier
-            });
-        }
-        [HttpGet]
-        public IActionResult Enter()
-        {
-            return View();
-        }
-        [HttpPost]
-        public void Enter(string login, string password)
-        {
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password))
-            {
-                throw new Exception("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
-            }
-            APIClient.Client =
-            APIClient.GetRequest<ClientViewModel>($"api/client/login?login={login}&password={password}");
-            if (APIClient.Client == null)
-            {
-                throw new Exception("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
-            }
-            Response.Redirect("Index");
-        }
-        [HttpGet]
-        public IActionResult Register()
-        {
-            return View();
-        }
-        [HttpPost]
-        public void Register(string login, string password, string fio)
-        {
-            if (string.IsNullOrEmpty(login) ||
-            string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-            {
-                throw new Exception("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>");
-            }
-            APIClient.PostRequest("api/client/register", new
-            ClientBindingModel
-            {
-                ClientFIO = fio,
-                Email = login,
-                Password = password
-            });
-            Response.Redirect("Enter");
-            return;
-        }
-        [HttpGet]
-        public IActionResult Create()
-        {
-            ViewBag.Engines =
-            APIClient.GetRequest<List<EngineViewModel>>("api/main/getEnginelist");
-            return View();
-        }
-        [HttpPost]
-        public void Create(int Engine, int count)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("<22><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>? <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
-            }
-            if (count <= 0)
-            {
-                throw new Exception("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0");
-            }
-            APIClient.PostRequest("api/main/createorder", new
-            OrderBindingModel
-            {
-                ClientId = APIClient.Client.Id,
-                EngineId = Engine,
-                Count = count,
-                Sum = Calc(count, Engine)
-            });
-            Response.Redirect("Index");
-        }
-        [HttpPost]
-        public double Calc(int count, int Engine)
-        {
-            var _Engine =
-            APIClient.GetRequest<EngineViewModel>($"api/main/getEngine?Engineid={Engine}"
-            );
-            return Math.Round(count * (_Engine?.Price ?? 1), 2);
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Models/ErrorViewModel.cs

@@ -1,9 +0,0 @@
-namespace MotorPlantClientApp.Models
-{
-    public class ErrorViewModel
-    {
-        public string? RequestId { get; set; }
-
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/MotorPlantClientApi.http

@@ -1,6 +0,0 @@
-@MotorPlantClientApi_HostAddress = http://localhost:5126
-
-GET {{MotorPlantClientApi_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Program.cs

@@ -1,31 +0,0 @@
-using MotorPlantClientApp;
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-builder.Services.AddControllersWithViews();
-
-var app = builder.Build();
-
-APIClient.Connect(builder.Configuration);
-
-// Configure the HTTP request pipeline.
-if (!app.Environment.IsDevelopment())
-{
-    app.UseExceptionHandler("/Home/Error");
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-    app.UseHsts();
-}
-
-app.UseHttpsRedirection();
-
-app.UseStaticFiles();
-
-app.UseRouting();
-
-app.UseAuthorization();
-
-app.MapControllerRoute(
-    name: "default",
-    pattern: "{controller=Home}/{action=Index}/{id?}");
-
-app.Run();

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:44719",
-      "sslPort": 44341
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5126",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7006;http://localhost:5126",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Home/Create.cshtml

@@ -1,50 +0,0 @@
-@{
-	ViewData["Title"] = "Create";
-}
-<div class="text-center">
-	<h2 class="display-4">Создание заказа</h2>
-</div>
-<form method="post">
-	<div class="row">
-		<div class="col-4">Изделие:</div>
-		<div class="col-8">
-			<select id="engine" name="engine" class="form-control" asp-items="@(new SelectList(@ViewBag.Engines,"Id", "EngineName"))"></select>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-4">Количество:</div>
-		<div class="col-8"><input type="text" name="count" id="count" /></div>
-	</div>
-	<div class="row">
-		<div class="col-4">Сумма:</div>
-		<div class="col-8"><input type="text" id="sum" name="sum" readonly /></div>
-	</div>
-	<div class="row">
-		<div class="col-8"></div>
-		<div class="col-4"><input type="submit" value="Создать" class="btn btn-primary" /></div>
-	</div>
-</form>
-
-<script>
-	$('#engine').on('change', function () {
-		check();
-	});
-	$('#count').on('change', function () {
-		check();
-	});
-
-	function check() {
-		var count = $('#count').val();
-		var engine = $('#engine').val();
-		if (count && engine) {
-			$.ajax({
-				method: "POST",
-				url: "/Home/Calc",
-				data: { count: count, engine: engine },
-				success: function (result) {
-					$("#sum").val(result);
-				}
-			});
-		};
-	}
-</script>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Home/Enter.cshtml

@@ -1,21 +0,0 @@
-@{
-	ViewData["Title"] = "Enter";
-}
-
-<div class="text-center">
-	<h2 class="display-4">Вход в приложение</h2>
-</div>
-<form method="post">
-	<div class="row">
-		<div class="col-4">Логин:</div>
-		<div class="col-8"><input type="text" name="login" /></div>
-	</div>
-	<div class="row">
-		<div class="col-4">Пароль:</div>
-		<div class="col-8"><input type="password" name="password" /></div>
-	</div>
-	<div class="row">
-		<div class="col-8"></div>
-		<div class="col-4"><input type="submit" value="Вход" class="btn btn-primary" /></div>
-	</div>
-</form>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Home/Index.cshtml

@@ -1,75 +0,0 @@
-@using MotorPlantContracts.VeiwModels
-
-@model List<OrderViewModel>
-
-@{
-	ViewData["Title"] = "Home Page";
-}
-
-<div class="text-center">
-	<h1 class="display-4">Заказы</h1>
-</div>
-
-
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-			<h3 class="display-4">Авторизируйтесь</h3>
-			return;
-		}
-
-		<p>
-			<a asp-action="Create">Создать заказ</a>
-		</p>
-		<table class="table">
-			<thead>
-				<tr>
-					<th>
-						Номер
-					</th>
-					<th>
-						Двигатель
-					</th>
-					<th>
-						Дата создания
-					</th>
-					<th>
-						Количество
-					</th>
-					<th>
-						Сумма
-					</th>
-					<th>
-						Статус
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				@foreach (var item in Model)
-				{
-					<tr>
-						<td>
-							@Html.DisplayFor(modelItem => item.Id)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.EngineName)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.DateCreate)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Count)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Sum)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Status)
-						</td>
-					</tr>
-				}
-			</tbody>
-		</table>
-	}
-</div>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Home/Privacy.cshtml

@@ -1,28 +0,0 @@
-@using MotorPlantContracts.ViewModels
-
-@model ClientViewModel
-
-@{
-	ViewData["Title"] = "Privacy Policy";
-}
-<div class="text-center">
-	<h2 class="display-4">Личные данные</h2>
-</div>
-<form method="post">
-	<div class="row">
-		<div class="col-4">Логин:</div>
-		<div class="col-8"><input type="text" name="login" value="@Model.Email" /></div>
-	</div>
-	<div class="row">
-		<div class="col-4">Пароль:</div>
-		<div class="col-8"><input type="password" name="password" value="@Model.Password" /></div>
-	</div>
-	<div class="row">
-		<div class="col-4">ФИО:</div>
-		<div class="col-8"><input type="text" name="fio" value="@Model.ClientFIO" /></div>
-	</div>
-	<div class="row">
-		<div class="col-8"></div>
-		<div class="col-4"><input type="submit" value="Сохранить" class="btn btn-primary" /></div>
-	</div>
-</form>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Home/Register.cshtml

@@ -1,25 +0,0 @@
-@{
-	ViewData["Title"] = "Register";
-}
-
-<div class="text-center">
-	<h2 class="display-4">Регистрация</h2>
-</div>
-<form method="post">
-	<div class="row">
-		<div class="col-4">Логин:</div>
-		<div class="col-8"><input type="text" name="login" /></div>
-	</div>
-	<div class="row">
-		<div class="col-4">Пароль:</div>
-		<div class="col-8"><input type="password" name="password" /></div>
-	</div>
-	<div class="row">
-		<div class="col-4">ФИО:</div>
-		<div class="col-8"><input type="text" name="fio" /></div>
-	</div>
-	<div class="row">
-		<div class="col-8"></div>
-		<div class="col-4"><input type="submit" value="Регистрация" class="btn btn-primary" /></div>
-	</div>
-</form>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Shared/Error.cshtml

@@ -1,25 +0,0 @@
-@model ErrorViewModel
-@{
-    ViewData["Title"] = "Error";
-}
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-@if (Model.ShowRequestId)
-{
-    <p>
-        <strong>Request ID:</strong> <code>@Model.RequestId</code>
-    </p>
-}
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Shared/_Layout.cshtml

@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - MotorPlantClientApp</title>
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/MotorPlantClientApp.styles.css" asp-append-version="true" />
-</head>
-<body>
-    <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
-            <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">MotorPlantClientApp</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
-                        aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Заказы</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Register">Регистрация</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </nav>
-    </header>
-    <div class="container">
-        <main role="main" class="pb-3">
-            @RenderBody()
-        </main>
-    </div>
-
-    <footer class="border-top footer text-muted">
-        <div class="container">
-            &copy; 2024 - MotorPlantClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
-        </div>
-    </footer>
-    <script src="~/lib/jquery/dist/jquery.min.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="~/js/site.js" asp-append-version="true"></script>
-    @await RenderSectionAsync("Scripts", required: false)
-</body>
-</html>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Shared/_Layout.cshtml.css

@@ -1,48 +0,0 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-for details on configuring this project to bundle and minify static web assets. */
-
-a.navbar-brand {
-  white-space: normal;
-  text-align: center;
-  word-break: break-all;
-}
-
-a {
-  color: #0077cc;
-}
-
-.btn-primary {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.border-top {
-  border-top: 1px solid #e5e5e5;
-}
-.border-bottom {
-  border-bottom: 1px solid #e5e5e5;
-}
-
-.box-shadow {
-  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
-}
-
-button.accept-policy {
-  font-size: 1rem;
-  line-height: inherit;
-}
-
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  white-space: nowrap;
-  line-height: 60px;
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,2 +0,0 @@
-<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/_ViewImports.cshtml

@@ -1,3 +0,0 @@
-@using MotorPlantClientApp
-@using MotorPlantClientApp.Models
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/Views/_ViewStart.cshtml

@@ -1,3 +0,0 @@
-@{
-    Layout = "_Layout";
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantClientApi/appsettings.json

@@ -1,10 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "IPAddress": "http://localhost:5114/"
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Implements/ClientStorage.cs

@@ -1,88 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantDatabaseImplement.Implements
-{
-    public class ClientStorage : IClientStorage
-    {
-        public List<ClientViewModel> GetFullList()
-        {
-            using var context = new MotorPlantDatabase();
-            return context.Clients
-            .Select(x => x.GetViewModel)
-           .ToList();
-        }
-        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ClientFIO) && string.IsNullOrEmpty(model.Email) &&
-                string.IsNullOrEmpty(model.Password) &&
-                string.IsNullOrEmpty(model.ClientFIO))
-            {
-                return new();
-            }
-            using var context = new MotorPlantDatabase();
-            return context.Clients
-            .Where(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO) &&
-                         string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email) &&
-                         string.IsNullOrEmpty(model.Password) || x.ClientFIO.Contains(model.Password)))
-           .Select(x => x.GetViewModel)
-           .ToList();
-        }
-        public ClientViewModel? GetElement(ClientSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new MotorPlantDatabase();
-            return context.Clients.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-        public ClientViewModel? Insert(ClientBindingModel model)
-        {
-            var newClient = Client.Create(model);
-            if (newClient == null)
-            {
-                return null;
-            }
-            using var context = new MotorPlantDatabase();
-            context.Clients.Add(newClient);
-            context.SaveChanges();
-            return newClient.GetViewModel;
-        }
-        public ClientViewModel? Update(ClientBindingModel model)
-        {
-            using var context = new MotorPlantDatabase();
-            var client = context.Clients.FirstOrDefault(x => x.Id == model.Id);
-            if (client == null)
-            {
-                return null;
-            }
-            client.Update(model);
-            context.SaveChanges();
-            return client.GetViewModel;
-        }
-        public ClientViewModel? Delete(ClientBindingModel model)
-        {
-            using var context = new MotorPlantDatabase();
-            var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Clients.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Implements/ImplementerStorage.cs

@@ -1,82 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantDatabaseImplement.Implements
-{
-    public class ImplementerStorage : IImplementerStorage
-    {
-        public ImplementerViewModel? Delete(ImplementerBindingModel model)
-        {
-            using var context = new MotorPlantDataBase();
-            var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
-            if (res != null)
-            {
-                context.Implementers.Remove(res);
-                context.SaveChanges();
-            }
-            return res?.GetViewModel;
-        }
-        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) &&
-               !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new MotorPlantDataBase();
-            return context.Implementers
-            .FirstOrDefault(x => (string.IsNullOrEmpty(model.ImplementerFIO) || x.ImplementerFIO == model.ImplementerFIO) &&
-                                 (!model.Id.HasValue || x.Id == model.Id) &&
-                                 (string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
-            ?.GetViewModel;
-        }
-        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                return new();
-            }
-            if (model.Id.HasValue)
-            {
-                var res = GetElement(model);
-                return res != null ? new() { res } : new();
-            }
-            return new();
-        }
-        public List<ImplementerViewModel> GetFullList()
-        {
-            using var context = new MotorPlantDataBase();
-            return context.Implementers.Select(x => x.GetViewModel).ToList();
-        }
-        public ImplementerViewModel? Insert(ImplementerBindingModel model)
-        {
-            using var context = new MotorPlantDataBase();
-            var res = Implementer.Create(model);
-            if (res != null)
-            {
-                context.Implementers.Add(res);
-                context.SaveChanges();
-            }
-            return res?.GetViewModel;
-        }
-        public ImplementerViewModel? Update(ImplementerBindingModel model)
-        {
-            using var context = new MotorPlantDataBase();
-            var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
-            if (res != null)
-            {
-                res.Update(model);
-                context.SaveChanges();
-            }
-            return res?.GetViewModel;
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Implements/OrderStorage.cs

@@ -1,85 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.VeiwModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDatabaseImplement.Models;
-
-namespace MotorPlantDatabaseImplement.Implements
-{
-	public class OrderStorage : IOrderStorage
-	{
-		public List<OrderViewModel> GetFullList()
-		{
-			using var context = new MotorPlantDatabase();
-			return context.Orders.Include(x => x.Engine)
-			.Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel)
-		   .ToList();
-		}
-		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-		{
-			using var context = new MotorPlantDatabase();
-			return context.Orders
-			.Include(x => x.Engine)
-				.Include(x => x.Client).Include(x => x.Implementer).Where(x => (
-						(!model.Id.HasValue || x.Id == model.Id) &&
-						(!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
-						(!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
-						&&
-						(!model.ClientId.HasValue || x.ClientId == model.ClientId)
-						&&
-						(!model.Status.HasValue || x.Status == model.Status)
-					)
-				)
-		   .Select(x => x.GetViewModel)
-		   .ToList();
-		}
-		public OrderViewModel? GetElement(OrderSearchModel model)
-		{
-			using var context = new MotorPlantDatabase();
-			return context.Orders.Include(x => x.Engine).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(
-							x => ((model.Id.HasValue && x.Id == model.Id) ||
-							(model.ImplementerId.HasValue && model.Status.HasValue &&
-							x.ImplementerId == model.ImplementerId && x.Status == model.Status)))?.GetViewModel;
-		}
-		public OrderViewModel? Insert(OrderBindingModel model)
-		{
-			using var context = new MotorPlantDatabase();
-			var newOrder = Order.Create(context, model);
-			if (newOrder == null)
-			{
-				return null;
-			}
-			context.Orders.Add(newOrder);
-			context.SaveChanges();
-			return newOrder.GetViewModel;
-		}
-		public OrderViewModel? Update(OrderBindingModel model)
-		{
-			using var context = new MotorPlantDatabase();
-			var order = context.Orders.Include(x => x.Engine).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id ==
-		   model.Id);
-			if (order == null)
-			{
-				return null;
-			}
-			order.Update(model);
-			context.SaveChanges();
-			return order.GetViewModel;
-		}
-		public OrderViewModel? Delete(OrderBindingModel model)
-		{
-			using var context = new MotorPlantDatabase();
-			var element = context.Orders.FirstOrDefault(rec => rec.Id ==
-		   model.Id);
-			if (element != null)
-			{
-				context.Orders.Remove(element);
-				context.SaveChanges();
-				return element.GetViewModel;
-			}
-			return null;
-		}
-	}
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Migrations/20240501163500_Second.Designer.cs

@@ -1,214 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using MotorPlantDatabaseImplement;
-
-#nullable disable
-
-namespace MotorPlantDatabaseImplement.Migrations
-{
-    [DbContext(typeof(MotorPlantDatabase))]
-    [Migration("20240501163500_Second")]
-    partial class Second
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.2")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("EngineName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Engines");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("EngineId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("EngineId");
-
-                    b.ToTable("EngineComponents");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("EngineId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("EngineName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("EngineId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
-                {
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Component", "Component")
-                        .WithMany("EngineComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
-                        .WithMany("Components")
-                        .HasForeignKey("EngineId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Engine");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Client", null)
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId");
-
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
-                        .WithMany("Orders")
-                        .HasForeignKey("EngineId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Engine");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("EngineComponents");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Migrations/20240501163500_Second.cs

@@ -1,66 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace MotorPlantDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class Second : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "ClientId",
-                table: "Orders",
-                type: "int",
-                nullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "Clients",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Clients", x => x.Id);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_ClientId",
-                table: "Orders",
-                column: "ClientId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Orders_Clients_ClientId",
-                table: "Orders",
-                column: "ClientId",
-                principalTable: "Clients",
-                principalColumn: "Id");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Orders_Clients_ClientId",
-                table: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "Clients");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Orders_ClientId",
-                table: "Orders");
-
-            migrationBuilder.DropColumn(
-                name: "ClientId",
-                table: "Orders");
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Migrations/MotorPlantDatabaseModelSnapshot.cs

@@ -1,211 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using MotorPlantDatabaseImplement;
-
-#nullable disable
-
-namespace MotorPlantDatabaseImplement.Migrations
-{
-    [DbContext(typeof(MotorPlantDatabase))]
-    partial class MotorPlantDatabaseModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.2")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("EngineName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Engines");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("EngineId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("EngineId");
-
-                    b.ToTable("EngineComponents");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("EngineId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("EngineName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("EngineId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
-                {
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Component", "Component")
-                        .WithMany("EngineComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
-                        .WithMany("Components")
-                        .HasForeignKey("EngineId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Engine");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Client", null)
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId");
-
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
-                        .WithMany("Orders")
-                        .HasForeignKey("EngineId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Engine");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("EngineComponents");
-                });
-
-            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Models/Client.cs

@@ -1,67 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantDatabaseImplement.Models
-{
-	public class Client : IClientModel
-	{
-		public int Id { get; private set; }
-		[Required]
-		public string ClientFIO { get; set; } = string.Empty;
-		[Required]
-		public string Email { get; set; } = string.Empty;
-		[Required]
-		public string Password { get; set; } = string.Empty;
-		[ForeignKey("ClientId")]
-		public virtual List<Order> Orders { get; set; } = new();
-		public static Client? Create(ClientBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Client()
-			{
-				Id = model.Id,
-				ClientFIO = model.ClientFIO,
-				Email = model.Email,
-				Password = model.Password
-			};
-		}
-		public static Client Create(ClientViewModel model)
-		{
-			return new Client
-			{
-				Id = model.Id,
-				ClientFIO = model.ClientFIO,
-				Email = model.Email,
-				Password = model.Password
-			};
-		}
-		public void Update(ClientBindingModel model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ClientFIO = model.ClientFIO;
-			Email = model.Email;
-			Password = model.Password;
-		}
-		public ClientViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ClientFIO = ClientFIO,
-			Email = Email,
-			Password = Password
-		};
-	}
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/Models/Implementer.cs

@@ -1,63 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantDatabaseImplement.Models
-{
-    public class Implementer : IImplementerModel
-    {
-        public int Id { get; private set; }
-        [Required]
-        public string ImplementerFIO { get; private set; } = string.Empty;
-        [Required]
-        public string Password { get; set; } = string.Empty;
-        [Required]
-        public int Qualification { get; set; } = 0;
-        [Required]
-        public int WorkExperience { get; set; } = 0;
-        [ForeignKey("ImplementerId")]
-        public virtual List<Order> Orders { get; set; } =
-       new();
-        public static Implementer? Create(ImplementerBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Id = model.Id,
-                Password = model.Password,
-                Qualification = model.Qualification,
-                ImplementerFIO = model.ImplementerFIO,
-                WorkExperience = model.WorkExperience,
-            };
-        }
-        public void Update(ImplementerBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Password = model.Password;
-            Qualification = model.Qualification;
-            ImplementerFIO = model.ImplementerFIO;
-            WorkExperience = model.WorkExperience;
-        }
-        public ImplementerViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Password = Password,
-            Qualification = Qualification,
-            ImplementerFIO = ImplementerFIO,
-            WorkExperience = WorkExperience,
-        };
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/MotorPlantDatabase.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using MotorPlantDatabaseImplement.Models;
-
-namespace MotorPlantDatabaseImplement
-{
-    public class MotorPlantDatabase : DbContext
-    {
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            if (optionsBuilder.IsConfigured == false)
-            {
-                optionsBuilder.UseSqlServer(@"Data Source=WIN-QKNE49D1RUQ\SQLEXPRESS;Initial Catalog=MotorPlantDatabaseeses;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
-            }
-            base.OnConfiguring(optionsBuilder);
-        }
-        public virtual DbSet<Component> Components { set; get; }
-        public virtual DbSet<Engine> Engines { set; get; }
-        public virtual DbSet<EngineComponent> EngineComponents { set; get; }
-        public virtual DbSet<Order> Orders { set; get; }
-        public virtual DbSet<Client> Clients { set; get; }
-        public virtual DbSet<Implementer> Implementers { set; get; }
-
-
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplement/MotorPlantDatabaseImplement.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	  </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\MotorPlantContracts\MotorPlantContracts.csproj" />
-    <ProjectReference Include="..\..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
-  </ItemGroup>
-
-</Project>

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Implements/ComponentStorage.cs

@@ -2,31 +2,25 @@
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.StoragesContracts;
 using MotorPlantContracts.VeiwModels;
-using MotorPlantDatabaseImplement.Models;
+using MotorPlantDatabaseImplementt.Models;
 
-namespace MotorPlantDatabaseImplement.Implements
+namespace MotorPlantDatabaseImplementt.Implements
 {
     public class ComponentStorage : IComponentStorage
     {
         public List<ComponentViewModel> GetFullList()
         {
             using var context = new MotorPlantDatabase();
-            return context.Components
-            .Select(x => x.GetViewModel)
-           .ToList();
+            return context.Components.Select(x => x.GetViewModel).ToList();
         }
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel
-       model)
+        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
         {
             if (string.IsNullOrEmpty(model.ComponentName))
             {
                 return new();
             }
             using var context = new MotorPlantDatabase();
-            return context.Components
-            .Where(x => x.ComponentName.Contains(model.ComponentName))
-           .Select(x => x.GetViewModel)
-           .ToList();
+            return context.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
         }
         public ComponentViewModel? GetElement(ComponentSearchModel model)
         {
@@ -35,12 +29,7 @@ namespace MotorPlantDatabaseImplement.Implements
                 return null;
             }
             using var context = new MotorPlantDatabase();
-            return context.Components
-            .FirstOrDefault(x =>
-           (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
-           model.ComponentName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-            ?.GetViewModel;
+            return context.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
         public ComponentViewModel? Insert(ComponentBindingModel model)
         {
@@ -57,8 +46,7 @@ namespace MotorPlantDatabaseImplement.Implements
         public ComponentViewModel? Update(ComponentBindingModel model)
         {
             using var context = new MotorPlantDatabase();
-            var component = context.Components.FirstOrDefault(x => x.Id ==
-           model.Id);
+            var component = context.Components.FirstOrDefault(x => x.Id == model.Id);
             if (component == null)
             {
                 return null;
@@ -70,15 +58,14 @@ namespace MotorPlantDatabaseImplement.Implements
         public ComponentViewModel? Delete(ComponentBindingModel model)
         {
             using var context = new MotorPlantDatabase();
-            var element = context.Components.FirstOrDefault(rec => rec.Id ==
-           model.Id);
-            if (element != null)
+            var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element == null)
             {
-                context.Components.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
+                return null;
             }
-            return null;
+            context.Components.Remove(element);
+            context.SaveChanges();
+            return element.GetViewModel;
         }
     }
 }

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Implements/EngineStorage.cs

@@ -3,21 +3,17 @@ using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.StoragesContracts;
 using MotorPlantContracts.VeiwModels;
-using MotorPlantDatabaseImplement.Models;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDatabaseImplementt.Models;
 
-namespace MotorPlantDatabaseImplement.Implements
+namespace MotorPlantDatabaseImplementt.Implements
 {
     public class EngineStorage : IEngineStorage
     {
         public List<EngineViewModel> GetFullList()
         {
             using var context = new MotorPlantDatabase();
-            return context.Engines
-             .Include(x => x.Components)
-            .ThenInclude(x => x.Component)
-            .ToList()
-            .Select(x => x.GetViewModel)
-            .ToList();
+            return context.Engines.Include(x => x.Components).ThenInclude(x => x.Component).ToList().Select(x => x.GetViewModel).ToList();
         }
         public List<EngineViewModel> GetFilteredList(EngineSearchModel model)
         {
@@ -26,13 +22,8 @@ namespace MotorPlantDatabaseImplement.Implements
                 return new();
             }
             using var context = new MotorPlantDatabase();
-            return context.Engines
-             .Include(x => x.Components)
-            .ThenInclude(x => x.Component)
-            .Where(x => x.EngineName.Contains(model.EngineName))
-            .ToList()
-            .Select(x => x.GetViewModel)
-            .ToList();
+            return context.Engines.Include(x => x.Components).ThenInclude(x => x.Component).Where(x => x.EngineName.Contains(model.EngineName)).ToList().Select(x => x.GetViewModel).ToList();
+
         }
         public EngineViewModel? GetElement(EngineSearchModel model)
         {
@@ -42,14 +33,8 @@ namespace MotorPlantDatabaseImplement.Implements
                 return null;
             }
             using var context = new MotorPlantDatabase();
-            return context.Engines
-             .Include(x => x.Components)
-             .ThenInclude(x => x.Component)
-             .FirstOrDefault(x => (!string.IsNullOrEmpty(model.EngineName) &&
-            x.EngineName == model.EngineName) ||
-            (model.Id.HasValue && x.Id ==
-            model.Id))
-            ?.GetViewModel;
+            return context.Engines.Include(x => x.Components).ThenInclude(x => x.Component)
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.EngineName) && x.EngineName == model.EngineName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
         public EngineViewModel? Insert(EngineBindingModel model)
         {

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Implements/OrderStorage.cs

@@ -0,0 +1,93 @@
+using Microsoft.EntityFrameworkCore;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDatabaseImplementt.Models;
+
+
+namespace MotorPlantDatabaseImplementt.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        public List<OrderViewModel> GetFullList()
+        {
+            using var context = new MotorPlantDatabase();
+			return context.Orders
+			.Select(x => AccessEngineStorage(x.GetViewModel))
+		   .ToList();
+		}
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            using var context = new MotorPlantDatabase();
+			return context.Orders.Where(x => x.Id == model.Id).Select(x => AccessEngineStorage(x.GetViewModel)).ToList();
+		}
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+			if (!model.Id.HasValue)
+			{
+				return null;
+			}
+			using var context = new MotorPlantDatabase();
+			return AccessEngineStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
+		}
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+			var newOrder = Order.Create(model);
+			if (newOrder == null)
+			{
+				return null;
+			}
+			using var context = new MotorPlantDatabase();
+			context.Orders.Add(newOrder);
+			context.SaveChanges();
+			return AccessEngineStorage(newOrder.GetViewModel);
+		}
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+			using var context = new MotorPlantDatabase();
+			var order = context.Orders.FirstOrDefault(x => x.Id ==
+		   model.Id);
+			if (order == null)
+			{
+				return null;
+			}
+			order.Update(model);
+			context.SaveChanges();
+			return AccessEngineStorage(order.GetViewModel);
+		}
+
+		public OrderViewModel? Delete(OrderBindingModel model)
+		{
+			using var context = new MotorPlantDatabase();
+			var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.Orders.Remove(element);
+				context.SaveChanges();
+                return AccessEngineStorage(element.GetViewModel);
+			}
+			return null;
+		}
+
+		public static OrderViewModel AccessEngineStorage(OrderViewModel model)
+		{
+			if (model == null)
+				return null;
+			using var context = new MotorPlantDatabase();
+			foreach (var Engine in context.Engines)
+			{
+				if (Engine.Id == model.EngineId)
+				{
+					model.EngineName = Engine.EngineName;
+					break;
+				}
+			}
+			return model;
+		}
+	}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Implements/ShopStorage.cs

@@ -0,0 +1,191 @@
+using Microsoft.EntityFrameworkCore;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDatabaseImplementt.Models;
+using MotorPlantDataModels.Models;
+
+namespace MotorPlantDatabaseImplementt.Implements
+{
+	public class ShopStorage : IShopStorage
+	{
+		public ShopViewModel? Delete(ShopBindingModel model)
+		{
+			using var context = new MotorPlantDatabase();
+			var element = context.Shops.FirstOrDefault(x => x.Id == model.Id);
+			if (element != null)
+			{
+				context.Shops.Remove(element);
+				context.SaveChanges();
+				return element.GetViewModel;
+			}
+			return null;
+		}
+
+		public ShopViewModel? GetElement(ShopSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+			{
+				return null;
+			}
+			using var context = new MotorPlantDatabase();
+			return context.Shops.Include(x => x.Engines).ThenInclude(x => x.Engine).FirstOrDefault(x =>
+                (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
+                (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+
+		public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ShopName))
+			{
+				return new();
+			}
+			using var context = new MotorPlantDatabase();
+			return context.Shops
+				.Include(x => x.Engines)
+				.ThenInclude(x => x.Engine)
+                .Where(x => x.ShopName.Contains(model.ShopName)).
+                ToList().Select(x => x.GetViewModel).ToList();
+        }
+
+		public List<ShopViewModel> GetFullList()
+		{
+			using var context = new MotorPlantDatabase();
+			return context.Shops
+			.Include(x => x.Engines)
+				.ThenInclude(x => x.Engine)
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public ShopViewModel? Insert(ShopBindingModel model)
+		{
+				using var context = new MotorPlantDatabase();
+				var newShop = Shop.Create(context, model);
+				if (newShop == null)
+				{
+					return null;
+				}
+				context.Shops.Add(newShop);
+				context.SaveChanges();
+				return newShop.GetViewModel;
+		
+		}
+
+		public ShopViewModel? Update(ShopBindingModel model)
+		{
+            using var context = new MotorPlantDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var shop = context.Shops.FirstOrDefault(x => x.Id == model.Id);
+                if (shop == null)
+                {
+                    return null;
+                }
+                shop.Update(model);
+                context.SaveChanges();
+                shop.UpdateEngines(context, model);
+                transaction.Commit();
+                return shop.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+        public bool RestockingShops(SupplyBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var transaction = context.Database.BeginTransaction();
+            var Shops = context.Shops.Include(x => x.Engines).ThenInclude(x => x.Engine).ToList().
+                Where(x => x.MaxCount > x.ShopEngines.Select(x => x.Value.Item2).Sum()).ToList();
+            if (model == null)
+            {
+                return false;
+            }
+            try
+            {
+                foreach (Shop shop in Shops)
+                {
+                    int difference = shop.MaxCount - shop.ShopEngines.Select(x => x.Value.Item2).Sum();
+                    int refill = Math.Min(difference, model.Count);
+                    model.Count -= refill;
+                    if (shop.ShopEngines.ContainsKey(model.EngineId))
+                    {
+                        var datePair = shop.ShopEngines[model.EngineId];
+                        datePair.Item2 += refill;
+                        shop.ShopEngines[model.EngineId] = datePair;
+                    }
+                    else
+                    {
+                        var Engine = context.Engines.First(x => x.Id == model.EngineId);
+                        shop.ShopEngines.Add(model.EngineId, (Engine, refill));
+                    }
+                    shop.EngineDictionatyUpdate(context);
+                    if (model.Count == 0)
+                    {
+                        transaction.Commit();
+                        return true;
+                    }
+                }
+                transaction.Rollback();
+                return false;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+        public bool SellEngines(SupplySearchModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var shops = context.Shops.Include(x => x.Engines).ThenInclude(x => x.Engine).ToList().
+                    Where(x => x.ShopEngines.ContainsKey(model.EngineId.Value)).OrderByDescending(x => x.ShopEngines[model.EngineId.Value].Item2).ToList();
+
+                foreach (var shop in shops)
+                {
+                    int residue = model.Count.Value - shop.ShopEngines[model.EngineId.Value].Item2;
+                    if (residue > 0)
+                    {
+                        shop.ShopEngines.Remove(model.EngineId.Value);
+                        shop.EnginesDictionatyUpdate(context);
+                        context.SaveChanges();
+                        model.Count = residue;
+
+                    }
+                    else
+                    {
+                        if (residue == 0)
+                            shop.ShopEngines.Remove(model.EngineId.Value);
+                        else
+                        {
+                            var dataPair = shop.ShopEngines[model.EngineId.Value];
+                            dataPair.Item2 = -residue;
+                            shop.ShopEngines[model.EngineId.Value] = dataPair;
+                        }
+
+                        shop.EnginesDictionatyUpdate(context);
+                        transaction.Commit();
+                        return true;
+                    }
+                }
+                transaction.Rollback();
+                return false;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+    }
+}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Models/Component.cs

@@ -1,10 +1,10 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.VeiwModels;
-using MotorPlantDataModels.Models;
-using System.ComponentModel.DataAnnotations;
+using MotorPlantDataModels.Models;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.VeiwModels;
 
-namespace MotorPlantDatabaseImplement.Models
+namespace MotorPlantDatabaseImplementt.Models
 {
     public class Component : IComponentModel
     {
@@ -21,7 +21,7 @@ namespace MotorPlantDatabaseImplement.Models
             {
                 return null;
             }
-            return new Component()
+            return new Component
             {
                 Id = model.Id,
                 ComponentName = model.ComponentName,

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Models/Engine.cs

@@ -1,10 +1,11 @@
-using MotorPlantDataModels.Models;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
+using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.VeiwModels;
-using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace MotorPlantDatabaseImplement.Models
+namespace MotorPlantDatabaseImplementt.Models
 {
     public class Engine : IEngineModel
     {
@@ -21,9 +22,7 @@ namespace MotorPlantDatabaseImplement.Models
             {
                 if (_engineComponents == null)
                 {
-                    _engineComponents = Components
-                    .ToDictionary(recPC => recPC.ComponentId, recPC =>
-                   (recPC.Component as IComponentModel, recPC.Count));
+                    _engineComponents = Components.ToDictionary(recDC => recDC.ComponentId, recDC => (recDC.Component as IComponentModel, recDC.Count));
                 }
                 return _engineComponents;
             }
@@ -32,6 +31,9 @@ namespace MotorPlantDatabaseImplement.Models
         public virtual List<EngineComponent> Components { get; set; } = new();
         [ForeignKey("EngineId")]
         public virtual List<Order> Orders { get; set; } = new();
+        [ForeignKey("EngineId")]
+        public virtual List<Order> ShopEngine { get; set; } = new();
+
         public static Engine Create(MotorPlantDatabase context, EngineBindingModel model)
         {
             return new Engine()
@@ -62,15 +64,12 @@ namespace MotorPlantDatabaseImplement.Models
         {
             var engineComponents = context.EngineComponents.Where(rec => rec.EngineId == model.Id).ToList();
             if (engineComponents != null && engineComponents.Count > 0)
-            { // удалили те, которых нет в модели
-                context.EngineComponents.RemoveRange(engineComponents.Where(rec
-               => !model.EngineComponents.ContainsKey(rec.ComponentId)));
+            {
+                context.EngineComponents.RemoveRange(engineComponents.Where(rec => !model.EngineComponents.ContainsKey(rec.ComponentId)));
                 context.SaveChanges();
-                // обновили количество у существующих записей
                 foreach (var updateComponent in engineComponents)
                 {
-                    updateComponent.Count =
-                   model.EngineComponents[updateComponent.ComponentId].Item2;
+                    updateComponent.Count = model.EngineComponents[updateComponent.ComponentId].Item2;
                     model.EngineComponents.Remove(updateComponent.ComponentId);
                 }
                 context.SaveChanges();

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Models/EngineComponent.cs

@@ -1,17 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MotorPlantDatabaseImplement.Models
+namespace MotorPlantDatabaseImplementt.Models
 {
     public class EngineComponent
     {
         public int Id { get; set; }
+
         [Required]
         public int EngineId { get; set; }
+
         [Required]
         public int ComponentId { get; set; }
+
         [Required]
         public int Count { get; set; }
+
         public virtual Component Component { get; set; } = new();
+
         public virtual Engine Engine { get; set; } = new();
     }
-}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Models/Order.cs

@@ -1,55 +1,49 @@
 using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Enums;
 using MotorPlantDataModels.Models;
 using System.ComponentModel.DataAnnotations;
 
-namespace MotorPlantDatabaseImplement.Models
+namespace MotorPlantDatabaseImplementt.Models
 {
     public class Order : IOrderModel
     {
         public int Id { get; private set; }
-        [Required]
-        public int Count { get; private set; }
-        [Required]
-        public double Sum { get; private set; }
-        [Required]
-        public OrderStatus Status { get; private set; }
-        [Required]
-        public DateTime DateCreate { get; private set; }
-        public DateTime? DateImplement { get; private set; }
+
         [Required]
         public int EngineId { get; private set; }
-        public virtual Engine Engine { get; private set; }
+
         [Required]
-        public int ClientId { get; private set; }
-        public virtual Client Client { get; private set; }
-        public int? ImplementerId { get; private set; } = null;
-        public virtual Implementer? Implementer { get; private set; }
-        public static Order? Create(MotorPlantDatabase context, OrderBindingModel model)
+        public int Count { get; private set; }
+        public virtual Engine Engine { get; private set; } = new();
+
+        [Required]
+        public double Sum { get; private set; }
+
+        [Required]
+        public OrderStatus Status { get; private set; }
+
+        [Required]
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+
+        public DateTime? DateImplement { get; private set; }
+
+        public static Order? Create(OrderBindingModel? model)
         {
-            if (model == null)
-            {
-                return null;
-            }
             return new Order()
             {
                 Id = model.Id,
+                EngineId = model.EngineId,
+                Engine = context.Engine.First(x=> x.Id == model.EngineId),
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
-                EngineId = model.EngineId,
-                Engine = context.Engines.FirstOrDefault(x => x.Id == model.EngineId),
-                ClientId = model.ClientId,
-                Client = context.Clients.FirstOrDefault(x => x.Id == model.ClientId),
-                ImplementerId = model.ImplementerId,
-                Implementer = (model.ImplementerId.HasValue ? context.Implementers.FirstOrDefault(x => x.Id == model.ImplementerId)
-                : null),
             };
         }
-        public void Update(OrderBindingModel? model)
+
+        public void Update(OrderBindingModel model)
         {
             if (model == null)
             {
@@ -57,22 +51,18 @@ namespace MotorPlantDatabaseImplement.Models
             }
             Status = model.Status;
             DateImplement = model.DateImplement;
-            ImplementerId = model.ImplementerId;
         }
+
         public OrderViewModel GetViewModel => new()
         {
+            Id = Id,
             EngineId = EngineId,
-            ClientId = ClientId,
-            ImplementerId = ImplementerId,
+            EngineName = Engine.EngineName,
             Count = Count,
             Sum = Sum,
             Status = Status,
             DateCreate = DateCreate,
             DateImplement = DateImplement,
-            Id = Id,
-            EngineName = Engine.EngineName,
-            ClientFIO = Client.ClientFIO,
-            ImplementerFIO = (Implementer != null ? Implementer.ImplementerFIO : string.Empty)
         };
     }
-}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Models/Shop.cs

@@ -0,0 +1,110 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantDatabaseImplementt.Models
+{
+	public class Shop : IShopModel
+	{
+		public int Id { get; private set; }
+		[Required]
+		public string ShopName { get; private set; }
+		[Required]
+		public string Adress { get; private set; }
+		[Required]
+		public DateTime DateOpen { get; private set; }
+		[Required]
+		public int MaxCount { get; private set; }
+		private Dictionary<int, (IEngineModel, int)>? _shopEngines = null;
+		[NotMapped]
+		public Dictionary<int, (IEngineModel, int)>? ShopEngines
+		{
+			get
+			{
+				if (_shopEngines == null)
+				{
+					_shopEngines = Engines.ToDictionary(x => x.EngineId, x => (x.Engine as IEngineModel, x.Count));
+				}
+				return _shopEngines;
+			}
+		}
+		[ForeignKey("ShopId")]
+		public virtual List<ShopEngine> Engines { get; set; } = new();
+		public static Shop? Create(MotorPlantDatabase context, ShopBindingModel model)
+		{
+			if (model == null)
+				return null;
+			return new Shop()
+			{
+				Id = model.Id,
+				ShopName = model.ShopName,
+				Adress = model.Adress,
+				DateOpen = model.DateOpen,
+				MaxCount = model.MaxCount,
+				Engines = model.ShopEngines.Select(x => new ShopEngine
+				{
+					Engine = context.Engines.First(y => y.Id == x.Key),
+					Count = x.Value.Item2
+				}).ToList()
+			};
+		}
+		public void Update(ShopBindingModel? model)
+		{
+			if (model == null)
+				return;
+			ShopName = model.ShopName;
+			Adress = model.Adress;
+			DateOpen = model.DateOpen;
+			MaxCount = model.MaxCount;
+		}
+		public ShopViewModel GetViewModel => new()
+		{
+			Id = Id,
+			ShopName = ShopName,
+			Adress = Adress,
+			DateOpen = DateOpen,
+			MaxCount = MaxCount,
+			ShopEngines = ShopEngines
+		};
+
+		public void UpdateDresses(MotorPlantDatabase context, ShopBindingModel model)
+		{
+			var shopEngines = context.ShopEngines.Where(rec => rec.ShopId == model.Id).ToList();
+			if (shopEngines != null && shopEngines.Count > 0)
+			{
+				context.ShopEngines.RemoveRange(shopEngines.Where(rec => !model.ShopEngines.ContainsKey(rec.EngineId)));
+				context.SaveChanges();
+				foreach (var uEngine in shopEngines)
+				{
+					uEngine.Count = model.ShopEngines[uEngine.EngineId].Item2;
+					model.ShopEngines.Remove(uEngine.EngineId);
+				}
+				context.SaveChanges();
+			}
+			var shop = context.Shops.First(x => x.Id == Id);
+			foreach (var pc in model.ShopEngines)
+			{
+				context.ShopEngines.Add(new ShopEngine
+				{
+					Shop = shop,
+					Engine = context.Engines.First(x => x.Id == pc.Key),
+					Count = pc.Value.Item2
+				});
+				context.SaveChanges();
+			}
+			_shopEngines = null;
+		}
+
+        internal void EnginesDictionatyUpdate(MotorPlantDatabase context)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/Models/ShopEngine.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantDatabaseImplementt.Models
+{
+	public class ShopEngine
+	{
+		public int Id { get; set; }
+		[Required]
+		public int EngineId { get; set; }
+		[Required]
+		public int ShopId { get; set; }
+		[Required]
+		public int Count { get; set; }
+		public virtual Shop Shop { get; set; } = new();
+		public virtual Engine Engine { get; set; } = new();
+	}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/MotorPlantDatabase.cs

@@ -0,0 +1,23 @@
+using MotorPlantDatabaseImplementt.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace MotorPlantDatabaseImplementt
+{
+    public class MotorPlantDatabase : DbContext
+    {
+		protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+		{
+			if (optionsBuilder.IsConfigured == false)
+			{
+				object value = optionsBuilder.UseSqlServer(@"Data Source=WIN-QKNE49D1RUQ\SQLEXPRESS;Initial Catalog=MotorPlantDatabaseHaard3;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+			}
+			base.OnConfiguring(optionsBuilder);
+		}
+		public virtual DbSet<Component> Components { get; set; }
+        public virtual DbSet<Engine> Engines { get; set; }
+        public virtual DbSet<EngineComponent> EngineComponents { get; set; }
+        public virtual DbSet<Order> Orders { get; set; }
+		public virtual DbSet<Shop> Shops { get; set; }
+		public virtual DbSet<ShopEngine> ShopEngines { get; set; }
+	}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantDatabaseImplementt/MotorPlantDatabaseImplementt.csproj

@@ -1,15 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <InvariantGlobalization>true</InvariantGlobalization>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
   </ItemGroup>
 
   <ItemGroup>

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/Component.cs

@@ -1,7 +1,8 @@
 using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Models;
 using System.Xml.Linq;
+
 namespace MotorPlantFileImplement.Models
 {
     public class Component : IComponentModel

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/ComponentStorage.cs

@@ -1,7 +1,7 @@
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.ViewModels;
 using MotorPlantFileImplement.Models;
 
 namespace MotorPlantFileImplement.Implements
@@ -31,10 +31,8 @@ namespace MotorPlantFileImplement.Implements
             {
                 return null;
             }
-            return source.Components.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
+            return source.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) ||
+            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
         public ComponentViewModel? Insert(ComponentBindingModel model)
         {
@@ -71,4 +69,4 @@ namespace MotorPlantFileImplement.Implements
             return null;
         }
     }
-}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/DataFileSingleton.cs

@@ -1,5 +1,4 @@
 using MotorPlantFileImplement.Models;
-using System.Diagnostics;
 using System.Xml.Linq;
 
 namespace MotorPlantFileImplement
@@ -10,13 +9,11 @@ namespace MotorPlantFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string EngineFileName = "Engine.xml";
-        private readonly string ClientFileName = "Client.xml";
-        private readonly string ImplementerFileName = "Implementer.xml";
+        private readonly string ShopFileName = "Shop.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Engine> Engines { get; private set; }
-        public List<Client> Clients { get; private set; }
-        public List<Implementer> Implementers { get; private set; }
+        public List<Shop> Shops { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -28,19 +25,13 @@ namespace MotorPlantFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SaveEngines() => SaveData(Engines, EngineFileName, "Engines", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        public void SaveClients() => SaveData(Clients, ClientFileName,
-"Clients", x => x.GetXElement);
-        public void SaveImplementers() => SaveData(Implementers, ImplementerFileName,
-"Implementers", x => x.GetXElement);
+        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Engines = LoadData(EngineFileName, "Engine", x => Engine.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-            Clients = LoadData(ClientFileName, "Client", x =>
-           Client.Create(x)!)!;
-            Implementers = LoadData(ImplementerFileName, "Implementer", x =>
-Implementer.Create(x)!)!;
+            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/Engine.cs

@@ -1,7 +1,8 @@
-using MotorPlantDataModels.Models;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
 using System.Xml.Linq;
+
 namespace MotorPlantFileImplement.Models
 {
     public class Engine : IEngineModel
@@ -18,7 +19,9 @@ namespace MotorPlantFileImplement.Models
                 if (_EngineComponents == null)
                 {
                     var source = DataFileSingleton.GetInstance();
-                    _EngineComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
+                    _EngineComponents = Components.ToDictionary(x => x.Key, y =>
+                    ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
+                    y.Value));
                 }
                 return _EngineComponents;
             }
@@ -34,7 +37,8 @@ namespace MotorPlantFileImplement.Models
                 Id = model.Id,
                 EngineName = model.EngineName,
                 Price = model.Price,
-                Components = model.EngineComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+                Components = model.EngineComponents.ToDictionary(x => x.Key, x
+               => x.Value.Item2)
             };
         }
         public static Engine? Create(XElement element)
@@ -48,8 +52,11 @@ namespace MotorPlantFileImplement.Models
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 EngineName = element.Element("EngineName")!.Value,
                 Price = Convert.ToDouble(element.Element("Price")!.Value),
-                Components = element.Element("EngineComponents")!.Elements("EngineComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                x => Convert.ToInt32(x.Element("Value")?.Value))
+                Components =
+           element.Element("EngineComponents")!.Elements("EngineComponent")
+            .ToDictionary(x =>
+           Convert.ToInt32(x.Element("Key")?.Value), x =>
+           Convert.ToInt32(x.Element("Value")?.Value))
             };
         }
         public void Update(EngineBindingModel model)
@@ -60,7 +67,8 @@ namespace MotorPlantFileImplement.Models
             }
             EngineName = model.EngineName;
             Price = model.Price;
-            Components = model.EngineComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
+            Components = model.EngineComponents.ToDictionary(x => x.Key, x =>
+           x.Value.Item2);
             _EngineComponents = null;
         }
         public EngineViewModel GetViewModel => new()
@@ -71,10 +79,11 @@ namespace MotorPlantFileImplement.Models
             EngineComponents = EngineComponents
         };
         public XElement GetXElement => new("Engine",
-                new XAttribute("Id", Id),
-                new XElement("EngineName", EngineName),
-                new XElement("Price", Price.ToString()),
-                new XElement("EngineComponents", Components.Select(
-                    x => new XElement("EngineComponent", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()));
+            new XAttribute("Id", Id),
+            new XElement("EngineName", EngineName),
+            new XElement("Price", Price.ToString()),
+            new XElement("EngineComponents", Components.Select(x => new XElement("EngineComponent", new XElement("Key", x.Key), new XElement("Value", x.Value)))
+
+       .ToArray()));
     }
-}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/EngineStorage.cs

@@ -1,8 +1,9 @@
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.ViewModels;
 using MotorPlantFileImplement.Models;
+
 namespace MotorPlantFileImplement.Implements
 {
     public class EngineStorage : IEngineStorage
@@ -12,9 +13,13 @@ namespace MotorPlantFileImplement.Implements
         {
             source = DataFileSingleton.GetInstance();
         }
-        public List<EngineViewModel> GetFullList()
+        public EngineViewModel? GetElement(EngineSearchModel model)
         {
-            return source.Engines.Select(x => x.GetViewModel).ToList();
+            if (string.IsNullOrEmpty(model.EngineName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Engines.FirstOrDefault(x => (!string.IsNullOrEmpty(model.EngineName) && x.EngineName == model.EngineName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
         public List<EngineViewModel> GetFilteredList(EngineSearchModel model)
         {
@@ -24,47 +29,43 @@ namespace MotorPlantFileImplement.Implements
             }
             return source.Engines.Where(x => x.EngineName.Contains(model.EngineName)).Select(x => x.GetViewModel).ToList();
         }
-        public EngineViewModel? GetElement(EngineSearchModel model)
+        public List<EngineViewModel> GetFullList()
         {
-            if (string.IsNullOrEmpty(model.EngineName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Engines.FirstOrDefault(x => (!string.IsNullOrEmpty(model.EngineName) && x.EngineName == model.EngineName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+            return source.Engines.Select(x => x.GetViewModel).ToList();
         }
         public EngineViewModel? Insert(EngineBindingModel model)
         {
             model.Id = source.Engines.Count > 0 ? source.Engines.Max(x => x.Id) + 1 : 1;
-            var newPizza = Engine.Create(model);
-            if (newPizza == null)
+            var newDoc = Engine.Create(model);
+            if (newDoc == null)
             {
                 return null;
             }
-            source.Engines.Add(newPizza);
+            source.Engines.Add(newDoc);
             source.SaveEngines();
-            return newPizza.GetViewModel;
+            return newDoc.GetViewModel;
         }
         public EngineViewModel? Update(EngineBindingModel model)
         {
-            var Pizza = source.Engines.FirstOrDefault(x => x.Id == model.Id);
-            if (Pizza == null)
+            var document = source.Engines.FirstOrDefault(x => x.Id == model.Id);
+            if (document == null)
             {
                 return null;
             }
-            Pizza.Update(model);
+            document.Update(model);
             source.SaveEngines();
-            return Pizza.GetViewModel;
+            return document.GetViewModel;
         }
         public EngineViewModel? Delete(EngineBindingModel model)
         {
-            var Pizza = source.Engines.FirstOrDefault(x => x.Id == model.Id);
-            if (Pizza != null)
+            var document = source.Engines.FirstOrDefault(x => x.Id == model.Id);
+            if (document == null)
             {
-                source.Engines.Remove(Pizza);
-                source.SaveEngines();
-                return Pizza.GetViewModel;
+                return null;
             }
-            return null;
+            document.Update(model);
+            source.SaveEngines();
+            return document.GetViewModel;
         }
     }
-}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/MotorPlantFileImplement.csproj

@@ -6,9 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
-    <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
-  </ItemGroup>
-
 </Project>

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/Order.cs

@@ -1,5 +1,4 @@
 using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.VeiwModels;
 using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Enums;
 using MotorPlantDataModels.Models;
@@ -10,12 +9,10 @@ namespace MotorPlantFileImplement.Models
     public class Order : IOrderModel
     {
         public int EngineId { get; private set; }
-        public int ClientId { get; private set; }
-        public int? ImplementerId { get; private set; } = null;
         public int Count { get; private set; }
         public double Sum { get; private set; }
-        public OrderStatus Status { get; private set; }
-        public DateTime DateCreate { get; private set; }
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
         public DateTime? DateImplement { get; private set; }
         public int Id { get; private set; }
         public static Order? Create(OrderBindingModel? model)
@@ -28,13 +25,11 @@ namespace MotorPlantFileImplement.Models
             {
                 Id = model.Id,
                 EngineId = model.EngineId,
-                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
                 DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-                ImplementerId = model.ImplementerId,
+                DateImplement = model.DateImplement
             };
         }
         public static Order? Create(XElement element)
@@ -43,18 +38,24 @@ namespace MotorPlantFileImplement.Models
             {
                 return null;
             }
-            return new Order()
+            var order = new Order()
             {
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 EngineId = Convert.ToInt32(element.Element("EngineId")!.Value),
-                ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
-                ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
-                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value.ToString()),
-                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value)
+                DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
             };
+            DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl);
+
+            order.DateImplement = dateImpl;
+
+            if (!Enum.TryParse(element.Element("Status")!.Value, out OrderStatus status))
+            {
+                return null;
+            }
+            order.Status = status;
+            return order;
         }
         public void Update(OrderBindingModel? model)
         {
@@ -69,8 +70,6 @@ namespace MotorPlantFileImplement.Models
         {
             Id = Id,
             EngineId = EngineId,
-            ClientId = ClientId,
-            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/OrderStorage.cs

@@ -1,13 +1,15 @@
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.ViewModels;
 using MotorPlantFileImplement.Models;
+
 namespace MotorPlantFileImplement.Implements
 {
     public class OrderStorage : IOrderStorage
     {
         private readonly DataFileSingleton source;
+
         public OrderStorage()
         {
             source = DataFileSingleton.GetInstance();
@@ -24,16 +26,9 @@ namespace MotorPlantFileImplement.Implements
         {
             if (!model.Id.HasValue)
             {
-                if (!model.Id.HasValue && !model.DateFrom.HasValue || !model.DateTo.HasValue)
-                {
-                    return new();
-                }
-                return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();
+                return new();
             }
-            return source.Orders
-                    .Where(x => x.Id == model.Id || (model.DateTo >= x.DateCreate && model.DateFrom <= x.DateCreate))
-                    .Select(x => GetViewModel(x))
-                    .ToList();
+            return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();
         }
         public List<OrderViewModel> GetFullList()
         {
@@ -81,4 +76,4 @@ namespace MotorPlantFileImplement.Implements
             return viewModel;
         }
     }
-}
+}

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/Shop.cs

@@ -0,0 +1,103 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace MotorPlantFileImplement.Models
+{
+    public class Shop : IShopModel
+    {
+        public int Id { get; private set; }
+        public string ShopName { get; private set; } = string.Empty;
+        public string Adress { get; private set; } = string.Empty;
+        public DateTime OpeningDate { get; private set; }
+        public Dictionary<int, int> Engines { get; private set; } = new();
+        private Dictionary<int, (IEngineModel, int)>? _shopEngines = null;
+        public Dictionary<int, (IEngineModel, int)> ShopEngines
+        {
+            get
+            {
+                if (_shopEngines == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _shopEngines = Engines.ToDictionary(x => x.Key, y => ((source.Engines.FirstOrDefault(z => z.Id == y.Key) as IEngineModel)!, y.Value));
+                }
+                return _shopEngines;
+            }
+        }
+        public int MaxCount { get; private set; }
+        public static Shop? Create(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Adress = model.Adress,
+                OpeningDate = model.OpeningDate,
+                Engines = model.ShopEngines.ToDictionary(x => x.Key, x => x.Value.Item2),
+                MaxCount = model.MaxCount
+            };
+        }
+        public static Shop? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ShopName = element.Element("ShopName")!.Value,
+                Adress = element.Element("Adress")!.Value,
+                OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
+                Engines = element.Element("ShopEngines")!.Elements("ShopEngine")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
+                x => Convert.ToInt32(x.Element("Value")?.Value)),
+                MaxCount = Convert.ToInt32(element.Element("MaxCount")!.Value)
+            };
+        }
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Adress = model.Adress;
+            OpeningDate = model.OpeningDate;
+            MaxCount = model.MaxCount;
+            Engines = model.ShopEngines.ToDictionary(x => x.Key, x => x.Value.Item2);
+            _shopEngines = null;
+        }
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Adress = Adress,
+            OpeningDate = OpeningDate,
+            ShopEngines = ShopEngines,
+            MaxCount = MaxCount
+        };
+        public XElement GetXElement => new("Shop",
+            new XAttribute("Id", Id),
+            new XElement("ShopName", ShopName),
+            new XElement("Adress", Adress),
+            new XElement("OpeningDate", OpeningDate.ToString()),
+            new XElement("ShopEngines", Engines.Select(
+                x => new XElement("ShopEngine", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
+            new XElement("MaxCount", MaxCount.ToString())
+            );
+        public void EnginesUpdate()
+        {
+            _shopEngines = null;
+        }
+    }
+}

Aparyan.ISE_22.MotorPlant/MotorPlantFileImplement/ShopStorage.cs

@@ -0,0 +1,145 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantFileImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        private readonly DataFileSingleton source;
+        public ShopStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ShopViewModel> GetFullList()
+        {
+            return source.Shops.Select(x => x.GetViewModel).ToList();
+        }
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return new();
+            }
+            return source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
+        }
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Shops.FirstOrDefault(x =>
+            (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
+            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public ShopViewModel? Insert(ShopBindingModel model)
+        {
+            model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
+            var newShop = Shop.Create(model);
+            if (newShop == null)
+            {
+                return null;
+            }
+            source.Shops.Add(newShop);
+            source.SaveShops();
+            return newShop.GetViewModel;
+        }
+        public ShopViewModel? Update(ShopBindingModel model)
+        {
+            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+            if (shop == null)
+            {
+                return null;
+            }
+            shop.Update(model);
+            source.SaveShops();
+            return shop.GetViewModel;
+        }
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+            if (shop != null)
+            {
+                source.Shops.Remove(shop);
+                source.SaveShops();
+                return shop.GetViewModel;
+            }
+            return null;
+        }
+        public bool Sale(SupplySearchModel model)
+        {
+            if (model == null || !model.EngineId.HasValue || !model.Count.HasValue)
+                return false;
+            int remainingSpace = source.Shops.Select(x => x.Engines.ContainsKey(model.EngineId.Value) ? x.Engines[model.EngineId.Value] : 0).Sum();
+            if (remainingSpace < model.Count)
+            {
+                return false;
+            }
+            var shops = source.Shops.Where(x => x.Engines.ContainsKey(model.EngineId.Value)).OrderByDescending(x => x.Engines[model.EngineId.Value]).ToList();
+            foreach (var shop in shops)
+            {
+                int residue = model.Count.Value - shop.Engines[model.EngineId.Value];
+                if (residue > 0)
+                {
+                    shop.Engines.Remove(model.EngineId.Value);
+                    shop.EnginesUpdate();
+                    model.Count = residue;
+                }
+                else
+                {
+                    if (residue == 0)
+                    {
+                        shop.Engines.Remove(model.EngineId.Value);
+                    }
+                    else
+                    {
+                        shop.Engines[model.EngineId.Value] = -residue;
+                    }
+                    shop.EnginesUpdate();
+                    source.SaveShops();
+                    return true;
+                }
+            }
+            source.SaveShops();
+            return false;
+        }
+        public bool RestockingShops(SupplyBindingModel model)
+        {
+            if (model == null || source.Shops.Select(x => x.MaxCount - x.ShopEngines.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
+            {
+                return false;
+            }
+            foreach (Shop shop in source.Shops)
+            {
+                int free_places = shop.MaxCount - shop.ShopEngines.Select(x => x.Value.Item2).Sum();
+                if (free_places <= 0)
+                    continue;
+                free_places = Math.Min(free_places, model.Count);
+                model.Count -= free_places;
+                if (shop.Engines.ContainsKey(model.EngineId))
+                {
+                    shop.Engines[model.EngineId] += free_places;
+                }
+                else
+                {
+                    shop.Engines.Add(model.EngineId, free_places);
+                }
+                shop.EnginesUpdate();
+                if (model.Count == 0)
+                {
+                    source.SaveShops();
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/Controllers/ClientController.cs

@@ -1,64 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.ViewModels;
-using Microsoft.AspNetCore.Mvc;
-namespace MotorPlantRestApi.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class ClientController : Controller
-    {
-        private readonly ILogger _logger;
-        private readonly IClientLogic _logic;
-        public ClientController(IClientLogic logic, ILogger<ClientController>
-       logger)
-        {
-            _logger = logger;
-            _logic = logic;
-        }
-        [HttpGet]
-        public ClientViewModel? Login(string login, string password)
-        {
-            try
-            {
-                return _logic.ReadElement(new ClientSearchModel
-                {
-                    Email = login,
-                    Password = password
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
-        [HttpPost]
-        public void Register(ClientBindingModel model)
-        {
-            try
-            {
-                _logic.Create(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка регистрации");
-                throw;
-            }
-        }
-        [HttpPost]
-        public void UpdateData(ClientBindingModel model)
-        {
-            try
-            {
-                _logic.Update(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка обновления данных");
-                throw;
-            }
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/Controllers/MainController.cs

@@ -1,85 +0,0 @@
-using DocumentFormat.OpenXml.Office2010.Excel;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using Microsoft.AspNetCore.Mvc;
-using MotorPlantContracts.VeiwModels;
-
-namespace MotorPlantRestApi.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class MainController : Controller
-    {
-        private readonly ILogger _logger;
-        private readonly IOrderLogic _order;
-        private readonly IEngineLogic _Engine;
-        public MainController(ILogger<MainController> logger, IOrderLogic order,
-       IEngineLogic Engine)
-        {
-            _logger = logger;
-            _order = order;
-            _Engine = Engine;
-        }
-        [HttpGet]
-        public List<EngineViewModel>? GetEngineList()
-        {
-            try
-            {
-                return _Engine.ReadList(null);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения списка мороженного");
-                throw;
-            }
-        }
-        [HttpGet]
-        public EngineViewModel? GetEngine(int EngineId)
-        {
-            try
-            {
-                return _Engine.ReadElement(new EngineSearchModel
-                {
-                    Id =
-			   EngineId
-				});
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения продукта по id={Id}",
-			   EngineId);
-                throw;
-            }
-        }
-        [HttpGet]
-        public List<OrderViewModel>? GetOrders(int clientId)
-        {
-            try
-            {
-                return _order.ReadList(new OrderSearchModel
-                {
-                    ClientId = clientId
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения списка заказов клиента id ={ Id}", clientId);
-            throw;
-            }
-        }
-        [HttpPost]
-        public void CreateOrder(OrderBindingModel model)
-        {
-            try
-            {
-                _order.CreateOrder(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания заказа");
-                throw;
-            }
-        }
-    }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/MotorPlantRestApi.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <InvariantGlobalization>true</InvariantGlobalization>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.17" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\MotorPlantBusinessLogic\MotorPlantBusinessLogic.csproj" />
-    <ProjectReference Include="..\MotorPlantDatabaseImplement\MotorPlantDatabaseImplement.csproj" />
-  </ItemGroup>
-
-</Project>

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/MotorPlantRestApi.http

@@ -1,6 +0,0 @@
-@MotorPlantRestApi_HostAddress = http://localhost:5167
-
-GET {{MotorPlantRestApi_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/Program.cs

@@ -1,43 +0,0 @@
-using MotorPlantBusinessLogic.BusinessLogic;
-using MotorPlantBusinessLogic.BusinessLogics;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantDatabaseImplement.Implements;
-using Microsoft.OpenApi.Models;
-
-var builder = WebApplication.CreateBuilder(args);
-builder.Logging.SetMinimumLevel(LogLevel.Trace);
-builder.Logging.AddLog4Net("log4net.config");
-// Add services to the container.
-builder.Services.AddTransient<IClientStorage, ClientStorage>();
-builder.Services.AddTransient<IOrderStorage, OrderStorage>();
-builder.Services.AddTransient<IEngineStorage, EngineStorage>();
-
-builder.Services.AddTransient<IOrderLogic, OrderLogic>();
-builder.Services.AddTransient<IClientLogic, ClientLogic>();
-builder.Services.AddTransient<IEngineLogic, EngineLogic>();
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at
-https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen(c =>
-{
-    c.SwaggerDoc("v1", new OpenApiInfo
-    {
-        Title = "EngineCompanyRestApi",
-        Version
-    = "v1"
-    });
-});
-var app = builder.Build();
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json",
-   "EngineCompanyRestApi v1"));
-}
-app.UseHttpsRedirection();
-app.UseAuthorization();
-app.MapControllers();
-app.Run();

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:59420",
-      "sslPort": 44364
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5167",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7267;http://localhost:5167",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

Aparyan.ISE_22.MotorPlant/MotorPlantRestApi/log4net.config

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<log4net>
-	<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
-		<file value="c:/temp/MotorPlantRestApi.log" />
-		<appendToFile value="true" />
-		<maximumFileSize value="100KB" />
-		<maxSizeRollBackups value="2" />
-		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%date %5level %logger.%method [%line] - MESSAGE: %message%newline %exception" />
-		</layout>
-	</appender>
-	<root>
-		<level value="TRACE" />
-		<appender-ref ref="RollingFile" />
-	</root>
-</log4net>

MoorPlantListImplement/DataListSingleton.cs

@@ -1,27 +1,28 @@
 using MotorPlantListImplement.Models;
+
 namespace MotorPlantListImplement
 {
-    public class DataListSingleton
-    {
-        private static DataListSingleton? _instance;
-        public List<Component> Components { get; set; }
-        public List<Order> Orders { get; set; }
-        public List<Engine> Engines { get; set; }
-        public List<Client> Clients { get; set; }
-
-        private DataListSingleton()
-        {
-            Components = new List<Component>();
-            Orders = new List<Order>();
-            Engines = new List<Engine>();
-        }
-        public static DataListSingleton GetInstance()
-        {
-            if (_instance == null)
-            {
-                _instance = new DataListSingleton();
-            }
-            return _instance;
-        }
-    }
+	public class DataListSingleton
+	{
+		private static DataListSingleton? _instance;
+		public List<Component> Components { get; set; }
+		public List<Order> Orders { get; set; }
+		public List<Engine> Engines { get; set; }
+		public List<Shop> Shops { get; set; }
+		private DataListSingleton()
+		{
+			Components = new List<Component>();
+			Orders = new List<Order>();
+			Engines = new List<Engine>();
+			Shops = new List<Shop>();
+		}
+		public static DataListSingleton GetInstance()
+		{
+			if (_instance == null)
+			{
+				_instance = new DataListSingleton();
+			}
+			return _instance;
+		}
+	}
 }

MoorPlantListImplement/Implements/ClientStorage.cs

@@ -1,99 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantListImplement.Models;
-
-namespace MotorPlantListImplement.Implements
-{
-    public class ClientStorage : IClientStorage
-    {
-        private readonly DataListSingleton _source;
-        public ClientStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<ClientViewModel> GetFullList()
-        {
-            var result = new List<ClientViewModel>();
-            foreach (var client in _source.Clients)
-            {
-                result.Add(client.GetViewModel);
-            }
-            return result;
-        }
-        public List<ClientViewModel> GetFilteredList(ClientSearchModel
-       model)
-        {
-            var result = new List<ClientViewModel>();
-            if (string.IsNullOrEmpty(model.ClientFIO) && string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password))
-            {
-                return result;
-            }
-            foreach (var client in _source.Clients)
-            {
-                if (client.ClientFIO.Contains(model.ClientFIO))
-                {
-                    result.Add(client.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public ClientViewModel? GetElement(ClientSearchModel model)
-        {
-            foreach (var client in _source.Clients)
-            {
-                if ((string.IsNullOrEmpty(model.ClientFIO) || client.ClientFIO == model.ClientFIO) &&
-                                 (!model.Id.HasValue || client.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || client.Email == model.Email) &&
-                                 (string.IsNullOrEmpty(model.Password) || client.Password == model.Password))
-                {
-                    return client.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ClientViewModel? Insert(ClientBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var client in _source.Clients)
-            {
-                if (model.Id <= client.Id)
-                {
-                    model.Id = client.Id + 1;
-                }
-            }
-            var newClient = Client.Create(model);
-            if (newClient == null)
-            {
-                return null;
-            }
-            _source.Clients.Add(newClient);
-            return newClient.GetViewModel;
-        }
-        public ClientViewModel? Update(ClientBindingModel model)
-        {
-            foreach (var client in _source.Clients)
-            {
-                if (client.Id == model.Id)
-                {
-                    client.Update(model);
-                    return client.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ClientViewModel? Delete(ClientBindingModel model)
-        {
-            for (int i = 0; i < _source.Clients.Count; ++i)
-            {
-                if (_source.Clients[i].Id == model.Id)
-                {
-                    var element = _source.Clients[i];
-                    _source.Clients.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

MoorPlantListImplement/Implements/ImplementerStorage.cs

@@ -1,103 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantListImplement.Implements
-{
-    public class ImplementerStorage : IImplementerStorage
-    {
-        private readonly DataListSingleton _source;
-        public ImplementerStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<ImplementerViewModel> GetFullList()
-        {
-            var result = new List<ImplementerViewModel>();
-            foreach (var implementer in _source.Implementers)
-            {
-                result.Add(implementer.GetViewModel);
-            }
-            return result;
-        }
-        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel
-       model)
-        {
-            var result = new List<ImplementerViewModel>();
-            if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password))
-            {
-                return result;
-            }
-            foreach (var implementer in _source.Implementers)
-            {
-                if (implementer.ImplementerFIO.Contains(model.ImplementerFIO))
-                {
-                    result.Add(implementer.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-        {
-            foreach (var implementer in _source.Implementers)
-            {
-                if ((string.IsNullOrEmpty(model.ImplementerFIO) || implementer.ImplementerFIO == model.ImplementerFIO) &&
-                                 (!model.Id.HasValue || implementer.Id == model.Id) && (string.IsNullOrEmpty(model.Password) || implementer.Password == model.Password))
-                {
-                    return implementer.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ImplementerViewModel? Insert(ImplementerBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var implementer in _source.Implementers)
-            {
-                if (model.Id <= implementer.Id)
-                {
-                    model.Id = implementer.Id + 1;
-                }
-            }
-            var newImplementer = Implementer.Create(model);
-            if (newImplementer == null)
-            {
-                return null;
-            }
-            _source.Implementers.Add(newImplementer);
-            return newImplementer.GetViewModel;
-        }
-        public ImplementerViewModel? Update(ImplementerBindingModel model)
-        {
-            foreach (var implementer in _source.Implementers)
-            {
-                if (model.Id == implementer.Id)
-                {
-                    implementer.Update(model);
-                    return implementer.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ImplementerViewModel? Delete(ImplementerBindingModel model)
-        {
-            for (int i = 0; i < _source.Implementers.Count; ++i)
-            {
-                if (_source.Implementers[i].Id == model.Id)
-                {
-                    var element = _source.Implementers[i];
-                    _source.Implementers.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

MoorPlantListImplement/Implements/OrderStorage.cs

@@ -1,118 +1,112 @@
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
 using MotorPlantListImplement.Models;
-using MotorPlantContracts.VeiwModels;
+
 namespace MotorPlantListImplement.Implements
 {
-    public class OrderStorage : IOrderStorage
-    {
-        private readonly DataListSingleton _source;
-        public OrderStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            for (int i = 0; i < _source.Orders.Count; ++i)
-            {
-                if (_source.Orders[i].Id == model.Id)
-                {
-                    var element = _source.Orders[i];
-                    _source.Orders.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var order in _source.Orders)
-            {
-                if (model.Id.HasValue && order.Id == model.Id)
-                {
-                    return order.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            var result = new List<OrderViewModel>();
-            if (model == null || !model.Id.HasValue)
-            {
-                return result;
-            }
-            if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
-            {
-                return result;
-            }
-            foreach (var order in _source.Orders)
-            {
-                if (order.Id == model.Id || (model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo))
-                {
-                    result.Add(AttachEngineName(order.GetViewModel));
-                }
-            }
-            return result;
-        }
-        private OrderViewModel AttachEngineName(OrderViewModel model)
-        {
-            foreach (var Engine in _source.Engines)
-            {
-                if (Engine.Id == model.EngineId)
-                {
-                    model.EngineName = Engine.EngineName;
-                    return model;
-                }
-            }
-            return model;
-        }
-        public List<OrderViewModel> GetFullList()
-        {
-            var result = new List<OrderViewModel>();
-
-            foreach (var order in _source.Orders)
-            {
-                result.Add(order.GetViewModel);
-            }
-            return result;
-        }
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            model.Id = 1;
-
-            foreach (var order in _source.Orders)
-            {
-                if (model.Id <= order.Id)
-                {
-                    model.Id = order.Id + 1;
-                }
-            }
-            var newOrder = Order.Create(model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-
-            _source.Orders.Add(newOrder);
-            return newOrder.GetViewModel;
-        }
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            foreach (var order in _source.Orders)
-            {
-                if (order.Id == model.Id)
-                {
-                    order.Update(model);
-                    return order.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
+	public class OrderStorage : IOrderStorage
+	{
+		private readonly DataListSingleton _source;
+		public OrderStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+		public List<OrderViewModel> GetFullList()
+		{
+			var result = new List<OrderViewModel>();
+			foreach (var order in _source.Orders)
+			{
+				result.Add(AttachEngineName(order.GetViewModel));
+			}
+			return result;
+		}
+		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+		{
+			var result = new List<OrderViewModel>();
+			if (model == null || !model.Id.HasValue)
+			{
+				return result;
+			}
+			foreach (var order in _source.Orders)
+			{
+				if (order.Id == model.Id)
+				{
+					result.Add(AttachEngineName(order.GetViewModel));
+				}
+			}
+			return result;
+		}
+		public OrderViewModel? GetElement(OrderSearchModel model)
+		{
+			if (!model.Id.HasValue)
+			{
+				return null;
+			}
+			foreach (var order in _source.Orders)
+			{
+				if (model.Id.HasValue && order.Id == model.Id)
+				{
+					return AttachEngineName(order.GetViewModel);
+				}
+			}
+			return null;
+		}
+		public OrderViewModel? Insert(OrderBindingModel model)
+		{
+			model.Id = 1;
+			foreach (var order in _source.Orders)
+			{
+				if (model.Id <= order.Id)
+				{
+					model.Id = order.Id + 1;
+				}
+			}
+			var newOrder = Order.Create(model);
+			if (newOrder == null)
+			{
+				return null;
+			}
+			_source.Orders.Add(newOrder);
+			return AttachEngineName(newOrder.GetViewModel);
+		}
+		public OrderViewModel? Update(OrderBindingModel model)
+		{
+			foreach (var order in _source.Orders)
+			{
+				if (order.Id == model.Id)
+				{
+					order.Update(model);
+					return AttachEngineName(order.GetViewModel);
+				}
+			}
+			return null;
+		}
+		public OrderViewModel? Delete(OrderBindingModel model)
+		{
+			for (int i = 0; i < _source.Orders.Count; ++i)
+			{
+				if (_source.Orders[i].Id == model.Id)
+				{
+					var element = _source.Orders[i];
+					_source.Orders.RemoveAt(i);
+					return AttachEngineName(element.GetViewModel);
+				}
+			}
+			return null;
+		}
+		private OrderViewModel AttachEngineName(OrderViewModel model)
+		{
+			foreach (var Engine in _source.Engines)
+			{
+				if (Engine.Id == model.EngineId)
+				{
+					model.EngineName = Engine.EngineName;
+					return model;
+				}
+			}
+			return model;
+		}
+	}
 }

MoorPlantListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,114 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantListImplement.Implements
+{
+	public class ShopStorage : IShopStorage
+	{
+		private readonly DataListSingleton _source;
+		public ShopStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+		public List<ShopViewModel> GetFullList()
+		{
+			var result = new List<ShopViewModel>();
+			foreach (var shop in _source.Shops)
+			{
+				result.Add(shop.GetViewModel);
+			}
+			return result;
+		}
+		public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+		{
+			var result = new List<ShopViewModel>();
+			if (string.IsNullOrEmpty(model.ShopName))
+			{
+				return result;
+			}
+			foreach (var shop in _source.Shops)
+			{
+				if (shop.ShopName.Contains(model.ShopName))
+				{
+					result.Add(shop.GetViewModel);
+				}
+			}
+			return result;
+		}
+		public ShopViewModel? GetElement(ShopSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+			{
+				return null;
+			}
+			foreach (var shop in _source.Shops)
+			{
+				if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) ||
+					(model.Id.HasValue && shop.Id == model.Id))
+				{
+					return shop.GetViewModel;
+				}
+			}
+			return null;
+		}
+		public ShopViewModel? Insert(ShopBindingModel model)
+		{
+			model.Id = 1;
+			foreach (var shop in _source.Shops)
+			{
+				if (model.Id <= shop.Id)
+				{
+					model.Id = shop.Id + 1;
+				}
+			}
+			var newShop = Shop.Create(model);
+			if (newShop == null)
+			{
+				return null;
+			}
+			_source.Shops.Add(newShop);
+			return newShop.GetViewModel;
+		}
+		public ShopViewModel? Update(ShopBindingModel model)
+		{
+			foreach (var shop in _source.Shops)
+			{
+				if (shop.Id == model.Id)
+				{
+					shop.Update(model);
+					return shop.GetViewModel;
+				}
+			}
+			return null;
+		}
+		public ShopViewModel? Delete(ShopBindingModel model)
+		{
+			for (int i = 0; i < _source.Shops.Count; ++i)
+			{
+				if (_source.Shops[i].Id == model.Id)
+				{
+					var element = _source.Shops[i];
+					_source.Shops.RemoveAt(i);
+					return element.GetViewModel;
+				}
+			}
+			return null;
+		}
+		public bool Sale(SupplySearchModel model)
+		{
+			throw new NotImplementedException();
+		}
+		public bool RestockingShops(SupplyBindingModel model)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

MoorPlantListImplement/Models/Client.cs

@@ -1,52 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantListImplement.Models
-{
-    public class Client : IClientModel
-    {
-        public int Id { get; private set; }
-        public string ClientFIO { get; private set; } = string.Empty;
-        public string Email { get; set; } = string.Empty;
-        public string Password { get; set; } = string.Empty;
-        public static Client? Create(ClientBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Client()
-            {
-                Id = model.Id,
-                ClientFIO = model.ClientFIO,
-                Email = model.Email,
-                Password = model.Password
-            };
-        }
-        public void Update(ClientBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ClientFIO = model.ClientFIO;
-            Email = model.Email;
-            Password = model.Password;
-        }
-        public ClientViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ClientFIO = ClientFIO,
-            Email = Email,
-            Password = Password
-        };
-    }
-}

MoorPlantListImplement/Models/Implementer.cs

@@ -1,54 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantListImplement.Models
-{
-    public class Implementer : IImplementerModel
-    {
-        public int Id { get; private set; }
-        public string ImplementerFIO { get; private set; } = string.Empty;
-        public string Password { get; set; } = string.Empty;
-        public int WorkExperience { get; set; } = 0;
-        public int Qualification { get; set; } = 0;
-        public static Implementer? Create(ImplementerBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Implementer()
-            {
-                Id = model.Id,
-                ImplementerFIO = model.ImplementerFIO,
-                Password = model.Password,
-                WorkExperience = model.WorkExperience,
-                Qualification = model.Qualification
-            };
-        }
-        public void Update(ImplementerBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ImplementerFIO = model.ImplementerFIO;
-            Password = model.Password;
-            WorkExperience = model.WorkExperience;
-            Qualification = model.Qualification;
-        }
-        public ImplementerViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ImplementerFIO = ImplementerFIO,
-            Password = Password,
-            WorkExperience = WorkExperience,
-            Qualification = Qualification
-        };
-    }
-}

MoorPlantListImplement/Models/Order.cs

@@ -1,66 +1,54 @@
 using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Enums;
 using MotorPlantDataModels.Models;
 
 namespace MotorPlantListImplement.Models
 {
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-        public int EngineId { get; private set; }
-        public int ClientId { get; private set; }
-        public int? ImplementerId { get; private set; }
-        public int Count { get; private set; }
-        public double Sum { get; private set; }
-        public OrderStatus Status { get; private set; }
-        public DateTime DateCreate { get; private set; }
-        public DateTime? DateImplement { get; private set; }
-        public static Order? Create(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Order()
-            {
-                Id = model.Id,
-                EngineId = model.EngineId,
-                ClientId = model.ClientId,
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-                ImplementerId = model.ImplementerId
-            };
-        }
-        public void Update(OrderBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            EngineId = model.EngineId;
-            ClientId = model.ClientId;
-            Count = model.Count;
-            Sum = model.Sum;
-            Status = model.Status;
-            DateCreate = model.DateCreate;
-            DateImplement = model.DateImplement;
-            ImplementerId = model.ImplementerId;
-        }
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            EngineId = EngineId,
-            ClientId = ClientId,
-            ImplementerId = ImplementerId,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-    }
+	public class Order : IOrderModel
+	{
+		public int Id { get; private set; }
+		public int EngineId { get; private set; }
+		public int Count { get; private set; }
+		public double Sum { get; private set; }
+		public OrderStatus Status { get; private set; }
+		public DateTime DateCreate { get; private set; }
+		public DateTime? DateImplement { get; private set; }
+		public static Order? Create(OrderBindingModel? model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new Order()
+			{
+				Id = model.Id,
+				EngineId = model.EngineId,
+				Count = model.Count,
+				Sum = model.Sum,
+				Status = model.Status,
+				DateCreate = model.DateCreate,
+				DateImplement = model.DateImplement,
+			};
+		}
+		public void Update(OrderBindingModel? model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			Status = model.Status;
+			DateImplement = model.DateImplement;
+		}
+		public OrderViewModel GetViewModel => new()
+		{
+			Id = Id,
+			EngineId = EngineId,
+			Count = Count,
+			Sum = Sum,
+			Status = Status,
+			DateCreate = DateCreate,
+			DateImplement = DateImplement,
+		};
+	}
 }

MoorPlantListImplement/Models/Shop.cs

@@ -0,0 +1,57 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantListImplement.Models
+{
+	public class Shop : IShopModel
+	{
+		public int Id { get; private set; }
+		public string ShopName { get; private set; } = string.Empty;
+		public string Adress { get; private set; } = string.Empty;
+		public DateTime OpeningDate { get; private set; }
+		public Dictionary<int, (IEngineModel, int)> ShopEngines { get; private set; } = new();
+		public int MaxCount { get; private set; }
+
+		public static Shop? Create(ShopBindingModel? model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new Shop()
+			{
+				Id = model.Id,
+				ShopName = model.ShopName,
+				Adress = model.Adress,
+				OpeningDate = model.OpeningDate,
+				MaxCount = model.MaxCount,
+			};
+		}
+		public void Update(ShopBindingModel? model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			ShopName = model.ShopName;
+			Adress = model.Adress;
+			OpeningDate = model.OpeningDate;
+			MaxCount = model.MaxCount;
+		}
+		public ShopViewModel GetViewModel => new()
+		{
+			Id = Id,
+			ShopName = ShopName,
+			Adress = Adress,
+			OpeningDate = OpeningDate,
+			ShopEngines = ShopEngines,
+			MaxCount = MaxCount,
+		};
+	}
+}

MotorPlantBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -1,121 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-
-
-namespace MotorPlantBusinessLogic.BusinessLogic
-{
-    public class ClientLogic : IClientLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IClientStorage _clientStorage;
-        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage
-       componentStorage)
-        {
-            _logger = logger;
-            _clientStorage = componentStorage;
-        }
-        public List<ClientViewModel>? ReadList(ClientSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ClientId:{Id}", model?.Id);
-            var list = model == null ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-
-        public ClientViewModel? ReadElement(ClientSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ClientFio:{ClientFio}.Id:{ Id}", model.ClientFIO, model.Id);
-            var element = _clientStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ClientBindingModel model)
-        {
-            CheckModel(model);
-            if (_clientStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(ClientBindingModel model)
-        {
-            CheckModel(model);
-            if (_clientStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(ClientBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_clientStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-        private void CheckModel(ClientBindingModel model, bool withParams =
-       true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ClientFIO))
-            {
-                throw new ArgumentNullException("Нет ФИО клиента",
-               nameof(model.ClientFIO));
-            }
-            if (string.IsNullOrEmpty(model.Email))
-            {
-                throw new ArgumentNullException("Нет Email клиента",
-               nameof(model.ClientFIO));
-            }
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля клиента",
-               nameof(model.ClientFIO));
-            }
-            _logger.LogInformation("Client. ClientFIO:{ClientFIO}." +
-                "Email:{ Email}. Password:{ Password}. Id: { Id} ", model.ClientFIO, model.Email, model.Password, model.Id);
-            var element = _clientStorage.GetElement(new ClientSearchModel
-            {
-                Email = model.Email,
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Клиент с таким лоигном уже есть");
-            }
-        }
-    }
-}

MotorPlantBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -1,124 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-
-
-namespace MotorPlantBusinessLogic.BusinessLogic
-{
-    public class ImplementerLogic : IImplementerLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerStorage _implementerStorage;
-        public ImplementerLogic(ILogger<ImplementerLogic> logger, IImplementerStorage
-       implementerStorage)
-        {
-            _logger = logger;
-            _implementerStorage = implementerStorage;
-        }
-        public List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ImplementerFIO:{ClientFIO}. Id:{ Id}", model?.ImplementerFIO, model?.Id);
-            var list = model == null ? _implementerStorage.GetFullList() :
-    _implementerStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ImplementerFIO:{ImplementerFIO}.Id:{ Id}", model.ImplementerFIO, model.Id);
-            var element = _implementerStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-        public bool Create(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(ImplementerBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_implementerStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-        private void CheckModel(ImplementerBindingModel model, bool withParams =
-       true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ImplementerFIO))
-            {
-                throw new ArgumentNullException("Нет ФИО исполнителя",
-               nameof(model.ImplementerFIO));
-            }
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля клиента",
-               nameof(model.Password));
-            }
-            if (model.WorkExperience < 0)
-            {
-                throw new ArgumentNullException("Стаж меньше 0",
-               nameof(model.WorkExperience));
-            }
-            if (model.Qualification < 0)
-            {
-                throw new ArgumentException("Квалификация меньше 0", nameof(model.Qualification));
-            }
-            _logger.LogInformation("Implementer. ImplementerFIO:{ImplementerFIO}." +
-                "Password:{ Password}. WorkExperience:{ WorkExperience}. Qualification:{ Qualification}. Id: { Id} ",
-                model.ImplementerFIO, model.Password, model.WorkExperience, model.Qualification, model.Id);
-            var element = _implementerStorage.GetElement(new ImplementerSearchModel
-            {
-                ImplementerFIO = model.ImplementerFIO,
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Исполнитель с таким ФИО уже есть");
-            }
-        }
-    }
-}

MotorPlantBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,115 +1,138 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.BusinessLogicsContracts;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.VeiwModels;
+using MotorPlantContracts.ViewModels;
+using Microsoft.Extensions.Logging;
 using MotorPlantDataModels.Enums;
 
 namespace MotorPlantBusinessLogic.BusinessLogics
 {
-    public class OrderLogic : IOrderLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IOrderStorage _orderStorage;
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
-        {
-            _logger = logger;
-            _orderStorage = orderStorage;
-        }
-        public List<OrderViewModel>? ReadList(OrderSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
-            var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public bool CreateOrder(OrderBindingModel model)
-        {
-            CheckModel(model);
-            if (model.Status != OrderStatus.Неизвестен)
-                return false;
-            model.Status = OrderStatus.Принят;
-            if (_orderStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool TakeOrderInWork(OrderBindingModel model)
-        {
-            return ChangeStatus(model, OrderStatus.Выполняется);
-        }
-        public bool FinishOrder(OrderBindingModel model)
-        {
-            return ChangeStatus(model, OrderStatus.Готов);
-        }
-        public bool DeliveryOrder(OrderBindingModel model)
-        {
-            return ChangeStatus(model, OrderStatus.Выдан);
-        }
-        private void CheckModel(OrderBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Колличество моторов в заказе не может быть меньше 1", nameof(model.Count));
-            }
-            if (model.Sum <= 0)
-            {
-                throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum));
-            }
-            if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
-            {
-                throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
-            }
-            _logger.LogInformation("Engine. EngineId:{EngineId}.Count:{Count}.Sum:{Sum}Id:{Id}",
-                model.EngineId, model.Count, model.Sum, model.Id);
-        }
-        private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
-        {
-            CheckModel(model, false);
-            var element = _orderStorage.GetElement(new OrderSearchModel()
-            {
-                Id = model.Id
-            });
-            if (element == null)
-            {
-                throw new ArgumentNullException(nameof(element));
-            }
-            model.DateCreate = element.DateCreate;
-            model.EngineId = element.EngineId;
-            model.DateImplement = element.DateImplement;
-            model.Status = element.Status;
-            model.Count = element.Count;
-            model.Sum = element.Sum;
-            if (requiredStatus - model.Status == 1)
-            {
-                model.Status = requiredStatus;
-                if (model.Status == OrderStatus.Выдан)
-                    model.DateImplement = DateTime.Now;
-                if (_orderStorage.Update(model) == null)
-                {
-                    _logger.LogWarning("Update operation failed");
-                    return false;
-                }
-                return true;
-            }
-            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-            throw new ArgumentException($"Невозможно присвоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
-        }
-    }
+	public class OrderLogic : IOrderLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IOrderStorage _orderStorage;
+		private readonly IShopStorage _shopStorage;
+		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
+		{
+			_logger = logger;
+			_orderStorage = orderStorage;
+			_shopStorage = shopStorage;
+		}
+		public List<OrderViewModel>? ReadList(OrderSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
+			var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+		public bool CreateOrder(OrderBindingModel model)
+		{
+			CheckModel(model);
+
+			if (model.Status != OrderStatus.Неизвестен)
+				return false;
+			model.Status = OrderStatus.Принят;
+
+			if (_orderStorage.Insert(model) == null)
+			{
+				model.Status = OrderStatus.Неизвестен;
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			return true;
+		}
+		public bool TakeOrderInWork(OrderBindingModel model)
+		{
+			return ToNextStatus(model, OrderStatus.Выполняется);
+		}
+		public bool FinishOrder(OrderBindingModel model)
+		{
+			return ToNextStatus(model, OrderStatus.Готов);
+		}
+		public bool DeliveryOrder(OrderBindingModel model)
+		{
+			var order = _orderStorage.GetElement(new OrderSearchModel
+			{
+				Id = model.Id,
+			});
+			if (order == null)
+			{
+				throw new ArgumentNullException(nameof(order));
+			}
+			if (!_shopStorage.RestockingShops(new SupplyBindingModel
+			{
+				EngineId = order.EngineId,
+				Count = order.Count
+			}))
+			{
+				throw new ArgumentException("Недостаточно места");
+			}
+			return ToNextStatus(model, OrderStatus.Выдан);
+		}
+		public bool ToNextStatus(OrderBindingModel model, OrderStatus orderStatus)
+		{
+			CheckModel(model, false);
+			var element = _orderStorage.GetElement(new OrderSearchModel()
+			{
+				Id = model.Id
+			});
+			if (element == null)
+			{
+				throw new ArgumentNullException(nameof(element));
+			}
+			model.EngineId = element.EngineId;
+			model.DateCreate = element.DateCreate;
+			model.DateImplement = element.DateImplement;
+			model.Status = element.Status;
+			model.Count = element.Count;
+			model.Sum = element.Sum;
+			if (model.Status != orderStatus - 1)
+			{
+				_logger.LogWarning("Status update to " + orderStatus + " operation failed");
+				return false;
+			}
+			model.Status = orderStatus;
+			if (model.Status == OrderStatus.Выдан)
+			{
+				model.DateImplement = DateTime.Now;
+			}
+			if (_orderStorage.Update(model) == null)
+			{
+				model.Status--;
+				_logger.LogWarning("Changing status operation faled");
+				return false;
+			}
+			return true;
+		}
+		private void CheckModel(OrderBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			if (model.Count <= 0)
+			{
+				throw new ArgumentNullException("Количество изделий должно быть больше 0", nameof(model.Count));
+			}
+			if (model.Sum <= 0)
+			{
+				throw new ArgumentNullException("Цена заказа должна быть больше 0", nameof(model.Sum));
+			}
+			if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
+			{
+				throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} должна быть позже даты его создания {model.DateCreate}");
+			}
+			_logger.LogInformation("Engine. EngineId:{EngineId}.Count:{Count}.Sum:{Sum}Id:{Id}", model.EngineId, model.Count, model.Sum, model.Id);
+		}
+	}
 }

MotorPlantBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -1,83 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperModels;
-using MotorPlantBusinessLogic.OfficePackage;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-namespace MotorPlantBusinessLogic
-{
-    public class ReportLogic : IReportLogic
-    {
-        private readonly IComponentStorage _componentStorage;
-        private readonly IEngineStorage _EngineStorage;
-        private readonly IOrderStorage _orderStorage;
-        private readonly AbstractSaveToExcel _saveToExcel;
-        private readonly AbstractSaveToWord _saveToWord;
-        private readonly AbstractSaveToPdf _saveToPdf;
-        public ReportLogic(IEngineStorage EngineStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
-        {
-            _EngineStorage = EngineStorage;
-            _componentStorage = componentStorage;
-            _orderStorage = orderStorage;
-            _saveToExcel = saveToExcel;
-            _saveToWord = saveToWord;
-            _saveToPdf = saveToPdf;
-        }
-        public List<ReportEngineComponentViewModel> GetEngineComponents()
-        {
-            return _EngineStorage.GetFullList().Select(x => new ReportEngineComponentViewModel
-            {
-                EngineName = x.EngineName,
-                Components = x.EngineComponents.Select(x => (x.Value.Item1.ComponentName, x.Value.Item2)).ToList(),
-                TotalCount = x.EngineComponents.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
-        {
-            return _orderStorage.GetFilteredList(new OrderSearchModel
-            {
-                DateFrom = model.DateFrom,
-                DateTo = model.DateTo
-            })
-            .Select(x => new ReportOrdersViewModel
-            {
-                Id = x.Id,
-                DateCreate = x.DateCreate,
-                EngineName = x.EngineName,
-                Sum = x.Sum,
-                Status = x.Status.ToString(),
-            })
-           .ToList();
-        }
-        public void SaveEnginesToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateDoc(new WordInfo
-            {
-                FileName = model.FileName,
-                Title = "Список двигателей",
-                Engines = _EngineStorage.GetFullList()
-            });
-        }
-        public void SaveEngineComponentToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateReport(new ExcelInfo
-            {
-                FileName = model.FileName,
-                Title = "Список компонентов",
-                EngineComponents = GetEngineComponents()
-            });
-        }
-        public void SaveOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateDoc(new PdfInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов",
-                DateFrom = model.DateFrom!.Value,
-                DateTo = model.DateTo!.Value,
-                Orders = GetOrders(model)
-            });
-        }
-    }
-}

MotorPlantBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,187 @@
+using Microsoft.Extensions.Logging;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantBusinessLogic.BusinessLogics
+{
+	public class ShopLogic : IShopLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IShopStorage _shopStorage;
+		private readonly IEngineStorage _EngineStorage;
+		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, IEngineStorage EngineStorage)
+		{
+			_logger = logger;
+			_shopStorage = shopStorage;
+			_EngineStorage = EngineStorage;
+		}
+		public List<ShopViewModel>? ReadList(ShopSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
+			var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+		public ShopViewModel? ReadElement(ShopSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
+			var element = _shopStorage.GetElement(model);
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
+				return null;
+			}
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+			return element;
+		}
+		public bool Create(ShopBindingModel model)
+		{
+			CheckModel(model);
+			if (_shopStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			return true;
+		}
+		public bool Update(ShopBindingModel model)
+		{
+			CheckModel(model);
+			if (_shopStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
+				return false;
+			}
+			return true;
+		}
+		public bool Delete(ShopBindingModel model)
+		{
+			CheckModel(model, false);
+			_logger.LogInformation("Delete. Id:{Id}", model.Id);
+			if (_shopStorage.Delete(model) == null)
+			{
+				_logger.LogWarning("Delete operation failed");
+				return false;
+			}
+			return true;
+		}
+		public bool MakeSupply(SupplyBindingModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (model.Count <= 0)
+			{
+				throw new ArgumentException("Количество изделий должно быть больше 0");
+			}
+			var shop = _shopStorage.GetElement(new ShopSearchModel
+			{
+				Id = model.ShopId
+			});
+			if (shop == null)
+			{
+				throw new ArgumentException("Магазина не существует");
+			}
+			if (shop.ShopEngines.ContainsKey(model.EngineId))
+			{
+				var oldValue = shop.ShopEngines[model.EngineId];
+				oldValue.Item2 += model.Count;
+				shop.ShopEngines[model.EngineId] = oldValue;
+			}
+			else
+			{
+				var Engine = _EngineStorage.GetElement(new EngineSearchModel
+				{
+					Id = model.EngineId
+				});
+				if (Engine == null)
+				{
+					throw new ArgumentException($"Поставка: Товар с id:{model.EngineId} не найденн");
+				}
+				if (shop.ShopEngines.Sum(kv => kv.Value.Item2) + model.Count > shop.MaxCount)
+				{
+					throw new ArgumentException("Превышена максимальная вместимость магазина");
+				}
+				shop.ShopEngines.Add(model.EngineId, (Engine, model.Count));
+			}
+			_shopStorage.Update(new ShopBindingModel()
+			{
+				Id = shop.Id,
+				ShopName = shop.ShopName,
+				Adress = shop.Adress,
+				OpeningDate = shop.OpeningDate,
+				ShopEngines = shop.ShopEngines,
+				MaxCount = shop.MaxCount,
+			});
+
+			return true;
+		}
+		private void CheckModel(ShopBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			if (string.IsNullOrEmpty(model.Adress))
+			{
+				throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
+			}
+			if (string.IsNullOrEmpty(model.ShopName))
+			{
+				throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
+			}
+			_logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
+			var element = _shopStorage.GetElement(new ShopSearchModel
+			{
+				ShopName = model.ShopName
+			});
+			if (element != null && element.Id != model.Id)
+			{
+				throw new InvalidOperationException("Магазин с таким названием уже есть");
+			}
+		}
+		public bool Sale(SupplySearchModel model)
+		{
+			if (!model.EngineId.HasValue || !model.Count.HasValue)
+			{
+				return false;
+			}
+			_logger.LogInformation("Check Engine count in all shops");
+			if (_shopStorage.Sale(model))
+			{
+				_logger.LogInformation("Selling sucsess");
+				return true;
+			}
+			_logger.LogInformation("Selling failed");
+			return false;
+		}
+
+		public bool MakeSupply(ShopSearchModel model, IEngineModel engine, int count)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

MotorPlantBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -1,128 +0,0 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Enums;
-
-namespace MotorPlantBusinessLogic.BusinessLogic
-{
-    public class WorkModeling : IWorkProcess
-    {
-        private readonly ILogger _logger;
-        private readonly Random _rnd;
-        private IOrderLogic? _orderLogic;
-        public WorkModeling(ILogger<WorkModeling> logger)
-        {
-            _logger = logger;
-            _rnd = new Random(1000);
-        }
-        public void DoWork(IImplementerLogic implementerLogic, IOrderLogic
-       orderLogic)
-        {
-            _orderLogic = orderLogic;
-            var implementers = implementerLogic.ReadList(null);
-            if (implementers == null)
-            {
-                _logger.LogWarning("DoWork. Implementers is null");
-                return;
-            }
-            var orders = _orderLogic.ReadList(new OrderSearchModel
-            {
-                Status =
-           OrderStatus.Принят
-            });
-            if (orders == null || orders.Count == 0)
-            {
-                _logger.LogWarning("DoWork. Orders is null or empty");
-                return;
-            }
-            _logger.LogDebug("DoWork for {Count} orders", orders.Count);
-            foreach (var implementer in implementers)
-            {
-                Task.Run(() => WorkerWorkAsync(implementer, orders));
-            }
-        }
-        private async Task WorkerWorkAsync(ImplementerViewModel implementer,
-       List<OrderViewModel> orders)
-        {
-            if (_orderLogic == null || implementer == null)
-            {
-                return;
-            }
-            await RunOrderInWork(implementer);
-            await Task.Run(() =>
-            {
-                foreach (var order in orders)
-                {
-                    try
-                    {
-                        _logger.LogDebug("DoWork. Worker {Id} try get order { Order}", implementer.Id, order.Id);
-                        _orderLogic.TakeOrderInWork(new OrderBindingModel
-                        {
-                            Id = order.Id,
-                            ImplementerId = implementer.Id
-                        });
-                        Thread.Sleep(implementer.WorkExperience * _rnd.Next(100,
-                        1000) * order.Count);
-                        _logger.LogDebug("DoWork. Worker {Id} finish order { Order}", implementer.Id, order.Id);
-
-                        _orderLogic.FinishOrder(new OrderBindingModel
-                        {
-                            Id = order.Id
-                        });
-                        Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-                    }
-                    catch (InvalidOperationException ex)
-                    {
-                        _logger.LogWarning(ex, "Error try get work");
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error while do work");
-                        throw;
-                    }
-                }
-            });
-        }
-        private async Task RunOrderInWork(ImplementerViewModel implementer)
-        {
-            if (_orderLogic == null || implementer == null)
-            {
-                return;
-            }
-            try
-            {
-                var runOrder = await Task.Run(() => _orderLogic.ReadElement(new
-               OrderSearchModel
-                {
-                    ImplementerId = implementer.Id,
-                    Status = OrderStatus.Выполняется
-                }));
-                if (runOrder == null)
-                {
-                    return;
-                }
-                _logger.LogDebug("DoWork. Worker {Id} back to order {Order}",
-               implementer.Id, runOrder.Id);
-                Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
-                _logger.LogDebug("DoWork. Worker {Id} finish order {Order}",
-               implementer.Id, runOrder.Id);
-                _orderLogic.FinishOrder(new OrderBindingModel
-                {
-                    Id = runOrder.Id
-                });
-                Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-            }
-            catch (InvalidOperationException ex)
-            {
-                _logger.LogWarning(ex, "Error try get work");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error while do work");
-                throw;
-            }
-        }
-    }
-}

MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj

@@ -7,20 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-	  <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-	  <PackageReference Include="PDFsharp-MigraDoc-GDI" Version="1.50.5147" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
-    <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
   </ItemGroup>
 
 </Project>

MotorPlantBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -1,77 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperEnums;
-using MotorPlantBusinessLogic.OfficePackage.HelperModels;
-namespace MotorPlantBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToExcel
-    {
-        public void CreateReport(ExcelInfo info)
-        {
-            CreateExcel(info);
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-            uint rowIndex = 2;
-            foreach (var pc in info.EngineComponents)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = pc.EngineName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-                foreach (var Engine in pc.Components)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Engine.Item1,
-                        StyleInfo =
-                    ExcelStyleInfoType.TextWithBroder
-                    });
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = Engine.Item2.ToString(),
-                        StyleInfo =
-                    ExcelStyleInfoType.TextWithBroder
-                    });
-                    rowIndex++;
-                }
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = pc.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-            SaveExcel(info);
-        }
-        protected abstract void CreateExcel(ExcelInfo info);
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters
-        excelParams);
-        protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        protected abstract void SaveExcel(ExcelInfo info);
-    }
-}

MotorPlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -1,52 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperEnums;
-using MotorPlantBusinessLogic.OfficePackage.HelperModels;
-namespace MotorPlantBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToPdf
-    {
-        public void CreateDoc(PdfInfo info)
-        {
-            CreatePdf(info);
-            CreateParagraph(new PdfParagraph
-            {
-                Text = info.Title,
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"с{info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
-                Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "4cm" });
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма", "Статус" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            foreach (var order in info.Orders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.EngineName, order.Sum.ToString(), order.Status },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t",
-                Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Right
-            });
-            SavePdf(info);
-        }
-        protected abstract void CreatePdf(PdfInfo info);
-        protected abstract void CreateParagraph(PdfParagraph paragraph);
-        protected abstract void CreateTable(List<string> columns);
-        protected abstract void CreateRow(PdfRowParameters rowParameters);
-        protected abstract void SavePdf(PdfInfo info);
-    }
-}

MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -1,49 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperEnums;
-using MotorPlantBusinessLogic.OfficePackage.HelperModels;
-
-namespace MotorPlantBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToWord
-    {
-        public void CreateDoc(WordInfo info)
-        {
-            CreateWord(info);
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new
-WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-            foreach (var component in info.Engines)
-            {
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)>
-                    {
-                        (component.EngineName, new WordTextProperties { Size = "24", Bold = true}),
-                        ("\t" + component.Price.ToString(), new WordTextProperties { Size = "24"}),
-                    },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-            SaveWord(info);
-        }
-        protected abstract void CreateWord(WordInfo info);
-        protected abstract void CreateParagraph(WordParagraph paragraph);
-        protected abstract void SaveWord(WordInfo info);
-    }
-}
-
-
-
-
-
-

MotorPlantBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -1,9 +0,0 @@
-namespace MotorPlantBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum ExcelStyleInfoType
-    {
-        Title,
-        Text,
-        TextWithBroder
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs

@@ -1,9 +0,0 @@
-namespace MotorPlantBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum PdfParagraphAlignmentType
-    {
-        Center,
-        Left,
-        Right
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs

@@ -1,8 +0,0 @@
-namespace MotorPlantBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum WordJustificationType
-    {
-        Center,
-        Both
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs

@@ -1,12 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperEnums;
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelCellParameters
-    {
-        public string ColumnName { get; set; } = string.Empty;
-        public uint RowIndex { get; set; }
-        public string Text { get; set; } = string.Empty;
-        public string CellReference => $"{ColumnName}{RowIndex}";
-        public ExcelStyleInfoType StyleInfo { get; set; }
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -1,15 +0,0 @@
-using MotorPlantContracts.ViewModels;
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportEngineComponentViewModel> EngineComponents
-        {
-            get;
-            set;
-        } = new();
-
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -1,9 +0,0 @@
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelMergeParameters
-    {
-        public string CellFromName { get; set; } = string.Empty;
-        public string CellToName { get; set; } = string.Empty;
-        public string Merge => $"{CellFromName}:{CellToName}";
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -1,12 +0,0 @@
-using MotorPlantContracts.ViewModels;
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public DateTime DateFrom { get; set; }
-        public DateTime DateTo { get; set; }
-        public List<ReportOrdersViewModel> Orders { get; set; } = new();
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs

@@ -1,10 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperEnums;
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfParagraph
-    {
-        public string Text { get; set; } = string.Empty;
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs

@@ -1,10 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperEnums;
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -1,10 +0,0 @@
-using MotorPlantContracts.VeiwModels;
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<EngineViewModel> Engines { get; set; } = new();
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -1,8 +0,0 @@
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordParagraph
-    {
-        public List<(string, WordTextProperties)> Texts { get; set; } = new();
-        public WordTextProperties? TextProperties { get; set; }
-    }
-}

MotorPlantBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs

@@ -1,10 +0,0 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperEnums;
-namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordTextProperties
-    {
-        public string Size { get; set; } = string.Empty;
-        public bool Bold { get; set; }
-        public WordJustificationType JustificationType { get; set; }
-    }
-}