Confectionery/Confectionery.sln

@@ -13,11 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryListImplement"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryView", "ConfectioneryView\ConfectioneryView.csproj", "{90E59686-3070-4B0F-BCBF-AAE0FEFE35FA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryFileImplement", "ConfectioneryFileImplement\ConfectioneryFileImplement.csproj", "{BB6D6796-AD42-44BA-9BCC-27D8E1F6D068}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryFileImplement", "ConfectioneryFileImplement\ConfectioneryFileImplement.csproj", "{BB6D6796-AD42-44BA-9BCC-27D8E1F6D068}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryDatabaseImplement", "ConfectioneryDatabaseImplement\ConfectioneryDatabaseImplement.csproj", "{F637E749-7A91-4608-908F-4DA0434AB30B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryDatabaseImplement", "ConfectioneryDatabaseImplement\ConfectioneryDatabaseImplement.csproj", "{F637E749-7A91-4608-908F-4DA0434AB30B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryRestApi", "ConfectioneryRestApi\ConfectioneryRestApi.csproj", "{1BD83A84-53DA-422D-8878-96100A1FD06F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,10 +51,6 @@ Global
 		{F637E749-7A91-4608-908F-4DA0434AB30B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F637E749-7A91-4608-908F-4DA0434AB30B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F637E749-7A91-4608-908F-4DA0434AB30B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1BD83A84-53DA-422D-8878-96100A1FD06F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BD83A84-53DA-422D-8878-96100A1FD06F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BD83A84-53DA-422D-8878-96100A1FD06F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BD83A84-53DA-422D-8878-96100A1FD06F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Confectionery/ConfectioneryBusinessLogic/ClientLogic.cs

@@ -1,124 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryBusinessLogic
-{
-    public class ClientLogic : IClientLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IClientStorage _clientStorage;
-
-        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage)
-        {
-            _logger = logger;
-            _clientStorage = clientStorage;
-        }
-
-        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("Нет почты пользователя", nameof(model.Email));
-            }
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
-            }
-            _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
-            {
-                ClientFIO = model.ClientFIO
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Клиент с таким именем уже есть");
-            }
-        }
-    }
-}

Confectionery/ConfectioneryDatabaseImplement/ClientStorage.cs

@@ -9,7 +9,7 @@ using ConfectioneryContracts.StoragesContracts;
 using ConfectioneryContracts.ViewModels;
 using ConfectioneryDatabaseImplement.Models;
 
-namespace ConfectioneryDatabaseImplement.Implements
+namespace ConfectioneryDatabaseImplement
 {
     public class ClientStorage : IClientStorage
     {

Confectionery/ConfectioneryFileImplement/Order.cs

@@ -9,7 +9,6 @@ namespace ConfectioneryFileImplement.Models
     public class Order : IOrderModel
     {
         public int Id { get; private set; }
-        public int ClientId { get; private set; }
         public int PastryId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }

Confectionery/ConfectioneryListImplement/Order.cs

@@ -14,7 +14,6 @@ namespace ConfectioneryListImplement.Models
     {
         public int Id { get; private set; }
         public int PastryId { get; private set; }
-        public int ClientId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;

Confectionery/ConfectioneryRestApi/ConfectioneryRestApi.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ConfectioneryBusinessLogic\ConfectioneryBusinessLogic.csproj" />
-    <ProjectReference Include="..\ConfectioneryDatabaseImplement\ConfectioneryDatabaseImplement.csproj" />
-  </ItemGroup>
-
-</Project>

Confectionery/ConfectioneryRestApi/ConfectioneryRestApi.http

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

Confectionery/ConfectioneryRestApi/Controllers/WeatherForecastController.cs

@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace ConfectioneryRestApi.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();
-        }
-    }
-}

Confectionery/ConfectioneryRestApi/Program.cs

