From edb600877cab502d0e714d055336132e0657178a Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Sat, 16 Mar 2024 15:44:01 +0400 Subject: [PATCH 1/4] All done --- .../SoftwareInstallation/FormMain.Designer.cs | 56 +++-- .../SoftwareInstallation/FormMain.cs | 18 ++ .../SoftwareInstallation/FormMain.resx | 2 +- .../SoftwareInstallation/FormShop.Designer.cs | 193 ++++++++++++++++++ .../SoftwareInstallation/FormShop.cs | 140 +++++++++++++ .../SoftwareInstallation/FormShop.resx | 120 +++++++++++ .../FormShopReplenishment.Designer.cs | 147 +++++++++++++ .../FormShopReplenishment.cs | 104 ++++++++++ .../FormShopReplenishment.resx | 120 +++++++++++ .../FormShops.Designer.cs | 125 ++++++++++++ .../SoftwareInstallation/FormShops.cs | 123 +++++++++++ .../SoftwareInstallation/FormShops.resx | 120 +++++++++++ .../SoftwareInstallation/Program.cs | 5 + .../BusinessLogics/ShopLogic.cs | 180 ++++++++++++++++ .../BindingModels/ShopBindingModel.cs | 18 ++ .../BusinessLogicContracts/IShopLogic.cs | 22 ++ .../SearchModels/ShopSearchModel.cs | 14 ++ .../StoragesContracts/IShopStorage.cs | 21 ++ .../ViewModels/ShopViewModel.cs | 23 +++ .../Models/IShopModel.cs | 16 ++ .../DataListSingleton.cs | 2 + .../Implements/ShopStorage.cs | 124 +++++++++++ .../Models/Shop.cs | 60 ++++++ 23 files changed, 1735 insertions(+), 18 deletions(-) create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShop.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShop.resx create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.Designer.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.resx create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShops.Designer.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShops.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormShops.resx create mode 100644 SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs create mode 100644 SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs create mode 100644 SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs create mode 100644 SoftwareInstallation/SoftwareInstallationContracts/SearchModels/ShopSearchModel.cs create mode 100644 SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs create mode 100644 SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs index 7566509..f0eb263 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs @@ -28,34 +28,36 @@ /// private void InitializeComponent() { - menuStrip = new MenuStrip(); + menuStrip1 = new MenuStrip(); справочникиToolStripMenuItem = new ToolStripMenuItem(); компонентыToolStripMenuItem = new ToolStripMenuItem(); изделияToolStripMenuItem = new ToolStripMenuItem(); + магазиныToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRefresh = new Button(); - menuStrip.SuspendLayout(); + shopReplenishment = new Button(); + menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // - // menuStrip + // menuStrip1 // - menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem }); - menuStrip.Location = new Point(0, 0); - menuStrip.Name = "menuStrip"; - menuStrip.Padding = new Padding(7, 3, 0, 3); - menuStrip.Size = new Size(1077, 30); - menuStrip.TabIndex = 0; - menuStrip.Text = "menuStrip1"; + menuStrip1.ImageScalingSize = new Size(20, 20); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem }); + menuStrip1.Location = new Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Padding = new Padding(7, 3, 0, 3); + menuStrip1.Size = new Size(1077, 30); + menuStrip1.TabIndex = 0; + menuStrip1.Text = "menuStrip1"; // // справочникиToolStripMenuItem // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem }); + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem, магазиныToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; @@ -74,6 +76,13 @@ изделияToolStripMenuItem.Text = "Изделия"; изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // + // магазиныToolStripMenuItem + // + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(182, 26); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; + // // dataGridView // dataGridView.AllowUserToAddRows = false; @@ -150,6 +159,16 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += ButtonRef_Click; // + // shopReplenishment + // + shopReplenishment.Location = new Point(885, 312); + shopReplenishment.Name = "shopReplenishment"; + shopReplenishment.Size = new Size(178, 41); + shopReplenishment.TabIndex = 7; + shopReplenishment.Text = "Пополнение магазина"; + shopReplenishment.UseVisualStyleBackColor = true; + shopReplenishment.Click += ShopReplenishment_Click; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -161,14 +180,15 @@ Controls.Add(buttonTakeOrderInWork); Controls.Add(buttonCreateOrder); Controls.Add(dataGridView); - Controls.Add(menuStrip); - MainMenuStrip = menuStrip; + Controls.Add(menuStrip1); + Controls.Add(shopReplenishment); + MainMenuStrip = menuStrip1; Margin = new Padding(3, 4, 3, 4); Name = "FormMain"; Text = "Установка ПО"; Load += FormMain_Load; - menuStrip.ResumeLayout(false); - menuStrip.PerformLayout(); + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); PerformLayout(); @@ -176,7 +196,7 @@ #endregion - private MenuStrip menuStrip; + private MenuStrip menuStrip1; private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem изделияToolStripMenuItem; @@ -186,5 +206,7 @@ private Button buttonOrderReady; private Button buttonIssuedOrder; private Button buttonRefresh; + private ToolStripMenuItem магазиныToolStripMenuItem; + private Button shopReplenishment; } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.cs b/SoftwareInstallation/SoftwareInstallation/FormMain.cs index 0a42aae..c7dd80e 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.cs @@ -50,6 +50,24 @@ namespace SoftwareInstallationView MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + private void ShopReplenishment_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShopReplenishment)); + + if (service is FormShopReplenishment form) + { + form.ShowDialog(); + } + } + private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + + if (service is FormShops form) + { + form.ShowDialog(); + } + } private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) { diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.resx b/SoftwareInstallation/SoftwareInstallation/FormMain.resx index 6c82d08..a0623c8 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.resx +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs new file mode 100644 index 0000000..2245683 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs @@ -0,0 +1,193 @@ +namespace SoftwareInstallationView +{ + 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() + { + shopNameLabel = new Label(); + shopAddressLabel = new Label(); + openingDateLabel = new Label(); + addressTextBox = new TextBox(); + openingDatePicker = new DateTimePicker(); + dataGridView = new DataGridView(); + PackageName = new DataGridViewTextBoxColumn(); + PackagePrice = new DataGridViewTextBoxColumn(); + PackageCount = new DataGridViewTextBoxColumn(); + SaveButton = new Button(); + ButtonCancel = new Button(); + nameTextBox = new TextBox(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // shopNameLabel + // + shopNameLabel.AutoSize = true; + shopNameLabel.Location = new Point(14, 12); + shopNameLabel.Name = "shopNameLabel"; + shopNameLabel.Size = new Size(154, 20); + shopNameLabel.TabIndex = 0; + shopNameLabel.Text = "Название магазина: "; + // + // shopAddressLabel + // + shopAddressLabel.AutoSize = true; + shopAddressLabel.Location = new Point(14, 53); + shopAddressLabel.Name = "shopAddressLabel"; + shopAddressLabel.Size = new Size(128, 20); + shopAddressLabel.TabIndex = 1; + shopAddressLabel.Text = "Адрес магазина: "; + // + // openingDateLabel + // + openingDateLabel.AutoSize = true; + openingDateLabel.Location = new Point(14, 96); + openingDateLabel.Name = "openingDateLabel"; + openingDateLabel.Size = new Size(117, 20); + openingDateLabel.TabIndex = 2; + openingDateLabel.Text = "Дата открытия: "; + // + // addressTextBox + // + addressTextBox.Location = new Point(163, 50); + addressTextBox.Margin = new Padding(3, 4, 3, 4); + addressTextBox.Name = "addressTextBox"; + addressTextBox.Size = new Size(198, 27); + addressTextBox.TabIndex = 4; + // + // openingDatePicker + // + openingDatePicker.Location = new Point(163, 91); + openingDatePicker.Name = "openingDatePicker"; + openingDatePicker.Size = new Size(198, 27); + openingDatePicker.TabIndex = 9; + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { PackageName, PackagePrice, PackageCount }); + dataGridView.Location = new Point(14, 145); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 25; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(887, 384); + dataGridView.TabIndex = 6; + // + // PackageName + // + PackageName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + PackageName.HeaderText = "Название изделия"; + PackageName.MinimumWidth = 6; + PackageName.Name = "PackageName"; + // + // PackagePrice + // + PackagePrice.HeaderText = "Цена"; + PackagePrice.MinimumWidth = 6; + PackagePrice.Name = "PackagePrice"; + PackagePrice.Width = 125; + // + // PackageCount + // + PackageCount.HeaderText = "Количество"; + PackageCount.MinimumWidth = 6; + PackageCount.Name = "PackageCount"; + PackageCount.Width = 125; + // + // SaveButton + // + SaveButton.Location = new Point(631, 537); + SaveButton.Margin = new Padding(3, 4, 3, 4); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(131, 47); + SaveButton.TabIndex = 7; + SaveButton.Text = "Сохранить"; + SaveButton.UseVisualStyleBackColor = true; + SaveButton.Click += SaveButton_Click; + // + // ButtonCancel + // + ButtonCancel.Location = new Point(769, 537); + ButtonCancel.Margin = new Padding(3, 4, 3, 4); + ButtonCancel.Name = "ButtonCancel"; + ButtonCancel.Size = new Size(131, 47); + ButtonCancel.TabIndex = 8; + ButtonCancel.Text = "Отменить"; + ButtonCancel.UseVisualStyleBackColor = true; + ButtonCancel.Click += ButtonCancel_Click; + // + // nameTextBox + // + nameTextBox.Location = new Point(163, 9); + nameTextBox.Name = "nameTextBox"; + nameTextBox.Size = new Size(198, 27); + nameTextBox.TabIndex = 10; + // + // FormShop + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(914, 600); + Controls.Add(nameTextBox); + Controls.Add(ButtonCancel); + Controls.Add(SaveButton); + Controls.Add(dataGridView); + Controls.Add(openingDatePicker); + Controls.Add(addressTextBox); + Controls.Add(openingDateLabel); + Controls.Add(shopAddressLabel); + Controls.Add(shopNameLabel); + Margin = new Padding(3, 4, 3, 4); + Name = "FormShop"; + Text = "Магазин"; + Load += FormShop_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label shopNameLabel; + private Label shopAddressLabel; + private Label openingDateLabel; + private TextBox addressTextBox; + private DateTimePicker openingDatePicker; + private DataGridView dataGridView; + private Button SaveButton; + private Button ButtonCancel; + private DataGridViewTextBoxColumn PackageName; + private DataGridViewTextBoxColumn PackagePrice; + private DataGridViewTextBoxColumn PackageCount; + private TextBox nameTextBox; + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormShop.cs b/SoftwareInstallation/SoftwareInstallation/FormShop.cs new file mode 100644 index 0000000..079b7f3 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShop.cs @@ -0,0 +1,140 @@ +using Microsoft.Extensions.Logging; +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.BusinessLogicContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.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; + +namespace SoftwareInstallationView +{ + public partial class FormShop : Form + { + private readonly List? _listShops; + private readonly IShopLogic _logic; + private readonly ILogger _logger; + public int Id { get; set; } + + public FormShop(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _listShops = logic.ReadList(null); + _logic = logic; + } + + private IShopModel? GetShop(int id) + { + if (_listShops == null) + { + return null; + } + foreach (var elem in _listShops) + { + if (elem.Id == id) + { + return elem; + } + } + return null; + } + + private void SaveButton_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(nameTextBox.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (string.IsNullOrEmpty(addressTextBox.Text)) + { + MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Сохранение изделия"); + + try + { + DateTime.TryParse(openingDatePicker.Text, out var dateTime); + ShopBindingModel model = new() + { + ShopName = nameTextBox.Text, + ShopAddress = addressTextBox.Text, + OpeningDate = dateTime + }; + var vmodel = GetShop(Id); + bool operationResult = false; + + if (vmodel != null) + { + model.Id = vmodel.Id; + model.Packages = vmodel.Packages; + operationResult = _logic.Update(model); + } + else + { + operationResult = _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(); + } + + private void FormShop_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData(bool extendDate = true) + { + try + { + var model = GetShop(extendDate ? Id : Convert.ToInt32(nameTextBox.Text)); + if (model != null) + { + nameTextBox.Text = model.ShopName; + addressTextBox.Text = model.ShopAddress; + openingDatePicker.Text = Convert.ToString(model.OpeningDate); + dataGridView.Rows.Clear(); + foreach (var el in model.Packages.Values) + { + dataGridView.Rows.Add(new object[] { el.Item1.PackageName, el.Item1.Price, el.Item2 }); + } + } + _logger.LogInformation("Загрузка магазинов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallation/FormShop.resx b/SoftwareInstallation/SoftwareInstallation/FormShop.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShop.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/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.Designer.cs new file mode 100644 index 0000000..34d3218 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.Designer.cs @@ -0,0 +1,147 @@ +namespace SoftwareInstallationView +{ + partial class FormShopReplenishment + { + /// + /// 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() + { + shopNameLabel = new Label(); + packageNameLabel = new Label(); + countLabel = new Label(); + shopNameComboBox = new ComboBox(); + packageNameComboBox = new ComboBox(); + countTextBox = new TextBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); + // + // shopNameLabel + // + shopNameLabel.AutoSize = true; + shopNameLabel.Location = new Point(14, 12); + shopNameLabel.Name = "shopNameLabel"; + shopNameLabel.Size = new Size(154, 20); + shopNameLabel.TabIndex = 0; + shopNameLabel.Text = "Название магазина: "; + // + // packageNameLabel + // + packageNameLabel.AutoSize = true; + packageNameLabel.Location = new Point(14, 49); + packageNameLabel.Name = "packageNameLabel"; + packageNameLabel.Size = new Size(145, 20); + packageNameLabel.TabIndex = 1; + packageNameLabel.Text = "Название изделия: "; + // + // countLabel + // + countLabel.AutoSize = true; + countLabel.Location = new Point(14, 88); + countLabel.Name = "countLabel"; + countLabel.Size = new Size(97, 20); + countLabel.TabIndex = 2; + countLabel.Text = "Количество: "; + // + // shopNameComboBox + // + shopNameComboBox.FormattingEnabled = true; + shopNameComboBox.Location = new Point(171, 9); + shopNameComboBox.Margin = new Padding(3, 4, 3, 4); + shopNameComboBox.Name = "shopNameComboBox"; + shopNameComboBox.Size = new Size(170, 28); + shopNameComboBox.TabIndex = 3; + // + // packageNameComboBox + // + packageNameComboBox.FormattingEnabled = true; + packageNameComboBox.Location = new Point(171, 49); + packageNameComboBox.Margin = new Padding(3, 4, 3, 4); + packageNameComboBox.Name = "packageNameComboBox"; + packageNameComboBox.Size = new Size(170, 28); + packageNameComboBox.TabIndex = 4; + // + // countTextBox + // + countTextBox.Location = new Point(171, 87); + countTextBox.Margin = new Padding(3, 4, 3, 4); + countTextBox.Name = "countTextBox"; + countTextBox.Size = new Size(170, 27); + countTextBox.TabIndex = 5; + // + // buttonSave + // + buttonSave.Location = new Point(151, 144); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(98, 31); + buttonSave.TabIndex = 6; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += SaveButton_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(255, 144); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(86, 31); + buttonCancel.TabIndex = 7; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // FormShopReplenishment + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(353, 200); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(countTextBox); + Controls.Add(packageNameComboBox); + Controls.Add(shopNameComboBox); + Controls.Add(countLabel); + Controls.Add(packageNameLabel); + Controls.Add(shopNameLabel); + Margin = new Padding(3, 4, 3, 4); + Name = "FormShopReplenishment"; + Text = "Пополнение магазина"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label shopNameLabel; + private Label packageNameLabel; + private Label countLabel; + private ComboBox shopNameComboBox; + private ComboBox packageNameComboBox; + private TextBox countTextBox; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.cs b/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.cs new file mode 100644 index 0000000..4924ff9 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.cs @@ -0,0 +1,104 @@ +using Microsoft.Extensions.Logging; +using SoftwareInstallationContracts.BusinessLogicContracts; +using SoftwareInstallationContracts.ViewModels; +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 SoftwareInstallationView +{ + public partial class FormShopReplenishment : Form + { + private readonly ILogger _logger; + private readonly IShopLogic _ShopLogic; + private readonly IPackageLogic _packageLogic; + private readonly List? _listShops; + private readonly List? _listPackages; + public FormShopReplenishment(ILogger logger, IShopLogic ShopLogic, IPackageLogic packageLogic) + { + InitializeComponent(); + _ShopLogic = ShopLogic; + _packageLogic = packageLogic; + _logger = logger; + _listShops = ShopLogic.ReadList(null); + if (_listShops != null) + { + shopNameComboBox.DisplayMember = "ShopName"; + shopNameComboBox.ValueMember = "Id"; + shopNameComboBox.DataSource = _listShops; + shopNameComboBox.SelectedItem = null; + } + + _listPackages = packageLogic.ReadList(null); + if (_listPackages != null) + { + packageNameComboBox.DisplayMember = "PackageName"; + packageNameComboBox.ValueMember = "Id"; + packageNameComboBox.DataSource = _listPackages; + packageNameComboBox.SelectedItem = null; + } + } + + private void SaveButton_Click(object sender, EventArgs e) + { + if (shopNameComboBox.SelectedValue == null) + { + MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (packageNameComboBox.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Добавление изделия в магазин"); + + try + { + var package = _packageLogic.ReadElement(new() + { + Id = (int)packageNameComboBox.SelectedValue + }); + + if (package == null) + { + throw new Exception("Не найдено изделие. Дополнительная информация в логах."); + } + + var resultOperation = _ShopLogic.AddPackage( + model: new() { Id = (int)shopNameComboBox.SelectedValue }, + package: package, + quantity: Convert.ToInt32(countTextBox.Text) + ); + + if (!resultOperation) + { + 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/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.resx b/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShopReplenishment.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/SoftwareInstallation/SoftwareInstallation/FormShops.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormShops.Designer.cs new file mode 100644 index 0000000..c20e9c0 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShops.Designer.cs @@ -0,0 +1,125 @@ +namespace SoftwareInstallationView +{ + 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(); + buttonAdd = new Button(); + buttonUpdate = new Button(); + buttonDelete = new Button(); + buttonRefresh = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(1, 1); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 25; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(629, 596); + dataGridView.TabIndex = 0; + // + // buttonAdd + // + buttonAdd.Location = new Point(669, 16); + buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(138, 53); + buttonAdd.TabIndex = 1; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += AddButton_Click; + // + // buttonUpdate + // + buttonUpdate.Location = new Point(669, 89); + buttonUpdate.Margin = new Padding(3, 4, 3, 4); + buttonUpdate.Name = "buttonUpdate"; + buttonUpdate.Size = new Size(138, 53); + buttonUpdate.TabIndex = 2; + buttonUpdate.Text = "Изменить"; + buttonUpdate.UseVisualStyleBackColor = true; + buttonUpdate.Click += UpdateButton_Click; + // + // buttonDelete + // + buttonDelete.Location = new Point(669, 163); + buttonDelete.Margin = new Padding(3, 4, 3, 4); + buttonDelete.Name = "buttonDelete"; + buttonDelete.Size = new Size(138, 53); + buttonDelete.TabIndex = 3; + buttonDelete.Text = "Удалить"; + buttonDelete.UseVisualStyleBackColor = true; + buttonDelete.Click += DeleteButton_Click; + // + // buttonRefresh + // + buttonRefresh.Location = new Point(669, 239); + buttonRefresh.Margin = new Padding(3, 4, 3, 4); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(138, 53); + buttonRefresh.TabIndex = 4; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += RefreshButton_Click; + // + // FormShops + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(821, 600); + Controls.Add(buttonRefresh); + Controls.Add(buttonDelete); + Controls.Add(buttonUpdate); + Controls.Add(buttonAdd); + Controls.Add(dataGridView); + Margin = new Padding(3, 4, 3, 4); + Name = "FormShops"; + Text = "Магазины"; + Load += FormShops_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonUpdate; + private Button buttonDelete; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormShops.cs b/SoftwareInstallation/SoftwareInstallation/FormShops.cs new file mode 100644 index 0000000..cb5b572 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormShops.cs @@ -0,0 +1,123 @@ +using Microsoft.Extensions.Logging; +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.BusinessLogicContracts; +using SoftwareInstallation; +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 SoftwareInstallationView +{ + 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["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["Packages"].Visible = false; + } + + _logger.LogInformation("Загрузка магазинов"); + + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void RefreshButton_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void DeleteButton_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 UpdateButton_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 AddButton_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShop)); + + if (service is FormShop form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallation/FormShops.resx b/SoftwareInstallation/SoftwareInstallation/FormShops.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/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/SoftwareInstallation/SoftwareInstallation/Program.cs b/SoftwareInstallation/SoftwareInstallation/Program.cs index 07a18a6..db148ac 100644 --- a/SoftwareInstallation/SoftwareInstallation/Program.cs +++ b/SoftwareInstallation/SoftwareInstallation/Program.cs @@ -40,9 +40,11 @@ namespace SoftwareInstallation services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -50,6 +52,9 @@ namespace SoftwareInstallation services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs new file mode 100644 index 0000000..ef5e5f8 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs @@ -0,0 +1,180 @@ +using Microsoft.Extensions.Logging; +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.BusinessLogicContracts; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationBusinessLogic.BusinessLogics +{ + public class ShopLogic : IShopLogic + { + private readonly ILogger _logger; + private readonly IShopStorage _ShopStorage; + public ShopLogic(ILogger logger, IShopStorage ShopStorage) + { + _logger = logger; + _ShopStorage = ShopStorage; + } + public bool AddPackage(ShopSearchModel model, IPackageModel package, int quantity) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + + if (quantity <= 0) + { + throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(quantity)); + } + + _logger.LogInformation("AddPackageInShop. ShopName:{ShopName}.Id:{Id}", model.ShopName, model.Id); + var element = _ShopStorage.GetElement(model); + + if (element == null) + { + _logger.LogWarning("AddPackageInShop element not found"); + return false; + } + + _logger.LogInformation("AddPackageInShop find. Id:{Id}", element.Id); + + if (element.Packages.TryGetValue(package.Id, out var pair)) + { + element.Packages[package.Id] = (package, quantity + pair.Item2); + _logger.LogInformation("AddPackageInShop. Has been added {quantity} {package} in {ShopName}", quantity, package.PackageName, element.ShopName); + } + else + { + element.Packages[package.Id] = (package, quantity); + _logger.LogInformation("AddPackageInShop. Has been added {quantity} new Package {package} in {ShopName}", quantity, package.PackageName, element.ShopName); + } + + _ShopStorage.Update(new() + { + Id = element.Id, + ShopAddress = element.ShopAddress, + ShopName = element.ShopName, + OpeningDate = element.OpeningDate, + Packages = element.Packages + }); + return true; + } + + public bool Create(ShopBindingModel model) + { + CheckModel(model); + model.Packages = new(); + + if (_ShopStorage.Insert(model) == null) + { + _logger.LogWarning("Insert 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; + } + + 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 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 bool Update(ShopBindingModel model) + { + CheckModel(model, false); + + if (string.IsNullOrEmpty(model.ShopName)) + { + throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName)); + } + + if (_ShopStorage.Update(model) == null) + { + _logger.LogWarning("Update 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}.ShopAddress:{1}. Id: {2}", model.ShopName, model.ShopAddress, 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("Магазин с таким названием уже есть"); + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs new file mode 100644 index 0000000..ef5c66e --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs @@ -0,0 +1,18 @@ +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.BindingModels +{ + public class ShopBindingModel : IShopModel + { + public string ShopName { get; set; } = string.Empty; + public string ShopAddress { get; set; } = string.Empty; + public DateTime OpeningDate { get; set; } = DateTime.Now; + public Dictionary Packages { get; set; } = new(); + public int Id { get; set; } + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs b/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs new file mode 100644 index 0000000..abecdbe --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs @@ -0,0 +1,22 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.BusinessLogicContracts +{ + public interface IShopLogic + { + List? ReadList(ShopSearchModel? model); + ShopViewModel? ReadElement(ShopSearchModel model); + bool Create(ShopBindingModel model); + bool Update(ShopBindingModel model); + bool Delete(ShopBindingModel model); + bool AddPackage(ShopSearchModel model, IPackageModel package, int quantity); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/SearchModels/ShopSearchModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/SearchModels/ShopSearchModel.cs new file mode 100644 index 0000000..a8a3e96 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/SearchModels/ShopSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.SearchModels +{ + public class ShopSearchModel + { + public int? Id { get; set; } + public string? ShopName { get; set; } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs b/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs new file mode 100644 index 0000000..b7db259 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs @@ -0,0 +1,21 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.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); + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs new file mode 100644 index 0000000..fbda17d --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs @@ -0,0 +1,23 @@ +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.ViewModels +{ + public class ShopViewModel : IShopModel + { + public Dictionary Packages { get; set; } = new(); + public int Id { get; set; } + + [DisplayName("Название магазина")] + public string ShopName { get; set; } = string.Empty; + [DisplayName("Адрес магазина")] + public string ShopAddress { get; set; } = string.Empty; + [DisplayName("Дата открытия")] + public DateTime OpeningDate { get; set; } = DateTime.Now; + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs new file mode 100644 index 0000000..a644274 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationDataModels.Models +{ + public interface IShopModel : IId + { + public string ShopName { get; } + public string ShopAddress { get; } + DateTime OpeningDate { get; } + Dictionary Packages { get; } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs b/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs index 00565cd..81f4fb1 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs @@ -13,11 +13,13 @@ namespace SoftwareInstallationListImplement public List Components { get; set; } public List Orders { get; set; } public List Packages { get; set; } + public List Shops { get; set; } private DataListSingleton() { Components = new List(); Orders = new List(); Packages = new List(); + Shops = new List(); } public static DataListSingleton GetInstance() { diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..8befbfc --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs @@ -0,0 +1,124 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Formats.Asn1.AsnWriter; + +namespace SoftwareInstallationListImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataListSingleton _source; + public ShopStorage() + { + _source = DataListSingleton.GetInstance(); + } + 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; + } + + 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; + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs new file mode 100644 index 0000000..0df1b1b --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs @@ -0,0 +1,60 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationListImplement.Models +{ + public class Shop : IShopModel + { + public string ShopName { get; private set; } = string.Empty; + public string ShopAddress { get; private set; } = string.Empty; + + public DateTime OpeningDate { get; private set; } + + public Dictionary Packages { get; private set; } = new(); + + public int Id { get; private set; } + + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + ShopAddress = model.ShopAddress, + OpeningDate = model.OpeningDate, + Packages = new() + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + ShopAddress = model.ShopAddress; + OpeningDate = model.OpeningDate; + Packages = model.Packages; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + ShopAddress = ShopAddress, + OpeningDate = OpeningDate, + Packages = Packages + }; + } +} From 2424828f2e52e775346e8facb464b80636d4202e Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Fri, 12 Apr 2024 21:08:39 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=B8=D0=B7=20?= =?UTF-8?q?PR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/OrderStorage.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs index b555ea6..5512397 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs @@ -92,12 +92,9 @@ namespace SoftwareInstallationFileImplement.Implements } private OrderViewModel GetPackageName(OrderViewModel viewModel) { - foreach (var package in source.Packages) - { - if (package.Id == viewModel.PackageId) - { - viewModel.PackageName = package.PackageName; - } + var package = source.Packages.FirstOrDefault(x => x.Id == viewModel.PackageId); + if (package != null) { + viewModel.PackageName = package.PackageName; } return viewModel; } From b5bd3fe73dd74a0ea64af277f6401c231e02c1b4 Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Sun, 21 Apr 2024 13:09:00 +0400 Subject: [PATCH 3/4] All done --- .../SoftwareInstallation/FormMain.Designer.cs | 21 ++- .../SoftwareInstallation/FormMain.cs | 18 +++ .../FormSellPackage.Designer.cs | 119 +++++++++++++++++ .../SoftwareInstallation/FormSellPackage.cs | 103 +++++++++++++++ .../SoftwareInstallation/FormSellPackage.resx | 120 ++++++++++++++++++ .../SoftwareInstallation/FormShop.Designer.cs | 24 ++++ .../SoftwareInstallation/FormShop.cs | 92 +++++++------- .../SoftwareInstallation/FormShops.cs | 2 +- .../SoftwareInstallation/Program.cs | 1 + .../BusinessLogics/OrderLogic.cs | 26 +++- .../BusinessLogics/ShopLogic.cs | 76 ++++++++++- .../BindingModels/ShopBindingModel.cs | 3 +- .../BusinessLogicContracts/IShopLogic.cs | 2 + .../StoragesContracts/IShopStorage.cs | 2 + .../ViewModels/ShopViewModel.cs | 4 +- .../Models/IShopModel.cs | 3 +- .../DataFileSingleton.cs | 7 +- .../Implements/ShopStorage.cs | 115 +++++++++++++++++ .../Models/Shop.cs | 107 ++++++++++++++++ .../Implements/ShopStorage.cs | 6 + .../Models/Shop.cs | 10 +- 21 files changed, 794 insertions(+), 67 deletions(-) create mode 100644 SoftwareInstallation/SoftwareInstallation/FormSellPackage.Designer.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormSellPackage.cs create mode 100644 SoftwareInstallation/SoftwareInstallation/FormSellPackage.resx create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ShopStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Models/Shop.cs diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs index cde146c..a654928 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs @@ -33,6 +33,8 @@ компонентыToolStripMenuItem = new ToolStripMenuItem(); изделияToolStripMenuItem = new ToolStripMenuItem(); магазиныToolStripMenuItem = new ToolStripMenuItem(); + поставкиToolStripMenuItem = new ToolStripMenuItem(); + продажиToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); @@ -57,7 +59,7 @@ // // справочникиToolStripMenuItem // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem, магазиныToolStripMenuItem }); + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem, магазиныToolStripMenuItem, поставкиToolStripMenuItem, продажиToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; @@ -83,6 +85,21 @@ магазиныToolStripMenuItem.Text = "Магазины"; магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; // + // поставкиToolStripMenuItem + // + поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem"; + поставкиToolStripMenuItem.Size = new Size(180, 22); + поставкиToolStripMenuItem.Text = "Поставки"; + поставкиToolStripMenuItem.Click += поставкиToolStripMenuItem_Click; + // продажиToolStripMenuItem + // + продажиToolStripMenuItem.Name = "продажиToolStripMenuItem"; + продажиToolStripMenuItem.Size = new Size(180, 22); + продажиToolStripMenuItem.Text = "Продажи"; + продажиToolStripMenuItem.Click += продажиToolStripMenuItem_Click; + // + // + // // dataGridView // dataGridView.AllowUserToAddRows = false; @@ -207,6 +224,8 @@ private Button buttonIssuedOrder; private Button buttonRefresh; private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem поставкиToolStripMenuItem; + private ToolStripMenuItem продажиToolStripMenuItem; private Button shopReplenishment; } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.cs b/SoftwareInstallation/SoftwareInstallation/FormMain.cs index d6db763..e24bbc3 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.cs @@ -87,6 +87,24 @@ namespace SoftwareInstallationView form.ShowDialog(); } } + + private void поставкиToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShopReplenishment)); + if (service is FormShopReplenishment form) + { + form.ShowDialog(); + } + } + + private void продажиToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSellPackage)); + if (service is FormSellPackage form) + { + form.ShowDialog(); + } + } private void ButtonCreateOrder_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); diff --git a/SoftwareInstallation/SoftwareInstallation/FormSellPackage.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormSellPackage.Designer.cs new file mode 100644 index 0000000..993a11c --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormSellPackage.Designer.cs @@ -0,0 +1,119 @@ +namespace SoftwareInstallationView +{ + partial class FormSellPackage + { + /// + /// 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.PackageLabel = new System.Windows.Forms.Label(); + this.QuantityLabel = new System.Windows.Forms.Label(); + this.PackageСomboBox = new System.Windows.Forms.ComboBox(); + this.QuantityTextBox = new System.Windows.Forms.TextBox(); + this.SaveButton = new System.Windows.Forms.Button(); + this.ButtonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // PackageLabel + // + this.PackageLabel.AutoSize = true; + this.PackageLabel.Location = new System.Drawing.Point(12, 18); + this.PackageLabel.Name = "PackageLabel"; + this.PackageLabel.Size = new System.Drawing.Size(56, 15); + this.PackageLabel.TabIndex = 0; + this.PackageLabel.Text = "Изделие:"; + // + // QuantityLabel + // + this.QuantityLabel.AutoSize = true; + this.QuantityLabel.Location = new System.Drawing.Point(12, 51); + this.QuantityLabel.Name = "QuantityLabel"; + this.QuantityLabel.Size = new System.Drawing.Size(75, 15); + this.QuantityLabel.TabIndex = 1; + this.QuantityLabel.Text = "Количество:"; + // + // PackageСomboBox + // + this.PackageСomboBox.FormattingEnabled = true; + this.PackageСomboBox.Location = new System.Drawing.Point(88, 15); + this.PackageСomboBox.Name = "PackageСomboBox"; + this.PackageСomboBox.Size = new System.Drawing.Size(184, 23); + this.PackageСomboBox.TabIndex = 2; + // + // QuantityTextBox + // + this.QuantityTextBox.Location = new System.Drawing.Point(88, 48); + this.QuantityTextBox.Name = "QuantityTextBox"; + this.QuantityTextBox.Size = new System.Drawing.Size(184, 23); + this.QuantityTextBox.TabIndex = 3; + // + // SaveButton + // + this.SaveButton.Location = new System.Drawing.Point(72, 100); + this.SaveButton.Name = "SaveButton"; + this.SaveButton.Size = new System.Drawing.Size(97, 29); + this.SaveButton.TabIndex = 4; + this.SaveButton.Text = "Сохранить"; + this.SaveButton.UseVisualStyleBackColor = true; + this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); + // + // ButtonCancel + // + this.ButtonCancel.Location = new System.Drawing.Point(175, 100); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(97, 29); + this.ButtonCancel.TabIndex = 5; + this.ButtonCancel.Text = "Отмена"; + this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FromSellPackage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(284, 141); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.SaveButton); + this.Controls.Add(this.QuantityTextBox); + this.Controls.Add(this.PackageСomboBox); + this.Controls.Add(this.QuantityLabel); + this.Controls.Add(this.PackageLabel); + this.Name = "FromSellPackage"; + this.Text = "Продать Изделие"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label PackageLabel; + private Label QuantityLabel; + private ComboBox PackageСomboBox; + private TextBox QuantityTextBox; + private Button SaveButton; + private Button ButtonCancel; + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormSellPackage.cs b/SoftwareInstallation/SoftwareInstallation/FormSellPackage.cs new file mode 100644 index 0000000..f964e8f --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormSellPackage.cs @@ -0,0 +1,103 @@ +using Microsoft.Extensions.Logging; +using SoftwareInstallationContracts.BusinessLogicContracts; +using SoftwareInstallationContracts.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 SoftwareInstallationView +{ + public partial class FormSellPackage : Form + { + private readonly ILogger _logger; + private readonly IPackageLogic _logicPackage; + private readonly IShopLogic _logicStore; + public FormSellPackage(ILogger logger, IPackageLogic logicPackage, IShopLogic logicStore) + { + InitializeComponent(); + _logger = logger; + _logicPackage = logicPackage; + _logicStore = logicStore; + LoadData(); + } + + private void FormSellPackage_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + _logger.LogInformation("Loading packages for sale."); + + try + { + var list = _logicPackage.ReadList(null); + if (list != null) + { + PackageСomboBox.DisplayMember = "PackageName"; + PackageСomboBox.ValueMember = "Id"; + PackageСomboBox.DataSource = list; + PackageСomboBox.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "List loading error."); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void SaveButton_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(QuantityTextBox.Text)) + { + MessageBox.Show("Укажите количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (PackageСomboBox.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Package sale."); + + try + { + var operationResult = _logicStore.SellPackage(_logicPackage.ReadElement(new PackageSearchModel() + { + Id = Convert.ToInt32(PackageСomboBox.SelectedValue) + })!, Convert.ToInt32(QuantityTextBox.Text)); + + if (!operationResult) + { + throw new Exception("Ошибка при продаже изделия. Дополнительная информация в логах."); + } + + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Package sale error."); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallation/FormSellPackage.resx b/SoftwareInstallation/SoftwareInstallation/FormSellPackage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallation/FormSellPackage.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/SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs index 2245683..75708dd 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormShop.Designer.cs @@ -40,7 +40,10 @@ SaveButton = new Button(); ButtonCancel = new Button(); nameTextBox = new TextBox(); + labelNumeric = new Label(); + numericUpDown = new NumericUpDown(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown).BeginInit(); SuspendLayout(); // // shopNameLabel @@ -152,11 +155,29 @@ nameTextBox.Size = new Size(198, 27); nameTextBox.TabIndex = 10; // + // labelNumeric + // + labelNumeric.AutoSize = true; + labelNumeric.Location = new Point(416, 12); + labelNumeric.Name = "labelNumeric"; + labelNumeric.Size = new Size(161, 20); + labelNumeric.TabIndex = 11; + labelNumeric.Text = "Макс. кол-во товара: "; + // + // numericUpDown + // + numericUpDown.Location = new Point(576, 9); + numericUpDown.Name = "numericUpDown"; + numericUpDown.Size = new Size(150, 27); + numericUpDown.TabIndex = 12; + // // FormShop // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(914, 600); + Controls.Add(numericUpDown); + Controls.Add(labelNumeric); Controls.Add(nameTextBox); Controls.Add(ButtonCancel); Controls.Add(SaveButton); @@ -171,6 +192,7 @@ Text = "Магазин"; Load += FormShop_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDown).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -189,5 +211,7 @@ private DataGridViewTextBoxColumn PackagePrice; private DataGridViewTextBoxColumn PackageCount; private TextBox nameTextBox; + private Label labelNumeric; + private NumericUpDown numericUpDown; } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormShop.cs b/SoftwareInstallation/SoftwareInstallation/FormShop.cs index 079b7f3..71b4502 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormShop.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormShop.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.BusinessLogicContracts; +using SoftwareInstallationContracts.SearchModels; using SoftwareInstallationContracts.ViewModels; using SoftwareInstallationDataModels.Models; using System; @@ -20,32 +21,18 @@ namespace SoftwareInstallationView private readonly List? _listShops; private readonly IShopLogic _logic; private readonly ILogger _logger; - public int Id { get; set; } + private int? _id; + private Dictionary _listStores; + public int Id { set { _id = value; } } public FormShop(ILogger logger, IShopLogic logic) { InitializeComponent(); _logger = logger; - _listShops = logic.ReadList(null); + _listShops = new(); _logic = logic; } - private IShopModel? GetShop(int id) - { - if (_listShops == null) - { - return null; - } - foreach (var elem in _listShops) - { - if (elem.Id == id) - { - return elem; - } - } - return null; - } - private void SaveButton_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(nameTextBox.Text)) @@ -60,31 +47,19 @@ namespace SoftwareInstallationView return; } - _logger.LogInformation("Сохранение изделия"); + _logger.LogInformation("Сохранение магазина"); try { - DateTime.TryParse(openingDatePicker.Text, out var dateTime); - ShopBindingModel model = new() + var model = new ShopBindingModel { + Id = _id ?? 0, ShopName = nameTextBox.Text, ShopAddress = addressTextBox.Text, - OpeningDate = dateTime + OpeningDate = openingDatePicker.Value.Date, + PackageMaxCount = (int)numericUpDown.Value }; - var vmodel = GetShop(Id); - bool operationResult = false; - - if (vmodel != null) - { - model.Id = vmodel.Id; - model.Packages = vmodel.Packages; - operationResult = _logic.Update(model); - } - else - { - operationResult = _logic.Create(model); - } - + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); @@ -96,7 +71,7 @@ namespace SoftwareInstallationView } catch (Exception ex) { - _logger.LogError(ex, "Ошибка сохранения изделия"); + _logger.LogError(ex, "Ошибка сохранения магазина"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -109,31 +84,52 @@ namespace SoftwareInstallationView private void FormShop_Load(object sender, EventArgs e) { - LoadData(); + if (_id.HasValue) + { + _logger.LogInformation("Загрузка магазина"); + try + { + var view = _logic.ReadElement(new ShopSearchModel + { + Id = _id.Value + }); + if (view != null) + { + nameTextBox.Text = view.ShopName; + addressTextBox.Text = view.ShopAddress; + openingDatePicker.Text = view.OpeningDate.ToString(); + numericUpDown.Value = view.PackageMaxCount; + _listStores = view.ShopPackages ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } } private void LoadData(bool extendDate = true) { + _logger.LogInformation("Загрузка изделий магазина"); try { - var model = GetShop(extendDate ? Id : Convert.ToInt32(nameTextBox.Text)); - if (model != null) + if (_listStores != null) { - nameTextBox.Text = model.ShopName; - addressTextBox.Text = model.ShopAddress; - openingDatePicker.Text = Convert.ToString(model.OpeningDate); dataGridView.Rows.Clear(); - foreach (var el in model.Packages.Values) + foreach (var elem in _listStores) { - dataGridView.Rows.Add(new object[] { el.Item1.PackageName, el.Item1.Price, el.Item2 }); + dataGridView.Rows.Add(new object[] { elem.Value.Item1.PackageName, elem.Value.Item1.Price, elem.Value.Item2 }); } } _logger.LogInformation("Загрузка магазинов"); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки магазинов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + _logger.LogError(ex, "Ошибка загрузки изделий магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/SoftwareInstallation/SoftwareInstallation/FormShops.cs b/SoftwareInstallation/SoftwareInstallation/FormShops.cs index cb5b572..ab3c7b3 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormShops.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormShops.cs @@ -41,7 +41,7 @@ namespace SoftwareInstallationView dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Packages"].Visible = false; + dataGridView.Columns["ShopPackages"].Visible = false; } _logger.LogInformation("Загрузка магазинов"); diff --git a/SoftwareInstallation/SoftwareInstallation/Program.cs b/SoftwareInstallation/SoftwareInstallation/Program.cs index 9c9489d..ef83480 100644 --- a/SoftwareInstallation/SoftwareInstallation/Program.cs +++ b/SoftwareInstallation/SoftwareInstallation/Program.cs @@ -55,6 +55,7 @@ namespace SoftwareInstallation services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs index cd11bd1..78e271c 100644 --- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs @@ -17,11 +17,15 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly IShopLogic _shopLogic; + private readonly IPackageStorage _packageStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopLogic shopLogic, IPackageStorage packageStorage) { _logger = logger; _orderStorage = orderStorage; + _shopLogic = shopLogic; + _packageStorage = packageStorage; } public bool CreateOrder(OrderBindingModel model) @@ -48,7 +52,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) { - var viewModel = _orderStorage.GetElement(new() { Id = model.Id }); + var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); if (viewModel == null) { throw new ArgumentNullException(nameof(model)); @@ -65,7 +69,25 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics if (model.Status == OrderStatus.Выдан) { model.DateImplement = DateTime.Now; + + var package = _packageStorage.GetElement(new() { Id = viewModel.PackageId }); + + if (package == null) + { + throw new ArgumentNullException(nameof(package)); + } + + if (!_shopLogic.AddPackage(package, viewModel.Count)) + { + throw new Exception($"AddPackage operation failed. Store is full."); + } } + else + { + model.DateImplement = viewModel.DateImplement; + } + + CheckModel(model, false); model.Sum = viewModel.Sum; model.Count = viewModel.Count; diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs index ef5e5f8..942178a 100644 --- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/ShopLogic.cs @@ -43,16 +43,20 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics return false; } - _logger.LogInformation("AddPackageInShop find. Id:{Id}", element.Id); - - if (element.Packages.TryGetValue(package.Id, out var pair)) + if (element.PackageMaxCount - element.ShopPackages.Select(x => x.Value.Item2).Sum() < quantity) { - element.Packages[package.Id] = (package, quantity + pair.Item2); + throw new ArgumentNullException("Магазин переполнен", nameof(quantity)); + } + + _logger.LogInformation("AddPackageInShop find. Id:{Id}", element.Id); + if (element.ShopPackages.TryGetValue(package.Id, out var pair)) + { + element.ShopPackages[package.Id] = (package, quantity + pair.Item2); _logger.LogInformation("AddPackageInShop. Has been added {quantity} {package} in {ShopName}", quantity, package.PackageName, element.ShopName); } else { - element.Packages[package.Id] = (package, quantity); + element.ShopPackages[package.Id] = (package, quantity); _logger.LogInformation("AddPackageInShop. Has been added {quantity} new Package {package} in {ShopName}", quantity, package.PackageName, element.ShopName); } @@ -62,15 +66,63 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics ShopAddress = element.ShopAddress, ShopName = element.ShopName, OpeningDate = element.OpeningDate, - Packages = element.Packages + ShopPackages = element.ShopPackages, + PackageMaxCount = element.PackageMaxCount }); return true; } + public bool AddPackage(IPackageModel package, int quantity) + { + if (package == null) + { + throw new ArgumentNullException(nameof(package)); + } + + if (quantity <= 0) + { + throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(quantity)); + } + + var freePlaces = _ShopStorage.GetFullList() + .Select(x => x.PackageMaxCount - x.ShopPackages + .Select(p => p.Value.Item2).Sum()).Sum() - quantity; + + if (freePlaces < 0) + { + _logger.LogInformation("AddPackage. Failed to add package to store. It's full."); + return false; + } + + foreach (var store in _ShopStorage.GetFullList()) + { + var temp = Math.Min(quantity, store.PackageMaxCount - store.ShopPackages.Select(x => x.Value.Item2).Sum()); + + if (temp <= 0) + { + continue; + } + + if (!AddPackage(new() { Id = store.Id }, package, temp)) + { + _logger.LogWarning("An error occurred while adding package to stores"); + return false; + } + + quantity -= temp; + + if (quantity == 0) + { + return true; + } + } + return true; + } + public bool Create(ShopBindingModel model) { CheckModel(model); - model.Packages = new(); + model.ShopPackages = new(); if (_ShopStorage.Insert(model) == null) { @@ -81,6 +133,11 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics return true; } + public bool SellPackage(IPackageModel package, int quantity) + { + return _ShopStorage.SellPackage(package, quantity); + } + public bool Delete(ShopBindingModel model) { CheckModel(model, false); @@ -165,6 +222,11 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName)); } + if (model.PackageMaxCount < 0) + { + throw new ArgumentException("Максимальное количество изделий в магазине не может быть меньше нуля", nameof(model.PackageMaxCount)); + } + _logger.LogInformation("Shop. ShopName:{0}.ShopAddress:{1}. Id: {2}", model.ShopName, model.ShopAddress, model.Id); var element = _ShopStorage.GetElement(new ShopSearchModel { diff --git a/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs index ef5c66e..0e2b248 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/ShopBindingModel.cs @@ -12,7 +12,8 @@ namespace SoftwareInstallationContracts.BindingModels public string ShopName { get; set; } = string.Empty; public string ShopAddress { get; set; } = string.Empty; public DateTime OpeningDate { get; set; } = DateTime.Now; - public Dictionary Packages { get; set; } = new(); + public Dictionary ShopPackages { get; set; } = new(); public int Id { get; set; } + public int PackageMaxCount { get; set; } } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs b/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs index abecdbe..0851fed 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicContracts/IShopLogic.cs @@ -18,5 +18,7 @@ namespace SoftwareInstallationContracts.BusinessLogicContracts bool Update(ShopBindingModel model); bool Delete(ShopBindingModel model); bool AddPackage(ShopSearchModel model, IPackageModel package, int quantity); + bool AddPackage(IPackageModel package, int quantity); + bool SellPackage(IPackageModel package, int quantity); } } diff --git a/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs b/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs index b7db259..1ac0b6f 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IShopStorage.cs @@ -1,6 +1,7 @@ using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.SearchModels; using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; using System; using System.Collections.Generic; using System.Linq; @@ -17,5 +18,6 @@ namespace SoftwareInstallationContracts.StoragesContracts ShopViewModel? Insert(ShopBindingModel model); ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + bool SellPackage(IPackageModel model, int quantity); } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs index fbda17d..f32e718 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ShopViewModel.cs @@ -10,7 +10,7 @@ namespace SoftwareInstallationContracts.ViewModels { public class ShopViewModel : IShopModel { - public Dictionary Packages { get; set; } = new(); + public Dictionary ShopPackages { get; set; } = new(); public int Id { get; set; } [DisplayName("Название магазина")] @@ -19,5 +19,7 @@ namespace SoftwareInstallationContracts.ViewModels public string ShopAddress { get; set; } = string.Empty; [DisplayName("Дата открытия")] public DateTime OpeningDate { get; set; } = DateTime.Now; + [DisplayName("Вместимость магазина")] + public int PackageMaxCount { get; set; } } } diff --git a/SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs index a644274..8745474 100644 --- a/SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs +++ b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IShopModel.cs @@ -11,6 +11,7 @@ namespace SoftwareInstallationDataModels.Models public string ShopName { get; } public string ShopAddress { get; } DateTime OpeningDate { get; } - Dictionary Packages { get; } + Dictionary ShopPackages { get; } + public int PackageMaxCount { get; } } } diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs index 6c1a577..3b4af3c 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using static System.Formats.Asn1.AsnWriter; namespace SoftwareInstallationFileImplement { @@ -14,9 +15,11 @@ namespace SoftwareInstallationFileImplement private readonly string ComponentFileName = "Component.xml"; private readonly string OrderFileName = "Order.xml"; private readonly string PackageFileName = "Package.xml"; + private readonly string ShopFileName = "Shop.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Packages { get; private set; } + public List Shops { get; private set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -26,13 +29,15 @@ namespace SoftwareInstallationFileImplement return instance; } public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); - public void SavePackages() => SaveData(Packages, PackageFileName, "Packages", x => x.GetXElement); + public void SavePackages() => SaveData(Packages, PackageFileName, "ShopPackages", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Packages = LoadData(PackageFileName, "Package", x => Package.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ShopStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..cef9649 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ShopStorage.cs @@ -0,0 +1,115 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using SoftwareInstallationFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Formats.Asn1.AsnWriter; + +namespace SoftwareInstallationFileImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataFileSingleton source; + + public ShopStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public ShopViewModel? Delete(ShopBindingModel model) + { + var element = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Shops.Remove(element); + source.SaveShops(); + return element.GetViewModel; + } + return null; + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + return source.Shops.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == + model.ShopName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + return source.Shops.Where(x => + x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Shops.Select(x => x.GetViewModel).ToList(); + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1; + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + source.Shops.Add(newShop); + source.SaveShops(); + return newShop.GetViewModel; + } + + public bool SellPackage(IPackageModel model, int quantity) + { + if (source.Shops.Select(x => x.ShopPackages.FirstOrDefault(y => y.Key == model.Id).Value.Item2).Sum() < quantity) + { + return false; + } + foreach (var Shop in source.Shops.Where(x => x.ShopPackages.ContainsKey(model.Id))) + { + int QuantityInCurrentShop = Shop.ShopPackages[model.Id].Item2; + if (QuantityInCurrentShop <= quantity) + { + Shop.ShopPackages.Remove(model.Id); + quantity -= QuantityInCurrentShop; + } + else + { + Shop.ShopPackages[model.Id] = (Shop.ShopPackages[model.Id].Item1, QuantityInCurrentShop - quantity); + quantity = 0; + } + if (quantity == 0) + { + return true; + } + } + return false; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + var Shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (Shop == null) + { + return null; + } + Shop.Update(model); + source.SaveShops(); + return Shop.GetViewModel; + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Shop.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Shop.cs new file mode 100644 index 0000000..5c27c02 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Shop.cs @@ -0,0 +1,107 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace SoftwareInstallationFileImplement.Models +{ + public class Shop : IShopModel + { + public string ShopName { get; private set; } = string.Empty; + public string ShopAddress { get; private set; } = string.Empty; + + public DateTime OpeningDate { get; private set; } + public Dictionary Packages { get; private set; } = new(); + + public Dictionary _Packages = null; + public Dictionary ShopPackages + { + get + { + if (_Packages == null) + { + var source = DataFileSingleton.GetInstance(); + _Packages = Packages.ToDictionary(x => x.Key, y => ((source.Packages.FirstOrDefault(z => z.Id == y.Key) as IPackageModel)!, y.Value)); + } + return _Packages; + } + } + + public int Id { get; private set; } + + public int PackageMaxCount { get; private set; } + + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + ShopAddress = model.ShopAddress, + PackageMaxCount = model.PackageMaxCount, + OpeningDate = model.OpeningDate, + Packages = model.ShopPackages.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Shop? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ShopName = element.Element("ShopName")!.Value, + ShopAddress = element.Element("ShopAddress")!.Value, + OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value), + PackageMaxCount = Convert.ToInt32(element.Element("PackageMaxCount")!.Value), + Packages = element.Element("ShopPackages")!.Elements("Package").ToDictionary( + x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + ShopAddress = model.ShopAddress; + OpeningDate = model.OpeningDate; + PackageMaxCount = model.PackageMaxCount; + Packages = model.ShopPackages.ToDictionary(x => x.Key, x => x.Value.Item2); + _Packages = null; + } + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + ShopAddress = ShopAddress, + ShopPackages = ShopPackages, + OpeningDate = OpeningDate, + PackageMaxCount = PackageMaxCount, + }; + public XElement GetXElement => new("Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("ShopAddress", ShopAddress), + new XElement("OpeningDate", OpeningDate), + new XElement("PackageMaxCount", PackageMaxCount), + new XElement("ShopPackages", Packages + .Select(x => new XElement("Package", + new XElement("Key", x.Key), + new XElement("Value", x.Value)) + ).ToArray())); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs index 8befbfc..3120e9b 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ShopStorage.cs @@ -2,6 +2,7 @@ using SoftwareInstallationContracts.SearchModels; using SoftwareInstallationContracts.StoragesContracts; using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; using SoftwareInstallationListImplement.Models; using System; using System.Collections.Generic; @@ -107,6 +108,11 @@ namespace SoftwareInstallationListImplement.Implements return newShop.GetViewModel; } + public bool SellPackage(IPackageModel model, int quantity) + { + throw new NotImplementedException(); + } + public ShopViewModel? Update(ShopBindingModel model) { foreach (var shop in _source.Shops) diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs index 0df1b1b..cb43a48 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Shop.cs @@ -16,7 +16,7 @@ namespace SoftwareInstallationListImplement.Models public DateTime OpeningDate { get; private set; } - public Dictionary Packages { get; private set; } = new(); + public Dictionary ShopPackages { get; private set; } = new(); public int Id { get; private set; } @@ -32,7 +32,7 @@ namespace SoftwareInstallationListImplement.Models ShopName = model.ShopName, ShopAddress = model.ShopAddress, OpeningDate = model.OpeningDate, - Packages = new() + ShopPackages = new() }; } @@ -45,7 +45,7 @@ namespace SoftwareInstallationListImplement.Models ShopName = model.ShopName; ShopAddress = model.ShopAddress; OpeningDate = model.OpeningDate; - Packages = model.Packages; + ShopPackages = model.ShopPackages; } public ShopViewModel GetViewModel => new() @@ -54,7 +54,9 @@ namespace SoftwareInstallationListImplement.Models ShopName = ShopName, ShopAddress = ShopAddress, OpeningDate = OpeningDate, - Packages = Packages + ShopPackages = ShopPackages }; + + public int PackageMaxCount => throw new NotImplementedException(); } } From 1d42d66ba86a0071e9aaf084aebccbb7b993cceb Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Thu, 2 May 2024 22:55:41 +0400 Subject: [PATCH 4/4] All done --- .../SoftwareInstallation/FormShop.cs | 5 +- .../BusinessLogics/OrderLogic.cs | 5 +- .../Implements/OrderStorage.cs | 9 +- .../Implements/ShopStorage.cs | 178 +++++++++++++ .../20240429151038_AddShopModel.Designer.cs | 248 ++++++++++++++++++ .../Migrations/20240429151038_AddShopModel.cs | 78 ++++++ ...ftwareInstallationDatabaseModelSnapshot.cs | 77 ++++++ .../Models/Order.cs | 7 +- .../Models/Shop.cs | 110 ++++++++ .../Models/ShopPackage.cs | 27 ++ .../SoftwareInstallationDatabase.cs | 6 +- 11 files changed, 736 insertions(+), 14 deletions(-) create mode 100644 SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/ShopStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.Designer.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Shop.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/ShopPackage.cs diff --git a/SoftwareInstallation/SoftwareInstallation/FormShop.cs b/SoftwareInstallation/SoftwareInstallation/FormShop.cs index 71b4502..c625bfc 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormShop.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormShop.cs @@ -57,8 +57,9 @@ namespace SoftwareInstallationView ShopName = nameTextBox.Text, ShopAddress = addressTextBox.Text, OpeningDate = openingDatePicker.Value.Date, - PackageMaxCount = (int)numericUpDown.Value - }; + PackageMaxCount = (int)numericUpDown.Value, + ShopPackages = _listStores + }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) { diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs index 5cf085f..17ea9c9 100644 --- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs @@ -67,6 +67,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics model.Status = newStatus; if (model.Status == OrderStatus.Выдан) + { model.DateImplement = DateTime.Now; var package = _packageStorage.GetElement(new() { Id = viewModel.PackageId }); @@ -81,8 +82,8 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics throw new Exception($"AddPackage operation failed. Store is full."); } } - else - { + + else { model.DateImplement = viewModel.DateImplement; } diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs index c9fe224..23671a7 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs @@ -40,7 +40,7 @@ namespace SoftwareInstallationDatabaseImplement.Implements using var context = new SoftwareInstallationDatabase(); - return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + return context.Orders.Include(x => x.Package).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; } public List GetFilteredList(OrderSearchModel model) @@ -64,15 +64,14 @@ namespace SoftwareInstallationDatabaseImplement.Implements public OrderViewModel? Insert(OrderBindingModel model) { - var newOrder = Order.Create(model); + using var context = new SoftwareInstallationDatabase(); + var newOrder = Order.Create(context, model); if (newOrder == null) { return null; } - using var context = new SoftwareInstallationDatabase(); - context.Orders.Add(newOrder); context.SaveChanges(); @@ -83,7 +82,7 @@ namespace SoftwareInstallationDatabaseImplement.Implements { using var context = new SoftwareInstallationDatabase(); - var order = context.Orders.FirstOrDefault(x => x.Id == model.Id); + var order = context.Orders.Include(x => x.Package).FirstOrDefault(x => x.Id == model.Id); if (order == null) { diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/ShopStorage.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..1eb47fb --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/ShopStorage.cs @@ -0,0 +1,178 @@ +using Microsoft.EntityFrameworkCore; +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDatabaseImplement.Models; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationDatabaseImplement.Implements +{ + public class ShopStorage : IShopStorage + { + public ShopViewModel? Delete(ShopBindingModel model) + { + using var context = new SoftwareInstallationDatabase(); + + var element = context.Shops + .Include(x => x.Packages) + .FirstOrDefault(rec => rec.Id == model.Id); + + if (element != null) + { + context.Shops.Remove(element); + context.SaveChanges(); + + return element.GetViewModel; + } + + return null; + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + + using var context = new SoftwareInstallationDatabase(); + + return context.Shops + .Include(x => x.Packages) + .ThenInclude(x => x.Package) + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) || (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + + using var context = new SoftwareInstallationDatabase(); + + return context.Shops + .Include(x => x.Packages) + .ThenInclude(x => x.Package) + .Where(x => x.ShopName.Contains(model.ShopName)) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + using var context = new SoftwareInstallationDatabase(); + return context.Shops + .Include(x => x.Packages) + .ThenInclude(x => x.Package) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + using var context = new SoftwareInstallationDatabase(); + var newShop = Shop.Create(context, model); + if (newShop == null) + { + return null; + } + context.Shops.Add(newShop); + context.SaveChanges(); + return newShop.GetViewModel; + } + + public bool SellPackage(IPackageModel model, int quantity) + { + using var context = new SoftwareInstallationDatabase(); + + if (context.Shops + .Include(x => x.Packages) + .ThenInclude(x => x.Package) + .ToList() + .Where(x => x.ShopPackages.ContainsKey(model.Id)).Select(x => x.PackageMaxCount).Sum() < quantity) + { + return false; + } + + using var transaction = context.Database.BeginTransaction(); + try + { + foreach (var Shop in context.Shops + .Include(x => x.Packages) + .ThenInclude(x => x.Package) + .ToList() + .Where(x => x.ShopPackages.ContainsKey(model.Id))) + { + int countInCurrentShop = Shop.ShopPackages[model.Id].Item2; + if (countInCurrentShop <= quantity) + { + var elem = context.ShopPackages + .Where(x => x.PackageId == model.Id) + .FirstOrDefault(x => x.ShopId == Shop.Id); + context.ShopPackages.Remove(elem); + Shop.ShopPackages.Remove(model.Id); + quantity -= countInCurrentShop; + } + else + { + Shop.ShopPackages[model.Id] = (Shop.ShopPackages[model.Id].Item1, countInCurrentShop - quantity); + quantity = 0; + Shop.UpdatePackage(context, new() + { + Id = Shop.Id, + ShopPackages = Shop.ShopPackages, + }); + } + if (quantity == 0) + { + context.SaveChanges(); + transaction.Commit(); + return true; + } + } + transaction.Rollback(); + return false; + } + catch + { + transaction.Rollback(); + throw; + } + } + + public ShopViewModel? Update(ShopBindingModel model) + { + using var context = new SoftwareInstallationDatabase(); + using var transaction = context.Database.BeginTransaction(); + try + { + var Shop = context.Shops.FirstOrDefault(rec => rec.Id == model.Id); + if (Shop == null) + { + return null; + } + Shop.Update(model); + Shop.UpdatePackage(context, model); + context.SaveChanges(); + transaction.Commit(); + return Shop.GetViewModel; + } + catch + { + transaction.Rollback(); + throw; + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.Designer.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.Designer.cs new file mode 100644 index 0000000..e1d8c56 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.Designer.cs @@ -0,0 +1,248 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using SoftwareInstallationDatabaseImplement; + +#nullable disable + +namespace SoftwareInstallationDatabaseImplement.Migrations +{ + [DbContext(typeof(SoftwareInstallationDatabase))] + [Migration("20240429151038_AddShopModel")] + partial class AddShopModel + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.2") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("PackageId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("PackageId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Package", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("PackageName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Packages"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.PackageComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PackageId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("PackageId"); + + b.ToTable("PackageComponents"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("OpeningDate") + .HasColumnType("datetime2"); + + b.Property("PackageMaxCount") + .HasColumnType("int"); + + b.Property("ShopAddress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.ShopPackage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PackageId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("PackageId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopPackages"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Order", b => + { + b.HasOne("SoftwareInstallationDatabaseImplement.Models.Package", "Package") + .WithMany("Orders") + .HasForeignKey("PackageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.PackageComponent", b => + { + b.HasOne("SoftwareInstallationDatabaseImplement.Models.Component", "Component") + .WithMany("PackageComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("SoftwareInstallationDatabaseImplement.Models.Package", "Package") + .WithMany("Components") + .HasForeignKey("PackageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Package"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.ShopPackage", b => + { + b.HasOne("SoftwareInstallationDatabaseImplement.Models.Package", "Package") + .WithMany() + .HasForeignKey("PackageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("SoftwareInstallationDatabaseImplement.Models.Shop", "Shop") + .WithMany("Packages") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + + b.Navigation("Shop"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Component", b => + { + b.Navigation("PackageComponents"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Package", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Shop", b => + { + b.Navigation("Packages"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.cs new file mode 100644 index 0000000..fbbbed6 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20240429151038_AddShopModel.cs @@ -0,0 +1,78 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace SoftwareInstallationDatabaseImplement.Migrations +{ + /// + public partial class AddShopModel : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Shops", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ShopName = table.Column(type: "nvarchar(max)", nullable: false), + ShopAddress = table.Column(type: "nvarchar(max)", nullable: false), + OpeningDate = table.Column(type: "datetime2", nullable: false), + PackageMaxCount = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Shops", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "ShopPackages", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + PackageId = table.Column(type: "int", nullable: false), + ShopId = table.Column(type: "int", nullable: false), + Count = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ShopPackages", x => x.Id); + table.ForeignKey( + name: "FK_ShopPackages_Packages_PackageId", + column: x => x.PackageId, + principalTable: "Packages", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_ShopPackages_Shops_ShopId", + column: x => x.ShopId, + principalTable: "Shops", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_ShopPackages_PackageId", + table: "ShopPackages", + column: "PackageId"); + + migrationBuilder.CreateIndex( + name: "IX_ShopPackages_ShopId", + table: "ShopPackages", + column: "ShopId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "ShopPackages"); + + migrationBuilder.DropTable( + name: "Shops"); + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/SoftwareInstallationDatabaseModelSnapshot.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/SoftwareInstallationDatabaseModelSnapshot.cs index e076682..2b06282 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/SoftwareInstallationDatabaseModelSnapshot.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/SoftwareInstallationDatabaseModelSnapshot.cs @@ -121,6 +121,59 @@ namespace SoftwareInstallationDatabaseImplement.Migrations b.ToTable("PackageComponents"); }); + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("OpeningDate") + .HasColumnType("datetime2"); + + b.Property("PackageMaxCount") + .HasColumnType("int"); + + b.Property("ShopAddress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.ShopPackage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("PackageId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("PackageId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopPackages"); + }); + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Order", b => { b.HasOne("SoftwareInstallationDatabaseImplement.Models.Package", "Package") @@ -151,6 +204,25 @@ namespace SoftwareInstallationDatabaseImplement.Migrations b.Navigation("Package"); }); + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.ShopPackage", b => + { + b.HasOne("SoftwareInstallationDatabaseImplement.Models.Package", "Package") + .WithMany() + .HasForeignKey("PackageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("SoftwareInstallationDatabaseImplement.Models.Shop", "Shop") + .WithMany("Packages") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Package"); + + b.Navigation("Shop"); + }); + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Component", b => { b.Navigation("PackageComponents"); @@ -162,6 +234,11 @@ namespace SoftwareInstallationDatabaseImplement.Migrations b.Navigation("Orders"); }); + + modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Shop", b => + { + b.Navigation("Packages"); + }); #pragma warning restore 612, 618 } } diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs index 0303f0d..f33aec7 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs @@ -33,7 +33,7 @@ namespace SoftwareInstallationDatabaseImplement.Models public virtual Package Package { get; set; } - public static Order? Create(OrderBindingModel? model) + public static Order? Create(SoftwareInstallationDatabase context, OrderBindingModel? model) { if (model == null) { @@ -48,8 +48,9 @@ namespace SoftwareInstallationDatabaseImplement.Models Sum = model.Sum, Status = model.Status, DateCreate = model.DateCreate, - DateImplement = model.DateImplement - }; + DateImplement = model.DateImplement, + Package = context.Packages.First(x => x.Id == model.PackageId) + }; } public void Update(OrderBindingModel model) diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Shop.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Shop.cs new file mode 100644 index 0000000..8881058 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Shop.cs @@ -0,0 +1,110 @@ +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.ViewModels; + +namespace SoftwareInstallationDatabaseImplement.Models +{ + public class Shop : IShopModel + { + [Required] + public string ShopName { get; private set; } = string.Empty; + [Required] + public string ShopAddress { get; private set; } = string.Empty; + [Required] + public DateTime OpeningDate { get; private set; } + [Required] + public int PackageMaxCount { get; private set; } + + public int Id { get; private set; } + + + private Dictionary _ShopPackages = null; + [NotMapped] + public Dictionary ShopPackages + { + get + { + if (_ShopPackages == null) + { + _ShopPackages = Packages + .ToDictionary(recPC => recPC.PackageId, recPC => (recPC.Package as IPackageModel, recPC.Count)); + } + return _ShopPackages; + } + } + + [ForeignKey("ShopId")] + public virtual List Packages { get; set; } = new(); + + public static Shop Create(SoftwareInstallationDatabase context, ShopBindingModel model) + { + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + ShopAddress = model.ShopAddress, + OpeningDate = model.OpeningDate, + PackageMaxCount = model.PackageMaxCount, + Packages = model.ShopPackages.Select(x => new ShopPackage + { + Package = context.Packages.First(y => y.Id == x.Key), + Count = x.Value.Item2 + }).ToList() + }; + } + + public void Update(ShopBindingModel model) + { + ShopName = model.ShopName; + ShopAddress = model.ShopAddress; + OpeningDate = model.OpeningDate; + PackageMaxCount = model.PackageMaxCount; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + ShopAddress = ShopAddress, + OpeningDate = OpeningDate, + PackageMaxCount = PackageMaxCount, + ShopPackages = ShopPackages + }; + + public void UpdatePackage(SoftwareInstallationDatabase context, ShopBindingModel model) + { + var ShopPackages = context.ShopPackages.Where(rec => rec.ShopId == model.Id).ToList(); + if (ShopPackages != null && ShopPackages.Count > 0) + { // удалили те, которых нет в модели + context.ShopPackages.RemoveRange(ShopPackages.Where(rec => !model.ShopPackages.ContainsKey(rec.PackageId))); + context.SaveChanges(); + // обновили количество у существующих записей + foreach (var updatePackage in ShopPackages) + { + updatePackage.Count = model.ShopPackages[updatePackage.PackageId].Item2; + model.ShopPackages.Remove(updatePackage.PackageId); + } + context.SaveChanges(); + } + var Shop = context.Shops.First(x => x.Id == Id); + foreach (var sp in model.ShopPackages) + { + context.ShopPackages.Add(new ShopPackage + { + Shop = Shop, + Package = context.Packages.First(x => x.Id == sp.Key), + Count = sp.Value.Item2 + }); + context.SaveChanges(); + } + _ShopPackages = null; + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/ShopPackage.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/ShopPackage.cs new file mode 100644 index 0000000..b0e026f --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/ShopPackage.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationDatabaseImplement.Models +{ + public class ShopPackage + { + public int Id { get; set; } + + [Required] + public int PackageId { get; set; } + + [Required] + public int ShopId { get; set; } + + [Required] + public int Count { get; set; } + + public virtual Shop Shop { get; set; } = new(); + + public virtual Package Package { get; set; } = new(); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabase.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabase.cs index a0e502b..022875f 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabase.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabase.cs @@ -15,7 +15,7 @@ namespace SoftwareInstallationDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-SPMUS7R;Initial Catalog=SoftwareInstallationDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-SPMUS7R;Initial Catalog=SoftwareInstallationHardDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } @@ -23,5 +23,7 @@ namespace SoftwareInstallationDatabaseImplement public virtual DbSet Packages { set; get; } public virtual DbSet PackageComponents { set; get; } public virtual DbSet Orders { set; get; } - } + public virtual DbSet Shops { set; get; } + public virtual DbSet ShopPackages { set; get; } + } }