diff --git a/LawFirm/LawFirm/FormMail.Designer.cs b/LawFirm/LawFirm/FormMail.Designer.cs new file mode 100644 index 0000000..9c251e4 --- /dev/null +++ b/LawFirm/LawFirm/FormMail.Designer.cs @@ -0,0 +1,166 @@ +namespace LawFirmView +{ + 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() + { + label1 = new Label(); + label2 = new Label(); + textBoxHead = new TextBox(); + textBoxBody = new TextBox(); + buttonCancel = new Button(); + buttonSave = new Button(); + label3 = new Label(); + labelHead = new Label(); + labelBody = new Label(); + labelFrom = new Label(); + SuspendLayout(); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(539, 53); + label1.Name = "label1"; + label1.Size = new Size(84, 20); + label1.TabIndex = 0; + label1.Text = "Заголовок:"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(539, 115); + label2.Name = "label2"; + label2.Size = new Size(104, 20); + label2.TabIndex = 1; + label2.Text = "Текст письма:"; + // + // textBoxHead + // + textBoxHead.Location = new Point(547, 85); + textBoxHead.Name = "textBoxHead"; + textBoxHead.Size = new Size(318, 27); + textBoxHead.TabIndex = 3; + // + // textBoxBody + // + textBoxBody.Location = new Point(547, 138); + textBoxBody.Name = "textBoxBody"; + textBoxBody.Size = new Size(318, 27); + textBoxBody.TabIndex = 4; + // + // buttonCancel + // + buttonCancel.Location = new Point(664, 230); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // buttonSave + // + buttonSave.Location = new Point(771, 230); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(94, 29); + buttonSave.TabIndex = 6; + buttonSave.Text = "Отправить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(541, 9); + label3.Name = "label3"; + label3.Size = new Size(82, 20); + label3.TabIndex = 7; + label3.Text = "Ваш ответ:"; + // + // labelHead + // + labelHead.AutoSize = true; + labelHead.Location = new Point(12, 9); + labelHead.Name = "labelHead"; + labelHead.Size = new Size(165, 20); + labelHead.TabIndex = 8; + labelHead.Text = "Заголовок сообщения"; + // + // labelBody + // + labelBody.AutoSize = true; + labelBody.Location = new Point(12, 53); + labelBody.Name = "labelBody"; + labelBody.Size = new Size(129, 20); + labelBody.TabIndex = 9; + labelBody.Text = "Текст сообщения"; + // + // labelFrom + // + labelFrom.AutoSize = true; + labelFrom.Location = new Point(12, 234); + labelFrom.Name = "labelFrom"; + labelFrom.Size = new Size(33, 20); + labelFrom.TabIndex = 10; + labelFrom.Text = "От: "; + // + // FormMail + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(877, 266); + Controls.Add(labelFrom); + Controls.Add(labelBody); + Controls.Add(labelHead); + Controls.Add(label3); + Controls.Add(buttonSave); + Controls.Add(buttonCancel); + Controls.Add(textBoxBody); + Controls.Add(textBoxHead); + Controls.Add(label2); + Controls.Add(label1); + Name = "FormMail"; + Text = "Ответ на письмо"; + Load += FormMail_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label label1; + private Label label2; + private TextBox textBoxHead; + private TextBox textBoxBody; + private Button buttonCancel; + private Button buttonSave; + private Label label3; + private Label labelHead; + private Label labelBody; + private Label labelFrom; + } +} \ No newline at end of file diff --git a/LawFirm/LawFirm/FormMail.cs b/LawFirm/LawFirm/FormMail.cs new file mode 100644 index 0000000..7260511 --- /dev/null +++ b/LawFirm/LawFirm/FormMail.cs @@ -0,0 +1,81 @@ +using LawFirmBusinessLogic.MailWorker; +using LawFirmContracts.BusinessLogicContracts; +using LawFirmContracts.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 LawFirmView +{ + public partial class FormMail : Form + { + private readonly ILogger _logger; + private readonly AbstractMailWorker _mailWorker; + private readonly IMessageInfoLogic _logic; + private MessageInfoViewModel _message; + public string MessageId { get; set; } = string.Empty; + + public FormMail(ILogger logger, AbstractMailWorker mailWorker, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _mailWorker = mailWorker; + _logic = logic; + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void buttonSave_Click(object sender, EventArgs e) + { + _mailWorker.MailSendAsync(new() + { + MailAddress = _message.SenderName, + Subject = textBoxHead.Text, + Text = textBoxBody.Text, + }); + _logic.Update(new() + { + MessageId = MessageId, + Reply = textBoxBody.Text, + IsReaded = true, + }); + MessageBox.Show("Успешно отправлен ответ", "Отправлен ответ", MessageBoxButtons.OK); + DialogResult = DialogResult.OK; + Close(); + } + + private void FormMail_Load(object sender, EventArgs e) + { + try + { + _message = _logic.ReadElement(new() { MessageId = MessageId }); + if (_message == null) throw new ArgumentNullException("Письма с таким Id не существует"); + + labelHead.Text = _message.Subject; + labelBody.Text = _message.Body; + labelFrom.Text = $"От: {_message.SenderName}"; + + if (_message.IsReaded is false) + { + _logic.Update(new() { MessageId = MessageId, IsReaded = true, Reply = _message.Reply }); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения собщения"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/LawFirm/LawFirm/FormMail.resx b/LawFirm/LawFirm/FormMail.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/LawFirm/LawFirm/FormMail.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/LawFirm/LawFirm/FormMails.Designer.cs b/LawFirm/LawFirm/FormMails.Designer.cs index cfb2a75..d0e46dd 100644 --- a/LawFirm/LawFirm/FormMails.Designer.cs +++ b/LawFirm/LawFirm/FormMails.Designer.cs @@ -1,62 +1,114 @@ namespace LawFirmView { - partial class FormMails - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormMails + { + /// + /// 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); - } + /// + /// 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 + #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; - // - // FormMails - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(dataGridView); - Name = "FormMails"; - Text = "Письма"; - Load += FormMails_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + buttonPrevPage = new Button(); + buttonNextPage = new Button(); + labelPage = new Label(); + buttonReply = new Button(); + ((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; + // + // buttonPrevPage + // + buttonPrevPage.Location = new Point(594, 444); + buttonPrevPage.Name = "buttonPrevPage"; + buttonPrevPage.Size = new Size(94, 29); + buttonPrevPage.TabIndex = 1; + buttonPrevPage.Text = "Пред."; + buttonPrevPage.UseVisualStyleBackColor = true; + buttonPrevPage.Click += buttonPrevPage_Click; + // + // buttonNextPage + // + buttonNextPage.Location = new Point(694, 444); + buttonNextPage.Name = "buttonNextPage"; + buttonNextPage.Size = new Size(94, 29); + buttonNextPage.TabIndex = 2; + buttonNextPage.Text = "След."; + buttonNextPage.UseVisualStyleBackColor = true; + buttonNextPage.Click += buttonNextPage_Click; + // + // labelPage + // + labelPage.AutoSize = true; + labelPage.Location = new Point(462, 448); + labelPage.Name = "labelPage"; + labelPage.Size = new Size(91, 20); + labelPage.TabIndex = 3; + labelPage.Text = "Страница: 0"; + // + // buttonReply + // + buttonReply.Location = new Point(12, 444); + buttonReply.Name = "buttonReply"; + buttonReply.Size = new Size(94, 29); + buttonReply.TabIndex = 4; + buttonReply.Text = "Ответить"; + buttonReply.UseVisualStyleBackColor = true; + buttonReply.Click += buttonReply_Click; + // + // FormMails + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 475); + Controls.Add(buttonReply); + Controls.Add(labelPage); + Controls.Add(buttonNextPage); + Controls.Add(buttonPrevPage); + Controls.Add(dataGridView); + Name = "FormMails"; + Text = "Письма"; + Load += FormMails_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private DataGridView dataGridView; - } + private DataGridView dataGridView; + private Button buttonPrevPage; + private Button buttonNextPage; + private Label labelPage; + private Button buttonReply; + } } \ No newline at end of file diff --git a/LawFirm/LawFirm/FormMails.cs b/LawFirm/LawFirm/FormMails.cs index b3e9263..b62e70b 100644 --- a/LawFirm/LawFirm/FormMails.cs +++ b/LawFirm/LawFirm/FormMails.cs @@ -1,4 +1,6 @@ -using LawFirmContracts.BusinessLogicContracts; +using LawFirm; +using LawFirmContracts.BusinessLogicContracts; +using LawFirmContracts.ViewModels; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -12,38 +14,99 @@ using System.Windows.Forms; namespace LawFirmView { - public partial class FormMails : Form - { - private readonly ILogger _logger; - private readonly IMessageInfoLogic _logic; + public partial class FormMails : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + private int currentPage = 1; + public int pageSize = 2; - public FormMails(ILogger logger, IMessageInfoLogic logic) - { - InitializeComponent(); - _logger = logger; - _logic = logic; - } + public FormMails(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + buttonPrevPage.Enabled = false; + } - private void FormMails_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); - } - } - } + private void FormMails_Load(object sender, EventArgs e) + { + LoadMail(); + } + + private bool LoadMail() + { + try + { + var list = _logic.ReadList(new() + { + Page = currentPage, + PageSize = pageSize, + }); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка писем"); + labelPage.Text = $"Страница: {currentPage}"; + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки писем"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + return false; + } + } + + private void buttonPrevPage_Click(object sender, EventArgs e) + { + if (currentPage == 1) + { + return; + } + currentPage--; + if (LoadMail()) + { + buttonNextPage.Enabled = true; + if (currentPage == 1) + { + buttonPrevPage.Enabled = false; + } + } + } + + private void buttonNextPage_Click(object sender, EventArgs e) + { + currentPage++; + if (!LoadMail() || ((List)dataGridView.DataSource).Count == 0) + { + currentPage--; + LoadMail(); + buttonNextPage.Enabled = false; + } + else + { + buttonPrevPage.Enabled = true; + } + } + + private void buttonReply_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMail)); + if (service is FormMail form) + { + form.MessageId = (string)(dataGridView.SelectedRows[0].Cells["MessageId"].Value); + form.ShowDialog(); + LoadMail(); + } + } + } + } } diff --git a/LawFirm/LawFirm/Program.cs b/LawFirm/LawFirm/Program.cs index 46a8947..ae3b151 100644 --- a/LawFirm/LawFirm/Program.cs +++ b/LawFirm/LawFirm/Program.cs @@ -109,8 +109,8 @@ namespace LawFirm services.AddTransient(); services.AddTransient(); services.AddTransient(); - - } + services.AddTransient(); + } } } diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/MessageInfoLogic.cs index 3af0179..876ec4a 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/MessageInfoLogic.cs +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/MessageInfoLogic.cs @@ -32,7 +32,18 @@ namespace LawFirmBusinessLogic.BusinessLogics return true; } - public List? ReadList(MessageInfoSearchModel? model) + public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model) + { + var message = _messageInfoStorage.GetElement(model); + if (message == null) + { + _logger.LogWarning("Read message operation failed"); + return null; + } + return message; + } + + public List? ReadList(MessageInfoSearchModel? model) { _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId); var list = (model == null) ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model); @@ -44,5 +55,15 @@ namespace LawFirmBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } - } + + public bool Update(MessageInfoBindingModel model) + { + if (_messageInfoStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + } } diff --git a/LawFirm/LawFirmClientApp/APIClient.cs b/LawFirm/LawFirmClientApp/APIClient.cs index a7c2766..cd3f657 100644 --- a/LawFirm/LawFirmClientApp/APIClient.cs +++ b/LawFirm/LawFirmClientApp/APIClient.cs @@ -10,7 +10,8 @@ namespace LawFirmClientApp { private static readonly HttpClient _client = new(); public static ClientViewModel? Client { get; set; } = null; - public static void Connect(IConfiguration configuration) + public static int CurrentPage { get; set; } = 0; + public static void Connect(IConfiguration configuration) { _client.BaseAddress = new Uri(configuration["IPAddress"]); _client.DefaultRequestHeaders.Accept.Clear(); diff --git a/LawFirm/LawFirmClientApp/Controllers/HomeController.cs b/LawFirm/LawFirmClientApp/Controllers/HomeController.cs index 101374a..75e7712 100644 --- a/LawFirm/LawFirmClientApp/Controllers/HomeController.cs +++ b/LawFirm/LawFirmClientApp/Controllers/HomeController.cs @@ -4,6 +4,7 @@ using LawFirmContracts.ViewModels; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System.Diagnostics; +using System.Text; namespace LawFirmClientApp.Controllers { @@ -136,16 +137,54 @@ namespace LawFirmClientApp.Controllers return count * (doc?.Price ?? 1); } - [HttpGet] - public IActionResult Mails() - { - if (APIClient.Client == null) - { - return Redirect("~/Home/Enter"); - } - return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); + [HttpGet] + public IActionResult Mails() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + APIClient.CurrentPage = 0; + return View(); + } + + [HttpGet] + public Tuple? SwitchPage(bool isNext) + { + if (isNext) + { + APIClient.CurrentPage++; + } + else + { + if (APIClient.CurrentPage == 1) + { + return null; + } + APIClient.CurrentPage--; + } + + var messages = APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client!.Id}&pageNum={APIClient.CurrentPage}"); + if (isNext && (messages == null || messages.Count == 0)) + { + APIClient.CurrentPage--; + return Tuple.Create(null, null, APIClient.CurrentPage != 1, false); + } + + StringBuilder htmlTable = new(); + foreach (var mail in messages) + { + htmlTable.Append("" + + $"{mail.DateDelivery}" + + $"{mail.Subject}" + + $"{mail.Body}" + + "" + (mail.IsReaded ? "Прочитано" : "Непрочитано") + "" + + $"{mail.Reply}" + + ""); + } + return Tuple.Create(htmlTable.ToString(), APIClient.CurrentPage.ToString(), APIClient.CurrentPage != 1, true); } - } + } } \ No newline at end of file diff --git a/LawFirm/LawFirmClientApp/Views/Home/Mails.cshtml b/LawFirm/LawFirmClientApp/Views/Home/Mails.cshtml index 850d41c..155cc32 100644 --- a/LawFirm/LawFirmClientApp/Views/Home/Mails.cshtml +++ b/LawFirm/LawFirmClientApp/Views/Home/Mails.cshtml @@ -1,54 +1,79 @@ -@using LawFirmContracts.ViewModels - -@model List - -@{ - ViewData["Title"] = "Mails"; +@{ + ViewData["Title"] = "Mails"; } -
-

Письма

+

Письма

-
- @{ - if (Model == null) - { -

Авторизируйтесь

- return; - } + + + + + + + + + + + + +
+ Дата + + Заголовок + + Текст + + Прочитано + + Ответ +
+ +
- - - - - - - - - - @foreach (var item in Model) - { - - - - - - } - -
- Дата письма - - Заголовок - - Текст -
- @Html.DisplayFor(modelItem => item.DateDelivery) - - @Html.DisplayFor(modelItem => item.Subject) - - @Html.DisplayFor(modelItem => item.Body) -
- } - \ No newline at end of file + \ No newline at end of file diff --git a/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs b/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs index e0cb256..6013785 100644 --- a/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs +++ b/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs @@ -20,5 +20,7 @@ namespace LawFirmContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; - } + public bool IsReaded { get; set; } + public string? Reply { get; set; } + } } diff --git a/LawFirm/LawFirmContracts/BusinessLogicContracts/IMessageInfoLogic.cs b/LawFirm/LawFirmContracts/BusinessLogicContracts/IMessageInfoLogic.cs index 982278f..c39d930 100644 --- a/LawFirm/LawFirmContracts/BusinessLogicContracts/IMessageInfoLogic.cs +++ b/LawFirm/LawFirmContracts/BusinessLogicContracts/IMessageInfoLogic.cs @@ -13,5 +13,7 @@ namespace LawFirmContracts.BusinessLogicContracts { List? ReadList(MessageInfoSearchModel? model); bool Create(MessageInfoBindingModel model); - } + bool Update(MessageInfoBindingModel model); + MessageInfoViewModel? ReadElement(MessageInfoSearchModel model); + } } diff --git a/LawFirm/LawFirmContracts/SearchModels/MessageInfoSearchModel.cs b/LawFirm/LawFirmContracts/SearchModels/MessageInfoSearchModel.cs index cad0a9e..72e57c3 100644 --- a/LawFirm/LawFirmContracts/SearchModels/MessageInfoSearchModel.cs +++ b/LawFirm/LawFirmContracts/SearchModels/MessageInfoSearchModel.cs @@ -10,5 +10,7 @@ namespace LawFirmContracts.SearchModels { public int? ClientId { get; set; } public string? MessageId { get; set; } + public int? Page { get; set; } + public int? PageSize { get; set; } } } diff --git a/LawFirm/LawFirmContracts/StorageContracts/IMessageInfoStorage.cs b/LawFirm/LawFirmContracts/StorageContracts/IMessageInfoStorage.cs index 299fd48..da6f80c 100644 --- a/LawFirm/LawFirmContracts/StorageContracts/IMessageInfoStorage.cs +++ b/LawFirm/LawFirmContracts/StorageContracts/IMessageInfoStorage.cs @@ -15,5 +15,6 @@ namespace LawFirmContracts.StorageContracts List GetFilteredList(MessageInfoSearchModel model); MessageInfoViewModel? GetElement(MessageInfoSearchModel model); MessageInfoViewModel? Insert(MessageInfoBindingModel model); - } + MessageInfoViewModel? Update(MessageInfoBindingModel model); + } } diff --git a/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs index c5283b5..e864976 100644 --- a/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs @@ -21,5 +21,9 @@ namespace LawFirmContracts.ViewModels public string Subject { get; set; } = string.Empty; [DisplayName("Текст")] public string Body { get; set; } = string.Empty; - } + [DisplayName("Прочитано")] + public bool IsReaded { get; set; } + [DisplayName("Ответ")] + public string? Reply { get; set; } + } } diff --git a/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs b/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs index 91ba52c..3ed6238 100644 --- a/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs +++ b/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs @@ -14,5 +14,7 @@ namespace LawFirmDataModels.Models DateTime DateDelivery { get; } string Subject { get; } string Body { get; } - } + public bool IsReaded { get; } + public string? Reply { get; } + } } diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/MessageInfoStorage .cs b/LawFirm/LawFirmDatabaseImplement/Implements/MessageInfoStorage .cs index a0aa21c..59aa5c4 100644 --- a/LawFirm/LawFirmDatabaseImplement/Implements/MessageInfoStorage .cs +++ b/LawFirm/LawFirmDatabaseImplement/Implements/MessageInfoStorage .cs @@ -3,6 +3,7 @@ using LawFirmContracts.SearchModels; using LawFirmContracts.StorageContracts; using LawFirmContracts.ViewModels; using LawFirmDatabaseImplement.Models; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; @@ -27,10 +28,16 @@ namespace LawFirmDatabaseImplement.Implements public List GetFilteredList(MessageInfoSearchModel model) { using var context = new LawFirmDatabase(); - return context.Messages - .Where(x => x.ClientId == model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); + var messages = context.Messages + .Where(x => (model.ClientId == null) || (x.ClientId == model.ClientId)) + .Select(x => x.GetViewModel); + + if (!(model.Page.HasValue && model.PageSize.HasValue)) + { + return messages.ToList(); + } + return messages.Skip((model.Page.Value - 1) * model.PageSize.Value).Take(model.PageSize.Value).ToList(); + } public List GetFullList() @@ -53,5 +60,17 @@ namespace LawFirmDatabaseImplement.Implements context.SaveChanges(); return newMessage.GetViewModel; } - } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + using var context = new LawFirmDatabase(); + var message = context.Messages.Include(x => x.Client).FirstOrDefault(x => x.MessageId.Equals(model.MessageId)); + if (message != null) + { + message.Update(model); + context.SaveChanges(); + } + return message?.GetViewModel; + } + } } diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20230422091213_MessageInfoUpdate.Designer.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20230422091213_MessageInfoUpdate.Designer.cs new file mode 100644 index 0000000..d925b2a --- /dev/null +++ b/LawFirm/LawFirmDatabaseImplement/Migrations/20230422091213_MessageInfoUpdate.Designer.cs @@ -0,0 +1,381 @@ +// +using System; +using LawFirmDatabaseImplement; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace LawFirmDatabaseImplement.Migrations +{ + [DbContext(typeof(LawFirmDatabase))] + [Migration("20230422091213_MessageInfoUpdate")] + partial class MessageInfoUpdate + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("BlankName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Blanks"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.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("LawFirmDatabaseImplement.Models.Document", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("DocumentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Documents"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("BlankId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DocumentId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("BlankId"); + + b.HasIndex("DocumentId"); + + b.ToTable("DocumentBlanks"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.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("LawFirmDatabaseImplement.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("Reply") + .HasColumnType("nvarchar(max)"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("DocumentId") + .HasColumnType("int"); + + b.Property("ImplementerId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("DocumentId"); + + b.HasIndex("ImplementerId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Adress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("MaxCountDocuments") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("OpeningDate") + .HasColumnType("datetime2"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.ShopDocument", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DocumentId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("DocumentId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopDocuments"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b => + { + b.HasOne("LawFirmDatabaseImplement.Models.Blank", "Blank") + .WithMany("DocumentBlanks") + .HasForeignKey("BlankId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document") + .WithMany("Blanks") + .HasForeignKey("DocumentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Blank"); + + b.Navigation("Document"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b => + { + b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document") + .WithMany("Orders") + .HasForeignKey("DocumentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("LawFirmDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Orders") + .HasForeignKey("ImplementerId"); + + b.Navigation("Client"); + + b.Navigation("Document"); + + b.Navigation("Implementer"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.ShopDocument", b => + { + b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document") + .WithMany() + .HasForeignKey("DocumentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("LawFirmDatabaseImplement.Models.Shop", "Shop") + .WithMany("Documents") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Document"); + + b.Navigation("Shop"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b => + { + b.Navigation("DocumentBlanks"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Client", b => + { + b.Navigation("Messages"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b => + { + b.Navigation("Blanks"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Orders"); + }); + + modelBuilder.Entity("LawFirmDatabaseImplement.Models.Shop", b => + { + b.Navigation("Documents"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20230422091213_MessageInfoUpdate.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20230422091213_MessageInfoUpdate.cs new file mode 100644 index 0000000..7b2c586 --- /dev/null +++ b/LawFirm/LawFirmDatabaseImplement/Migrations/20230422091213_MessageInfoUpdate.cs @@ -0,0 +1,39 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace LawFirmDatabaseImplement.Migrations +{ + /// + public partial class MessageInfoUpdate : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsReaded", + table: "Messages", + type: "bit", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "Reply", + table: "Messages", + type: "nvarchar(max)", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsReaded", + table: "Messages"); + + migrationBuilder.DropColumn( + name: "Reply", + table: "Messages"); + } + } +} diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/LawFirmDatabaseModelSnapshot.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/LawFirmDatabaseModelSnapshot.cs index f4a3261..ed7c45b 100644 --- a/LawFirm/LawFirmDatabaseImplement/Migrations/LawFirmDatabaseModelSnapshot.cs +++ b/LawFirm/LawFirmDatabaseImplement/Migrations/LawFirmDatabaseModelSnapshot.cs @@ -155,6 +155,12 @@ namespace LawFirmDatabaseImplement.Migrations b.Property("DateDelivery") .HasColumnType("datetime2"); + b.Property("IsReaded") + .HasColumnType("bit"); + + b.Property("Reply") + .HasColumnType("nvarchar(max)"); + b.Property("SenderName") .IsRequired() .HasColumnType("nvarchar(max)"); diff --git a/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs b/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs index f5ceea7..2fe0829 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs @@ -26,8 +26,10 @@ namespace LawFirmDatabaseImplement.Models public string Body { get; private set; } = string.Empty; public virtual Client? Client { get; private set; } + public bool IsReaded { get; private set; } + public string? Reply { get; private set; } - public static MessageInfo? Create(MessageInfoBindingModel model) + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) { @@ -41,10 +43,22 @@ namespace LawFirmDatabaseImplement.Models MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, - }; + IsReaded = model.IsReaded, + Reply = model.Reply + }; } - public MessageInfoViewModel GetViewModel => new() + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + Reply = model.Reply; + IsReaded = model.IsReaded; + } + + public MessageInfoViewModel GetViewModel => new() { Body = Body, Subject = Subject, @@ -52,7 +66,9 @@ namespace LawFirmDatabaseImplement.Models MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, - }; + Reply = Reply, + IsReaded = IsReaded, + }; } } diff --git a/LawFirm/LawFirmFileImplement/Implements/MessageInfoStorage.cs b/LawFirm/LawFirmFileImplement/Implements/MessageInfoStorage.cs index 2c3e31b..00e59d7 100644 --- a/LawFirm/LawFirmFileImplement/Implements/MessageInfoStorage.cs +++ b/LawFirm/LawFirmFileImplement/Implements/MessageInfoStorage.cs @@ -30,10 +30,15 @@ namespace LawFirmFileImplement.Implements public List GetFilteredList(MessageInfoSearchModel model) { - return _source.Messages + var messages = _source.Messages .Where(x => x.ClientId == model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); + .Select(x => x.GetViewModel); + + if (!(model.Page.HasValue && model.PageSize.HasValue)) + { + return messages.ToList(); + } + return messages.Skip((model.Page.Value - 1) * model.PageSize.Value).Take(model.PageSize.Value).ToList(); } public List GetFullList() @@ -54,5 +59,16 @@ namespace LawFirmFileImplement.Implements _source.SaveMessages(); return newMessage.GetViewModel; } - } + + public MessageInfoViewModel? Update(MessageInfoBindingModel model) + { + var message = _source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId)); + if (message != null) + { + message.Update(model); + _source.SaveMessages(); + } + return message?.GetViewModel; + } + } } diff --git a/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs b/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs index e218081..740f504 100644 --- a/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs +++ b/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs @@ -23,8 +23,10 @@ namespace LawFirmFileImplement.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + public string? Reply { get; private set; } - public static MessageInfo? Create(MessageInfoBindingModel model) + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) { @@ -38,7 +40,9 @@ namespace LawFirmFileImplement.Models MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, - }; + Reply = model.Reply, + IsReaded = model.IsReaded, + }; } public static MessageInfo? Create(XElement element) @@ -55,10 +59,22 @@ namespace LawFirmFileImplement.Models MessageId = element.Attribute("MessageId")!.Value, SenderName = element.Attribute("SenderName")!.Value, DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), - }; + Reply = element.Attribute("Reply")!.Value, + IsReaded = Convert.ToBoolean(element.Attribute("IsReaded")!.Value), + }; } - public MessageInfoViewModel GetViewModel => new() + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + Reply = model.Reply; + IsReaded = model.IsReaded; + } + + public MessageInfoViewModel GetViewModel => new() { Body = Body, Subject = Subject, @@ -66,7 +82,9 @@ namespace LawFirmFileImplement.Models MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, - }; + Reply = Reply, + IsReaded = IsReaded, + }; public XElement GetXElement => new("MessageInfo", new XAttribute("Body", Body), @@ -74,7 +92,9 @@ namespace LawFirmFileImplement.Models new XAttribute("ClientId", ClientId), new XAttribute("MessageId", MessageId), new XAttribute("SenderName", SenderName), - new XAttribute("DateDelivery", DateDelivery) - ); + new XAttribute("DateDelivery", DateDelivery), + new XAttribute("Reply", Reply), + new XAttribute("HasRead", IsReaded) + ); } } diff --git a/LawFirm/LawFirmListImplements/Implements/MessageInfoStorage.cs b/LawFirm/LawFirmListImplements/Implements/MessageInfoStorage.cs index a1cedde..2bf75e5 100644 --- a/LawFirm/LawFirmListImplements/Implements/MessageInfoStorage.cs +++ b/LawFirm/LawFirmListImplements/Implements/MessageInfoStorage.cs @@ -30,15 +30,29 @@ namespace LawFirmListImplements.Implements public List GetFilteredList(MessageInfoSearchModel model) { - List result = new(); + List messages = new(); foreach (var item in _source.Messages) { - if (item.ClientId.HasValue && item.ClientId == model.ClientId) + if (item.ClientId == model.ClientId) { - result.Add(item.GetViewModel); + messages.Add(item.GetViewModel); } } - return result; + + if (!(model.Page.HasValue && model.PageSize.HasValue)) + { + return messages; + } + if (model.Page * model.PageSize >= messages.Count) + { + return null; + } + List filterMessages = new(); + for (var i = (model.Page.Value - 1) * model.PageSize.Value; i < model.Page.Value * model.PageSize.Value; i++) + { + filterMessages.Add(messages[i]); + } + return filterMessages; } public List GetFullList() @@ -61,5 +75,18 @@ namespace LawFirmListImplements.Implements _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/LawFirm/LawFirmListImplements/Models/MessageInfo.cs b/LawFirm/LawFirmListImplements/Models/MessageInfo.cs index 4e051b7..ea0cc0a 100644 --- a/LawFirm/LawFirmListImplements/Models/MessageInfo.cs +++ b/LawFirm/LawFirmListImplements/Models/MessageInfo.cs @@ -22,8 +22,10 @@ namespace LawFirmListImplements.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public bool IsReaded { get; private set; } + public string? Reply { get; private set; } - public static MessageInfo? Create(MessageInfoBindingModel model) + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) { @@ -37,10 +39,22 @@ namespace LawFirmListImplements.Models MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, - }; + Reply = model.Reply, + IsReaded = model.IsReaded, + }; } - public MessageInfoViewModel GetViewModel => new() + public void Update(MessageInfoBindingModel model) + { + if (model == null) + { + return; + } + Reply = model.Reply; + IsReaded = model.IsReaded; + } + + public MessageInfoViewModel GetViewModel => new() { Body = Body, Subject = Subject, @@ -48,7 +62,9 @@ namespace LawFirmListImplements.Models MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, - }; + Reply = Reply, + IsReaded = IsReaded, + }; } } diff --git a/LawFirm/LawFirmRestApi/Controllers/ClientController.cs b/LawFirm/LawFirmRestApi/Controllers/ClientController.cs index 792cf52..df5b117 100644 --- a/LawFirm/LawFirmRestApi/Controllers/ClientController.cs +++ b/LawFirm/LawFirmRestApi/Controllers/ClientController.cs @@ -13,8 +13,9 @@ namespace LawFirmRestApi.Controllers private readonly ILogger _logger; private readonly IClientLogic _logic; private readonly IMessageInfoLogic _mailLogic; + public int pageSize = 2; - public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger logger) + public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger logger) { _logger = logger; _logic = logic; @@ -65,14 +66,16 @@ namespace LawFirmRestApi.Controllers } [HttpGet] - public List? GetMessages(int clientId) + public List? GetMessages(int clientId, int pageNum) { try { - return _mailLogic.ReadList(new MessageInfoSearchModel - { - ClientId = clientId - }); + return _mailLogic.ReadList(new() + { + ClientId = clientId, + Page = pageNum, + PageSize = pageSize + }); } catch (Exception ex) {