From 27e75f84d92eab0ba436f3bec3eef5c71ad45b76 Mon Sep 17 00:00:00 2001 From: Artyom_Yashin Date: Tue, 21 May 2024 17:45:32 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=88=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComputersShop/FormLetter.Designer.cs | 182 ++++++++ ComputersShop/ComputersShop/FormLetter.cs | 150 +++++++ .../{ViewMailForm.resx => FormLetter.resx} | 0 .../ComputersShop/FormMail.Designer.cs | 133 ++++++ ComputersShop/ComputersShop/FormMail.cs | 112 +++++ ComputersShop/ComputersShop/FormMail.resx | 120 ++++++ ComputersShop/ComputersShop/FormMain.cs | 4 +- ComputersShop/ComputersShop/Program.cs | 3 +- .../ComputersShop/ViewMailForm.Designer.cs | 62 --- ComputersShop/ComputersShop/ViewMailForm.cs | 48 --- .../BusinessLogics/MessageInfoLogic.cs | 30 +- .../BusinessLogics/OrderLogic.cs | 4 +- .../MailWorker/AbstractMailWorker.cs | 76 +++- .../MailWorker/MailKitWorker.cs | 57 ++- .../ComputersShopClientApp/APIClient.cs | 2 + .../Controllers/HomeController.cs | 9 +- .../Views/Home/Mails.cshtml | 20 +- .../Views/Shared/_Layout.cshtml | 4 +- .../MailReplySendInfoBindingModel.cs | 13 + .../BindingModels/MessageInfoBindingModel.cs | 3 + .../IMessageInfoLogic.cs | 2 + .../SearchModels/MessageInfoSearchModel.cs | 2 + .../StoragesContracts/IMessageInfoStorage.cs | 14 +- .../ViewModels/MessageInfoViewModel.cs | 15 +- .../IMassageInfoModel.cs | 3 + .../Implements/MessageInfoStorage.cs | 41 +- .../20240521123710_initialCreate.Designer.cs | 394 ++++++++++++++++++ .../20240521123710_initialCreate.cs | 286 +++++++++++++ .../ComputersShopDatabaseModelSnapshot.cs | 17 + .../Models/MessageInfo.cs | 44 +- .../Implements/MessageInfoStorage.cs | 93 +++-- .../Models/MessageInfo.cs | 77 ++-- .../Implements/MessageInfoStorage.cs | 123 +++--- .../Models/MessageInfo.cs | 23 +- .../Controllers/ClientController.cs | 6 +- 35 files changed, 1871 insertions(+), 301 deletions(-) create mode 100644 ComputersShop/ComputersShop/FormLetter.Designer.cs create mode 100644 ComputersShop/ComputersShop/FormLetter.cs rename ComputersShop/ComputersShop/{ViewMailForm.resx => FormLetter.resx} (100%) create mode 100644 ComputersShop/ComputersShop/FormMail.Designer.cs create mode 100644 ComputersShop/ComputersShop/FormMail.cs create mode 100644 ComputersShop/ComputersShop/FormMail.resx delete mode 100644 ComputersShop/ComputersShop/ViewMailForm.Designer.cs delete mode 100644 ComputersShop/ComputersShop/ViewMailForm.cs create mode 100644 ComputersShop/ComputersShopContracts/BindingModels/MailReplySendInfoBindingModel.cs create mode 100644 ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.Designer.cs create mode 100644 ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.cs diff --git a/ComputersShop/ComputersShop/FormLetter.Designer.cs b/ComputersShop/ComputersShop/FormLetter.Designer.cs new file mode 100644 index 0000000..9413fe6 --- /dev/null +++ b/ComputersShop/ComputersShop/FormLetter.Designer.cs @@ -0,0 +1,182 @@ +namespace ComputersShop +{ + partial class FormLetter + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.textBoxEmail = new System.Windows.Forms.TextBox(); + this.labelAdress = new System.Windows.Forms.Label(); + this.labelSubject = new System.Windows.Forms.Label(); + this.textBoxSubject = new System.Windows.Forms.TextBox(); + this.labelBody = new System.Windows.Forms.Label(); + this.textBoxBody = new System.Windows.Forms.TextBox(); + this.buttonClose = new System.Windows.Forms.Button(); + this.buttonReply = new System.Windows.Forms.Button(); + this.labelDate = new System.Windows.Forms.Label(); + this.textBoxDate = new System.Windows.Forms.TextBox(); + this.buttonSend = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBoxEmail + // + this.textBoxEmail.Location = new System.Drawing.Point(72, 6); + this.textBoxEmail.Name = "textBoxEmail"; + this.textBoxEmail.ReadOnly = true; + this.textBoxEmail.Size = new System.Drawing.Size(186, 27); + this.textBoxEmail.TabIndex = 0; + // + // labelAdress + // + this.labelAdress.AutoSize = true; + this.labelAdress.Location = new System.Drawing.Point(12, 9); + this.labelAdress.Name = "labelAdress"; + this.labelAdress.Size = new System.Drawing.Size(54, 20); + this.labelAdress.TabIndex = 1; + this.labelAdress.Text = "Адрес:"; + // + // labelSubject + // + this.labelSubject.AutoSize = true; + this.labelSubject.Location = new System.Drawing.Point(12, 55); + this.labelSubject.Name = "labelSubject"; + this.labelSubject.Size = new System.Drawing.Size(47, 20); + this.labelSubject.TabIndex = 2; + this.labelSubject.Text = "Тема:"; + // + // textBoxSubject + // + this.textBoxSubject.Location = new System.Drawing.Point(72, 52); + this.textBoxSubject.Name = "textBoxSubject"; + this.textBoxSubject.ReadOnly = true; + this.textBoxSubject.Size = new System.Drawing.Size(552, 27); + this.textBoxSubject.TabIndex = 3; + // + // labelBody + // + this.labelBody.AutoSize = true; + this.labelBody.Location = new System.Drawing.Point(12, 96); + this.labelBody.Name = "labelBody"; + this.labelBody.Size = new System.Drawing.Size(104, 20); + this.labelBody.TabIndex = 4; + this.labelBody.Text = "Текст письма:"; + // + // textBoxBody + // + this.textBoxBody.Location = new System.Drawing.Point(12, 119); + this.textBoxBody.Multiline = true; + this.textBoxBody.Name = "textBoxBody"; + this.textBoxBody.ReadOnly = true; + this.textBoxBody.Size = new System.Drawing.Size(612, 186); + this.textBoxBody.TabIndex = 5; + // + // buttonClose + // + this.buttonClose.Location = new System.Drawing.Point(491, 326); + this.buttonClose.Name = "buttonClose"; + this.buttonClose.Size = new System.Drawing.Size(111, 39); + this.buttonClose.TabIndex = 6; + this.buttonClose.Text = "Закрыть"; + this.buttonClose.UseVisualStyleBackColor = true; + this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click); + // + // buttonReply + // + this.buttonReply.Location = new System.Drawing.Point(290, 326); + this.buttonReply.Name = "buttonReply"; + this.buttonReply.Size = new System.Drawing.Size(177, 39); + this.buttonReply.TabIndex = 7; + this.buttonReply.Text = "Ответить"; + this.buttonReply.UseVisualStyleBackColor = true; + this.buttonReply.Click += new System.EventHandler(this.buttonReply_Click); + // + // labelDate + // + this.labelDate.AutoSize = true; + this.labelDate.Location = new System.Drawing.Point(278, 9); + this.labelDate.Name = "labelDate"; + this.labelDate.Size = new System.Drawing.Size(127, 20); + this.labelDate.TabIndex = 8; + this.labelDate.Text = "Дата получения: "; + // + // textBoxDate + // + this.textBoxDate.Location = new System.Drawing.Point(411, 6); + this.textBoxDate.Name = "textBoxDate"; + this.textBoxDate.ReadOnly = true; + this.textBoxDate.Size = new System.Drawing.Size(213, 27); + this.textBoxDate.TabIndex = 9; + // + // buttonSend + // + this.buttonSend.Location = new System.Drawing.Point(149, 326); + this.buttonSend.Name = "buttonSend"; + this.buttonSend.Size = new System.Drawing.Size(109, 39); + this.buttonSend.TabIndex = 10; + this.buttonSend.Text = "Отправить"; + this.buttonSend.UseVisualStyleBackColor = true; + this.buttonSend.Visible = false; + this.buttonSend.Click += new System.EventHandler(this.buttonSend_Click); + // + // FormLetter + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(636, 377); + this.Controls.Add(this.buttonSend); + this.Controls.Add(this.textBoxDate); + this.Controls.Add(this.labelDate); + this.Controls.Add(this.buttonReply); + this.Controls.Add(this.buttonClose); + this.Controls.Add(this.textBoxBody); + this.Controls.Add(this.labelBody); + this.Controls.Add(this.textBoxSubject); + this.Controls.Add(this.labelSubject); + this.Controls.Add(this.labelAdress); + this.Controls.Add(this.textBoxEmail); + this.Name = "FormLetter"; + this.Text = "Письмо"; + this.Load += new System.EventHandler(this.FormLetter_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox textBoxEmail; + private Label labelAdress; + private Label labelSubject; + private TextBox textBoxSubject; + private Label labelBody; + private TextBox textBoxBody; + private Button buttonClose; + private Button buttonReply; + private Label labelDate; + private TextBox textBoxDate; + private Button buttonSend; + } +} \ No newline at end of file diff --git a/ComputersShop/ComputersShop/FormLetter.cs b/ComputersShop/ComputersShop/FormLetter.cs new file mode 100644 index 0000000..2eb517e --- /dev/null +++ b/ComputersShop/ComputersShop/FormLetter.cs @@ -0,0 +1,150 @@ +using ComputersShopBusinessLogic.MailWorker; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.BisnessLogicsContracts; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ComputersShop +{ + public partial class FormLetter : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + private readonly AbstractMailWorker _worker; + + public MessageInfoViewModel? model; + public string? messageId; + + public FormLetter(ILogger logger, IMessageInfoLogic logic, AbstractMailWorker worker) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _worker = worker; + } + + private void FormLetter_Load(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(messageId)) + { + ReloadLetter(); + return; + } + else if (model != null) + { + ConfigurateToCreateAnsver(); + return; + } + _logger.LogError("Для формы не переданно сведений о письме, на которое отвечаем!"); + DialogResult = DialogResult.Abort; + Close(); + return; + } + + private void ReloadLetter() + { + _logger.LogInformation("Загрузка существующего письма с id:{}", messageId); + model = _logic.ReadElement(new MessageInfoSearchModel + { + MessageId = messageId + }); + if (model != null) + { + _logger.LogInformation("Письмо найдено"); + textBoxEmail.Text = model.SenderName; + textBoxDate.Text = model.DateDelivery.ToString(); + textBoxSubject.Text = model.Subject; + textBoxBody.Text = model.Body; + + + if (model.IsReply) + { + _logger.LogInformation("Письмо само и есть ответ"); + buttonReply.Visible = false; + } + else + { + if (!string.IsNullOrEmpty(model.ReplyMessageId)) + { + _logger.LogInformation("У письма есть ответ."); + buttonReply.Text = "Прочитать ответ"; + } + } + return; + } + _logger.LogWarning("Письмо с таким id не удалось найти"); + DialogResult = DialogResult.Abort; + Close(); + return; + } + + private void ConfigurateToCreateAnsver() + { + textBoxEmail.Text = model.SenderName; + labelDate.Visible = false; + textBoxDate.Visible = false; + textBoxSubject.Text = $"re: {model.Subject}"; + textBoxBody.ReadOnly = false; + buttonReply.Visible = false; + buttonSend.Visible = true; + _logger.LogInformation("Запущена форма создания нового письма - ответа"); + } + + private void buttonClose_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void buttonReply_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormLetter)); + if (service is FormLetter form) + { + if (!string.IsNullOrEmpty(model.ReplyMessageId)) + { + form.messageId = model.ReplyMessageId; + } + else + { + form.model = model; + } + + if (form.ShowDialog() != DialogResult.Cancel) + { + buttonReply.Visible = false; + } + } + } + + private void buttonSend_Click(object sender, EventArgs e) + { + if (model == null) + { + return; + } + string subject = textBoxSubject.Text; + string text = textBoxBody.Text; + + Task.Run(() => _worker.MailSendReplyAsync(new MailReplySendInfoBindingModel + { + MailAddress = model.SenderName, + Subject = subject, + Text = text, + ParentMessageId = model.MessageId, + })); + DialogResult = DialogResult.OK; + Close(); + } + } +} diff --git a/ComputersShop/ComputersShop/ViewMailForm.resx b/ComputersShop/ComputersShop/FormLetter.resx similarity index 100% rename from ComputersShop/ComputersShop/ViewMailForm.resx rename to ComputersShop/ComputersShop/FormLetter.resx diff --git a/ComputersShop/ComputersShop/FormMail.Designer.cs b/ComputersShop/ComputersShop/FormMail.Designer.cs new file mode 100644 index 0000000..5eda654 --- /dev/null +++ b/ComputersShop/ComputersShop/FormMail.Designer.cs @@ -0,0 +1,133 @@ +namespace ComputersShop +{ + partial class FormMail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.panel1 = new System.Windows.Forms.Panel(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonOpen = new System.Windows.Forms.Button(); + this.numericUpDownPage = new System.Windows.Forms.NumericUpDown(); + this.buttonPreveous = new System.Windows.Forms.Button(); + this.buttonNext = new System.Windows.Forms.Button(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.Controls.Add(this.dataGridView); + this.panel1.Location = new System.Drawing.Point(3, 1); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(795, 431); + this.panel1.TabIndex = 0; + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersWidth = 51; + this.dataGridView.RowTemplate.Height = 29; + this.dataGridView.Size = new System.Drawing.Size(795, 431); + this.dataGridView.TabIndex = 2; + // + // buttonOpen + // + this.buttonOpen.Location = new System.Drawing.Point(806, 80); + this.buttonOpen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonOpen.Name = "buttonOpen"; + this.buttonOpen.Size = new System.Drawing.Size(107, 31); + this.buttonOpen.TabIndex = 1; + this.buttonOpen.Text = "Прочитать"; + this.buttonOpen.UseVisualStyleBackColor = true; + this.buttonOpen.Click += new System.EventHandler(this.buttonOpen_Click); + // + // numericUpDownPage + // + this.numericUpDownPage.Location = new System.Drawing.Point(825, 287); + this.numericUpDownPage.Name = "numericUpDownPage"; + this.numericUpDownPage.Size = new System.Drawing.Size(85, 27); + this.numericUpDownPage.TabIndex = 4; + this.numericUpDownPage.ValueChanged += new System.EventHandler(this.numericUpDownPage_ValueChanged); + // + // buttonPreveous + // + this.buttonPreveous.Location = new System.Drawing.Point(825, 323); + this.buttonPreveous.Name = "buttonPreveous"; + this.buttonPreveous.Size = new System.Drawing.Size(39, 29); + this.buttonPreveous.TabIndex = 5; + this.buttonPreveous.Text = "<-"; + this.buttonPreveous.UseVisualStyleBackColor = true; + this.buttonPreveous.Click += new System.EventHandler(this.buttonPreveous_Click); + // + // buttonNext + // + this.buttonNext.Location = new System.Drawing.Point(872, 323); + this.buttonNext.Name = "buttonNext"; + this.buttonNext.Size = new System.Drawing.Size(39, 29); + this.buttonNext.TabIndex = 6; + this.buttonNext.Text = "->"; + this.buttonNext.UseVisualStyleBackColor = true; + this.buttonNext.Click += new System.EventHandler(this.buttonNext_Click); + // + // FormMail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(925, 428); + this.Controls.Add(this.buttonNext); + this.Controls.Add(this.buttonPreveous); + this.Controls.Add(this.numericUpDownPage); + this.Controls.Add(this.buttonOpen); + this.Controls.Add(this.panel1); + this.Name = "FormMail"; + this.Text = "Письма"; + this.Load += new System.EventHandler(this.FormMail_Load); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Panel panel1; + private DataGridView dataGridView; + private Button buttonOpen; + private NumericUpDown numericUpDownPage; + private Button buttonPreveous; + private Button buttonNext; + } +} \ No newline at end of file diff --git a/ComputersShop/ComputersShop/FormMail.cs b/ComputersShop/ComputersShop/FormMail.cs new file mode 100644 index 0000000..243ff12 --- /dev/null +++ b/ComputersShop/ComputersShop/FormMail.cs @@ -0,0 +1,112 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.BisnessLogicsContracts; +using ComputersShopContracts.SearchModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ComputersShop +{ + public partial class FormMail : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + private int currentPage = 1; + private int pageLength = 2; + + public FormMail(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(new MessageInfoSearchModel() + { + PageLength = pageLength, + PageIndex = currentPage + + }); + numericUpDownPage.Value = pageLength; + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["ReplyMessageId"].Visible = false; + dataGridView.Columns["Reply"].Visible = false; + dataGridView.Columns["IsReply"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = + DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка почтовых собщений"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки почтовых сообщений"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void FormMail_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void buttonOpen_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count <= 0) + return; + + var service = Program.ServiceProvider?.GetService(typeof(FormLetter)); + if (service is FormLetter form) + { + string? messageId = dataGridView.SelectedRows[0].Cells["MessageId"].Value.ToString(); + if (messageId == null) return; + form.messageId = messageId; + + if (!Convert.ToBoolean(dataGridView.SelectedRows[0].Cells["IsReaded"].Value)) + { + _logic.Update(new MessageInfoBindingModel + { + MessageId = messageId, + IsReaded = true, + ReplyMessageId = dataGridView.SelectedRows[0].Cells["ReplyMessageId"].Value?.ToString() + }); + } + + form.ShowDialog(); + LoadData(); + } + } + + private void buttonPreveous_Click(object sender, EventArgs e) + { + currentPage = Math.Max(1, currentPage - 1); + LoadData(); + } + + private void buttonNext_Click(object sender, EventArgs e) + { + currentPage++; + LoadData(); + } + + private void numericUpDownPage_ValueChanged(object sender, EventArgs e) + { + pageLength = Math.Max(1, (int)numericUpDownPage.Value); + LoadData(); + } + } +} diff --git a/ComputersShop/ComputersShop/FormMail.resx b/ComputersShop/ComputersShop/FormMail.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ComputersShop/ComputersShop/FormMail.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ComputersShop/ComputersShop/FormMain.cs b/ComputersShop/ComputersShop/FormMain.cs index 680842f..1f9bbde 100644 --- a/ComputersShop/ComputersShop/FormMain.cs +++ b/ComputersShop/ComputersShop/FormMain.cs @@ -212,8 +212,8 @@ namespace ComputersShop } private void почтаToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(ViewMailForm)); - if (service is ViewMailForm form) + var service = Program.ServiceProvider?.GetService(typeof(FormMail)); + if (service is FormMail form) { form.ShowDialog(); } diff --git a/ComputersShop/ComputersShop/Program.cs b/ComputersShop/ComputersShop/Program.cs index 9cdca49..ab6a6d0 100644 --- a/ComputersShop/ComputersShop/Program.cs +++ b/ComputersShop/ComputersShop/Program.cs @@ -103,7 +103,8 @@ namespace ComputersShop services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/ComputersShop/ComputersShop/ViewMailForm.Designer.cs b/ComputersShop/ComputersShop/ViewMailForm.Designer.cs deleted file mode 100644 index 2eb5c4e..0000000 --- a/ComputersShop/ComputersShop/ViewMailForm.Designer.cs +++ /dev/null @@ -1,62 +0,0 @@ -namespace ComputersShop -{ - partial class ViewMailForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - dataGridView = new DataGridView(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // dataGridView - // - 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; - // - // ViewMailForm - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(dataGridView); - Name = "ViewMailForm"; - Text = "Почта"; - Load += ViewMailForm_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - } - - #endregion - - private DataGridView dataGridView; - } -} \ No newline at end of file diff --git a/ComputersShop/ComputersShop/ViewMailForm.cs b/ComputersShop/ComputersShop/ViewMailForm.cs deleted file mode 100644 index 0967729..0000000 --- a/ComputersShop/ComputersShop/ViewMailForm.cs +++ /dev/null @@ -1,48 +0,0 @@ -using ComputersShopContracts.BisnessLogicsContracts; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ComputersShop -{ - public partial class ViewMailForm : Form - { - private readonly ILogger _logger; - private readonly IMessageInfoLogic _logic; - public ViewMailForm(ILogger logger, IMessageInfoLogic logic) - { - InitializeComponent(); - _logger = logger; - _logic = logic; - } - - private void ViewMailForm_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); - } - } - } -} diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs index 6a92f28..e2b7620 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -44,5 +44,33 @@ namespace ComputersShopBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } - } + + public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. MessageId:{MessageId}", model?.MessageId); + var element = _messageInfoStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.MessageId); + return element; + } + + public bool Update(MessageInfoBindingModel model) + { + if (_messageInfoStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + } } + diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs index 432b72c..4ae03d4 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -27,6 +27,8 @@ namespace ComputersShopBusinessLogic.BusinessLogics _shopStorage = shopStorage; _shopLogic = shopLogic; _computerStorage = computerStorage; + _mailWorker = mailWorker; + _clientLogic = clientLogic; } public List? ReadList(OrderSearchModel? model) @@ -215,7 +217,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics } private bool SendOrderStatusMail(int clientId, string subject, string text) { - var client = _clientLogic.ReadElement(new() { Id = clientId }); + var client = _clientLogic.ReadElement(new ClientSearchModel() { Id = clientId }); if (client == null) { return false; diff --git a/ComputersShop/ComputersShopBusinessLogic/MailWorker/AbstractMailWorker.cs b/ComputersShop/ComputersShopBusinessLogic/MailWorker/AbstractMailWorker.cs index 7cd2c83..541965c 100644 --- a/ComputersShop/ComputersShopBusinessLogic/MailWorker/AbstractMailWorker.cs +++ b/ComputersShop/ComputersShopBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -9,8 +9,8 @@ using System.Threading.Tasks; namespace ComputersShopBusinessLogic.MailWorker { - public abstract class AbstractMailWorker - { + public abstract class AbstractMailWorker + { protected string _mailLogin = string.Empty; protected string _mailPassword = string.Empty; protected string _smtpClientHost = string.Empty; @@ -19,8 +19,8 @@ namespace ComputersShopBusinessLogic.MailWorker protected int _popPort; private readonly IMessageInfoLogic _messageInfoLogic; private readonly ILogger _logger; - public AbstractMailWorker(ILogger logger, - IMessageInfoLogic messageInfoLogic) + + public AbstractMailWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) { _logger = logger; _messageInfoLogic = messageInfoLogic; @@ -33,45 +33,45 @@ namespace ComputersShopBusinessLogic.MailWorker _smtpClientPort = config.SmtpClientPort; _popHost = config.PopHost; _popPort = config.PopPort; - _logger.LogDebug("Config: {login}, {password}, " + - "{clientHost}, { clientPOrt}, { popHost}, { popPort}", - _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort); + _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword.Length, _smtpClientHost, _smtpClientPort, _popHost, _popPort); } public async void MailSendAsync(MailSendInfoBindingModel info) { - if (string.IsNullOrEmpty(_mailLogin) || - string.IsNullOrEmpty(_mailPassword)) + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) { return; } + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) { return; } - if (string.IsNullOrEmpty(info.MailAddress) || - string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text)) + + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text)) { return; } - _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, - info.Subject); + + _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject); await SendMailAsync(info); } public async void MailCheck() { - if (string.IsNullOrEmpty(_mailLogin) || - string.IsNullOrEmpty(_mailPassword)) + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) { return; } + if (string.IsNullOrEmpty(_popHost) || _popPort == 0) { return; } + if (_messageInfoLogic == null) { return; } + var list = await ReceiveMailAsync(); _logger.LogDebug("Check Mail: {Count} new mails", list.Count); foreach (var mail in list) @@ -79,7 +79,51 @@ namespace ComputersShopBusinessLogic.MailWorker _messageInfoLogic.Create(mail); } } - protected abstract Task SendMailAsync(MailSendInfoBindingModel info); + + public async void MailSendReplyAsync(MailReplySendInfoBindingModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text) || string.IsNullOrEmpty(info.ParentMessageId)) + { + return; + } + + _logger.LogDebug("Send Mail as reply: {To}, {Subject}, {parentId}", info.MailAddress, info.Subject, info.ParentMessageId); + + string? messageId = await SendMailAsync(info); + if (string.IsNullOrEmpty(messageId)) + { + throw new InvalidOperationException("Непредвиденная ошибка при отправке сообщения в ответ"); + } + if (_messageInfoLogic.Create(new MessageInfoBindingModel + { + MessageId = messageId, + DateDelivery = DateTime.Now, + SenderName = _mailLogin, + IsReply = true, + Subject = info.Subject, + Body = info.Text, + })) + { + _messageInfoLogic.Update(new MessageInfoBindingModel() + { + MessageId = info.ParentMessageId, + ReplyMessageId = messageId, + IsReaded = true + }); + } + } + + protected abstract Task SendMailAsync(MailSendInfoBindingModel info); protected abstract Task> ReceiveMailAsync(); } } diff --git a/ComputersShop/ComputersShopBusinessLogic/MailWorker/MailKitWorker.cs b/ComputersShop/ComputersShopBusinessLogic/MailWorker/MailKitWorker.cs index da599cd..37bca7e 100644 --- a/ComputersShop/ComputersShopBusinessLogic/MailWorker/MailKitWorker.cs +++ b/ComputersShop/ComputersShopBusinessLogic/MailWorker/MailKitWorker.cs @@ -15,33 +15,39 @@ using DocumentFormat.OpenXml.Wordprocessing; namespace ComputersShopBusinessLogic.MailWorker { - public class MailKitWorker : AbstractMailWorker - { + public class MailKitWorker : AbstractMailWorker + { public MailKitWorker(ILogger logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { } - protected override async Task SendMailAsync(MailSendInfoBindingModel info) + + protected override async Task SendMailAsync(MailSendInfoBindingModel info) { + string? resount = null; using var objMailMessage = new MailMessage(); using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort); try { - objMailMessage.From = new MailAddress(_mailLogin); - objMailMessage.To.Add(new MailAddress(info.MailAddress)); - objMailMessage.Subject = info.Subject; - objMailMessage.Body = info.Text; - objMailMessage.SubjectEncoding = Encoding.UTF8; - objMailMessage.BodyEncoding = Encoding.UTF8; - objSmtpClient.UseDefaultCredentials = false; - objSmtpClient.EnableSsl = true; - objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; - objSmtpClient.Credentials = new NetworkCredential(_mailLogin, - _mailPassword); + ConfigurateSmtpClient(objSmtpClient); + CreateMessage(objMailMessage, info); + + if (info is MailReplySendInfoBindingModel replyInfo) + { + objMailMessage.Headers.Add("In-Reply-To", replyInfo.ParentMessageId); + objMailMessage.Headers.Add("References", replyInfo.ParentMessageId); + + string messageGuid = Guid.NewGuid().ToString(); + objMailMessage.Headers.Add("Message-Id", messageGuid); + resount = messageGuid; + } + await Task.Run(() => objSmtpClient.Send(objMailMessage)); } catch (Exception) { throw; } + return resount; } + protected override async Task> ReceiveMailAsync() { var list = new List(); @@ -50,8 +56,7 @@ namespace ComputersShopBusinessLogic.MailWorker { try { - client.Connect(_popHost, _popPort, - SecureSocketOptions.SslOnConnect); + client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect); client.Authenticate(_mailLogin, _mailPassword); for (int i = 0; i < client.Count; i++) { @@ -69,7 +74,7 @@ namespace ComputersShopBusinessLogic.MailWorker } } } - catch (AuthenticationException) + catch (MailKit.Security.AuthenticationException) { } finally { @@ -79,5 +84,23 @@ namespace ComputersShopBusinessLogic.MailWorker return list; } + private void CreateMessage(MailMessage objMailMessage, MailSendInfoBindingModel info) + { + objMailMessage.From = new MailAddress(_mailLogin); + objMailMessage.To.Add(new MailAddress(info.MailAddress)); + objMailMessage.Subject = info.Subject; + objMailMessage.Body = info.Text; + objMailMessage.SubjectEncoding = Encoding.UTF8; + objMailMessage.BodyEncoding = Encoding.UTF8; + } + + private void ConfigurateSmtpClient(SmtpClient objSmtpClient) + { + + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + } } } diff --git a/ComputersShop/ComputersShopClientApp/APIClient.cs b/ComputersShop/ComputersShopClientApp/APIClient.cs index de67eac..c50cbf0 100644 --- a/ComputersShop/ComputersShopClientApp/APIClient.cs +++ b/ComputersShop/ComputersShopClientApp/APIClient.cs @@ -9,6 +9,8 @@ namespace ComputersShopClientApp { private static readonly HttpClient _client = new(); public static ClientViewModel? Client { get; set; } = null; + + public static int MaipPage { get; set; } = 1; public static void Connect(IConfiguration configuration) { _client.BaseAddress = new Uri(configuration["IPAddress"]); diff --git a/ComputersShop/ComputersShopClientApp/Controllers/HomeController.cs b/ComputersShop/ComputersShopClientApp/Controllers/HomeController.cs index 7c7a1a7..e755cbe 100644 --- a/ComputersShop/ComputersShopClientApp/Controllers/HomeController.cs +++ b/ComputersShop/ComputersShopClientApp/Controllers/HomeController.cs @@ -137,20 +137,19 @@ namespace ComputersShopClientApp.Controllers [HttpPost] public double Calc(int count, int computer) { - var prod = - APIClient.GetRequest($"api/main/getcomputer?computerId={computer}" + var prod = APIClient.GetRequest($"api/main/getcomputer?computerId={computer}" ); return count * (prod?.Price ?? 1); } [HttpGet] - public IActionResult Mails() + public IActionResult Mails(int page = 1) { if (APIClient.Client == null) { return Redirect("~/Home/Enter"); } - return - View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + page = Math.Max(page, 1); + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}&page={page}")); } } } \ No newline at end of file diff --git a/ComputersShop/ComputersShopClientApp/Views/Home/Mails.cshtml b/ComputersShop/ComputersShopClientApp/Views/Home/Mails.cshtml index bd1c21c..e588f10 100644 --- a/ComputersShop/ComputersShopClientApp/Views/Home/Mails.cshtml +++ b/ComputersShop/ComputersShopClientApp/Views/Home/Mails.cshtml @@ -1,7 +1,7 @@ @using ComputersShopContracts.ViewModels @model List - +@Url.ActionContext.RouteData.Values["page"] @{ ViewData["Title"] = "Mails"; } @@ -50,5 +50,23 @@ } +
+ @{ + int page = int.Parse(Context.Request.Query["page"]); +
+ +
+ if (page > 1) + { + <- + } + else + { +

<-

+ } + + -> + } +
} \ No newline at end of file diff --git a/ComputersShop/ComputersShopClientApp/Views/Shared/_Layout.cshtml b/ComputersShop/ComputersShopClientApp/Views/Shared/_Layout.cshtml index 7d4cc27..0365ad0 100644 --- a/ComputersShop/ComputersShopClientApp/Views/Shared/_Layout.cshtml +++ b/ComputersShop/ComputersShopClientApp/Views/Shared/_Layout.cshtml @@ -33,7 +33,7 @@ Регистрация
  • - Письма + Письма
    • @@ -47,7 +47,7 @@ diff --git a/ComputersShop/ComputersShopContracts/BindingModels/MailReplySendInfoBindingModel.cs b/ComputersShop/ComputersShopContracts/BindingModels/MailReplySendInfoBindingModel.cs new file mode 100644 index 0000000..5afc739 --- /dev/null +++ b/ComputersShop/ComputersShopContracts/BindingModels/MailReplySendInfoBindingModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopContracts.BindingModels +{ + public class MailReplySendInfoBindingModel : MailSendInfoBindingModel + { + public string ParentMessageId { get; set; } = string.Empty; + } +} diff --git a/ComputersShop/ComputersShopContracts/BindingModels/MessageInfoBindingModel.cs b/ComputersShop/ComputersShopContracts/BindingModels/MessageInfoBindingModel.cs index d621eda..4865422 100644 --- a/ComputersShop/ComputersShopContracts/BindingModels/MessageInfoBindingModel.cs +++ b/ComputersShop/ComputersShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,8 @@ namespace ComputersShopContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public bool IsReaded { get; set; } + public string? ReplyMessageId { get; set; } + public bool IsReply { get; set; } } } diff --git a/ComputersShop/ComputersShopContracts/BisnessLogicsContracts/IMessageInfoLogic.cs b/ComputersShop/ComputersShopContracts/BisnessLogicsContracts/IMessageInfoLogic.cs index 6bc1dac..434a804 100644 --- a/ComputersShop/ComputersShopContracts/BisnessLogicsContracts/IMessageInfoLogic.cs +++ b/ComputersShop/ComputersShopContracts/BisnessLogicsContracts/IMessageInfoLogic.cs @@ -12,6 +12,8 @@ namespace ComputersShopContracts.BisnessLogicsContracts public interface IMessageInfoLogic { List? ReadList(MessageInfoSearchModel? model); + MessageInfoViewModel? ReadElement(MessageInfoSearchModel model); bool Create(MessageInfoBindingModel model); + bool Update(MessageInfoBindingModel model); } } diff --git a/ComputersShop/ComputersShopContracts/SearchModels/MessageInfoSearchModel.cs b/ComputersShop/ComputersShopContracts/SearchModels/MessageInfoSearchModel.cs index 9cb6993..a526285 100644 --- a/ComputersShop/ComputersShopContracts/SearchModels/MessageInfoSearchModel.cs +++ b/ComputersShop/ComputersShopContracts/SearchModels/MessageInfoSearchModel.cs @@ -10,5 +10,7 @@ namespace ComputersShopContracts.SearchModels { public int? ClientId { get; set; } public string? MessageId { get; set; } + public int? PageLength { get; set; } + public int? PageIndex { get; set;} } } diff --git a/ComputersShop/ComputersShopContracts/StoragesContracts/IMessageInfoStorage.cs b/ComputersShop/ComputersShopContracts/StoragesContracts/IMessageInfoStorage.cs index 64dfea8..ff9e13b 100644 --- a/ComputersShop/ComputersShopContracts/StoragesContracts/IMessageInfoStorage.cs +++ b/ComputersShop/ComputersShopContracts/StoragesContracts/IMessageInfoStorage.cs @@ -11,12 +11,10 @@ namespace ComputersShopContracts.StoragesContracts { public interface IMessageInfoStorage { - List GetFullList(); - - List GetFilteredList(MessageInfoSearchModel model); - - MessageInfoViewModel? GetElement(MessageInfoSearchModel model); - - MessageInfoViewModel? Insert(MessageInfoBindingModel model); - } + List GetFullList(); + List GetFilteredList(MessageInfoSearchModel model); + MessageInfoViewModel? GetElement(MessageInfoSearchModel model); + MessageInfoViewModel? Insert(MessageInfoBindingModel model); + MessageInfoViewModel? Update(MessageInfoBindingModel model); + } } diff --git a/ComputersShop/ComputersShopContracts/ViewModels/MessageInfoViewModel.cs b/ComputersShop/ComputersShopContracts/ViewModels/MessageInfoViewModel.cs index 7f8a8a8..515381d 100644 --- a/ComputersShop/ComputersShopContracts/ViewModels/MessageInfoViewModel.cs +++ b/ComputersShop/ComputersShopContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ -using System; +using ComputersShopDataModels; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -23,5 +24,15 @@ namespace ComputersShopContracts.ViewModels [DisplayName("Текст")] public string Body { get; set; } = string.Empty; - } + + + [DisplayName("Прочитанно")] + public bool IsReaded { get; set; } + + public string? ReplyMessageId { get; set; } + + public IMassageInfoModel? Reply { get; set; } + + public bool IsReply { get; set; } + } } diff --git a/ComputersShop/ComputersShopDataModels/IMassageInfoModel.cs b/ComputersShop/ComputersShopDataModels/IMassageInfoModel.cs index 213e183..f89980a 100644 --- a/ComputersShop/ComputersShopDataModels/IMassageInfoModel.cs +++ b/ComputersShop/ComputersShopDataModels/IMassageInfoModel.cs @@ -14,5 +14,8 @@ namespace ComputersShopDataModels DateTime DateDelivery { get; } string Subject { get; } string Body { get; } + bool IsReaded { get; } + string? ReplyMessageId { get; } + bool IsReply { get; } } } diff --git a/ComputersShop/ComputersShopDatabaseImplement/Implements/MessageInfoStorage.cs b/ComputersShop/ComputersShopDatabaseImplement/Implements/MessageInfoStorage.cs index 7e3a38d..a0344c6 100644 --- a/ComputersShop/ComputersShopDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/ComputersShop/ComputersShopDatabaseImplement/Implements/MessageInfoStorage.cs @@ -16,7 +16,7 @@ namespace ComputersShopDatabaseImplement.Implements public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) { using var context = new ComputersShopDatabase(); - if (model.MessageId != null) + if (!string.IsNullOrEmpty(model.MessageId)) { return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; } @@ -25,14 +25,24 @@ namespace ComputersShopDatabaseImplement.Implements public List GetFilteredList(MessageInfoSearchModel model) { - using var context = new ComputersShopDatabase(); - return context.Messages - .Where(x => x.ClientId == model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); - } + if (!model.ClientId.HasValue && !model.PageLength.HasValue && !model.PageIndex.HasValue) + { + return new(); + } + using var context = new ComputersShopDatabase(); + IEnumerable request = context.Messages.Where(x => !x.IsReply); + if (model.ClientId.HasValue) + request = request.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId); + if (model.PageLength.HasValue) + { + int skipRows = model.PageIndex.HasValue ? (model.PageIndex.Value - 1) * model.PageLength.Value : 0; + request = request.Skip(skipRows).Take(model.PageLength.Value); + } - public List GetFullList() + return request.Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() { using var context = new ComputersShopDatabase(); return context.Messages @@ -52,5 +62,18 @@ namespace ComputersShopDatabaseImplement.Implements context.SaveChanges(); return newMessage.GetViewModel; } - } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + using var context = new ComputersShopDatabase(); + var message = context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId); + if (message == null) + { + return null; + } + message.Update(context, model); + context.SaveChanges(); + return message.GetViewModel; + } + } } diff --git a/ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.Designer.cs b/ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.Designer.cs new file mode 100644 index 0000000..649df38 --- /dev/null +++ b/ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.Designer.cs @@ -0,0 +1,394 @@ +// +using System; +using ComputersShopDatabaseImplement; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace ComputersShopDatabaseImplement.Migrations +{ + [DbContext(typeof(ComputersShopDatabase))] + [Migration("20240521123710_initialCreate")] + partial class initialCreate + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.17") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Computer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComputerName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Computers"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.ComputerComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("ComputerId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("ComputerId"); + + b.ToTable("ComputerComponents"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Implementer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ImplementerFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Qualification") + .HasColumnType("int"); + + b.Property("WorkExperience") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Implementers"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("IsReaded") + .HasColumnType("bit"); + + b.Property("IsReply") + .HasColumnType("bit"); + + b.Property("ReplyMessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.HasIndex("ReplyMessageId"); + + b.ToTable("Messages"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("ComputerId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("ImplementerId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ComputerId"); + + b.HasIndex("ImplementerId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DateOpen") + .HasColumnType("datetime2"); + + b.Property("MaxCapacity") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.ShopComputer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComputerId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ComputerId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopComputers"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.ComputerComponent", b => + { + b.HasOne("ComputersShopDatabaseImplement.Models.Component", "Component") + .WithMany("ComputerComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ComputersShopDatabaseImplement.Models.Computer", "Computer") + .WithMany("Components") + .HasForeignKey("ComputerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Computer"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("ComputersShopDatabaseImplement.Models.Client", "Client") + .WithMany("MessageInfos") + .HasForeignKey("ClientId"); + + b.HasOne("ComputersShopDatabaseImplement.Models.MessageInfo", "Reply") + .WithMany() + .HasForeignKey("ReplyMessageId"); + + b.Navigation("Client"); + + b.Navigation("Reply"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Order", b => + { + b.HasOne("ComputersShopDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ComputersShopDatabaseImplement.Models.Computer", "Computers") + .WithMany("Orders") + .HasForeignKey("ComputerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ComputersShopDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Orders") + .HasForeignKey("ImplementerId"); + + b.Navigation("Client"); + + b.Navigation("Computers"); + + b.Navigation("Implementer"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.ShopComputer", b => + { + b.HasOne("ComputersShopDatabaseImplement.Models.Computer", "Computer") + .WithMany("ShopComputers") + .HasForeignKey("ComputerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("ComputersShopDatabaseImplement.Models.Shop", "Shop") + .WithMany("Computers") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Computer"); + + b.Navigation("Shop"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Client", b => + { + b.Navigation("MessageInfos"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Component", b => + { + b.Navigation("ComputerComponents"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Computer", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + + b.Navigation("ShopComputers"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Orders"); + }); + + modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Shop", b => + { + b.Navigation("Computers"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.cs b/ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.cs new file mode 100644 index 0000000..ce30f75 --- /dev/null +++ b/ComputersShop/ComputersShopDatabaseImplement/Migrations/20240521123710_initialCreate.cs @@ -0,0 +1,286 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace ComputersShopDatabaseImplement.Migrations +{ + /// + public partial class initialCreate : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Clients", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ClientFIO = table.Column(type: "nvarchar(max)", nullable: false), + Email = table.Column(type: "nvarchar(max)", nullable: false), + Password = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Clients", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Components", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ComponentName = table.Column(type: "nvarchar(max)", nullable: false), + Cost = table.Column(type: "float", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Components", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Computers", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ComputerName = table.Column(type: "nvarchar(max)", nullable: false), + Price = table.Column(type: "float", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Computers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Implementers", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ImplementerFIO = table.Column(type: "nvarchar(max)", nullable: false), + Password = table.Column(type: "nvarchar(max)", nullable: false), + Qualification = table.Column(type: "int", nullable: false), + WorkExperience = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Implementers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Shops", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ShopName = table.Column(type: "nvarchar(max)", nullable: false), + Address = table.Column(type: "nvarchar(max)", nullable: false), + DateOpen = table.Column(type: "datetime2", nullable: false), + MaxCapacity = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Shops", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Messages", + columns: table => new + { + MessageId = table.Column(type: "nvarchar(450)", nullable: false), + ClientId = table.Column(type: "int", nullable: true), + SenderName = table.Column(type: "nvarchar(max)", nullable: false), + DateDelivery = table.Column(type: "datetime2", nullable: false), + Subject = table.Column(type: "nvarchar(max)", nullable: false), + Body = table.Column(type: "nvarchar(max)", nullable: false), + IsReaded = table.Column(type: "bit", nullable: false), + ReplyMessageId = table.Column(type: "nvarchar(450)", nullable: true), + IsReply = table.Column(type: "bit", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Messages", x => x.MessageId); + table.ForeignKey( + name: "FK_Messages_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id"); + table.ForeignKey( + name: "FK_Messages_Messages_ReplyMessageId", + column: x => x.ReplyMessageId, + principalTable: "Messages", + principalColumn: "MessageId"); + }); + + migrationBuilder.CreateTable( + name: "ComputerComponents", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ComputerId = table.Column(type: "int", nullable: false), + ComponentId = table.Column(type: "int", nullable: false), + Count = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ComputerComponents", x => x.Id); + table.ForeignKey( + name: "FK_ComputerComponents_Components_ComponentId", + column: x => x.ComponentId, + principalTable: "Components", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_ComputerComponents_Computers_ComputerId", + column: x => x.ComputerId, + principalTable: "Computers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Orders", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + Count = table.Column(type: "int", nullable: false), + Sum = table.Column(type: "float", nullable: false), + Status = table.Column(type: "int", nullable: false), + DateCreate = table.Column(type: "datetime2", nullable: false), + DateImplement = table.Column(type: "datetime2", nullable: true), + ComputerId = table.Column(type: "int", nullable: false), + ClientId = table.Column(type: "int", nullable: false), + ImplementerId = table.Column(type: "int", 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_Computers_ComputerId", + column: x => x.ComputerId, + principalTable: "Computers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Orders_Implementers_ImplementerId", + column: x => x.ImplementerId, + principalTable: "Implementers", + principalColumn: "Id"); + }); + + migrationBuilder.CreateTable( + name: "ShopComputers", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ComputerId = table.Column(type: "int", nullable: false), + ShopId = table.Column(type: "int", nullable: false), + Count = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ShopComputers", x => x.Id); + table.ForeignKey( + name: "FK_ShopComputers_Computers_ComputerId", + column: x => x.ComputerId, + principalTable: "Computers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_ShopComputers_Shops_ShopId", + column: x => x.ShopId, + principalTable: "Shops", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_ComputerComponents_ComponentId", + table: "ComputerComponents", + column: "ComponentId"); + + migrationBuilder.CreateIndex( + name: "IX_ComputerComponents_ComputerId", + table: "ComputerComponents", + column: "ComputerId"); + + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_Messages_ReplyMessageId", + table: "Messages", + column: "ReplyMessageId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ClientId", + table: "Orders", + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ComputerId", + table: "Orders", + column: "ComputerId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ImplementerId", + table: "Orders", + column: "ImplementerId"); + + migrationBuilder.CreateIndex( + name: "IX_ShopComputers_ComputerId", + table: "ShopComputers", + column: "ComputerId"); + + migrationBuilder.CreateIndex( + name: "IX_ShopComputers_ShopId", + table: "ShopComputers", + column: "ShopId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "ComputerComponents"); + + migrationBuilder.DropTable( + name: "Messages"); + + migrationBuilder.DropTable( + name: "Orders"); + + migrationBuilder.DropTable( + name: "ShopComputers"); + + migrationBuilder.DropTable( + name: "Components"); + + migrationBuilder.DropTable( + name: "Clients"); + + migrationBuilder.DropTable( + name: "Implementers"); + + migrationBuilder.DropTable( + name: "Computers"); + + migrationBuilder.DropTable( + name: "Shops"); + } + } +} diff --git a/ComputersShop/ComputersShopDatabaseImplement/Migrations/ComputersShopDatabaseModelSnapshot.cs b/ComputersShop/ComputersShopDatabaseImplement/Migrations/ComputersShopDatabaseModelSnapshot.cs index 7d6ad96..0aa6493 100644 --- a/ComputersShop/ComputersShopDatabaseImplement/Migrations/ComputersShopDatabaseModelSnapshot.cs +++ b/ComputersShop/ComputersShopDatabaseImplement/Migrations/ComputersShopDatabaseModelSnapshot.cs @@ -155,6 +155,15 @@ namespace ComputersShopDatabaseImplement.Migrations b.Property("DateDelivery") .HasColumnType("datetime2"); + b.Property("IsReaded") + .HasColumnType("bit"); + + b.Property("IsReply") + .HasColumnType("bit"); + + b.Property("ReplyMessageId") + .HasColumnType("nvarchar(450)"); + b.Property("SenderName") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -167,6 +176,8 @@ namespace ComputersShopDatabaseImplement.Migrations b.HasIndex("ClientId"); + b.HasIndex("ReplyMessageId"); + b.ToTable("Messages"); }); @@ -291,7 +302,13 @@ namespace ComputersShopDatabaseImplement.Migrations .WithMany("MessageInfos") .HasForeignKey("ClientId"); + b.HasOne("ComputersShopDatabaseImplement.Models.MessageInfo", "Reply") + .WithMany() + .HasForeignKey("ReplyMessageId"); + b.Navigation("Client"); + + b.Navigation("Reply"); }); modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Order", b => diff --git a/ComputersShop/ComputersShopDatabaseImplement/Models/MessageInfo.cs b/ComputersShop/ComputersShopDatabaseImplement/Models/MessageInfo.cs index 5cb8e6e..b3d5341 100644 --- a/ComputersShop/ComputersShopDatabaseImplement/Models/MessageInfo.cs +++ b/ComputersShop/ComputersShopDatabaseImplement/Models/MessageInfo.cs @@ -4,6 +4,7 @@ using ComputersShopDataModels; 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; @@ -16,16 +17,22 @@ namespace ComputersShopDatabaseImplement.Models public string MessageId { get; private set; } = string.Empty; public int? ClientId { get; private set; } - - public string SenderName { get; private set; } = string.Empty; - + public Client? Client { get; private set; } + [Required] + public string SenderName { get; private set; } = string.Empty; + [Required] public DateTime DateDelivery { get; private set; } = DateTime.Now; - + [Required] public string Subject { get; private set; } = string.Empty; - + [Required] public string Body { get; private set; } = string.Empty; - - public Client? Client { get; private set; } + [Required] + public bool IsReaded { get; private set; } + public string? ReplyMessageId { get; private set; } + [ForeignKey("ReplyMessageId")] + public virtual MessageInfo? Reply { get; private set; } + [Required] + public bool IsReply { get; private set; } public static MessageInfo? Create(ComputersShopDatabase context, MessageInfoBindingModel model) { @@ -42,10 +49,27 @@ namespace ComputersShopDatabaseImplement.Models MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, + IsReply = model.IsReply, + IsReaded = model.IsReaded, + ReplyMessageId = model.ReplyMessageId, }; } - public MessageInfoViewModel GetViewModel => new() + public void Update(ComputersShopDatabase context, MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + IsReaded = model.IsReaded; + ReplyMessageId = model.ReplyMessageId; + if (!string.IsNullOrEmpty(ReplyMessageId)) + { + Reply = context.Messages.First(x => x.MessageId == ReplyMessageId); + } + } + + public MessageInfoViewModel GetViewModel => new() { Body = Body, Subject = Subject, @@ -53,6 +77,10 @@ namespace ComputersShopDatabaseImplement.Models MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, + IsReaded = IsReaded, + IsReply = IsReply, + ReplyMessageId= ReplyMessageId, + Reply = Reply, }; } } diff --git a/ComputersShop/ComputersShopFileImplement/Implements/MessageInfoStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/MessageInfoStorage.cs index cda15bf..fdfcd9e 100644 --- a/ComputersShop/ComputersShopFileImplement/Implements/MessageInfoStorage.cs +++ b/ComputersShop/ComputersShopFileImplement/Implements/MessageInfoStorage.cs @@ -11,48 +11,61 @@ using System.Threading.Tasks; namespace ComputersShopFileImplement.Implements { - public class MessageInfoStorage : IMessageInfoStorage - { - private readonly DataFileSingleton _source; - public MessageInfoStorage() - { - _source = DataFileSingleton.GetInstance(); - } + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataFileSingleton _source; + public MessageInfoStorage() + { + _source = DataFileSingleton.GetInstance(); + } - public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) - { - if (model.MessageId != null) - { - return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; - } - return null; - } + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (model.MessageId != null) + { + return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + return null; + } - public List GetFilteredList(MessageInfoSearchModel model) - { - return _source.Messages - .Where(x => x.ClientId == model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); - } + public List GetFilteredList(MessageInfoSearchModel model) + { + var res = _source.Messages.Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId).Select(x => x.GetViewModel); + if (!(model.PageIndex.HasValue && model.PageLength.HasValue)) + { + return res.ToList(); + } + return res.Skip((model.PageIndex.Value - 1) * model.PageLength.Value).Take(model.PageLength.Value).ToList(); + } - public List GetFullList() - { - return _source.Messages - .Select(x => x.GetViewModel) - .ToList(); - } + public List GetFullList() + { + return _source.Messages + .Select(x => x.GetViewModel) + .ToList(); + } - public MessageInfoViewModel? Insert(MessageInfoBindingModel model) - { - var newMessage = MessageInfo.Create(model); - if (newMessage == null) - { - return null; - } - _source.Messages.Add(newMessage); - _source.SaveMessages(); - return newMessage.GetViewModel; - } - } + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + _source.SaveMessages(); + return newMessage.GetViewModel; + } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + var res = _source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId)); + if (res != null) + { + res.Update(model); + _source.SaveMessages(); + } + return res?.GetViewModel; + } + } } diff --git a/ComputersShop/ComputersShopFileImplement/Models/MessageInfo.cs b/ComputersShop/ComputersShopFileImplement/Models/MessageInfo.cs index 63196e2..0a9c59c 100644 --- a/ComputersShop/ComputersShopFileImplement/Models/MessageInfo.cs +++ b/ComputersShop/ComputersShopFileImplement/Models/MessageInfo.cs @@ -23,8 +23,11 @@ namespace ComputersShopFileImplement.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + public bool IsReply { get; private set; } + public string? ReplyMessageId { get; private set; } = string.Empty; - public static MessageInfo? Create(MessageInfoBindingModel model) + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) { @@ -33,11 +36,14 @@ namespace ComputersShopFileImplement.Models return new() { Body = model.Body, + IsReply = model.IsReply, + IsReaded = model.IsReaded, Subject = model.Subject, ClientId = model.ClientId, MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, + ReplyMessageId = model.ReplyMessageId }; } @@ -49,32 +55,51 @@ namespace ComputersShopFileImplement.Models } return new() { - Body = element.Attribute("Body")!.Value, - Subject = element.Attribute("Subject")!.Value, - ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), - MessageId = element.Attribute("MessageId")!.Value, - SenderName = element.Attribute("SenderName")!.Value, - DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), - }; + Body = element.Attribute("Body")!.Value, + IsReply = Convert.ToBoolean(element.Attribute("IsReply")!.Value), + IsReaded = Convert.ToBoolean(element.Attribute("HasRead")!.Value), + Subject = element.Attribute("Subject")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + MessageId = element.Attribute("MessageId")!.Value, + ReplyMessageId = element.Attribute("ReplyMessageId")!.Value, + SenderName = element.Attribute("SenderName")!.Value, + DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), + }; } - public MessageInfoViewModel GetViewModel => new() - { - Body = Body, - Subject = Subject, - ClientId = ClientId, - MessageId = MessageId, - SenderName = SenderName, - DateDelivery = DateDelivery, - }; + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + IsReply = model.IsReply; + IsReaded = model.IsReaded; + } - public XElement GetXElement => new("MessageInfo", - new XAttribute("Body", Body), - new XAttribute("Subject", Subject), - new XAttribute("ClientId", ClientId), - new XAttribute("MessageId", MessageId), - new XAttribute("SenderName", SenderName), - new XAttribute("DateDelivery", DateDelivery) - ); - } + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + IsReply = IsReply, + IsReaded = IsReaded, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + ReplyMessageId = ReplyMessageId, + }; + + public XElement GetXElement => new("MessageInfo", + new XAttribute("Body", Body), + new XAttribute("IsReply", IsReply), + new XAttribute("IsReaded", IsReaded), + new XAttribute("Subject", Subject), + new XAttribute("ClientId", ClientId), + new XAttribute("MessageId", MessageId), + new XAttribute("ReplyMessageId", ReplyMessageId), + new XAttribute("SenderName", SenderName), + new XAttribute("DateDelivery", DateDelivery) + ); + } } diff --git a/ComputersShop/ComputersShopListImplement/Implements/MessageInfoStorage.cs b/ComputersShop/ComputersShopListImplement/Implements/MessageInfoStorage.cs index 7414bfb..805d67c 100644 --- a/ComputersShop/ComputersShopListImplement/Implements/MessageInfoStorage.cs +++ b/ComputersShop/ComputersShopListImplement/Implements/MessageInfoStorage.cs @@ -11,56 +11,83 @@ using System.Threading.Tasks; namespace ComputersShopListImplement.Implements { - public class MessageInfoStorage : IMessageInfoStorage - { - private readonly DataListSingleton _source; - public MessageInfoStorage() - { - _source = DataListSingleton.GetInstance(); - } + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataListSingleton _source; + public MessageInfoStorage() + { + _source = DataListSingleton.GetInstance(); + } - public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) - { - foreach (var message in _source.Messages) - { - if (model.MessageId != null && model.MessageId.Equals(message.MessageId)) - return message.GetViewModel; - } - return null; - } + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + foreach (var message in _source.Messages) + { + if (model.MessageId != null && model.MessageId.Equals(message.MessageId)) + return message.GetViewModel; + } + return null; + } - public List GetFilteredList(MessageInfoSearchModel model) - { - List result = new(); - foreach (var item in _source.Messages) - { - if (item.ClientId.HasValue && item.ClientId == model.ClientId) - { - result.Add(item.GetViewModel); - } - } - return result; - } + public List GetFilteredList(MessageInfoSearchModel model) + { + List result = new(); + foreach (var item in _source.Messages) + { + if (item.ClientId.HasValue && item.ClientId == model.ClientId) + { + result.Add(item.GetViewModel); + } + } - public List GetFullList() - { - List result = new(); - foreach (var item in _source.Messages) - { - result.Add(item.GetViewModel); - } - return result; - } + if (!(model.PageIndex.HasValue && model.PageLength.HasValue)) + { + return result; + } + if (model.PageIndex * model.PageLength >= result.Count) + { + return null; + } + List filteredResult = new(); + for (var i = (model.PageIndex.Value - 1) * model.PageLength.Value; i < model.PageIndex.Value * model.PageLength.Value; i++) + { + filteredResult.Add(result[i]); + } + return filteredResult; + } - public MessageInfoViewModel? Insert(MessageInfoBindingModel model) - { - var newMessage = MessageInfo.Create(model); - if (newMessage == null) - { - return null; - } - _source.Messages.Add(newMessage); - return newMessage.GetViewModel; - } - } + public List GetFullList() + { + List result = new(); + foreach (var item in _source.Messages) + { + result.Add(item.GetViewModel); + } + return result; + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = MessageInfo.Create(model); + if (newMessage == null) + { + return null; + } + _source.Messages.Add(newMessage); + return newMessage.GetViewModel; + } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + foreach (var message in _source.Messages) + { + if (message.MessageId.Equals(model.MessageId)) + { + message.Update(model); + return message.GetViewModel; + } + } + return null; + } + } } diff --git a/ComputersShop/ComputersShopListImplement/Models/MessageInfo.cs b/ComputersShop/ComputersShopListImplement/Models/MessageInfo.cs index 8dbb9ca..f705e15 100644 --- a/ComputersShop/ComputersShopListImplement/Models/MessageInfo.cs +++ b/ComputersShop/ComputersShopListImplement/Models/MessageInfo.cs @@ -22,8 +22,11 @@ namespace ComputersShopListImplement.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + public bool IsReply { get; private set; } + public string? ReplyMessageId { get; private set; } - public static MessageInfo? Create(MessageInfoBindingModel model) + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) { @@ -32,22 +35,38 @@ namespace ComputersShopListImplement.Models return new() { Body = model.Body, + IsReply = model.IsReply, + IsReaded = model.IsReaded, Subject = model.Subject, ClientId = model.ClientId, MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, + ReplyMessageId = model.ReplyMessageId }; } - public MessageInfoViewModel GetViewModel => new() + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + IsReply = model.IsReply; + IsReaded = model.IsReaded; + } + + public MessageInfoViewModel GetViewModel => new() { Body = Body, + IsReply = IsReply, + IsReaded = IsReaded, Subject = Subject, ClientId = ClientId, MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, + ReplyMessageId = ReplyMessageId }; } } diff --git a/ComputersShop/ComputersShopRestApi/Controllers/ClientController.cs b/ComputersShop/ComputersShopRestApi/Controllers/ClientController.cs index acd9b64..8e67c5a 100644 --- a/ComputersShop/ComputersShopRestApi/Controllers/ClientController.cs +++ b/ComputersShop/ComputersShopRestApi/Controllers/ClientController.cs @@ -38,13 +38,15 @@ namespace ComputersShopRestApi.Controllers } } [HttpGet] - public List? GetMessages(int clientId) + public List? GetMessages(int clientId, int page, int pagesize = 1) { try { return _mailLogic.ReadList(new MessageInfoSearchModel { - ClientId = clientId + ClientId = clientId, + PageIndex = page, + PageLength = pagesize }); } catch (Exception ex)