.gitignore

@@ -371,6 +371,8 @@ healthchecksdb
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
 
+Migrations/
+
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
@@ -398,4 +400,3 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
-/SushiBar/SushiBarDatabaseImplement/Migrations/

SushiBar/SushiBar/App.config

@@ -2,10 +2,10 @@
 <configuration>
 	<appSettings>
 		<add key="SmtpClientHost" value="smtp.yandex.ru" />
-		<add key="SmtpClientPort" value="587" />
+		<add key="SmtpClientPort" value="465" />
 		<add key="PopHost" value="pop.yandex.com" />
 		<add key="PopPort" value="995" />
-		<add key="MailLogin" value="tester.b.moio@yandex.ru" />
+		<add key="MailLogin" value="tester.b.moio@ya.ru" />
 		<add key="MailPassword" value="pyzzqswchjevecec" />
 	</appSettings>
 </configuration>

SushiBar/SushiBar/Forms/FormMailView.Designer.cs

@@ -1,65 +0,0 @@
-namespace SushiBar.Forms
-{
-    partial class FormMailView
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            dataGridView = new DataGridView();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(12, 12);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowHeadersWidth = 51;
-            dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(776, 426);
-            dataGridView.TabIndex = 0;
-            // 
-            // FormMailView
-            // 
-            AllowDrop = true;
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
-            Controls.Add(dataGridView);
-            Name = "FormMailView";
-            Text = "FormMail";
-            WindowState = FormWindowState.Maximized;
-            Load += FormMailView_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-    }
-}

SushiBar/SushiBar/Forms/FormMailView.cs

@@ -1,39 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BusinessLogicsContracts;
-
-namespace SushiBar.Forms
-{
-    public partial class FormMailView : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoLogic _logic;
-        public FormMailView(ILogger<FormMailView> logger, IMessageInfoLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormMailView_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["MessageId"].Visible = false;
-                    dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка списка писем");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки писем");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-    }
-}

SushiBar/SushiBar/Forms/FormMailView.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SushiBar/SushiBar/Forms/FormMain.Designer.cs

@@ -39,7 +39,6 @@
             sushisReportToolStripMenuItem = new ToolStripMenuItem();
             componentsReportПоСушиToolStripMenuItem = new ToolStripMenuItem();
             orderReportToolStripMenuItem = new ToolStripMenuItem();
-            startWorksToolStripMenuItem = new ToolStripMenuItem();
             отчётыToolStripMenuItem = new ToolStripMenuItem();
             sushisToolStripMenuItem = new ToolStripMenuItem();
             componentSushisToolStripMenuItem = new ToolStripMenuItem();
@@ -49,7 +48,7 @@
             buttonOrderReady = new Button();
             buttonIssuedOrder = new Button();
             buttonRef = new Button();
-            MailToolStripMenuItem = new ToolStripMenuItem();
+            startWorksToolStripMenuItem = new ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             menuStrip1.SuspendLayout();
             SuspendLayout();
@@ -69,7 +68,7 @@
             // menuStrip1
             // 
             menuStrip1.ImageScalingSize = new Size(20, 20);
-            menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчётыToolStripMenuItem1, startWorksToolStripMenuItem, MailToolStripMenuItem });
+            menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчётыToolStripMenuItem1, startWorksToolStripMenuItem });
             menuStrip1.Location = new Point(0, 0);
             menuStrip1.Name = "menuStrip1";
             menuStrip1.Size = new Size(1184, 28);
@@ -86,28 +85,28 @@
             // sushiToolStripMenuItem
             // 
             sushiToolStripMenuItem.Name = "sushiToolStripMenuItem";
-            sushiToolStripMenuItem.Size = new Size(185, 26);
+            sushiToolStripMenuItem.Size = new Size(224, 26);
             sushiToolStripMenuItem.Text = "Суши";
             sushiToolStripMenuItem.Click += SushiToolStripMenuItem_Click;
             // 
             // componentsToolStripMenuItem
             // 
             componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
-            componentsToolStripMenuItem.Size = new Size(185, 26);
+            componentsToolStripMenuItem.Size = new Size(224, 26);
             componentsToolStripMenuItem.Text = "Компоненты";
             componentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
             // 
             // clientsToolStripMenuItem
             // 
             clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
