Закончил databaseimplements

DiningRoom/DiningRoomContracts/SearchModels/ComponentSearchModel.cs

@@ -5,5 +5,6 @@
 		public int? Id { get; set; }
 
 		public int? UserId { get; set; }
+		public string ComponentName { get; set; }
 	}
 }

DiningRoom/DiningRoomContracts/StorageContracts/IUserStorage.cs

@@ -12,7 +12,6 @@ namespace DiningRoomContracts.StorageContracts
 	public interface IUserStorage
 	{
 		List<UserViewModel> GetFullList();
-		List<UserViewModel> GetFilteredList(UserSearchModel model);
 		UserViewModel? GetElement(UserSearchModel model);
 		UserViewModel? Insert(UserBindingModel model);
 		UserViewModel? Update(UserBindingModel model);

DiningRoom/DiningRoomDatabaseImplement/Implements/ComponentStorage.cs

@@ -0,0 +1,85 @@
+using DiningRoomContracts.BindingModels;
+using DiningRoomContracts.SearchModels;
+using DiningRoomContracts.StorageContracts;
+using DiningRoomContracts.ViewModels;
+using DiningRoomDatabaseImplement.Models;
+
+namespace DiningRoomDatabaseImplement.Implements
+{
+    public class ComponentStorage : IComponentStorage
+    {
+        //
+        public List<ComponentViewModel> GetFullList()
+        {
+            using var context = new DiningRoomDatabase();
+            return context.Components
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+        //
+        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName))
+            {
+                return new();
+            }
+            using var context = new DiningRoomDatabase();
+            return context.Components
+                    .Where(x => x.ComponentName.Contains(model.ComponentName))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+        //
+        public ComponentViewModel? GetElement(ComponentSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new DiningRoomDatabase();
+            return context.Components
+                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) ||
+                                        (model.Id.HasValue && x.Id == model.Id))
+                    ?.GetViewModel;
+        }
+        //
+        public ComponentViewModel? Insert(ComponentBindingModel model)
+        {
+            var newComponent = Component.Create(model);
+            if (newComponent == null)
+            {
+                return null;
+            }
+            using var context = new DiningRoomDatabase();
+            context.Components.Add(newComponent);
+            context.SaveChanges();
+            return newComponent.GetViewModel;
+        }
+
+        public ComponentViewModel? Update(ComponentBindingModel model)
+        {
+            using var context = new DiningRoomDatabase();
+            var component = context.Components.FirstOrDefault(x => x.Id == model.Id);
+            if (component == null)
+            {
+                return null;
+            }
+            component.Update(model);
+            context.SaveChanges();
+            return component.GetViewModel;
+        }
+
+        public ComponentViewModel? Delete(ComponentBindingModel model)
+        {
+            using var context = new DiningRoomDatabase();
+            var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Components.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

DiningRoom/DiningRoomDatabaseImplement/Implements/DrinkStorage.cs

@@ -0,0 +1,106 @@
+using DiningRoomContracts.BindingModels;
+using DiningRoomContracts.SearchModels;
+using DiningRoomContracts.StorageContracts;
+using DiningRoomContracts.ViewModels;
+using DiningRoomDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace DiningRoomDatabaseImplement.Implements
+{
+    public class DrinkStorage : IDrinkStorage
+    {
+		public List<DrinkViewModel> GetFullList()
+		{
+			using var context = new DiningRoomDatabase();
+			return context.Drinks
+					.Include(x => x.Components)
+					.ThenInclude(x => x.Component)
+					.ToList()
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
+
+		public List<DrinkViewModel> GetFilteredList(DrinkSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.DrinkName))
+			{
+				return new();
+			}
+			using var context = new DiningRoomDatabase();
+			return context.Drinks
+					.Include(x => x.Components)
+					.ThenInclude(x => x.Component)
+					.Where(x => x.DrinkName.Contains(model.DrinkName))
+					.ToList()
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
+
+		public DrinkViewModel? GetElement(DrinkSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.DrinkName) && !model.Id.HasValue)
+			{
+				return null;
+			}
+			using var context = new DiningRoomDatabase();
+			return context.Drinks
+				.Include(x => x.Components)
+				.ThenInclude(x => x.Component)
+				.FirstOrDefault(x => (!string.IsNullOrEmpty(model.DrinkName) && x.DrinkName == model.DrinkName) ||
+								(model.Id.HasValue && x.Id == model.Id))
+				?.GetViewModel;
+		}
+
+		public DrinkViewModel? Insert(DrinkBindingModel model)
+		{
+			using var context = new DiningRoomDatabase();
+			var newDrink = Drink.Create(context, model);
+			if (newDrink == null)
+			{
+				return null;
+			}
+			context.Drinks.Add(newDrink);
+			context.SaveChanges();
+			return newDrink.GetViewModel;
+		}
+
+		public DrinkViewModel? Update(DrinkBindingModel model)
+		{
+			using var context = new DiningRoomDatabase();
+			using var transaction = context.Database.BeginTransaction();
+			try
+			{
+				var Drink = context.Drinks.FirstOrDefault(rec => rec.Id == model.Id);
+				if (Drink == null)
+				{
+					return null;
+				}
+				Drink.Update(model);
+				context.SaveChanges();
+				Drink.UpdateComponents(context, model);
+				transaction.Commit();
+				return Drink.GetViewModel;
+			}
+			catch
+			{
+				transaction.Rollback();
+				throw;
+			}
+		}
+
+		public DrinkViewModel? Delete(DrinkBindingModel model)
+		{
+			using var context = new DiningRoomDatabase();
+			var element = context.Drinks
+				.Include(x => x.Components)
+				.FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.Drinks.Remove(element);
+				context.SaveChanges();
+				return element.GetViewModel;
+			}
+			return null;
+		}
+	}
+}

