From 1e5de3e27b8171654cc8de542a6098ef32de8fc5 Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Tue, 26 Mar 2024 17:42:09 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=201=20=D1=83=D1=81?= =?UTF-8?q?=D0=BB=D0=BE=D0=B6=D0=BD=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormCreateDelivery.Designer.cs | 43 ++-- .../TravelCompany/FormShop.Designer.cs | 155 +++++++++++- TravelCompany/TravelCompany/FormShop.cs | 108 +++++++- TravelCompany/TravelCompany/FormShop.resx | 68 ++++-- .../TravelCompany/FormShops.Designer.cs | 129 ++++++++++ TravelCompany/TravelCompany/FormShops.cs | 116 +++++++++ TravelCompany/TravelCompany/FormShops.resx | 120 +++++++++ TravelCompany/TravelCompany/Program.cs | 8 +- .../BusinessLogic/OrderLogic.cs | 4 +- .../BusinessLogic/ShopLogic.cs | 231 +++++++++--------- .../BusinessLogic/TravelLogic.cs | 2 +- .../TravelCompanyBusinessLogic.csproj | 1 + .../BindingModels/ShopBindingModel.cs | 2 +- .../{ITravelStorage_1.cs => IOrderStorage.cs} | 2 +- .../Implements/OrderStorage.cs | 2 +- 15 files changed, 819 insertions(+), 172 deletions(-) create mode 100644 TravelCompany/TravelCompany/FormShops.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormShops.cs create mode 100644 TravelCompany/TravelCompany/FormShops.resx rename TravelCompany/TravelCompanyContracts/StoragesContracts/{ITravelStorage_1.cs => IOrderStorage.cs} (94%) diff --git a/TravelCompany/TravelCompany/FormCreateDelivery.Designer.cs b/TravelCompany/TravelCompany/FormCreateDelivery.Designer.cs index d9a3957..7875c06 100644 --- a/TravelCompany/TravelCompany/FormCreateDelivery.Designer.cs +++ b/TravelCompany/TravelCompany/FormCreateDelivery.Designer.cs @@ -40,9 +40,10 @@ // // buttonCancel // - buttonCancel.Location = new Point(338, 156); + buttonCancel.Location = new Point(296, 117); + buttonCancel.Margin = new Padding(3, 2, 3, 2); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(94, 29); + buttonCancel.Size = new Size(82, 22); buttonCancel.TabIndex = 15; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; @@ -50,9 +51,10 @@ // // buttonSave // - buttonSave.Location = new Point(210, 156); + buttonSave.Location = new Point(184, 117); + buttonSave.Margin = new Padding(3, 2, 3, 2); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(94, 29); + buttonSave.Size = new Size(82, 22); buttonSave.TabIndex = 14; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; @@ -60,59 +62,62 @@ // // textBoxCount // - textBoxCount.Location = new Point(154, 100); + textBoxCount.Location = new Point(135, 75); + textBoxCount.Margin = new Padding(3, 2, 3, 2); textBoxCount.Name = "textBoxCount"; - textBoxCount.Size = new Size(278, 27); + textBoxCount.Size = new Size(244, 23); textBoxCount.TabIndex = 13; // // comboBoxShop // comboBoxShop.FormattingEnabled = true; - comboBoxShop.Location = new Point(154, 13); + comboBoxShop.Location = new Point(135, 10); + comboBoxShop.Margin = new Padding(3, 2, 3, 2); comboBoxShop.Name = "comboBoxShop"; - comboBoxShop.Size = new Size(278, 28); + comboBoxShop.Size = new Size(244, 23); comboBoxShop.TabIndex = 11; // // label3 // label3.AutoSize = true; - label3.Location = new Point(55, 107); + label3.Location = new Point(48, 80); label3.Name = "label3"; - label3.Size = new Size(93, 20); + label3.Size = new Size(75, 15); label3.TabIndex = 10; label3.Text = "Количество:"; // // label2 // label2.AutoSize = true; - label2.Location = new Point(77, 64); + label2.Location = new Point(67, 48); label2.Name = "label2"; - label2.Size = new Size(71, 20); + label2.Size = new Size(56, 15); label2.TabIndex = 9; label2.Text = "Изделие:"; // // label1 // label1.AutoSize = true; - label1.Location = new Point(76, 21); + label1.Location = new Point(66, 16); label1.Name = "label1"; - label1.Size = new Size(72, 20); + label1.Size = new Size(57, 15); label1.TabIndex = 8; label1.Text = "Магазин:"; // // comboBoxTravel // comboBoxTravel.FormattingEnabled = true; - comboBoxTravel.Location = new Point(154, 56); + comboBoxTravel.Location = new Point(135, 42); + comboBoxTravel.Margin = new Padding(3, 2, 3, 2); comboBoxTravel.Name = "comboBoxTravel"; - comboBoxTravel.Size = new Size(278, 28); + comboBoxTravel.Size = new Size(244, 23); comboBoxTravel.TabIndex = 16; // // FormCreateDelivery // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(490, 203); + ClientSize = new Size(429, 152); Controls.Add(comboBoxTravel); Controls.Add(buttonCancel); Controls.Add(buttonSave); @@ -121,8 +126,10 @@ Controls.Add(label3); Controls.Add(label2); Controls.Add(label1); + Margin = new Padding(3, 2, 3, 2); Name = "FormCreateDelivery"; Text = "FormCreateDelivery"; + Load += FormCreateDelivery_Load; ResumeLayout(false); PerformLayout(); } diff --git a/TravelCompany/TravelCompany/FormShop.Designer.cs b/TravelCompany/TravelCompany/FormShop.Designer.cs index d4e4444..8268004 100644 --- a/TravelCompany/TravelCompany/FormShop.Designer.cs +++ b/TravelCompany/TravelCompany/FormShop.Designer.cs @@ -28,12 +28,159 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "FormShop"; + labelName = new Label(); + labelAddress = new Label(); + labelDate = new Label(); + textBoxName = new TextBox(); + textBoxAddress = new TextBox(); + dateOpenTimePicker = new DateTimePicker(); + dataGridView = new DataGridView(); + id = new DataGridViewTextBoxColumn(); + TravelName = new DataGridViewTextBoxColumn(); + Count = new DataGridViewTextBoxColumn(); + buttonSave = new Button(); + buttonCancel = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // labelName + // + labelName.AutoSize = true; + labelName.Location = new Point(12, 9); + labelName.Name = "labelName"; + labelName.Size = new Size(62, 15); + labelName.TabIndex = 0; + labelName.Text = "Название:"; + // + // labelAddress + // + labelAddress.AutoSize = true; + labelAddress.Location = new Point(12, 45); + labelAddress.Name = "labelAddress"; + labelAddress.Size = new Size(43, 15); + labelAddress.TabIndex = 1; + labelAddress.Text = "Адрес:"; + // + // labelDate + // + labelDate.AutoSize = true; + labelDate.Location = new Point(12, 78); + labelDate.Name = "labelDate"; + labelDate.Size = new Size(90, 15); + labelDate.TabIndex = 2; + labelDate.Text = "Дата открытия:"; + // + // textBoxName + // + textBoxName.Location = new Point(112, 6); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(277, 23); + textBoxName.TabIndex = 3; + // + // textBoxAddress + // + textBoxAddress.Location = new Point(112, 37); + textBoxAddress.Name = "textBoxAddress"; + textBoxAddress.Size = new Size(277, 23); + textBoxAddress.TabIndex = 4; + // + // dateOpenTimePicker + // + dateOpenTimePicker.Location = new Point(112, 72); + dateOpenTimePicker.Name = "dateOpenTimePicker"; + dateOpenTimePicker.Size = new Size(277, 23); + dateOpenTimePicker.TabIndex = 5; + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { id, TravelName, Count }); + dataGridView.Location = new Point(12, 112); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; + dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(534, 261); + dataGridView.TabIndex = 6; + // + // id + // + id.HeaderText = "id"; + id.Name = "id"; + id.ReadOnly = true; + id.Visible = false; + // + // TravelName + // + TravelName.HeaderText = "Путевка"; + TravelName.Name = "TravelName"; + TravelName.ReadOnly = true; + // + // Count + // + Count.HeaderText = "Количество"; + Count.Name = "Count"; + Count.ReadOnly = true; + // + // buttonSave + // + buttonSave.Location = new Point(322, 379); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(109, 32); + buttonSave.TabIndex = 7; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(437, 379); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(109, 32); + buttonCancel.TabIndex = 8; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // FormShop + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(558, 423); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(dataGridView); + Controls.Add(dateOpenTimePicker); + Controls.Add(textBoxAddress); + Controls.Add(textBoxName); + Controls.Add(labelDate); + Controls.Add(labelAddress); + Controls.Add(labelName); + Name = "FormShop"; + Text = "Магазин"; + Load += FormShop_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion + + private Label labelName; + private Label labelAddress; + private Label labelDate; + private TextBox textBoxName; + private TextBox textBoxAddress; + private DateTimePicker dateOpenTimePicker; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn id; + private DataGridViewTextBoxColumn TravelName; + private DataGridViewTextBoxColumn Count; + private Button buttonSave; + private Button buttonCancel; } } \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormShop.cs b/TravelCompany/TravelCompany/FormShop.cs index 01a890d..7e52c54 100644 --- a/TravelCompany/TravelCompany/FormShop.cs +++ b/TravelCompany/TravelCompany/FormShop.cs @@ -7,14 +7,120 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicContracts; +using TravelCompanyDataModels.Models; +using TravelCompanyContracts.SearchModels; +using Microsoft.Extensions.Logging; namespace TravelCompanyView { public partial class FormShop : Form { - public FormShop() + private readonly ILogger _logger; + private readonly IShopLogic _logic; + private int? _id; + public int Id { set { _id = value; } } + private Dictionary _ShopTravels; + private DateTime? _openingDate = null; + + public FormShop(ILogger logger, IShopLogic logic) { InitializeComponent(); + _logger = logger; + _logic = logic; + _ShopTravels = new Dictionary(); + } + private void FormShop_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка магазина"); + try + { + var view = _logic.ReadElement(new ShopSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.ShopName; + textBoxAddress.Text = view.Address; + dateOpenTimePicker.Value = view.OpeningDate; + _ShopTravels = view.ShopTravels ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void LoadData() + { + _logger.LogInformation("Загрузка изделий в магазине"); + try + { + if (_ShopTravels != null) + { + dataGridView.Rows.Clear(); + foreach (var sr in _ShopTravels) + { + dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.TravelName, sr.Value.Item2 }); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделий магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxAddress.Text)) + { + MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение магазина"); + try + { + var model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = textBoxName.Text, + Address = textBoxAddress.Text, + OpeningDate = dateOpenTimePicker.Value + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); } } } diff --git a/TravelCompany/TravelCompany/FormShop.resx b/TravelCompany/TravelCompany/FormShop.resx index 1af7de1..65f568e 100644 --- a/TravelCompany/TravelCompany/FormShop.resx +++ b/TravelCompany/TravelCompany/FormShop.resx @@ -1,17 +1,17 @@  - @@ -117,4 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormShops.Designer.cs b/TravelCompany/TravelCompany/FormShops.Designer.cs new file mode 100644 index 0000000..0f751b9 --- /dev/null +++ b/TravelCompany/TravelCompany/FormShops.Designer.cs @@ -0,0 +1,129 @@ +namespace TravelCompanyView +{ + partial class FormShops + { + /// + /// 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(); + ToolsPanel = new Panel(); + buttonRef = new Button(); + buttonDel = new Button(); + buttonUpd = new Button(); + buttonAdd = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + ToolsPanel.SuspendLayout(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.DisplayedCells; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(12, 12); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(618, 383); + dataGridView.TabIndex = 0; + // + // ToolsPanel + // + ToolsPanel.Controls.Add(buttonRef); + ToolsPanel.Controls.Add(buttonDel); + ToolsPanel.Controls.Add(buttonUpd); + ToolsPanel.Controls.Add(buttonAdd); + ToolsPanel.Location = new Point(640, 12); + ToolsPanel.Name = "ToolsPanel"; + ToolsPanel.Size = new Size(150, 387); + ToolsPanel.TabIndex = 1; + // + // buttonRef + // + buttonRef.Location = new Point(22, 226); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(102, 42); + buttonRef.TabIndex = 3; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; + // + // buttonDel + // + buttonDel.Location = new Point(22, 159); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(102, 42); + buttonDel.TabIndex = 2; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(22, 92); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(102, 42); + buttonUpd.TabIndex = 1; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; + // + // buttonAdd + // + buttonAdd.Location = new Point(22, 28); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(102, 42); + buttonAdd.TabIndex = 0; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // FormShops + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 407); + Controls.Add(ToolsPanel); + Controls.Add(dataGridView); + Name = "FormShops"; + Text = "Магазины"; + Load += FormShops_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ToolsPanel.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private Panel ToolsPanel; + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + private Button buttonAdd; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormShops.cs b/TravelCompany/TravelCompany/FormShops.cs new file mode 100644 index 0000000..7db0b99 --- /dev/null +++ b/TravelCompany/TravelCompany/FormShops.cs @@ -0,0 +1,116 @@ +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; +using TravelCompany; +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicContracts; + +namespace TravelCompanyView +{ + public partial class FormShops : Form + { + private readonly ILogger _logger; + private readonly IShopLogic _logic; + + public FormShops(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormShops_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["ShopTravels"].Visible = false; + dataGridView.Columns["ShopName"].AutoSizeMode = + DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка магазинов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShop)); + if (service is FormShop form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void buttonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShop)); + if (service is FormShop form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void buttonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление магазина"); + try + { + if (!_logic.Delete(new ShopBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void buttonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/TravelCompany/TravelCompany/FormShops.resx b/TravelCompany/TravelCompany/FormShops.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/TravelCompany/TravelCompany/FormShops.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/TravelCompany/TravelCompany/Program.cs b/TravelCompany/TravelCompany/Program.cs index b692dae..acc04d1 100644 --- a/TravelCompany/TravelCompany/Program.cs +++ b/TravelCompany/TravelCompany/Program.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using TravelCompanyBusinessLogic.BusinessLogic; +using TravelCompanyContracts.BusinessLogicContracts; using TravelCompanyContracts.BusinessLogicsContracts; using TravelCompanyContracts.StoragesContracts; using TravelCompanyListImplement.Implements; @@ -36,7 +37,7 @@ namespace TravelCompany option.AddNLog("nlog.config"); }); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -48,6 +49,11 @@ namespace TravelCompany services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs index d5c851d..e7c1295 100644 --- a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs @@ -20,9 +20,9 @@ namespace TravelCompanyBusinessLogic.BusinessLogic //менять статус на новый, если его текущий статус предшествует новому private readonly ILogger _logger; - private readonly ITravelStorage _orderStorage; + private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, ITravelStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage) { _logger = logger; _orderStorage = orderStorage; diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs index f82b563..9c92db7 100644 --- a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs +++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs @@ -10,155 +10,152 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using static TravelCompanyBusinessLogic.BusinessLogic.ShopLogic; +using TravelCompanyContracts.BusinessLogicContracts; namespace TravelCompanyBusinessLogic.BusinessLogic { public class ShopLogic : IShopLogic { - public class ShopLogic : IShopLogic + private readonly ILogger _logger; + private readonly IShopStorage _shopStorage; + private readonly ITravelStorage _travelStorage; + + public ShopLogic(ILogger logger, IShopStorage shopStorage, ITravelStorage travelStorage) { - private readonly ILogger _logger; - private readonly IShopStorage _shopStorage; - private readonly ITravelStorage _travelStorage; + _logger = logger; + _shopStorage = shopStorage; + _travelStorage = travelStorage; + } - public ShopLogic(ILogger logger, IShopStorage shopStorage, ITravelStorage travelStorage) + public List? ReadList(ShopSearchModel? model) + { + _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id); + var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model); + if (list == null) { - _logger = logger; - _shopStorage = shopStorage; - _travelStorage = travelStorage; + _logger.LogWarning("ReadList return null list"); + return null; } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } - public List? ReadList(ShopSearchModel? model) + public ShopViewModel? ReadElement(ShopSearchModel model) + { + if (model == null) { - _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id); - var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model); - if (list == null) - { - _logger.LogWarning("ReadList return null list"); - return null; - } - _logger.LogInformation("ReadList. Count:{Count}", list.Count); - return list; + throw new ArgumentNullException(nameof(model)); } - - public TravelViewModel? ReadElement(ShopSearchModel model) + _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); + var element = _shopStorage.GetElement(model); + if (element == null) { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); - var element = _shopStorage.GetElement(model); - if (element == null) - { - _logger.LogWarning("ReadElement element not found"); - return null; - } - _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); - return element; + _logger.LogWarning("ReadElement element not found"); + return null; } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } - public bool Create(ShopBindingModel model) + public bool Create(ShopBindingModel model) + { + CheckModel(model); + if (_shopStorage.Insert(model) == null) { - CheckModel(model); - if (_shopStorage.Insert(model) == null) - { - _logger.LogWarning("Insert operation failed"); - return false; - } - return true; + _logger.LogWarning("Insert operation failed"); + return false; } + return true; + } - public bool Update(ShopBindingModel model) + public bool Update(ShopBindingModel model) + { + CheckModel(model); + if (_shopStorage.Update(model) == null) { - CheckModel(model); - if (_shopStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); - return false; - } - return true; + _logger.LogWarning("Update operation failed"); + return false; } + return true; + } - public bool Delete(ShopBindingModel model) + public bool Delete(ShopBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_shopStorage.Delete(model) == null) { - CheckModel(model, false); - _logger.LogInformation("Delete. Id:{Id}", model.Id); - if (_shopStorage.Delete(model) == null) - { - _logger.LogWarning("Delete operation failed"); - return false; - } - return true; + _logger.LogWarning("Delete operation failed"); + return false; } + return true; + } - public bool MakeSupply(SupplyBindingModel model) + public bool MakeDelivery(DeliveryBindingModel model) + { + if (model == null) { - if (model == null) + throw new ArgumentNullException(nameof(model)); + } + if (model.Count <= 0) + { + throw new ArgumentException("Количество изделий должно быть больше 0"); + } + var shop = _shopStorage.GetElement(new ShopSearchModel + { + Id = model.ShopId + }); + if (shop == null) + { + throw new ArgumentException("Магазина не существует"); + } + if (shop.ShopTravels.ContainsKey(model.TravelId)) + { + var oldValue = shop.ShopTravels[model.TravelId]; + oldValue.Item2 += model.Count; + shop.ShopTravels[model.TravelId] = oldValue; + } + else + { + var Travel = _travelStorage.GetElement(new TravelSearchModel { - throw new ArgumentNullException(nameof(model)); - } - if (model.Count <= 0) - { - throw new ArgumentException("Количество изделий должно быть больше 0"); - } - var shop = _shopStorage.GetElement(new ShopSearchModel - { - Id = model.ShopId + Id = model.TravelId }); - if (shop == null) + if (Travel == null) { - throw new ArgumentException("Магазина не существует"); + throw new ArgumentException($"Поставка: Товар с id:{model.TravelId} не найденн"); } - if (shop.ShopPizzas.ContainsKey(model.PizzaId)) - { - var oldValue = shop.ShopPizzas[model.PizzaId]; - oldValue.Item2 += model.Count; - shop.ShopPizzas[model.PizzaId] = oldValue; - } - else - { - var pizza = _pizzaStorage.GetElement(new PizzaSearchModel - { - Id = model.PizzaId - }); - if (pizza == null) - { - throw new ArgumentException($"Поставка: Товар с id:{model.PizzaId} не найденн"); - } - shop.ShopPizzas.Add(model.PizzaId, (pizza, model.Count)); - } - return true; + shop.ShopTravels.Add(model.TravelId, (Travel, model.Count)); } + return true; + } - private void CheckModel(ShopBindingModel model, bool withParams = true) + private void CheckModel(ShopBindingModel model, bool withParams = true) + { + if (model == null) { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - if (!withParams) - { - return; - } - if (string.IsNullOrEmpty(model.Adress)) - { - throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress)); - } - if (string.IsNullOrEmpty(model.ShopName)) - { - throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName)); - } - _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id); - var element = _shopStorage.GetElement(new ShopSearchModel - { - ShopName = model.ShopName - }); - if (element != null && element.Id != model.Id) - { - throw new InvalidOperationException("Магазин с таким названием уже есть"); - } + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.Address)) + { + throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Address)); + } + if (string.IsNullOrEmpty(model.ShopName)) + { + throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName)); + } + _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Address, model.OpeningDate, model.Id); + var element = _shopStorage.GetElement(new ShopSearchModel + { + ShopName = model.ShopName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Магазин с таким названием уже есть"); } } } diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs index 1e5348b..69719fe 100644 --- a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs +++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace TravelCompanyBusinessLogic.BusinessLogic { - public class TravelLogic : TravelCompanyContracts.BusinessLogicsContracts.ITravelLogic + public class TravelLogic : ITravelLogic { private readonly ILogger _logger; private readonly ITravelStorage _TravelStorage; diff --git a/TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj b/TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj index 901b63b..fd62a0d 100644 --- a/TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj +++ b/TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj @@ -17,6 +17,7 @@ + diff --git a/TravelCompany/TravelCompanyContracts/BindingModels/ShopBindingModel.cs b/TravelCompany/TravelCompanyContracts/BindingModels/ShopBindingModel.cs index 533370d..39d108e 100644 --- a/TravelCompany/TravelCompanyContracts/BindingModels/ShopBindingModel.cs +++ b/TravelCompany/TravelCompanyContracts/BindingModels/ShopBindingModel.cs @@ -13,6 +13,6 @@ namespace TravelCompanyContracts.BindingModels public string ShopName { get; set; } = string.Empty; public string Address { get; set; } = string.Empty; public DateTime OpeningDate { get; set; } = DateTime.Now; - public Dictionary ShopPizzas { get; set; } = new(); + public Dictionary ShopTravels { get; set; } = new(); } } diff --git a/TravelCompany/TravelCompanyContracts/StoragesContracts/ITravelStorage_1.cs b/TravelCompany/TravelCompanyContracts/StoragesContracts/IOrderStorage.cs similarity index 94% rename from TravelCompany/TravelCompanyContracts/StoragesContracts/ITravelStorage_1.cs rename to TravelCompany/TravelCompanyContracts/StoragesContracts/IOrderStorage.cs index 8bff61f..b4d8462 100644 --- a/TravelCompany/TravelCompanyContracts/StoragesContracts/ITravelStorage_1.cs +++ b/TravelCompany/TravelCompanyContracts/StoragesContracts/IOrderStorage.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace TravelCompanyContracts.StoragesContracts { - public interface ITravelStorage + public interface IOrderStorage { List GetFullList(); List GetFilteredList(OrderSearchModel model); diff --git a/TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs b/TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs index 9130910..0676fe2 100644 --- a/TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs +++ b/TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace TravelCompanyListImplement.Implements { - public class OrderStorage : ITravelStorage + public class OrderStorage : IOrderStorage { private readonly DataListSingleton _source;