From a71ea5188a5d123484657488d87939fa09186bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Sun, 12 Feb 2023 10:11:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FoodOrders/FormCreateOrder.Designer.cs | 22 ++-- FoodOrders/FoodOrders/FormCreateOrder.cs | 26 ++--- FoodOrders/FoodOrders/FormDish.Designer.cs | 14 +-- FoodOrders/FoodOrders/FormDish.cs | 16 +-- FoodOrders/FoodOrders/FormDishes.Designer.cs | 14 +-- FoodOrders/FoodOrders/FormDishes.cs | 20 ++-- .../FormListSetOfDishes.Designer.cs | 12 +- FoodOrders/FoodOrders/FormListSetOfDishes.cs | 20 ++-- FoodOrders/FoodOrders/FormMain.Designer.cs | 10 +- FoodOrders/FoodOrders/FormMain.cs | 26 ++--- .../FoodOrders/FormSetOfDishes.Designer.cs | 78 ++++++------- FoodOrders/FoodOrders/FormSetOfDishes.cs | 60 +++++----- FoodOrders/FoodOrders/FormSetOfDishes.resx | 2 +- .../FormSetOfDishesComponents.Designer.cs | 52 ++++----- .../FoodOrders/FormSetOfDishesComponents.cs | 22 ++-- FoodOrders/FoodOrders/Program.cs | 18 +-- ...{SetOfDishesLogic.cs => ComponentLogic.cs} | 72 ++++++------ .../BusinessLogics/DishLogic.cs | 56 +++++----- .../BusinessLogics/OrderLogic.cs | 4 +- .../BindingModels/ComponentBindingModel.cs | 11 ++ .../BindingModels/DishBindingModel.cs | 9 +- .../BindingModels/OrderBindingModel.cs | 4 +- .../BindingModels/SetOfDishesBindingModel.cs | 16 --- .../IComponentLogic.cs | 15 +++ .../BuisnessLogicsContracts/IDishLogic.cs | 6 +- .../ISetOfDishesLogic.cs | 15 --- ...SearchModel.cs => ComponentSearchModel.cs} | 4 +- .../SearchModels/DishSearchModel.cs | 2 +- .../StoragesContracts/IComponentStorage.cs | 16 +++ .../StoragesContracts/IDishStorage.cs | 8 +- .../StoragesContracts/ISetOfDishesStorage.cs | 16 --- .../ViewModels/ComponentViewModel.cs | 13 +++ .../ViewModels/DishViewModel.cs | 6 +- .../ViewModels/OrderViewModel.cs | 4 +- .../ViewModels/SetOfDishesViewModel.cs | 15 --- .../FoodOrdersDataModels/IComponentModel.cs | 9 ++ FoodOrders/FoodOrdersDataModels/IDishModel.cs | 3 +- .../FoodOrdersDataModels/IOrderModel.cs | 2 +- .../FoodOrdersDataModels/ISetOfDishesModel.cs | 10 -- .../DataListSingleton.cs | 8 +- .../Implements/ComponentStorage.cs | 103 ++++++++++++++++++ .../Implements/DishStorage.cs | 28 ++--- .../Implements/SetOfDishesStorage.cs | 103 ------------------ .../Models/Component.cs | 41 +++++++ .../FoodOrdersListImplement/Models/Dish.cs | 16 ++- .../FoodOrdersListImplement/Models/Order.cs | 16 +-- .../FoodOrdersListImplement/Models/Product.cs | 49 --------- 47 files changed, 546 insertions(+), 546 deletions(-) rename FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/{SetOfDishesLogic.cs => ComponentLogic.cs} (52%) create mode 100644 FoodOrders/FoodOrdersContracts/BindingModels/ComponentBindingModel.cs delete mode 100644 FoodOrders/FoodOrdersContracts/BindingModels/SetOfDishesBindingModel.cs create mode 100644 FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IComponentLogic.cs delete mode 100644 FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/ISetOfDishesLogic.cs rename FoodOrders/FoodOrdersContracts/SearchModels/{SetOfDishesSearchModel.cs => ComponentSearchModel.cs} (52%) create mode 100644 FoodOrders/FoodOrdersContracts/StoragesContracts/IComponentStorage.cs delete mode 100644 FoodOrders/FoodOrdersContracts/StoragesContracts/ISetOfDishesStorage.cs create mode 100644 FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs delete mode 100644 FoodOrders/FoodOrdersContracts/ViewModels/SetOfDishesViewModel.cs create mode 100644 FoodOrders/FoodOrdersDataModels/IComponentModel.cs delete mode 100644 FoodOrders/FoodOrdersDataModels/ISetOfDishesModel.cs create mode 100644 FoodOrders/FoodOrdersListImplement/Implements/ComponentStorage.cs delete mode 100644 FoodOrders/FoodOrdersListImplement/Implements/SetOfDishesStorage.cs create mode 100644 FoodOrders/FoodOrdersListImplement/Models/Component.cs delete mode 100644 FoodOrders/FoodOrdersListImplement/Models/Product.cs diff --git a/FoodOrders/FoodOrders/FormCreateOrder.Designer.cs b/FoodOrders/FoodOrders/FormCreateOrder.Designer.cs index 96b3e0f..dce3202 100644 --- a/FoodOrders/FoodOrders/FormCreateOrder.Designer.cs +++ b/FoodOrders/FoodOrders/FormCreateOrder.Designer.cs @@ -32,7 +32,7 @@ this.buttonSave = new System.Windows.Forms.Button(); this.textBoxSum = new System.Windows.Forms.TextBox(); this.textBoxCount = new System.Windows.Forms.TextBox(); - this.comboBoxSetOfDishes = new System.Windows.Forms.ComboBox(); + this.comboBoxDish = new System.Windows.Forms.ComboBox(); this.labelSum = new System.Windows.Forms.Label(); this.labelCount = new System.Windows.Forms.Label(); this.labelName = new System.Windows.Forms.Label(); @@ -77,15 +77,15 @@ this.textBoxCount.TabIndex = 12; this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); // - // comboBoxSetOfDishes + // comboBoxDish // - this.comboBoxSetOfDishes.FormattingEnabled = true; - this.comboBoxSetOfDishes.Location = new System.Drawing.Point(93, 9); - this.comboBoxSetOfDishes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.comboBoxSetOfDishes.Name = "comboBoxSetOfDishes"; - this.comboBoxSetOfDishes.Size = new System.Drawing.Size(230, 23); - this.comboBoxSetOfDishes.TabIndex = 11; - this.comboBoxSetOfDishes.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSetOfDishes_SelectedIndexChanged); + this.comboBoxDish.FormattingEnabled = true; + this.comboBoxDish.Location = new System.Drawing.Point(93, 9); + this.comboBoxDish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.comboBoxDish.Name = "comboBoxDish"; + this.comboBoxDish.Size = new System.Drawing.Size(230, 23); + this.comboBoxDish.TabIndex = 11; + this.comboBoxDish.SelectedIndexChanged += new System.EventHandler(this.ComboBoxDish_SelectedIndexChanged); // // labelSum // @@ -123,7 +123,7 @@ this.Controls.Add(this.buttonSave); this.Controls.Add(this.textBoxSum); this.Controls.Add(this.textBoxCount); - this.Controls.Add(this.comboBoxSetOfDishes); + this.Controls.Add(this.comboBoxDish); this.Controls.Add(this.labelSum); this.Controls.Add(this.labelCount); this.Controls.Add(this.labelName); @@ -141,7 +141,7 @@ private Button buttonSave; private TextBox textBoxSum; private TextBox textBoxCount; - private ComboBox comboBoxSetOfDishes; + private ComboBox comboBoxDish; private Label labelSum; private Label labelCount; private Label labelName; diff --git a/FoodOrders/FoodOrders/FormCreateOrder.cs b/FoodOrders/FoodOrders/FormCreateOrder.cs index 2c1ca37..554785e 100644 --- a/FoodOrders/FoodOrders/FormCreateOrder.cs +++ b/FoodOrders/FoodOrders/FormCreateOrder.cs @@ -8,9 +8,9 @@ namespace FoodOrdersView public partial class FormCreateOrder : Form { private readonly ILogger _logger; - private readonly ISetOfDishesLogic _logicS; + private readonly IDishLogic _logicS; private readonly IOrderLogic _logicO; - public FormCreateOrder(ILogger logger, ISetOfDishesLogic logicS, IOrderLogic logicO) + public FormCreateOrder(ILogger logger, IDishLogic logicS, IOrderLogic logicO) { InitializeComponent(); _logger = logger; @@ -25,10 +25,10 @@ namespace FoodOrdersView var list = _logicS.ReadList(null); if (list != null) { - comboBoxSetOfDishes.DisplayMember = "SetOfDishesName"; - comboBoxSetOfDishes.ValueMember = "Id"; - comboBoxSetOfDishes.DataSource = list; - comboBoxSetOfDishes.SelectedItem = null; + comboBoxDish.DisplayMember = "DishName"; + comboBoxDish.ValueMember = "Id"; + comboBoxDish.DataSource = list; + comboBoxDish.SelectedItem = null; } } @@ -40,12 +40,12 @@ namespace FoodOrdersView } private void CalcSum() { - if (comboBoxSetOfDishes.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) + if (comboBoxDish.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) { try { - int id = Convert.ToInt32(comboBoxSetOfDishes.SelectedValue); - var product = _logicS.ReadElement(new SetOfDishesearchModel + int id = Convert.ToInt32(comboBoxDish.SelectedValue); + var product = _logicS.ReadElement(new DishSearchModel { Id = id }); @@ -65,7 +65,7 @@ namespace FoodOrdersView { CalcSum(); } - private void ComboBoxSetOfDishes_SelectedIndexChanged(object sender, EventArgs e) + private void ComboBoxDish_SelectedIndexChanged(object sender, EventArgs e) { CalcSum(); } @@ -77,7 +77,7 @@ namespace FoodOrdersView MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (comboBoxSetOfDishes.SelectedValue == null) + if (comboBoxDish.SelectedValue == null) { MessageBox.Show("Выберите Набор блюд", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -87,8 +87,8 @@ namespace FoodOrdersView { var operationResult = _logicO.CreateOrder(new OrderBindingModel { - SetOfDishesId = Convert.ToInt32(comboBoxSetOfDishes.SelectedValue), - SetOfDishesName = comboBoxSetOfDishes.Text, + DishId = Convert.ToInt32(comboBoxDish.SelectedValue), + DishName = comboBoxDish.Text, Count = Convert.ToInt32(textBoxCount.Text), Sum = Convert.ToDouble(textBoxSum.Text) }); diff --git a/FoodOrders/FoodOrders/FormDish.Designer.cs b/FoodOrders/FoodOrders/FormDish.Designer.cs index eda2ab6..905ca7b 100644 --- a/FoodOrders/FoodOrders/FormDish.Designer.cs +++ b/FoodOrders/FoodOrders/FormDish.Designer.cs @@ -1,11 +1,11 @@ namespace FoodOrdersView { - partial class FormDish + partial class FormComponent { /// /// Required designer variable. /// - private System.ComponentModel.IContainer Dishes = null; + private System.ComponentModel.IContainer Components = null; /// /// Clean up any resources being used. @@ -13,9 +13,9 @@ /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { - if (disposing && (Dishes != null)) + if (disposing && (Components != null)) { - Dishes.Dispose(); + Components.Dispose(); } base.Dispose(disposing); } @@ -92,7 +92,7 @@ this.labelBlankName.TabIndex = 6; this.labelBlankName.Text = "Название:"; // - // FormDish + // FormComponent // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -103,9 +103,9 @@ this.Controls.Add(this.textBoxName); this.Controls.Add(this.labelPrice); this.Controls.Add(this.labelBlankName); - this.Name = "FormDish"; + this.Name = "FormComponent"; this.Text = "Блюдо"; - this.Load += new System.EventHandler(this.FormDish_Load); + this.Load += new System.EventHandler(this.FormComponent_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/FoodOrders/FoodOrders/FormDish.cs b/FoodOrders/FoodOrders/FormDish.cs index 806255b..03a5f08 100644 --- a/FoodOrders/FoodOrders/FormDish.cs +++ b/FoodOrders/FoodOrders/FormDish.cs @@ -5,34 +5,34 @@ using FoodOrdersContracts.BindingModels; namespace FoodOrdersView { - public partial class FormDish : Form + public partial class FormComponent : Form { private readonly ILogger _logger; - private readonly IDishLogic _logic; + private readonly IComponentLogic _logic; private int? _id; public int Id { set { _id = value; } } - public FormDish(ILogger logger, IDishLogic logic) + public FormComponent(ILogger logger, IComponentLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; } - private void FormDish_Load(object sender, EventArgs e) + private void FormComponent_Load(object sender, EventArgs e) { if (_id.HasValue) { try { _logger.LogInformation("Получение блюда"); - var view = _logic.ReadElement(new DishesearchModel + var view = _logic.ReadElement(new ComponentSearchModel { Id = _id.Value }); if (view != null) { - textBoxName.Text = view.DishName; + textBoxName.Text = view.ComponentName; textBoxCost.Text = view.Cost.ToString(); } } @@ -55,10 +55,10 @@ namespace FoodOrdersView _logger.LogInformation("Сохранение блюда"); try { - var model = new DishBindingModel + var model = new ComponentBindingModel { Id = _id ?? 0, - DishName = textBoxName.Text, + ComponentName = textBoxName.Text, Cost = Convert.ToDouble(textBoxCost.Text) }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/FoodOrders/FoodOrders/FormDishes.Designer.cs b/FoodOrders/FoodOrders/FormDishes.Designer.cs index d62400f..db6eaf1 100644 --- a/FoodOrders/FoodOrders/FormDishes.Designer.cs +++ b/FoodOrders/FoodOrders/FormDishes.Designer.cs @@ -1,11 +1,11 @@ namespace FoodOrdersView { - partial class FormDishes + partial class FormComponents { /// /// Required designer variable. /// - private System.ComponentModel.IContainer Dishes = null; + private System.ComponentModel.IContainer Components = null; /// /// Clean up any resources being used. @@ -13,9 +13,9 @@ /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { - if (disposing && (Dishes != null)) + if (disposing && (Components != null)) { - Dishes.Dispose(); + Components.Dispose(); } base.Dispose(disposing); } @@ -93,7 +93,7 @@ this.dataGridView.Size = new System.Drawing.Size(426, 348); this.dataGridView.TabIndex = 5; // - // FormDishes + // FormComponents // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -103,9 +103,9 @@ this.Controls.Add(this.buttonDelete); this.Controls.Add(this.buttonEdit); this.Controls.Add(this.buttonAdd); - this.Name = "FormDishes"; + this.Name = "FormComponents"; this.Text = "Блюда"; - this.Load += new System.EventHandler(this.FormDishes_Load); + this.Load += new System.EventHandler(this.FormComponents_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); diff --git a/FoodOrders/FoodOrders/FormDishes.cs b/FoodOrders/FoodOrders/FormDishes.cs index c806bcf..5b67403 100644 --- a/FoodOrders/FoodOrders/FormDishes.cs +++ b/FoodOrders/FoodOrders/FormDishes.cs @@ -5,17 +5,17 @@ using Microsoft.Extensions.Logging; namespace FoodOrdersView { - public partial class FormDishes : Form + public partial class FormComponents : Form { private readonly ILogger _logger; - private readonly IDishLogic _logic; - public FormDishes(ILogger logger, IDishLogic logic) + private readonly IComponentLogic _logic; + public FormComponents(ILogger logger, IComponentLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; } - private void FormDishes_Load(object sender, EventArgs e) + private void FormComponents_Load(object sender, EventArgs e) { LoadData(); } @@ -28,7 +28,7 @@ namespace FoodOrdersView { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["DishName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка Блюд"); } @@ -41,8 +41,8 @@ namespace FoodOrdersView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDish)); - if (service is FormDish form) + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) { if (form.ShowDialog() == DialogResult.OK) { @@ -54,8 +54,8 @@ namespace FoodOrdersView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormDish)); - if (service is FormDish form) + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) @@ -75,7 +75,7 @@ namespace FoodOrdersView _logger.LogInformation("Удаление блюда"); try { - if (!_logic.Delete(new DishBindingModel + if (!_logic.Delete(new ComponentBindingModel { Id = id })) diff --git a/FoodOrders/FoodOrders/FormListSetOfDishes.Designer.cs b/FoodOrders/FoodOrders/FormListSetOfDishes.Designer.cs index 6353298..251f8c9 100644 --- a/FoodOrders/FoodOrders/FormListSetOfDishes.Designer.cs +++ b/FoodOrders/FoodOrders/FormListSetOfDishes.Designer.cs @@ -1,11 +1,11 @@ namespace FoodOrdersView { - partial class FormListSetOfDishes + partial class FormListDish { /// /// Required designer variable. /// - private System.ComponentModel.IContainer Dishes = null; + private System.ComponentModel.IContainer Components = null; /// /// Clean up any resources being used. @@ -13,9 +13,9 @@ /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { - if (disposing && (Dishes != null)) + if (disposing && (Components != null)) { - Dishes.Dispose(); + Components.Dispose(); } base.Dispose(disposing); } @@ -93,7 +93,7 @@ this.buttonAdd.UseVisualStyleBackColor = true; this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); // - // FormListSetOfDishes + // FormListDish // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -103,7 +103,7 @@ this.Controls.Add(this.buttonDelete); this.Controls.Add(this.buttonEdit); this.Controls.Add(this.buttonAdd); - this.Name = "FormListSetOfDishes"; + this.Name = "FormListDish"; this.Text = "Список набор блюд"; this.Load += new System.EventHandler(this.FormDocuments_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); diff --git a/FoodOrders/FoodOrders/FormListSetOfDishes.cs b/FoodOrders/FoodOrders/FormListSetOfDishes.cs index 6a11188..a9eca36 100644 --- a/FoodOrders/FoodOrders/FormListSetOfDishes.cs +++ b/FoodOrders/FoodOrders/FormListSetOfDishes.cs @@ -5,11 +5,11 @@ using Microsoft.Extensions.Logging; namespace FoodOrdersView { - public partial class FormListSetOfDishes : Form + public partial class FormListDish : Form { private readonly ILogger _logger; - private readonly ISetOfDishesLogic _logic; - public FormListSetOfDishes(ILogger logger, ISetOfDishesLogic logic) + private readonly IDishLogic _logic; + public FormListDish(ILogger logger, IDishLogic logic) { InitializeComponent(); _logger = logger; @@ -29,8 +29,8 @@ namespace FoodOrdersView { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["SetOfDishesName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["SetOfDishesDishes"].Visible = false; + dataGridView.Columns["DishName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["DishComponents"].Visible = false; } _logger.LogInformation("Загрузка набор блюд"); } @@ -43,8 +43,8 @@ namespace FoodOrdersView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormSetOfDishes)); - if (service is FormSetOfDishes form) + var service = Program.ServiceProvider?.GetService(typeof(FormDish)); + if (service is FormDish form) { if (form.ShowDialog() == DialogResult.OK) { @@ -57,8 +57,8 @@ namespace FoodOrdersView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormSetOfDishes)); - if (service is FormSetOfDishes form) + var service = Program.ServiceProvider?.GetService(typeof(FormDish)); + if (service is FormDish form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) @@ -79,7 +79,7 @@ namespace FoodOrdersView _logger.LogInformation("Удаление набор блюд"); try { - if (!_logic.Delete(new SetOfDishesBindingModel + if (!_logic.Delete(new DishBindingModel { Id = id })) diff --git a/FoodOrders/FoodOrders/FormMain.Designer.cs b/FoodOrders/FoodOrders/FormMain.Designer.cs index 6a6905d..a9f671f 100644 --- a/FoodOrders/FoodOrders/FormMain.Designer.cs +++ b/FoodOrders/FoodOrders/FormMain.Designer.cs @@ -5,7 +5,7 @@ /// /// Required designer variable. /// - private System.ComponentModel.IContainer Dishes = null; + private System.ComponentModel.IContainer Components = null; /// /// Clean up any resources being used. @@ -13,9 +13,9 @@ /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { - if (disposing && (Dishes != null)) + if (disposing && (Components != null)) { - Dishes.Dispose(); + Components.Dispose(); } base.Dispose(disposing); } @@ -66,14 +66,14 @@ this.БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem"; this.БлюдаToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.БлюдаToolStripMenuItem.Text = "Блюда"; - this.БлюдаToolStripMenuItem.Click += new System.EventHandler(this.DishesToolStripMenuItem_Click); + this.БлюдаToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); // // набор блюдToolStripMenuItem // this.наборблюдToolStripMenuItem.Name = "набор блюдToolStripMenuItem"; this.наборблюдToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.наборблюдToolStripMenuItem.Text = "Набор блюд"; - this.наборблюдToolStripMenuItem.Click += new System.EventHandler(this.SetOfDishesToolStripMenuItem_Click); + this.наборблюдToolStripMenuItem.Click += new System.EventHandler(this.DishToolStripMenuItem_Click); // // buttonUpdate // diff --git a/FoodOrders/FoodOrders/FormMain.cs b/FoodOrders/FoodOrders/FormMain.cs index 0816cc6..4c471e2 100644 --- a/FoodOrders/FoodOrders/FormMain.cs +++ b/FoodOrders/FoodOrders/FormMain.cs @@ -30,7 +30,7 @@ namespace FoodOrdersView if (list != null) { dataGridView.DataSource = list; - dataGridView.Columns["SetOfDishesId"].Visible = false; + dataGridView.Columns["DishId"].Visible = false; } _logger.LogInformation("Загрузка заказов"); } @@ -40,18 +40,18 @@ namespace FoodOrdersView MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void DishesToolStripMenuItem_Click(object sender, EventArgs e) + private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDishes)); - if (service is FormDishes form) + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) { form.ShowDialog(); } } - private void SetOfDishesToolStripMenuItem_Click(object sender, EventArgs e) + private void DishToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormListSetOfDishes)); - if (service is FormListSetOfDishes form) + var service = Program.ServiceProvider?.GetService(typeof(FormListDish)); + if (service is FormListDish form) { form.ShowDialog(); } @@ -76,8 +76,8 @@ namespace FoodOrdersView var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id, - SetOfDishesId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["SetOfDishesId"].Value), - SetOfDishesName = dataGridView.SelectedRows[0].Cells["SetOfDishesName"].Value.ToString(), + DishId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DishId"].Value), + DishName = dataGridView.SelectedRows[0].Cells["DishName"].Value.ToString(), Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), @@ -107,8 +107,8 @@ namespace FoodOrdersView var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id, - SetOfDishesId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["SetOfDishesId"].Value), - SetOfDishesName = dataGridView.SelectedRows[0].Cells["SetOfDishesName"].Value.ToString(), + DishId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DishId"].Value), + DishName = dataGridView.SelectedRows[0].Cells["DishName"].Value.ToString(), Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), @@ -138,8 +138,8 @@ namespace FoodOrdersView var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id, - SetOfDishesId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["SetOfDishesId"].Value), - SetOfDishesName = dataGridView.SelectedRows[0].Cells["SetOfDishesName"].Value.ToString(), + DishId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DishId"].Value), + DishName = dataGridView.SelectedRows[0].Cells["DishName"].Value.ToString(), Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), diff --git a/FoodOrders/FoodOrders/FormSetOfDishes.Designer.cs b/FoodOrders/FoodOrders/FormSetOfDishes.Designer.cs index 20c7b13..4c0256c 100644 --- a/FoodOrders/FoodOrders/FormSetOfDishes.Designer.cs +++ b/FoodOrders/FoodOrders/FormSetOfDishes.Designer.cs @@ -1,11 +1,11 @@ namespace FoodOrdersView { - partial class FormSetOfDishes + partial class FormDish { /// /// Required designer variable. /// - private System.ComponentModel.IContainer Dishes = null; + private System.ComponentModel.IContainer Components = null; /// /// Clean up any resources being used. @@ -13,9 +13,9 @@ /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { - if (disposing && (Dishes != null)) + if (disposing && (Components != null)) { - Dishes.Dispose(); + Components.Dispose(); } base.Dispose(disposing); } @@ -32,7 +32,7 @@ this.textBoxName = new System.Windows.Forms.TextBox(); this.labelPrice = new System.Windows.Forms.Label(); this.labelName = new System.Windows.Forms.Label(); - this.groupBoxDishes = new System.Windows.Forms.GroupBox(); + this.groupBoxComponents = new System.Windows.Forms.GroupBox(); this.buttonCancel = new System.Windows.Forms.Button(); this.buttonSave = new System.Windows.Forms.Button(); this.buttonUpdate = new System.Windows.Forms.Button(); @@ -41,9 +41,9 @@ this.buttonAdd = new System.Windows.Forms.Button(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnDishName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnComponentName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.groupBoxDishes.SuspendLayout(); + this.groupBoxComponents.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); // @@ -81,24 +81,24 @@ this.labelName.TabIndex = 4; this.labelName.Text = "Название:"; // - // groupBoxDishes + // groupBoxComponents // - this.groupBoxDishes.Controls.Add(this.buttonCancel); - this.groupBoxDishes.Controls.Add(this.buttonSave); - this.groupBoxDishes.Controls.Add(this.buttonUpdate); - this.groupBoxDishes.Controls.Add(this.buttonDelete); - this.groupBoxDishes.Controls.Add(this.buttonEdit); - this.groupBoxDishes.Controls.Add(this.buttonAdd); - this.groupBoxDishes.Controls.Add(this.dataGridView); - this.groupBoxDishes.Dock = System.Windows.Forms.DockStyle.Bottom; - this.groupBoxDishes.Location = new System.Drawing.Point(0, 70); - this.groupBoxDishes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.groupBoxDishes.Name = "groupBoxDishes"; - this.groupBoxDishes.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.groupBoxDishes.Size = new System.Drawing.Size(592, 206); - this.groupBoxDishes.TabIndex = 8; - this.groupBoxDishes.TabStop = false; - this.groupBoxDishes.Text = "Компоненты"; + this.groupBoxComponents.Controls.Add(this.buttonCancel); + this.groupBoxComponents.Controls.Add(this.buttonSave); + this.groupBoxComponents.Controls.Add(this.buttonUpdate); + this.groupBoxComponents.Controls.Add(this.buttonDelete); + this.groupBoxComponents.Controls.Add(this.buttonEdit); + this.groupBoxComponents.Controls.Add(this.buttonAdd); + this.groupBoxComponents.Controls.Add(this.dataGridView); + this.groupBoxComponents.Dock = System.Windows.Forms.DockStyle.Bottom; + this.groupBoxComponents.Location = new System.Drawing.Point(0, 70); + this.groupBoxComponents.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxComponents.Name = "groupBoxComponents"; + this.groupBoxComponents.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxComponents.Size = new System.Drawing.Size(592, 206); + this.groupBoxComponents.TabIndex = 8; + this.groupBoxComponents.TabStop = false; + this.groupBoxComponents.Text = "Компоненты"; // // buttonCancel // @@ -171,7 +171,7 @@ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.ID, - this.ColumnDishName, + this.ColumnComponentName, this.ColumnCount}); this.dataGridView.Location = new System.Drawing.Point(5, 20); this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -189,14 +189,14 @@ this.ID.Visible = false; this.ID.Width = 125; // - // ColumnDishName + // ColumnComponentName // - this.ColumnDishName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.ColumnDishName.HeaderText = "Блюдо"; - this.ColumnDishName.MinimumWidth = 6; - this.ColumnDishName.Name = "ColumnDishName"; - this.ColumnDishName.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.ColumnDishName.Width = 312; + this.ColumnComponentName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.ColumnComponentName.HeaderText = "Блюдо"; + this.ColumnComponentName.MinimumWidth = 6; + this.ColumnComponentName.Name = "ColumnComponentName"; + this.ColumnComponentName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ColumnComponentName.Width = 312; // // ColumnCount // @@ -205,20 +205,20 @@ this.ColumnCount.Name = "ColumnCount"; this.ColumnCount.Width = 125; // - // FormSetOfDishes + // FormDish // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(592, 276); - this.Controls.Add(this.groupBoxDishes); + this.Controls.Add(this.groupBoxComponents); this.Controls.Add(this.textBoxPrice); this.Controls.Add(this.textBoxName); this.Controls.Add(this.labelPrice); this.Controls.Add(this.labelName); - this.Name = "FormSetOfDishes"; + this.Name = "FormDish"; this.Text = "Набор блюд"; - this.Load += new System.EventHandler(this.FormSetOfDishes_Load); - this.groupBoxDishes.ResumeLayout(false); + this.Load += new System.EventHandler(this.FormDish_Load); + this.groupBoxComponents.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -231,7 +231,7 @@ private TextBox textBoxName; private Label labelPrice; private Label labelName; - private GroupBox groupBoxDishes; + private GroupBox groupBoxComponents; private Button buttonUpdate; private Button buttonDelete; private Button buttonEdit; @@ -240,7 +240,7 @@ private Button buttonCancel; private Button buttonSave; private DataGridViewTextBoxColumn ID; - private DataGridViewTextBoxColumn ColumnDishName; + private DataGridViewTextBoxColumn ColumnComponentName; private DataGridViewTextBoxColumn ColumnCount; } } \ No newline at end of file diff --git a/FoodOrders/FoodOrders/FormSetOfDishes.cs b/FoodOrders/FoodOrders/FormSetOfDishes.cs index 3124b29..1f02fd2 100644 --- a/FoodOrders/FoodOrders/FormSetOfDishes.cs +++ b/FoodOrders/FoodOrders/FormSetOfDishes.cs @@ -7,36 +7,36 @@ using Microsoft.Extensions.Logging; namespace FoodOrdersView { - public partial class FormSetOfDishes : Form + public partial class FormDish : Form { private readonly ILogger _logger; - private readonly ISetOfDishesLogic _logic; + private readonly IDishLogic _logic; private int? _id; - private Dictionary _set_of_dishesDishes; + private Dictionary _dishComponents; public int Id { set { _id = value; } } - public FormSetOfDishes(ILogger logger, ISetOfDishesLogic logic) + public FormDish(ILogger logger, IDishLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; - _set_of_dishesDishes = new Dictionary(); + _dishComponents = new Dictionary(); } - private void FormSetOfDishes_Load(object sender, EventArgs e) + private void FormDish_Load(object sender, EventArgs e) { if (_id.HasValue) { _logger.LogInformation("Загрузка набор блюд"); try { - var view = _logic.ReadElement(new SetOfDishesearchModel + var view = _logic.ReadElement(new DishSearchModel { Id = _id.Value }); if (view != null) { - textBoxName.Text = view.SetOfDishesName; + textBoxName.Text = view.DishName; textBoxPrice.Text = view.Price.ToString(); - _set_of_dishesDishes = view.SetOfDishesDishes ?? new Dictionary(); + _dishComponents = view.DishComponents ?? new Dictionary(); LoadData(); } } @@ -53,12 +53,12 @@ namespace FoodOrdersView _logger.LogInformation("Загрузка Блюдо набор блюд"); try { - if (_set_of_dishesDishes != null) + if (_dishComponents != null) { dataGridView.Rows.Clear(); - foreach (var sc in _set_of_dishesDishes) + foreach (var sc in _dishComponents) { - dataGridView.Rows.Add(new object[] { sc.Key, sc.Value.Item1.DishName, sc.Value.Item2 }); + dataGridView.Rows.Add(new object[] { sc.Key, sc.Value.Item1.ComponentName, sc.Value.Item2 }); } textBoxPrice.Text = CalcPrice().ToString(); } @@ -71,8 +71,8 @@ namespace FoodOrdersView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormSetOfDishesDishes)); - if (service is FormSetOfDishesDishes form) + var service = Program.ServiceProvider?.GetService(typeof(FormDishComponents)); + if (service is FormDishComponents form) { if (form.ShowDialog() == DialogResult.OK) { @@ -80,15 +80,15 @@ namespace FoodOrdersView { return; } - _logger.LogInformation("Добавление нового блюда: { DishName} - { Count}", form.ComponentModel.DishName, form.Count); - if (_set_of_dishesDishes.ContainsKey(form.Id)) + _logger.LogInformation("Добавление нового блюда: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + if (_dishComponents.ContainsKey(form.Id)) { - _set_of_dishesDishes[form.Id] = (form.ComponentModel, + _dishComponents[form.Id] = (form.ComponentModel, form.Count); } else { - _set_of_dishesDishes.Add(form.Id, (form.ComponentModel, + _dishComponents.Add(form.Id, (form.ComponentModel, form.Count)); } LoadData(); @@ -99,21 +99,21 @@ namespace FoodOrdersView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormSetOfDishesDishes)); - if (service is FormSetOfDishesDishes form) + var service = Program.ServiceProvider?.GetService(typeof(FormDishComponents)); + if (service is FormDishComponents form) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); form.Id = id; - form.Count = _set_of_dishesDishes[id].Item2; + form.Count = _dishComponents[id].Item2; if (form.ShowDialog() == DialogResult.OK) { if (form.ComponentModel == null) { return; } - _logger.LogInformation("Изменение блюда: { DishName} - { Count} ", form.ComponentModel.DishName, form.Count); - _set_of_dishesDishes[form.Id] = (form.ComponentModel, form.Count); + _logger.LogInformation("Изменение блюда: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count); + _dishComponents[form.Id] = (form.ComponentModel, form.Count); LoadData(); } } @@ -128,8 +128,8 @@ namespace FoodOrdersView { try { - _logger.LogInformation("Удаление блюда: { DishName} - { Count} ", - dataGridView.SelectedRows[0].Cells[1].Value); _set_of_dishesDishes?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + _logger.LogInformation("Удаление блюда: { ComponentName} - { Count} ", + dataGridView.SelectedRows[0].Cells[1].Value); _dishComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); } catch (Exception ex) { @@ -158,7 +158,7 @@ namespace FoodOrdersView MessageBoxIcon.Error); return; } - if (_set_of_dishesDishes == null || _set_of_dishesDishes.Count == 0) + if (_dishComponents == null || _dishComponents.Count == 0) { MessageBox.Show("Заполните Блюда", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -167,12 +167,12 @@ namespace FoodOrdersView _logger.LogInformation("Сохранение набор блюд"); try { - var model = new SetOfDishesBindingModel + var model = new DishBindingModel { Id = _id ?? 0, - SetOfDishesName = textBoxName.Text, + DishName = textBoxName.Text, Price = Convert.ToDouble(textBoxPrice.Text), - SetOfDishesDishes = _set_of_dishesDishes + DishComponents = _dishComponents }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) @@ -197,7 +197,7 @@ namespace FoodOrdersView private double CalcPrice() { double price = 0; - foreach (var elem in _set_of_dishesDishes) + foreach (var elem in _dishComponents) { price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); } diff --git a/FoodOrders/FoodOrders/FormSetOfDishes.resx b/FoodOrders/FoodOrders/FormSetOfDishes.resx index ed24e01..8e6d533 100644 --- a/FoodOrders/FoodOrders/FormSetOfDishes.resx +++ b/FoodOrders/FoodOrders/FormSetOfDishes.resx @@ -60,7 +60,7 @@ True - + True diff --git a/FoodOrders/FoodOrders/FormSetOfDishesComponents.Designer.cs b/FoodOrders/FoodOrders/FormSetOfDishesComponents.Designer.cs index 01281f2..e5a4330 100644 --- a/FoodOrders/FoodOrders/FormSetOfDishesComponents.Designer.cs +++ b/FoodOrders/FoodOrders/FormSetOfDishesComponents.Designer.cs @@ -1,11 +1,11 @@ namespace FoodOrdersView { - partial class FormSetOfDishesDishes + partial class FormDishComponents { /// /// Required designer variable. /// - private System.ComponentModel.IContainer Dishes = null; + private System.ComponentModel.IContainer Components = null; /// /// Clean up any resources being used. @@ -13,9 +13,9 @@ /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { - if (disposing && (Dishes != null)) + if (disposing && (Components != null)) { - Dishes.Dispose(); + Components.Dispose(); } base.Dispose(disposing); } @@ -31,9 +31,9 @@ this.buttonCancel = new System.Windows.Forms.Button(); this.buttonSave = new System.Windows.Forms.Button(); this.textBoxCount = new System.Windows.Forms.TextBox(); - this.comboBoxDish = new System.Windows.Forms.ComboBox(); + this.comboBoxComponent = new System.Windows.Forms.ComboBox(); this.labelCount = new System.Windows.Forms.Label(); - this.labelDish = new System.Windows.Forms.Label(); + this.labelComponent = new System.Windows.Forms.Label(); this.SuspendLayout(); // // buttonCancel @@ -66,14 +66,14 @@ this.textBoxCount.Size = new System.Drawing.Size(283, 23); this.textBoxCount.TabIndex = 9; // - // comboBoxDish + // comboBoxComponent // - this.comboBoxDish.FormattingEnabled = true; - this.comboBoxDish.Location = new System.Drawing.Point(116, 11); - this.comboBoxDish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.comboBoxDish.Name = "comboBoxDish"; - this.comboBoxDish.Size = new System.Drawing.Size(282, 23); - this.comboBoxDish.TabIndex = 8; + this.comboBoxComponent.FormattingEnabled = true; + this.comboBoxComponent.Location = new System.Drawing.Point(116, 11); + this.comboBoxComponent.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.comboBoxComponent.Name = "comboBoxComponent"; + this.comboBoxComponent.Size = new System.Drawing.Size(282, 23); + this.comboBoxComponent.TabIndex = 8; // // labelCount // @@ -84,16 +84,16 @@ this.labelCount.TabIndex = 7; this.labelCount.Text = "Количество:"; // - // labelDish + // labelComponent // - this.labelDish.AutoSize = true; - this.labelDish.Location = new System.Drawing.Point(10, 14); - this.labelDish.Name = "labelDish"; - this.labelDish.Size = new System.Drawing.Size(75, 15); - this.labelDish.TabIndex = 6; - this.labelDish.Text = "Блюдо:"; + this.labelComponent.AutoSize = true; + this.labelComponent.Location = new System.Drawing.Point(10, 14); + this.labelComponent.Name = "labelComponent"; + this.labelComponent.Size = new System.Drawing.Size(75, 15); + this.labelComponent.TabIndex = 6; + this.labelComponent.Text = "Блюдо:"; // - // FormSetOfDishesDishes + // FormDishComponents // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -101,10 +101,10 @@ this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); this.Controls.Add(this.textBoxCount); - this.Controls.Add(this.comboBoxDish); + this.Controls.Add(this.comboBoxComponent); this.Controls.Add(this.labelCount); - this.Controls.Add(this.labelDish); - this.Name = "FormSetOfDishesDishes"; + this.Controls.Add(this.labelComponent); + this.Name = "FormDishComponents"; this.Text = "Блюдо набор блюд"; this.ResumeLayout(false); this.PerformLayout(); @@ -116,8 +116,8 @@ private Button buttonCancel; private Button buttonSave; private TextBox textBoxCount; - private ComboBox comboBoxDish; + private ComboBox comboBoxComponent; private Label labelCount; - private Label labelDish; + private Label labelComponent; } } \ No newline at end of file diff --git a/FoodOrders/FoodOrders/FormSetOfDishesComponents.cs b/FoodOrders/FoodOrders/FormSetOfDishesComponents.cs index 6e2caf3..5ee296c 100644 --- a/FoodOrders/FoodOrders/FormSetOfDishesComponents.cs +++ b/FoodOrders/FoodOrders/FormSetOfDishesComponents.cs @@ -4,21 +4,21 @@ using FoodOrdersDataModels.Models; namespace FoodOrdersView { - public partial class FormSetOfDishesDishes : Form + public partial class FormDishComponents : Form { - private readonly List? _list; + private readonly List? _list; public int Id { get { - return Convert.ToInt32(comboBoxDish.SelectedValue); + return Convert.ToInt32(comboBoxComponent.SelectedValue); } set { - comboBoxDish.SelectedValue = value; + comboBoxComponent.SelectedValue = value; } } - public IDishModel? ComponentModel + public IComponentModel? ComponentModel { get { @@ -41,16 +41,16 @@ namespace FoodOrdersView get { return Convert.ToInt32(textBoxCount.Text); } set { textBoxCount.Text = value.ToString(); } } - public FormSetOfDishesDishes(IDishLogic logic) + public FormDishComponents(IComponentLogic logic) { InitializeComponent(); _list = logic.ReadList(null); if (_list != null) { - comboBoxDish.DisplayMember = "DishName"; - comboBoxDish.ValueMember = "Id"; - comboBoxDish.DataSource = _list; - comboBoxDish.SelectedItem = null; + comboBoxComponent.DisplayMember = "ComponentName"; + comboBoxComponent.ValueMember = "Id"; + comboBoxComponent.DataSource = _list; + comboBoxComponent.SelectedItem = null; } } private void ButtonSave_Click(object sender, EventArgs e) @@ -61,7 +61,7 @@ namespace FoodOrdersView MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (comboBoxDish.SelectedValue == null) + if (comboBoxComponent.SelectedValue == null) { MessageBox.Show("Выберите Блюдо", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); diff --git a/FoodOrders/FoodOrders/Program.cs b/FoodOrders/FoodOrders/Program.cs index 46cfcea..8597c4a 100644 --- a/FoodOrders/FoodOrders/Program.cs +++ b/FoodOrders/FoodOrders/Program.cs @@ -37,19 +37,19 @@ namespace FoodOrders option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/SetOfDishesLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ComponentLogic.cs similarity index 52% rename from FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/SetOfDishesLogic.cs rename to FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ComponentLogic.cs index 7d789da..7a86b71 100644 --- a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/SetOfDishesLogic.cs +++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ComponentLogic.cs @@ -4,30 +4,25 @@ using FoodOrdersContracts.SearchModels; using FoodOrdersContracts.StoragesContracts; using FoodOrdersContracts.ViewModels; using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FoodOrdersBusinessLogic.BusinessLogics { - public class SetOfDishesLogic : ISetOfDishesLogic + public class ComponentLogic : IComponentLogic { private readonly ILogger _logger; - private readonly ISetOfDishestorage _set_of_dishesStorage; - public SetOfDishesLogic(ILogger logger, ISetOfDishestorage set_of_dishesStorage) + private readonly IComponentStorage _componentStorage; + public ComponentLogic(ILogger logger, IComponentStorage + ComponentStorage) { _logger = logger; - _set_of_dishesStorage = set_of_dishesStorage; + _componentStorage = ComponentStorage; } - - public List? ReadList(SetOfDishesearchModel? model) + public List? ReadList(ComponentSearchModel? model) { - _logger.LogInformation("ReadList. SetOfDishesName:{SetOfDishesName}. Id:{Id}", - model?.SetOfDishesName, model?.Id); - var list = model == null ? _set_of_dishesStorage.GetFullList() : - _set_of_dishesStorage.GetFilteredList(model); + _logger.LogInformation("ReadList. ComponentName:{ComponentName}. Id:{Id}", + model?.ComponentName, model?.Id); + var list = model == null ? _componentStorage.GetFullList() : + _componentStorage.GetFilteredList(model); if (list == null) { _logger.LogWarning("ReadList return null list"); @@ -36,15 +31,14 @@ namespace FoodOrdersBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } - - public SetOfDishesViewModel? ReadElement(SetOfDishesearchModel model) + public ComponentViewModel? ReadElement(ComponentSearchModel model) { if (model == null) { throw new ArgumentNullException(nameof(model)); } - _logger.LogInformation("ReadElement. SetOfDishesName:{SetOfDishesName}. Id:{Id}", model.SetOfDishesName, model.Id); - var element = _set_of_dishesStorage.GetElement(model); + _logger.LogInformation("ReadElement. ComponentName:{ComponentName}. Id:{Id}", model.ComponentName, model.Id); + var element = _componentStorage.GetElement(model); if (element == null) { _logger.LogWarning("ReadElement element not found"); @@ -53,40 +47,39 @@ namespace FoodOrdersBusinessLogic.BusinessLogics _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); return element; } - - public bool Create(SetOfDishesBindingModel model) + public bool Create(ComponentBindingModel model) { CheckModel(model); - if (_set_of_dishesStorage.Insert(model) == null) + if (_componentStorage.Insert(model) == null) { _logger.LogWarning("Insert operation failed"); return false; } return true; } - - public bool Update(SetOfDishesBindingModel model) + public bool Update(ComponentBindingModel model) { CheckModel(model); - if (_set_of_dishesStorage.Update(model) == null) + if (_componentStorage.Update(model) == null) { _logger.LogWarning("Update operation failed"); return false; } return true; } - public bool Delete(SetOfDishesBindingModel model) + public bool Delete(ComponentBindingModel model) { CheckModel(model, false); _logger.LogInformation("Delete. Id:{Id}", model.Id); - if (_set_of_dishesStorage.Delete(model) == null) + if (_componentStorage.Delete(model) == null) { _logger.LogWarning("Delete operation failed"); return false; } return true; } - private void CheckModel(SetOfDishesBindingModel model, bool withParams = true) + private void CheckModel(ComponentBindingModel model, bool withParams = + true) { if (model == null) { @@ -96,23 +89,24 @@ namespace FoodOrdersBusinessLogic.BusinessLogics { return; } - if (string.IsNullOrEmpty(model.SetOfDishesName)) + if (string.IsNullOrEmpty(model.ComponentName)) { - throw new ArgumentNullException("Нет названия компонента", nameof(model.SetOfDishesName)); + throw new ArgumentNullException("Нет названия компонента", + nameof(model.ComponentName)); } - if (model.Price <= 0) + if (model.Cost <= 0) { - throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Price)); + throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); } - _logger.LogInformation("SetOfDishes. SetOfDishesName:{SetOfDishesName}. Price:{Price}. Id:{Id}", model.SetOfDishesName, model.Price, model.Id); - var element = _set_of_dishesStorage.GetElement(new SetOfDishesearchModel - { - SetOfDishesName = model.SetOfDishesName - }); + _logger.LogInformation("Component. ComponentName:{ComponentName}. Cost:{ Cost}. Id:{Id}", model.ComponentName, model.Cost, model.Id); + var element = _componentStorage.GetElement(new ComponentSearchModel + { + ComponentName = model.ComponentName + }); if (element != null && element.Id != model.Id) { - throw new InvalidOperationException("Прдукт с таким названием уже есть"); + throw new InvalidOperationException("Компонент с таким названием уже есть"); } } } -} +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/DishLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/DishLogic.cs index 5d40c9e..bd8e613 100644 --- a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/DishLogic.cs +++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/DishLogic.cs @@ -4,25 +4,30 @@ using FoodOrdersContracts.SearchModels; using FoodOrdersContracts.StoragesContracts; using FoodOrdersContracts.ViewModels; using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; namespace FoodOrdersBusinessLogic.BusinessLogics { public class DishLogic : IDishLogic { private readonly ILogger _logger; - private readonly IDishestorage _Dishestorage; - public DishLogic(ILogger logger, IDishestorage - Dishestorage) + private readonly IDishStorage _dishStorage; + public DishLogic(ILogger logger, IDishStorage dishStorage) { _logger = logger; - _Dishestorage = Dishestorage; + _dishStorage = dishStorage; } - public List? ReadList(DishesearchModel? model) + + public List? ReadList(DishSearchModel? model) { _logger.LogInformation("ReadList. DishName:{DishName}. Id:{Id}", model?.DishName, model?.Id); - var list = model == null ? _Dishestorage.GetFullList() : - _Dishestorage.GetFilteredList(model); + var list = model == null ? _dishStorage.GetFullList() : + _dishStorage.GetFilteredList(model); if (list == null) { _logger.LogWarning("ReadList return null list"); @@ -31,14 +36,15 @@ namespace FoodOrdersBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } - public DishViewModel? ReadElement(DishesearchModel model) + + public DishViewModel? ReadElement(DishSearchModel model) { if (model == null) { throw new ArgumentNullException(nameof(model)); } _logger.LogInformation("ReadElement. DishName:{DishName}. Id:{Id}", model.DishName, model.Id); - var element = _Dishestorage.GetElement(model); + var element = _dishStorage.GetElement(model); if (element == null) { _logger.LogWarning("ReadElement element not found"); @@ -47,20 +53,22 @@ namespace FoodOrdersBusinessLogic.BusinessLogics _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); return element; } + public bool Create(DishBindingModel model) { CheckModel(model); - if (_Dishestorage.Insert(model) == null) + if (_dishStorage.Insert(model) == null) { _logger.LogWarning("Insert operation failed"); return false; } return true; } + public bool Update(DishBindingModel model) { CheckModel(model); - if (_Dishestorage.Update(model) == null) + if (_dishStorage.Update(model) == null) { _logger.LogWarning("Update operation failed"); return false; @@ -71,15 +79,14 @@ namespace FoodOrdersBusinessLogic.BusinessLogics { CheckModel(model, false); _logger.LogInformation("Delete. Id:{Id}", model.Id); - if (_Dishestorage.Delete(model) == null) + if (_dishStorage.Delete(model) == null) { _logger.LogWarning("Delete operation failed"); return false; } return true; } - private void CheckModel(DishBindingModel model, bool withParams = - true) + private void CheckModel(DishBindingModel model, bool withParams = true) { if (model == null) { @@ -91,22 +98,21 @@ namespace FoodOrdersBusinessLogic.BusinessLogics } if (string.IsNullOrEmpty(model.DishName)) { - throw new ArgumentNullException("Нет названия компонента", - nameof(model.DishName)); + throw new ArgumentNullException("Нет названия компонента", nameof(model.DishName)); } - if (model.Cost <= 0) + if (model.Price <= 0) { - throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); + throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Price)); } - _logger.LogInformation("Dish. DishName:{DishName}. Cost:{ Cost}. Id:{Id}", model.DishName, model.Cost, model.Id); - var element = _Dishestorage.GetElement(new DishesearchModel - { - DishName = model.DishName - }); + _logger.LogInformation("Dish. DishName:{DishName}. Price:{Price}. Id:{Id}", model.DishName, model.Price, model.Id); + var element = _dishStorage.GetElement(new DishSearchModel + { + DishName = model.DishName + }); if (element != null && element.Id != model.Id) { - throw new InvalidOperationException("Компонент с таким названием уже есть"); + throw new InvalidOperationException("Прдукт с таким названием уже есть"); } } } -} \ No newline at end of file +} diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs index 3b5d77c..c63cd43 100644 --- a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs @@ -20,7 +20,7 @@ namespace FoodOrdersBusinessLogic.BusinessLogics public List? ReadList(OrderSearchModel? model) { - _logger.LogInformation("ReadList. DishName:{DishName}. Id:{Id}", model?.Id); + _logger.LogInformation("ReadList. ComponentName:{ComponentName}. Id:{Id}", model?.Id); var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); if (list == null) @@ -87,7 +87,7 @@ namespace FoodOrdersBusinessLogic.BusinessLogics { throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); } - _logger.LogInformation("Order. OrderID:{Id}. Sum:{ Sum}. SetOfDishesId: { SetOfDishesId}", model.Id, model.Sum, model.Id); + _logger.LogInformation("Order. OrderID:{Id}. Sum:{ Sum}. DishId: { DishId}", model.Id, model.Sum, model.Id); } //??? diff --git a/FoodOrders/FoodOrdersContracts/BindingModels/ComponentBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/ComponentBindingModel.cs new file mode 100644 index 0000000..9bd6f2d --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/BindingModels/ComponentBindingModel.cs @@ -0,0 +1,11 @@ +using FoodOrdersDataModels.Models; + +namespace FoodOrdersContracts.BindingModels +{ + public class ComponentBindingModel : IComponentModel + { + public int Id { get; set; } + public string ComponentName { get; set; } = string.Empty; + public double Cost { get; set; } + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/BindingModels/DishBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/DishBindingModel.cs index bcbbf41..982fcce 100644 --- a/FoodOrders/FoodOrdersContracts/BindingModels/DishBindingModel.cs +++ b/FoodOrders/FoodOrdersContracts/BindingModels/DishBindingModel.cs @@ -6,6 +6,11 @@ namespace FoodOrdersContracts.BindingModels { public int Id { get; set; } public string DishName { get; set; } = string.Empty; - public double Cost { get; set; } + public double Price { get; set; } + public Dictionary DishComponents + { + get; + set; + } = new(); } -} \ No newline at end of file +} diff --git a/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs index 5a6072e..3da89d2 100644 --- a/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs +++ b/FoodOrders/FoodOrdersContracts/BindingModels/OrderBindingModel.cs @@ -6,8 +6,8 @@ namespace FoodOrdersContracts.BindingModels public class OrderBindingModel : IOrderModel { public int Id { get; set; } - public int SetOfDishesId { get; set; } - public string SetOfDishesName { get; set; } = string.Empty; + public int DishId { get; set; } + public string DishName { get; set; } = string.Empty; public int Count { get; set; } public double Sum { get; set; } public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; diff --git a/FoodOrders/FoodOrdersContracts/BindingModels/SetOfDishesBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/SetOfDishesBindingModel.cs deleted file mode 100644 index f02f6de..0000000 --- a/FoodOrders/FoodOrdersContracts/BindingModels/SetOfDishesBindingModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using FoodOrdersDataModels.Models; - -namespace FoodOrdersContracts.BindingModels -{ - public class SetOfDishesBindingModel : ISetOfDishesModel - { - public int Id { get; set; } - public string SetOfDishesName { get; set; } = string.Empty; - public double Price { get; set; } - public Dictionary SetOfDishesDishes - { - get; - set; - } = new(); - } -} diff --git a/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IComponentLogic.cs b/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IComponentLogic.cs new file mode 100644 index 0000000..2e830fd --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IComponentLogic.cs @@ -0,0 +1,15 @@ +using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.SearchModels; +using FoodOrdersContracts.ViewModels; + +namespace FoodOrdersContracts.BusinessLogicsContracts +{ + public interface IComponentLogic + { + List? ReadList(ComponentSearchModel? model); + ComponentViewModel? ReadElement(ComponentSearchModel model); + bool Create(ComponentBindingModel model); + bool Update(ComponentBindingModel model); + bool Delete(ComponentBindingModel model); + } +} diff --git a/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IDishLogic.cs b/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IDishLogic.cs index 974f2b3..8051e71 100644 --- a/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IDishLogic.cs +++ b/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IDishLogic.cs @@ -6,10 +6,10 @@ namespace FoodOrdersContracts.BusinessLogicsContracts { public interface IDishLogic { - List? ReadList(DishesearchModel? model); - DishViewModel? ReadElement(DishesearchModel model); + List? ReadList(DishSearchModel? model); + DishViewModel? ReadElement(DishSearchModel model); bool Create(DishBindingModel model); bool Update(DishBindingModel model); bool Delete(DishBindingModel model); } -} +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/ISetOfDishesLogic.cs b/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/ISetOfDishesLogic.cs deleted file mode 100644 index a488572..0000000 --- a/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/ISetOfDishesLogic.cs +++ /dev/null @@ -1,15 +0,0 @@ -using FoodOrdersContracts.BindingModels; -using FoodOrdersContracts.SearchModels; -using FoodOrdersContracts.ViewModels; - -namespace FoodOrdersContracts.BusinessLogicsContracts -{ - public interface ISetOfDishesLogic - { - List? ReadList(SetOfDishesearchModel? model); - SetOfDishesViewModel? ReadElement(SetOfDishesearchModel model); - bool Create(SetOfDishesBindingModel model); - bool Update(SetOfDishesBindingModel model); - bool Delete(SetOfDishesBindingModel model); - } -} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/SearchModels/SetOfDishesSearchModel.cs b/FoodOrders/FoodOrdersContracts/SearchModels/ComponentSearchModel.cs similarity index 52% rename from FoodOrders/FoodOrdersContracts/SearchModels/SetOfDishesSearchModel.cs rename to FoodOrders/FoodOrdersContracts/SearchModels/ComponentSearchModel.cs index 891bbbc..2b83bb5 100644 --- a/FoodOrders/FoodOrdersContracts/SearchModels/SetOfDishesSearchModel.cs +++ b/FoodOrders/FoodOrdersContracts/SearchModels/ComponentSearchModel.cs @@ -1,9 +1,9 @@  namespace FoodOrdersContracts.SearchModels { - public class SetOfDishesearchModel + public class ComponentSearchModel { public int? Id { get; set; } - public string? SetOfDishesName { get; set; } + public string? ComponentName { get; set; } } } diff --git a/FoodOrders/FoodOrdersContracts/SearchModels/DishSearchModel.cs b/FoodOrders/FoodOrdersContracts/SearchModels/DishSearchModel.cs index 0669660..4adf0e1 100644 --- a/FoodOrders/FoodOrdersContracts/SearchModels/DishSearchModel.cs +++ b/FoodOrders/FoodOrdersContracts/SearchModels/DishSearchModel.cs @@ -1,7 +1,7 @@  namespace FoodOrdersContracts.SearchModels { - public class DishesearchModel + public class DishSearchModel { public int? Id { get; set; } public string? DishName { get; set; } diff --git a/FoodOrders/FoodOrdersContracts/StoragesContracts/IComponentStorage.cs b/FoodOrders/FoodOrdersContracts/StoragesContracts/IComponentStorage.cs new file mode 100644 index 0000000..d86f0cf --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/StoragesContracts/IComponentStorage.cs @@ -0,0 +1,16 @@ +using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.SearchModels; +using FoodOrdersContracts.ViewModels; + +namespace FoodOrdersContracts.StoragesContracts +{ + public interface IComponentStorage + { + List GetFullList(); + List GetFilteredList(ComponentSearchModel model); + ComponentViewModel? GetElement(ComponentSearchModel model); + ComponentViewModel? Insert(ComponentBindingModel model); + ComponentViewModel? Update(ComponentBindingModel model); + ComponentViewModel? Delete(ComponentBindingModel model); + } +} diff --git a/FoodOrders/FoodOrdersContracts/StoragesContracts/IDishStorage.cs b/FoodOrders/FoodOrdersContracts/StoragesContracts/IDishStorage.cs index f87eeb4..1e95068 100644 --- a/FoodOrders/FoodOrdersContracts/StoragesContracts/IDishStorage.cs +++ b/FoodOrders/FoodOrdersContracts/StoragesContracts/IDishStorage.cs @@ -4,13 +4,13 @@ using FoodOrdersContracts.ViewModels; namespace FoodOrdersContracts.StoragesContracts { - public interface IDishestorage + public interface IDishStorage { List GetFullList(); - List GetFilteredList(DishesearchModel model); - DishViewModel? GetElement(DishesearchModel model); + List GetFilteredList(DishSearchModel model); + DishViewModel? GetElement(DishSearchModel model); DishViewModel? Insert(DishBindingModel model); DishViewModel? Update(DishBindingModel model); DishViewModel? Delete(DishBindingModel model); } -} +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/StoragesContracts/ISetOfDishesStorage.cs b/FoodOrders/FoodOrdersContracts/StoragesContracts/ISetOfDishesStorage.cs deleted file mode 100644 index fbff2f5..0000000 --- a/FoodOrders/FoodOrdersContracts/StoragesContracts/ISetOfDishesStorage.cs +++ /dev/null @@ -1,16 +0,0 @@ -using FoodOrdersContracts.BindingModels; -using FoodOrdersContracts.SearchModels; -using FoodOrdersContracts.ViewModels; - -namespace FoodOrdersContracts.StoragesContracts -{ - public interface ISetOfDishestorage - { - List GetFullList(); - List GetFilteredList(SetOfDishesearchModel model); - SetOfDishesViewModel? GetElement(SetOfDishesearchModel model); - SetOfDishesViewModel? Insert(SetOfDishesBindingModel model); - SetOfDishesViewModel? Update(SetOfDishesBindingModel model); - SetOfDishesViewModel? Delete(SetOfDishesBindingModel model); - } -} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs new file mode 100644 index 0000000..a569dba --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs @@ -0,0 +1,13 @@ +using FoodOrdersDataModels.Models; +using System.ComponentModel; +namespace FoodOrdersContracts.ViewModels +{ + public class ComponentViewModel : IComponentModel + { + public int Id { get; set; } + [DisplayName("Название компонента")] + public string ComponentName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Cost { get; set; } + } +} diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs index fb95a51..76e4723 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs @@ -1,13 +1,15 @@ using FoodOrdersDataModels.Models; using System.ComponentModel; + namespace FoodOrdersContracts.ViewModels { public class DishViewModel : IDishModel { public int Id { get; set; } - [DisplayName("Название компонента")] + [DisplayName("Название изделия")] public string DishName { get; set; } = string.Empty; [DisplayName("Цена")] - public double Cost { get; set; } + public double Price { get; set; } + public Dictionary DishComponents {get; set;} = new(); } } diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs index d1aa039..de316fa 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs @@ -8,10 +8,10 @@ namespace FoodOrdersContracts.ViewModels [DisplayName("Номер")] public int Id { get; set; } - public int SetOfDishesId { get; set; } + public int DishId { get; set; } [DisplayName("Изделие")] - public string SetOfDishesName { get; set; } = string.Empty; + public string DishName { get; set; } = string.Empty; [DisplayName("Количество")] public int Count { get; set; } diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/SetOfDishesViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/SetOfDishesViewModel.cs deleted file mode 100644 index 7ddda80..0000000 --- a/FoodOrders/FoodOrdersContracts/ViewModels/SetOfDishesViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using FoodOrdersDataModels.Models; -using System.ComponentModel; - -namespace FoodOrdersContracts.ViewModels -{ - public class SetOfDishesViewModel : ISetOfDishesModel - { - public int Id { get; set; } - [DisplayName("Название изделия")] - public string SetOfDishesName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary SetOfDishesDishes {get; set;} = new(); - } -} diff --git a/FoodOrders/FoodOrdersDataModels/IComponentModel.cs b/FoodOrders/FoodOrdersDataModels/IComponentModel.cs new file mode 100644 index 0000000..2e2e443 --- /dev/null +++ b/FoodOrders/FoodOrdersDataModels/IComponentModel.cs @@ -0,0 +1,9 @@ + +namespace FoodOrdersDataModels.Models +{ + public interface IComponentModel : IId + { + string ComponentName { get; } + double Cost { get; } + } +} diff --git a/FoodOrders/FoodOrdersDataModels/IDishModel.cs b/FoodOrders/FoodOrdersDataModels/IDishModel.cs index 2d41383..cca6f22 100644 --- a/FoodOrders/FoodOrdersDataModels/IDishModel.cs +++ b/FoodOrders/FoodOrdersDataModels/IDishModel.cs @@ -4,6 +4,7 @@ namespace FoodOrdersDataModels.Models public interface IDishModel : IId { string DishName { get; } - double Cost { get; } + double Price { get; } + Dictionary DishComponents { get; } } } diff --git a/FoodOrders/FoodOrdersDataModels/IOrderModel.cs b/FoodOrders/FoodOrdersDataModels/IOrderModel.cs index d43445f..134fd34 100644 --- a/FoodOrders/FoodOrdersDataModels/IOrderModel.cs +++ b/FoodOrders/FoodOrdersDataModels/IOrderModel.cs @@ -4,7 +4,7 @@ namespace FoodOrdersDataModels.Models { public interface IOrderModel : IId { - int SetOfDishesId { get; } + int DishId { get; } int Count { get; } double Sum { get; } OrderStatus Status { get; } diff --git a/FoodOrders/FoodOrdersDataModels/ISetOfDishesModel.cs b/FoodOrders/FoodOrdersDataModels/ISetOfDishesModel.cs deleted file mode 100644 index 62fd3b9..0000000 --- a/FoodOrders/FoodOrdersDataModels/ISetOfDishesModel.cs +++ /dev/null @@ -1,10 +0,0 @@ - -namespace FoodOrdersDataModels.Models -{ - public interface ISetOfDishesModel : IId - { - string SetOfDishesName { get; } - double Price { get; } - Dictionary SetOfDishesDishes { get; } - } -} diff --git a/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs b/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs index 9b7d06d..d8e4c35 100644 --- a/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs +++ b/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs @@ -5,14 +5,14 @@ namespace FoodOrdersListImplement public class DataListSingleton { private static DataListSingleton? _instance; - public List Dishes { get; set; } + public List Components { get; set; } public List Orders { get; set; } - public List SetOfDishes { get; set; } + public List Dish { get; set; } private DataListSingleton() { - Dishes = new List(); + Components = new List(); Orders = new List(); - SetOfDishes = new List(); + Dish = new List(); } public static DataListSingleton GetInstance() { diff --git a/FoodOrders/FoodOrdersListImplement/Implements/ComponentStorage.cs b/FoodOrders/FoodOrdersListImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..d8ba6cb --- /dev/null +++ b/FoodOrders/FoodOrdersListImplement/Implements/ComponentStorage.cs @@ -0,0 +1,103 @@ +using FoodOrdersListImplement.Models; +using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.SearchModels; +using FoodOrdersContracts.StoragesContracts; +using FoodOrdersContracts.ViewModels; + +namespace FoodOrdersListImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataListSingleton _source; + public ComponentStorage() + { + _source = DataListSingleton.GetInstance(); + } + public List GetFullList() + { + var result = new List(); + foreach (var component in _source.Components) + { + result.Add(component.GetViewModel); + } + return result; + } + public List GetFilteredList(ComponentSearchModel + model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ComponentName)) + { + return result; + } + foreach (var component in _source.Components) + { + if (component.ComponentName.Contains(model.ComponentName)) + { + result.Add(component.GetViewModel); + } + } + return result; + } + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + foreach (var component in _source.Components) + { + if ((!string.IsNullOrEmpty(model.ComponentName) && + component.ComponentName == model.ComponentName) || + (model.Id.HasValue && component.Id == model.Id)) + { + return component.GetViewModel; + } + } + return null; + } + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = 1; + foreach (var component in _source.Components) + { + if (model.Id <= component.Id) + { + model.Id = component.Id + 1; + } + } + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + _source.Components.Add(newComponent); + return newComponent.GetViewModel; + } + public ComponentViewModel? Update(ComponentBindingModel model) + { + foreach (var component in _source.Components) + { + if (component.Id == model.Id) + { + component.Update(model); + return component.GetViewModel; + } + } + return null; + } + public ComponentViewModel? Delete(ComponentBindingModel model) + { + for (int i = 0; i < _source.Components.Count; ++i) + { + if (_source.Components[i].Id == model.Id) + { + var element = _source.Components[i]; + _source.Components.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersListImplement/Implements/DishStorage.cs b/FoodOrders/FoodOrdersListImplement/Implements/DishStorage.cs index c784e65..c751142 100644 --- a/FoodOrders/FoodOrdersListImplement/Implements/DishStorage.cs +++ b/FoodOrders/FoodOrdersListImplement/Implements/DishStorage.cs @@ -6,23 +6,23 @@ using FoodOrdersContracts.ViewModels; namespace FoodOrdersListImplement.Implements { - public class Dishestorage : IDishestorage + public class DishStorage : IDishStorage { private readonly DataListSingleton _source; - public Dishestorage() + public DishStorage() { _source = DataListSingleton.GetInstance(); } public List GetFullList() { var result = new List(); - foreach (var dish in _source.Dishes) + foreach (var dish in _source.Dish) { result.Add(dish.GetViewModel); } return result; } - public List GetFilteredList(DishesearchModel + public List GetFilteredList(DishSearchModel model) { var result = new List(); @@ -30,7 +30,7 @@ namespace FoodOrdersListImplement.Implements { return result; } - foreach (var dish in _source.Dishes) + foreach (var dish in _source.Dish) { if (dish.DishName.Contains(model.DishName)) { @@ -39,13 +39,13 @@ namespace FoodOrdersListImplement.Implements } return result; } - public DishViewModel? GetElement(DishesearchModel model) + public DishViewModel? GetElement(DishSearchModel model) { if (string.IsNullOrEmpty(model.DishName) && !model.Id.HasValue) { return null; } - foreach (var dish in _source.Dishes) + foreach (var dish in _source.Dish) { if ((!string.IsNullOrEmpty(model.DishName) && dish.DishName == model.DishName) || @@ -59,7 +59,7 @@ namespace FoodOrdersListImplement.Implements public DishViewModel? Insert(DishBindingModel model) { model.Id = 1; - foreach (var dish in _source.Dishes) + foreach (var dish in _source.Dish) { if (model.Id <= dish.Id) { @@ -71,12 +71,12 @@ namespace FoodOrdersListImplement.Implements { return null; } - _source.Dishes.Add(newDish); + _source.Dish.Add(newDish); return newDish.GetViewModel; } public DishViewModel? Update(DishBindingModel model) { - foreach (var dish in _source.Dishes) + foreach (var dish in _source.Dish) { if (dish.Id == model.Id) { @@ -88,12 +88,12 @@ namespace FoodOrdersListImplement.Implements } public DishViewModel? Delete(DishBindingModel model) { - for (int i = 0; i < _source.Dishes.Count; ++i) + for (int i = 0; i < _source.Dish.Count; ++i) { - if (_source.Dishes[i].Id == model.Id) + if (_source.Dish[i].Id == model.Id) { - var element = _source.Dishes[i]; - _source.Dishes.RemoveAt(i); + var element = _source.Dish[i]; + _source.Dish.RemoveAt(i); return element.GetViewModel; } } diff --git a/FoodOrders/FoodOrdersListImplement/Implements/SetOfDishesStorage.cs b/FoodOrders/FoodOrdersListImplement/Implements/SetOfDishesStorage.cs deleted file mode 100644 index cefc7bb..0000000 --- a/FoodOrders/FoodOrdersListImplement/Implements/SetOfDishesStorage.cs +++ /dev/null @@ -1,103 +0,0 @@ -using FoodOrdersListImplement.Models; -using FoodOrdersContracts.BindingModels; -using FoodOrdersContracts.SearchModels; -using FoodOrdersContracts.StoragesContracts; -using FoodOrdersContracts.ViewModels; - -namespace FoodOrdersListImplement.Implements -{ - public class SetOfDishestorage : ISetOfDishestorage - { - private readonly DataListSingleton _source; - public SetOfDishestorage() - { - _source = DataListSingleton.GetInstance(); - } - public List GetFullList() - { - var result = new List(); - foreach (var set_of_dishes in _source.SetOfDishes) - { - result.Add(set_of_dishes.GetViewModel); - } - return result; - } - public List GetFilteredList(SetOfDishesearchModel - model) - { - var result = new List(); - if (string.IsNullOrEmpty(model.SetOfDishesName)) - { - return result; - } - foreach (var set_of_dishes in _source.SetOfDishes) - { - if (set_of_dishes.SetOfDishesName.Contains(model.SetOfDishesName)) - { - result.Add(set_of_dishes.GetViewModel); - } - } - return result; - } - public SetOfDishesViewModel? GetElement(SetOfDishesearchModel model) - { - if (string.IsNullOrEmpty(model.SetOfDishesName) && !model.Id.HasValue) - { - return null; - } - foreach (var set_of_dishes in _source.SetOfDishes) - { - if ((!string.IsNullOrEmpty(model.SetOfDishesName) && - set_of_dishes.SetOfDishesName == model.SetOfDishesName) || - (model.Id.HasValue && set_of_dishes.Id == model.Id)) - { - return set_of_dishes.GetViewModel; - } - } - return null; - } - public SetOfDishesViewModel? Insert(SetOfDishesBindingModel model) - { - model.Id = 1; - foreach (var set_of_dishes in _source.SetOfDishes) - { - if (model.Id <= set_of_dishes.Id) - { - model.Id = set_of_dishes.Id + 1; - } - } - var newSetOfDishes = SetOfDishes.Create(model); - if (newSetOfDishes == null) - { - return null; - } - _source.SetOfDishes.Add(newSetOfDishes); - return newSetOfDishes.GetViewModel; - } - public SetOfDishesViewModel? Update(SetOfDishesBindingModel model) - { - foreach (var set_of_dishes in _source.SetOfDishes) - { - if (set_of_dishes.Id == model.Id) - { - set_of_dishes.Update(model); - return set_of_dishes.GetViewModel; - } - } - return null; - } - public SetOfDishesViewModel? Delete(SetOfDishesBindingModel model) - { - for (int i = 0; i < _source.SetOfDishes.Count; ++i) - { - if (_source.SetOfDishes[i].Id == model.Id) - { - var element = _source.SetOfDishes[i]; - _source.SetOfDishes.RemoveAt(i); - return element.GetViewModel; - } - } - return null; - } - } -} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersListImplement/Models/Component.cs b/FoodOrders/FoodOrdersListImplement/Models/Component.cs new file mode 100644 index 0000000..2510fb9 --- /dev/null +++ b/FoodOrders/FoodOrdersListImplement/Models/Component.cs @@ -0,0 +1,41 @@ +using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.ViewModels; +using FoodOrdersDataModels.Models; + +namespace FoodOrdersListImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private set; } = string.Empty; + public double Cost { get; set; } + public static Component? Create(ComponentBindingModel? model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public void Update(ComponentBindingModel? model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersListImplement/Models/Dish.cs b/FoodOrders/FoodOrdersListImplement/Models/Dish.cs index 63f86ab..f9d40a4 100644 --- a/FoodOrders/FoodOrdersListImplement/Models/Dish.cs +++ b/FoodOrders/FoodOrdersListImplement/Models/Dish.cs @@ -8,7 +8,12 @@ namespace FoodOrdersListImplement.Models { public int Id { get; private set; } public string DishName { get; private set; } = string.Empty; - public double Cost { get; set; } + public double Price { get; private set; } + public Dictionary DishComponents + { + get; + private set; + } = new Dictionary(); public static Dish? Create(DishBindingModel? model) { if (model == null) @@ -19,7 +24,8 @@ namespace FoodOrdersListImplement.Models { Id = model.Id, DishName = model.DishName, - Cost = model.Cost + Price = model.Price, + DishComponents = model.DishComponents }; } public void Update(DishBindingModel? model) @@ -29,13 +35,15 @@ namespace FoodOrdersListImplement.Models return; } DishName = model.DishName; - Cost = model.Cost; + Price = model.Price; + DishComponents = model.DishComponents; } public DishViewModel GetViewModel => new() { Id = Id, DishName = DishName, - Cost = Cost + Price = Price, + DishComponents = DishComponents }; } } \ No newline at end of file diff --git a/FoodOrders/FoodOrdersListImplement/Models/Order.cs b/FoodOrders/FoodOrdersListImplement/Models/Order.cs index d7d4981..152eb9b 100644 --- a/FoodOrders/FoodOrdersListImplement/Models/Order.cs +++ b/FoodOrders/FoodOrdersListImplement/Models/Order.cs @@ -9,8 +9,8 @@ namespace FoodOrdersListImplement.Models public class Order : IOrderModel { public int Id { get; private set; } - public int SetOfDishesId { get; private set; } - public string SetOfDishesName { get; private set; } = string.Empty; + public int DishId { get; private set; } + public string DishName { get; private set; } = string.Empty; public int Count { get; private set; } public double Sum { get; private set; } public OrderStatus Status { get; private set; } @@ -26,8 +26,8 @@ namespace FoodOrdersListImplement.Models return new Order() { Id = model.Id, - SetOfDishesId = model.SetOfDishesId, - SetOfDishesName = model.SetOfDishesName, + DishId = model.DishId, + DishName = model.DishName, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -41,8 +41,8 @@ namespace FoodOrdersListImplement.Models { return; } - SetOfDishesId = model.SetOfDishesId; - SetOfDishesName = model.SetOfDishesName; + DishId = model.DishId; + DishName = model.DishName; Count = model.Count; Sum = model.Sum; Status = model.Status; @@ -52,8 +52,8 @@ namespace FoodOrdersListImplement.Models public OrderViewModel GetViewModel => new() { Id = Id, - SetOfDishesId = SetOfDishesId, - SetOfDishesName = SetOfDishesName, + DishId = DishId, + DishName = DishName, Count = Count, Sum = Sum, Status = Status, diff --git a/FoodOrders/FoodOrdersListImplement/Models/Product.cs b/FoodOrders/FoodOrdersListImplement/Models/Product.cs deleted file mode 100644 index 3616b61..0000000 --- a/FoodOrders/FoodOrdersListImplement/Models/Product.cs +++ /dev/null @@ -1,49 +0,0 @@ -using FoodOrdersContracts.BindingModels; -using FoodOrdersContracts.ViewModels; -using FoodOrdersDataModels.Models; - -namespace FoodOrdersListImplement.Models -{ - public class SetOfDishes : ISetOfDishesModel - { - public int Id { get; private set; } - public string SetOfDishesName { get; private set; } = string.Empty; - public double Price { get; private set; } - public Dictionary SetOfDishesDishes - { - get; - private set; - } = new Dictionary(); - public static SetOfDishes? Create(SetOfDishesBindingModel? model) - { - if (model == null) - { - return null; - } - return new SetOfDishes() - { - Id = model.Id, - SetOfDishesName = model.SetOfDishesName, - Price = model.Price, - SetOfDishesDishes = model.SetOfDishesDishes - }; - } - public void Update(SetOfDishesBindingModel? model) - { - if (model == null) - { - return; - } - SetOfDishesName = model.SetOfDishesName; - Price = model.Price; - SetOfDishesDishes = model.SetOfDishesDishes; - } - public SetOfDishesViewModel GetViewModel => new() - { - Id = Id, - SetOfDishesName = SetOfDishesName, - Price = Price, - SetOfDishesDishes = SetOfDishesDishes - }; - } -} \ No newline at end of file