-            clientsToolStripMenuItem.Size = new Size(185, 26);
+            clientsToolStripMenuItem.Size = new Size(224, 26);
             clientsToolStripMenuItem.Text = "Клиенты";
             clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click;
             // 
             // implementersToolStripMenuItem
             // 
             implementersToolStripMenuItem.Name = "implementersToolStripMenuItem";
-            implementersToolStripMenuItem.Size = new Size(185, 26);
+            implementersToolStripMenuItem.Size = new Size(224, 26);
             implementersToolStripMenuItem.Text = "Исполнители";
             implementersToolStripMenuItem.Click += implementersToolStripMenuItem_Click;
             // 
@@ -139,13 +138,6 @@
             orderReportToolStripMenuItem.Text = "Список заказов";
             orderReportToolStripMenuItem.Click += orderReportToolStripMenuItem_Click;
             // 
-            // startWorksToolStripMenuItem
-            // 
-            startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
-            startWorksToolStripMenuItem.Size = new Size(114, 24);
-            startWorksToolStripMenuItem.Text = "Запуск работ";
-            startWorksToolStripMenuItem.Click += startWorksToolStripMenuItem_Click;
-            // 
             // отчётыToolStripMenuItem
             // 
             отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
@@ -221,12 +213,12 @@
             buttonRef.UseVisualStyleBackColor = true;
             buttonRef.Click += ButtonRef_Click;
             // 
-            // MailToolStripMenuItem
+            // startWorksToolStripMenuItem
             // 
-            MailToolStripMenuItem.Name = "MailToolStripMenuItem";
+            startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
-            MailToolStripMenuItem.Size = new Size(65, 24);
+            startWorksToolStripMenuItem.Size = new Size(114, 24);
-            MailToolStripMenuItem.Text = "Почта";
+            startWorksToolStripMenuItem.Text = "Запуск работ";
-            MailToolStripMenuItem.Click += MailToolStripMenuItem_Click;
+            startWorksToolStripMenuItem.Click += startWorksToolStripMenuItem_Click;
             // 
             // FormMain
             // 
@@ -276,6 +268,5 @@
         private ToolStripMenuItem clientsToolStripMenuItem;
         private ToolStripMenuItem implementersToolStripMenuItem;
         private ToolStripMenuItem startWorksToolStripMenuItem;
-        private ToolStripMenuItem MailToolStripMenuItem;
     }
 }

SushiBar/SushiBar/Forms/FormMain.cs

@@ -195,14 +195,5 @@ namespace SushiBar.Forms
             _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
-
-        private void MailToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormMailView));
-            if (service is FormMailView form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

SushiBar/SushiBar/Program.cs

@@ -30,7 +30,6 @@ namespace SushiBar
             var services = new ServiceCollection();
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
-
             try
             {
                 var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
@@ -46,12 +45,6 @@ namespace SushiBar
                 var timer = new System.Threading.Timer(new
                 TimerCallback(MailCheck!), null, 0, 100000);
             }
-            catch (Exception ex)
-            {
-                var logger = _serviceProvider.GetService<ILogger>();
-                logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
-            }
-
             Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
         private static void ConfigureServices(ServiceCollection services)
@@ -66,7 +59,6 @@ namespace SushiBar
             services.AddTransient<ISushiStorage, SushiStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
             services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
@@ -74,8 +66,7 @@ namespace SushiBar
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddSingleton<IWorkProcess, WorkModeling>();
+            services.AddTransient<IWorkProcess, WorkModeling>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
@@ -89,12 +80,10 @@ namespace SushiBar
             services.AddTransient<FormReportOrders>();
             services.AddTransient<FormImplementers>();
             services.AddTransient<FormImplementer>();
-            services.AddTransient<FormMailView>();
 
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
         }
 
         private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();

SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -59,8 +59,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
                 return false;
             }
             model.Status = OrderStatus.Принят;
-            var res = _orderStorage.Insert(model);
+            if (_orderStorage.Insert(model) == null)
-            if (res == null)
             {
                 _logger.LogWarning("Insert operation failed");
                 return false;
@@ -155,8 +154,6 @@ namespace SushiBarBusinessLogic.BusinessLogics
             }
         }
         private bool SendOrderStatusMail(int clientId, string subject, string text)
