diff --git a/FlowerShop/FlowerShop.sln b/FlowerShop/FlowerShop.sln
index 8c5e4ad..5d03518 100644
--- a/FlowerShop/FlowerShop.sln
+++ b/FlowerShop/FlowerShop.sln
@@ -1,9 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
-VisualStudioVersion = 17.3.32922.545
+VisualStudioVersion = 17.3.32825.248
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowerShop", "FlowerShop\FlowerShop.csproj", "{1E86CFFF-8817-4A8A-B2CB-36062D27AF78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShop", "FlowerShop\FlowerShop.csproj", "{086CB019-AA3B-425A-87B0-26662D1F201F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopDataModels", "FlowerShopDataModels\FlowerShopDataModels.csproj", "{FDC31847-CB24-4EBD-8CE5-852ED404CEAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopContracts", "FlowerShopContracts\FlowerShopContracts.csproj", "{404B251B-7B48-4648-99B4-7E99EDB05A6C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopBusinessLogic", "FlowerShopBusinessLogic\FlowerShopBusinessLogic.csproj", "{D8084C04-7B2B-4C8D-A63A-71A3EE1BC065}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerShopListImplement", "FlowerShopListImplement\FlowerShopListImplement.csproj", "{C58840E6-D68D-476E-AB3A-EB13F1740FC8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowerShopFileImplement", "FlowerShopFileImplement\FlowerShopFileImplement.csproj", "{87156689-2FDA-4065-90CC-749B2FE3C0D6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +21,35 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1E86CFFF-8817-4A8A-B2CB-36062D27AF78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1E86CFFF-8817-4A8A-B2CB-36062D27AF78}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1E86CFFF-8817-4A8A-B2CB-36062D27AF78}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1E86CFFF-8817-4A8A-B2CB-36062D27AF78}.Release|Any CPU.Build.0 = Release|Any CPU
+ {086CB019-AA3B-425A-87B0-26662D1F201F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {086CB019-AA3B-425A-87B0-26662D1F201F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {086CB019-AA3B-425A-87B0-26662D1F201F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {086CB019-AA3B-425A-87B0-26662D1F201F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FDC31847-CB24-4EBD-8CE5-852ED404CEAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FDC31847-CB24-4EBD-8CE5-852ED404CEAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FDC31847-CB24-4EBD-8CE5-852ED404CEAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FDC31847-CB24-4EBD-8CE5-852ED404CEAE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {404B251B-7B48-4648-99B4-7E99EDB05A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {404B251B-7B48-4648-99B4-7E99EDB05A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {404B251B-7B48-4648-99B4-7E99EDB05A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {404B251B-7B48-4648-99B4-7E99EDB05A6C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D8084C04-7B2B-4C8D-A63A-71A3EE1BC065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D8084C04-7B2B-4C8D-A63A-71A3EE1BC065}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D8084C04-7B2B-4C8D-A63A-71A3EE1BC065}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D8084C04-7B2B-4C8D-A63A-71A3EE1BC065}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C58840E6-D68D-476E-AB3A-EB13F1740FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C58840E6-D68D-476E-AB3A-EB13F1740FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C58840E6-D68D-476E-AB3A-EB13F1740FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C58840E6-D68D-476E-AB3A-EB13F1740FC8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {87156689-2FDA-4065-90CC-749B2FE3C0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {87156689-2FDA-4065-90CC-749B2FE3C0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {87156689-2FDA-4065-90CC-749B2FE3C0D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {87156689-2FDA-4065-90CC-749B2FE3C0D6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {8063D56F-9779-4946-90F8-9D2D40447C33}
+ SolutionGuid = {87A821F8-2466-463B-AD75-707A196B0AA3}
EndGlobalSection
EndGlobal
diff --git a/FlowerShop/FlowerShop/FlowerShop.csproj b/FlowerShop/FlowerShop/FlowerShop.csproj
index 132c02c..9a6165d 100644
--- a/FlowerShop/FlowerShop/FlowerShop.csproj
+++ b/FlowerShop/FlowerShop/FlowerShop.csproj
@@ -1,9 +1,24 @@
-
+
- net6.0
- enable
+ WinExe
+ net6.0-windows
enable
+ true
+ enable
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FlowerShop/FlowerShop/FormBouquetComponent.Designer.cs b/FlowerShop/FlowerShop/FormBouquetComponent.Designer.cs
new file mode 100644
index 0000000..7ef6205
--- /dev/null
+++ b/FlowerShop/FlowerShop/FormBouquetComponent.Designer.cs
@@ -0,0 +1,126 @@
+namespace FlowerShop
+{
+ partial class FormBouquetComponent
+ {
+ ///
+ /// 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.comboBoxComponent = new System.Windows.Forms.ComboBox();
+ this.textBoxCount = new System.Windows.Forms.TextBox();
+ this.labelComponent = new System.Windows.Forms.Label();
+ this.labelCount = new System.Windows.Forms.Label();
+ this.buttonSave = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // comboBoxComponent
+ //
+ this.comboBoxComponent.FormattingEnabled = true;
+ this.comboBoxComponent.Location = new System.Drawing.Point(104, 6);
+ this.comboBoxComponent.Margin = new System.Windows.Forms.Padding(2);
+ this.comboBoxComponent.Name = "comboBoxComponent";
+ this.comboBoxComponent.Size = new System.Drawing.Size(129, 23);
+ this.comboBoxComponent.TabIndex = 0;
+ //
+ // textBoxCount
+ //
+ this.textBoxCount.Location = new System.Drawing.Point(104, 32);
+ this.textBoxCount.Margin = new System.Windows.Forms.Padding(2);
+ this.textBoxCount.Name = "textBoxCount";
+ this.textBoxCount.Size = new System.Drawing.Size(129, 23);
+ this.textBoxCount.TabIndex = 1;
+ //
+ // labelComponent
+ //
+ this.labelComponent.AutoSize = true;
+ this.labelComponent.Location = new System.Drawing.Point(11, 11);
+ this.labelComponent.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelComponent.Name = "labelComponent";
+ this.labelComponent.Size = new System.Drawing.Size(69, 15);
+ this.labelComponent.TabIndex = 2;
+ this.labelComponent.Text = "Компонент";
+ //
+ // labelCount
+ //
+ this.labelCount.AutoSize = true;
+ this.labelCount.Location = new System.Drawing.Point(11, 34);
+ this.labelCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelCount.Name = "labelCount";
+ this.labelCount.Size = new System.Drawing.Size(75, 15);
+ this.labelCount.TabIndex = 3;
+ this.labelCount.Text = "Количество ";
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(102, 61);
+ this.buttonSave.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(78, 25);
+ this.buttonSave.TabIndex = 4;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(184, 61);
+ this.buttonCancel.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(78, 25);
+ this.buttonCancel.TabIndex = 5;
+ this.buttonCancel.Text = "Отменить";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+ //
+ // FormBouquetComponent
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(273, 97);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonSave);
+ this.Controls.Add(this.labelCount);
+ this.Controls.Add(this.labelComponent);
+ this.Controls.Add(this.textBoxCount);
+ this.Controls.Add(this.comboBoxComponent);
+ this.Margin = new System.Windows.Forms.Padding(2);
+ this.Name = "FormBouquetComponent";
+ this.Text = "Компонент букета";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private ComboBox comboBoxComponent;
+ private TextBox textBoxCount;
+ private Label labelComponent;
+ private Label labelCount;
+ private Button buttonSave;
+ private Button buttonCancel;
+ }
+}
\ No newline at end of file
diff --git a/FlowerShop/FlowerShop/FormComponent.Designer.cs b/FlowerShop/FlowerShop/FormComponent.Designer.cs
new file mode 100644
index 0000000..b37a218
--- /dev/null
+++ b/FlowerShop/FlowerShop/FormComponent.Designer.cs
@@ -0,0 +1,126 @@
+namespace FlowerShop
+{
+ partial class FormComponent
+ {
+ ///
+ /// 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.buttonSave = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.labelName = new System.Windows.Forms.Label();
+ this.labelCost = new System.Windows.Forms.Label();
+ this.textBoxName = new System.Windows.Forms.TextBox();
+ this.textBoxCost = new System.Windows.Forms.TextBox();
+ this.SuspendLayout();
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(135, 73);
+ this.buttonSave.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(78, 26);
+ this.buttonSave.TabIndex = 0;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(227, 73);
+ this.buttonCancel.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(78, 26);
+ this.buttonCancel.TabIndex = 1;
+ this.buttonCancel.Text = "Отменить";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+ //
+ // labelName
+ //
+ this.labelName.AutoSize = true;
+ this.labelName.Location = new System.Drawing.Point(17, 8);
+ this.labelName.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelName.Name = "labelName";
+ this.labelName.Size = new System.Drawing.Size(59, 15);
+ this.labelName.TabIndex = 2;
+ this.labelName.Text = "Название";
+ //
+ // labelCost
+ //
+ this.labelCost.AutoSize = true;
+ this.labelCost.Location = new System.Drawing.Point(17, 38);
+ this.labelCost.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelCost.Name = "labelCost";
+ this.labelCost.Size = new System.Drawing.Size(35, 15);
+ this.labelCost.TabIndex = 3;
+ this.labelCost.Text = "Цена";
+ //
+ // textBoxName
+ //
+ this.textBoxName.Location = new System.Drawing.Point(76, 6);
+ this.textBoxName.Margin = new System.Windows.Forms.Padding(2);
+ this.textBoxName.Name = "textBoxName";
+ this.textBoxName.Size = new System.Drawing.Size(208, 23);
+ this.textBoxName.TabIndex = 4;
+ //
+ // textBoxCost
+ //
+ this.textBoxCost.Location = new System.Drawing.Point(76, 35);
+ this.textBoxCost.Margin = new System.Windows.Forms.Padding(2);
+ this.textBoxCost.Name = "textBoxCost";
+ this.textBoxCost.Size = new System.Drawing.Size(208, 23);
+ this.textBoxCost.TabIndex = 5;
+ //
+ // FormComponent
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(316, 110);
+ this.Controls.Add(this.textBoxCost);
+ this.Controls.Add(this.textBoxName);
+ this.Controls.Add(this.labelCost);
+ this.Controls.Add(this.labelName);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonSave);
+ this.Margin = new System.Windows.Forms.Padding(2);
+ this.Name = "FormComponent";
+ this.Text = "Компонент";
+ this.Load += new System.EventHandler(this.FormComponent_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private Button buttonSave;
+ private Button buttonCancel;
+ private Label labelName;
+ private Label labelCost;
+ private TextBox textBoxName;
+ private TextBox textBoxCost;
+ }
+}
\ No newline at end of file
diff --git a/FlowerShop/FlowerShop/FormMain.Designer.cs b/FlowerShop/FlowerShop/FormMain.Designer.cs
index f962aca..6a02953 100644
--- a/FlowerShop/FlowerShop/FormMain.Designer.cs
+++ b/FlowerShop/FlowerShop/FormMain.Designer.cs
@@ -35,9 +35,9 @@
this.buttonPut = new System.Windows.Forms.Button();
this.buttonRefresh = new System.Windows.Forms.Button();
this.menuStrip = new System.Windows.Forms.MenuStrip();
- this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.guidesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.componentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.bouquetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.menuStrip.SuspendLayout();
this.SuspendLayout();
@@ -112,7 +112,7 @@
//
this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.справочникиToolStripMenuItem});
+ this.guidesToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
this.menuStrip.Padding = new System.Windows.Forms.Padding(4, 1, 0, 1);
@@ -120,28 +120,28 @@
this.menuStrip.TabIndex = 6;
this.menuStrip.Text = "menuStrip1";
//
- // справочникиToolStripMenuItem
+ // guidesToolStripMenuItem
//
- this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.компонентыToolStripMenuItem,
- this.изделияToolStripMenuItem});
- this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
- this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 22);
- this.справочникиToolStripMenuItem.Text = "Справочники";
+ this.guidesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.componentsToolStripMenuItem,
+ this.bouquetsToolStripMenuItem});
+ this.guidesToolStripMenuItem.Name = "guidesToolStripMenuItem";
+ this.guidesToolStripMenuItem.Size = new System.Drawing.Size(94, 22);
+ this.guidesToolStripMenuItem.Text = "Справочники";
//
- // компонентыToolStripMenuItem
+ // componentsToolStripMenuItem
//
- this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
- this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
- this.компонентыToolStripMenuItem.Text = "Компоненты";
- this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.componentsToolStripMenuItem_Click);
+ this.componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
+ this.componentsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.componentsToolStripMenuItem.Text = "Компоненты";
+ this.componentsToolStripMenuItem.Click += new System.EventHandler(this.componentsToolStripMenuItem_Click);
//
- // изделияToolStripMenuItem
+ // bouquetsToolStripMenuItem
//
- this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
- this.изделияToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
- this.изделияToolStripMenuItem.Text = "Букеты";
- this.изделияToolStripMenuItem.Click += new System.EventHandler(this.bouquetsToolStripMenuItem_Click);
+ this.bouquetsToolStripMenuItem.Name = "bouquetsToolStripMenuItem";
+ this.bouquetsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.bouquetsToolStripMenuItem.Text = "Букеты";
+ this.bouquetsToolStripMenuItem.Click += new System.EventHandler(this.bouquetsToolStripMenuItem_Click);
//
// FormMain
//
@@ -176,9 +176,9 @@
private Button buttonPut;
private Button buttonRefresh;
private MenuStrip menuStrip;
- private ToolStripMenuItem справочникиToolStripMenuItem;
- private ToolStripMenuItem компонентыToolStripMenuItem;
- private ToolStripMenuItem изделияToolStripMenuItem;
+ private ToolStripMenuItem guidesToolStripMenuItem;
+ private ToolStripMenuItem componentsToolStripMenuItem;
+ private ToolStripMenuItem bouquetsToolStripMenuItem;
private Button buttonReady;
}
}
\ No newline at end of file
diff --git a/FlowerShop/FlowerShop/Program.cs b/FlowerShop/FlowerShop/Program.cs
new file mode 100644
index 0000000..e0c73ea
--- /dev/null
+++ b/FlowerShop/FlowerShop/Program.cs
@@ -0,0 +1,47 @@
+using FlowerShopContracts.StoragesContracts;
+using Microsoft.Extensions.DependencyInjection;
+using FlowerShopFileImplement.Implements;
+using FlowerShopBusinessLogic.BusinessLogics;
+using FlowerShopContracts.BusinessLogicsContracts;
+using NLog.Extensions.Logging;
+using Microsoft.Extensions.Logging;
+
+namespace FlowerShop
+{
+ internal static class Program
+ {
+ private static ServiceProvider? _serviceProvider;
+ public static ServiceProvider? ServiceProvider => _serviceProvider;
+
+ [STAThread]
+ static void Main()
+ {
+ ApplicationConfiguration.Initialize();
+ var services = new ServiceCollection();
+ ConfigureServices(services);
+ _serviceProvider = services.BuildServiceProvider();
+ Application.Run(_serviceProvider.GetRequiredService());
+ }
+ private static void ConfigureServices(ServiceCollection services)
+ {
+ services.AddLogging(option =>
+ {
+ 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();
+ }
+ }
+}
\ No newline at end of file
diff --git a/FlowerShop/FlowerShopFileImplement/DataFileSingleton.cs b/FlowerShop/FlowerShopFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..b67f6df
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/DataFileSingleton.cs
@@ -0,0 +1,58 @@
+using FlowerShopFileImplement.Models;
+using System.Xml.Linq;
+
+namespace FlowerShopFileImplement
+{
+ public class DataFileSingleton
+ {
+ private static DataFileSingleton instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private readonly string BouquetFileName = "Bouquet.xml";
+
+ public List Components { get; private set; }
+
+ public List Orders { get; private set; }
+
+ public List Bouquets { get; private set; }
+
+ public static DataFileSingleton GetInstance()
+ {
+ if (instance == null)
+ {
+ instance = new DataFileSingleton();
+ }
+
+ return instance;
+ }
+
+ public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
+ public void SaveBouquets() => SaveData(Bouquets, BouquetFileName, "Bouquets", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+ Bouquets = LoadData(BouquetFileName, "Bouquet", x => Bouquet.Create(x)!)!;
+ Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+ }
+
+ private static List? LoadData(string filename, string xmlNodeName, Func selectFunction)
+ {
+ if (File.Exists(filename))
+ {
+ return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+ }
+
+ return new List();
+ }
+
+ private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction)
+ {
+ if (data != null)
+ {
+ new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
+ }
+ }
+ }
+}
diff --git a/FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj b/FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj
new file mode 100644
index 0000000..ca6fa62
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/FlowerShop/FlowerShopFileImplement/Implements/BouquetStorage.cs b/FlowerShop/FlowerShopFileImplement/Implements/BouquetStorage.cs
new file mode 100644
index 0000000..a1f2468
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/Implements/BouquetStorage.cs
@@ -0,0 +1,85 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.SearchModels;
+using FlowerShopContracts.StoragesContracts;
+using FlowerShopContracts.ViewModels;
+using FlowerShopFileImplement.Models;
+
+namespace FlowerShopFileImplement.Implements
+{
+ public class BouquetStorage : IBouquetStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public BouquetStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public BouquetViewModel? GetElement(BouquetSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.BouquetName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Bouquets.FirstOrDefault(x => (!string.IsNullOrEmpty(model.BouquetName) && x.BouquetName == model.BouquetName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ }
+
+ public List GetFilteredList(BouquetSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.BouquetName))
+ {
+ return new();
+ }
+ return source.Bouquets.Where(x => x.BouquetName.Contains(model.BouquetName)).Select(x => x.GetViewModel).ToList();
+ }
+
+ public List GetFullList()
+ {
+ return source.Bouquets.Select(x => x.GetViewModel).ToList();
+ }
+
+ public BouquetViewModel? Insert(BouquetBindingModel model)
+ {
+ model.Id = source.Bouquets.Count > 0 ? source.Bouquets.Max(x => x.Id) + 1 : 1;
+
+ var newBouquet = Bouquet.Create(model);
+ if (newBouquet == null)
+ {
+ return null;
+ }
+
+ source.Bouquets.Add(newBouquet);
+ source.SaveBouquets();
+
+ return newBouquet.GetViewModel;
+ }
+
+ public BouquetViewModel? Update(BouquetBindingModel model)
+ {
+ var bouquet = source.Bouquets.FirstOrDefault(x => x.Id == model.Id);
+ if (bouquet == null)
+ {
+ return null;
+ }
+
+ bouquet.Update(model);
+ source.SaveBouquets();
+
+ return bouquet.GetViewModel;
+ }
+
+ public BouquetViewModel? Delete(BouquetBindingModel model)
+ {
+ var bouquet = source.Bouquets.FirstOrDefault(x => x.Id == model.Id);
+ if (bouquet == null)
+ {
+ return null;
+ }
+
+ source.Bouquets.Remove(bouquet);
+ source.SaveBouquets();
+
+ return bouquet.GetViewModel;
+ }
+ }
+}
diff --git a/FlowerShop/FlowerShopFileImplement/Implements/ComponentStorage.cs b/FlowerShop/FlowerShopFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..faae0e1
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,88 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.SearchModels;
+using FlowerShopContracts.StoragesContracts;
+using FlowerShopContracts.ViewModels;
+using FlowerShopFileImplement.Models;
+using System.Linq;
+
+namespace FlowerShopFileImplement.Implements
+{
+ public class ComponentStorage : IComponentStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public ComponentStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public ComponentViewModel? GetElement(ComponentSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+
+ return source.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ }
+
+ public List GetFilteredList(ComponentSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ComponentName))
+ {
+ return new();
+ }
+
+ return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
+ }
+
+ public List GetFullList()
+ {
+ return source.Components.Select(x => x.GetViewModel).ToList();
+ }
+
+ public ComponentViewModel? Insert(ComponentBindingModel model)
+ {
+ model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1;
+
+ var newComponent = Component.Create(model);
+ if (newComponent == null)
+ {
+ return null;
+ }
+
+ source.Components.Add(newComponent);
+ source.SaveComponents();
+
+ return newComponent.GetViewModel;
+ }
+
+ public ComponentViewModel? Update(ComponentBindingModel model)
+ {
+ var component = source.Components.FirstOrDefault(x => x.Id == model.Id);
+ if (component == null)
+ {
+ return null;
+ }
+
+ component.Update(model);
+ source.SaveComponents();
+
+ return component.GetViewModel;
+ }
+
+ public ComponentViewModel? Delete(ComponentBindingModel model)
+ {
+ var component = source.Components.FirstOrDefault(x => x.Id == model.Id);
+ if (component == null)
+ {
+ return null;
+ }
+
+ source.Components.Remove(component);
+ source.SaveComponents();
+
+ return component.GetViewModel;
+ }
+ }
+}
diff --git a/FlowerShop/FlowerShopFileImplement/Implements/OrderStorage.cs b/FlowerShop/FlowerShopFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..fba35bf
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,100 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.SearchModels;
+using FlowerShopContracts.StoragesContracts;
+using FlowerShopContracts.ViewModels;
+using FlowerShopFileImplement.Models;
+
+namespace FlowerShopFileImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+
+ return AttachBouquetName(source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel);
+ }
+
+ public List GetFilteredList(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return new();
+ }
+
+ return source.Orders.Where(x => x.Id == model.Id).Select(x => AttachBouquetName(x.GetViewModel)).ToList();
+ }
+
+ public List GetFullList()
+ {
+ return source.Orders.Select(x => x.GetViewModel).ToList();
+ }
+
+ public OrderViewModel? Update(OrderBindingModel model)
+ {
+ var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+ if (order == null)
+ {
+ return null;
+ }
+
+ order.Update(model);
+ source.SaveOrders();
+
+ return AttachBouquetName(order.GetViewModel);
+ }
+
+ public OrderViewModel? Insert(OrderBindingModel model)
+ {
+ model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
+ var newOrder = Order.Create(model);
+
+ if (newOrder == null)
+ {
+ return null;
+ }
+
+ source.Orders.Add(newOrder);
+ source.SaveOrders();
+
+ return newOrder.GetViewModel;
+ }
+
+ public OrderViewModel? Delete(OrderBindingModel model)
+ {
+ var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+ if (order == null)
+ {
+ return null;
+ }
+
+ source.Orders.Remove(order);
+ source.SaveOrders();
+
+ return order.GetViewModel;
+ }
+
+ private OrderViewModel AttachBouquetName(OrderViewModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+
+ var bouquet = source.Bouquets.Find(b => b.Id == model.BouquetId);
+ model.BouquetName = bouquet is null ? String.Empty : bouquet.BouquetName;
+
+ return model;
+ }
+ }
+}
diff --git a/FlowerShop/FlowerShopFileImplement/Models/Bouquet.cs b/FlowerShop/FlowerShopFileImplement/Models/Bouquet.cs
new file mode 100644
index 0000000..45f5ceb
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/Models/Bouquet.cs
@@ -0,0 +1,104 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.ViewModels;
+using FlowerShopDataModels.Models;
+using System.Xml.Linq;
+using System.Linq;
+
+namespace FlowerShopFileImplement.Models
+{
+ public class Bouquet : IBouquetModel
+ {
+ public string BouquetName { get; private set; } = string.Empty;
+
+ public double Price { get; private set; }
+
+ public int Id { get; private set; }
+
+ public Dictionary Components { get; private set; } = new();
+
+ private Dictionary? _bouquetComponents = new();
+
+ public Dictionary BouquetComponents
+ {
+ get
+ {
+ if (_bouquetComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _bouquetComponents = Components.ToDictionary(
+ x => x.Key,
+ y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)
+ );
+ }
+ return _bouquetComponents;
+ }
+ }
+
+ public static Bouquet? Create(BouquetBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+
+ return new Bouquet()
+ {
+ Id = model.Id,
+ BouquetName = model.BouquetName,
+ Price = model.Price,
+ Components = model.BouquetComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+ };
+ }
+
+ public static Bouquet? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+
+ return new Bouquet()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ BouquetName = element.Attribute("BouquetName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components = element.Element("BouquetComponents")!.Elements("BouquetComponent").ToDictionary(
+ x => Convert.ToInt32(x.Element("Key")?.Value),
+ x => Convert.ToInt32(x.Element("Value")?.Value)
+ )
+ };
+ }
+
+ public void Update(BouquetBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+
+ BouquetName = model.BouquetName;
+ Price = model.Price;
+ Components = model.BouquetComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
+ _bouquetComponents = null;
+ }
+
+ public BouquetViewModel GetViewModel => new()
+ {
+ Id = Id,
+ BouquetName = BouquetName,
+ Price = Price,
+ BouquetComponents = BouquetComponents
+ };
+
+ public XElement GetXElement => new(
+ "Bouquet",
+ new XAttribute("Id", Id),
+ new XElement("BouquetName", BouquetName),
+ new XElement("Price", Price.ToString()),
+ new XElement("BouquetComponents", Components.Select(x =>
+ new XElement("BouquetComponent",
+ new XElement("Key", x.Key),
+ new XElement("Value", x.Value))).ToArray())
+ );
+ }
+}
diff --git a/FlowerShop/FlowerShopFileImplement/Models/Component.cs b/FlowerShop/FlowerShopFileImplement/Models/Component.cs
new file mode 100644
index 0000000..cc65f26
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/Models/Component.cs
@@ -0,0 +1,72 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.ViewModels;
+using FlowerShopDataModels.Models;
+using System.Xml.Linq;
+using System.Linq;
+
+namespace FlowerShopFileImplement.Models
+{
+ public class Component : IComponentModel
+ {
+ public string ComponentName { get; private set; } = String.Empty;
+
+ public double Cost { get; set; }
+
+ public int Id { get; private 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 static Component? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+
+ return new Component()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ ComponentName = element.Element("ComponentName")!.Value,
+ Cost = Convert.ToDouble(element.Element("Cost")!.Value)
+ };
+ }
+
+ 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
+ };
+
+ public XElement GetXElement => new(
+ "Component",
+ new XAttribute("Id", Id),
+ new XElement("ComponentName", ComponentName),
+ new XElement("Cost", Cost.ToString())
+ );
+ }
+}
diff --git a/FlowerShop/FlowerShopFileImplement/Models/Order.cs b/FlowerShop/FlowerShopFileImplement/Models/Order.cs
new file mode 100644
index 0000000..8b59378
--- /dev/null
+++ b/FlowerShop/FlowerShopFileImplement/Models/Order.cs
@@ -0,0 +1,101 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.ViewModels;
+using FlowerShopDataModels.Enums;
+using FlowerShopDataModels.Models;
+using System.Xml.Linq;
+
+namespace FlowerShopFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ public int BouquetId { get; private set; }
+
+ public int Count { get; private set; }
+
+ public double Sum { get; private set; }
+
+ public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+
+ public DateTime DateCreate { get; private set; } = DateTime.Now;
+
+ public DateTime? DateImplement { get; private set; }
+
+ public int Id { get; private set; }
+
+ public static Order? Create(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+
+ return new Order
+ {
+ BouquetId = model.BouquetId,
+ Count = model.Count,
+ Sum = model.Sum,
+ Status = model.Status,
+ DateCreate = model.DateCreate,
+ DateImplement = model.DateImplement,
+ Id = model.Id,
+ };
+ }
+
+ public static Order? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+
+ return new Order()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ BouquetId = Convert.ToInt32(element.Element("BouquetId")!.Value),
+ Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+ Count = Convert.ToInt32(element.Element("Count")!.Value),
+ Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+ DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+ DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value)
+ };
+ }
+
+ public void Update(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+
+ BouquetId = model.BouquetId;
+ Count = model.Count;
+ Sum = model.Sum;
+ Status = model.Status;
+ DateCreate = model.DateCreate;
+ DateImplement = model.DateImplement;
+ Id = model.Id;
+ }
+
+ public OrderViewModel GetViewModel => new()
+ {
+ BouquetId = BouquetId,
+ Count = Count,
+ Sum = Sum,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement,
+ Id = Id,
+ Status = Status,
+ };
+
+ public XElement GetXElement => new(
+ "Order",
+ new XAttribute("Id", Id),
+ new XElement("BouquetId", BouquetId.ToString()),
+ new XElement("Count", Count.ToString()),
+ new XElement("Sum", Sum.ToString()),
+ new XElement("Status", Status.ToString()),
+ new XElement("DateCreate", DateCreate.ToString()),
+ new XElement("DateImplement", DateImplement.ToString())
+ );
+ }
+}