From 98151dc3939d26245d96d3bb328948c381585a02 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: Sat, 1 Apr 2023 16:33:26 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=BE=D0=B1=D0=BD=D0=BE=D0=B5=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HardwareShopDatabaseImplement/HardwareShopDatabase.cs | 2 ++ .../HardwareShopDatabaseImplement.csproj | 4 ++++ .../Models/{ => ModelsManyToMany}/BuildComponent.cs | 3 ++- .../Models/{ => ModelsManyToMany}/PurchaseBuild.cs | 2 +- .../Models/{ => ModelsManyToMany}/PurchaseGood.cs | 3 ++- .../Models/{ => ModelsStorekeeper}/Component.cs | 2 +- .../Models/{ => ModelsStorekeeper}/Good.cs | 2 +- .../Models/{ => ModelsStorekeeper}/Order.cs | 2 +- .../Models/{ => ModelsWorker}/Build.cs | 4 ++-- .../Models/{ => ModelsWorker}/Comment.cs | 2 +- .../Models/{ => ModelsWorker}/Purchase.cs | 3 ++- 11 files changed, 19 insertions(+), 10 deletions(-) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsManyToMany}/BuildComponent.cs (81%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsManyToMany}/PurchaseBuild.cs (89%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsManyToMany}/PurchaseGood.cs (80%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsStorekeeper}/Component.cs (82%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsStorekeeper}/Good.cs (83%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsStorekeeper}/Order.cs (81%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsWorker}/Build.cs (97%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsWorker}/Comment.cs (95%) rename HardwareShop/HardwareShopDatabaseImplement/Models/{ => ModelsWorker}/Purchase.cs (98%) diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs index 2bbe3d7..648429e 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs @@ -1,4 +1,6 @@ using HardwareShopDatabaseImplement.Models; +using HardwareShopDatabaseImplement.Models.ModelsManyToMany; +using HardwareShopDatabaseImplement.Models.ModelsStorekeeper; using Microsoft.EntityFrameworkCore; namespace HardwareShopDatabaseImplement diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabaseImplement.csproj b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabaseImplement.csproj index 841ba20..47df5db 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabaseImplement.csproj +++ b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/BuildComponent.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/BuildComponent.cs similarity index 81% rename from HardwareShop/HardwareShopDatabaseImplement/Models/BuildComponent.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/BuildComponent.cs index e0dc8e5..5543221 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/BuildComponent.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/BuildComponent.cs @@ -5,8 +5,9 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; +using HardwareShopDatabaseImplement.Models.ModelsStorekeeper; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany { public class BuildComponent { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/PurchaseBuild.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseBuild.cs similarity index 89% rename from HardwareShop/HardwareShopDatabaseImplement/Models/PurchaseBuild.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseBuild.cs index 8c27dac..11d128f 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/PurchaseBuild.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseBuild.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany { public class PurchaseBuild { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/PurchaseGood.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseGood.cs similarity index 80% rename from HardwareShop/HardwareShopDatabaseImplement/Models/PurchaseGood.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseGood.cs index e0c1f49..6a12faf 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/PurchaseGood.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsManyToMany/PurchaseGood.cs @@ -5,8 +5,9 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; +using HardwareShopDatabaseImplement.Models.ModelsStorekeeper; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsManyToMany { public class PurchaseGood { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Component.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Component.cs similarity index 82% rename from HardwareShop/HardwareShopDatabaseImplement/Models/Component.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Component.cs index c62f457..10cdb6b 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Component.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Component.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsStorekeeper { public class Component : IComponentModel { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Good.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Good.cs similarity index 83% rename from HardwareShop/HardwareShopDatabaseImplement/Models/Good.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Good.cs index 4de3950..2d6ee18 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Good.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Good.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsStorekeeper { public class Good : IGoodModel { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Order.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Order.cs similarity index 81% rename from HardwareShop/HardwareShopDatabaseImplement/Models/Order.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Order.cs index 1ee8524..48946a8 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Order.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsStorekeeper/Order.cs @@ -2,7 +2,7 @@ using HardwareShopDataModels.Models; using HardwareShopDataModels.Models; using System.ComponentModel; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsStorekeeper { public class Order : IOrderModel { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Build.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Build.cs similarity index 97% rename from HardwareShop/HardwareShopDatabaseImplement/Models/Build.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Build.cs index 1f333b8..206657d 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Build.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Build.cs @@ -1,11 +1,11 @@ using HardwareShopContracts.BindingModels; using HardwareShopContracts.ViewModels; +using HardwareShopDatabaseImplement.Models.ModelsManyToMany; using HardwareShopDataModels.Models; -using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsWorker { public class Build : IBuildModel { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Comment.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Comment.cs similarity index 95% rename from HardwareShop/HardwareShopDatabaseImplement/Models/Comment.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Comment.cs index d041dc3..36bbe96 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Comment.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Comment.cs @@ -4,7 +4,7 @@ using HardwareShopDataModels.Models; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsWorker { public class Comment : ICommentModel { diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Purchase.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Purchase.cs similarity index 98% rename from HardwareShop/HardwareShopDatabaseImplement/Models/Purchase.cs rename to HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Purchase.cs index 0a35865..6263bcb 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Purchase.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/ModelsWorker/Purchase.cs @@ -1,11 +1,12 @@ using HardwareShopContracts.BindingModels; using HardwareShopContracts.ViewModels; +using HardwareShopDatabaseImplement.Models.ModelsManyToMany; using HardwareShopDataModels.Enums; using HardwareShopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.Diagnostics; -namespace HardwareShopDatabaseImplement.Models +namespace HardwareShopDatabaseImplement.Models.ModelsWorker { public class Purchase : IPurchaseModel {