DiningRoom/DiningRoomDatabaseImplement/Implements/OrderStorage.cs

@@ -13,7 +13,6 @@ using System.Threading.Tasks;
 
 namespace DiningRoomDatabaseImplement.Implements
 {
-	//!!!ПОДОБИЕ component
 	public class OrderStorage : IOrderStorage
 	{
         public OrderViewModel? Delete(OrderBindingModel model)
@@ -45,65 +44,51 @@ namespace DiningRoomDatabaseImplement.Implements
             using var context = new DiningRoomDatabase();
 
             return context.Orders
-                    .Include(x => x.Client)
-                    .Include(x => x.Implementer)
-                    .FirstOrDefault(x =>
-                        (model.Statuses == null || model.Statuses != null && model.Statuses.Contains(x.Status)) &&
-                        model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
-                        model.Id.HasValue && x.Id == model.Id
-                    )
-                    ?.GetViewModel;
+                    .Include(x=> x.Product)
+                    .FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (model.Id.HasValue)
-            {
-                var result = GetElement(model);
-                return result != null ? new() { result } : new();
-            }
-
-            using var context = new CarpentryWorkshopDatabase();
-            IQueryable<Order>? queryWhere = null;
-
+            using var context = new DiningRoomDatabase();
+            
             if (model.DateFrom.HasValue && model.DateTo.HasValue)
             {
-                queryWhere = context.Orders
-                    .Where(x => model.DateFrom <= x.DateCreate.Date &&
-                                                  x.DateCreate.Date <= model.DateTo);
+                return context.Orders
+                    .Where(x => (x.UserId == model.UserId) && (x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo))
+                    .Include(x => x.Product)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
             }
-
-            else if (model.Statuses != null)
+            
+            else if (model.Status.HasValue)
             {
-                queryWhere = context.Orders.Where(x => model.Statuses.Contains(x.Status));
+                return context.Orders
+                    .Where(x => (x.UserId == model.UserId) && (x.Status == model.Status))
+                    .Include(x => x.Product)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
             }
-
-            else if (model.ClientId.HasValue)
-            {
-                queryWhere = context.Orders.Where(x => x.ClientId == model.ClientId);
-            }
-
-            else
-            {
-                return new();
-            }
-
-            return queryWhere
-                    .Include(x => x.Client)
-                    .Include(x => x.Implementer)
+            
+            return context.Orders
+                    .Where(x => x.UserId == model.UserId)
+                    .Include(x => x.Product)
+                    .ToList()
                     .Select(x => x.GetViewModel)
                     .ToList();
         }
 
         public List<OrderViewModel> GetFullList()
         {
-            using var context = new CarpentryWorkshopDatabase();
+            using var context = new DiningRoomDatabase();
 
             return context.Orders
-                .Include(x => x.Wood)
-                .Include(x => x.Client)
-                .Include(x => x.Implementer)
-                .Select(x => x.GetViewModel).ToList();
+                .Include(x => x.Product)
+                .ToList()
+                .Select(x => x.GetViewModel)
+                .ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -115,37 +100,27 @@ namespace DiningRoomDatabaseImplement.Implements
                 return null;
             }
 
-            using var context = new CarpentryWorkshopDatabase();
-
+            using var context = new DiningRoomDatabase();
+            if (newOrder == null)
+            {
+                return null;
+            }
             context.Orders.Add(newOrder);
             context.SaveChanges();
-
-            return context.Orders
-                          .Include(x => x.Wood)
-                          .Include(x => x.Client)
-                          .Include(x => x.Implementer)
-                          .FirstOrDefault(x => x.Id == newOrder.Id)
-                          ?.GetViewModel;
+            return newOrder.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
         {
-            using var context = new CarpentryWorkshopDatabase();
-
-            var order = context.Orders
-                .Include(x => x.Wood)
-                .Include(x => x.Client)
-                .Include(x => x.Implementer)
-                .FirstOrDefault(x => x.Id == model.Id);
+            using var context = new DiningRoomDatabase();
 
+            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
             if (order == null)
             {
                 return null;
             }
-
             order.Update(model);
             context.SaveChanges();
-
             return order.GetViewModel;
         }
     }

