diff --git a/Shipyard/Shipyard/FormAddShip.Designer.cs b/Shipyard/Shipyard/FormAddShip.Designer.cs new file mode 100644 index 0000000..f8d0631 --- /dev/null +++ b/Shipyard/Shipyard/FormAddShip.Designer.cs @@ -0,0 +1,145 @@ +namespace ShipyardView +{ + partial class FormAddShip + { + /// + /// 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.labelShop = new System.Windows.Forms.Label(); + this.labelShip = new System.Windows.Forms.Label(); + this.labelCount = new System.Windows.Forms.Label(); + this.comboBoxShop = new System.Windows.Forms.ComboBox(); + this.comboBoxShip = new System.Windows.Forms.ComboBox(); + this.numericUpDownCount = new System.Windows.Forms.NumericUpDown(); + this.ButtonSave = new System.Windows.Forms.Button(); + this.ButtonCancel = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit(); + this.SuspendLayout(); + // + // labelShop + // + this.labelShop.AutoSize = true; + this.labelShop.Location = new System.Drawing.Point(12, 31); + this.labelShop.Name = "labelShop"; + this.labelShop.Size = new System.Drawing.Size(69, 20); + this.labelShop.TabIndex = 0; + this.labelShop.Text = "Магазин"; + // + // labelShip + // + this.labelShip.AutoSize = true; + this.labelShip.Location = new System.Drawing.Point(12, 76); + this.labelShip.Name = "labelShip"; + this.labelShip.Size = new System.Drawing.Size(69, 20); + this.labelShip.TabIndex = 1; + this.labelShip.Text = "Корабль"; + // + // labelCount + // + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(12, 127); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(90, 20); + this.labelCount.TabIndex = 2; + this.labelCount.Text = "Количество"; + // + // comboBoxShop + // + this.comboBoxShop.FormattingEnabled = true; + this.comboBoxShop.Location = new System.Drawing.Point(111, 31); + this.comboBoxShop.Name = "comboBoxShop"; + this.comboBoxShop.Size = new System.Drawing.Size(369, 28); + this.comboBoxShop.TabIndex = 3; + // + // comboBoxShip + // + this.comboBoxShip.FormattingEnabled = true; + this.comboBoxShip.Location = new System.Drawing.Point(111, 76); + this.comboBoxShip.Name = "comboBoxShip"; + this.comboBoxShip.Size = new System.Drawing.Size(369, 28); + this.comboBoxShip.TabIndex = 4; + // + // numericUpDownCount + // + this.numericUpDownCount.Location = new System.Drawing.Point(111, 120); + this.numericUpDownCount.Name = "numericUpDownCount"; + this.numericUpDownCount.Size = new System.Drawing.Size(369, 27); + this.numericUpDownCount.TabIndex = 5; + // + // ButtonSave + // + this.ButtonSave.Location = new System.Drawing.Point(279, 167); + this.ButtonSave.Name = "ButtonSave"; + this.ButtonSave.Size = new System.Drawing.Size(94, 29); + this.ButtonSave.TabIndex = 6; + this.ButtonSave.Text = "Сохранить"; + this.ButtonSave.UseVisualStyleBackColor = true; + this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // ButtonCancel + // + this.ButtonCancel.Location = new System.Drawing.Point(386, 167); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(94, 29); + this.ButtonCancel.TabIndex = 7; + this.ButtonCancel.Text = "Отмена"; + this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormAddShip + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(492, 207); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.ButtonSave); + this.Controls.Add(this.numericUpDownCount); + this.Controls.Add(this.comboBoxShip); + this.Controls.Add(this.comboBoxShop); + this.Controls.Add(this.labelCount); + this.Controls.Add(this.labelShip); + this.Controls.Add(this.labelShop); + this.Name = "FormAddShip"; + this.Text = "Добавление корабля в магазин"; + this.Load += new System.EventHandler(this.FormAddShip_Load); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label labelShop; + private Label labelShip; + private Label labelCount; + private ComboBox comboBoxShop; + private ComboBox comboBoxShip; + private NumericUpDown numericUpDownCount; + private Button ButtonSave; + private Button ButtonCancel; + } +} \ No newline at end of file diff --git a/Shipyard/Shipyard/FormAddShip.cs b/Shipyard/Shipyard/FormAddShip.cs new file mode 100644 index 0000000..4a88779 --- /dev/null +++ b/Shipyard/Shipyard/FormAddShip.cs @@ -0,0 +1,117 @@ +using Microsoft.Extensions.Logging; +using ShipyardContracts.BusinessLogicsContracts; +using ShipyardContracts.SearchModels; +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 ShipyardView +{ + public partial class FormAddShip : Form + { + private readonly ILogger _logger; + private readonly IShipLogic _logicShip; + private readonly IShopLogic _logicShop; + public FormAddShip(ILogger logger, IShipLogic logicShip, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _logicShip = logicShip; + _logicShop = logicShop; + } + + private void FormAddShip_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка списка кораблей для пополнения"); + try + { + var list = _logicShip.ReadList(null); + if (list != null) + { + comboBoxShip.DisplayMember = "ShipName"; + comboBoxShip.ValueMember = "Id"; + comboBoxShip.DataSource = list; + comboBoxShip.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка кораблей"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + _logger.LogInformation("Загрузка списка магазинов для пополнения"); + try + { + var list = _logicShop.ReadList(null); + if (list != null) + { + comboBoxShop.DisplayMember = "ShopName"; + comboBoxShop.ValueMember = "Id"; + comboBoxShop.DataSource = list; + comboBoxShop.SelectedItem = null; + } + } + 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(numericUpDownCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxShip.SelectedValue == null) + { + MessageBox.Show("Выберите корабль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxShop.SelectedValue == null) + { + MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Пополнение магазина"); + try + { + var operationResult = _logicShop.AddShip(new ShopSearchModel + { + Id = Convert.ToInt32(comboBoxShop.SelectedValue) + }, + _logicShip.ReadElement(new ShipSearchModel() + { + Id = Convert.ToInt32(comboBoxShip.SelectedValue) + })!, Convert.ToInt32(numericUpDownCount.Text)); + 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/Shipyard/Shipyard/FormAddShip.resx b/Shipyard/Shipyard/FormAddShip.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Shipyard/Shipyard/FormAddShip.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/Shipyard/Shipyard/FormMain.Designer.cs b/Shipyard/Shipyard/FormMain.Designer.cs index adae0c6..d537508 100644 --- a/Shipyard/Shipyard/FormMain.Designer.cs +++ b/Shipyard/Shipyard/FormMain.Designer.cs @@ -37,7 +37,9 @@ this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ДеталиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.КораблиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.магазинToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ButtonAddShip = new System.Windows.Forms.Button(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -112,7 +114,8 @@ // this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ДеталиToolStripMenuItem, - this.КораблиToolStripMenuItem}); + this.КораблиToolStripMenuItem, + this.магазинToolStripMenuItem}); this.ToolStripMenuItem.Name = "ToolStripMenuItem"; this.ToolStripMenuItem.Size = new System.Drawing.Size(117, 24); this.ToolStripMenuItem.Text = "Справочники"; @@ -120,17 +123,24 @@ // ДеталиToolStripMenuItem // this.ДеталиToolStripMenuItem.Name = "ДеталиToolStripMenuItem"; - this.ДеталиToolStripMenuItem.Size = new System.Drawing.Size(153, 26); + this.ДеталиToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.ДеталиToolStripMenuItem.Text = "Детали"; this.ДеталиToolStripMenuItem.Click += new System.EventHandler(this.ДеталиToolStripMenuItem_Click); // // КораблиToolStripMenuItem // this.КораблиToolStripMenuItem.Name = "КораблиToolStripMenuItem"; - this.КораблиToolStripMenuItem.Size = new System.Drawing.Size(153, 26); + this.КораблиToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.КораблиToolStripMenuItem.Text = "Корабли"; this.КораблиToolStripMenuItem.Click += new System.EventHandler(this.КораблиToolStripMenuItem_Click); // + // магазинToolStripMenuItem + // + this.магазинToolStripMenuItem.Name = "магазинToolStripMenuItem"; + this.магазинToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.магазинToolStripMenuItem.Text = "Магазины"; + this.магазинToolStripMenuItem.Click += new System.EventHandler(this.МагазиныToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -142,11 +152,22 @@ this.dataGridView.Size = new System.Drawing.Size(933, 446); this.dataGridView.TabIndex = 6; // + // ButtonAddShip + // + this.ButtonAddShip.Location = new System.Drawing.Point(961, 379); + this.ButtonAddShip.Name = "ButtonAddShip"; + this.ButtonAddShip.Size = new System.Drawing.Size(187, 33); + this.ButtonAddShip.TabIndex = 7; + this.ButtonAddShip.Text = "Добавить корабль"; + this.ButtonAddShip.UseVisualStyleBackColor = true; + this.ButtonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1160, 474); + this.Controls.Add(this.ButtonAddShip); this.Controls.Add(this.dataGridView); this.Controls.Add(this.ButtonRef); this.Controls.Add(this.ButtonIssuedOrder); @@ -178,5 +199,7 @@ private ToolStripMenuItem ДеталиToolStripMenuItem; private ToolStripMenuItem КораблиToolStripMenuItem; private DataGridView dataGridView; + private ToolStripMenuItem магазинToolStripMenuItem; + private Button ButtonAddShip; } } \ No newline at end of file diff --git a/Shipyard/Shipyard/FormMain.cs b/Shipyard/Shipyard/FormMain.cs index 4c486eb..a01e6cf 100644 --- a/Shipyard/Shipyard/FormMain.cs +++ b/Shipyard/Shipyard/FormMain.cs @@ -154,5 +154,24 @@ namespace ShipyardView { LoadData(); } + + private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + if (service is FormShops form) + { + form.ShowDialog(); + } + } + + private void ButtonAddShip_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormAddShip)); + if (service is FormAddShip form) + { + form.ShowDialog(); + LoadData(); + } + } } } diff --git a/Shipyard/Shipyard/FormShop.Designer.cs b/Shipyard/Shipyard/FormShop.Designer.cs new file mode 100644 index 0000000..34bb8d5 --- /dev/null +++ b/Shipyard/Shipyard/FormShop.Designer.cs @@ -0,0 +1,188 @@ +namespace ShipyardView +{ + partial class FormShop + { + /// + /// 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.labelShop = new System.Windows.Forms.Label(); + this.labelAddress = new System.Windows.Forms.Label(); + this.labelDate = new System.Windows.Forms.Label(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.textBoxAddress = new System.Windows.Forms.TextBox(); + this.dateTimePickerDateOpen = new System.Windows.Forms.DateTimePicker(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ButtonSave = new System.Windows.Forms.Button(); + this.ButtonCancel = new System.Windows.Forms.Button(); + this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShipName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // labelShop + // + this.labelShop.AutoSize = true; + this.labelShop.Location = new System.Drawing.Point(12, 21); + this.labelShop.Name = "labelShop"; + this.labelShop.Size = new System.Drawing.Size(69, 20); + this.labelShop.TabIndex = 0; + this.labelShop.Text = "Магазин"; + // + // labelAddress + // + this.labelAddress.AutoSize = true; + this.labelAddress.Location = new System.Drawing.Point(195, 21); + this.labelAddress.Name = "labelAddress"; + this.labelAddress.Size = new System.Drawing.Size(51, 20); + this.labelAddress.TabIndex = 1; + this.labelAddress.Text = "Адрес"; + // + // labelDate + // + this.labelDate.AutoSize = true; + this.labelDate.Location = new System.Drawing.Point(474, 21); + this.labelDate.Name = "labelDate"; + this.labelDate.Size = new System.Drawing.Size(110, 20); + this.labelDate.TabIndex = 2; + this.labelDate.Text = "Дата открытия"; + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(12, 44); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(160, 27); + this.textBoxName.TabIndex = 3; + // + // textBoxAddress + // + this.textBoxAddress.Location = new System.Drawing.Point(195, 44); + this.textBoxAddress.Name = "textBoxAddress"; + this.textBoxAddress.Size = new System.Drawing.Size(246, 27); + this.textBoxAddress.TabIndex = 4; + // + // dateTimePickerDateOpen + // + this.dateTimePickerDateOpen.Location = new System.Drawing.Point(474, 44); + this.dateTimePickerDateOpen.Name = "dateTimePickerDateOpen"; + this.dateTimePickerDateOpen.Size = new System.Drawing.Size(250, 27); + this.dateTimePickerDateOpen.TabIndex = 5; + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ID, + this.ShipName, + this.Count}); + this.dataGridView.Location = new System.Drawing.Point(12, 77); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 51; + this.dataGridView.RowTemplate.Height = 29; + this.dataGridView.Size = new System.Drawing.Size(712, 330); + this.dataGridView.TabIndex = 6; + // + // ButtonSave + // + this.ButtonSave.Location = new System.Drawing.Point(490, 413); + this.ButtonSave.Name = "ButtonSave"; + this.ButtonSave.Size = new System.Drawing.Size(111, 29); + this.ButtonSave.TabIndex = 7; + this.ButtonSave.Text = "Сохранить"; + this.ButtonSave.UseVisualStyleBackColor = true; + this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // ButtonCancel + // + this.ButtonCancel.Location = new System.Drawing.Point(630, 413); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(94, 29); + this.ButtonCancel.TabIndex = 8; + this.ButtonCancel.Text = "Отмена"; + this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // ID + // + this.ID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ID.HeaderText = "ID"; + this.ID.MinimumWidth = 6; + this.ID.Name = "ID"; + this.ID.Visible = false; + // + // ShipName + // + this.ShipName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ShipName.HeaderText = "ShipName"; + this.ShipName.MinimumWidth = 6; + this.ShipName.Name = "ShipName"; + // + // Count + // + this.Count.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Count.HeaderText = "Count"; + this.Count.MinimumWidth = 6; + this.Count.Name = "Count"; + // + // FormShop + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(740, 450); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.ButtonSave); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.dateTimePickerDateOpen); + this.Controls.Add(this.textBoxAddress); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.labelDate); + this.Controls.Add(this.labelAddress); + this.Controls.Add(this.labelShop); + this.Name = "FormShop"; + this.Text = "Магазин"; + this.Load += new System.EventHandler(this.FormShop_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label labelShop; + private Label labelAddress; + private Label labelDate; + private TextBox textBoxName; + private TextBox textBoxAddress; + private DateTimePicker dateTimePickerDateOpen; + private DataGridView dataGridView; + private Button ButtonSave; + private Button ButtonCancel; + private DataGridViewTextBoxColumn ID; + private DataGridViewTextBoxColumn ShipName; + private DataGridViewTextBoxColumn Count; + } +} \ No newline at end of file diff --git a/Shipyard/Shipyard/FormShop.cs b/Shipyard/Shipyard/FormShop.cs new file mode 100644 index 0000000..bea9773 --- /dev/null +++ b/Shipyard/Shipyard/FormShop.cs @@ -0,0 +1,132 @@ +using ShipyardContracts.BusinessLogicsContracts; +using ShipyardContracts.SearchModels; +using ShipyardDataModels.Models; +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 System.Windows.Forms.VisualStyles; +using Microsoft.Extensions.Logging; +using ShipyardContracts.BindingModels; + +namespace ShipyardView +{ + public partial class FormShop : Form + { + private readonly ILogger _logger; + private readonly IShopLogic _logic; + private int? _id; + private Dictionary _shopShips; + public int Id { set { _id = value; } } + public FormShop(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _shopShips = 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.ToString(); + dateTimePickerDateOpen.Text = view.DateOpen.ToString(); + _shopShips = view.ShopShips ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void LoadData() + { + _logger.LogInformation("Загрузка кораблей магазина"); + try + { + if (_shopShips != null) + { + dataGridView.Rows.Clear(); + foreach (var element in _shopShips) + { + dataGridView.Rows.Add(new object[] { element.Key, element.Value.Item1.ShipName, element.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; + } + if (string.IsNullOrEmpty(dateTimePickerDateOpen.Text)) + { + MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение магазина"); + try + { + var model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = textBoxName.Text, + Address = textBoxAddress.Text, + DateOpen = DateTime.Parse(dateTimePickerDateOpen.Text), + ShopShips = _shopShips + }; + 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/Shipyard/Shipyard/FormShop.resx b/Shipyard/Shipyard/FormShop.resx new file mode 100644 index 0000000..5b92748 --- /dev/null +++ b/Shipyard/Shipyard/FormShop.resx @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/Shipyard/Shipyard/FormShops.Designer.cs b/Shipyard/Shipyard/FormShops.Designer.cs new file mode 100644 index 0000000..daafcee --- /dev/null +++ b/Shipyard/Shipyard/FormShops.Designer.cs @@ -0,0 +1,116 @@ +namespace ShipyardView +{ + 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() + { + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ButtonAdd = new System.Windows.Forms.Button(); + this.ButtonUpd = new System.Windows.Forms.Button(); + this.ButtonDel = new System.Windows.Forms.Button(); + this.ButtonRef = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 51; + this.dataGridView.RowTemplate.Height = 29; + this.dataGridView.Size = new System.Drawing.Size(631, 450); + this.dataGridView.TabIndex = 0; + // + // ButtonAdd + // + this.ButtonAdd.Location = new System.Drawing.Point(670, 33); + this.ButtonAdd.Name = "ButtonAdd"; + this.ButtonAdd.Size = new System.Drawing.Size(106, 48); + this.ButtonAdd.TabIndex = 1; + this.ButtonAdd.Text = "Создать"; + this.ButtonAdd.UseVisualStyleBackColor = true; + this.ButtonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // ButtonUpd + // + this.ButtonUpd.Location = new System.Drawing.Point(670, 102); + this.ButtonUpd.Name = "ButtonUpd"; + this.ButtonUpd.Size = new System.Drawing.Size(106, 48); + this.ButtonUpd.TabIndex = 2; + this.ButtonUpd.Text = "Изменить"; + this.ButtonUpd.UseVisualStyleBackColor = true; + this.ButtonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // ButtonDel + // + this.ButtonDel.Location = new System.Drawing.Point(670, 165); + this.ButtonDel.Name = "ButtonDel"; + this.ButtonDel.Size = new System.Drawing.Size(106, 48); + this.ButtonDel.TabIndex = 3; + this.ButtonDel.Text = "Удалить"; + this.ButtonDel.UseVisualStyleBackColor = true; + this.ButtonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // ButtonRef + // + this.ButtonRef.Location = new System.Drawing.Point(670, 229); + this.ButtonRef.Name = "ButtonRef"; + this.ButtonRef.Size = new System.Drawing.Size(106, 48); + this.ButtonRef.TabIndex = 4; + this.ButtonRef.Text = "Обновить"; + this.ButtonRef.UseVisualStyleBackColor = true; + this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // FormShops + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.ButtonRef); + this.Controls.Add(this.ButtonDel); + this.Controls.Add(this.ButtonUpd); + this.Controls.Add(this.ButtonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormShops"; + this.Text = "Магазины"; + this.Load += new System.EventHandler(this.FormShops_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + private Button ButtonAdd; + private Button ButtonUpd; + private Button ButtonDel; + private Button ButtonRef; + } +} \ No newline at end of file diff --git a/Shipyard/Shipyard/FormShops.cs b/Shipyard/Shipyard/FormShops.cs new file mode 100644 index 0000000..93469c1 --- /dev/null +++ b/Shipyard/Shipyard/FormShops.cs @@ -0,0 +1,113 @@ +using Microsoft.Extensions.Logging; +using ShipyardContracts.BindingModels; +using ShipyardContracts.BusinessLogicsContracts; +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 ShipyardView +{ + 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["ShopShips"].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/Shipyard/Shipyard/FormShops.resx b/Shipyard/Shipyard/FormShops.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Shipyard/Shipyard/FormShops.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/Shipyard/Shipyard/Program.cs b/Shipyard/Shipyard/Program.cs index 00ba945..16bf9a9 100644 --- a/Shipyard/Shipyard/Program.cs +++ b/Shipyard/Shipyard/Program.cs @@ -6,7 +6,6 @@ using ShipyardContracts.BusinessLogicsContracts; using ShipyardContracts.StoragesContracts; using ShipyardListImplement.Implements; - namespace ShipyardView { internal static class Program @@ -40,9 +39,11 @@ namespace ShipyardView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -50,6 +51,9 @@ namespace ShipyardView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } diff --git a/Shipyard/ShipyardBusinessLogic/BusinessLogics/ShopLogic.cs b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ShopLogic.cs new file mode 100644 index 0000000..c284950 --- /dev/null +++ b/Shipyard/ShipyardBusinessLogic/BusinessLogics/ShopLogic.cs @@ -0,0 +1,152 @@ +using Microsoft.Extensions.Logging; +using ShipyardContracts.BindingModels; +using ShipyardContracts.BusinessLogicsContracts; +using ShipyardContracts.SearchModels; +using ShipyardContracts.StoragesContracts; +using ShipyardContracts.ViewModels; +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardBusinessLogic.BusinessLogics +{ + public class ShopLogic: IShopLogic + { + private readonly ILogger _logger; + private readonly IShopStorage _shopStorage; + public ShopLogic(ILogger logger, IShopStorage shopStorage) + { + _logger = logger; + _shopStorage = shopStorage; + } + 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.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + public ShopViewModel? ReadElement(ShopSearchModel model) + { + 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; + } + public bool Create(ShopBindingModel model) + { + CheckModel(model); + if (_shopStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(ShopBindingModel model) + { + CheckModel(model); + if (_shopStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(ShopBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id: {Id}", model.Id); + if (_shopStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + private void CheckModel(ShopBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ShopName)) + { + throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName)); + } + _logger.LogInformation("Shop. ShopName:{0}. Address:{1}. Id:{2}", + model.ShopName, model.Address, model.Id); + var element = _shopStorage.GetElement(new ShopSearchModel + { + ShopName = model.ShopName + }); + if (element != null && element.Id != model.Id && element.ShopName == model.ShopName) + { + throw new InvalidOperationException("Магазин с таким названием уже есть"); + } + } + + public bool AddShip(ShopSearchModel model, IShipModel ship, int count) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (count <= 0) + { + throw new ArgumentException("Количество поездок должно быть больше 0", nameof(count)); + } + _logger.LogInformation("AddShip. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id); + var element = _shopStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("AddShip element not found"); + return false; + } + _logger.LogInformation("AddShip find. Id:{Id}", element.Id); + + if (element.ShopShips.TryGetValue(ship.Id, out var pair)) + { + element.ShopShips[ship.Id] = (ship, count + pair.Item2); + _logger.LogInformation("AddShip. Added {count} {ship} to '{ShopName}' shop", + count, ship.ShipName, element.ShopName); + } + else + { + element.ShopShips[ship.Id] = (ship, count); + _logger.LogInformation("AddShip. Added {count} new ship {ship} to '{ShopName}' shop", + count, ship.ShipName, element.ShopName); + } + _shopStorage.Update(new() + { + Id = element.Id, + Address = element.Address, + ShopName = element.ShopName, + DateOpen = element.DateOpen, + ShopShips = element.ShopShips + }); + return true; + } + } +} diff --git a/Shipyard/ShipyardContracts/BindingModels/ShopBindingModel.cs b/Shipyard/ShipyardContracts/BindingModels/ShopBindingModel.cs new file mode 100644 index 0000000..7cc5f7c --- /dev/null +++ b/Shipyard/ShipyardContracts/BindingModels/ShopBindingModel.cs @@ -0,0 +1,18 @@ +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.BindingModels +{ + public class ShopBindingModel:IShopModel + { + public string ShopName { get; set; } = string.Empty; + public string Address { get; set; } = string.Empty; + public DateTime DateOpen { get; set; } = DateTime.Now; + public Dictionary ShopShips { get; set; } = new(); + public int Id { get; set; } + } +} diff --git a/Shipyard/ShipyardContracts/BusinessLogicsContracts/IShopLogic.cs b/Shipyard/ShipyardContracts/BusinessLogicsContracts/IShopLogic.cs new file mode 100644 index 0000000..bb308e0 --- /dev/null +++ b/Shipyard/ShipyardContracts/BusinessLogicsContracts/IShopLogic.cs @@ -0,0 +1,22 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.ViewModels; +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.BusinessLogicsContracts +{ + public interface IShopLogic + { + List? ReadList(ShopSearchModel? model); + ShopViewModel? ReadElement(ShopSearchModel model); + bool Create(ShopBindingModel model); + bool Update(ShopBindingModel model); + bool Delete(ShopBindingModel model); + bool AddShip(ShopSearchModel model, IShipModel ship, int count); + } +} diff --git a/Shipyard/ShipyardContracts/SearchModels/ShopSearchModel.cs b/Shipyard/ShipyardContracts/SearchModels/ShopSearchModel.cs new file mode 100644 index 0000000..2a660d4 --- /dev/null +++ b/Shipyard/ShipyardContracts/SearchModels/ShopSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.SearchModels +{ + public class ShopSearchModel + { + public int? Id { get; set; } + public string? ShopName { get; set; } + } +} diff --git a/Shipyard/ShipyardContracts/StoragesContracts/IShopStorage.cs b/Shipyard/ShipyardContracts/StoragesContracts/IShopStorage.cs new file mode 100644 index 0000000..df45e51 --- /dev/null +++ b/Shipyard/ShipyardContracts/StoragesContracts/IShopStorage.cs @@ -0,0 +1,21 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.StoragesContracts +{ + public interface IShopStorage + { + List GetFullList(); + List GetFilteredList(ShopSearchModel model); + ShopViewModel? GetElement(ShopSearchModel model); + ShopViewModel? Insert(ShopBindingModel model); + ShopViewModel? Update(ShopBindingModel model); + ShopViewModel? Delete(ShopBindingModel model); + } +} diff --git a/Shipyard/ShipyardContracts/ViewModels/ShopViewModel.cs b/Shipyard/ShipyardContracts/ViewModels/ShopViewModel.cs new file mode 100644 index 0000000..ca3eb95 --- /dev/null +++ b/Shipyard/ShipyardContracts/ViewModels/ShopViewModel.cs @@ -0,0 +1,24 @@ +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardContracts.ViewModels +{ + public class ShopViewModel:IShopModel + { + [DisplayName("Название магазина")] + public string ShopName { get; set; } = string.Empty; + + [DisplayName("Адрес магазина")] + public string Address { get; set; } = string.Empty; + + [DisplayName("Дата открытия")] + public DateTime DateOpen { get; set; } = DateTime.Now; + public Dictionary ShopShips { get; set; } = new(); + public int Id { get; set; } + } +} diff --git a/Shipyard/ShipyardDataModels/Models/IShopModel.cs b/Shipyard/ShipyardDataModels/Models/IShopModel.cs new file mode 100644 index 0000000..584154a --- /dev/null +++ b/Shipyard/ShipyardDataModels/Models/IShopModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardDataModels.Models +{ + public interface IShopModel: IId + { + string ShopName { get; } + string Address { get; } + DateTime DateOpen { get; } + Dictionary ShopShips { get; } + } +} diff --git a/Shipyard/ShipyardListImplement»/DataListSingleton.cs b/Shipyard/ShipyardListImplement»/DataListSingleton.cs index fd368be..5dabe77 100644 --- a/Shipyard/ShipyardListImplement»/DataListSingleton.cs +++ b/Shipyard/ShipyardListImplement»/DataListSingleton.cs @@ -1,5 +1,6 @@ using ShipyardListImplement.Models; + namespace ShipyardListImplement { public class DataListSingleton @@ -8,11 +9,13 @@ namespace ShipyardListImplement public List Details { get; set; } public List Orders { get; set; } public List Ships { get; set; } + public List Shops { get; set; } private DataListSingleton() { Details = new List(); Orders = new List(); Ships = new List(); + Shops = new List(); } public static DataListSingleton GetInstance() { diff --git a/Shipyard/ShipyardListImplement»/Implements/ShopStorage.cs b/Shipyard/ShipyardListImplement»/Implements/ShopStorage.cs new file mode 100644 index 0000000..b11ec35 --- /dev/null +++ b/Shipyard/ShipyardListImplement»/Implements/ShopStorage.cs @@ -0,0 +1,113 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.SearchModels; +using ShipyardContracts.StoragesContracts; +using ShipyardContracts.ViewModels; +using ShipyardListImplement; +using ShipyardListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardListImplement.Implements +{ + public class ShopStorage:IShopStorage + { + private readonly DataListSingleton _source; + + public ShopStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + foreach (var shop in _source.Shops) + { + if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) || (model.Id.HasValue && shop.Id == model.Id)) + { + return shop.GetViewModel; + } + } + return null; + } + + public List GetFilteredList(ShopSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ShopName)) + { + return result; + } + foreach (var shop in _source.Shops) + { + if (shop.ShopName.Contains(model.ShopName)) + { + result.Add(shop.GetViewModel); + } + } + return result; + } + + public List GetFullList() + { + var result = new List(); + foreach (var shop in _source.Shops) + { + result.Add(shop.GetViewModel); + } + return result; + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = 1; + foreach (var shop in _source.Shops) + { + if (model.Id <= shop.Id) + { + model.Id = shop.Id + 1; + } + } + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + _source.Shops.Add(newShop); + return newShop.GetViewModel; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + foreach (var shop in _source.Shops) + { + if (shop.Id == model.Id) + { + shop.Update(model); + return shop.GetViewModel; + } + } + return null; + } + + public ShopViewModel? Delete(ShopBindingModel model) + { + for (int i = 0; i < _source.Shops.Count; ++i) + { + if (_source.Shops[i].Id == model.Id) + { + var element = _source.Shops[i]; + _source.Shops.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} diff --git a/Shipyard/ShipyardListImplement»/Models/Shop.cs b/Shipyard/ShipyardListImplement»/Models/Shop.cs new file mode 100644 index 0000000..fb6664f --- /dev/null +++ b/Shipyard/ShipyardListImplement»/Models/Shop.cs @@ -0,0 +1,60 @@ +using ShipyardContracts.BindingModels; +using ShipyardContracts.ViewModels; +using ShipyardDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShipyardListImplement.Models +{ + public class Shop:IShopModel + { + public string ShopName { get; set; } = string.Empty; + + public string Address { get; set; } = string.Empty; + + public DateTime DateOpen { get; set; } + public int Id { get; set; } + public Dictionary ShopShips { get; private set; } = new Dictionary(); + + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpen = model.DateOpen, + ShopShips = model.ShopShips + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + DateOpen = model.DateOpen; + ShopShips = model.ShopShips; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpen = DateOpen, + ShopShips = ShopShips + }; + } +} +