@@ -1,42 +0,0 @@
-using ConfectioneryBusinessLogic;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryDatabaseImplement.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<IPastryStorage, PastryStorage>();
-builder.Services.AddTransient<IOrderLogic, OrderLogic>();
-builder.Services.AddTransient<IClientLogic, ClientLogic>();
-builder.Services.AddTransient<IPastryLogic, PastryLogic>();
-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 = "ConfectioneryRestApi",
-        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",
-   "ConfectioneryRestApi v1"));
-}
-app.UseHttpsRedirection();
-app.UseAuthorization();
-app.MapControllers();
-app.Run();

Confectionery/ConfectioneryRestApi/Properties/launchSettings.json

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

Confectionery/ConfectioneryRestApi/WeatherForecast.cs

@@ -1,13 +0,0 @@
-namespace ConfectioneryRestApi
-{
-    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; }
-    }
-}

Confectionery/ConfectioneryRestApi/appsettings.Development.json

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

Confectionery/ConfectioneryRestApi/appsettings.json

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

Confectionery/ConfectioneryView/FormMain.Designer.cs

@@ -53,7 +53,7 @@
             dataGridView.Location = new Point(12, 60);
             dataGridView.Name = "dataGridView";
             dataGridView.RowHeadersWidth = 62;
-            dataGridView.Size = new Size(1374, 549);
+            dataGridView.Size = new Size(1068, 549);
             dataGridView.TabIndex = 0;
             // 
             // menuStrip
@@ -62,7 +62,7 @@
             menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(1666, 33);
+            menuStrip.Size = new Size(1375, 33);
             menuStrip.TabIndex = 1;
             menuStrip.Text = "menuStrip1";
             // 
@@ -118,7 +118,7 @@
             // buttonCreateOrder
             // 
             buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonCreateOrder.Location = new Point(1402, 83);
+            buttonCreateOrder.Location = new Point(1111, 83);
             buttonCreateOrder.Name = "buttonCreateOrder";
             buttonCreateOrder.Size = new Size(232, 34);
             buttonCreateOrder.TabIndex = 2;
@@ -129,7 +129,7 @@
             // buttonTakeOrderInWork
             // 
             buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonTakeOrderInWork.Location = new Point(1402, 143);
+            buttonTakeOrderInWork.Location = new Point(1111, 143);
             buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
             buttonTakeOrderInWork.Size = new Size(232, 34);
             buttonTakeOrderInWork.TabIndex = 3;
@@ -140,7 +140,7 @@
             // buttonOrderReady
             // 
             buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonOrderReady.Location = new Point(1402, 203);
+            buttonOrderReady.Location = new Point(1111, 203);
             buttonOrderReady.Name = "buttonOrderReady";
             buttonOrderReady.Size = new Size(232, 34);
             buttonOrderReady.TabIndex = 4;
@@ -151,7 +151,7 @@
             // buttonIssuedOrder
             // 
             buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonIssuedOrder.Location = new Point(1402, 266);
+            buttonIssuedOrder.Location = new Point(1111, 266);
             buttonIssuedOrder.Name = "buttonIssuedOrder";
             buttonIssuedOrder.Size = new Size(232, 34);
             buttonIssuedOrder.TabIndex = 5;
@@ -162,7 +162,7 @@
             // buttonRef
             // 
             buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonRef.Location = new Point(1402, 329);
+            buttonRef.Location = new Point(1111, 329);
             buttonRef.Name = "buttonRef";
             buttonRef.Size = new Size(232, 34);
             buttonRef.TabIndex = 6;
@@ -174,7 +174,7 @@
             // 
             AutoScaleDimensions = new SizeF(10F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1666, 621);
+            ClientSize = new Size(1375, 621);
             Controls.Add(buttonRef);
             Controls.Add(buttonIssuedOrder);
             Controls.Add(buttonOrderReady);

Confectionery/ConfectioneryView/FormMain.resx

@@ -120,7 +120,4 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
 </root>