DiningRoom/DiningRoomDatabaseImplement/Implements/ProductStorage.cs

@@ -0,0 +1,106 @@
+using DiningRoomContracts.BindingModels;
+using DiningRoomContracts.SearchModels;
+using DiningRoomContracts.StorageContracts;
+using DiningRoomContracts.ViewModels;
+using DiningRoomDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace DiningRoomDatabaseImplement.Implements
+{
+    public class ProductStorage : IProductStorage
+    {
+		public List<ProductViewModel> GetFullList()
+		{
+			using var context = new DiningRoomDatabase();
+			return context.Products
+					.Include(x => x.Components)
+					.ThenInclude(x => x.Component)
+					.ToList()
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
+
+		public List<ProductViewModel> GetFilteredList(ProductSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ProductName))
+			{
+				return new();
+			}
+			using var context = new DiningRoomDatabase();
+			return context.Products
+					.Include(x => x.Components)
+					.ThenInclude(x => x.Component)
+					.Where(x => x.ProductName.Contains(model.ProductName))
+					.ToList()
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
+
+		public ProductViewModel? GetElement(ProductSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ProductName) && !model.Id.HasValue)
+			{
+				return null;
+			}
+			using var context = new DiningRoomDatabase();
+			return context.Products
+				.Include(x => x.Components)
+				.ThenInclude(x => x.Component)
+				.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ProductName) && x.ProductName == model.ProductName) ||
+								(model.Id.HasValue && x.Id == model.Id))
+				?.GetViewModel;
+		}
+
+		public ProductViewModel? Insert(ProductBindingModel model)
+		{
+			using var context = new DiningRoomDatabase();
+			var newProduct = Product.Create(context, model);
+			if (newProduct == null)
+			{
+				return null;
+			}
+			context.Products.Add(newProduct);
+			context.SaveChanges();
+			return newProduct.GetViewModel;
+		}
+
+		public ProductViewModel? Update(ProductBindingModel model)
+		{
+			using var context = new DiningRoomDatabase();
+			using var transaction = context.Database.BeginTransaction();
+			try
+			{
+				var Product = context.Products.FirstOrDefault(rec => rec.Id == model.Id);
+				if (Product == null)
+				{
+					return null;
+				}
+				Product.Update(model);
+				context.SaveChanges();
+				Product.UpdateComponents(context, model);
+				transaction.Commit();
+				return Product.GetViewModel;
+			}
+			catch
+			{
+				transaction.Rollback();
+				throw;
+			}
+		}
+
+		public ProductViewModel? Delete(ProductBindingModel model)
+		{
+			using var context = new DiningRoomDatabase();
+			var element = context.Products
+				.Include(x => x.Components)
+				.FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.Products.Remove(element);
+				context.SaveChanges();
+				return element.GetViewModel;
+			}
+			return null;
+		}
+	}
+}