-        {
-            try
         {
             var client = _clientLogic.ReadElement(new() { Id = clientId });
             if (client == null)
@@ -171,11 +168,5 @@ namespace SushiBarBusinessLogic.BusinessLogics
             });
             return true;
         }
-            catch (Exception ex)
-            {
-                return false;
-            }
-            
-        }
     }
 }

SushiBar/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -69,6 +69,7 @@ namespace SushiBarBusinessLogic.MailWorker
             }
         }
         protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-        protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
+        protected abstract Task<List<MessageInfoBindingModel>>
+       ReceiveMailAsync();
     }
 }

SushiBar/SushiBarClientApi/appsettings.json

@@ -7,5 +7,16 @@
   },
   "AllowedHosts": "*",
   
-  "IPAddress": "http://localhost:5050"
+  "IPAddress": "http://localhost:5050",
+
+  "MailConfigBindingModel": {
+    "SmtpClientHost": "smtp.yandex.ru",
+    "SmtpClientPort": 465,
+
+    "PopHost": "pop.yandex.com",
+    "PopPort": 995,
+
+    "MailLogin": "tester.b.moio@ya.ru",
+    "MailPassword": "pyzzqswchjevecec"
+  }
 }

SushiBar/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -1,4 +1,5 @@
-using SushiBarContracts.BindingModels;
+using Microsoft.EntityFrameworkCore;
+using SushiBarContracts.BindingModels;
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;
@@ -41,7 +42,7 @@ namespace SushiBarDatabaseImplement.Implements
         {
             using var context = new SushiBarDatabase();
             var newMessage = MessageInfo.Create(context, model);
-            if (newMessage == null || newMessage.Body == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId)))
+            if (newMessage == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId)))
             {
                 return null;
             }

SushiBar/SushiBarDatabaseImplement/Migrations/20240507181620_lab6.Designer.cs

@@ -0,0 +1,252 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using SushiBarDatabaseImplement;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    [DbContext(typeof(SushiBarDatabase))]
+    [Migration("20240507181620_lab6")]
+    partial class lab6
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.16")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ImplementerFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Qualification")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("WorkExperience")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Implementers");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ImplementerId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("SushiName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sushis");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("SushiComponents");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Orders")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
+                        .WithMany("SushiComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Components")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("SushiComponents");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/20240507181620_lab6.cs

@@ -0,0 +1,186 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class lab6 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ClientFIO = table.Column<string>(type: "text", nullable: false),
+                    Email = table.Column<string>(type: "text", nullable: false),
+                    Password = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Components",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ComponentName = table.Column<string>(type: "text", nullable: false),
+                    Cost = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Components", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Implementers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ImplementerFIO = table.Column<string>(type: "text", nullable: false),
+                    Password = table.Column<string>(type: "text", nullable: false),
+                    Qualification = table.Column<int>(type: "integer", nullable: false),
+                    WorkExperience = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Sushis",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    SushiName = table.Column<string>(type: "text", nullable: false),
+                    Price = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Sushis", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Orders",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    Count = table.Column<int>(type: "integer", nullable: false),
+                    Sum = table.Column<double>(type: "double precision", nullable: false),
+                    Status = table.Column<int>(type: "integer", nullable: false),
+                    DateCreate = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    SushiId = table.Column<int>(type: "integer", nullable: false),
+                    ClientId = table.Column<int>(type: "integer", nullable: false),
+                    ImplementerId = table.Column<int>(type: "integer", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Orders", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Orders_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Orders_Implementers_ImplementerId",
+                        column: x => x.ImplementerId,
+                        principalTable: "Implementers",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_Orders_Sushis_SushiId",
+                        column: x => x.SushiId,
+                        principalTable: "Sushis",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "SushiComponents",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    SushiId = table.Column<int>(type: "integer", nullable: false),
+                    ComponentId = table.Column<int>(type: "integer", nullable: false),
+                    Count = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SushiComponents", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_SushiComponents_Components_ComponentId",
+                        column: x => x.ComponentId,
+                        principalTable: "Components",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_SushiComponents_Sushis_SushiId",
+                        column: x => x.SushiId,
+                        principalTable: "Sushis",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ClientId",
+                table: "Orders",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_SushiId",
+                table: "Orders",
+                column: "SushiId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SushiComponents_ComponentId",
+                table: "SushiComponents",
+                column: "ComponentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SushiComponents_SushiId",
+                table: "SushiComponents",
+                column: "SushiId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "SushiComponents");
+
+            migrationBuilder.DropTable(
+                name: "Clients");
+
+            migrationBuilder.DropTable(
+                name: "Implementers");
+
+            migrationBuilder.DropTable(
+                name: "Components");
+
+            migrationBuilder.DropTable(
+                name: "Sushis");
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -0,0 +1,249 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using SushiBarDatabaseImplement;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    [DbContext(typeof(SushiBarDatabase))]
+    partial class SushiBarDatabaseModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.16")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ImplementerFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Qualification")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("WorkExperience")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Implementers");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ImplementerId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("SushiName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sushis");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("SushiComponents");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Orders")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
+                        .WithMany("SushiComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Components")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("SushiComponents");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/MessageInfo.cs