DiningRoom/DiningRoomDatabaseImplement/Implements/UserStorage.cs

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace DiningRoomDatabaseImplement.Implements
 {
-	//!!!МБ У USER ХРАНИТЬ СПИСКИ ВСЕХ СОЗДАННЫХ СУШНОСТЕЙ И ТОГДА ПРИ СОЗДАНИИ, УДАЛЕНИИ СУЩНОСТЕЙ ЕЩЁ СОЗДАВАТЬ И УДАЛЯТЬ ИЗ СПИСКА У ПОЛЬЗОВАТЕЛЯ
+
 	public class UserStorage : IUserStorage
 	{
 		public List<UserViewModel> GetFullList()
@@ -21,19 +21,6 @@ namespace DiningRoomDatabaseImplement.Implements
 			return context.Users.Select(x => x.GetViewModel).ToList();
 		}
 
-		//Фильтрация пользователей логически нужна только для роли (по остальным параметрам будет 1 или 0 пользователей)
-		public List<UserViewModel> GetFilteredList(UserSearchModel model)
-		{
-			if (model.Role == null || model.Role == UserRole.Неизвестная)
-			{
-				return new();
-			}
-			using var context = new DiningRoomDatabase();
-			return context.Users.Where(x => x.Role == model.Role).Select(x => x.GetViewModel).ToList();
-		}
-
-		//!!!ПРОВЕРИТЬ
-		//id, почта и логин уникальны, можно получать по ним
 		public UserViewModel? GetElement(UserSearchModel model)
 		{
 			//!!!МБ ЭТУ ПРОВЕРКУ УБРАТЬ
@@ -46,7 +33,7 @@ namespace DiningRoomDatabaseImplement.Implements
 			//Поиск пользователя при входе в систему по логину, паролю и его роли (чтобы не могли войти в аккаунты другой роли) 
 			if (!string.IsNullOrEmpty(model.Login) && !string.IsNullOrEmpty(model.Password) && model.Role.HasValue)
 			{
-				return context.Users.FirstOrDefault(x => x.Login == model.Login && x.Password == model.Password && x.Role == model.Role)?.GetViewModel;
+				return context.Users.FirstOrDefault(x => x.Login == model.Login && x.Password == model.Password)?.GetViewModel;
 			}
 			//!!!НИЖЕ МБ НЕ НАДО
 			//Получение по логину (пользователей с таким логином будет 1 или 0)

DiningRoom/DiningRoomDatabaseImplement/Models/Component.cs

@@ -44,7 +44,7 @@ namespace DiningRoomDatabaseImplement.Models
 			Unit = Model.Unit;
 		}
 
-		public ComponentViewModel ViewModel => new()
+		public ComponentViewModel GetViewModel => new()
 		{
 			Id = Id,
 			UserId = UserId,