@@ -28,11 +28,11 @@ namespace SushiBarDatabaseImplement.Models
             }
             return new()
             {
-                Body = model.Body ?? string.Empty,
+                Body = model.Body,
-                Subject = model.Subject ?? string.Empty,
+                Subject = model.Subject,
                 ClientId = context.Clients.FirstOrDefault(x => x.Email == model.SenderName)?.Id,
                 MessageId = model.MessageId,
-                SenderName = model.SenderName ?? string.Empty,
+                SenderName = model.SenderName,
                 DateDelivery = model.DateDelivery,
             };
         }

SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs

@@ -9,7 +9,7 @@ namespace SushiBarDatabaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseNpgsql(@"Host=localhost;Database=SushiBar_db7;Username=postgres;Password=postgres");
+                optionsBuilder.UseNpgsql(@"Host=localhost;Database=SushiBar_db6;Username=postgres;Password=postgres");
             }
             base.OnConfiguring(optionsBuilder);
             AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);

SushiBar/SushiBarRestApi/Program.cs

@@ -11,22 +11,12 @@ builder.Logging.SetMinimumLevel(LogLevel.Information);
 builder.Logging.AddLog4Net("log4net.config");
 
 // Add services to the container.
-builder.Services
+builder.Services.AddSingleton<IClientStorage, ClientStorage>();
-    .AddSingleton<IClientStorage, ClientStorage>()
+builder.Services.AddSingleton<IOrderStorage, OrderStorage>();
-    .AddSingleton<IOrderStorage, OrderStorage>()
+builder.Services.AddSingleton<ISushiStorage, SushiStorage>();
-    .AddSingleton<ISushiStorage, SushiStorage>()
+builder.Services.AddSingleton<IOrderLogic, OrderLogic>();
-    .AddSingleton<IMessageInfoStorage, MessageInfoStorage>();
+builder.Services.AddSingleton<IClientLogic, ClientLogic>();
-
+builder.Services.AddSingleton<ISushiLogic, SushiLogic>();
-builder.Services
-    .AddSingleton<IOrderLogic, OrderLogic>()
-    .AddSingleton<IClientLogic, ClientLogic>()
-    .AddSingleton<ISushiLogic, SushiLogic>()
-    .AddSingleton<IMessageInfoLogic, MessageInfoLogic>();
-
-builder.Services
-    .AddSingleton<AbstractMailWorker, MailKitWorker>();
-
-
 builder.Services.AddControllers();
 
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle

SushiBar/SushiBarRestApi/appsettings.json

@@ -5,16 +5,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
+  "AllowedHosts": "*"
-
-  "MailConfigBindingModel": {
-    "SmtpClientHost": "smtp.yandex.ru",
-    "SmtpClientPort": 587,
-
-    "PopHost": "pop.yandex.com",
-    "PopPort": 995,
-
-    "MailLogin": "tester.b.moio@yandex.ru",
-    "MailPassword": "pyzzqswchjevecec"
-  }
 }